geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r561993 - in /geronimo/server/trunk: applications/ applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/ applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/ applications/geronimo-remote-...
Date Thu, 02 Aug 2007 00:14:31 GMT
Author: djencks
Date: Wed Aug  1 17:14:28 2007
New Revision: 561993

URL: http://svn.apache.org/viewvc?view=rev&rev=561993
Log:
GERONIMO-2286 GERONIMO-1874 GERONIMO-3140 Adjust schema versions for schemas importing new schema versions

Added:
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd   (contents, props changed)
      - copied, changed from r561259, geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-1.2.xsd
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd   (contents, props changed)
      - copied, changed from r561259, geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-1.2.xsd
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd   (contents, props changed)
      - copied, changed from r561259, geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-1.2.xsd
Removed:
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-1.2.xsd
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-1.2.xsd
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-1.2.xsd
Modified:
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/applications/pom.xml
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.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/deployables/war3/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-post.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.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/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml Wed Aug  1 17:14:28 2007
@@ -17,7 +17,7 @@
 
 <!-- $Rev: 525563 $ $Date: 2007-04-04 13:37:08 -0400 (Wed, 04 Apr 2007) $ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
          xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2"
          xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
 

Modified: geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml Wed Aug  1 17:14:28 2007
@@ -17,7 +17,7 @@
 
 <!-- $Rev: 525563 $ $Date: 2007-04-04 13:37:08 -0400 (Wed, 04 Apr 2007) $ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
          xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2"
          xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
 

Modified: geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml Wed Aug  1 17:14:28 2007
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
          xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2"
          xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.2">
 

Modified: geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml Wed Aug  1 17:14:28 2007
@@ -17,7 +17,7 @@
 
 <!-- $Rev: 525563 $ $Date: 2007-04-04 13:37:08 -0400 (Wed, 04 Apr 2007) $ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
          xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
   <dep:environment>

Modified: geronimo/server/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/pom.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/applications/pom.xml (original)
+++ geronimo/server/trunk/applications/pom.xml Wed Aug  1 17:14:28 2007
@@ -42,7 +42,7 @@
         <module>geronimo-remote-deploy</module>
         <module>geronimo-uddi-db</module>
         <module>geronimo-uddi-server</module>
-        <module>geronimo-ldap-demo</module>
+        <!--<module>geronimo-ldap-demo</module>-->
         <module>geronimo-ca-helper</module>
     </modules>
     

Modified: geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/config.xml Wed Aug  1 17:14:28 2007
@@ -51,7 +51,7 @@
     
     <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0</attribute>
         </gbean>
     </module>
 

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml Wed Aug  1 17:14:28 2007
@@ -132,7 +132,7 @@
 
     <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2</attribute>
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0</attribute>
         </gbean>
         <gbean name="EnvironmentEntryBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml Wed Aug  1 17:14:28 2007
@@ -74,7 +74,7 @@
     
     <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2</attribute>
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0</attribute>
         </gbean>
     </module>
 

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml Wed Aug  1 17:14:28 2007
@@ -139,7 +139,7 @@
 
     <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0</attribute>
         </gbean>
         <gbean name="EnvironmentEntryBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml Wed Aug  1 17:14:28 2007
@@ -75,7 +75,7 @@
     
     <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
+            <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0</attribute>
         </gbean>
     </module>
 

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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 2007
@@ -66,13 +66,16 @@
         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-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-1.2");
-        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/j2ee/web/jetty-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-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.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/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-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2");
+        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/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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 2007
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
        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.xsd (from r561259, geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-1.2.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd?view=diff&rev=561993&p1=geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-1.2.xsd&r1=561259&p2=geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd&r2=561993
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-1.2.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd Wed Aug  1 17:14:28 2007
@@ -16,8 +16,8 @@
     limitations under the License.
 -->
 
-<xs:schema xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2"
+<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"
     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"
@@ -38,7 +38,7 @@
             specify the top level element as web-app with namespace specified as
             xmlns="http://geronimo.apache.org/xml/ns/j2ee/jetty-1.2". The
             default location for this document is
-            http://geronimo.apache.org/schemas-1.2/geronimo-jetty-1.2.xsd
+            http://geronimo.apache.org/schemas-1.2/geronimo-jetty-2.0.xsd
         </xs:documentation>
     </xs:annotation>
 

Propchange: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 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-1.2">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0">
         <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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 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-1.2"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0"
          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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 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-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
     <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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 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-1.2.xsd, geronimo-tomcat-1.2.xsd, and
-            geronimo-jetty-1.2.xsd. All the schema's or plans using elements of
+            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
             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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 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-1.2.xsd,
-            geronimo-tomcat-1.2.xsd, and geronimo-jetty-1.2.xsd. All the schemas
+            geronimo-connector-1.2.xsd, geronimo-web-2.0.xsd,
+            geronimo-tomcat-2.0.xsd, and geronimo-jetty-1.2.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.xsd (from r561259, geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-1.2.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd?view=diff&rev=561993&p1=geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-1.2.xsd&r1=561259&p2=geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd&r2=561993
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-1.2.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd Wed Aug  1 17:14:28 2007
@@ -16,8 +16,8 @@
     limitations under the License.
 -->
 
-<xs:schema xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2"
+<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"
     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"
@@ -38,7 +38,7 @@
             specify the top level element as web-app with namespace specified as
             xmlns="http://geronimo.apache.org/xml/ns/j2ee/tomcat-1.2". The
             default location for this document is
-            http://geronimo.apache.org/schemas-1.2/geronimo-tomcat-1.2.xsd
+            http://geronimo.apache.org/schemas-1.2/geronimo-tomcat-2.0.xsd
         </xs:documentation>
     </xs:annotation>
 

Propchange: geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 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-1.2">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0">
         <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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 2007
@@ -68,19 +68,22 @@
         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-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web-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-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1", "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/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-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2");
-        NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2");
+        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/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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 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-1.2">
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
       <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-1.2">
+    <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
       <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-1.2">
+      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
         <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-1.2">
+      <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
         <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.xsd (from r561259, geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-1.2.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd?view=diff&rev=561993&p1=geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-1.2.xsd&r1=561259&p2=geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd&r2=561993
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-1.2.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd Wed Aug  1 17:14:28 2007
@@ -20,8 +20,8 @@
 <!-- $Rev$ $Date$ -->
 
 <xs:schema
-    xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
+    xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
     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"

Propchange: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-2.0.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 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-1.2">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
         <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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 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-1.2", "tomcat").convertToSpecificPlan(rawPlan);
+                "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0", "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/deployables/war3/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml Wed Aug  1 17:14:28 2007
@@ -18,7 +18,7 @@
 -->
 
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
     xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2">
 
     <context-root>/test</context-root>

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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 2007
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 
-<xml-fragment xmlns:tom="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2" 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" 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/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml Wed Aug  1 17:14:28 2007
@@ -118,7 +118,7 @@
     </module>
     <module>
         <web>web.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
             <security-realm-name>test-cms-realm</security-realm-name>
             <security xmlns="http://geronimo.apache.org/xml/ns/security-2.0">
                 <credential-store>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml Wed Aug  1 17:14:28 2007
@@ -20,7 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
     <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
         <moduleId>
             <groupId>${pom.groupId}</groupId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml Wed Aug  1 17:14:28 2007
@@ -40,7 +40,7 @@
       </dep:environment>
       <module>
         <web>web.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
     	<context-root>/testjms</context-root> 
     	<resource-ref>
            <ref-name>jms/QCF</ref-name>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml Wed Aug  1 17:14:28 2007
@@ -16,7 +16,7 @@
   limitations under the License.
 -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
     <environment>
         <moduleId>
             <groupId>default</groupId>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml Wed Aug  1 17:14:28 2007
@@ -38,7 +38,7 @@
     </dep:environment>
     <module>
         <web>web-references-war.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
             <context-root>/webref</context-root>
             <ejb-ref>
                 <ref-name>ejb/TestBean</ref-name>

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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 2007
@@ -20,7 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-1.2" 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" 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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 2007
@@ -20,7 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-1.2" 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" 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?view=diff&rev=561993&r1=561992&r2=561993
==============================================================================
--- 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 Wed Aug  1 17:14:28 2007
@@ -20,7 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-1.2" 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" 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