geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r292376 [4/4] - in /geronimo/branches/1.0-M5: ./ applications/console-ear/src/plan/ applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/ applications/console-standard/src/java/org/apache/geronimo/console/jmsma...
Date Thu, 29 Sep 2005 02:08:52 GMT
Modified: geronimo/branches/1.0-M5/modules/tomcat-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/tomcat-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/tomcat-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/branches/1.0-M5/modules/tomcat-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
Wed Sep 28 19:07:10 2005
@@ -6,9 +6,9 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,8 @@
 -->
 
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/web"
-    xmlns:sec="http://geronimo.apache.org/xml/ns/security"
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
+    xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.0"
     configId="org/apache/geronimo/test">
 
     <context-root>/test</context-root>

Modified: geronimo/branches/1.0-M5/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/branches/1.0-M5/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml
Wed Sep 28 19:07:10 2005
@@ -16,14 +16,14 @@
     limitations under the License.
 -->
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/web"
-    xmlns:sec="http://geronimo.apache.org/xml/ns/security"
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
+    xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.0"
     configId="org/apache/geronimo/test">
 
     <context-root>/test</context-root>
     <context-priority-classloader>false</context-priority-classloader>
     <container-config>
-        <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat">
+        <tomcat xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0/tomcat">
 <!--            <host>tomcathost</host>-->
             <valve-chain>FirstValve</valve-chain>
             <tomcat-realm>TomcatRealm</tomcat-realm>

Modified: geronimo/branches/1.0-M5/modules/tomcat-builder/src/test-resources/plans/plan1.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/tomcat-builder/src/test-resources/plans/plan1.xml?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/tomcat-builder/src/test-resources/plans/plan1.xml (original)
+++ geronimo/branches/1.0-M5/modules/tomcat-builder/src/test-resources/plans/plan1.xml Wed
Sep 28 19:07:10 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://geronimo.apache.org/xml/ns/web"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
     configId="goodservlet"
     parentId="org/apache/geronimo/DefaultDatabase">
     <context-priority-classloader>false</context-priority-classloader>

Modified: geronimo/branches/1.0-M5/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
(original)
+++ geronimo/branches/1.0-M5/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
Wed Sep 28 19:07:10 2005
@@ -4,12 +4,13 @@
 import javax.management.ObjectName;
 
 import junit.framework.TestCase;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
 import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.jmx.JMXUtil;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
-import org.apache.geronimo.xbeans.geronimo.web.GerWebAppType;
 import org.apache.geronimo.xbeans.geronimo.web.GerWebAppDocument;
+import org.apache.geronimo.xbeans.geronimo.web.GerWebAppType;
+import org.apache.geronimo.xbeans.geronimo.web.tomcat.TomcatWebAppType;
 
 /**
  */
@@ -20,13 +21,13 @@
     private File basedir = new File(System.getProperty("basedir", "."));
 
     protected void setUp() throws Exception {
-        builder = new TomcatModuleBuilder(null, false, tomcatContainerObjectName, null, null,
kernel);
+        builder = new TomcatModuleBuilder(null, false, tomcatContainerObjectName, null, null);
     }
 
     public void testResourceRef() throws Exception {
         File resourcePlan = new File(basedir, "src/test-resources/plans/plan1.xml");
         assertTrue(resourcePlan.exists());
-        GerWebAppType jettyWebApp = builder.getTomcatWebApp(resourcePlan, null, true, null,
null);
+        TomcatWebAppType jettyWebApp = builder.getTomcatWebApp(resourcePlan, null, true,
null, null);
         assertEquals(1, jettyWebApp.getResourceRefArray().length);
     }
 

Modified: geronimo/branches/1.0-M5/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
(original)
+++ geronimo/branches/1.0-M5/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Wed Sep 28 19:07:10 2005
@@ -385,7 +385,7 @@
 
         WebServiceBuilder webServiceBuilder = new AxisBuilder();
 
-        builder = new TomcatModuleBuilder(new URI[] {new URI("null")}, false, containerName,
webServiceBuilder, null, kernel);
+        builder = new TomcatModuleBuilder(new URI[] {new URI("null")}, false, containerName,
webServiceBuilder, null);
 
         // Default Realm
         Map initParams = new HashMap();

Modified: geronimo/branches/1.0-M5/modules/tomcat/src/etc/META-INF/geronimo-service.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/tomcat/src/etc/META-INF/geronimo-service.xml?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/tomcat/src/etc/META-INF/geronimo-service.xml (original)
+++ geronimo/branches/1.0-M5/modules/tomcat/src/etc/META-INF/geronimo-service.xml Wed Sep
28 19:07:10 2005
@@ -18,7 +18,7 @@
 
 
 <!--dependencies for jetty-->
-<service xmlns="http://geronimo.apache.org/xml/ns/deployment">
+<service xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0">
 
     <dependency>
         <uri>tomcat/jars/jasper-compiler-${jasper_version}.jar</uri>

Modified: geronimo/branches/1.0-M5/modules/tomcat/src/plan/tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/tomcat/src/plan/tomcat-plan.xml?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/tomcat/src/plan/tomcat-plan.xml (original)
+++ geronimo/branches/1.0-M5/modules/tomcat/src/plan/tomcat-plan.xml Wed Sep 28 19:07:10 2005
@@ -22,7 +22,7 @@
 Configuration for the Apache Tomcat web container
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
     parentId="org/apache/geronimo/System"
     configId="org/apache/geronimo/Tomcat"
     >

Modified: geronimo/branches/1.0-M5/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/branches/1.0-M5/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
Wed Sep 28 19:07:10 2005
@@ -17,7 +17,7 @@
 -->
 
 <tomcat:web-app
-    xmlns:tomcat="http://geronimo.apache.org/xml/ns/web/tomcat"
+    xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
     configId="org/apache/geronimo/tomcat/Test"
     >
     <tomcat:context-root>/test</tomcat:context-root>

Modified: geronimo/branches/1.0-M5/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/branches/1.0-M5/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
Wed Sep 28 19:07:10 2005
@@ -6,9 +6,9 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,8 @@
 -->
 
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/web/jetty"
-    xmlns:sec="http://geronimo.apache.org/xml/ns/security"
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
+    xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.0"
     configId="org/apache/geronimo/test">
 
     <context-root>/test</context-root>

Modified: geronimo/branches/1.0-M5/modules/web-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/web-builder/maven.xml?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/web-builder/maven.xml (original)
+++ geronimo/branches/1.0-M5/modules/web-builder/maven.xml Wed Sep 28 19:07:10 2005
@@ -27,7 +27,7 @@
     >
     <preGoal name="java:compile">
         <xmlbeans:schema2java
-            maven.xmlbeans2.sourceschema="schema/geronimo-web.xsd"/>
+            maven.xmlbeans2.sourceschema="schema/geronimo-web-1.0.xsd"/>
         <mkdir dir="${basedir}/target/xmlbeans-classes"/>
         <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
         <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">

Modified: geronimo/branches/1.0-M5/modules/web-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/web-builder/project.xml?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/web-builder/project.xml (original)
+++ geronimo/branches/1.0-M5/modules/web-builder/project.xml Wed Sep 28 19:07:10 2005
@@ -63,6 +63,12 @@
 
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-deploy-config</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
@@ -118,6 +124,12 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-deployment</artifactId>
             <version>${geronimo_version}</version>
         </dependency>
 

Modified: geronimo/branches/1.0-M5/modules/web-builder/src/schema/xmlconfig.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/web-builder/src/schema/xmlconfig.xml?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/web-builder/src/schema/xmlconfig.xml (original)
+++ geronimo/branches/1.0-M5/modules/web-builder/src/schema/xmlconfig.xml Wed Sep 28 19:07:10
2005
@@ -17,7 +17,7 @@
 -->
 <!-- @version $Rev: 57116 $ $Date: 2004-11-09 18:34:38 -0700 (Tue, 09 Nov 2004) $ -->
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/web">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/web-1.0">
         <xb:package>org.apache.geronimo.xbeans.geronimo.web</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>

Modified: geronimo/branches/1.0-M5/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/branches/1.0-M5/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
Wed Sep 28 19:07:10 2005
@@ -6,9 +6,9 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
 -->
 
 <tomcat:web-app
-    xmlns:tomcat="http://geronimo.apache.org/xml/ns/web/tomcat"
+    xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
     configId="org/apache/geronimo/tomcat/Test"
     >
     <tomcat:context-root>/test</tomcat:context-root>

Modified: geronimo/branches/1.0-M5/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/project.properties?rev=292376&r1=292375&r2=292376&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/project.properties (original)
+++ geronimo/branches/1.0-M5/project.properties Wed Sep 28 19:07:10 2005
@@ -48,7 +48,7 @@
 
 #if you are a committer on all these projects use e.g. -Dgeronimo.otherproject.cvs.access=:ext:djencks
 #if you are a committer on one of these projects set the appropriate property here or on
the command line.
-geronimo.otherproject.cvs.access=:pserver:anonymous
+geronimo.otherproject.cvs.access=:ext:djencks
 geronimo.activemq.cvs.access=${geronimo.otherproject.cvs.access}
 geronimo.howl.cvs.access=${geronimo.otherproject.cvs.access}
 geronimo.openejb.cvs.access=${geronimo.otherproject.cvs.access}



Mime
View raw message