Repository: struts
Updated Branches:
refs/heads/develop 3414c1b67 -> 96156dfa1
WW-4321 Adds missing location property during copy
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/96156dfa
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/96156dfa
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/96156dfa
Branch: refs/heads/develop
Commit: 96156dfa17811e4b15c97030d4cdc9684900e096
Parents: 3414c1b
Author: Lukasz Lenart
Authored: Fri Apr 11 07:23:57 2014 +0200
Committer: Lukasz Lenart
Committed: Fri Apr 11 07:23:57 2014 +0200
--
.../opensymphony/xwork2/config/entities/ActionConfig.java| 1 +
.../xwork2/config/entities/ExceptionMappingConfig.java | 1 +
.../xwork2/config/entities/InterceptorConfig.java| 1 +
.../xwork2/config/entities/InterceptorStackConfig.java | 1 +
.../opensymphony/xwork2/config/entities/PackageConfig.java | 1 +
.../opensymphony/xwork2/config/entities/ResultConfig.java| 1 +
.../xwork2/config/entities/ResultTypeConfig.java | 1 +
.../xwork2/config/entities/UnknownHandlerConfig.java | 8 ++--
.../xwork2/config/providers/XmlConfigurationProvider.java| 3 ++-
9 files changed, 15 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/96156dfa/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
index 7494d43..0bc9363 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
@@ -87,6 +87,7 @@ public class ActionConfig extends Located implements
Serializable {
this.results = new LinkedHashMap(orig.results);
this.exceptionMappings = new
ArrayList(orig.exceptionMappings);
this.allowedMethods = new HashSet(orig.allowedMethods);
+this.location = orig.location;
}
public String getName() {
http://git-wip-us.apache.org/repos/asf/struts/blob/96156dfa/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java
index 52b3166..5dcd266 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ExceptionMappingConfig.java
@@ -49,6 +49,7 @@ public class ExceptionMappingConfig extends Located
implements Serializable {
this.exceptionClassName = target.exceptionClassName;
this.result = target.result;
this.params = new LinkedHashMap(target.params);
+this.location = target.location;
}
public String getName() {
http://git-wip-us.apache.org/repos/asf/struts/blob/96156dfa/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java
index dc81e57..288fa55 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorConfig.java
@@ -46,6 +46,7 @@ public class InterceptorConfig extends Located implements
Serializable {
this.name = orig.name;
this.className = orig.className;
this.params = new LinkedHashMap(orig.params);
+this.location = orig.location;
}
public String getClassName() {
http://git-wip-us.apache.org/repos/asf/struts/blob/96156dfa/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java
index 330e716..d3e41f9 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfig.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/InterceptorStackConfi