Author: niallp
Date: Sun May 28 23:51:32 2006
New Revision: 410032
URL: http://svn.apache.org/viewvc?rev=410032&view=rev
Log:
Port fix for STR-2877 to 1.2.x branch - TestModuleConfig fails when run offline
Modified:
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/TestModuleConfig.java
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/struts-config-1.1.xml
Modified:
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/TestModuleConfig.java
URL:
http://svn.apache.org/viewvc/struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/TestModuleConfig.java?rev=410032&r1=410031&r2=410032&view=diff
==============================================================================
---
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/TestModuleConfig.java
(original)
+++
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/TestModuleConfig.java
Sun May 28 23:51:32 2006
@@ -206,7 +206,7 @@
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");
+
"/org/apache/struts/config/struts-config-custom-mapping-1.1.xml");
}
Modified:
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/struts-config-1.1.xml
URL:
http://svn.apache.org/viewvc/struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/struts-config-1.1.xml?rev=410032&r1=410031&r2=410032&view=diff
==============================================================================
---
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/struts-config-1.1.xml
(original)
+++
struts/action/branches/STRUTS_1_2_BRANCH/src/test/org/apache/struts/config/struts-config-1.1.xml
Sun May 28 23:51:32 2006
@@ -1,8 +1,8 @@
<?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";>
+ "-//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,
