Return-Path: 
 <scm-return-8635-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 79394 invoked from network); 18 Nov 2005 02:52:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 Nov 2005 02:52:20 -0000
Received: (qmail 60465 invoked by uid 500); 18 Nov 2005 02:52:20 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 60450 invoked by uid 500); 18 Nov 2005 02:52:19 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 60439 invoked by uid 99); 18 Nov 2005 02:52:19 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Nov 2005 18:52:19 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Thu, 17 Nov 2005 18:53:53 -0800
Received: (qmail 79339 invoked by uid 65534); 18 Nov 2005 02:51:58 -0000
Message-ID: <20051118025158.79338.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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());