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 <lukaszlen...@apache.org> Authored: Fri Apr 11 07:23:57 2014 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> 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<String,ResultConfig>(orig.results); this.exceptionMappings = new ArrayList<ExceptionMappingConfig>(orig.exceptionMappings); this.allowedMethods = new HashSet<String>(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<String,String>(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<String,String>(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/InterceptorStackConfig.java @@ -58,6 +58,7 @@ public class InterceptorStackConfig extends Located implements Serializable { protected InterceptorStackConfig(InterceptorStackConfig orig) { this.name = orig.name; this.interceptors = new ArrayList<InterceptorMapping>(orig.interceptors); + this.location = orig.location; } http://git-wip-us.apache.org/repos/asf/struts/blob/96156dfa/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java index 1619645..eeb530e 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java @@ -80,6 +80,7 @@ public class PackageConfig extends Located implements Comparable, Serializable, this.resultTypeConfigs = new LinkedHashMap<String, ResultTypeConfig>(orig.resultTypeConfigs); this.globalExceptionMappingConfigs = new ArrayList<ExceptionMappingConfig>(orig.globalExceptionMappingConfigs); this.parents = new ArrayList<PackageConfig>(orig.parents); + this.location = orig.location; } public boolean isAbstract() { http://git-wip-us.apache.org/repos/asf/struts/blob/96156dfa/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java index 4b4c79c..3c7ab2d 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java @@ -47,6 +47,7 @@ public class ResultConfig extends Located implements Serializable { this.params = orig.params; this.name = orig.name; this.className = orig.className; + 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/ResultTypeConfig.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java index cb9cc9e..85ef023 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java @@ -51,6 +51,7 @@ public class ResultTypeConfig extends Located implements Serializable { this.className = orig.className; this.defaultResultParam = orig.defaultResultParam; this.params = orig.params; + this.location = orig.location; } public void setDefaultResultParam(String defaultResultParam) { http://git-wip-us.apache.org/repos/asf/struts/blob/96156dfa/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java index 802280b..3d6692f 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java @@ -15,12 +15,16 @@ */ package com.opensymphony.xwork2.config.entities; -public class UnknownHandlerConfig { +import com.opensymphony.xwork2.util.location.Located; +import com.opensymphony.xwork2.util.location.Location; + +public class UnknownHandlerConfig extends Located { private String name; - public UnknownHandlerConfig(String name) { + public UnknownHandlerConfig(String name, Location location) { this.name = name; + this.location = location; } public String getName() { http://git-wip-us.apache.org/repos/asf/struts/blob/96156dfa/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java ---------------------------------------------------------------------- diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java index 7a0a4e3..6f9508b 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java @@ -260,7 +260,8 @@ public class XmlConfigurationProvider implements ConfigurationProvider { for (int k = 0; k < unknownHandlersSize; k++) { Element unknownHandler = (Element) unknownHandlers.item(k); - unknownHandlerStack.add(new UnknownHandlerConfig(unknownHandler.getAttribute("name"))); + Location location = LocationUtils.getLocation(unknownHandler); + unknownHandlerStack.add(new UnknownHandlerConfig(unknownHandler.getAttribute("name"), location)); } if (!unknownHandlerStack.isEmpty())
