You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2020/11/29 16:01:53 UTC
[struts] branch WW-5078-removes-xwork-dtds updated: WW-5078 Drops
unneeded DTDs
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5078-removes-xwork-dtds
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/WW-5078-removes-xwork-dtds by this push:
new b2fb778 WW-5078 Drops unneeded DTDs
b2fb778 is described below
commit b2fb778909e05379e25fd174e7b9e3619add9712
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Sun Nov 29 17:01:46 2020 +0100
WW-5078 Drops unneeded DTDs
---
.../config/providers/XmlConfigurationProvider.java | 12 +-
.../config/StrutsXmlConfigurationProvider.java | 3 +-
.../org/apache/struts2/dispatcher/Dispatcher.java | 2 +-
core/src/main/resources/struts-default.xml | 8 +-
core/src/main/resources/xwork-1.0.dtd | 106 --------------
core/src/main/resources/xwork-1.1.1.dtd | 123 ----------------
core/src/main/resources/xwork-1.1.2.dtd | 131 -----------------
core/src/main/resources/xwork-1.1.dtd | 115 ---------------
core/src/main/resources/xwork-2.0.dtd | 137 ------------------
core/src/main/resources/xwork-2.1.3.dtd | 146 -------------------
core/src/main/resources/xwork-2.1.dtd | 143 -------------------
core/src/main/resources/xwork-2.3.dtd | 149 -------------------
core/src/main/resources/xwork-2.5.dtd | 151 --------------------
core/src/main/resources/xwork-2.6.dtd | 157 ---------------------
.../xwork2/util/ClassLoaderUtilTest.java | 12 +-
.../interceptor/FetchMetadataInterceptorTest.java | 4 +-
.../apache/struts2/dispatcher/ng/struts-no-op.xml | 4 +-
.../org/apache/struts2/views/jsp/WW3090-struts.xml | 4 +-
.../resources/{xwork-1.0.dtd => struts-2.0.dtd} | 0
core/src/test/resources/struts.xml | 4 +-
20 files changed, 26 insertions(+), 1385 deletions(-)
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 d2da197..e02338f 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
@@ -72,6 +72,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.Vector;
@@ -106,7 +107,7 @@ public abstract class XmlConfigurationProvider implements ConfigurationProvider
private ValueSubstitutor valueSubstitutor;
public XmlConfigurationProvider() {
- this("xwork.xml", true);
+ this("struts.xml", true);
}
public XmlConfigurationProvider(String filename) {
@@ -170,11 +171,7 @@ public abstract class XmlConfigurationProvider implements ConfigurationProvider
final XmlConfigurationProvider xmlConfigurationProvider = (XmlConfigurationProvider) o;
- if ((configFileName != null) ? (!configFileName.equals(xmlConfigurationProvider.configFileName)) : (xmlConfigurationProvider.configFileName != null)) {
- return false;
- }
-
- return true;
+ return Objects.equals(configFileName, xmlConfigurationProvider.configFileName);
}
@Override
@@ -1066,7 +1063,8 @@ public abstract class XmlConfigurationProvider implements ConfigurationProvider
}
if (urls == null || !urls.hasNext()) {
- throw new ConfigurationException("Could not open file: " + fileName, ioException);
+ LOG.debug("Ignoring file that does not exist: " + fileName, ioException);
+ return docs;
}
URL url = null;
diff --git a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
index 3461c75..f876d06 100644
--- a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
@@ -51,6 +51,7 @@ public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider {
*
* @param errorIfMissing If we should throw an exception if the file can't be found
*/
+ @Deprecated
public StrutsXmlConfigurationProvider(boolean errorIfMissing) {
this("struts.xml", errorIfMissing, null);
}
@@ -75,7 +76,7 @@ public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider {
super(filename, errorIfMissing);
this.servletContext = ctx;
this.filename = filename;
- reloadKey = "configurationReload-"+filename;
+ reloadKey = "configurationReload-" + filename;
Map<String,String> dtdMappings = new HashMap<String,String>(getDtdMappings());
dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.0//EN", "struts-2.0.dtd");
dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.1//EN", "struts-2.1.dtd");
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index eeb813f..8d7b5fb 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -446,7 +446,7 @@ public class Dispatcher {
String[] classes = configClasses.split("\\s*[,]\\s*");
for (String cname : classes) {
try {
- Class cls = ClassLoaderUtil.loadClass(cname, this.getClass());
+ Class<?> cls = ClassLoaderUtil.loadClass(cname, this.getClass());
StrutsJavaConfiguration config = (StrutsJavaConfiguration) cls.newInstance();
configurationManager.addContainerProvider(createJavaConfigurationProvider(config));
} catch (InstantiationException e) {
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 8d30cf4..045d453 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -31,8 +31,8 @@
and {@link com.opensymphony.xwork2.inject.Inject}
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
- "http://struts.apache.org/dtds/struts-2.5.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.6//EN"
+ "http://struts.apache.org/dtds/struts-2.6.dtd">
<struts>
@@ -401,10 +401,10 @@
<interceptor-ref name="coepInterceptor">
<param name="enforcingMode">false</param>
<param name="disabled">false</param>
- <param name="exemptedPaths"></param>
+ <param name="exemptedPaths"/>
</interceptor-ref>
<interceptor-ref name="coopInterceptor">
- <param name="exemptedPaths"></param>
+ <param name="exemptedPaths"/>
<param name="mode">same-origin</param>
</interceptor-ref>
<interceptor-ref name="fetchMetadata"/>
diff --git a/core/src/main/resources/xwork-1.0.dtd b/core/src/main/resources/xwork-1.0.dtd
deleted file mode 100644
index 23661a1..0000000
--- a/core/src/main/resources/xwork-1.0.dtd
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!--
- XWork Configuraion DTD.
- Use the following DOCTYPE.
-
- <!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 1.0//EN"
- "http://struts.apache.org/dtds/xwork-1.0.dtd">
--->
-
-<!ELEMENT xwork (package|include)*>
-
-<!ELEMENT package (result-types?, interceptors?, default-interceptor-ref?, global-results?, action*)>
-<!ATTLIST package
- name CDATA #REQUIRED
- extends CDATA #IMPLIED
- namespace CDATA #IMPLIED
- abstract CDATA #IMPLIED
- externalReferenceResolver NMTOKEN #IMPLIED
->
-
-<!ELEMENT result-types (result-type+)>
-
-<!ELEMENT result-type (param*)>
-<!ATTLIST result-type
- name CDATA #REQUIRED
- class CDATA #REQUIRED
- default (true|false) "false"
->
-
-<!ELEMENT interceptors (interceptor|interceptor-stack)+>
-
-<!ELEMENT interceptor (param*)>
-<!ATTLIST interceptor
- name CDATA #REQUIRED
- class CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-stack (interceptor-ref+)>
-<!ATTLIST interceptor-stack
- name CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-ref (param*)>
-<!ATTLIST interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-interceptor-ref (param*)>
-<!ATTLIST default-interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT external-ref (#PCDATA)>
-<!ATTLIST external-ref
- name NMTOKEN #REQUIRED
- required (true|false) "true"
->
-
-<!ELEMENT global-results (result+)>
-
-<!ELEMENT action (param|result|interceptor-ref|external-ref)*>
-<!ATTLIST action
-name CDATA #REQUIRED
- class CDATA #REQUIRED
- method CDATA #IMPLIED
- converter CDATA #IMPLIED
->
-
-<!ELEMENT param (#PCDATA)>
-<!ATTLIST param
- name CDATA #REQUIRED
->
-
-<!ELEMENT result (#PCDATA|param)*>
-<!ATTLIST result
- name CDATA #REQUIRED
- type CDATA #IMPLIED
->
-
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST include
- file CDATA #REQUIRED
->
-
-
diff --git a/core/src/main/resources/xwork-1.1.1.dtd b/core/src/main/resources/xwork-1.1.1.dtd
deleted file mode 100644
index c8b01b4..0000000
--- a/core/src/main/resources/xwork-1.1.1.dtd
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!-- START SNIPPET: xworkDtd -->
-
-<!--
- XWork configuration DTD.
- Use the following DOCTYPE
-
- <!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 1.0//EN"
- "http://struts.apache.org/dtds/xwork-1.1.1.dtd">
--->
-
-<!ELEMENT xwork (package|include)*>
-
-<!ELEMENT package (result-types?, interceptors?, default-interceptor-ref?, default-action-ref?, global-results?, global-exception-mappings?, action*)>
-<!ATTLIST package
- name CDATA #REQUIRED
- extends CDATA #IMPLIED
- namespace CDATA #IMPLIED
- abstract CDATA #IMPLIED
- externalReferenceResolver NMTOKEN #IMPLIED
->
-
-<!ELEMENT result-types (result-type+)>
-
-<!ELEMENT result-type (param*)>
-<!ATTLIST result-type
- name CDATA #REQUIRED
- class CDATA #REQUIRED
- default (true|false) "false"
->
-
-<!ELEMENT interceptors (interceptor|interceptor-stack)+>
-
-<!ELEMENT interceptor (param*)>
-<!ATTLIST interceptor
- name CDATA #REQUIRED
- class CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-stack (interceptor-ref+)>
-<!ATTLIST interceptor-stack
- name CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-ref (param*)>
-<!ATTLIST interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-interceptor-ref (param*)>
-<!ATTLIST default-interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-action-ref (param*)>
-<!ATTLIST default-action-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT external-ref (#PCDATA)>
-<!ATTLIST external-ref
- name NMTOKEN #REQUIRED
- required (true|false) "true"
->
-
-<!ELEMENT global-results (result+)>
-
-<!ELEMENT global-exception-mappings (exception-mapping+)>
-
-<!ELEMENT action (param|result|interceptor-ref|exception-mapping|external-ref)*>
-<!ATTLIST action
- name CDATA #REQUIRED
- class CDATA #IMPLIED
- method CDATA #IMPLIED
- converter CDATA #IMPLIED
->
-
-<!ELEMENT param (#PCDATA)>
-<!ATTLIST param
- name CDATA #REQUIRED
->
-
-<!ELEMENT result (#PCDATA|param)*>
-<!ATTLIST result
- name CDATA #IMPLIED
- type CDATA #IMPLIED
->
-
-<!ELEMENT exception-mapping (#PCDATA|param)*>
-<!ATTLIST exception-mapping
- name CDATA #IMPLIED
- exception CDATA #REQUIRED
- result CDATA #REQUIRED
->
-
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST include
- file CDATA #REQUIRED
->
-
-<!-- END SNIPPET: xworkDtd -->
-
diff --git a/core/src/main/resources/xwork-1.1.2.dtd b/core/src/main/resources/xwork-1.1.2.dtd
deleted file mode 100644
index 296c8a5..0000000
--- a/core/src/main/resources/xwork-1.1.2.dtd
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!-- START SNIPPET: xworkDtd -->
-
-<!--
- XWork configuration DTD.
- Use the following DOCTYPE
-
- <!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 1.0//EN"
- "http://struts.apache.org/dtds/xwork-1.1.2.dtd">
--->
-
-<!ELEMENT xwork (parameters?, (package|include)*)>
-
-<!ELEMENT parameters (parameter*)>
-
-<!ELEMENT parameter (#PCDATA)>
-<!ATTLIST parameter
- name CDATA #REQUIRED
- value CDATA #REQUIRED
->
-
-<!ELEMENT package (result-types?, interceptors?, default-interceptor-ref?, default-action-ref?, global-results?, global-exception-mappings?, action*)>
-<!ATTLIST package
- name CDATA #REQUIRED
- extends CDATA #IMPLIED
- namespace CDATA #IMPLIED
- abstract CDATA #IMPLIED
- externalReferenceResolver NMTOKEN #IMPLIED
->
-
-<!ELEMENT result-types (result-type+)>
-
-<!ELEMENT result-type (param*)>
-<!ATTLIST result-type
- name CDATA #REQUIRED
- class CDATA #REQUIRED
- default (true|false) "false"
->
-
-<!ELEMENT interceptors (interceptor|interceptor-stack)+>
-
-<!ELEMENT interceptor (param*)>
-<!ATTLIST interceptor
- name CDATA #REQUIRED
- class CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-stack (interceptor-ref+)>
-<!ATTLIST interceptor-stack
- name CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-ref (param*)>
-<!ATTLIST interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-interceptor-ref (param*)>
-<!ATTLIST default-interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-action-ref (param*)>
-<!ATTLIST default-action-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT external-ref (#PCDATA)>
-<!ATTLIST external-ref
- name NMTOKEN #REQUIRED
- required (true|false) "true"
->
-
-<!ELEMENT global-results (result+)>
-
-<!ELEMENT global-exception-mappings (exception-mapping+)>
-
-<!ELEMENT action (param|result|interceptor-ref|exception-mapping|external-ref)*>
-<!ATTLIST action
- name CDATA #REQUIRED
- class CDATA #IMPLIED
- method CDATA #IMPLIED
- converter CDATA #IMPLIED
->
-
-<!ELEMENT param (#PCDATA)>
-<!ATTLIST param
- name CDATA #REQUIRED
->
-
-<!ELEMENT result (#PCDATA|param)*>
-<!ATTLIST result
- name CDATA #IMPLIED
- type CDATA #IMPLIED
->
-
-<!ELEMENT exception-mapping (#PCDATA|param)*>
-<!ATTLIST exception-mapping
- name CDATA #IMPLIED
- exception CDATA #REQUIRED
- result CDATA #REQUIRED
->
-
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST include
- file CDATA #REQUIRED
->
-
-<!-- END SNIPPET: xworkDtd -->
-
diff --git a/core/src/main/resources/xwork-1.1.dtd b/core/src/main/resources/xwork-1.1.dtd
deleted file mode 100644
index f1fbfd7..0000000
--- a/core/src/main/resources/xwork-1.1.dtd
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!--
- XWork configuration DTD.
- Use the following DOCTYPE
-
- <!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 1.0//EN"
- "http://struts.apache.org/dtds/xwork-1.1.dtd">
--->
-
-<!ELEMENT xwork (package|include)*>
-
-<!ELEMENT package (result-types?, interceptors?, default-interceptor-ref?, global-results?, global-exception-mappings?, action*)>
-<!ATTLIST package
- name CDATA #REQUIRED
- extends CDATA #IMPLIED
- namespace CDATA #IMPLIED
- abstract CDATA #IMPLIED
- externalReferenceResolver NMTOKEN #IMPLIED
->
-
-<!ELEMENT result-types (result-type+)>
-
-<!ELEMENT result-type (param*)>
-<!ATTLIST result-type
- name CDATA #REQUIRED
- class CDATA #REQUIRED
- default (true|false) "false"
->
-
-<!ELEMENT interceptors (interceptor|interceptor-stack)+>
-
-<!ELEMENT interceptor (param*)>
-<!ATTLIST interceptor
- name CDATA #REQUIRED
- class CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-stack (interceptor-ref+)>
-<!ATTLIST interceptor-stack
- name CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-ref (param*)>
-<!ATTLIST interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-interceptor-ref (param*)>
-<!ATTLIST default-interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT external-ref (#PCDATA)>
-<!ATTLIST external-ref
- name NMTOKEN #REQUIRED
- required (true|false) "true"
->
-
-<!ELEMENT global-results (result+)>
-
-<!ELEMENT global-exception-mappings (exception-mapping+)>
-
-<!ELEMENT action (param|result|interceptor-ref|exception-mapping|external-ref)*>
-<!ATTLIST action
- name CDATA #REQUIRED
- class CDATA #IMPLIED
- method CDATA #IMPLIED
- converter CDATA #IMPLIED
->
-
-<!ELEMENT param (#PCDATA)>
-<!ATTLIST param
- name CDATA #REQUIRED
->
-
-<!ELEMENT result (#PCDATA|param)*>
-<!ATTLIST result
- name CDATA #IMPLIED
- type CDATA #IMPLIED
->
-
-<!ELEMENT exception-mapping (#PCDATA|param)*>
-<!ATTLIST exception-mapping
- name CDATA #IMPLIED
- exception CDATA #REQUIRED
- result CDATA #REQUIRED
->
-
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST include
- file CDATA #REQUIRED
->
-
-
diff --git a/core/src/main/resources/xwork-2.0.dtd b/core/src/main/resources/xwork-2.0.dtd
deleted file mode 100644
index c9c3b3b..0000000
--- a/core/src/main/resources/xwork-2.0.dtd
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!-- START SNIPPET: xworkDtd -->
-
-<!--
- XWork configuration DTD.
- Use the following DOCTYPE
-
- <!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 2.0//EN"
- "http://struts.apache.org/dtds/xwork-2.0.dtd">
--->
-
-<!ELEMENT xwork (package|include|bean|constant)*>
-
-<!ELEMENT package (result-types?, interceptors?, default-interceptor-ref?, default-action-ref?, default-class-ref?, global-results?, global-exception-mappings?, action*)>
-<!ATTLIST package
- name CDATA #REQUIRED
- extends CDATA #IMPLIED
- namespace CDATA #IMPLIED
- abstract CDATA #IMPLIED
->
-
-<!ELEMENT result-types (result-type+)>
-
-<!ELEMENT result-type (param*)>
-<!ATTLIST result-type
- name CDATA #REQUIRED
- class CDATA #REQUIRED
- default (true|false) "false"
->
-
-<!ELEMENT interceptors (interceptor|interceptor-stack)+>
-
-<!ELEMENT interceptor (param*)>
-<!ATTLIST interceptor
- name CDATA #REQUIRED
- class CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-stack (interceptor-ref*)>
-<!ATTLIST interceptor-stack
- name CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-ref (param*)>
-<!ATTLIST interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-interceptor-ref (#PCDATA)>
-<!ATTLIST default-interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-action-ref (#PCDATA)>
-<!ATTLIST default-action-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-class-ref (#PCDATA)>
-<!ATTLIST default-class-ref
- class CDATA #REQUIRED
->
-
-<!ELEMENT global-results (result+)>
-
-<!ELEMENT global-exception-mappings (exception-mapping+)>
-
-<!ELEMENT action (param|result|interceptor-ref|exception-mapping)*>
-<!ATTLIST action
- name CDATA #REQUIRED
- class CDATA #IMPLIED
- method CDATA #IMPLIED
- converter CDATA #IMPLIED
->
-
-<!ELEMENT param (#PCDATA)>
-<!ATTLIST param
- name CDATA #REQUIRED
->
-
-<!ELEMENT result (#PCDATA|param)*>
-<!ATTLIST result
- name CDATA #IMPLIED
- type CDATA #IMPLIED
->
-
-<!ELEMENT exception-mapping (#PCDATA|param)*>
-<!ATTLIST exception-mapping
- name CDATA #IMPLIED
- exception CDATA #REQUIRED
- result CDATA #REQUIRED
->
-
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST include
- file CDATA #REQUIRED
->
-
-<!ELEMENT bean (#PCDATA)>
-<!ATTLIST bean
- type CDATA #IMPLIED
- name CDATA #IMPLIED
- class CDATA #REQUIRED
- scope CDATA #IMPLIED
- static CDATA #IMPLIED
- optional CDATA #IMPLIED
->
-
-<!ELEMENT constant (#PCDATA)>
-<!ATTLIST constant
- name CDATA #REQUIRED
- value CDATA #REQUIRED
->
-
-<!-- END SNIPPET: xworkDtd -->
-
diff --git a/core/src/main/resources/xwork-2.1.3.dtd b/core/src/main/resources/xwork-2.1.3.dtd
deleted file mode 100644
index bce8e23..0000000
--- a/core/src/main/resources/xwork-2.1.3.dtd
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!-- START SNIPPET: xworkDtd -->
-
-<!--
- XWork configuration DTD.
- Use the following DOCTYPE
-
- <!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 2.1.3//EN"
- "http://struts.apache.org/dtds/xwork-2.1.3.dtd">
--->
-
-<!ELEMENT xwork ((package|include|bean|constant)*, unknown-handler-stack?)>
-<!ATTLIST xwork
- order CDATA #IMPLIED
->
-
-<!ELEMENT package (result-types?, interceptors?, default-interceptor-ref?, default-action-ref?, default-class-ref?, global-results?, global-exception-mappings?, action*)>
-<!ATTLIST package
- name CDATA #REQUIRED
- extends CDATA #IMPLIED
- namespace CDATA #IMPLIED
- abstract CDATA #IMPLIED
->
-
-<!ELEMENT result-types (result-type+)>
-
-<!ELEMENT result-type (param*)>
-<!ATTLIST result-type
- name CDATA #REQUIRED
- class CDATA #REQUIRED
- default (true|false) "false"
->
-
-<!ELEMENT interceptors (interceptor|interceptor-stack)+>
-
-<!ELEMENT interceptor (param*)>
-<!ATTLIST interceptor
- name CDATA #REQUIRED
- class CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-stack (interceptor-ref*)>
-<!ATTLIST interceptor-stack
- name CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-ref (param*)>
-<!ATTLIST interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-interceptor-ref (#PCDATA)>
-<!ATTLIST default-interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-action-ref (#PCDATA)>
-<!ATTLIST default-action-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-class-ref (#PCDATA)>
-<!ATTLIST default-class-ref
- class CDATA #REQUIRED
->
-
-<!ELEMENT global-results (result+)>
-
-<!ELEMENT global-exception-mappings (exception-mapping+)>
-
-<!ELEMENT action (param|result|interceptor-ref|exception-mapping)*>
-<!ATTLIST action
- name CDATA #REQUIRED
- class CDATA #IMPLIED
- method CDATA #IMPLIED
- converter CDATA #IMPLIED
->
-
-<!ELEMENT param (#PCDATA)>
-<!ATTLIST param
- name CDATA #REQUIRED
->
-
-<!ELEMENT result (#PCDATA|param)*>
-<!ATTLIST result
- name CDATA #IMPLIED
- type CDATA #IMPLIED
->
-
-<!ELEMENT exception-mapping (#PCDATA|param)*>
-<!ATTLIST exception-mapping
- name CDATA #IMPLIED
- exception CDATA #REQUIRED
- result CDATA #REQUIRED
->
-
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST include
- file CDATA #REQUIRED
->
-
-<!ELEMENT bean (#PCDATA)>
-<!ATTLIST bean
- type CDATA #IMPLIED
- name CDATA #IMPLIED
- class CDATA #REQUIRED
- scope CDATA #IMPLIED
- static CDATA #IMPLIED
- optional CDATA #IMPLIED
->
-
-<!ELEMENT constant (#PCDATA)>
-<!ATTLIST constant
- name CDATA #REQUIRED
- value CDATA #REQUIRED
->
-
-<!ELEMENT unknown-handler-stack (unknown-handler-ref*)>
-<!ELEMENT unknown-handler-ref (#PCDATA)>
-<!ATTLIST unknown-handler-ref
- name CDATA #REQUIRED
->
-
-<!-- END SNIPPET: xworkDtd -->
-
diff --git a/core/src/main/resources/xwork-2.1.dtd b/core/src/main/resources/xwork-2.1.dtd
deleted file mode 100644
index 40db431..0000000
--- a/core/src/main/resources/xwork-2.1.dtd
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!-- START SNIPPET: xworkDtd -->
-
-<!--
- XWork configuration DTD.
- Use the following DOCTYPE
-
- <!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 2.1//EN"
- "http://struts.apache.org/dtds/xwork-2.1.dtd">
--->
-
-<!ELEMENT xwork ((package|include|bean|constant)*, unknown-handler-stack?)>
-
-<!ELEMENT package (result-types?, interceptors?, default-interceptor-ref?, default-action-ref?, default-class-ref?, global-results?, global-exception-mappings?, action*)>
-<!ATTLIST package
- name CDATA #REQUIRED
- extends CDATA #IMPLIED
- namespace CDATA #IMPLIED
- abstract CDATA #IMPLIED
->
-
-<!ELEMENT result-types (result-type+)>
-
-<!ELEMENT result-type (param*)>
-<!ATTLIST result-type
- name CDATA #REQUIRED
- class CDATA #REQUIRED
- default (true|false) "false"
->
-
-<!ELEMENT interceptors (interceptor|interceptor-stack)+>
-
-<!ELEMENT interceptor (param*)>
-<!ATTLIST interceptor
- name CDATA #REQUIRED
- class CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-stack (interceptor-ref*)>
-<!ATTLIST interceptor-stack
- name CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-ref (param*)>
-<!ATTLIST interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-interceptor-ref (#PCDATA)>
-<!ATTLIST default-interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-action-ref (#PCDATA)>
-<!ATTLIST default-action-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-class-ref (#PCDATA)>
-<!ATTLIST default-class-ref
- class CDATA #REQUIRED
->
-
-<!ELEMENT global-results (result+)>
-
-<!ELEMENT global-exception-mappings (exception-mapping+)>
-
-<!ELEMENT action (param|result|interceptor-ref|exception-mapping)*>
-<!ATTLIST action
- name CDATA #REQUIRED
- class CDATA #IMPLIED
- method CDATA #IMPLIED
- converter CDATA #IMPLIED
->
-
-<!ELEMENT param (#PCDATA)>
-<!ATTLIST param
- name CDATA #REQUIRED
->
-
-<!ELEMENT result (#PCDATA|param)*>
-<!ATTLIST result
- name CDATA #IMPLIED
- type CDATA #IMPLIED
->
-
-<!ELEMENT exception-mapping (#PCDATA|param)*>
-<!ATTLIST exception-mapping
- name CDATA #IMPLIED
- exception CDATA #REQUIRED
- result CDATA #REQUIRED
->
-
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST include
- file CDATA #REQUIRED
->
-
-<!ELEMENT bean (#PCDATA)>
-<!ATTLIST bean
- type CDATA #IMPLIED
- name CDATA #IMPLIED
- class CDATA #REQUIRED
- scope CDATA #IMPLIED
- static CDATA #IMPLIED
- optional CDATA #IMPLIED
->
-
-<!ELEMENT constant (#PCDATA)>
-<!ATTLIST constant
- name CDATA #REQUIRED
- value CDATA #REQUIRED
->
-
-<!ELEMENT unknown-handler-stack (unknown-handler-ref*)>
-<!ELEMENT unknown-handler-ref (#PCDATA)>
-<!ATTLIST unknown-handler-ref
- name CDATA #REQUIRED
->
-
-<!-- END SNIPPET: xworkDtd -->
-
diff --git a/core/src/main/resources/xwork-2.3.dtd b/core/src/main/resources/xwork-2.3.dtd
deleted file mode 100644
index 2a81073..0000000
--- a/core/src/main/resources/xwork-2.3.dtd
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!-- START SNIPPET: xworkDtd -->
-
-<!--
- XWork configuration DTD.
- Use the following DOCTYPE
-
- <!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 2.3//EN"
- "http://struts.apache.org/dtds/xwork-2.3.dtd">
--->
-
-<!ELEMENT xwork ((package|include|bean|constant)*, unknown-handler-stack?)>
-<!ATTLIST xwork
- order CDATA #IMPLIED
->
-
-<!ELEMENT package (result-types?, interceptors?, default-interceptor-ref?, default-action-ref?, default-class-ref?, global-results?, global-exception-mappings?, action*)>
-<!ATTLIST package
- name CDATA #REQUIRED
- extends CDATA #IMPLIED
- namespace CDATA #IMPLIED
- abstract CDATA #IMPLIED
- strict-method-invocation CDATA #IMPLIED
->
-
-<!ELEMENT result-types (result-type+)>
-
-<!ELEMENT result-type (param*)>
-<!ATTLIST result-type
- name CDATA #REQUIRED
- class CDATA #REQUIRED
- default (true|false) "false"
->
-
-<!ELEMENT interceptors (interceptor|interceptor-stack)+>
-
-<!ELEMENT interceptor (param*)>
-<!ATTLIST interceptor
- name CDATA #REQUIRED
- class CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-stack (interceptor-ref*)>
-<!ATTLIST interceptor-stack
- name CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-ref (param*)>
-<!ATTLIST interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-interceptor-ref (#PCDATA)>
-<!ATTLIST default-interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-action-ref (#PCDATA)>
-<!ATTLIST default-action-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-class-ref (#PCDATA)>
-<!ATTLIST default-class-ref
- class CDATA #REQUIRED
->
-
-<!ELEMENT global-results (result+)>
-
-<!ELEMENT global-exception-mappings (exception-mapping+)>
-
-<!ELEMENT action ((param|result|interceptor-ref|exception-mapping)*,allowed-methods?)>
-<!ATTLIST action
- name CDATA #REQUIRED
- class CDATA #IMPLIED
- method CDATA #IMPLIED
- converter CDATA #IMPLIED
->
-
-<!ELEMENT param (#PCDATA)>
-<!ATTLIST param
- name CDATA #REQUIRED
->
-
-<!ELEMENT result (#PCDATA|param)*>
-<!ATTLIST result
- name CDATA #IMPLIED
- type CDATA #IMPLIED
->
-
-<!ELEMENT exception-mapping (#PCDATA|param)*>
-<!ATTLIST exception-mapping
- name CDATA #IMPLIED
- exception CDATA #REQUIRED
- result CDATA #REQUIRED
->
-
-<!ELEMENT allowed-methods (#PCDATA)>
-
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST include
- file CDATA #REQUIRED
->
-
-<!ELEMENT bean (#PCDATA)>
-<!ATTLIST bean
- type CDATA #IMPLIED
- name CDATA #IMPLIED
- class CDATA #REQUIRED
- scope CDATA #IMPLIED
- static CDATA #IMPLIED
- optional CDATA #IMPLIED
->
-
-<!ELEMENT constant (#PCDATA)>
-<!ATTLIST constant
- name CDATA #REQUIRED
- value CDATA #REQUIRED
->
-
-<!ELEMENT unknown-handler-stack (unknown-handler-ref*)>
-<!ELEMENT unknown-handler-ref (#PCDATA)>
-<!ATTLIST unknown-handler-ref
- name CDATA #REQUIRED
->
-
-<!-- END SNIPPET: xworkDtd -->
-
diff --git a/core/src/main/resources/xwork-2.5.dtd b/core/src/main/resources/xwork-2.5.dtd
deleted file mode 100644
index 4d61e8a..0000000
--- a/core/src/main/resources/xwork-2.5.dtd
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!-- START SNIPPET: xworkDtd -->
-
-<!--
- XWork configuration DTD.
- Use the following DOCTYPE
-
- <!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 2.5//EN"
- "http://struts.apache.org/dtds/xwork-2.5.dtd">
--->
-
-<!ELEMENT xwork ((package|include|bean|constant)*, unknown-handler-stack?)>
-<!ATTLIST xwork
- order CDATA #IMPLIED
->
-
-<!ELEMENT package (result-types?, interceptors?, default-interceptor-ref?, default-action-ref?, default-class-ref?, global-results?, global-allowed-methods?, global-exception-mappings?, action*)>
-<!ATTLIST package
- name CDATA #REQUIRED
- extends CDATA #IMPLIED
- namespace CDATA #IMPLIED
- abstract CDATA #IMPLIED
- strict-method-invocation (true|false) "true"
->
-
-<!ELEMENT result-types (result-type+)>
-
-<!ELEMENT result-type (param*)>
-<!ATTLIST result-type
- name CDATA #REQUIRED
- class CDATA #REQUIRED
- default (true|false) "false"
->
-
-<!ELEMENT interceptors (interceptor|interceptor-stack)+>
-
-<!ELEMENT interceptor (param*)>
-<!ATTLIST interceptor
- name CDATA #REQUIRED
- class CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-stack (interceptor-ref*)>
-<!ATTLIST interceptor-stack
- name CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-ref (param*)>
-<!ATTLIST interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-interceptor-ref (#PCDATA)>
-<!ATTLIST default-interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-action-ref (#PCDATA)>
-<!ATTLIST default-action-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-class-ref (#PCDATA)>
-<!ATTLIST default-class-ref
- class CDATA #REQUIRED
->
-
-<!ELEMENT global-results (result+)>
-
-<!ELEMENT global-allowed-methods (#PCDATA)>
-
-<!ELEMENT global-exception-mappings (exception-mapping+)>
-
-<!ELEMENT action ((param|result|interceptor-ref|exception-mapping)*,allowed-methods?)>
-<!ATTLIST action
- name CDATA #REQUIRED
- class CDATA #IMPLIED
- method CDATA #IMPLIED
- converter CDATA #IMPLIED
->
-
-<!ELEMENT param (#PCDATA)>
-<!ATTLIST param
- name CDATA #REQUIRED
->
-
-<!ELEMENT result (#PCDATA|param)*>
-<!ATTLIST result
- name CDATA #IMPLIED
- type CDATA #IMPLIED
->
-
-<!ELEMENT exception-mapping (#PCDATA|param)*>
-<!ATTLIST exception-mapping
- name CDATA #IMPLIED
- exception CDATA #REQUIRED
- result CDATA #REQUIRED
->
-
-<!ELEMENT allowed-methods (#PCDATA)>
-
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST include
- file CDATA #REQUIRED
->
-
-<!ELEMENT bean (#PCDATA)>
-<!ATTLIST bean
- type CDATA #IMPLIED
- name CDATA #IMPLIED
- class CDATA #REQUIRED
- scope CDATA #IMPLIED
- static CDATA #IMPLIED
- optional CDATA #IMPLIED
->
-
-<!ELEMENT constant (#PCDATA)>
-<!ATTLIST constant
- name CDATA #REQUIRED
- value CDATA #REQUIRED
->
-
-<!ELEMENT unknown-handler-stack (unknown-handler-ref*)>
-<!ELEMENT unknown-handler-ref (#PCDATA)>
-<!ATTLIST unknown-handler-ref
- name CDATA #REQUIRED
->
-
-<!-- END SNIPPET: xworkDtd -->
-
diff --git a/core/src/main/resources/xwork-2.6.dtd b/core/src/main/resources/xwork-2.6.dtd
deleted file mode 100644
index ba6dddf..0000000
--- a/core/src/main/resources/xwork-2.6.dtd
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
--->
-<!-- START SNIPPET: xworkDtd -->
-
-<!--
- XWork configuration DTD.
- Use the following DOCTYPE
-
- <!DOCTYPE xwork PUBLIC
- "-//Apache Struts//XWork 2.6//EN"
- "http://struts.apache.org/dtds/xwork-2.6.dtd">
--->
-
-<!ELEMENT xwork ((package|include|bean|constant)*, bean-selection?, unknown-handler-stack?)>
-<!ATTLIST xwork
- order CDATA #IMPLIED
->
-
-<!ELEMENT package (result-types?, interceptors?, default-interceptor-ref?, default-action-ref?, default-class-ref?, global-results?, global-allowed-methods?, global-exception-mappings?, action*)>
-<!ATTLIST package
- name CDATA #REQUIRED
- extends CDATA #IMPLIED
- namespace CDATA #IMPLIED
- abstract CDATA #IMPLIED
- strict-method-invocation (true|false) "true"
->
-
-<!ELEMENT result-types (result-type+)>
-
-<!ELEMENT result-type (param*)>
-<!ATTLIST result-type
- name CDATA #REQUIRED
- class CDATA #REQUIRED
- default (true|false) "false"
->
-
-<!ELEMENT interceptors (interceptor|interceptor-stack)+>
-
-<!ELEMENT interceptor (param*)>
-<!ATTLIST interceptor
- name CDATA #REQUIRED
- class CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-stack (interceptor-ref*)>
-<!ATTLIST interceptor-stack
- name CDATA #REQUIRED
->
-
-<!ELEMENT interceptor-ref (param*)>
-<!ATTLIST interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-interceptor-ref (#PCDATA)>
-<!ATTLIST default-interceptor-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-action-ref (#PCDATA)>
-<!ATTLIST default-action-ref
- name CDATA #REQUIRED
->
-
-<!ELEMENT default-class-ref (#PCDATA)>
-<!ATTLIST default-class-ref
- class CDATA #REQUIRED
->
-
-<!ELEMENT global-results (result+)>
-
-<!ELEMENT global-allowed-methods (#PCDATA)>
-
-<!ELEMENT global-exception-mappings (exception-mapping+)>
-
-<!ELEMENT action ((param|result|interceptor-ref|exception-mapping)*,allowed-methods?)>
-<!ATTLIST action
- name CDATA #REQUIRED
- class CDATA #IMPLIED
- method CDATA #IMPLIED
- converter CDATA #IMPLIED
->
-
-<!ELEMENT param (#PCDATA)>
-<!ATTLIST param
- name CDATA #REQUIRED
->
-
-<!ELEMENT result (#PCDATA|param)*>
-<!ATTLIST result
- name CDATA #IMPLIED
- type CDATA #IMPLIED
->
-
-<!ELEMENT exception-mapping (#PCDATA|param)*>
-<!ATTLIST exception-mapping
- name CDATA #IMPLIED
- exception CDATA #REQUIRED
- result CDATA #REQUIRED
->
-
-<!ELEMENT allowed-methods (#PCDATA)>
-
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST include
- file CDATA #REQUIRED
->
-
-<!ELEMENT bean (#PCDATA)>
-<!ATTLIST bean
- type CDATA #IMPLIED
- name CDATA #IMPLIED
- class CDATA #REQUIRED
- scope CDATA #IMPLIED
- static CDATA #IMPLIED
- optional CDATA #IMPLIED
->
-
-<!ELEMENT bean-selection (#PCDATA)>
-<!ATTLIST bean-selection
- name CDATA #IMPLIED
- class CDATA #IMPLIED
->
-
-<!ELEMENT constant (#PCDATA)>
-<!ATTLIST constant
- name CDATA #REQUIRED
- value CDATA #REQUIRED
->
-
-<!ELEMENT unknown-handler-stack (unknown-handler-ref*)>
-<!ELEMENT unknown-handler-ref (#PCDATA)>
-<!ATTLIST unknown-handler-ref
- name CDATA #REQUIRED
->
-
-<!-- END SNIPPET: xworkDtd -->
-
diff --git a/core/src/test/java/com/opensymphony/xwork2/util/ClassLoaderUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/util/ClassLoaderUtilTest.java
index b3ef289..90cc5f1 100644
--- a/core/src/test/java/com/opensymphony/xwork2/util/ClassLoaderUtilTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/util/ClassLoaderUtilTest.java
@@ -39,26 +39,26 @@ public class ClassLoaderUtilTest extends TestCase {
}
public void testGetResources_Multiple() throws IOException {
- Iterator<URL> i = ClassLoaderUtil.getResources("xwork-1.0.dtd", ClassLoaderUtilTest.class, false);
+ Iterator<URL> i = ClassLoaderUtil.getResources("struts-2.0.dtd", ClassLoaderUtilTest.class, false);
assertNotNull(i);
assertTrue(i.hasNext());
URL url = i.next();
- assertTrue(url.toString().endsWith("xwork-1.0.dtd"));
+ assertTrue(url.toString().endsWith("struts-2.0.dtd"));
url = i.next();
- assertTrue(url.toString().endsWith("xwork-1.0.dtd"));
+ assertTrue(url.toString().endsWith("struts-2.0.dtd"));
assertTrue(!i.hasNext());
}
public void testGetResources_Aggregate() throws IOException {
- Iterator<URL> i = ClassLoaderUtil.getResources("xwork-1.0.dtd", ClassLoaderUtilTest.class, true);
+ Iterator<URL> i = ClassLoaderUtil.getResources("struts-2.0.dtd", ClassLoaderUtilTest.class, true);
assertNotNull(i);
assertTrue(i.hasNext());
URL url = i.next();
- assertTrue(url.toString().endsWith("xwork-1.0.dtd"));
+ assertTrue(url.toString().endsWith("struts-2.0.dtd"));
url = i.next();
- assertTrue(url.toString().endsWith("xwork-1.0.dtd"));
+ assertTrue(url.toString().endsWith("struts-2.0.dtd"));
assertTrue(!i.hasNext());
}
diff --git a/core/src/test/java/org/apache/struts2/interceptor/FetchMetadataInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/FetchMetadataInterceptorTest.java
index 2249077..7d7c4bd 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/FetchMetadataInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/FetchMetadataInterceptorTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.struts2.interceptor;
-
import static org.apache.struts2.interceptor.ResourceIsolationPolicy.DEST_EMBED;
import static org.apache.struts2.interceptor.ResourceIsolationPolicy.DEST_OBJECT;
import static org.apache.struts2.interceptor.ResourceIsolationPolicy.DEST_SCRIPT;
@@ -43,6 +42,7 @@ import com.opensymphony.xwork2.config.entities.PackageConfig;
import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.config.StrutsXmlConfigurationProvider;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -155,7 +155,7 @@ public class FetchMetadataInterceptorTest extends XWorkTestCase {
// Perform a multi-step test to confirm (indirectly) that the method parameter injection of setExemptedPaths() for
// the FetchMetadataInterceptor is functioning as expected, when configured appropriately.
// Ensure we're using the specific test configuration, not the default simple configuration.
- XmlConfigurationProvider configurationProvider = new XmlConfigurationProvider("struts-testing.xml");
+ XmlConfigurationProvider configurationProvider = new StrutsXmlConfigurationProvider("struts-testing.xml");
container.inject(configurationProvider);
loadConfigurationProviders(configurationProvider);
diff --git a/core/src/test/resources/org/apache/struts2/dispatcher/ng/struts-no-op.xml b/core/src/test/resources/org/apache/struts2/dispatcher/ng/struts-no-op.xml
index 28c0d65..55a8f32 100644
--- a/core/src/test/resources/org/apache/struts2/dispatcher/ng/struts-no-op.xml
+++ b/core/src/test/resources/org/apache/struts2/dispatcher/ng/struts-no-op.xml
@@ -20,6 +20,6 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
- "http://struts.apache.org/dtds/struts-2.0.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.6//EN"
+ "http://struts.apache.org/dtds/struts-2.6.dtd">
<struts />
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/WW3090-struts.xml b/core/src/test/resources/org/apache/struts2/views/jsp/WW3090-struts.xml
index c6e256f..8e23a20 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/WW3090-struts.xml
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/WW3090-struts.xml
@@ -21,8 +21,8 @@
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
- "http://struts.apache.org/dtds/struts-2.0.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.6//EN"
+ "http://struts.apache.org/dtds/struts-2.6.dtd">
<struts>
diff --git a/core/src/test/resources/xwork-1.0.dtd b/core/src/test/resources/struts-2.0.dtd
similarity index 100%
rename from core/src/test/resources/xwork-1.0.dtd
rename to core/src/test/resources/struts-2.0.dtd
diff --git a/core/src/test/resources/struts.xml b/core/src/test/resources/struts.xml
index cae2eb8..ca6609e 100644
--- a/core/src/test/resources/struts.xml
+++ b/core/src/test/resources/struts.xml
@@ -20,8 +20,8 @@
*/
-->
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
- "http://struts.apache.org/dtds/struts-2.0.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.6//EN"
+ "http://struts.apache.org/dtds/struts-2.6.dtd">
<struts>
<package name="default" extends="struts-default">
<action name="hello" class="com.opensymphony.xwork2.ActionSupport">