Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 78805 invoked from network); 2 Aug 2007 16:32:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Aug 2007 16:32:37 -0000 Received: (qmail 35072 invoked by uid 500); 2 Aug 2007 16:32:31 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 35021 invoked by uid 500); 2 Aug 2007 16:32:31 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 34991 invoked by uid 99); 2 Aug 2007 16:32:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Aug 2007 09:32:31 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Aug 2007 16:31:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DFF431A981A; Thu, 2 Aug 2007 09:31:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r562176 - in /geronimo/server/branches/2.0: 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-... Date: Thu, 02 Aug 2007 16:31:49 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070802163155.DFF431A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Thu Aug 2 09:31:43 2007 New Revision: 562176 URL: http://svn.apache.org/viewvc?view=rev&rev=562176 Log: GERONIMO-2286 GERONIMO-1874 GERONIMO-3140 Adjust schema versions for schemas importing new schema versions (merge from trunk) Added: geronimo/server/branches/2.0/modules/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.xsd - copied unchanged from r561993, geronimo/server/trunk/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 - copied unchanged from r561993, geronimo/server/trunk/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 - copied unchanged from r561993, 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-1.2.xsd geronimo/server/branches/2.0/modules/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-1.2.xsd geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/main/xsd/geronimo-web-1.2.xsd Modified: geronimo/server/branches/2.0/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml geronimo/server/branches/2.0/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml geronimo/server/branches/2.0/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml geronimo/server/branches/2.0/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml geronimo/server/branches/2.0/applications/pom.xml geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml 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/deployables/war3/WEB-INF/geronimo-web.xml geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-post.xml geronimo/server/branches/2.0/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml geronimo/server/branches/2.0/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.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 Modified: geronimo/server/branches/2.0/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml (original) +++ geronimo/server/branches/2.0/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/geronimo-web.xml Thu Aug 2 09:31:43 2007 @@ -17,7 +17,7 @@ - Modified: geronimo/server/branches/2.0/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml (original) +++ geronimo/server/branches/2.0/applications/geronimo-examples/geronimo-servlet-examples/src/main/webapp/WEB-INF/geronimo-web.xml Thu Aug 2 09:31:43 2007 @@ -17,7 +17,7 @@ - Modified: geronimo/server/branches/2.0/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml (original) +++ geronimo/server/branches/2.0/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/geronimo-web.xml Thu Aug 2 09:31:43 2007 @@ -18,7 +18,7 @@ - Modified: geronimo/server/branches/2.0/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml (original) +++ geronimo/server/branches/2.0/applications/geronimo-welcome/src/main/webapp/WEB-INF/geronimo-web.xml Thu Aug 2 09:31:43 2007 @@ -17,7 +17,7 @@ - Modified: geronimo/server/branches/2.0/applications/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/applications/pom.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/applications/pom.xml (original) +++ geronimo/server/branches/2.0/applications/pom.xml Thu Aug 2 09:31:43 2007 @@ -42,7 +42,7 @@ geronimo-remote-deploy geronimo-uddi-db geronimo-uddi-server - geronimo-ldap-demo + geronimo-ca-helper Modified: geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml (original) +++ geronimo/server/branches/2.0/assemblies/geronimo-framework/src/main/resources/var/config/config.xml Thu Aug 2 09:31:43 2007 @@ -51,7 +51,7 @@ - http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2 + http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0 Modified: geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml (original) +++ geronimo/server/branches/2.0/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml Thu Aug 2 09:31:43 2007 @@ -132,7 +132,7 @@ - http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2 + http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0 http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee Modified: geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml (original) +++ geronimo/server/branches/2.0/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml Thu Aug 2 09:31:43 2007 @@ -74,7 +74,7 @@ - http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2 + http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0 Modified: geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml (original) +++ geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml Thu Aug 2 09:31:43 2007 @@ -139,7 +139,7 @@ - http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2 + http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0 http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee Modified: geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml (original) +++ geronimo/server/branches/2.0/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml Thu Aug 2 09:31:43 2007 @@ -75,7 +75,7 @@ - http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2 + http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0 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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 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/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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 2007 @@ -16,7 +16,7 @@ limitations under the License. --> - 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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 2007 @@ -18,7 +18,7 @@ --> - + org.apache.geronimo.xbeans.geronimo.web.jetty Jetty 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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 2007 @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - 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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 2007 @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + foo 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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 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/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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 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 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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 2007 @@ -18,7 +18,7 @@ --> - + org.apache.geronimo.xbeans.geronimo.web.tomcat Tomcat 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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 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/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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 2007 @@ -35,7 +35,7 @@ servlet_deploy_ejblink_single_web.war - + default @@ -55,7 +55,7 @@ servlet_deploy_ejblink_single_web.war - + default @@ -76,7 +76,7 @@ servlet_deploy_ejblink_single_web.war - + default @@ -92,7 +92,7 @@ servlet_deploy_ejblink_single_web.war - + default 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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 2007 @@ -18,7 +18,7 @@ --> - + org.apache.geronimo.xbeans.geronimo.web Ger 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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 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/branches/2.0/modules/geronimo-web-2.5-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml (original) +++ geronimo/server/branches/2.0/modules/geronimo-web-2.5-builder/src/test/resources/deployables/war3/WEB-INF/geronimo-web.xml Thu Aug 2 09:31:43 2007 @@ -18,7 +18,7 @@ --> /test 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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 2007 @@ -16,7 +16,7 @@ limitations under the License. --> - + test Modified: geronimo/server/branches/2.0/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/branches/2.0/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml (original) +++ geronimo/server/branches/2.0/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml Thu Aug 2 09:31:43 2007 @@ -118,7 +118,7 @@ web.war - + test-cms-realm Modified: geronimo/server/branches/2.0/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/branches/2.0/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml (original) +++ geronimo/server/branches/2.0/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Aug 2 09:31:43 2007 @@ -20,7 +20,7 @@ - + ${pom.groupId} Modified: geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml (original) +++ geronimo/server/branches/2.0/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/resources/META-INF/geronimo-application.xml Thu Aug 2 09:31:43 2007 @@ -40,7 +40,7 @@ web.war - + /testjms jms/QCF Modified: geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml (original) +++ geronimo/server/branches/2.0/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Aug 2 09:31:43 2007 @@ -16,7 +16,7 @@ limitations under the License. --> - + default Modified: geronimo/server/branches/2.0/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/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml (original) +++ geronimo/server/branches/2.0/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/resources/META-INF/geronimo-application.xml Thu Aug 2 09:31:43 2007 @@ -40,7 +40,7 @@ web-references-war.war - + /webref ejb/TestBean 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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 2007 @@ -20,7 +20,7 @@ - + ejb/SimpleStatelessSession 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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 2007 @@ -20,7 +20,7 @@ - + ejb/SimpleStatelessSession 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?view=diff&rev=562176&r1=562175&r2=562176 ============================================================================== --- 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 Aug 2 09:31:43 2007 @@ -20,7 +20,7 @@ - + ejb/SimpleStatelessSession