geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r377921 - in /geronimo/branches/configid: configs/activemq-broker/src/plan/ configs/activemq/src/plan/ configs/client-corba/src/plan/ configs/client-security/src/plan/ configs/client-system/src/plan/ configs/client/src/plan/ configs/console...
Date Wed, 15 Feb 2006 02:07:05 GMT
Author: djencks
Date: Tue Feb 14 18:07:00 2006
New Revision: 377921

URL: http://svn.apache.org/viewcvs?rev=377921&view=rev
Log:
intermediate checkin, fix some problems with the packaging builder, make configId optional in plans

Modified:
    geronimo/branches/configid/configs/activemq-broker/src/plan/plan.xml
    geronimo/branches/configid/configs/activemq/src/plan/plan.xml
    geronimo/branches/configid/configs/client-corba/src/plan/plan.xml
    geronimo/branches/configid/configs/client-security/src/plan/plan.xml
    geronimo/branches/configid/configs/client-system/src/plan/plan.xml
    geronimo/branches/configid/configs/client/src/plan/plan.xml
    geronimo/branches/configid/configs/console-jetty/src/plan/plan.xml
    geronimo/branches/configid/configs/console-tomcat/src/plan/plan.xml
    geronimo/branches/configid/configs/daytrader-jetty/src/plan/plan.xml
    geronimo/branches/configid/configs/daytrader-tomcat/src/plan/plan.xml
    geronimo/branches/configid/configs/directory/src/plan/plan.xml
    geronimo/branches/configid/configs/executable-deployer/src/plan/plan.xml
    geronimo/branches/configid/configs/geronimo-gbean-deployer/src/plan/plan.xml
    geronimo/branches/configid/configs/hot-deployer/src/plan/plan.xml
    geronimo/branches/configid/configs/j2ee-corba/src/plan/plan.xml
    geronimo/branches/configid/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/branches/configid/configs/j2ee-security/src/plan/plan.xml
    geronimo/branches/configid/configs/j2ee-server/src/plan/plan.xml
    geronimo/branches/configid/configs/j2ee-system/src/plan/plan.xml
    geronimo/branches/configid/configs/javamail/src/plan/plan.xml
    geronimo/branches/configid/configs/jetty-deployer/src/plan/plan.xml
    geronimo/branches/configid/configs/jetty/src/plan/plan.xml
    geronimo/branches/configid/configs/jmxdebug-jetty/src/plan/plan.xml
    geronimo/branches/configid/configs/jmxdebug-tomcat/src/plan/plan.xml
    geronimo/branches/configid/configs/jsp-examples-jetty/src/plan/plan.xml
    geronimo/branches/configid/configs/jsp-examples-tomcat/src/plan/plan.xml
    geronimo/branches/configid/configs/ldap-demo-jetty/src/plan/plan.xml
    geronimo/branches/configid/configs/ldap-demo-tomcat/src/plan/plan.xml
    geronimo/branches/configid/configs/ldap-realm/src/plan/plan.xml
    geronimo/branches/configid/configs/online-deployer/src/plan/plan.xml
    geronimo/branches/configid/configs/remote-deploy-jetty/src/plan/plan.xml
    geronimo/branches/configid/configs/remote-deploy-tomcat/src/plan/plan.xml
    geronimo/branches/configid/configs/rmi-naming/src/plan/plan.xml
    geronimo/branches/configid/configs/servlets-examples-jetty/src/plan/plan.xml
    geronimo/branches/configid/configs/servlets-examples-tomcat/src/plan/plan.xml
    geronimo/branches/configid/configs/shutdown/src/plan/plan.xml
    geronimo/branches/configid/configs/system-database/src/plan/plan.xml
    geronimo/branches/configid/configs/tomcat-deployer/src/plan/plan.xml
    geronimo/branches/configid/configs/tomcat/src/plan/plan.xml
    geronimo/branches/configid/configs/uddi-jetty/src/plan/plan.xml
    geronimo/branches/configid/configs/uddi-tomcat/src/plan/plan.xml
    geronimo/branches/configid/configs/welcome-jetty/src/plan/plan.xml
    geronimo/branches/configid/configs/welcome-tomcat/src/plan/plan.xml
    geronimo/branches/configid/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
    geronimo/branches/configid/modules/service-builder/src/schema/geronimo-config-1.1.xsd
    geronimo/branches/configid/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java
    geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
    geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
    geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java

Modified: geronimo/branches/configid/configs/activemq-broker/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/activemq-broker/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/activemq-broker/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/activemq-broker/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -19,10 +19,7 @@
 <!-- $Rev$ $Date$ -->
 <!--               parentId="${pom.groupId}/system-database/${pom.currentVersion}/car"
 -->
-<configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
-    >
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 
 
     <!-- management -->

Modified: geronimo/branches/configid/configs/activemq/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/activemq/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/activemq/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/activemq/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -18,8 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
+
     >
     <resourceadapter>
         <resourceadapter-instance>

Modified: geronimo/branches/configid/configs/client-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/client-corba/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/client-corba/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/client-corba/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -21,10 +21,7 @@
 <!--
 CSSBean examples for app client
 -->
-<configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
-    >
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 
     <gbean name="DyanmicStubClassLoader" class="org.openejb.corba.util.DynamicStubClassLoader"/>
 

Modified: geronimo/branches/configid/configs/client-security/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/client-security/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/client-security/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/client-security/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -24,7 +24,7 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+
     >
 
 

Modified: geronimo/branches/configid/configs/client-system/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/client-system/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/client-system/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/client-system/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -27,8 +27,8 @@
 specific services - those should be provided by children.
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     domain="geronimo.client"
     server="client"
     >

Modified: geronimo/branches/configid/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/client/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/client/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/client/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -26,8 +26,8 @@
                parentId="${pom.groupId}/client-system/${pom.currentVersion}/car"
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 
     <!-- Naming properties -->

Modified: geronimo/branches/configid/configs/console-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/console-jetty/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/console-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/console-jetty/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -19,13 +19,13 @@
 <!-- $Rev$ $Date$ -->
 
 <application
-    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
+
     >
 
     <module>
         <web>geronimo-console-framework-${pom.currentVersion}.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="console">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1" configId="console">
             <context-root>/console</context-root>
             <context-priority-classloader>false</context-priority-classloader>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
@@ -46,7 +46,7 @@
 
     <module>
         <web>geronimo-console-standard-${pom.currentVersion}.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="console-standard">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1" configId="console-standard">
             <context-root>/console-standard</context-root>
             <context-priority-classloader>false</context-priority-classloader>
         </web-app>

Modified: geronimo/branches/configid/configs/console-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/console-tomcat/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/console-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/console-tomcat/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -19,13 +19,13 @@
 <!-- $Rev$ $Date$ -->
 
 <application
-    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
+
     >
 
     <module>
         <web>geronimo-console-framework-${pom.currentVersion}.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0" configId="console">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1" configId="console">
             <context-root>/console</context-root>
             <context-priority-classloader>false</context-priority-classloader>
             <cross-context/>
@@ -47,7 +47,7 @@
 
     <module>
         <web>geronimo-console-standard-${pom.currentVersion}.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0" configId="console-standard">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1" configId="console-standard">
             <context-root>/console-standard</context-root>
             <context-priority-classloader>false</context-priority-classloader>
             <cross-context/>

Modified: geronimo/branches/configid/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/daytrader-jetty/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/daytrader-jetty/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
+    >
 
     <module>
         <web>daytrader-web-${daytrader_version}.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
             configId="Web" parentId="Trade">
             <context-priority-classloader>false</context-priority-classloader>
             <service-ref>
@@ -31,7 +31,7 @@
     -->
     <module>
         <ejb>daytrader-ejb-${daytrader_version}.jar</ejb>     <!--  Note this must match the -->
-        <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
+        <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
                      configId="TradeEJBs"
                      >
 
@@ -506,7 +506,7 @@
 
     <module>
         <java>daytrader-streamer-${daytrader_version}.jar</java>
-        <application-client  xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0"
+        <application-client  xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1"
             configId="foo"
             clientConfigId="${pom.groupId}/${pom.artifactId}-streamer-client/${daytrader_version}/car">
             <resource>
@@ -565,7 +565,7 @@
         <connector>TradeDataSource</connector>
         <external-path>tranql/tranql-connector-derby-embed-xa/${tranql_vendors_version}/rar</external-path>
         <connector
-            xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
+            xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
             configId="TradeDataSource"
             >
 
@@ -605,7 +605,7 @@
         <connector>TradeJMS</connector>
         <external-path>activemq/activemq-ra/${activemq_version}/rar</external-path>
         <connector
-            xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
+            xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
             xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"
             configId="TradeJMS"
             >

Modified: geronimo/branches/configid/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/daytrader-tomcat/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/daytrader-tomcat/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
+    >
 
     <module>
         <web>daytrader-web-${daytrader_version}.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
             configId="Web" parentId="Trade">
             <context-priority-classloader>false</context-priority-classloader>
             <service-ref>
@@ -31,7 +31,7 @@
     -->
     <module>
         <ejb>daytrader-ejb-${daytrader_version}.jar</ejb>     <!--  Note this must match the -->
-        <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
+        <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
                      configId="TradeEJBs"
                      >
 
@@ -506,7 +506,7 @@
 
     <module>
         <java>daytrader-streamer-${daytrader_version}.jar</java>
-        <application-client  xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0"
+        <application-client  xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1"
             configId="foo"
             clientConfigId="${pom.groupId}/${pom.artifactId}-streamer-client/${daytrader_version}/car">
             <resource>
@@ -565,7 +565,7 @@
         <connector>TradeDataSource</connector>
         <external-path>tranql/tranql-connector-derby-embed-xa/${tranql_vendors_version}/rar</external-path>
         <connector
-            xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
+            xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
             configId="TradeDataSource"
             >
 
@@ -605,7 +605,7 @@
         <connector>TradeJMS</connector>
         <external-path>activemq/activemq-ra/${activemq_version}/rar</external-path>
         <connector
-            xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
+            xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
             xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"
             configId="TradeJMS"
             >

Modified: geronimo/branches/configid/configs/directory/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/directory/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/directory/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/directory/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -25,8 +25,8 @@
 by the server.
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 
     <gbean gbeanName="geronimo.server:name=DirectoryService" class="org.apache.geronimo.directory.DirectoryGBean">

Modified: geronimo/branches/configid/configs/executable-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/executable-deployer/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/executable-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/executable-deployer/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -16,8 +16,8 @@
     limitations under the License.
 -->
 
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
                domain="geronimo.maven"
                server="geronimo"
         >

Modified: geronimo/branches/configid/configs/geronimo-gbean-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/geronimo-gbean-deployer/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/geronimo-gbean-deployer/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -16,12 +16,19 @@
     limitations under the License.
 -->
 
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
-               domain="geronimo.maven"
-               server="geronimo"
-        >
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
 
+    <environment>
+        <name-key>
+            <key>domain</key>
+            <value>geronimo.maven</value>
+        </name-key>
+        <name-key>
+            <key>J2EEServer</key>
+            <value>geronimo</value>
+        </name-key>
+        <classloader></classloader>
+    </environment>
 
     <!-- Deployer used to process modules and plans -->
     <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
@@ -37,7 +44,7 @@
 
     <!-- Builder for handling plans defining Geronimo configurations -->
     <gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
-        <attribute name="defaultParentId">geronimo/j2ee-server/${pom.currentVersion}/car</attribute>
+        <!--<attribute name="defaultParentId">geronimo/j2ee-server/${pom.currentVersion}/car</attribute>-->
         <references name="Repository">
             <pattern><gbean-name>geronimo.maven:name=Repository</gbean-name></pattern>
             <pattern><gbean-name>geronimo.server:name=Repository,*</gbean-name></pattern>
@@ -51,4 +58,5 @@
             <name>*</name>
         </reference>
     </gbean>
+    
 </configuration>

Modified: geronimo/branches/configid/configs/hot-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/hot-deployer/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/hot-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/hot-deployer/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -23,8 +23,8 @@
     parentId="geronimo/runtime-deployer/${pom.currentVersion}/car"
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 <!--
     <dependency>

Modified: geronimo/branches/configid/configs/j2ee-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/j2ee-corba/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/j2ee-corba/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/j2ee-corba/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -24,8 +24,8 @@
 
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 
     <!-- CORBA -->

Modified: geronimo/branches/configid/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/j2ee-deployer/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/j2ee-deployer/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -16,8 +16,8 @@
     limitations under the License.
 -->
 
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
         >
 
     <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
@@ -57,7 +57,7 @@
 
     <!-- web switching builder -->
     <gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
-        <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
+        <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1</attribute>
         <references name="ModuleBuilders">
             <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/jetty-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=JettyWebBuilder</gbean-name></pattern>
             <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/tomcat-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=TomcatWebBuilder</gbean-name></pattern>

Modified: geronimo/branches/configid/configs/j2ee-security/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/j2ee-security/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/j2ee-security/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/j2ee-security/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -23,8 +23,8 @@
                parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 
 

Modified: geronimo/branches/configid/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/j2ee-server/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/j2ee-server/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -27,8 +27,8 @@
 
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 
     <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">

Modified: geronimo/branches/configid/configs/j2ee-system/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/j2ee-system/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/j2ee-system/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/j2ee-system/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -27,8 +27,8 @@
 specific services - those should be provided by children.
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     domain="geronimo.server"
     server="geronimo"
     >

Modified: geronimo/branches/configid/configs/javamail/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/javamail/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/javamail/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/javamail/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -23,8 +23,8 @@
     parentId="geronimo/runtime-deployer/${pom.currentVersion}/car"
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 
     <gbean name="mail/MailSession" class="org.apache.geronimo.mail.MailGBean">

Modified: geronimo/branches/configid/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/jetty-deployer/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/jetty-deployer/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -19,8 +19,8 @@
 <!--               parentId="${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car"
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 
     <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">

Modified: geronimo/branches/configid/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/jetty/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/jetty/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -23,8 +23,8 @@
                parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 
     <!-- david jencks is not convinced that these 2 gbeans should be in this

Modified: geronimo/branches/configid/configs/jmxdebug-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/jmxdebug-jetty/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/jmxdebug-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/jmxdebug-jetty/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
+
     >
 
     <dependency>

Modified: geronimo/branches/configid/configs/jmxdebug-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/jmxdebug-tomcat/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/jmxdebug-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/jmxdebug-tomcat/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
+
     >
 
     <dependency>

Modified: geronimo/branches/configid/configs/jsp-examples-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/jsp-examples-jetty/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/jsp-examples-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/jsp-examples-jetty/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -18,8 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
-      configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
+
     >
 
     <context-root>/jsp-examples</context-root>

Modified: geronimo/branches/configid/configs/jsp-examples-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/jsp-examples-tomcat/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/jsp-examples-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/jsp-examples-tomcat/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -18,8 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
-      configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
+
     >
 
     <context-root>/jsp-examples</context-root>

Modified: geronimo/branches/configid/configs/ldap-demo-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/ldap-demo-jetty/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/ldap-demo-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/ldap-demo-jetty/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
     xmlns:sec="http://geronimo.apache.org/xml/ns/security"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+
     >
     <context-root>/ldap-demo</context-root>
     <context-priority-classloader>false</context-priority-classloader>

Modified: geronimo/branches/configid/configs/ldap-demo-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/ldap-demo-tomcat/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/ldap-demo-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/ldap-demo-tomcat/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
     xmlns:sec="http://geronimo.apache.org/xml/ns/security"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+
     parentId="geronimo/ldap-realm/${pom.currentVersion}/car">
     <context-root>/ldap-demo</context-root>
     <context-priority-classloader>false</context-priority-classloader>

Modified: geronimo/branches/configid/configs/ldap-realm/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/ldap-realm/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/ldap-realm/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/ldap-realm/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -2,7 +2,7 @@
 
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+
     >
 
    <gbean name="ldap-login"

Modified: geronimo/branches/configid/configs/online-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/online-deployer/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/online-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/online-deployer/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -16,8 +16,8 @@
     limitations under the License.
 -->
 
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
                domain="geronimo.online.deployer"
                server="geronimo"
         >

Modified: geronimo/branches/configid/configs/remote-deploy-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/remote-deploy-jetty/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/remote-deploy-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/remote-deploy-jetty/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -18,10 +18,10 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
          xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
-         xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.0"
-         configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+         xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 
     <context-root>/remote-deploy</context-root>

Modified: geronimo/branches/configid/configs/remote-deploy-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/remote-deploy-tomcat/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/remote-deploy-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/remote-deploy-tomcat/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -18,10 +18,10 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
          xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
-         xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.0"
-         configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+         xmlns:cfg="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 
     <context-root>/remote-deploy</context-root>

Modified: geronimo/branches/configid/configs/rmi-naming/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/rmi-naming/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/rmi-naming/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/rmi-naming/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -25,8 +25,8 @@
 
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 
     <gbean name="RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService">

Modified: geronimo/branches/configid/configs/servlets-examples-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/servlets-examples-jetty/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/servlets-examples-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/servlets-examples-jetty/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -18,8 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
-      configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
+
     >
 
     <context-root>/servlets-examples</context-root>

Modified: geronimo/branches/configid/configs/servlets-examples-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/servlets-examples-tomcat/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/servlets-examples-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/servlets-examples-tomcat/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -18,8 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
-      configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
+
     >
 
     <context-root>/servlets-examples</context-root>

Modified: geronimo/branches/configid/configs/shutdown/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/shutdown/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/shutdown/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/shutdown/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -16,8 +16,8 @@
     limitations under the License.
 -->
 
-<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
                domain="geronimo.online.deployer"
                server="geronimo"
         >

Modified: geronimo/branches/configid/configs/system-database/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/system-database/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/system-database/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/system-database/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -18,8 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
+
           >
     <resourceadapter>
         <outbound-resourceadapter>

Modified: geronimo/branches/configid/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/tomcat-deployer/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/tomcat-deployer/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -19,8 +19,8 @@
 <!-- $Rev$ $Date$ -->
 
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 
     <gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">

Modified: geronimo/branches/configid/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/tomcat/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/tomcat/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -22,8 +22,8 @@
 Configuration for Tomcat server.
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+
     >
 
     <gbean name="TomcatResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">

Modified: geronimo/branches/configid/configs/uddi-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/uddi-jetty/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/uddi-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/uddi-jetty/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -17,14 +17,14 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
+    >
 
     <ext-module>
         <web>uddi-jetty</web>
         <external-path>geronimo/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
         <web-app
-            xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
+            xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
                        configId="juddi-server"
             >
 
@@ -53,7 +53,7 @@
     <ext-module>
         <connector>uddi-db</connector>
         <external-path>tranql/tranql-connector-derby-embed-local/${tranql_vendors_version}/rar</external-path>
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
                        configId="uddi-db"
                   >
             <resourceadapter>

Modified: geronimo/branches/configid/configs/uddi-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/uddi-tomcat/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/uddi-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/uddi-tomcat/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -17,15 +17,14 @@
 -->
 
 <!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
+    >
 
     <ext-module>
         <web>uddi-tomcat</web>
         <external-path>geronimo/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
         <web-app
-            xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
-                       configId="juddi-server"
+            xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
             >
 
             <context-root>/juddi</context-root>
@@ -47,8 +46,7 @@
     <ext-module>
         <connector>uddi-db</connector>
         <external-path>tranql/tranql-connector-derby-embed-local/${tranql_vendors_version}/rar</external-path>
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
-                       configId="uddi-db"
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
                   >
             <resourceadapter>
                 <outbound-resourceadapter>

Modified: geronimo/branches/configid/configs/welcome-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/welcome-jetty/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/welcome-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/welcome-jetty/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -18,8 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
-      configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
+
     >
 
     <context-root>/</context-root>

Modified: geronimo/branches/configid/configs/welcome-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/configs/welcome-tomcat/src/plan/plan.xml?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/configs/welcome-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/configid/configs/welcome-tomcat/src/plan/plan.xml Tue Feb 14 18:07:00 2006
@@ -18,8 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
-      configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
+
     >
 
     <context-root>/</context-root>

Modified: geronimo/branches/configid/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java (original)
+++ geronimo/branches/configid/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java Tue Feb 14 18:07:00 2006
@@ -17,26 +17,26 @@
 
 package org.apache.geronimo.deployment.service;
 
+import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.Environment;
-import org.apache.geronimo.deployment.xbeans.EnvironmentType;
-import org.apache.geronimo.deployment.xbeans.NameKeyType;
-import org.apache.geronimo.deployment.xbeans.ClassloaderType;
-import org.apache.geronimo.deployment.xbeans.ClassFilterType;
 import org.apache.geronimo.deployment.xbeans.ArtifactType;
+import org.apache.geronimo.deployment.xbeans.ClassFilterType;
+import org.apache.geronimo.deployment.xbeans.ClassloaderType;
 import org.apache.geronimo.deployment.xbeans.EnvironmentDocument;
+import org.apache.geronimo.deployment.xbeans.EnvironmentType;
+import org.apache.geronimo.deployment.xbeans.NameKeyType;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.schema.SchemaConversionUtils;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
 
-import java.util.Map;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
+import java.util.Map;
 import java.util.Set;
-import java.util.HashSet;
 
 /**
  * @version $Rev:$ $Date:$
@@ -47,7 +47,9 @@
 
     public static Environment buildEnvironment(EnvironmentType environmentType) {
         Environment environment = new Environment();
-        environment.setConfigId(toArtifact(environmentType.getConfigId()));
+        if (environmentType.isSetConfigId()) {
+            environment.setConfigId(toArtifact(environmentType.getConfigId()));
+        }
 
         NameKeyType[] nameKeyArray = environmentType.getNameKeyArray();
         Map nameKeyMap = new HashMap();
@@ -76,21 +78,90 @@
     }
 
     public static void mergeEnvironments(Environment environment, Environment additionalEnvironment) {
-        environment.addNameKeys(additionalEnvironment.getNameKeys());
-        environment.addImports(additionalEnvironment.getImports());
-        environment.addDependencies(additionalEnvironment.getDependencies());
-        environment.addIncludes(additionalEnvironment.getIncludes());
-        environment.setInverseClassloading(environment.isInverseClassloading() || additionalEnvironment.isInverseClassloading());
-        environment.setSuppressDefaultEnvironment(environment.isSuppressDefaultEnvironment() || additionalEnvironment.isSuppressDefaultEnvironment());
-        environment.addHiddenClasses(additionalEnvironment.getHiddenClasses());
-        environment.addNonOverrideableClasses(additionalEnvironment.getNonOverrideableClasses());
-        environment.addReferences(additionalEnvironment.getReferences());
+        if (additionalEnvironment != null) {
+            environment.addNameKeys(additionalEnvironment.getNameKeys());
+            environment.addImports(additionalEnvironment.getImports());
+            environment.addDependencies(additionalEnvironment.getDependencies());
+            environment.addIncludes(additionalEnvironment.getIncludes());
+            environment.setInverseClassloading(environment.isInverseClassloading() || additionalEnvironment.isInverseClassloading());
+            environment.setSuppressDefaultEnvironment(environment.isSuppressDefaultEnvironment() || additionalEnvironment.isSuppressDefaultEnvironment());
+            environment.addHiddenClasses(additionalEnvironment.getHiddenClasses());
+            environment.addNonOverrideableClasses(additionalEnvironment.getNonOverrideableClasses());
+            environment.addReferences(additionalEnvironment.getReferences());
+        }
     }
 
     public static Environment buildEnvironment(EnvironmentType environmentType, Environment defaultEnvironment) {
         Environment environment = buildEnvironment(environmentType);
         mergeEnvironments(environment, defaultEnvironment);
         return environment;
+    }
+
+    public static EnvironmentType buildEnvironmentType(Environment environment) {
+        EnvironmentType environmentType = EnvironmentType.Factory.newInstance();
+        ArtifactType configId = environmentType.addNewConfigId();
+        toArtifactType(configId, environment.getConfigId());
+        for (Iterator iterator = environment.getNameKeys().entrySet().iterator(); iterator.hasNext();) {
+            Map.Entry entry = (Map.Entry) iterator.next();
+            String key = (String) entry.getKey();
+            String value = (String) entry.getValue();
+            NameKeyType nameKeyType = environmentType.addNewNameKey();
+            nameKeyType.setKey(key);
+            nameKeyType.setValue(value);
+        }
+        ClassloaderType classloaderType = environmentType.addNewClassloader();
+        classloaderType.setImportArray(toArtifactTypes(environment.getImports()));
+        classloaderType.setIncludeArray(toArtifactTypes(environment.getIncludes()));
+        classloaderType.setDependencyArray(toArtifactTypes(environment.getDependencies()));
+        if (environment.isInverseClassloading()) {
+            classloaderType.addNewInverseClassloading();
+        }
+        if (environment.isSuppressDefaultEnvironment()) {
+            classloaderType.addNewSuppressDefaultEnvironment();
+        }
+        classloaderType.setHiddenClassesArray(toFilterType(environment.getHiddenClasses()));
+        classloaderType.setNonOverridableClassesArray(toFilterType(environment.getNonOverrideableClasses()));
+        environmentType.setReferenceArray(toArtifactTypes(environment.getReferences()));
+        return environmentType;
+    }
+
+    private static ClassFilterType[] toFilterType(Set filters) {
+        ClassFilterType[] classFilters = new ClassFilterType[filters.size()];
+        int i = 0;
+        for (Iterator iterator = filters.iterator(); iterator.hasNext();) {
+            String filter = (String) iterator.next();
+            ClassFilterType classFilter  = ClassFilterType.Factory.newInstance();
+            classFilter.setFilter(filter);
+            classFilters[i++] = classFilter;
+        }
+        return classFilters;
+    }
+
+    private static ArtifactType[] toArtifactTypes(Collection artifacts) {
+        ArtifactType[] artifactTypes = new ArtifactType[artifacts.size()];
+        int i = 0;
+        for (Iterator iterator = artifacts.iterator(); iterator.hasNext();) {
+            Artifact artifact = (Artifact) iterator.next();
+            ArtifactType artifactType = ArtifactType.Factory.newInstance();
+            toArtifactType(artifactType, artifact);
+            artifactTypes[i++] = artifactType;
+        }
+        return artifactTypes;
+    }
+
+    private static void toArtifactType(ArtifactType artifactType, Artifact artifact) {
+        if (artifact.getGroupId() != null) {
+            artifactType.setGroupId(artifact.getGroupId());
+        }
+        if (artifact.getArtifactId() != null) {
+            artifactType.setArtifactId(artifact.getArtifactId());
+        }
+        if (artifact.getVersion() != null) {
+            artifactType.setVersion(artifact.getVersion().toString());
+        }
+        if (artifact.getType() != null) {
+            artifactType.setType(artifact.getType());
+        }
     }
 
     private static Set toFilters(ClassFilterType[] filterArray) {

Modified: geronimo/branches/configid/modules/service-builder/src/schema/geronimo-config-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/service-builder/src/schema/geronimo-config-1.1.xsd?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/modules/service-builder/src/schema/geronimo-config-1.1.xsd (original)
+++ geronimo/branches/configid/modules/service-builder/src/schema/geronimo-config-1.1.xsd Tue Feb 14 18:07:00 2006
@@ -60,7 +60,7 @@
 
     <xs:complexType name="environmentType">
         <xs:sequence>
-            <xs:element name="configId" type="sys:artifactType">
+            <xs:element name="configId" type="sys:artifactType" minOccurs="0" >
                 <xs:annotation>
                     <xs:documentation>
                         "configId" holds elements for the groupId, artifactId, and version of the configuration

Modified: geronimo/branches/configid/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java (original)
+++ geronimo/branches/configid/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java Tue Feb 14 18:07:00 2006
@@ -60,7 +60,7 @@
 
     private static File resolveRoot(URI root, ServerInfo serverInfo) {
         if (root == null) throw new NullPointerException("root is null");
-        if (serverInfo == null) throw new NullPointerException("serverInfo is null");
+//        if (serverInfo == null) throw new NullPointerException("serverInfo is null");
 
         if (!root.toString().endsWith("/")) {
             try {
@@ -70,7 +70,12 @@
             }
         }
 
-        URI resolvedUri = serverInfo.resolve(root);
+        URI resolvedUri;
+        if (serverInfo != null) {
+            resolvedUri = serverInfo.resolve(root);
+        } else {
+            resolvedUri = root;
+        }
 
         if (!resolvedUri.getScheme().equals("file")) {
             throw new IllegalStateException("FileSystemRepository must have a root that's a local directory (not " + resolvedUri + ")");

Modified: geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java (original)
+++ geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java Tue Feb 14 18:07:00 2006
@@ -69,7 +69,7 @@
         }
 
         GBeanData config = new GBeanData();
-        URL baseURL = new URL("jar:" + repository.getLocation(configId).toString() + "!/");
+        URL baseURL = new URL("jar:" + repository.getLocation(configId).toURL().toString() + "!/");
         InputStream jis = null;
         try {
             URL stateURL = new URL(baseURL, "META-INF/config.ser");

Modified: geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java (original)
+++ geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java Tue Feb 14 18:07:00 2006
@@ -36,6 +36,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.net.URI;
 
 /**
  * JellyBean that builds a Geronimo Configuration using the local Mavem
@@ -323,7 +324,8 @@
         ClassLoader cl = PackageBuilder.class.getClassLoader();
         GBeanInfo repoInfo = GBeanInfo.getGBeanInfo(repoClass, cl);
         GBeanData repoGBean = new GBeanData(REPOSITORY_NAME, repoInfo);
-        repoGBean.setAttribute("root", repository);
+        URI repositoryURI = repository.toURI();
+        repoGBean.setAttribute("root", repositoryURI);
         kernel.loadGBean(repoGBean, cl);
         kernel.startGBean(REPOSITORY_NAME);
 

Modified: geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java?rev=377921&r1=377920&r2=377921&view=diff
==============================================================================
--- geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java (original)
+++ geronimo/branches/configid/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessor.java Tue Feb 14 18:07:00 2006
@@ -162,7 +162,11 @@
                 QName childName = xmlCursor.getName();
                 EnvironmentType environmentType;
                 if (childName.equals(ENVIRONMENT_QNAME)) {
-                    environmentType = (EnvironmentType) xmlCursor.getObject();
+                    XmlObject xmlObject = xmlCursor.getObject();
+                    System.out.println("Expected EnvironmentType, actual: " + xmlObject.getClass().getName());
+                    System.out.println(xmlObject.toString());
+                    environmentType = (EnvironmentType) xmlObject.copy().changeType(EnvironmentType.type);
+                    xmlCursor.removeXml();
                 } else {
                     environmentType = EnvironmentType.Factory.newInstance();
                     xmlCursor.beginElement(ENVIRONMENT_QNAME);
@@ -213,6 +217,14 @@
                         return classloaderType.addNewDependency();
                     }
                 });
+
+                xmlCursor.beginElement(ENVIRONMENT_QNAME);
+                XmlCursor element = environmentType.newCursor();
+                try {
+                    element.copyXmlContents(xmlCursor);
+                } finally {
+                    element.dispose();
+                }
 
                 File targetDir = new File(this.targetDir);
                 if (targetDir.exists()) {



Mime
View raw message