geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r349830 [2/4] - in /geronimo/trunk: applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ applications/console-standard/src/webapp/WEB-INF/view/realmwizard/ applications/demo/src/webapp/WEB-INF/ applicat...
Date Tue, 29 Nov 2005 23:15:48 GMT
Modified: geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -16,28 +16,28 @@
 -->
 
 <!-- $Rev: 216115 $ $Date: 2005-07-12 23:22:18 -0600 (Tue, 12 Jul 2005) $ -->
-<!--               parentId="${pom.groupId}/cars/j2ee-deployer-${pom.currentVersion}.car"
+<!--               parentId="${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car"
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
     <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car,${pom.groupId}/cars/jetty-${pom.currentVersion}.car</attribute>
+        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car,${pom.groupId}/jetty/${pom.currentVersion}/car</attribute>
         <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
         <attribute name="defaultContextPriorityClassloader">false</attribute>
         <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
         <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
         <reference name="DefaultServlets">
-            <!--gbean-name>geronimo.maven:j2eeType=DefaultServlet,J2EEModule=${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car,*</gbean-name-->
+            <!--gbean-name>geronimo.maven:j2eeType=DefaultServlet,J2EEModule=${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car,*</gbean-name-->
             <name>*</name>
         </reference>
         <reference name="PojoWebServiceTemplate">
             <name>POJOTemplate</name>
         </reference>
         <reference name="WebServiceBuilder">
-            <module>${pom.groupId}/cars/j2ee-deployer-${pom.currentVersion}.car</module>
+            <module>${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car</module>
             <name>WebServiceBuilder</name>
         </reference>
         <reference name="Repository">

Modified: geronimo/trunk/configs/jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty/project.properties (original)
+++ geronimo/trunk/configs/jetty/project.properties Tue Nov 29 15:14:42 2005
@@ -22,7 +22,7 @@
 maven.multiproject.type=car
 
 # just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
 
 PlanHTTPPort=8080
 PlanHTTPSPort=8443

Modified: geronimo/trunk/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jetty/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -20,11 +20,11 @@
 
 <!--
 Configuration for Jetty server.
-               parentId="${pom.groupId}/cars/rmi-naming-${pom.currentVersion}.car"
+               parentId="${pom.groupId}/rmi-naming/${pom.currentVersion}/car"
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
     <!-- david jencks is not convinced that these 2 gbeans should be in this
@@ -52,7 +52,7 @@
             <name>JettyWebContainer</name>
         </reference>
         <reference name="ServerInfo">
-            <module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module>
+            <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
         <attribute name="filename">var/log/jetty_yyyy_mm_dd.log</attribute>
@@ -86,7 +86,7 @@
             <name>JettyWebContainer</name>
         </reference>
         <reference name="ServerInfo">
-            <module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module>
+            <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>

Modified: geronimo/trunk/configs/rmi-naming/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/rmi-naming/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/project.properties (original)
+++ geronimo/trunk/configs/rmi-naming/project.properties Tue Nov 29 15:14:42 2005
@@ -22,7 +22,7 @@
 maven.multiproject.type=car
 
 # just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
 
 PlanServerHostname=localhost
 PlanNamingPort=1099

Modified: geronimo/trunk/configs/rmi-naming/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/rmi-naming/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/rmi-naming/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -21,12 +21,12 @@
 <!--
 Holds the RMI naming server configuration.  This needs to be started
 after the system GBeans but before the server GBeans.
-    parentId="${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car"
+    parentId="${pom.groupId}/j2ee-system/${pom.currentVersion}/car"
 
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
     <gbean name="RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService">
@@ -54,7 +54,7 @@
             javax.net.ssl.trustStore=var/security/keystore
         </attribute>
         <reference name="ServerInfo">
-            <module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module>
+            <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>

Modified: geronimo/trunk/configs/system-database/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/system-database/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/project.properties (original)
+++ geronimo/trunk/configs/system-database/project.properties Tue Nov 29 15:14:42 2005
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car,geronimo/cars/j2ee-deployer-${geronimo_version}.car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_connector_version}.rar
 

Modified: geronimo/trunk/configs/system-database/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/system-database/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/system-database/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -19,7 +19,7 @@
 <!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
 
 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
-               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
           >
     <resourceadapter>
         <outbound-resourceadapter>
@@ -47,7 +47,7 @@
     </resourceadapter>
 
     <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
-        <reference name="ServerInfo"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><moduleType>J2EEModule</moduleType><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
         <attribute name="derbySystemHome">var/derby</attribute>
     </gbean>
     <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
@@ -59,17 +59,17 @@
 
     <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
         <attribute name="repeatCount">5</attribute>
-        <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>TransactionContextManager</name></reference>
+        <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/j2ee-server/${pom.currentVersion}/car</module><name>TransactionContextManager</name></reference>
         <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>DefaultThreadPool</name></reference>
+        <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/j2ee-server/${pom.currentVersion}/car</module><name>DefaultThreadPool</name></reference>
         <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
         <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
     </gbean>
 
     <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
-        <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>TransactionContextManager</name></reference>
+        <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/j2ee-server/${pom.currentVersion}/car</module><name>TransactionContextManager</name></reference>
         <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>DefaultThreadPool</name></reference>
+        <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/j2ee-server/${pom.currentVersion}/car</module><name>DefaultThreadPool</name></reference>
         <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
         <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
     </gbean>

Modified: geronimo/trunk/configs/tomcat-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat-deployer/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/project.properties (original)
+++ geronimo/trunk/configs/tomcat-deployer/project.properties Tue Nov 29 15:14:42 2005
@@ -22,7 +22,7 @@
 maven.multiproject.type=car
 
 # just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
 
 PlanHTTPPort=8080
 PlanHTTPSPort=8443

Modified: geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -20,15 +20,15 @@
 
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
     <gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car,${pom.groupId}/cars/tomcat-${pom.currentVersion}.car</attribute>
+        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car,${pom.groupId}/tomcat/${pom.currentVersion}/car</attribute>
         <attribute name="defaultContextPriorityClassloader">false</attribute>
         <attribute name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
         <reference name="WebServiceBuilder">
-            <module>${pom.groupId}/cars/j2ee-deployer-${pom.currentVersion}.car</module>
+            <module>${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car</module>
             <name>WebServiceBuilder</name>
         </reference>
         <reference name="Repository">

Modified: geronimo/trunk/configs/tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/project.properties (original)
+++ geronimo/trunk/configs/tomcat/project.properties Tue Nov 29 15:14:42 2005
@@ -22,7 +22,7 @@
 maven.multiproject.type=car
 
 # just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
 
 PlanHTTPPort2=8090
 PlanHTTPSPort2=8453

Modified: geronimo/trunk/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -23,14 +23,14 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
     <gbean name="TomcatResources" class="org.apache.geronimo.tomcat.util.DirectoryInitializationGBean">
         <!-- copies tomcat initialization files into specified location -->
         <attribute name="path">var/catalina</attribute>
         <reference name="ServerInfo">
-            <module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module>
+            <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>
@@ -49,7 +49,7 @@
             <name>TomcatEngine</name>
         </reference>
         <reference name="ServerInfo">
-            <module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module>
+            <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>
@@ -107,7 +107,7 @@
             <name>TomcatWebContainer</name>
         </reference>
         <reference name="ServerInfo">
-            <module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module>
+            <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>
@@ -138,7 +138,7 @@
 
     <gbean name="TomcatAccessLogManager" class="org.apache.geronimo.tomcat.TomcatLogManagerImpl">
         <reference name="ServerInfo">
-            <module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module>
+            <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
         <references name="LogGBeans">

Modified: geronimo/trunk/configs/uddi-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-jetty/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/project.properties (original)
+++ geronimo/trunk/configs/uddi-jetty/project.properties Tue Nov 29 15:14:42 2005
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car,geronimo/cars/j2ee-deployer-${geronimo_version}.car,geronimo/cars/jetty-deployer-${geronimo_version}.car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-uddi-server-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -20,7 +20,7 @@
 
 <web-app
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
-               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
     <context-root>/juddi</context-root>

Modified: geronimo/trunk/configs/uddi-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-tomcat/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/project.properties (original)
+++ geronimo/trunk/configs/uddi-tomcat/project.properties Tue Nov 29 15:14:42 2005
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car,geronimo/cars/j2ee-deployer-${geronimo_version}.car,geronimo/cars/tomcat-deployer-${geronimo_version}.car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-uddi-server-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -20,7 +20,7 @@
 
 <web-app
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
-               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
     <context-root>/juddi</context-root>

Modified: geronimo/trunk/configs/welcome-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-jetty/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/project.properties (original)
+++ geronimo/trunk/configs/welcome-jetty/project.properties Tue Nov 29 15:14:42 2005
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car,geronimo/cars/j2ee-deployer-${geronimo_version}.car,geronimo/cars/jetty-deployer-${geronimo_version}.car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-welcome-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -19,7 +19,7 @@
 <!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
 
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
-      configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+      configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
     <context-root>/</context-root>

Modified: geronimo/trunk/configs/welcome-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-tomcat/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/project.properties (original)
+++ geronimo/trunk/configs/welcome-tomcat/project.properties Tue Nov 29 15:14:42 2005
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car,geronimo/cars/j2ee-deployer-${geronimo_version}.car,geronimo/cars/tomcat-deployer-${geronimo_version}.car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-welcome-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -19,7 +19,7 @@
 <!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
 
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
-      configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+      configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
     <context-root>/</context-root>

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Tue Nov 29 15:14:42 2005
@@ -260,6 +260,7 @@
         <j:if test="${context.getVariable('geronimo.web.container').equals('jetty')}">
             <echo>JETTY CONTAINER</echo>
             <j:set var="PlanWebServerName" value="Jetty"/>
+            <j:set var="PlanWebServerNameLC" value="jetty"/>
             <j:set var="PlanWebBuilderDefaultNamespace" value="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"/>
             <j:set var="PlanHTTPPort" value="8080"/>
             <j:set var="PlanHTTPSPort" value="8443"/>
@@ -271,6 +272,7 @@
         <j:if test="${context.getVariable('geronimo.web.container').equals('tomcat')}">
             <echo>TOMCAT CONTAINER</echo>
             <j:set var="PlanWebServerName" value="Tomcat"/>
+            <j:set var="PlanWebServerNameLC" value="tomcat"/>
             <j:set var="PlanWebBuilderDefaultNamespace" value="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"/>
             <j:set var="PlanHTTPPort" value="8090"/>
             <j:set var="PlanHTTPSPort" value="8453"/>
@@ -357,7 +359,7 @@
             deployerSystemPlan="${basedir}/target/plan/deployer-system-plan.xml"
             j2eeDeployerPlan="${basedir}/target/plan/j2ee-deployer-plan.xml"
             deployerClassPath="${deploy.classpath}"
-            deployerGBean="geronimo.deployer:name=Deployer,J2EEApplication=null,J2EEModule=org/apache/geronimo/OfflineDeployer,j2eeType=Deployer,J2EEServer=deployer"
+            deployerGBean="geronimo.deployer:name=Deployer,J2EEApplication=null,J2EEModule=geronimo/offline-deployer/${pom.currentVersion}/car,j2eeType=Deployer,J2EEServer=deployer"
             deploymentFactory="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl"
             />
 
@@ -472,14 +474,14 @@
             <deploy:startRemoteServer
                 geronimoTarget="${geronimo.assembly.dir}"
                 vmArgs="${geronimo.server.debug.options} -Xmx512m -Djava.rmi.server.RMIClassLoaderSpi=org.apache.geronimo.system.rmi.RMIClassLoaderSpiImpl"
-                configs="org/apache/geronimo/Security org/apache/geronimo/RuntimeDeployer org/apache/geronimo/JettyRuntimeDeployer org/apache/geronimo/TomcatRuntimeDeployer"/>
+                configs="geronimo/security/${pom.currentVersion}/car geronimo/runtime-deployer/${pom.currentVersion}/car geronimo/jetty-runtime-deployer/${pom.currentVersion}/car geronimo/tomcat-runtime-deployer/${pom.currentVersion}/car"/>
             <ant:echo message="Waiting for server at: ${geronimo.assembly.dir}"/>
             <deploy:waitForStarted
                 uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
                 maxtries="125"
                 username="system"
                 password="manager"
-                id="org/apache/geronimo/TomcatRuntimeDeployer"/>
+                id="geronimo/tomcat-runtime-deployer/${pom.currentVersion}/car"/>
             <!-- wait for started does not assure that child services are started so we must sleep -->
             <u:sleep millis="7000"/>
             <echo message="server has started"/>
@@ -570,12 +572,14 @@
                 />
 
             <!-- build the J2EEServer secure configuration -->
+<!--
             <deploy:distribute
                 uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
                 username="system"
                 password="manager"
                 plan="${basedir}/target/plan/j2ee-secure-plan.xml"
                 />
+-->
 
             <!-- build the J2EE client configuration -->
             <!--            <deploy:distribute-->

Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Tue Nov 29 15:14:42 2005
@@ -53,6 +53,7 @@
             </properties>
         </dependency>
 
+        <!--WTF? why does this need to be in lib and deploy? -->
         <dependency>
             <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-corba</artifactId>
@@ -231,6 +232,7 @@
             </properties>
         </dependency>
 
+<!--
         <dependency>
             <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-corba</artifactId>
@@ -239,6 +241,7 @@
                 <repository>true</repository>
             </properties>
         </dependency>
+-->
 
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml (original)
+++ geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml Tue Nov 29 15:14:42 2005
@@ -7,7 +7,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/RMINaming</arg>
+            <arg>geronimo/rmi-naming/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="J2EE Features"/>
     </job>
@@ -17,7 +17,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/Server</arg>
+            <arg>geronimo/j2ee-server/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="J2EE Features"/>
     </job>
@@ -27,7 +27,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/Security</arg>
+            <arg>geronimo/security/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="J2EE Features"/>
     </job>
@@ -37,7 +37,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/RuntimeDeployer</arg>
+            <arg>geronimo/runtime-deployer/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="J2EE Features"/>
     </job>
@@ -47,7 +47,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/SystemDatabase</arg>
+            <arg>geronimo/system-database/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="J2EE Features"/>
     </job>
@@ -59,7 +59,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/ServerCORBA</arg>
+            <arg>geronimo/server-corba/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="CORBA Features"/>
     </job>
@@ -71,7 +71,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/ActiveMQServer</arg>
+            <arg>geronimo/activemq-broker/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="JMS Features"/>
     </job>
@@ -81,7 +81,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/SystemJMS</arg>
+            <arg>geronimo/system-jms/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="JMS Features"/>
     </job>
@@ -93,7 +93,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/Jetty</arg>
+            <arg>geronimo/jetty/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="Jetty Web Container"/>
     </job>
@@ -103,7 +103,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/JettyRuntimeDeployer</arg>
+            <arg>geronimo/jetty-runtime-deployer/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="Jetty Web Container"/>
     </job>
@@ -115,7 +115,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/applications/Welcome/Jetty</arg>
+            <arg>geronimo/welcome-jetty/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="Jetty Welcome Application"/>
     </job>
@@ -127,7 +127,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/Console/Jetty</arg>
+            <arg>geronimo/console-jetty/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="Jetty Web Management Console"/>
     </job>
@@ -151,7 +151,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/Tomcat</arg>
+            <arg>geronimo/tomcat/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="Tomcat Web Container"/>
     </job>
@@ -161,7 +161,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/TomcatRuntimeDeployer</arg>
+            <arg>geronimo/tomcat-runtime-deployer/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="Tomcat Web Container"/>
     </job>
@@ -173,7 +173,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/applications/Welcome/Tomcat</arg>
+            <arg>geronimo/welcome-tomcat/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="Tomcat Welcome Application"/>
     </job>
@@ -185,7 +185,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/Console/Tomcat</arg>
+            <arg>geronimo/console-tomcat/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="Tomcat Web Management Console"/>
     </job>
@@ -209,7 +209,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/Directory</arg>
+            <arg>geronimo/directory/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="LDAP Server"/>
     </job>
@@ -221,7 +221,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/DefaultDatabase</arg>
+            <arg>geronimo/default-database/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="Sample Database Pool"/>
     </job>
@@ -233,7 +233,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/SpringRuntime</arg>
+            <arg>geronimo/spring-runtime/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="Spring Integration"/>
     </job>
@@ -244,7 +244,7 @@
             <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>
             <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>
             <arg>$INSTALL_PATH/var/config/config.list</arg>
-            <arg>org/apache/geronimo/SpringDeployer</arg>
+            <arg>geronimo/spring-deployer/${pom.currentVersion}/car</arg>
         </executefile>
         <executeForPack name="Spring Integration"/>
     </job>
@@ -268,7 +268,7 @@
 <!--            <arg>$INSTALL_PATH/repository/geronimo/jars/geronimo-system-${GeronimoVersion}.jar</arg>-->
 <!--            <arg>org.apache.geronimo.system.configuration.cli.AddStartupConfiguration</arg>-->
 <!--            <arg>$INSTALL_PATH/var/config/config.list</arg>-->
-<!--            <arg>org/apache/geronimo/SampleSecurityRealm</arg>-->
+<!--            <arg>geronimo/sample-security/${pom.currentVersion}/car</arg>-->
 <!--        </executefile>-->
 <!--        <executeForPack name="Demo Web Application"/>-->
 <!--    </job>-->

Modified: geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml Tue Nov 29 15:14:42 2005
@@ -28,7 +28,7 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/ClientSystem"
+    configId="geronimo/client-system/${pom.currentVersion}/car"
     domain="geronimo.client"
     server="client"
     >

Modified: geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml Tue Nov 29 15:14:42 2005
@@ -19,17 +19,17 @@
 <!-- $Rev$ $Date$ -->
 
 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
-    configId="org/apache/geronimo/DefaultDatabase"
-    parentId="org/apache/geronimo/Server">
+    configId="geronimo/default-database/${pom.currentVersion}/car"
+    parentId="geronimo/j2ee-server/${pom.currentVersion}/car">
 
     <dependency>
-        <uri>org.apache.derby/jars/derby-${derby_version}.jar</uri>
+        <uri>org.apache.derby/derby/${derby_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>org.apache.derby/jars/derbynet-${derby_version}.jar</uri>
+        <uri>org.apache.derby/derbynet/${derby_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-derby-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-derby/${geronimo_version}/jar</uri>
     </dependency>
 
     <resourceadapter>

Modified: geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml Tue Nov 29 15:14:42 2005
@@ -23,7 +23,7 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/DeployerSystem"
+    configId="geronimo/deployer-system/${pom.currentVersion}/car"
     domain="geronimo.deployer"
     server="deployer"
     >

Modified: geronimo/trunk/modules/assembly/src/plan/directory-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/directory-server-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/directory-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/directory-server-plan.xml Tue Nov 29 15:14:42 2005
@@ -26,82 +26,82 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/Directory"
-    parentId="org/apache/geronimo/Server"
+    configId="geronimo/directory/${pom.currentVersion}/car"
+    parentId="geronimo/j2ee-server/${pom.currentVersion}/car"
     >
 
     <dependency>
-        <uri>antlr/jars/antlr-${antlr_version}.jar</uri>
+        <uri>antlr/antlr/${antlr_version}/jar</uri>
     </dependency>
 
     <!-- required for rar 1.5 to load realms -->
     <dependency>
-        <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
+        <uri>regexp/regexp/${regexp_version}/jar</uri>
     </dependency>
 
     <!-- Directory -->
     <dependency>
-        <uri>geronimo/jars/geronimo-directory-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-directory/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>org.slf4j/jars/slf4j-simple-${slf4j_version}.jar</uri>
+        <uri>org.slf4j/slf4j-simple/${slf4j_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>directory/jars/apacheds-core-${apacheds_version}.jar</uri>
+        <uri>directory/apacheds-core/${apacheds_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>directory/jars/apacheds-shared-${apacheds_version}.jar</uri>
+        <uri>directory/apacheds-shared/${apacheds_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>directory-protocols/jars/ldap-protocol-${ldap_protocols_version}.jar</uri>
+        <uri>directory-protocols/ldap-protocol/${ldap_protocols_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>directory-protocols/jars/kerberos-protocol-${kerberos_protocols_version}.jar</uri>
+        <uri>directory-protocols/kerberos-protocol/${kerberos_protocols_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>directory-network/jars/mina-${mina_version}.jar</uri>
+        <uri>directory-network/mina/${mina_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>directory-asn1/jars/asn1-ber-${asn1_version}.jar</uri>
+        <uri>directory-asn1/asn1-ber/${asn1_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>directory-asn1/jars/asn1-codec-${asn1_version}.jar</uri>
+        <uri>directory-asn1/asn1-codec/${asn1_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>directory-asn1/jars/asn1-der-${asn1_version}.jar</uri>
+        <uri>directory-asn1/asn1-der/${asn1_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>directory-shared/jars/apache-ldapber-provider-${apacheds_version}.jar</uri>
+        <uri>directory-shared/apache-ldapber-provider/${apacheds_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>directory-shared/jars/kerberos-common-${kerberos_common_version}.jar</uri>
+        <uri>directory-shared/kerberos-common/${kerberos_common_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>directory-shared/jars/ldap-common-${apacheds_version}.jar</uri>
+        <uri>directory-shared/ldap-common/${apacheds_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-io/jars/commons-io-${commons_io_version}.jar</uri>
+        <uri>commons-io/commons-io/${commons_io_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-primitives/jars/commons-primitives-${commons_primitives_version}.jar</uri>
+        <uri>commons-primitives/commons-primitives/${commons_primitives_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-collections/jars/commons-collections-${commons_collections_version}.jar</uri>
+        <uri>commons-collections/commons-collections/${commons_collections_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-lang/jars/commons-lang-${commons_lang_version}.jar</uri>
+        <uri>commons-lang/commons-lang/${commons_lang_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>oro/jars/oro-${oro_version}.jar</uri>
+        <uri>oro/oro/${oro_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>jdbm/jars/jdbm-${jdbm_version}.jar</uri>
+        <uri>jdbm/jdbm/${jdbm_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>xmlbeans/jars/xbean-${xmlbeans_version}.jar</uri>
+        <uri>xmlbeans/xbean/${xmlbeans_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>stax/jars/stax-api-${stax_api_version}.jar</uri>
+        <uri>stax/stax-api/${stax_api_version}/jar</uri>
     </dependency>
 
     <gbean gbeanName="geronimo.server:name=DirectoryService" class="org.apache.geronimo.directory.DirectoryGBean">
@@ -114,7 +114,7 @@
         <attribute name="host">0.0.0.0</attribute>
         <attribute name="port">${PlanLdapPort}</attribute>
         <attribute name="configFile">var/ldap/conf/directory.xml</attribute>
-        <reference name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><module>geronimo/system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
     </gbean>
 
 </configuration>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml Tue Nov 29 15:14:42 2005
@@ -23,15 +23,15 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment"
-    parentId="org/apache/geronimo/Client"
-    configId="org/apache/geronimo/ClientCORBA"
+    parentId="geronimo/client/${pom.currentVersion}/car"
+    configId="geronimo/client-corba/${pom.currentVersion}/car"
     >
 
     <gbean name="DyanmicStubClassLoader" class="org.openejb.corba.util.DynamicStubClassLoader"/>
 
     <gbean name="Server" class="org.openejb.corba.CORBABean">
         <reference name="ThreadPool">
-            <module>org/apache/geronimo/Client</module>
+            <module>geronimo/client/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="SecurityService">
@@ -47,11 +47,11 @@
 
     <gbean name="SSLClientCert" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>org/apache/geronimo/Client</module>
+            <module>geronimo/client/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>org/apache/geronimo/Client</module>
+            <module>geronimo/client/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -87,11 +87,11 @@
 
     <gbean name="SSLClientPassword" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>org/apache/geronimo/Client</module>
+            <module>geronimo/client/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>org/apache/geronimo/Client</module>
+            <module>geronimo/client/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -128,11 +128,11 @@
 
     <gbean name="NoSecurity" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>org/apache/geronimo/Client</module>
+            <module>geronimo/client/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>org/apache/geronimo/Client</module>
+            <module>geronimo/client/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml Tue Nov 29 15:14:42 2005
@@ -26,93 +26,93 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    parentId="org/apache/geronimo/ClientSystem"
-    configId="org/apache/geronimo/Client"
+    parentId="geronimo/client-system/${pom.currentVersion}/car"
+    configId="geronimo/client/${pom.currentVersion}/car"
     >
 
     <dependency>
-        <uri>geronimo-spec/jars/geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar</uri>
+        <uri>geronimo-spec/geronimo-spec-j2ee/${geronimo_spec_j2ee_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-client/${geronimo_version}/jar</uri>
     </dependency>
     <!-- for property editor support for some login modules/principals -->
     <dependency>
-        <uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-common/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-naming/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-security-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-security/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-activation-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-activation/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
+        <uri>openejb/openejb-core/${openejb_version}/jar</uri>
     </dependency>
 
     <!-- client side connector support -->
     <dependency>
-        <uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-core/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-connector/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>concurrent/jars/concurrent-${concurrent_version}.jar</uri>
+        <uri>concurrent/concurrent/${concurrent_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-transaction-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-transaction/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tranql/jars/tranql-${tranql_version}.jar</uri>
+        <uri>tranql/tranql/${tranql_version}/jar</uri>
     </dependency>
     <!-- required for rar 1.5 to load realms -->
     <dependency>
-        <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
+        <uri>regexp/regexp/${regexp_version}/jar</uri>
     </dependency>
     <!--connector deploys some jsr 77 beans... maybe this shoult be turned off-->
     <dependency>
-        <uri>geronimo/jars/geronimo-j2ee-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-j2ee/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-management-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-management/${geronimo_version}/jar</uri>
     </dependency>
 
     <!-- remote login -->
     <dependency>
-        <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
+        <uri>activeio/activeio/${activeio_version}/jar</uri>
     </dependency>
     <!--client side web services-->
     <dependency>
-        <uri>asm/jars/asm-${asm_version}.jar</uri>
+        <uri>asm/asm/${asm_version}/jar</uri>
     </dependency>
 
     <dependency>
-        <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-axis/${geronimo_version}/jar</uri>
     </dependency>
 
     <dependency>
-        <uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-webservices/${geronimo_version}/jar</uri>
     </dependency>
 
     <!--scout -->
     <dependency>
-        <uri>scout/jars/jaxr-api-${scout_version}.jar</uri>
+        <uri>scout/jaxr-api/${scout_version}/jar</uri>
     </dependency>
 
     <dependency>
-        <uri>scout/jars/scout-${scout_version}.jar</uri>
+        <uri>scout/scout/${scout_version}/jar</uri>
     </dependency>
 
     <dependency>
-        <uri>juddi/jars/juddi-${juddi_version}.jar</uri>
+        <uri>juddi/juddi/${juddi_version}/jar</uri>
     </dependency>
 
     <dependency>
-        <uri>jdom/jars/jdom-1.0.jar</uri>
+        <uri>jdom/jdom/${jdom_version}/jar</uri>
     </dependency>
 
     <!-- Naming properties -->

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-security-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-client-security-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-client-security-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-security-plan.xml Tue Nov 29 15:14:42 2005
@@ -26,15 +26,15 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment"
-    parentId="org/apache/geronimo/Client"
-    configId="org/apache/geronimo/ClientSecurity"
+    parentId="geronimo/client/${pom.currentVersion}/car"
+    configId="geronimo/client-security/${pom.currentVersion}/car"
     >
 
 
     <!-- required -->
     <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/ClientSystem</module>
+            <module>geronimo/client-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
         <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
@@ -97,7 +97,7 @@
             </lc:login-config>
         </xml-reference>
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/ClientSystem</module>
+            <module>geronimo/client-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
         <reference name="LoginService">

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Tue Nov 29 15:14:42 2005
@@ -23,206 +23,206 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/OfflineDeployer"
-    parentId="org/apache/geronimo/DeployerSystem"
+    configId="geronimo/offline-deployer/${pom.currentVersion}/car"
+    parentId="geronimo/deployer-system/${pom.currentVersion}/car"
     >
 
     <dependency>
-        <uri>geronimo-spec/jars/geronimo-spec-corba-${geronimo_spec_corba_version}.jar</uri>
+        <uri>geronimo-spec/geronimo-spec-corba/${geronimo_spec_corba_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-j2ee-schema/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-deployment-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-deployment/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-connector-builder/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>openejb/jars/openejb-pkgen-builder-${openejb_version}.jar</uri>
+        <uri>openejb/openejb-pkgen-builder/${openejb_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-j2ee-builder-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-j2ee-builder/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-naming-builder-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-naming-builder/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-web-builder-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-web-builder/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-client-builder-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-client-builder/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-security-builder-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-security-builder/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-service-builder-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-service-builder/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
+        <uri>openejb/openejb-builder/${openejb_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>xmlbeans/jars/xbean-${xmlbeans_version}.jar</uri>
+        <uri>xmlbeans/xbean/${xmlbeans_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>stax/jars/stax-api-${stax_api_version}.jar</uri>
+        <uri>stax/stax-api/${stax_api_version}/jar</uri>
     </dependency>
 
     <dependency>
-        <uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
+        <uri>openejb/openejb-core/${openejb_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-connector/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-core/${geronimo_version}/jar</uri>
     </dependency>
     <!-- needed to load some connector and core classes-->
     <dependency>
-        <uri>concurrent/jars/concurrent-${concurrent_version}.jar</uri>
+        <uri>concurrent/concurrent/${concurrent_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-j2ee-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-j2ee/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-management-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-management/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-security-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-security/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-naming/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-timer-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-timer/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-transaction-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-transaction/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-j2ee-schema/${geronimo_version}/jar</uri>
     </dependency>
     <!-- seems to be required to load jetty deployer - but I think this should not be here-->
     <dependency>
-        <uri>geronimo-spec/jars/geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar</uri>
+        <uri>geronimo-spec/geronimo-spec-j2ee/${geronimo_spec_j2ee_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo-spec/jars/geronimo-spec-j2ee-deployment-${geronimo_spec_j2ee_deployment_version}.jar</uri>
+        <uri>geronimo-spec/geronimo-spec-j2ee-deployment/${geronimo_spec_j2ee_deployment_version}/jar</uri>
     </dependency>
     <!-- required for rar 1.5 to load realms -->
     <dependency>
-        <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
+        <uri>regexp/regexp/${regexp_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tranql/jars/tranql-${tranql_version}.jar</uri>
+        <uri>tranql/tranql/${tranql_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>antlr/jars/antlr-${antlr_version}.jar</uri>
+        <uri>antlr/antlr/${antlr_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-client/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>asm/jars/asm-${asm_version}.jar</uri>
+        <uri>asm/asm/${asm_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-axis/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-axis-builder-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-axis-builder/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-webservices/${geronimo_version}/jar</uri>
     </dependency>
 
 
     <dependency>
-        <uri>geronimo/jars/geronimo-interop-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-interop/${geronimo_version}/jar</uri>
     </dependency>
 
     <dependency>
-        <uri>geronimo/jars/geronimo-servicemix-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-servicemix/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-servicemix-builder-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-servicemix-builder/${geronimo_version}/jar</uri>
     </dependency>
 
     <!--jetty-->
     <dependency>
-        <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-jetty/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-jetty-builder/${geronimo_version}/jar</uri>
     </dependency>
 
     <!--tomcat-->
     <dependency>
-        <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-tomcat/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tomcat/jars/catalina-${tomcat_version}.jar</uri>
+        <uri>tomcat/catalina/${tomcat_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tomcat/jars/catalina-cluster-${tomcat_version}.jar</uri>
+        <uri>tomcat/catalina-cluster/${tomcat_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tomcat/jars/catalina-optional-${tomcat_version}.jar</uri>
+        <uri>tomcat/catalina-optional/${tomcat_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tomcat/jars/tomcat-coyote-${tomcat_version}.jar</uri>
+        <uri>tomcat/tomcat-coyote/${tomcat_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tomcat/jars/tomcat-http-${tomcat_version}.jar</uri>
+        <uri>tomcat/tomcat-http/${tomcat_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tomcat/jars/tomcat-util-${tomcat_version}.jar</uri>
+        <uri>tomcat/tomcat-util/${tomcat_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tomcat/jars/naming-resources-${tomcat_version}.jar</uri>
+        <uri>tomcat/naming-resources/${tomcat_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tomcat/jars/servlets-default-${tomcat_version}.jar</uri>
+        <uri>tomcat/servlets-default/${tomcat_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tomcat/jars/servlets-invoker-${tomcat_version}.jar</uri>
+        <uri>tomcat/servlets-invoker/${tomcat_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-beanutils/jars/commons-beanutils-${commons_beanutils_version}.jar</uri>
+        <uri>commons-beanutils/commons-beanutils/${commons_beanutils_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-collections/jars/commons-collections-${commons_collections_version}.jar</uri>
+        <uri>commons-collections/commons-collections/${commons_collections_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-digester/jars/commons-digester-${commons_digester_version}.jar</uri>
+        <uri>commons-digester/commons-digester/${commons_digester_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
+        <uri>commons-el/commons-el/${commons_el_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-modeler/jars/commons-modeler-${commons_modeler_version}.jar</uri>
+        <uri>commons-modeler/commons-modeler/${commons_modeler_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
+        <uri>regexp/regexp/${regexp_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tomcat/jars/jasper-compiler-${jasper_version}.jar</uri>
+        <uri>tomcat/jasper-compiler/${jasper_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tomcat/jars/jasper-compiler-jdt-${jasper_version}.jar</uri>
+        <uri>tomcat/jasper-compiler-jdt/${jasper_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tomcat/jars/jasper-runtime-${jasper_version}.jar</uri>
+        <uri>tomcat/jasper-runtime/${jasper_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>tomcat/jars/tomcat-ajp-${tomcat_ajp_version}.jar</uri>
+        <uri>tomcat/tomcat-ajp/${tomcat_ajp_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>commons-el/jars/commons-el-${commons_el_version}.jar</uri>
+        <uri>commons-el/commons-el/${commons_el_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-tomcat-builder-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-tomcat-builder/${geronimo_version}/jar</uri>
     </dependency>
 
 
@@ -231,13 +231,13 @@
             <name>*</name>
         </reference>
         <reference name="Store">
-            <module>org/apache/geronimo/DeployerSystem</module>
+            <module>geronimo/deployer-system/${pom.currentVersion}/car</module>
             <name>*</name>
         </reference>
     </gbean>
 
     <gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="defaultParentId">geronimo/j2ee-server/${pom.currentVersion}/car</attribute>
         <reference name="Repository">
             <gbean-name>*:name=Repository,*</gbean-name>
         </reference>
@@ -255,14 +255,14 @@
     <gbean name="LoginConfigurationBuilder" class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
 
     <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="defaultParentId">geronimo/j2ee-server/${pom.currentVersion}/car</attribute>
         <!--domain set to wildcard so datasources may be deployed independently on client. -->
         <!--a better solution is to get the domain and server from the parent configuration -->
         <attribute name="transactionContextManagerObjectName">*:name=TransactionContextManager,*</attribute>
         <attribute name="connectionTrackerObjectName">*:name=ConnectionTracker,*</attribute>
         <attribute name="transactionalTimerObjectName">geronimo.server:name=TransactionalThreadPooledTimer,*</attribute>
         <attribute name="nonTransactionalTimerObjectName">geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
-        <attribute name="corbaGBeanObjectName">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ServerCorba,J2EEServer=geronimo,j2eeType=CORBABean,name=Server</attribute>
+        <attribute name="corbaGBeanObjectName">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/server-corba/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=CORBABean,name=Server</attribute>
         <reference name="Repository">
             <gbean-name>*:name=Repository,*</gbean-name>
         </reference>
@@ -301,7 +301,7 @@
     </gbean>
 
     <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="defaultParentId">geronimo/j2ee-server/${pom.currentVersion}/car</attribute>
         <attribute name="defaultMaxSize">10</attribute>
         <attribute name="defaultMinSize">0</attribute>
         <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
@@ -314,7 +314,7 @@
     </gbean>
 
     <gbean name="ClientConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Client</attribute>
+        <attribute name="defaultParentId">geronimo/client/${pom.currentVersion}/car</attribute>
         <attribute name="defaultMaxSize">10</attribute>
         <attribute name="defaultMinSize">0</attribute>
         <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
@@ -327,11 +327,11 @@
     </gbean>
 
     <gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
-        <attribute name="defaultClientParentId">org/apache/geronimo/Client</attribute>
-        <attribute name="defaultServerParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="defaultClientParentId">geronimo/client/${pom.currentVersion}/car</attribute>
+        <attribute name="defaultServerParentId">geronimo/j2ee-server/${pom.currentVersion}/car</attribute>
         <attribute name="transactionContextManagerObjectName">geronimo.client:name=TransactionContextManager,*</attribute>
         <attribute name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
-        <attribute name="corbaGBeanObjectName">geronimo.client:J2EEApplication=null,J2EEModule=org/apache/geronimo/ClientCorba,J2EEServer=client,j2eeType=CORBABean,name=Server,*</attribute>
+        <attribute name="corbaGBeanObjectName">geronimo.client:J2EEApplication=null,J2EEModule=geronimo/client-corba/${pom.currentVersion}/car,J2EEServer=client,j2eeType=CORBABean,name=Server,*</attribute>
         <reference name="EJBReferenceBuilder">
             <name>ClientEJBReferenceBuilder</name>
         </reference>
@@ -345,7 +345,7 @@
             <name>WebServiceBuilder</name>
         </reference>
         <reference name="Store">
-            <module>org/apache/geronimo/DeployerSystem</module>
+            <module>geronimo/deployer-system/${pom.currentVersion}/car</module>
             <name>*</name>
         </reference>
         <reference name="Repository">
@@ -357,8 +357,8 @@
     </gbean>
 
     <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
-        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=WebContainer</attribute>
+        <attribute name="defaultParentId">geronimo/j2ee-server/${pom.currentVersion}/car</attribute>
+        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=WebContainer</attribute>
         <reference name="WebServiceLinkTemplate">
             <name>WebServiceEJBLinkTemplate</name>
         </reference>
@@ -374,10 +374,10 @@
     </gbean>
 
     <gbean name="JBIBuilder" class="org.apache.geronimo.servicemix.deployment.ServiceMixConfigBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="defaultParentId">geronimo/j2ee-server/${pom.currentVersion}/car</attribute>
         <attribute name="deploymentDependencies">
-            servicemix/jars/spring-${servicemix_spring_version}.jar,
-            servicemix/jars/servicemix-${servicemix_version}.jar
+            servicemix/spring/${servicemix_spring_version}/jar,
+            servicemix/servicemix/${servicemix_version}/jar
         </attribute>
         <reference name="Repository">
             <gbean-name>*:name=Repository,*</gbean-name>
@@ -401,19 +401,19 @@
     <!-- jetty builder -->
 
     <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server,org/apache/geronimo/Jetty</attribute>
+        <attribute name="defaultParentId">geronimo/j2ee-server/${pom.currentVersion}/car,geronimo/jetty/${pom.currentVersion}/car</attribute>
         <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
         <attribute name="defaultContextPriorityClassloader">false</attribute>
         <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
         <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
         <reference name="DefaultServlets">
-            <gbean-name>geronimo.deployer:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/OfflineDeployer,*</gbean-name>
+            <gbean-name>geronimo.deployer:j2eeType=DefaultServlet,J2EEModule=geronimo/offline-deployer/${pom.currentVersion}/car,*</gbean-name>
         </reference>
         <reference name="PojoWebServiceTemplate">
-            <gbean-name>geronimo.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/OfflineDeployer,J2EEServer=deployer,j2eeType=ServletWebServiceTemplate,name=POJOTemplate</gbean-name>
+            <gbean-name>geronimo.deployer:J2EEApplication=null,J2EEModule=geronimo/offline-deployer/${pom.currentVersion}/car,J2EEServer=deployer,j2eeType=ServletWebServiceTemplate,name=POJOTemplate</gbean-name>
         </reference>
         <reference name="WebServiceBuilder">
-            <module>org/apache/geronimo/OfflineDeployer</module>
+            <module>geronimo/offline-deployer/${pom.currentVersion}/car</module>
             <name>WebServiceBuilder</name>
         </reference>
         <reference name="Repository">
@@ -452,7 +452,7 @@
 
     <!-- tomcat builder -->
     <gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server,org/apache/geronimo/Tomcat</attribute>
+        <attribute name="defaultParentId">geronimo/j2ee-server/${pom.currentVersion}/car,geronimo/tomcat/${pom.currentVersion}/car</attribute>
         <attribute name="defaultContextPriorityClassloader">false</attribute>
         <attribute name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
         <reference name="WebServiceBuilder">

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-hot-deploy-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-hot-deploy-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-hot-deploy-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-hot-deploy-plan.xml Tue Nov 29 15:14:42 2005
@@ -19,33 +19,33 @@
 <!-- $Rev: 57116 $ $Date: 2004-11-09 17:34:38 -0800 (Tue, 09 Nov 2004) $ -->
 
 <!--
-Child of the org/apache/geronimo/Server configuration that includes deployment services
+Child of the geronimo/j2ee-server/${pom.currentVersion}/car configuration that includes deployment services
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/HotDeployer"
-    parentId="org/apache/geronimo/RuntimeDeployer"
+    configId="geronimo/hot-deployer/${pom.currentVersion}/car"
+    parentId="geronimo/runtime-deployer/${pom.currentVersion}/car"
     >
 
     <dependency>
-        <uri>geronimo/jars/geronimo-hot-deploy-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-hot-deploy/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-deploy-tool-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-deploy-tool/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-deploy-jsr88-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-deploy-jsr88/${geronimo_version}/jar</uri>
     </dependency>
 
     <gbean name="HotDeployer" class="org.apache.geronimo.deployment.hot.DirectoryHotDeployer">
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
 		<attribute name="path">deploy/</attribute>
         <attribute name="pollIntervalMillis">2000</attribute>
         <dependency>
-            <module>org/apache/geronimo/RuntimeDeployer</module>
+            <module>geronimo/runtime-deployer/${pom.currentVersion}/car</module>
             <type>ConfigBuilder</type>
             <name>EARBuilder</name>
         </dependency>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml Tue Nov 29 15:14:42 2005
@@ -23,12 +23,12 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/Jetty"
-    parentId="org/apache/geronimo/RMINaming"
+    configId="geronimo/jetty/${pom.currentVersion}/car"
+    parentId="geronimo/rmi-naming/${pom.currentVersion}/car"
     >
 
     <dependency>
-        <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-jetty/${geronimo_version}/jar</uri>
     </dependency>
 
     <!-- david jencks is not convinced that these 2 gbeans should be in this
@@ -39,7 +39,7 @@
 
     <gbean name="JettyAccessLogManager" class="org.apache.geronimo.jetty.requestlog.JettyLogManagerImpl">
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
         <references name="LogGBeans">
@@ -60,7 +60,7 @@
             <name>JettyWebContainer</name>
         </reference>
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
         <attribute name="filename">var/log/jetty_yyyy_mm_dd.log</attribute>
@@ -94,7 +94,7 @@
             <name>JettyWebContainer</name>
         </reference>
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml Tue Nov 29 15:14:42 2005
@@ -19,33 +19,33 @@
 
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/JettyRuntimeDeployer"
-    parentId="org/apache/geronimo/RuntimeDeployer"
+    configId="geronimo/jetty-runtime-deployer/${pom.currentVersion}/car"
+    parentId="geronimo/runtime-deployer/${pom.currentVersion}/car"
     >
 
     <import>
-        <uri>org/apache/geronimo/Jetty</uri>
+        <uri>geronimo/jetty/${pom.currentVersion}/car</uri>
     </import>
 
 
     <dependency>
-        <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-jetty-builder/${geronimo_version}/jar</uri>
     </dependency>
 
     <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server,org/apache/geronimo/Jetty</attribute>
+        <attribute name="defaultParentId">geronimo/j2ee-server/${pom.currentVersion}/car,geronimo/jetty/${pom.currentVersion}/car</attribute>
         <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
         <attribute name="defaultContextPriorityClassloader">false</attribute>
         <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
         <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
         <reference name="DefaultServlets">
-            <gbean-name>geronimo.server:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/JettyRuntimeDeployer,*</gbean-name>
+            <gbean-name>geronimo.server:j2eeType=DefaultServlet,J2EEModule=geronimo/jetty-runtime-deployer/${pom.currentVersion}/car,*</gbean-name>
         </reference>
         <reference name="PojoWebServiceTemplate">
-            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/JettyRuntimeDeployer,J2EEServer=geronimo,j2eeType=ServletWebServiceTemplate,name=POJOTemplate</gbean-name>
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/jetty-runtime-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ServletWebServiceTemplate,name=POJOTemplate</gbean-name>
         </reference>
         <reference name="WebServiceBuilder">
-            <module>org/apache/geronimo/RuntimeDeployer</module>
+            <module>geronimo/runtime-deployer/${pom.currentVersion}/car</module>
             <name>WebServiceBuilder</name>
         </reference>
         <reference name="Repository">



Mime
View raw message