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 012efd3cd..047fc0077 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java @@ -77,6 +77,7 @@ public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider { reloadKey = "configurationReload-"+filename; Map dtdMappings = new HashMap(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"); setDtdMappings(dtdMappings); File file = new File(filename); if (file.getParent() != null) { diff --git a/core/src/main/resources/struts-2.1.dtd b/core/src/main/resources/struts-2.1.dtd new file mode 100644 index 000000000..2a9e8188b --- /dev/null +++ b/core/src/main/resources/struts-2.1.dtd @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index 007e212d4..479ed493b 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -22,8 +22,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.1//EN" + "http://struts.apache.org/dtds/struts-2.1.dtd">