rleland 2004/02/06 16:09:33
Modified: conf/test struts-config.xml
src/share/org/apache/struts/tiles/xmlDefinition
XmlParser.java
src/test/org/apache/struts/config TestModuleConfig.java
struts-config-custom-mapping.xml struts-config.xml
web/blank/WEB-INF struts-config.xml validation.xml
web/example/WEB-INF validation.xml
web/examples/WEB-INF struts-config.xml
web/examples/WEB-INF/validator validation.xml
web/exercise-taglib/WEB-INF struts-config.xml
web/tiles-documentation/WEB-INF struts-config.xml
struts-doc-config.xml struts-examples-config.xml
struts-tests-config.xml struts-tutorial-config.xml
web/upload/WEB-INF struts-config.xml
web/validator/WEB-INF struts-config.xml validation.xml
Added: src/test/org/apache/struts/config struts-config-1.1.xml
struts-config-custom-mapping-1.1.xml
Log:
Fix web/blank struts-config.xml the DTD reference was mismatched.
Update DTD references and test both struts 1.1 & 1.2 DTD in unit tests.
Also remove unused validator DTD and tiles DTD from June 2002,
the remaining tiles DTD was from Nov 2002.
Revision Changes Path
1.10 +2 -2 jakarta-struts/conf/test/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/conf/test/struts-config.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- struts-config.xml 14 Mar 2003 01:17:10 -0000 1.9
+++ struts-config.xml 7 Feb 2004 00:09:33 -0000 1.10
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+ "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<!--
This is a test Struts configuration file
1.14 +3 -9
jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java
Index: XmlParser.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XmlParser.java 13 Jan 2004 12:48:52 -0000 1.13
+++ XmlParser.java 7 Feb 2004 00:09:33 -0000 1.14
@@ -90,12 +90,6 @@
* <strong>MUST</strong> be an even number of Strings in this list!
*/
protected String registrations[] = {
- // pre 1.1
- "-//Apache Software Foundation//DTD Tiles Configuration//EN",
- "/org/apache/struts/resources/tiles-config_1_1.dtd",
- "-//Apache Software Foundation//DTD Components Configuration//EN",
- "/org/apache/struts/resources/tiles-config.dtd",
- // version 1.1
"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN",
"/org/apache/struts/resources/tiles-config_1_1.dtd",
};
1.7 +68 -38
jakarta-struts/src/test/org/apache/struts/config/TestModuleConfig.java
Index: TestModuleConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/config/TestModuleConfig.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestModuleConfig.java 22 Jan 2004 04:54:13 -0000 1.6
+++ TestModuleConfig.java 7 Feb 2004 00:09:33 -0000 1.7
@@ -135,12 +135,7 @@
// ------------------------------------------------ Individual Test Methods
-
-
- /**
- * Test parsing of a struts-config.xml file.
- */
- public void testParse() {
+ private void parseConfig(String publicId, String entityURL,String strutsConfig)
{
// Prepare a Digester for parsing a struts-config.xml file
@@ -150,15 +145,14 @@
digester.setValidating(true);
digester.addRuleSet(new ConfigRuleSet());
digester.register
- ("-//Apache Software Foundation//DTD Struts Configuration 1.1//EN",
+ (publicId,
this.getClass().getResource
- ("/org/apache/struts/resources/struts-config_1_1.dtd").toString());
+ (entityURL).toString());
// Parse the test struts-config.xml file
try {
- InputStream input = this.getClass().getResourceAsStream
- ("/org/apache/struts/config/struts-config.xml");
- assertNotNull("Got an input stream for struts-config.xml", input);
+ InputStream input = this.getClass().getResourceAsStream(strutsConfig);
+ assertNotNull("Got an input stream for "+strutsConfig, input);
digester.parse(input);
input.close();
} catch (Throwable t) {
@@ -166,6 +160,34 @@
fail("Parsing threw exception: " + t);
}
+
+
+ }
+
+
+ /**
+ * Test parsing of a struts-config.xml file.
+ */
+ public void testParse() {
+
+ testParseBase("-//Apache Software Foundation//DTD Struts Configuration
1.2//EN",
+ "/org/apache/struts/resources/struts-config_1_2.dtd",
+ "/org/apache/struts/config/struts-config.xml");
+
+ }
+
+ public void testParse1_1() {
+
+ testParseBase("-//Apache Software Foundation//DTD Struts Configuration
1.1//EN",
+ "/org/apache/struts/resources/struts-config_1_1.dtd",
+ "/org/apache/struts/config/struts-config-1.1.xml");
+
+ }
+
+ public void testParseBase(String publicId, String entityURL,String
strutsConfig) {
+
+ parseConfig(publicId,entityURL, strutsConfig);
+
// Perform assertion tests on the parsed information
DataSourceConfig dsc =
@@ -198,39 +220,47 @@
}
+
/**
* Tests a struts-config.xml that contains a custom mapping and property.
*/
public void testCustomMappingParse() {
+ // Prepare a Digester for parsing a struts-config.xml file
+ testCustomMappingParseBase
+ ("-//Apache Software Foundation//DTD Struts Configuration 1.2//EN",
+ "/org/apache/struts/resources/struts-config_1_2.dtd",
+ "/org/apache/struts/config/struts-config-custom-mapping.xml");
+ }
+
+ /**
+ * Tests a struts-config.xml that contains a custom mapping and property.
+ */
+ public void testCustomMappingParse1_1() {
- // Prepare a Digester for parsing a struts-config.xml file
- Digester digester = new Digester();
- digester.push(config);
- digester.setNamespaceAware(true);
- digester.setValidating(true);
- digester.addRuleSet(new ConfigRuleSet());
- digester.register
- ("-//Apache Software Foundation//DTD Struts Configuration 1.1//EN",
- this.getClass().getResource
- ("/org/apache/struts/resources/struts-config_1_1.dtd").toString());
- // Parse the test struts-config.xml file
- try {
- InputStream input = this.getClass().getResourceAsStream
- ("/org/apache/struts/config/struts-config-custom-mapping.xml");
- assertNotNull("Got an input stream for struts-config.xml", input);
- digester.parse(input);
- input.close();
- } catch (Throwable t) {
- t.printStackTrace(System.out);
- fail("Parsing threw exception: " + t);
- }
+ // Prepare a Digester for parsing a struts-config.xml file
+ testCustomMappingParseBase
+ ("-//Apache Software Foundation//DTD Struts Configuration 1.1//EN",
+ "/org/apache/struts/resources/struts-config_1_1.dtd",
+ "/org/apache/struts/config/struts-config-custom-mapping.xml");
- // Perform assertion tests on the parsed information
- CustomMappingTest map =
(CustomMappingTest)config.findActionConfig("/editRegistration");
- assertNotNull("Cannot find editRegistration mapping", map);
- assertTrue("The custom mapping attribute has not been set",
map.getPublic());
+ }
+
+
+ /**
+ * Tests a struts-config.xml that contains a custom mapping and property.
+ */
+ private void testCustomMappingParseBase(String publicId, String
entityURL,String strutsConfig) {
+
+
+ parseConfig(publicId,entityURL, strutsConfig);
+
+ // Perform assertion tests on the parsed information
+ CustomMappingTest map =
(CustomMappingTest)config.findActionConfig("/editRegistration");
+ assertNotNull("Cannot find editRegistration mapping", map);
+ assertTrue("The custom mapping attribute has not been set",
map.getPublic());
+
+ }
- }
}
1.2 +3 -3
jakarta-struts/src/test/org/apache/struts/config/struts-config-custom-mapping.xml
Index: struts-config-custom-mapping.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/config/struts-config-custom-mapping.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- struts-config-custom-mapping.xml 9 Dec 2003 21:40:43 -0000 1.1
+++ struts-config-custom-mapping.xml 7 Feb 2004 00:09:33 -0000 1.2
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+ "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<!--
This is the Struts configuration file for the example application,
@@ -21,7 +21,7 @@
<!-- ========== Data Source Configuration =============================== -->
<data-sources>
- <data-source>
+ <data-source type="org.apache.commons.dbcp.BasicDataSource" >
<set-property property="autoCommit"
value="false"/>
<set-property property="description"
1.2 +3 -3
jakarta-struts/src/test/org/apache/struts/config/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/config/struts-config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- struts-config.xml 26 Dec 2001 21:55:55 -0000 1.1
+++ struts-config.xml 7 Feb 2004 00:09:33 -0000 1.2
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+ "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<!--
This is the Struts configuration file for the example application,
@@ -21,7 +21,7 @@
<!-- ========== Data Source Configuration =============================== -->
<data-sources>
- <data-source>
+ <data-source type="org.apache.commons.dbcp.BasicDataSource">
<set-property property="autoCommit"
value="false"/>
<set-property property="description"
1.1
jakarta-struts/src/test/org/apache/struts/config/struts-config-1.1.xml
Index: struts-config-1.1.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<!--
This is the Struts configuration file for the example application,
using the proposed new syntax.
NOTE: You would only flesh out the details in the "form-bean"
declarations if you had a generator tool that used them to create
the corresponding Java classes for you. Otherwise, you would
need only the "form-bean" element itself, with the corresponding
"name" and "type" attributes.
-->
<struts-config>
<!-- ========== Data Source Configuration =============================== -->
<data-sources>
<data-source type="org.apache.commons.dbcp.BasicDataSource">
<set-property property="autoCommit"
value="false"/>
<set-property property="description"
value="Example Data Source Configuration"/>
<set-property property="driverClass"
value="org.postgresql.Driver"/>
<set-property property="maxCount"
value="4"/>
<set-property property="minCount"
value="2"/>
<set-property property="password"
value="mypassword"/>
<set-property property="url"
value="jdbc:postgresql://localhost/mydatabase"/>
<set-property property="user"
value="myusername"/>
</data-source>
</data-sources>
<!-- ========== Form Bean Definitions =================================== -->
<form-beans>
<!-- Logon form bean -->
<form-bean name="logonForm"
type="org.apache.struts.webapp.example.LogonForm"/>
<!-- Registration form bean -->
<form-bean name="registrationForm"
type="org.apache.struts.webapp.example.RegistrationForm"/>
<!-- Subscription form bean -->
<form-bean name="subscriptionForm"
type="org.apache.struts.webapp.example.SubscriptionForm"/>
</form-beans>
<!-- ========== Global Forward Definitions ============================== -->
<global-forwards>
<forward name="logoff" path="/logoff.do"/>
<forward name="logon" path="/logon.jsp"/>
<forward name="success" path="/mainMenu.jsp"/>
</global-forwards>
<!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
<!-- Edit user registration -->
<action path="/editRegistration"
type="org.apache.struts.webapp.example.EditRegistrationAction"
attribute="registrationForm"
scope="request"
validate="false">
<forward name="success" path="/registration.jsp"/>
</action>
<!-- Edit mail subscription -->
<action path="/editSubscription"
type="org.apache.struts.webapp.example.EditSubscriptionAction"
attribute="subscriptionForm"
scope="request"
validate="false">
<forward name="failure" path="/mainMenu.jsp"/>
<forward name="success" path="/subscription.jsp"/>
</action>
<!-- Process a user logoff -->
<action path="/logoff"
type="org.apache.struts.webapp.example.LogoffAction">
<forward name="success" path="/index.jsp"/>
</action>
<!-- Process a user logon -->
<action path="/logon"
type="org.apache.struts.webapp.example.LogonAction"
name="logonForm"
scope="request"
input="/logon.jsp">
</action>
<!-- Save user registration -->
<action path="/saveRegistration"
type="org.apache.struts.webapp.example.SaveRegistrationAction"
name="registrationForm"
scope="request"
input="/registration.jsp"/>
<!-- Save mail subscription -->
<action path="/saveSubscription"
type="org.apache.struts.webapp.example.SaveSubscriptionAction"
name="subscriptionForm"
scope="request"
input="/subscription.jsp">
<forward name="success" path="/editRegistration.do?action=Edit"/>
</action>
<!-- Display the "walking tour" documentation -->
<action path="/tour"
forward="/tour.htm">
</action>
<!-- The standard administrative actions available with Struts -->
<!-- These would be either omitted or protected by security -->
<!-- in a real application deployment -->
<action path="/admin/addFormBean"
type="org.apache.struts.actions.AddFormBeanAction"/>
<action path="/admin/addForward"
type="org.apache.struts.actions.AddForwardAction"/>
<action path="/admin/addMapping"
type="org.apache.struts.actions.AddMappingAction"/>
<action path="/admin/reload"
type="org.apache.struts.actions.ReloadAction"/>
<action path="/admin/removeFormBean"
type="org.apache.struts.actions.RemoveFormBeanAction"/>
<action path="/admin/removeForward"
type="org.apache.struts.actions.RemoveForwardAction"/>
<action path="/admin/removeMapping"
type="org.apache.struts.actions.RemoveMappingAction"/>
</action-mappings>
</struts-config>
1.1
jakarta-struts/src/test/org/apache/struts/config/struts-config-custom-mapping-1.1.xml
Index: struts-config-custom-mapping-1.1.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
<!--
This is the Struts configuration file for the example application,
using the proposed new syntax.
NOTE: You would only flesh out the details in the "form-bean"
declarations if you had a generator tool that used them to create
the corresponding Java classes for you. Otherwise, you would
need only the "form-bean" element itself, with the corresponding
"name" and "type" attributes.
-->
<struts-config>
<!-- ========== Data Source Configuration =============================== -->
<data-sources>
<data-source>
<set-property property="autoCommit"
value="false"/>
<set-property property="description"
value="Example Data Source Configuration"/>
<set-property property="driverClass"
value="org.postgresql.Driver"/>
<set-property property="maxCount"
value="4"/>
<set-property property="minCount"
value="2"/>
<set-property property="password"
value="mypassword"/>
<set-property property="url"
value="jdbc:postgresql://localhost/mydatabase"/>
<set-property property="user"
value="myusername"/>
</data-source>
</data-sources>
<!-- ========== Form Bean Definitions =================================== -->
<form-beans>
<!-- Logon form bean -->
<form-bean name="logonForm"
type="org.apache.struts.webapp.example.LogonForm"/>
<!-- Registration form bean -->
<form-bean name="registrationForm"
type="org.apache.struts.webapp.example.RegistrationForm"/>
<!-- Subscription form bean -->
<form-bean name="subscriptionForm"
type="org.apache.struts.webapp.example.SubscriptionForm"/>
</form-beans>
<!-- ========== Global Forward Definitions ============================== -->
<global-forwards>
<forward name="logoff" path="/logoff.do"/>
<forward name="logon" path="/logon.jsp"/>
<forward name="success" path="/mainMenu.jsp"/>
</global-forwards>
<!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
<!-- Edit user registration -->
<action path="/editRegistration"
type="org.apache.struts.webapp.example.EditRegistrationAction"
attribute="registrationForm"
scope="request"
validate="false"
className="org.apache.struts.config.CustomMappingTest">
<set-property property="public" value="true"/>
<forward name="success" path="/registration.jsp"/>
</action>
<!-- Edit mail subscription -->
<action path="/editSubscription"
type="org.apache.struts.webapp.example.EditSubscriptionAction"
attribute="subscriptionForm"
scope="request"
validate="false">
<forward name="failure" path="/mainMenu.jsp"/>
<forward name="success" path="/subscription.jsp"/>
</action>
<!-- Process a user logoff -->
<action path="/logoff"
type="org.apache.struts.webapp.example.LogoffAction">
<forward name="success" path="/index.jsp"/>
</action>
<!-- Process a user logon -->
<action path="/logon"
type="org.apache.struts.webapp.example.LogonAction"
name="logonForm"
scope="request"
input="/logon.jsp">
</action>
<!-- Save user registration -->
<action path="/saveRegistration"
type="org.apache.struts.webapp.example.SaveRegistrationAction"
name="registrationForm"
scope="request"
input="/registration.jsp"/>
<!-- Save mail subscription -->
<action path="/saveSubscription"
type="org.apache.struts.webapp.example.SaveSubscriptionAction"
name="subscriptionForm"
scope="request"
input="/subscription.jsp">
<forward name="success" path="/editRegistration.do?action=Edit"/>
</action>
<!-- Display the "walking tour" documentation -->
<action path="/tour"
forward="/tour.htm">
</action>
<!-- The standard administrative actions available with Struts -->
<!-- These would be either omitted or protected by security -->
<!-- in a real application deployment -->
<action path="/admin/addFormBean"
type="org.apache.struts.actions.AddFormBeanAction"/>
<action path="/admin/addForward"
type="org.apache.struts.actions.AddForwardAction"/>
<action path="/admin/addMapping"
type="org.apache.struts.actions.AddMappingAction"/>
<action path="/admin/reload"
type="org.apache.struts.actions.ReloadAction"/>
<action path="/admin/removeFormBean"
type="org.apache.struts.actions.RemoveFormBeanAction"/>
<action path="/admin/removeForward"
type="org.apache.struts.actions.RemoveForwardAction"/>
<action path="/admin/removeMapping"
type="org.apache.struts.actions.RemoveMappingAction"/>
</action-mappings>
</struts-config>
1.14 +1 -1 jakarta-struts/web/blank/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/blank/WEB-INF/struts-config.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- struts-config.xml 6 Feb 2004 12:18:39 -0000 1.13
+++ struts-config.xml 7 Feb 2004 00:09:33 -0000 1.14
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<!--
1.4 +2 -2 jakarta-struts/web/blank/WEB-INF/validation.xml
Index: validation.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/blank/WEB-INF/validation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- validation.xml 26 Oct 2002 00:25:24 -0000 1.3
+++ validation.xml 7 Feb 2004 00:09:33 -0000 1.4
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE form-validation PUBLIC
- "-//Apache Software Foundation//DTD Commons Validator Rules Configuration
1.0//EN"
- "http://jakarta.apache.org/commons/dtds/validator_1_0.dtd";>
+ "-//Apache Software Foundation//DTD Commons Validator Rules Configuration
1.1//EN"
+ "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd";>
<form-validation>
1.11 +3 -3 jakarta-struts/web/example/WEB-INF/validation.xml
Index: validation.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/example/WEB-INF/validation.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- validation.xml 25 Oct 2003 01:37:12 -0000 1.10
+++ validation.xml 7 Feb 2004 00:09:33 -0000 1.11
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE form-validation PUBLIC
- "-//Apache Software Foundation//DTD Commons Validator Rules Configuration
1.0//EN"
- "http://jakarta.apache.org/commons/dtds/validator_1_0.dtd";>
+ "-//Apache Software Foundation//DTD Commons Validator Rules Configuration
1.1//EN"
+ "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd";>
<!--
Validation Rules for the Struts Example Web Application
1.3 +2 -2 jakarta-struts/web/examples/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/examples/WEB-INF/struts-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- struts-config.xml 9 Jan 2004 21:50:59 -0000 1.2
+++ struts-config.xml 7 Feb 2004 00:09:33 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE struts-config SYSTEM
"http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+<!DOCTYPE struts-config SYSTEM
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<!--
Default configuration file for examples application.
Each module also has its own struts-config under: /WEB-INF/$MODULE/
1.2 +1 -1 jakarta-struts/web/examples/WEB-INF/validator/validation.xml
Index: validation.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/examples/WEB-INF/validator/validation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- validation.xml 8 Jan 2004 16:23:45 -0000 1.1
+++ validation.xml 7 Feb 2004 00:09:33 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE form-validation SYSTEM
"http://jakarta.apache.org/commons/dtds/validator_1_0.dtd";>
+<!DOCTYPE form-validation SYSTEM
"http://jakarta.apache.org/commons/dtds/validator_1_1.dtd";>
<form-validation>
<global>
<constant>
1.9 +2 -2 jakarta-struts/web/exercise-taglib/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/exercise-taglib/WEB-INF/struts-config.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- struts-config.xml 1 Jan 2004 13:47:40 -0000 1.8
+++ struts-config.xml 7 Feb 2004 00:09:33 -0000 1.9
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+ "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<struts-config>
1.7 +2 -2 jakarta-struts/web/tiles-documentation/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/struts-config.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- struts-config.xml 21 Jul 2003 15:23:34 -0000 1.6
+++ struts-config.xml 7 Feb 2004 00:09:33 -0000 1.7
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+ "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<!--
This is the Struts configuration file for the
Tiles-documentation application
1.3 +2 -2
jakarta-struts/web/tiles-documentation/WEB-INF/struts-doc-config.xml
Index: struts-doc-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/struts-doc-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- struts-doc-config.xml 28 Jun 2003 00:22:30 -0000 1.2
+++ struts-doc-config.xml 7 Feb 2004 00:09:33 -0000 1.3
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+ "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<!--
This is the Struts configuration file for the example application,
using the proposed new syntax.
1.5 +2 -2
jakarta-struts/web/tiles-documentation/WEB-INF/struts-examples-config.xml
Index: struts-examples-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/struts-examples-config.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- struts-examples-config.xml 21 Jul 2003 15:23:34 -0000 1.4
+++ struts-examples-config.xml 7 Feb 2004 00:09:33 -0000 1.5
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+ "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<!--
This is the Struts configuration file for the
Tiles-documentation "examples" application
1.5 +2 -2
jakarta-struts/web/tiles-documentation/WEB-INF/struts-tests-config.xml
Index: struts-tests-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/struts-tests-config.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- struts-tests-config.xml 16 May 2003 10:06:45 -0000 1.4
+++ struts-tests-config.xml 7 Feb 2004 00:09:33 -0000 1.5
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+ "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<!--
This is the Struts configuration file for the example application,
using the proposed new syntax.
1.3 +2 -2
jakarta-struts/web/tiles-documentation/WEB-INF/struts-tutorial-config.xml
Index: struts-tutorial-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/web/tiles-documentation/WEB-INF/struts-tutorial-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- struts-tutorial-config.xml 21 Jul 2003 15:23:34 -0000 1.2
+++ struts-tutorial-config.xml 7 Feb 2004 00:09:33 -0000 1.3
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+ "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<!--
This is the Struts configuration file for the
Tiles-documentation "tutorial" application
1.7 +2 -2 jakarta-struts/web/upload/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/upload/WEB-INF/struts-config.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- struts-config.xml 8 Aug 2002 23:02:43 -0000 1.6
+++ struts-config.xml 7 Feb 2004 00:09:33 -0000 1.7
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+ "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<struts-config>
1.7 +2 -2 jakarta-struts/web/validator/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/WEB-INF/struts-config.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- struts-config.xml 1 Jan 2004 13:46:29 -0000 1.6
+++ struts-config.xml 7 Feb 2004 00:09:33 -0000 1.7
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+ "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
<!--
This is the Struts configuration file for the example application,
1.11 +2 -2 jakarta-struts/web/validator/WEB-INF/validation.xml
Index: validation.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/web/validator/WEB-INF/validation.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- validation.xml 31 Dec 2003 00:32:58 -0000 1.10
+++ validation.xml 7 Feb 2004 00:09:33 -0000 1.11
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE form-validation PUBLIC
- "-//Apache Software Foundation//DTD Commons Validator Rules Configuration
1.0//EN"
- "http://jakarta.apache.org/commons/dtds/validator_1_0.dtd";>
+ "-//Apache Software Foundation//DTD Commons Validator Rules Configuration
1.1//EN"
+ "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd";>
<form-validation>
<global>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
