Commits

rainerh  committed 8710757

Version of Xwork DTD
Issue number: WW-1140
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@783e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits 14678a3

Comments (0)

Files changed (24)

File src/java/com/opensymphony/xwork/config/providers/XmlConfigurationProvider.java

             db = dbf.newDocumentBuilder();
             db.setEntityResolver(new EntityResolver() {
                 public InputSource resolveEntity(String publicId, String systemId) {
-                    if ("-//OpenSymphony Group//XWork 1.0//EN".equals(publicId)) {
+                    if ("-//OpenSymphony Group//XWork 1.1.1//EN".equals(publicId)) {
                         return new InputSource(ClassLoaderUtil.getResourceAsStream("xwork-1.1.1.dtd", XmlConfigurationProvider.class));
                     }
+                    else if ("-//OpenSymphony Group//XWork 1.1//EN".equals(publicId)) {
+                        return new InputSource(ClassLoaderUtil.getResourceAsStream("xwork-1.1.dtd", XmlConfigurationProvider.class));
+                    }
+                    else if ("-//OpenSymphony Group//XWork 1.0//EN".equals(publicId)) {
+                        return new InputSource(ClassLoaderUtil.getResourceAsStream("xwork-1.0.dtd", XmlConfigurationProvider.class));
+                    }
 
                     return null;
                 }

File src/java/xwork-1.1.1.dtd

    Use the following DOCTYPE
    
    <!DOCTYPE xwork PUBLIC 
-	"-//OpenSymphony Group//XWork 1.0//EN" 
-	"http://www.opensymphony.com/xwork/xwork-1.1.dtd">
+	"-//OpenSymphony Group//XWork 1.1.1//EN"
+	"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
 -->
 
 <!ELEMENT xwork (package|include)*>

File src/java/xwork-1.1.dtd

    Use the following DOCTYPE
    
    <!DOCTYPE xwork PUBLIC 
-	"-//OpenSymphony Group//XWork 1.0//EN" 
+	"-//OpenSymphony Group//XWork 1.1//EN" 
 	"http://www.opensymphony.com/xwork/xwork-1.1.dtd">
 -->
 

File src/java/xwork-default.xml

-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN" "http://www.opensymphony.com/xwork/xwork-1.1.dtd">
+<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
 
 <xwork>
     <package name="xwork-default">

File src/test/com/opensymphony/xwork/config/providers/xwork-test-actions.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
     "http://www.opensymphony.com/xwork/xwork-1.1.dtd"
  >
 

File src/test/com/opensymphony/xwork/config/providers/xwork-test-bad-inheritance.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
 
 <xwork>

File src/test/com/opensymphony/xwork/config/providers/xwork-test-basic-packages.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
 
 <xwork>

File src/test/com/opensymphony/xwork/config/providers/xwork-test-default-package.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
 
 <xwork>

File src/test/com/opensymphony/xwork/config/providers/xwork-test-exception-mappings.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
     "http://www.opensymphony.com/xwork/xwork-1.1.dtd"
  >
 

File src/test/com/opensymphony/xwork/config/providers/xwork-test-interceptor-defaultref.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
 
 <xwork>

File src/test/com/opensymphony/xwork/config/providers/xwork-test-interceptor-inheritance.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
 
 <xwork>

File src/test/com/opensymphony/xwork/config/providers/xwork-test-interceptors-basic.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
 
 <xwork>

File src/test/com/opensymphony/xwork/config/providers/xwork-test-interceptors-spring.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
 
 <xwork>

File src/test/com/opensymphony/xwork/config/providers/xwork-test-multilevel.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
 
 <xwork>

File src/test/com/opensymphony/xwork/config/providers/xwork-test-package-inheritance.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
 
 <xwork>

File src/test/com/opensymphony/xwork/config/providers/xwork-test-result-inheritance.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
 
 <xwork>

File src/test/com/opensymphony/xwork/config/providers/xwork-test-result-types.xml

 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE xwork PUBLIC 
-	"-//OpenSymphony Group//XWork 1.0//EN" 
+	"-//OpenSymphony Group//XWork 1.1.1//EN"
 	"http://www.opensymphony.com/xwork/xwork-1.1.dtd">
  
 <xwork>

File src/test/com/opensymphony/xwork/config/providers/xwork-test-results.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
 
 <xwork>

File src/test/com/opensymphony/xwork/spring/actionContext-xwork.xml

-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN" "file:///temp/ross/xwork/src/test/java/com/atlassian/xwork/ext/xwork-1.0.dtd">
-
+<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
 <xwork>
     <package name="default">
         <result-types>

File src/test/com/opensymphony/xwork/spring/xwork-autowire.xml

-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN"
-"file:///temp/ross/xwork/src/test/java/com/atlassian/xwork/pserver/xwork-1.0.dtd">
-
+<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
 <xwork>
     <package name="default">
         <result-types>

File src/test/com/opensymphony/xwork/spring/xwork-ext.xml

-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.0//EN" "http://www.opensymphony.com/xwork/xwork-1.0.dtd">
+<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
 
 <xwork>
     <package name="default" externalReferenceResolver="com.opensymphony.xwork.spring.SpringExternalReferenceResolver">

File src/test/includeTest.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
 
 <xwork>

File src/test/xwork-default.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.0.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
 
 <xwork>

File src/test/xwork.xml

 <!DOCTYPE xwork PUBLIC
-    "-//OpenSymphony Group//XWork 1.0//EN"
-    "http://www.opensymphony.com/xwork/xwork-1.1.dtd"
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd"
  >
  <!-- "file:///temp/ross/xwork/src/etc/xwork-1.0.dtd"  -->