geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r345414 - in /geronimo/trunk/modules/web-builder/src: test-resources/plans/tomcat-pre.xml test-resources/plans/tomcat-pre2.xml test-resources/plans/tomcat-pre3.xml test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
Date Fri, 18 Nov 2005 02:51:57 GMT
Author: djencks
Date: Thu Nov 17 18:51:54 2005
New Revision: 345414

URL: http://svn.apache.org/viewcvs?rev=345414&view=rev
Log:
Fix the namespace in the test to match the actual schema namespace

Modified:
    geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre.xml
    geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml
    geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml
    geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java

Modified: geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre.xml?rev=345414&r1=345413&r2=345414&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre.xml (original)
+++ geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre.xml Thu Nov 17
18:51:54 2005
@@ -2,7 +2,7 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0" configId="org/apache/jetspeed/web">
     <context-priority-classloader>false</context-priority-classloader>
     <container-config>
-        <tomcat xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat/config-1.0">
+        <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0">
             <cross-context/>
             <tomcat-realm>TomcatJAASRealm</tomcat-realm>
         </tomcat>

Modified: geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml?rev=345414&r1=345413&r2=345414&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml (original)
+++ geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml Thu Nov 17
18:51:54 2005
@@ -2,7 +2,7 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0" configId="org/apache/jetspeed/web">
     <context-priority-classloader>false</context-priority-classloader>
     <container-config>
-        <tomcat xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat/config-1.0">
+        <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0">
             <cross-context/>
             <tomcat-realm>TomcatJAASRealm</tomcat-realm>
         </tomcat>

Modified: geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml?rev=345414&r1=345413&r2=345414&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml (original)
+++ geronimo/trunk/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml Thu Nov 17
18:51:54 2005
@@ -2,7 +2,7 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/web" configId="org/apache/jetspeed/web">
     <context-priority-classloader>false</context-priority-classloader>
     <container-config>
-        <tomcat xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat/config-1.0">
+        <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0">
             <cross-context/>
             <tomcat-realm>TomcatJAASRealm</tomcat-realm>
         </tomcat>

Modified: geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java?rev=345414&r1=345413&r2=345414&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
(original)
+++ geronimo/trunk/modules/web-builder/src/test/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
Thu Nov 17 18:51:54 2005
@@ -47,7 +47,7 @@
         URL expectedOutputXml = classLoader.getResource("plans/tomcat-post.xml");
         XmlObject rawPlan = XmlObject.Factory.parse(srcXml);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
-        XmlObject webPlan = new GenericToSpecificPlanConverter("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat/config-1.0",
+        XmlObject webPlan = new GenericToSpecificPlanConverter("http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0",
                 "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0", "tomcat").convertToSpecificPlan(rawPlan);
 
 //        System.out.println(webPlan.toString());



Mime
View raw message