Drops outdated attribute
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fb0c4a58 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fb0c4a58 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fb0c4a58 Branch: refs/heads/master Commit: fb0c4a58507c7fb1af135bb376af5b475f43d7ee Parents: 55b8070 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Mon Aug 31 14:42:44 2015 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Mon Aug 31 14:42:44 2015 +0200 ---------------------------------------------------------------------- .../xwork2/config/providers/XmlConfigurationProvider.java | 5 ----- core/src/main/resources/struts-2.5.dtd | 1 - 2 files changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/fb0c4a58/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java index 449d254..fd9f92a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java @@ -649,11 +649,6 @@ public class XmlConfigurationProvider implements ConfigurationProvider { String name = StringUtils.defaultString(packageElement.getAttribute("name")); String namespace = StringUtils.defaultString(packageElement.getAttribute("namespace")); - if (StringUtils.isNotEmpty(packageElement.getAttribute("externalReferenceResolver"))) { - throw new ConfigurationException("The 'externalReferenceResolver' attribute has been removed. Please use " + - "a custom ObjectFactory or Interceptor.", packageElement); - } - PackageConfig.Builder cfg = new PackageConfig.Builder(name) .namespace(namespace) .isAbstract(isAbstract) http://git-wip-us.apache.org/repos/asf/struts/blob/fb0c4a58/core/src/main/resources/struts-2.5.dtd ---------------------------------------------------------------------- diff --git a/core/src/main/resources/struts-2.5.dtd b/core/src/main/resources/struts-2.5.dtd index 86afbc0..25ca800 100644 --- a/core/src/main/resources/struts-2.5.dtd +++ b/core/src/main/resources/struts-2.5.dtd @@ -43,7 +43,6 @@ extends CDATA #IMPLIED namespace CDATA #IMPLIED abstract CDATA #IMPLIED - externalReferenceResolver NMTOKEN #IMPLIED > <!ELEMENT result-types (result-type+)>
