geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r577890 - in /geronimo/server: branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/ branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/ branches/2.0/modules/geronimo-jetty6-build...
Date Thu, 20 Sep 2007 19:37:29 GMT
Author: vamsic007
Date: Thu Sep 20 12:37:26 2007
New Revision: 577890

URL: http://svn.apache.org/viewvc?rev=577890&view=rev
Log:
GERONIMO-2964 Cannot specify the Tomcat work directory for a web application
  o Renamed the schemas that changed

Added:
    geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.1.xsd
      - copied, changed from r577853, geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd
    geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd
      - copied, changed from r577853, geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd
    geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd
      - copied, changed from r577853, geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.1.xsd
      - copied, changed from r577801, geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd
      - copied, changed from r577801, geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd
      - copied, changed from r577801, geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd
Removed:
    geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd
    geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd
    geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd
Modified:
    geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java
    geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-post.xml
    geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsdconfig/xmlconfig.xml
    geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml
    geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml
    geronimo/server/branches/2.0/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
    geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd
    geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsdconfig/xmlconfig.xml
    geronimo/server/branches/2.0/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
    geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml
    geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsdconfig/xmlconfig.xml
    geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
    geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-post.xml
    geronimo/server/branches/2.0/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/branches/2.0/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/branches/2.0/testsupport/test-deployment-javaee_5/test-war-javaee_5/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java
    geronimo/server/trunk/modules/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-post.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsdconfig/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml
    geronimo/server/trunk/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
    geronimo/server/trunk/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsdconfig/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsdconfig/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-post.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-war-javaee_5/src/main/webapp/WEB-INF/geronimo-web.xml

Modified: geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java Thu Sep 20 12:37:26 2007
@@ -66,16 +66,19 @@
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security", "http://geronimo.apache.org/xml/ns/security-1.2");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.1", "http://geronimo.apache.org/xml/ns/security-2.0");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.2", "http://geronimo.apache.org/xml/ns/security-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty/config", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty/config-1.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat/config", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat/config-1.0");
         NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar", "http://openejb.apache.org/xml/ns/openejb-jar-2.2");
         NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar-2.1", "http://openejb.apache.org/xml/ns/openejb-jar-2.2");

Modified: geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-post.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-post.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-post.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-post.xml Thu Sep 20 12:37:26 2007
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
        xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2"
    xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
    <dep:environment>

Copied: geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.1.xsd (from r577853, geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.1.xsd?p2=geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.1.xsd&p1=geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd&r1=577853&r2=577890&rev=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.1.xsd Thu Sep 20 12:37:26 2007
@@ -16,8 +16,10 @@
     limitations under the License.
 -->
 
-<xs:schema xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0"
+<!-- $Rev$ $Date$ -->
+
+<xs:schema xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
     xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"

Modified: geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsdconfig/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsdconfig/xmlconfig.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsdconfig/xmlconfig.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsdconfig/xmlconfig.xml Thu Sep 20 12:37:26 2007
@@ -18,7 +18,7 @@
 -->
 <!-- @version $Rev$ $Date$ -->
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1">
         <xb:package>org.apache.geronimo.xbeans.geronimo.web.jetty</xb:package>
         <xb:prefix>Jetty</xb:prefix>
     </xb:namespace>

Modified: geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml Thu Sep 20 12:37:26 2007
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1"
          xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
     <dep:environment>

Modified: geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml Thu Sep 20 12:37:26 2007
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
     <environment>
         <moduleId>
             <groupId>foo</groupId>

Modified: geronimo/server/branches/2.0/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd Thu Sep 20 12:37:26 2007
@@ -28,8 +28,8 @@
             for resolving EJB, Web, services, or resource references. This
             schema will never be used directly but its elements are used in
             geronimo-application-client-2.0.xsd, geronimo-connector-1.2.xsd,
-            geronimo-web-2.0.xsd, geronimo-tomcat-2.0.xsd, and
-            geronimo-jetty-2.0.xsd. All the schema's or plans using elements of
+            geronimo-web-2.0.1.xsd, geronimo-tomcat-2.0.1.xsd, and
+            geronimo-jetty-2.0.1.xsd. All the schema's or plans using elements of
             this schema must specify the top level element with one of the
             namespace specified as
             "http://geronimo.apache.org/xml/ns/j2ee/naming-1.2". The default

Modified: geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd Thu Sep 20 12:37:26 2007
@@ -31,8 +31,8 @@
             This is a partial XML Schema Definition for common security
             elements. This schema will never be used directly but its elements
             are used in geronimo-application-client-2.0.xsd,
-            geronimo-connector-1.2.xsd, geronimo-web-2.0.xsd,
-            geronimo-tomcat-2.0.xsd, and geronimo-jetty-1.2.xsd. All the schemas
+            geronimo-connector-1.2.xsd, geronimo-web-2.0.1.xsd,
+            geronimo-tomcat-2.0.1.xsd, and geronimo-jetty-2.0.1.xsd. All the schemas
             or plans using elements of this schema must specify the top level
             element with one of the namespace specified as
             "http://geronimo.apache.org/xml/ns/j2ee/security-1.2". The default

Copied: geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd (from r577853, geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd?p2=geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd&p1=geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd&r1=577853&r2=577890&rev=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd Thu Sep 20 12:37:26 2007
@@ -16,8 +16,10 @@
     limitations under the License.
 -->
 
-<xs:schema xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0"
+<!-- $Rev$ $Date$ -->
+
+<xs:schema xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"

Modified: geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsdconfig/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsdconfig/xmlconfig.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsdconfig/xmlconfig.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsdconfig/xmlconfig.xml Thu Sep 20 12:37:26 2007
@@ -18,7 +18,7 @@
 -->
 <!-- @version $Rev$ $Date$ -->
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1">
         <xb:package>org.apache.geronimo.xbeans.geronimo.web.tomcat</xb:package>
         <xb:prefix>Tomcat</xb:prefix>
     </xb:namespace>

Modified: geronimo/server/branches/2.0/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java Thu Sep 20 12:37:26 2007
@@ -68,22 +68,25 @@
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security", "http://geronimo.apache.org/xml/ns/security-1.2");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.0", "http://geronimo.apache.org/xml/ns/security-1.2");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.1", "http://geronimo.apache.org/xml/ns/security-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty/config", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty/config-1.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat/config", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat/config-1.0");
         NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar", "http://www.openejb.org/xml/ns/openejb-jar-2.2");
         NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar-2.0", "http://www.openejb.org/xml/ns/openejb-jar-2.2");

Modified: geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml Thu Sep 20 12:37:26 2007
@@ -35,7 +35,7 @@
   </dep:environment>
   <module>
     <web>servlet_deploy_ejblink_single_web.war</web>
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
       <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>
@@ -55,7 +55,7 @@
   </module>
   <module>
     <web>servlet_deploy_ejblink_single_web.war</web>
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
       <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>
@@ -76,7 +76,7 @@
   </module>
     <module>
       <web>servlet_deploy_ejblink_single_web.war</web>
-      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
+      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
         <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
           <dep:moduleId>
             <dep:groupId>default</dep:groupId>
@@ -92,7 +92,7 @@
     </module>
     <module>
       <web>servlet_deploy_ejblink_single_web.war</web>
-      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
+      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
         <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
           <dep:moduleId>
             <dep:groupId>default</dep:groupId>

Copied: geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd (from r577853, geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd?p2=geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd&p1=geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd&r1=577853&r2=577890&rev=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd (original)
+++ geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd Thu Sep 20 12:37:26 2007
@@ -20,8 +20,8 @@
 <!-- $Rev$ $Date$ -->
 
 <xs:schema
-    xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
+    xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"

Modified: geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsdconfig/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsdconfig/xmlconfig.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsdconfig/xmlconfig.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsdconfig/xmlconfig.xml Thu Sep 20 12:37:26 2007
@@ -18,7 +18,7 @@
 -->
 <!-- @version $Rev$ $Date$ -->
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
         <xb:package>org.apache.geronimo.xbeans.geronimo.web</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>

Modified: geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java Thu Sep 20 12:37:26 2007
@@ -59,7 +59,7 @@
         
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         XmlObject webPlan = new GenericToSpecificPlanConverter("http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0",
-                "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0", "tomcat").convertToSpecificPlan(rawPlan);
+                "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1", "tomcat").convertToSpecificPlan(rawPlan);
 
         log.debug("PROCESSED: " + webPlan.toString());
         log.debug("EXPECTED: " + expected.toString());

Modified: geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-post.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-post.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-post.xml (original)
+++ geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-post.xml Thu Sep 20 12:37:26 2007
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 
-<xml-fragment xmlns:tom="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+<xml-fragment xmlns:tom="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:environment>
         <dep:moduleId>
             <dep:groupId>test</dep:groupId>

Modified: geronimo/server/branches/2.0/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.0/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml Thu Sep 20 12:37:26 2007
@@ -20,7 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-2.0" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
     <naming:resource-ref>
         <naming:ref-name>ejb/SimpleStatelessSession</naming:ref-name>

Modified: geronimo/server/branches/2.0/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.0/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml Thu Sep 20 12:37:26 2007
@@ -20,7 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-2.0" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
     <naming:resource-ref>
         <naming:ref-name>ejb/SimpleStatelessSession</naming:ref-name>

Modified: geronimo/server/branches/2.0/testsupport/test-deployment-javaee_5/test-war-javaee_5/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsupport/test-deployment-javaee_5/test-war-javaee_5/src/main/webapp/WEB-INF/geronimo-web.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/branches/2.0/testsupport/test-deployment-javaee_5/test-war-javaee_5/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/2.0/testsupport/test-deployment-javaee_5/test-war-javaee_5/src/main/webapp/WEB-INF/geronimo-web.xml Thu Sep 20 12:37:26 2007
@@ -20,7 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-2.0" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
     <naming:resource-ref>
         <naming:ref-name>ejb/SimpleStatelessSession</naming:ref-name>

Modified: geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java (original)
+++ geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java Thu Sep 20 12:37:26 2007
@@ -66,16 +66,19 @@
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security", "http://geronimo.apache.org/xml/ns/security-1.2");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.1", "http://geronimo.apache.org/xml/ns/security-2.0");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.2", "http://geronimo.apache.org/xml/ns/security-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty/config", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty/config-1.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat/config", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat/config-1.0");
         NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar", "http://openejb.apache.org/xml/ns/openejb-jar-2.2");
         NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar-2.1", "http://openejb.apache.org/xml/ns/openejb-jar-2.2");

Modified: geronimo/server/trunk/modules/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-post.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-post.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-post.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-post.xml Thu Sep 20 12:37:26 2007
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
        xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2"
    xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
    <dep:environment>

Copied: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.1.xsd (from r577801, geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.1.xsd?p2=geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.1.xsd&p1=geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd&r1=577801&r2=577890&rev=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.1.xsd Thu Sep 20 12:37:26 2007
@@ -16,8 +16,10 @@
     limitations under the License.
 -->
 
-<xs:schema xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0"
+<!-- $Rev$ $Date$ -->
+
+<xs:schema xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
     xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsdconfig/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsdconfig/xmlconfig.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsdconfig/xmlconfig.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsdconfig/xmlconfig.xml Thu Sep 20 12:37:26 2007
@@ -18,7 +18,7 @@
 -->
 <!-- @version $Rev$ $Date$ -->
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1">
         <xb:package>org.apache.geronimo.xbeans.geronimo.web.jetty</xb:package>
         <xb:prefix>Jetty</xb:prefix>
     </xb:namespace>

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4-converted.xml Thu Sep 20 12:37:26 2007
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1"
          xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
     <dep:environment>

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/test/resources/plans/plan4.xml Thu Sep 20 12:37:26 2007
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
     <environment>
         <moduleId>
             <groupId>foo</groupId>

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd Thu Sep 20 12:37:26 2007
@@ -28,8 +28,8 @@
             for resolving EJB, Web, services, or resource references. This
             schema will never be used directly but its elements are used in
             geronimo-application-client-2.0.xsd, geronimo-connector-1.2.xsd,
-            geronimo-web-2.0.xsd, geronimo-tomcat-2.0.xsd, and
-            geronimo-jetty-2.0.xsd. All the schema's or plans using elements of
+            geronimo-web-2.0.1.xsd, geronimo-tomcat-2.0.1.xsd, and
+            geronimo-jetty-2.0.1.xsd. All the schema's or plans using elements of
             this schema must specify the top level element with one of the
             namespace specified as
             "http://geronimo.apache.org/xml/ns/j2ee/naming-1.2". The default

Modified: geronimo/server/trunk/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-security-builder/src/main/xsd/geronimo-security-1.2.xsd Thu Sep 20 12:37:26 2007
@@ -31,8 +31,8 @@
             This is a partial XML Schema Definition for common security
             elements. This schema will never be used directly but its elements
             are used in geronimo-application-client-2.0.xsd,
-            geronimo-connector-1.2.xsd, geronimo-web-2.0.xsd,
-            geronimo-tomcat-2.0.xsd, and geronimo-jetty-1.2.xsd. All the schemas
+            geronimo-connector-1.2.xsd, geronimo-web-2.0.1.xsd,
+            geronimo-tomcat-2.0.1.xsd, and geronimo-jetty-2.0.1.xsd. All the schemas
             or plans using elements of this schema must specify the top level
             element with one of the namespace specified as
             "http://geronimo.apache.org/xml/ns/j2ee/security-1.2". The default

Copied: geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd (from r577801, geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd?p2=geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd&p1=geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd&r1=577801&r2=577890&rev=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd Thu Sep 20 12:37:26 2007
@@ -16,8 +16,10 @@
     limitations under the License.
 -->
 
-<xs:schema xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0"
+<!-- $Rev$ $Date$ -->
+
+<xs:schema xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"

Modified: geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsdconfig/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsdconfig/xmlconfig.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsdconfig/xmlconfig.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsdconfig/xmlconfig.xml Thu Sep 20 12:37:26 2007
@@ -18,7 +18,7 @@
 -->
 <!-- @version $Rev$ $Date$ -->
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1">
         <xb:package>org.apache.geronimo.xbeans.geronimo.web.tomcat</xb:package>
         <xb:prefix>Tomcat</xb:prefix>
     </xb:namespace>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java Thu Sep 20 12:37:26 2007
@@ -68,22 +68,25 @@
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security", "http://geronimo.apache.org/xml/ns/security-1.2");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.0", "http://geronimo.apache.org/xml/ns/security-1.2");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.1", "http://geronimo.apache.org/xml/ns/security-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty/config", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty/config-1.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
         NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat/config", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat/config-1.0");
         NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar", "http://www.openejb.org/xml/ns/openejb-jar-2.2");
         NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar-2.0", "http://www.openejb.org/xml/ns/openejb-jar-2.2");

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml Thu Sep 20 12:37:26 2007
@@ -35,7 +35,7 @@
   </dep:environment>
   <module>
     <web>servlet_deploy_ejblink_single_web.war</web>
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
       <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>
@@ -55,7 +55,7 @@
   </module>
   <module>
     <web>servlet_deploy_ejblink_single_web.war</web>
-    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
       <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <dep:moduleId>
           <dep:groupId>default</dep:groupId>
@@ -76,7 +76,7 @@
   </module>
     <module>
       <web>servlet_deploy_ejblink_single_web.war</web>
-      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
+      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
         <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
           <dep:moduleId>
             <dep:groupId>default</dep:groupId>
@@ -92,7 +92,7 @@
     </module>
     <module>
       <web>servlet_deploy_ejblink_single_web.war</web>
-      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
+      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
         <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
           <dep:moduleId>
             <dep:groupId>default</dep:groupId>

Copied: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd (from r577801, geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd?p2=geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd&p1=geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd&r1=577801&r2=577890&rev=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.1.xsd Thu Sep 20 12:37:26 2007
@@ -20,8 +20,8 @@
 <!-- $Rev$ $Date$ -->
 
 <xs:schema
-    xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
+    xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
     xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
     xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsdconfig/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsdconfig/xmlconfig.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsdconfig/xmlconfig.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsdconfig/xmlconfig.xml Thu Sep 20 12:37:26 2007
@@ -18,7 +18,7 @@
 -->
 <!-- @version $Rev$ $Date$ -->
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
         <xb:package>org.apache.geronimo.xbeans.geronimo.web</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverterTest.java Thu Sep 20 12:37:26 2007
@@ -59,7 +59,7 @@
         
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         XmlObject webPlan = new GenericToSpecificPlanConverter("http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0",
-                "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0", "tomcat").convertToSpecificPlan(rawPlan);
+                "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1", "tomcat").convertToSpecificPlan(rawPlan);
 
         log.debug("PROCESSED: " + webPlan.toString());
         log.debug("EXPECTED: " + expected.toString());

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-post.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-post.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-post.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-post.xml Thu Sep 20 12:37:26 2007
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 
-<xml-fragment xmlns:tom="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+<xml-fragment xmlns:tom="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:environment>
         <dep:moduleId>
             <dep:groupId>test</dep:groupId>

Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml Thu Sep 20 12:37:26 2007
@@ -20,7 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-2.0" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
     <naming:resource-ref>
         <naming:ref-name>ejb/SimpleStatelessSession</naming:ref-name>

Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml Thu Sep 20 12:37:26 2007
@@ -20,7 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-2.0" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
     <naming:resource-ref>
         <naming:ref-name>ejb/SimpleStatelessSession</naming:ref-name>

Modified: geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-war-javaee_5/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-war-javaee_5/src/main/webapp/WEB-INF/geronimo-web.xml?rev=577890&r1=577889&r2=577890&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-war-javaee_5/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-war-javaee_5/src/main/webapp/WEB-INF/geronimo-web.xml Thu Sep 20 12:37:26 2007
@@ -20,7 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-2.0" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
     <naming:resource-ref>
         <naming:ref-name>ejb/SimpleStatelessSession</naming:ref-name>



Mime
View raw message