Return-Path: 
 <scm-return-8782-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 71561 invoked from network); 29 Nov 2005 23:17:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 29 Nov 2005 23:17:03 -0000
Received: (qmail 67244 invoked by uid 500); 29 Nov 2005 23:17:00 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 67204 invoked by uid 500); 29 Nov 2005 23:16:59 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 67056 invoked by uid 99); 29 Nov 2005 23:16:58 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Nov 2005 15:16:58 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 29 Nov 2005 15:18:24 -0800
Received: (qmail 71342 invoked by uid 65534); 29 Nov 2005 23:16:33 -0000
Message-ID: <20051129231633.71340.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r349830 [3/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 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml Tue Nov 29 15:14:42 2005
@@ -19,66 +19,66 @@
 <!-- $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/RuntimeDeployer"
-    parentId="org/apache/geronimo/Server"
+    configId="geronimo/runtime-deployer/${pom.currentVersion}/car"
+    parentId="geronimo/j2ee-server/${pom.currentVersion}/car"
     >
 
     <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>openejb/jars/openejb-pkgen-builder-${openejb_version}.jar</uri>
+        <uri>openejb/openejb-pkgen-builder/${openejb_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>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>asm/jars/asm-${asm_version}.jar</uri>
+        <uri>asm/asm/${asm_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-interop-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-interop/${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>
 
     <!-- deployer gbeans -->
@@ -87,13 +87,13 @@
             <name>*</name>
         </reference>
         <reference name="Store">
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/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>
@@ -111,12 +111,12 @@
     <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>
         <attribute name="transactionContextManagerObjectName">geronimo.server:name=TransactionContextManager,*</attribute>
         <attribute name="connectionTrackerObjectName">geronimo.server: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>
@@ -158,7 +158,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>
@@ -171,7 +171,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>
@@ -184,11 +184,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>
@@ -202,7 +202,7 @@
             <name>WebServiceBuilder</name>
         </reference>
         <reference name="Store">
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/system/${pom.currentVersion}/car</module>
             <name>*</name>
         </reference>
         <reference name="Repository">
@@ -214,8 +214,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=JettyWebContainer</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=JettyWebContainer</attribute>
         <reference name="WebServiceLinkTemplate">
             <name>WebServiceEJBLinkTemplate</name>
         </reference>
@@ -231,10 +231,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>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml Tue Nov 29 15:14:42 2005
@@ -26,8 +26,8 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/SampleSecurityRealm"
-    parentId="org/apache/geronimo/Server"
+    configId="geronimo/sample-security/${pom.currentVersion}/car"
+    parentId="geronimo/security/${pom.currentVersion}/car"
     >
 
     <!-- Security GBeans -->
@@ -50,10 +50,10 @@
             <name>demo-properties-login</name>
         </reference>
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
-        <reference name="LoginService"><module>org/apache/geronimo/Server</module><name>JaasLoginService</name></reference>
+        <reference name="LoginService"><module>geronimo/security/${pom.currentVersion}/car</module><name>JaasLoginService</name></reference>
     </gbean>
 
     <gbean name="demo-properties-login" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
@@ -67,7 +67,7 @@
         class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
         <attribute name="applicationConfigName">jaasTest</attribute>
         <attribute name="realmName">demo-properties-realm</attribute>
-        <reference name="LoginService"><module>org/apache/geronimo/Server</module><name>JaasLoginService</name></reference>
+        <reference name="LoginService"><module>geronimo/security/${pom.currentVersion}/car</module><name>JaasLoginService</name></reference>
     </gbean>
 
 </configuration>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-security-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-security-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-security-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-security-plan.xml Tue Nov 29 15:14:42 2005
@@ -23,19 +23,19 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/Security"
-    parentId="org/apache/geronimo/RMINaming"
+    configId="geronimo/security/${pom.currentVersion}/car"
+    parentId="geronimo/rmi-naming/${pom.currentVersion}/car"
     >
 
 
     <!--runtime dependencies-->
     <dependency>
-        <uri>geronimo/jars/geronimo-jmxremoting-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-jmxremoting/${geronimo_version}/jar</uri>
     </dependency>
 
 
     <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
-        <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>
         <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
         <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
     </gbean>
@@ -88,7 +88,7 @@
         <reference name="LoginModuleConfiguration">
             <name>properties-login</name>
         </reference>
-        <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>
         <reference name="LoginService"><name>JaasLoginService</name></reference>
     </gbean>
     <gbean name="properties-login" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-corba-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-corba-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-corba-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-corba-plan.xml Tue Nov 29 15:14:42 2005
@@ -24,8 +24,8 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/ServerCORBA"
-    parentId="org/apache/geronimo/Server"
+    configId="geronimo/server-corba/${pom.currentVersion}/car"
+    parentId="geronimo/j2ee-server/${pom.currentVersion}/car"
     >
 
     <!-- CORBA -->
@@ -33,7 +33,7 @@
 
     <gbean name="NameServer" class="org.openejb.corba.SunNameService">
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
         <attribute name="dbDir">var/cosnaming.db</attribute>
@@ -43,7 +43,7 @@
     <!-- connections require SSL, no client cert, client logs in with password, no identity token -->
     <gbean name="Server" class="org.openejb.corba.CORBABean">
         <reference name="ThreadPool">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="NameService">
@@ -166,7 +166,7 @@
     <!-- orb with no security whatsoever -->
     <gbean name="UnprotectedServer" class="org.openejb.corba.CORBABean">
         <reference name="ThreadPool">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="NameService">
@@ -260,11 +260,11 @@
     <!--CSS beans for client security.  These specify what the client is willing to provide -->
     <gbean name="SSLClientCert" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -300,11 +300,11 @@
 
     <gbean name="SSLClientPassword" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -341,11 +341,11 @@
 
     <gbean name="SSLIdentityTokenPrincipal" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -381,11 +381,11 @@
 
     <gbean name="SSLIdentityTokenCert" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -421,11 +421,11 @@
 
     <gbean name="NoSecurityIdentityTokenPrincipal" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -457,11 +457,11 @@
 
     <gbean name="NoSecurityIdentityTokenCert" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>TransactionContextManager</name>
         </reference>
         <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
@@ -493,11 +493,11 @@
 
     <gbean name="NoSecurity" class="org.openejb.corba.CSSBean">
         <reference name="ThreadPool">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${pom.currentVersion}/car</module>
             <name>DefaultThreadPool</name>
         </reference>
         <reference name="TransactionContextManager">
-            <module>org/apache/geronimo/Server</module>
+            <module>geronimo/j2ee-server/${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-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Tue Nov 29 15:14:42 2005
@@ -26,105 +26,105 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/Server"
-    parentId="org/apache/geronimo/RMINaming"
+    configId="geronimo/j2ee-server/${pom.currentVersion}/car"
+    parentId="geronimo/rmi-naming/${pom.currentVersion}/car"
     >
 
 
     <!--runtime dependencies-->
     <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-timer-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-timer/${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>openejb/jars/openejb-core-${openejb_version}.jar</uri>
+        <uri>openejb/openejb-core/${openejb_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-jmxremoting-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-jmxremoting/${geronimo_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>
 
     <!-- for timer serialization implementation -->
     <dependency>
-        <uri>xstream/jars/xstream-${xstream_version}.jar</uri>
+        <uri>xstream/xstream/${xstream_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>xpp3/jars/xpp3-${xpp3_version}.jar</uri>
+        <uri>xpp3/xpp3/${xpp3_version}/jar</uri>
     </dependency>
 
     <dependency>
-        <uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-common/${geronimo_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-webservices-${geronimo_version}.jar</uri>
+         <uri>geronimo/geronimo-webservices/${geronimo_version}/jar</uri>
     </dependency>
 
     <!-- for JBI container -->
     <dependency>
-        <uri>geronimo/jars/geronimo-servicemix-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-servicemix/${geronimo_version}/jar</uri>
     </dependency>
 
     <dependency>
-        <uri>activemq/jars/activemq-gbean-management-${activemq_version}.jar</uri>
+        <uri>activemq/activemq-gbean-management/${activemq_version}/jar</uri>
     </dependency>
     <!-- remote login -->
     <dependency>
-        <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
+        <uri>activeio/activeio/${activeio_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>
 
     <!-- Derby classes must be loaded from a common classloader -->
     <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>
 
     <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
@@ -156,7 +156,7 @@
         <attribute name="maxLogFiles">2</attribute>
         <attribute name="minBuffers">4</attribute>
         <attribute name="threadsWaitingForceThreshold">-1</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>
 
     <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
@@ -206,14 +206,14 @@
     <!-- JSR77 Management Objects -->
     <gbean gbeanName="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
     <gbean gbeanName="geronimo.server:j2eeType=J2EEServer,name=geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
-        <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>
 
     <gbean gbeanName="geronimo.server:j2eeType=JVM,J2EEServer=geronimo,name=JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
 
     <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
 
-    <gbean gbeanName="geronimo.server:J2EEApplication=null,EJBModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
+    <gbean gbeanName="geronimo.server:J2EEApplication=null,EJBModule=geronimo/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
 
     <gbean name="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
 

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml Tue Nov 29 15:14:42 2005
@@ -23,82 +23,82 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/Tomcat"
-    parentId="org/apache/geronimo/RMINaming"
+    configId="geronimo/tomcat/${pom.currentVersion}/car"
+    parentId="geronimo/rmi-naming/${pom.currentVersion}/car"
     >
 
     <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>mx4j/jars/mx4j-${mx4j_version}.jar</uri>
+        <uri>mx4j/mx4j/${mx4j_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>
 
     <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>org/apache/geronimo/System</module>
+            <module>geronimo/system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>
@@ -117,7 +117,7 @@
             <name>TomcatEngine</name>
         </reference>
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>
@@ -175,7 +175,7 @@
             <name>TomcatWebContainer</name>
         </reference>
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>
@@ -206,7 +206,7 @@
 
     <gbean name="TomcatAccessLogManager" class="org.apache.geronimo.tomcat.TomcatLogManagerImpl">
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
         <references name="LogGBeans">

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-runtime-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-runtime-deployer-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-runtime-deployer-plan.xml Tue Nov 29 15:14:42 2005
@@ -20,24 +20,24 @@
 
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/TomcatRuntimeDeployer"
-    parentId="org/apache/geronimo/RuntimeDeployer"
+    configId="geronimo/tomcat-runtime-deployer/${pom.currentVersion}/car"
+    parentId="geronimo/runtime-deployer/${pom.currentVersion}/car"
     >
 
     <import>
-        <uri>org/apache/geronimo/Tomcat</uri>
+        <uri>geronimo/tomcat/${pom.currentVersion}/car</uri>
     </import>
 
     <dependency>
-        <uri>geronimo/jars/geronimo-tomcat-builder-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-tomcat-builder/${geronimo_version}/jar</uri>
     </dependency>
 
     <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">
-            <module>org/apache/geronimo/RuntimeDeployer</module>
+            <module>geronimo/runtime-deployer/${pom.currentVersion}/car</module>
             <name>WebServiceBuilder</name>
         </reference>
         <reference name="Repository">

Modified: geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml Tue Nov 29 15:14:42 2005
@@ -24,55 +24,55 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/RMINaming"
-    parentId="org/apache/geronimo/System"
+    configId="geronimo/rmi-naming/${pom.currentVersion}/car"
+    parentId="geronimo/system/${pom.currentVersion}/car"
     >
 
     <dependency>
-        <uri>geronimo/jars/geronimo-management-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-management/${geronimo_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-webservices-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-webservices/${geronimo_version}/jar</uri>
     </dependency>
     <!-- activation must come before spec-j2ee to override stock mailcap file in its javamail api -->
     <dependency>
-        <uri>geronimo/jars/geronimo-activation-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-activation/${geronimo_version}/jar</uri>
     </dependency>
     <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-transaction-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-transaction/${geronimo_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>howl/jars/howl-logger-${howl_version}.jar</uri>
+        <uri>howl/howl-logger/${howl_version}/jar</uri>
     </dependency>
     <!--transaction module requires tranql for cache class -->
     <dependency>
-        <uri>tranql/jars/tranql-${tranql_version}.jar</uri>
+        <uri>tranql/tranql/${tranql_version}/jar</uri>
     </dependency>
     <!-- tranql requires antlr -->
     <dependency>
-        <uri>antlr/jars/antlr-${antlr_version}.jar</uri>
+        <uri>antlr/antlr/${antlr_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>concurrent/jars/concurrent-${concurrent_version}.jar</uri>
+        <uri>concurrent/concurrent/${concurrent_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-core/${geronimo_version}/jar</uri>
     </dependency>
     <!-- remote login -->
     <dependency>
-        <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
+        <uri>activeio/activeio/${activeio_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri>
+        <uri>geronimo/geronimo-naming/${geronimo_version}/jar</uri>
     </dependency>
 
     <!-- RMI Registry -->
@@ -102,7 +102,7 @@
             javax.net.ssl.trustStore=var/security/keystore
         </attribute>
         <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/spring-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml Tue Nov 29 15:14:42 2005
@@ -20,30 +20,30 @@
 
 <configuration
   xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-  configId="org/apache/geronimo/SpringDeployer"
-  parentId="org/apache/geronimo/SpringRuntime"
+  configId="geronimo/spring-deployer/${pom.currentVersion}/car"
+  parentId="geronimo/spring-runtime/${pom.currentVersion}/car"
   >
 
   <dependency>
-    <uri>springframework/jars/spring-${spring_version}.jar</uri><!-- lose later -->
+    <uri>springframework/spring/${spring_version}/jar</uri><!-- lose later -->
   </dependency>
   <dependency>
-    <uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>
+    <uri>geronimo/geronimo-common/${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-spring-builder-${geronimo_version}.jar</uri>
+    <uri>geronimo/geronimo-spring-builder/${geronimo_version}/jar</uri>
   </dependency>
 
   <gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
     <reference name="Builders"><name>SPRBuilder</name></reference>
-      <reference name="Store"><module>org/apache/geronimo/System</module><name>*</name></reference>
+      <reference name="Store"><module>geronimo/system/${pom.currentVersion}/car</module><name>*</name></reference>
   </gbean>
 
   <gbean name="SPRBuilder" class="org.apache.geronimo.spring.deployment.SPRConfigBuilder">
-    <attribute name="defaultParentId">org/apache/geronimo/SpringRuntime</attribute>
+    <attribute name="defaultParentId">geronimo/spring-runtime/${pom.currentVersion}/car</attribute>
     <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
   </gbean>
 

Modified: geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/spring-runtime-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="org/apache/geronimo/SpringRuntime"
-  parentId="org/apache/geronimo/System"
+  configId="geronimo/spring-runtime/${pom.currentVersion}/car"
+  parentId="geronimo/system/${pom.currentVersion}/car"
   >
 
   <dependency>
-    <uri>springframework/jars/spring-${spring_version}.jar</uri>
+    <uri>springframework/spring/${spring_version}/jar</uri>
   </dependency>
   <dependency>
-    <uri>geronimo/jars/geronimo-spring-${geronimo_version}.jar</uri>
+    <uri>geronimo/geronimo-spring/${geronimo_version}/jar</uri>
   </dependency>
 
 <!--

Modified: geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml Tue Nov 29 15:14:42 2005
@@ -20,17 +20,17 @@
 
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="org/apache/geronimo/ActiveMQServer"
-    parentId="org/apache/geronimo/SystemDatabase">
+    configId="geronimo/activemq-broker/${pom.currentVersion}/car"
+    parentId="geronimo/system-database/${pom.currentVersion}/car">
 
     <dependency>
-        <uri>activemq/jars/activemq-core-${activemq_version}.jar</uri>
+        <uri>activemq/activemq-core/${activemq_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>activemq/jars/activemq-gbean-${activemq_version}.jar</uri>
+        <uri>activemq/activemq-gbean/${activemq_version}/jar</uri>
     </dependency>
     <dependency>
-        <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
+        <uri>activeio/activeio/${activeio_version}/jar</uri>
     </dependency>
 
     <!-- management -->
@@ -50,24 +50,24 @@
 
     <gbean name="ActiveMQ.journal" class="org.activemq.store.journal.JournalPersistenceAdapterGBean">
         <!--TODO change to ServerInfo -->
-        <reference name="serverInfo"><module>org/apache/geronimo/System</module><type>GBean</type><name>ServerInfo</name></reference>
+        <reference name="serverInfo"><module>geronimo/system/${pom.currentVersion}/car</module><type>GBean</type><name>ServerInfo</name></reference>
         <attribute name="directory">var/activemq/journal</attribute>
         <attribute name="journalType">default</attribute>
         <reference name="longTermPersistence"><gbean-name>geronimo.server:j2eeType=JMSPersistence,name=ActiveMQ.jdbc,*</gbean-name></reference>
     </gbean>
 
     <gbean name="ActiveMQ.jdbc" class="org.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
-        <reference name="dataSource"><gbean-name>geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemDatabase,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</gbean-name></reference>
+        <reference name="dataSource"><gbean-name>geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo/system-database/${pom.currentVersion}/car,j2eeType=JCAManagedConnectionFactory,name=SystemDatasource</gbean-name></reference>
     </gbean>
 
-    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.tcp.default" class="org.activemq.gbean.ActiveMQConnectorGBean">
+    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=geronimo/activemq-broker/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.tcp.default" class="org.activemq.gbean.ActiveMQConnectorGBean">
         <attribute name="protocol">tcp</attribute>
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanActiveMQPort}</attribute>
         <reference name="activeMQContainer"><gbean-name>geronimo.server:j2eeType=JMSServer,name=ActiveMQ,*</gbean-name></reference>
     </gbean>
 
-    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.vm.localhost" class="org.activemq.gbean.ActiveMQConnectorGBean">
+    <gbean gbeanName="geronimo.server:J2EEApplication=null,J2EEModule=geronimo/activemq-broker/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=JMSConnector,broker=ActiveMQ,name=ActiveMQ.vm.localhost" class="org.activemq.gbean.ActiveMQConnectorGBean">
         <attribute name="protocol">vm</attribute>
         <attribute name="host">localhost</attribute>
         <attribute name="port">-1</attribute>

Modified: geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml Tue Nov 29 15:14:42 2005
@@ -19,8 +19,19 @@
 <!-- $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="org/apache/geronimo/SystemDatabase"
-    parentId="org/apache/geronimo/Server">
+    configId="geronimo/system-database/${pom.currentVersion}/car"
+    parentId="geronimo/j2ee-server/${pom.currentVersion}/car">
+
+    <!-- are these dependencies needed here? if not, why not? -->
+    <dependency>
+        <uri>org.apache.derby/derby/${derby_version}/jar</uri>
+    </dependency>
+    <dependency>
+        <uri>org.apache.derby/derbynet/${derby_version}/jar</uri>
+    </dependency>
+    <dependency>
+        <uri>geronimo/geronimo-derby/${geronimo_version}/jar</uri>
+    </dependency>
 
     <resourceadapter>
         <outbound-resourceadapter>
@@ -48,7 +59,7 @@
     </resourceadapter>
 
     <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
-        <reference name="ServerInfo"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><moduleType>J2EEModule</moduleType><module>geronimo/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">
@@ -60,17 +71,17 @@
 
     <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
         <attribute name="repeatCount">5</attribute>
-        <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</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>org/apache/geronimo/Server</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>org/apache/geronimo/Server</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>org/apache/geronimo/Server</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/modules/assembly/src/plan/system-jms-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml Tue Nov 29 15:14:42 2005
@@ -19,8 +19,8 @@
 <!-- $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="org/apache/geronimo/SystemJMS"
-    parentId="org/apache/geronimo/ActiveMQServer">
+    configId="geronimo/system-jms/${pom.currentVersion}/car"
+    parentId="geronimo/activemq-broker/${pom.currentVersion}/car">
     <resourceadapter>
         <resourceadapter-instance>
             <resourceadapter-name>ActiveMQ RA</resourceadapter-name>

Modified: geronimo/trunk/modules/assembly/src/plan/system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/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/System"
+    configId="geronimo/system/${pom.currentVersion}/car"
     domain="geronimo.server"
     server="geronimo"
     >

Modified: geronimo/trunk/modules/assembly/src/plan/uddi-server-jetty-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/uddi-server-jetty-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/uddi-server-jetty-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/uddi-server-jetty-plan.xml Tue Nov 29 15:14:42 2005
@@ -20,12 +20,12 @@
 
 <web-app
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
-    configId="org/apache/geronimo/juddiServer/${pom.currentVersion}/Jetty"
-    parentId="org/apache/geronimo/SystemDatabase"
+    configId="geronimo/uddi-jetty/${pom.currentVersion}/car"
+    parentId="geronimo/system-database/${pom.currentVersion}/car"
     >
 
     <dependency>
-        <uri>juddi/jars/juddi-${juddi_version}.jar</uri>
+        <uri>juddi/juddi/${juddi_version}/jar</uri>
     </dependency>
 
     <context-root>/juddi</context-root>

Modified: geronimo/trunk/modules/assembly/src/plan/uddi-server-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/uddi-server-tomcat-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/uddi-server-tomcat-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/uddi-server-tomcat-plan.xml Tue Nov 29 15:14:42 2005
@@ -20,12 +20,12 @@
 
 <web-app
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
-    configId="org/apache/geronimo/juddiServer/${pom.currentVersion}/Tomcat"
-    parentId="org/apache/geronimo/SystemDatabase"
+    configId="geronimo/uddi-tomcat/${pom.currentVersion}/car"
+    parentId="geronimo/system-database/${pom.currentVersion}/car"
     >
 
     <dependency>
-        <uri>juddi/jars/juddi-${juddi_version}.jar</uri>
+        <uri>juddi/juddi/${juddi_version}/jar</uri>
     </dependency>
 
     <context-root>/juddi</context-root>

Modified: geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml Tue Nov 29 15:14:42 2005
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-    configId="org/apache/geronimo/Console/Jetty"
-    parentId="org/apache/geronimo/Server">
-    
+    configId="geronimo/console-jetty/${pom.currentVersion}/car"
+    parentId="geronimo/j2ee-server/${pom.currentVersion}/car">
+
     <import>
-      <uri>org/apache/geronimo/Jetty</uri>
+      <uri>geronimo/jetty/${pom.currentVersion}/car</uri>
     </import>
 
     <!-- these dependencies must be kept here so that their classes are loaded in the "EARs" classloader. -->
@@ -117,11 +117,11 @@
     <!-- Console specific server info -->
     <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
         <reference name="ServerInfo">
-            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/System,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/system/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
         </reference>
         <reference name="LoginModule">
-            <!--            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>-->
-            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Security,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>
+            <!--            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>-->
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/security/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>
         </reference>
     </gbean>
 
@@ -134,7 +134,7 @@
         <reference name="serverInfo">
             <application>null</application>
             <moduleType>J2EEModule</moduleType>
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/system/${pom.currentVersion}/car</module>
             <type>GBean</type>
             <name>ServerInfo</name>
         </reference>

Modified: geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml Tue Nov 29 15:14:42 2005
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-    configId="org/apache/geronimo/Console/Tomcat"
-    parentId="org/apache/geronimo/Server">
+    configId="geronimo/console-tomcat/${pom.currentVersion}/car"
+    parentId="geronimo/j2ee-server/${pom.currentVersion}/car">
 
     <import>
-      <uri>org/apache/geronimo/Tomcat</uri>
+      <uri>geronimo/tomcat/${pom.currentVersion}/car</uri>
     </import>
 
     <!-- these dependencies must be kept here so that their classes are loaded in the "EARs" classloader. -->
@@ -119,11 +119,11 @@
     <!-- Console specific server info -->
     <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
         <reference name="ServerInfo">
-            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/System,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/system/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
         </reference>
         <reference name="LoginModule">
-            <!--            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>-->
-            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Security,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>
+            <!--            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>-->
+            <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/security/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>
         </reference>
     </gbean>
 
@@ -136,7 +136,7 @@
         <reference name="serverInfo">
             <application>null</application>
             <moduleType>J2EEModule</moduleType>
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/system/${pom.currentVersion}/car</module>
             <type>GBean</type>
             <name>ServerInfo</name>
         </reference>

Modified: geronimo/trunk/modules/assembly/src/plan/welcome-jetty-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/welcome-jetty-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/welcome-jetty-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/welcome-jetty-plan.xml Tue Nov 29 15:14:42 2005
@@ -19,8 +19,8 @@
 <!-- $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="org/apache/geronimo/applications/Welcome/Jetty"
-    parentId="org/apache/geronimo/Server"
+    configId="geronimo/welcome-jetty/${pom.currentVersion}/car"
+    parentId="geronimo/j2ee-server/${pom.currentVersion}/car"
     >
 
     <context-root>/</context-root>

Modified: geronimo/trunk/modules/assembly/src/plan/welcome-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/welcome-tomcat-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/welcome-tomcat-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/welcome-tomcat-plan.xml Tue Nov 29 15:14:42 2005
@@ -19,8 +19,8 @@
 <!-- $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/tomcat-1.0"
-    configId="org/apache/geronimo/applications/Welcome/Tomcat"
-    parentId="org/apache/geronimo/Server"
+    configId="geronimo/welcome-tomcat/${pom.currentVersion}/car"
+    parentId="geronimo/j2ee-server/${pom.currentVersion}/car"
     >
 
     <context-root>/</context-root>

Modified: geronimo/trunk/modules/assembly/src/var/config/config.client.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.client.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.client.xml (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.client.xml Tue Nov 29 15:14:42 2005
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
-    <configuration name="org/apache/geronimo/ClientCORBA">
+    <configuration name="geronimo/client/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/client-corba/${pom.currentVersion}/car">
         <gbean name="Server">
             <attribute name="args">-ORBPort, ${PlanORBSSLPort}, -ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
             <attribute name="props">

Modified: geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml Tue Nov 29 15:14:42 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
-    <configuration name="org/apache/geronimo/RMINaming">
+    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -10,15 +10,15 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/RuntimeDeployer">
+    <configuration name="geronimo/runtime-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</attribute>
         </gbean>
         <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/jetty/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Jetty">
+    <configuration name="geronimo/jetty/${pom.currentVersion}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -29,13 +29,13 @@
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Server">
+    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car">
         <gbean name="openejb:type=NetworkService,name=EJB">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Security">
+    <configuration name="geronimo/security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -44,7 +44,7 @@
             <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/ServerCORBA" load="false">
+    <configuration name="geronimo/server-corba/${pom.currentVersion}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -56,29 +56,29 @@
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/ActiveMQServer">
+    <configuration name="geronimo/activemq-broker/${pom.currentVersion}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/SystemJMS"/>
-    <configuration name="org/apache/geronimo/SystemDatabase">
+    <configuration name="geronimo/system-jms/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/system-database/${pom.currentVersion}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Directory">
+    <configuration name="geronimo/directory/${pom.currentVersion}/car">
         <gbean name="geronimo.server:name=DirectoryService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanLdapPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/JettyRuntimeDeployer"/>
-    <configuration name="org/apache/geronimo/applications/Welcome/Jetty"/>
-    <configuration name="org/apache/geronimo/Console/Jetty"/>
-    <configuration name="org/apache/geronimo/HotDeployer">
+    <configuration name="geronimo/jetty-runtime-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/welcome-jetty/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/console-jetty/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car">
         <gbean name="HotDeployer">
             <attribute name="path">deploy</attribute>
             <attribute name="pollIntervalMillis">2000</attribute>

Modified: geronimo/trunk/modules/assembly/src/var/config/config.offline.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.offline.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.offline.xml (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.offline.xml Tue Nov 29 15:14:42 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
-    <configuration name="org/apache/geronimo/OfflineDeployer">
+    <configuration name="geronimo/offline-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">${PlanWebBuilderDefaultNamespace}</attribute>
         </gbean>

Modified: geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml Tue Nov 29 15:14:42 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
-    <configuration name="org/apache/geronimo/RMINaming">
+    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -10,15 +10,15 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/RuntimeDeployer">
+    <configuration name="geronimo/runtime-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
         </gbean>
         <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Tomcat,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/tomcat/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Tomcat">
+    <configuration name="geronimo/tomcat/${pom.currentVersion}/car">
         <gbean name="TomcatWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -34,13 +34,13 @@
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Server">
+    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car">
         <gbean name="openejb:type=NetworkService,name=EJB">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Security">
+    <configuration name="geronimo/security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -49,7 +49,7 @@
             <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/ServerCORBA" load="false">
+    <configuration name="geronimo/server-corba/${pom.currentVersion}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -61,29 +61,29 @@
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/ActiveMQServer">
+    <configuration name="geronimo/activemq-broker/${pom.currentVersion}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/SystemJMS"/>
-    <configuration name="org/apache/geronimo/SystemDatabase">
+    <configuration name="geronimo/system-jms/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/system-database/${pom.currentVersion}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Directory">
+    <configuration name="geronimo/directory/${pom.currentVersion}/car">
         <gbean name="geronimo.server:name=DirectoryService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanLdapPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/TomcatRuntimeDeployer"/>
-    <configuration name="org/apache/geronimo/applications/Welcome/Tomcat"/>
-    <configuration name="org/apache/geronimo/Console/Tomcat"/>
-    <configuration name="org/apache/geronimo/HotDeployer">
+    <configuration name="geronimo/tomcat-runtime-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/welcome-tomcat/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/console-tomcat/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car">
         <gbean name="HotDeployer">
             <attribute name="path">deploy</attribute>
             <attribute name="pollIntervalMillis">2000</attribute>

Modified: geronimo/trunk/modules/assembly/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.xml (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.xml Tue Nov 29 15:14:42 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
-    <configuration name="org/apache/geronimo/RMINaming">
+    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -10,15 +10,15 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/RuntimeDeployer">
+    <configuration name="geronimo/runtime-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">${PlanWebBuilderDefaultNamespace}</attribute>
         </gbean>
         <gbean name="EJBBuilder">
-            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/${PlanWebServerName},J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/${PlanWebServerNameLC}/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Jetty">
+    <configuration name="geronimo/jetty/${pom.currentVersion}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPort}</attribute>
@@ -29,7 +29,7 @@
             <attribute name="port">${PlanHTTPSPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Tomcat">
+    <configuration name="geronimo/tomcat/${pom.currentVersion}/car">
         <gbean name="TomcatWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPort2}</attribute>
@@ -45,13 +45,13 @@
             <attribute name="port">${PlanHTTPSPort2}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Server">
+    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car">
         <gbean name="openejb:type=NetworkService,name=EJB">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Security">
+    <configuration name="geronimo/security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -60,7 +60,7 @@
             <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/ServerCORBA" load="false">
+    <configuration name="geronimo/server-corba/${pom.currentVersion}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -72,30 +72,30 @@
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/ActiveMQServer">
+    <configuration name="geronimo/activemq-broker/${pom.currentVersion}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/SystemJMS"/>
-    <configuration name="org/apache/geronimo/SystemDatabase">
+    <configuration name="geronimo/system-jms/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/system-database/${pom.currentVersion}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/Directory">
+    <configuration name="geronimo/directory/${pom.currentVersion}/car">
         <gbean name="geronimo.server:name=DirectoryService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanLdapPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="org/apache/geronimo/JettyRuntimeDeployer"/>
-    <configuration name="org/apache/geronimo/TomcatRuntimeDeployer"/> 
-    <configuration name="org/apache/geronimo/applications/Welcome/${PlanWebServerName}"/>
-    <configuration name="org/apache/geronimo/Console/${PlanWebServerName}"/>
-    <configuration name="org/apache/geronimo/HotDeployer">
+    <configuration name="geronimo/jetty-runtime-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/tomcat-runtime-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/welcome-${PlanWebServerNameLC}/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/console-${PlanWebServerNameLC}/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car">
         <gbean name="HotDeployer">
             <attribute name="path">deploy</attribute>
             <attribute name="pollIntervalMillis">2000</attribute>

Modified: geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java (original)
+++ geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java Tue Nov 29 15:14:42 2005
@@ -42,6 +42,7 @@
         appendEditorSearchPath("org.apache.geronimo.common.propertyeditor");
         // and explicitly register the Boolean editor.
         PropertyEditorManager.registerEditor(Boolean.class, BooleanEditor.class);
+        PropertyEditorManager.registerEditor(Integer.class, IntegerEditor.class);
     }
 
     /**

Copied: geronimo/trunk/modules/deploy-jsr88/src/conf/manifest.mf (from r348828, geronimo/trunk/modules/deploy-tool/src/conf/manifest.mf)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/src/conf/manifest.mf?p2=geronimo/trunk/modules/deploy-jsr88/src/conf/manifest.mf&p1=geronimo/trunk/modules/deploy-tool/src/conf/manifest.mf&r1=348828&r2=349830&rev=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/src/conf/manifest.mf (original)
+++ geronimo/trunk/modules/deploy-jsr88/src/conf/manifest.mf Tue Nov 29 15:14:42 2005
@@ -1 +1,7 @@
+Class-Path:  ../lib/geronimo-common-1.0-SNAPSHOT.jar ../lib/geronimo-d
+ eployment-1.0-SNAPSHOT.jar ../lib/geronimo-deploy-jsr88-1.0-SNAPSHOT.
+ jar ../lib/geronimo-kernel-1.0-SNAPSHOT.jar ../lib/geronimo-system-1.
+ 0-SNAPSHOT.jar  ../lib/geronimo-spec-j2ee-deployment-1.1-rc4.jar ../
+ lib/cglib-nodep-2.1_3.jar ../lib/mx4j-3.0.1.jar ../lib/mx4j-remote-3.
+ 0.1.jar
 J2EE-DeploymentFactory-Implementation-Class: org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java Tue Nov 29 15:14:42 2005
@@ -205,7 +205,7 @@
         try {
             type = classLoader.loadClass(gbeanInfo.getClassName());
         } catch (ClassNotFoundException e) {
-            throw new InvalidConfigurationException("Could not load GBeanInfo class from classloader: " +
+            throw new InvalidConfigurationException("Could not load GBeanInfo class from classloader: " + classLoader + 
                     " className=" + gbeanInfo.getClassName());
         }
 

Modified: geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java (original)
+++ geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java Tue Nov 29 15:14:42 2005
@@ -421,7 +421,7 @@
             String type = dep.isSetType() ? dep.getType() : "jar";
             String artifactId = dep.getArtifactId();
             String version = dep.getVersion();
-            String id = groupId + "/" + type + "s/" + artifactId + '-' + version + "." + type;
+            String id = groupId + "/" + artifactId + "/" + version + "/" + type;
             try {
                 uri = new URI(id);
             } catch (URISyntaxException e) {

Modified: geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ParentIDTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ParentIDTest.java?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ParentIDTest.java (original)
+++ geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ParentIDTest.java Tue Nov 29 15:14:42 2005
@@ -53,7 +53,7 @@
         anImport.setVersion("version");
         List parentId = ServiceConfigBuilder.getParentID(null, new DependencyType[] {anImport});
         assertEquals(1, parentId.size());
-        assertEquals("groupId/types/artifactId-version.type", ((URI)parentId.get(0)).getPath());
+        assertEquals("groupId/artifactId/version/type", ((URI)parentId.get(0)).getPath());
     }
 
     public void testBothParent() throws Exception {