geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r349830 [1/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
Author: djencks
Date: Tue Nov 29 15:14:42 2005
New Revision: 349830

URL: http://svn.apache.org/viewcvs?rev=349830&view=rev
Log:
GERONIMO-1230  Use abstract non-path maven-like uris for repository and configIds.  Also general cleanup and GERONIMO-1061 and GERONIMO-1069, put demo app's security into demo plan

Added:
    geronimo/trunk/configs/executable-deployer/
      - copied from r348828, geronimo/trunk/configs/j2ee-system/
    geronimo/trunk/configs/executable-deployer/LICENSE.txt
      - copied unchanged from r349820, geronimo/trunk/configs/j2ee-system/LICENSE.txt
    geronimo/trunk/configs/executable-deployer/NOTICE.txt
      - copied unchanged from r349820, geronimo/trunk/configs/j2ee-system/NOTICE.txt
    geronimo/trunk/configs/executable-deployer/maven.xml
      - copied unchanged from r349820, geronimo/trunk/configs/j2ee-system/maven.xml
    geronimo/trunk/configs/executable-deployer/project.properties
      - copied, changed from r349820, geronimo/trunk/configs/j2ee-system/project.properties
    geronimo/trunk/configs/executable-deployer/project.xml
      - copied, changed from r349820, geronimo/trunk/configs/j2ee-system/project.xml
    geronimo/trunk/configs/executable-deployer/src/
      - copied from r349820, geronimo/trunk/configs/j2ee-system/src/
    geronimo/trunk/modules/deploy-jsr88/src/conf/manifest.mf
      - copied, changed from r348828, geronimo/trunk/modules/deploy-tool/src/conf/manifest.mf
Removed:
    geronimo/trunk/applications/demo/src/webapp/WEB-INF/jetty-web.xml
    geronimo/trunk/configs/j2ee-security/temp/
Modified:
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp
    geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml
    geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml
    geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml
    geronimo/trunk/assemblies/j2ee-jetty-server/maven.xml
    geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
    geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/trunk/assemblies/j2ee-tomcat-server/maven.xml
    geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/trunk/configs/activemq-broker/project.properties
    geronimo/trunk/configs/activemq-broker/src/plan/plan.xml
    geronimo/trunk/configs/activemq/src/plan/plan.xml
    geronimo/trunk/configs/client-corba/project.properties
    geronimo/trunk/configs/client-corba/src/plan/plan.xml
    geronimo/trunk/configs/client-security/project.properties
    geronimo/trunk/configs/client-security/src/plan/plan.xml
    geronimo/trunk/configs/client-system/project.properties
    geronimo/trunk/configs/client-system/src/plan/plan.xml
    geronimo/trunk/configs/client/project.properties
    geronimo/trunk/configs/client/src/plan/plan.xml
    geronimo/trunk/configs/console-jetty/project.properties
    geronimo/trunk/configs/console-jetty/src/plan/plan.xml
    geronimo/trunk/configs/console-tomcat/project.properties
    geronimo/trunk/configs/console-tomcat/src/plan/plan.xml
    geronimo/trunk/configs/directory/project.properties
    geronimo/trunk/configs/directory/src/plan/plan.xml
    geronimo/trunk/configs/executable-deployer/src/plan/plan.xml
    geronimo/trunk/configs/geronimo-gbean-deployer/project.properties
    geronimo/trunk/configs/geronimo-gbean-deployer/project.xml
    geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-corba/project.properties
    geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-deployer/project.properties
    geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-security/project.properties
    geronimo/trunk/configs/j2ee-security/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-server/project.properties
    geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-system/project.properties
    geronimo/trunk/configs/j2ee-system/src/plan/plan.xml
    geronimo/trunk/configs/jetty-deployer/project.properties
    geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
    geronimo/trunk/configs/jetty/project.properties
    geronimo/trunk/configs/jetty/src/plan/plan.xml
    geronimo/trunk/configs/rmi-naming/project.properties
    geronimo/trunk/configs/rmi-naming/src/plan/plan.xml
    geronimo/trunk/configs/system-database/project.properties
    geronimo/trunk/configs/system-database/src/plan/plan.xml
    geronimo/trunk/configs/tomcat-deployer/project.properties
    geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml
    geronimo/trunk/configs/tomcat/project.properties
    geronimo/trunk/configs/tomcat/src/plan/plan.xml
    geronimo/trunk/configs/uddi-jetty/project.properties
    geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml
    geronimo/trunk/configs/uddi-tomcat/project.properties
    geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml
    geronimo/trunk/configs/welcome-jetty/project.properties
    geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml
    geronimo/trunk/configs/welcome-tomcat/project.properties
    geronimo/trunk/configs/welcome-tomcat/src/plan/plan.xml
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/project.xml
    geronimo/trunk/modules/assembly/src/izpack/izpack-process.xml
    geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
    geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
    geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml
    geronimo/trunk/modules/assembly/src/plan/directory-server-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-client-security-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-hot-deploy-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-security-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-corba-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-runtime-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml
    geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml
    geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
    geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
    geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml
    geronimo/trunk/modules/assembly/src/plan/system-plan.xml
    geronimo/trunk/modules/assembly/src/plan/uddi-server-jetty-plan.xml
    geronimo/trunk/modules/assembly/src/plan/uddi-server-tomcat-plan.xml
    geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml
    geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml
    geronimo/trunk/modules/assembly/src/plan/welcome-jetty-plan.xml
    geronimo/trunk/modules/assembly/src/plan/welcome-tomcat-plan.xml
    geronimo/trunk/modules/assembly/src/var/config/config.client.xml
    geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml
    geronimo/trunk/modules/assembly/src/var/config/config.offline.xml
    geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml
    geronimo/trunk/modules/assembly/src/var/config/config.xml
    geronimo/trunk/modules/common/src/java/org/apache/geronimo/common/propertyeditor/PropertyEditors.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
    geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
    geronimo/trunk/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ParentIDTest.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/FileSystemRepository.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java
    geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
    geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java
    geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/LocalConfigInstaller.java
    geronimo/trunk/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/RepoConfigInstaller.java
    geronimo/trunk/plugins/geronimo-deployment-plugin/plugin.jelly
    geronimo/trunk/plugins/geronimo-deployment-plugin/plugin.properties
    geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.properties
    geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenRepository.java

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java Tue Nov 29 15:14:42 2005
@@ -30,9 +30,9 @@
     /**
      * todo: EVIL!!!  Should be replaced with something, somehow!
      */
-    private final static String TRANQL_RAR_NAME = "tranql/rars/tranql-connector-1.0.rar";
-    private final static String DERBY_EMBEDDED_RAR_NAME = "tranql/rars/tranql-connector-derby-embed-xa-1.0.rar";
-    private final static String DERBY_NETWORK_RAR_NAME = "tranql/rars/tranql-connector-derby-client-xa-1.0.rar";
+    private final static String TRANQL_RAR_NAME = "tranql/tranql-connector/1.0/rar";
+    private final static String DERBY_EMBEDDED_RAR_NAME = "tranql/tranql-connector-derby-embed-xa/1.0/rar";
+    private final static String DERBY_NETWORK_RAR_NAME = "tranql/tranql-connector-derby-client-xa/1.0/rar";
 
     //todo: Load this from a config file or something
     public static final DatabaseInfo[] ALL_DATABASES = new DatabaseInfo[]{

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Tue Nov 29 15:14:42 2005
@@ -812,8 +812,8 @@
                 final DDBeanRoot ddBeanRoot = deployable.getDDBeanRoot();
                 Connector15DCBRoot root = (Connector15DCBRoot) config.getDConfigBeanRoot(ddBeanRoot);
                 ConnectorDCB connector = (ConnectorDCB) root.getDConfigBean(ddBeanRoot.getChildBean(root.getXpaths()[0])[0]);
-                connector.setConfigID("DatabasePool"+data.getName());
-                connector.setParentID("org/apache/geronimo/Server");
+                connector.setConfigID("user/database-pool"+data.getName() + "/1/car");
+                connector.setParentID("geronimo/j2ee-server/1.0-SNAPSHOT/car");
                 if(data.jar1 != null && !data.jar1.equals("")) {
                     Dependency dep = new Dependency();
                     connector.setDependency(new Dependency[]{dep});

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp Tue Nov 29 15:14:42 2005
@@ -69,7 +69,7 @@
     xmlns="http://geronimo.apache.org/xml/ns/web"
     xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
     configId="MyConfigName"
-    parentId="org/apache/geronimo/Server">
+    parentId="geronimo/j2ee-server/1.0-SNAPSHOT/car">
 
     <context-root>/MyWebApp</context-root>
     <context-priority-classloader>true</context-priority-classloader>

Modified: geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml Tue Nov 29 15:14:42 2005
@@ -19,8 +19,13 @@
 <web-app
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
     xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
-    configId="org/apache/geronimo/Demo"
-    parentId="org/apache/geronimo/SampleSecurityRealm">
+    configId="geronimo/security-demo/1.0-SNAPSHOT/car"
+    parentId="geronimo/security/1.0-SNAPSHOT/car">
+
+<!--
+    configId="geronimo/security-demo/${pom.currentVersion}/car"
+    parentId="geronimo/security/${pom.currentVersion}/car">
+-->
 
     <context-root>/demo</context-root>
     <context-priority-classloader>false</context-priority-classloader>
@@ -37,4 +42,36 @@
             </role>
         </role-mappings>
     </security>
+
+    <gbean name="demo-properties-login"
+        class="org.apache.geronimo.security.jaas.LoginModuleGBean">
+        <attribute name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
+        <attribute name="serverSide">true</attribute>
+        <attribute name="options">
+            usersURI=var/security/demo_users.properties
+            groupsURI=var/security/demo_groups.properties
+        </attribute>
+        <attribute name="loginDomainName">demo-properties-realm</attribute>
+    </gbean>
+
+    <gbean name="demo-properties-realm"
+        class="org.apache.geronimo.security.realm.GenericSecurityRealm">
+        <attribute name="realmName">demo-properties-realm</attribute>
+        <reference name="LoginModuleConfiguration">
+            <name>demo-properties-login</name>
+        </reference>
+        <reference name="ServerInfo">
+            <module>geronimo/system/${pom.currentVersion}/car</module>
+            <name>ServerInfo</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">
+        <attribute name="controlFlag">REQUIRED</attribute>
+        <reference name="LoginModule">
+            <name>demo-properties-login</name>
+        </reference>
+    </gbean>
+
 </web-app>

Modified: geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml Tue Nov 29 15:14:42 2005
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
-    configId="org/apache/geronimo/DebugConsole"
-    parentId="org/apache/geronimo/Server"
+    configId="geronimo/debug-console/1.0-SNAPSHOT/car"
+    parentId="geronimo/server/1.0-SNAPSHOT/car"
     >
+<!--
+    configId="geronimo/debug-console/${pom.currentVersion}/car"
+    parentId="geronimo/j2ee-server/${pom.currentVersion}/car"
+-->
 
     <dependency>
-        <uri>commons-collections/jars/commons-collections-3.1.jar</uri>
+        <uri>commons-collections/commons-collections/3.1/jar</uri>
+<!--        <uri>commons-collections/commons-collections/${commons_collections_version}/jar</uri>-->
     </dependency>
 
     <context-root>/debug-tool</context-root>

Modified: geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml (original)
+++ geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml Tue Nov 29 15:14:42 2005
@@ -2,7 +2,7 @@
 <application
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
     configId="org/apache/geronimo/MagicGBallCorbaNoSec"
-    parentId="org/apache/geronimo/ServerCORBA">
+    parentId="geronimo/j2ee-server-corba/1.0-SNAPSHOT/car">
 
     <import>
         <uri>org/apache/geronimo/Security</uri>

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/maven.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/maven.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/maven.xml Tue Nov 29 15:14:42 2005
@@ -21,6 +21,6 @@
 
 <project default="default"
     >
-    <goal name="default" prereqs="geronimo:package-assembly"/>
+    <goal name="default" prereqs="assemble:install-assembly"/>
 
 </project>

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Tue Nov 29 15:14:42 2005
@@ -170,6 +170,43 @@
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-system</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+                <geronimo.assemble.executable>bin/client.jar</geronimo.assemble.executable>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-security</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>client-corba</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
 
         <!-- lib dependencies -->
         <dependency>

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/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="geronimo/cars/rmi-naming-${pom.currentVersion}.car">
+    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -10,13 +10,13 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/j2ee-server-${pom.currentVersion}.car">
+    <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="geronimo/cars/j2ee-security-${pom.currentVersion}.car">
+    <configuration name="geronimo/j2ee-security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -25,7 +25,7 @@
             <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/j2ee-corba-${pom.currentVersion}.car" load="false">
+    <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -37,26 +37,26 @@
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/activemq-broker-${pom.currentVersion}.car">
+    <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="geronimo/cars/activemq-${pom.currentVersion}.car"/>
-    <configuration name="geronimo/cars/system-database-${pom.currentVersion}.car">
+    <configuration name="geronimo/activemq/${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="geronimo/cars/directory-${pom.currentVersion}.car">
+    <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="geronimo/cars/jetty-${pom.currentVersion}.car">
+    <configuration name="geronimo/jetty/${pom.currentVersion}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -67,8 +67,8 @@
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/geronimo-gbean-deployer-${pom.currentVersion}.car"/>
-    <configuration name="geronimo/cars/j2ee-deployer-${pom.currentVersion}.car">
+    <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</attribute>
         </gbean>
@@ -76,8 +76,8 @@
             <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/jetty-deployer-${pom.currentVersion}.car"/>
-    <configuration name="geronimo/cars/welcome-jetty-${pom.currentVersion}.car"/>
-    <configuration name="geronimo/cars/webconsole-jetty-${pom.currentVersion}.car"/>
-    <configuration name="geronimo/cars/uddi-jetty-${pom.currentVersion}.car"/>
+    <configuration name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/welcome-jetty/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/webconsole-jetty/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/uddi-jetty/${pom.currentVersion}/car"/>
 </attributes>

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/maven.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/maven.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/maven.xml Tue Nov 29 15:14:42 2005
@@ -21,6 +21,6 @@
 
 <project default="default"
     >
-    <goal name="default" prereqs="geronimo:package-assembly"/>
+    <goal name="default" prereqs="assemble:install-assembly"/>
 
 </project>

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/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="geronimo/cars/rmi-naming-${pom.currentVersion}.car">
+    <configuration name="geronimo/rmi-naming/${pom.currentVersion}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -10,13 +10,13 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/j2ee-server-${pom.currentVersion}.car">
+    <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="geronimo/cars/j2ee-security-${pom.currentVersion}.car">
+    <configuration name="geronimo/j2ee-security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -25,7 +25,7 @@
             <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/j2ee-corba-${pom.currentVersion}.car" load="false">
+    <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
             <attribute name="port">${PlanCOSNamingPort}</attribute>
@@ -37,26 +37,26 @@
             <attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/activemq-broker-${pom.currentVersion}.car">
+    <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="geronimo/cars/activemq-${pom.currentVersion}.car"/>
-    <configuration name="geronimo/cars/system-database-${pom.currentVersion}.car">
+    <configuration name="geronimo/activemq/${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="geronimo/cars/directory-${pom.currentVersion}.car">
+    <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="geronimo/cars/tomcat-${pom.currentVersion}.car">
+    <configuration name="geronimo/tomcat/${pom.currentVersion}/car">
         <gbean name="TomcatResources"/>
         <gbean name="TomcatWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -73,8 +73,8 @@
             <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/geronimo-gbean-deployer-${pom.currentVersion}.car"/>
-    <configuration name="geronimo/cars/j2ee-deployer-${pom.currentVersion}.car">
+    <configuration name="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/j2ee-deployer/${pom.currentVersion}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</attribute>
         </gbean>
@@ -82,8 +82,8 @@
             <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/cars/tomcat-deployer-${pom.currentVersion}.car"/>
-    <configuration name="geronimo/cars/welcome-tomcat-${pom.currentVersion}.car"/>
-    <configuration name="geronimo/cars/webconsole-tomcat-${pom.currentVersion}.car"/>
-    <configuration name="geronimo/cars/uddi-tomcat-${pom.currentVersion}.car"/>
+    <configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/welcome-tomcat/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/webconsole-tomcat/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/uddi-tomcat/${pom.currentVersion}/car"/>
 </attributes>

Modified: geronimo/trunk/configs/activemq-broker/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq-broker/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq-broker/project.properties (original)
+++ geronimo/trunk/configs/activemq-broker/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/activemq-broker/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq-broker/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq-broker/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/activemq-broker/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -17,11 +17,11 @@
 -->
 
 <!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
-<!--               parentId="${pom.groupId}/cars/system-database-${pom.currentVersion}.car"
+<!--               parentId="${pom.groupId}/system-database/${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"
     >
 
 
@@ -42,14 +42,14 @@
 
     <gbean name="ActiveMQ.journal" class="org.activemq.store.journal.JournalPersistenceAdapterGBean">
         <!--TODO change to ServerInfo -->
-        <reference name="serverInfo"><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><type>GBean</type><name>ServerInfo</name></reference>
+        <reference name="serverInfo"><module>geronimo/j2ee-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=geronimo/cars/system-database-${pom.currentVersion}.car,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">

Modified: geronimo/trunk/configs/activemq/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/activemq/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>
         <resourceadapter-instance>

Modified: geronimo/trunk/configs/client-corba/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-corba/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/client-corba/project.properties (original)
+++ geronimo/trunk/configs/client-corba/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
 
 PlanHTTPPort=8080
 PlanHTTPSPort=8443

Modified: geronimo/trunk/configs/client-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-corba/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/client-corba/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-corba/src/plan/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="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
     <gbean name="DyanmicStubClassLoader" class="org.openejb.corba.util.DynamicStubClassLoader"/>

Modified: geronimo/trunk/configs/client-security/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-security/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/client-security/project.properties (original)
+++ geronimo/trunk/configs/client-security/project.properties Tue Nov 29 15:14:42 2005
@@ -22,7 +22,7 @@
 maven.multiproject.type=car
 
 #j2ee-deployer needed for login config xml-reference builder
-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
 
 PlanHTTPPort=8080
 PlanHTTPSPort=8443

Modified: geronimo/trunk/configs/client-security/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-security/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/client-security/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-security/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -24,7 +24,7 @@
 -->
 <configuration
     xmlns="http://geronimo.apache.org/xml/ns/deployment"
-               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
 

Modified: geronimo/trunk/configs/client-system/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-system/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/client-system/project.properties (original)
+++ geronimo/trunk/configs/client-system/project.properties Tue Nov 29 15:14:42 2005
@@ -22,7 +22,27 @@
 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
+
+
+
+geronimo.packaging.classPath= \
+    ../lib/geronimo-spec-qname-${geronimo_spec_qname_version}.jar \
+    ../lib/geronimo-common-${geronimo_version}.jar \
+    ../lib/geronimo-kernel-${geronimo_version}.jar \
+    ../lib/geronimo-system-${geronimo_version}.jar \
+    ../lib/cglib-nodep-${cglib_version}.jar \
+    ../lib/commons-cli-${commons_cli_version}.jar \
+    ../lib/commons-logging-${commons_logging_version}.jar \
+    ../lib/log4j-${log4j_version}.jar \
+    ../lib/mx4j-${mx4j_version}.jar \
+    ../lib/mx4j-remote-${mx4j_version}.jar \
+    ../lib/endorsed/xercesImpl-${xerces_version}.jar \
+    ../lib/endorsed/xmlParserAPIs-${xml_parser_apis_version}.jar
+
+geronimo.packaging.mainClass=org.apache.geronimo.system.main.ClientCommandLine
+geronimo.packaging.endorsedDirs=lib/endorsed
+geronimo.packaging.extensionDirs=lib/ext
 
 PlanHTTPPort=8080
 PlanHTTPSPort=8443

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

Modified: geronimo/trunk/configs/client/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/client/project.properties (original)
+++ geronimo/trunk/configs/client/project.properties Tue Nov 29 15:14:42 2005
@@ -22,8 +22,9 @@
 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
 
+PlanNamingPort=1099
 PlanHTTPPort=8080
 PlanHTTPSPort=8443
 PlanOpenEJBPort=4201

Modified: geronimo/trunk/configs/client/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/client/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -23,18 +23,18 @@
 
 This configuration should contain those services normally provided
 by the app client.
-               parentId="${pom.groupId}/cars/client-system-${pom.currentVersion}.car"
+               parentId="${pom.groupId}/client-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"
     >
 
     <!-- Naming properties -->
     <gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">
         <attribute name="namingFactoryInitial">com.sun.jndi.rmi.registry.RegistryContextFactory</attribute>
         <attribute name="namingFactoryUrlPkgs">org.apache.geronimo.naming</attribute>
-        <attribute name="namingProviderUrl">rmi://localhost:1099${PlanNamingPort}</attribute>
+        <attribute name="namingProviderUrl">rmi://localhost:${PlanNamingPort}</attribute>
     </gbean>
 
     <!--client connector support-->

Modified: geronimo/trunk/configs/console-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/project.properties (original)
+++ geronimo/trunk/configs/console-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/ears/geronimo-console-${geronimo_version}.ear
 

Modified: geronimo/trunk/configs/console-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/console-jetty/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -20,7 +20,7 @@
 
 <application
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-    configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
     <module>
@@ -57,13 +57,13 @@
         <reference name="ServerInfo">
             <application>null</application>
             <moduleType>J2EEModule</moduleType>
-            <module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module>
+            <module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
         <reference name="LoginModule">
             <application>null</application>
             <moduleType>J2EEModule</moduleType>
-            <module>${pom.groupId}/cars/j2ee-security-${pom.currentVersion}.car</module>
+            <module>${pom.groupId}/j2ee-security/${pom.currentVersion}/car</module>
             <name>properties-login</name>
         </reference>
     </gbean>
@@ -77,7 +77,7 @@
         <reference name="serverInfo">
             <application>null</application>
             <moduleType>J2EEModule</moduleType>
-            <module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module>
+            <module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>

Modified: geronimo/trunk/configs/console-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-tomcat/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/project.properties (original)
+++ geronimo/trunk/configs/console-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/ears/geronimo-console-${geronimo_version}.ear
 

Modified: geronimo/trunk/configs/console-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-tomcat/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/console-tomcat/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -20,7 +20,7 @@
 
 <application
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-    configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+    configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
     <module>
@@ -59,13 +59,13 @@
         <reference name="ServerInfo">
             <application>null</application>
             <moduleType>J2EEModule</moduleType>
-            <module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module>
+            <module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
         <reference name="LoginModule">
             <application>null</application>
             <moduleType>J2EEModule</moduleType>
-            <module>${pom.groupId}/cars/j2ee-security-${pom.currentVersion}.car</module>
+            <module>${pom.groupId}/j2ee-security/${pom.currentVersion}/car</module>
             <name>properties-login</name>
         </reference>
     </gbean>
@@ -79,7 +79,7 @@
         <reference name="serverInfo">
             <application>null</application>
             <moduleType>J2EEModule</moduleType>
-            <module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module>
+            <module>${pom.groupId}/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>

Modified: geronimo/trunk/configs/directory/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/directory/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/directory/project.properties (original)
+++ geronimo/trunk/configs/directory/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/directory/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/directory/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/directory/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/directory/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -26,7 +26,7 @@
 -->
 <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 gbeanName="geronimo.server:name=DirectoryService" class="org.apache.geronimo.directory.DirectoryGBean">
@@ -38,7 +38,7 @@
         <attribute name="enableNetworking">true</attribute>
         <attribute name="host">0.0.0.0</attribute>
         <attribute name="port">1389</attribute>
-        <reference name="ServerInfo"><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
     </gbean>
 
 </configuration>

Copied: geronimo/trunk/configs/executable-deployer/project.properties (from r349820, geronimo/trunk/configs/j2ee-system/project.properties)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/executable-deployer/project.properties?p2=geronimo/trunk/configs/executable-deployer/project.properties&p1=geronimo/trunk/configs/j2ee-system/project.properties&r1=349820&r2=349830&rev=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/project.properties (original)
+++ geronimo/trunk/configs/executable-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
 
 geronimo.packaging.classPath= \
     ../lib/geronimo-spec-qname-${geronimo_spec_qname_version}.jar \
@@ -38,5 +38,6 @@
     ../lib/endorsed/xercesImpl-${xerces_version}.jar \
     ../lib/endorsed/xmlParserAPIs-${xml_parser_apis_version}.jar
 
-geronimo.packaging.mainClass=org.apache.geronimo.system.main.Daemon
-geronimo.packaging.endorsedDirs=lib/endorsed
\ No newline at end of file
+geronimo.packaging.mainClass=org.apache.geronimo.deployment.cli.DeployTool
+geronimo.packaging.endorsedDirs=lib/endorsed
+geronimo.packaging.extensionDirs=lib/ext
\ No newline at end of file

Copied: geronimo/trunk/configs/executable-deployer/project.xml (from r349820, geronimo/trunk/configs/j2ee-system/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/executable-deployer/project.xml?p2=geronimo/trunk/configs/executable-deployer/project.xml&p1=geronimo/trunk/configs/j2ee-system/project.xml&r1=349820&r2=349830&rev=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/project.xml (original)
+++ geronimo/trunk/configs/executable-deployer/project.xml Tue Nov 29 15:14:42 2005
@@ -21,7 +21,7 @@
 <project>
     <extend>../../etc/project.xml</extend>
     <pomVersion>3</pomVersion>
-    <id>j2ee-system</id>
+    <id>j2ee-system-experimental</id>
     <name>System Configuration for the J2EE Server</name>
 
     <dependencies>

Modified: geronimo/trunk/configs/executable-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/executable-deployer/src/plan/plan.xml?rev=349830&r1=349820&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/executable-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/executable-deployer/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2004 The Apache Software Foundation
+    Copyright 2005 The Apache Software Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,70 +16,39 @@
     limitations under the License.
 -->
 
-
-<!--
-Configuration for the innermost ring of a Geronimo server.
-This configuration should only contain critical services needed to
-run other Configurations - for example, the ServerInfo, Logging
-and Repository services used to load them.
-
-This configuration should *NOT* be used to provide server or application
-specific services - those should be provided by children.
--->
-<configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
-    configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
-    domain="geronimo.server"
-    server="geronimo"
-    >
-
-    <!-- ServerInfo service -->
-    <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
-
-    <!-- Configuration Manager service -->
-    <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.ConfigurationManagerImpl">
-        <reference name="Stores">
-            <gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name>
-        </reference>
-        <reference name="AttributeStore">
-            <name>AttributeManager</name>
-        </reference>
-        <reference name="PersistentConfigurationList">
-            <type>AttributeStore</type>
-            <name>AttributeManager</name>
-        </reference>
-    </gbean>
-
-    <!-- User-editable attribute service -->
-    <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-        <attribute name="configFile">var/config/config.xml</attribute>
-    </gbean>
-
-    <!-- Configuration Store service -->
-    <gbean name="Local" class="org.apache.geronimo.system.configuration.LocalConfigStore">
-        <attribute name="root">config-store</attribute>
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-    </gbean>
-
-    <!-- Repository -->
-    <gbean name="Repository" class="org.apache.geronimo.system.repository.ReadOnlyRepository">
-        <attribute name="root">repository/</attribute>
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
+<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
+               configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
+               domain="geronimo.maven"
+               server="geronimo"
+        >
+
+
+    <!-- Deployer used to process modules and plans -->
+    <gbean gbeanName="geronimo.maven:name=Deployer,j2eeType=Deployer,J2EEModule=${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car" class="org.apache.geronimo.deployment.Deployer">
+        <references name="Store">
+            <!--gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name-->
+            <pattern><gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name></pattern>
+            <pattern><gbean-name>geronimo.server:j2eeType=ConfigurationStore,name=Local</gbean-name></pattern>
+         </references>
+        <reference name="Builders">
+            <gbean-name>geronimo.maven:j2eeType=ConfigBuilder,*</gbean-name>
         </reference>
     </gbean>
 
-    <!-- Logging service -->
-    <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
-        <attribute name="configFileName">var/log/server-log4j.properties</attribute>
-        <attribute name="refreshPeriodSeconds">60</attribute>
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
+    <!-- Builder for handling plans defining Geronimo configurations -->
+    <gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
+        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <references name="Repository">
+            <pattern><gbean-name>geronimo.maven:name=Repository</gbean-name></pattern>
+            <pattern><gbean-name>geronimo.server:name=Repository,*</gbean-name></pattern>
+        </references>
+        <reference name="XmlAttributeBuilders">
+            <module>*</module>
+            <name>*</name>
+        </reference>
+        <reference name="XmlReferenceBuilders">
+            <module>*</module>
+            <name>*</name>
         </reference>
     </gbean>
 </configuration>

Modified: geronimo/trunk/configs/geronimo-gbean-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/geronimo-gbean-deployer/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/project.properties (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/project.properties Tue Nov 29 15:14:42 2005
@@ -22,5 +22,26 @@
 maven.multiproject.type=car
 
 # override deploymentConfig to use bootstrap configuration
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-0.2.car
-geronimo.packaging.deployerName=*:name=Deployer,j2eeType=Deployer,*
+#geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/0.2/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car
+#geronimo.packaging.deployerName=*:name=Deployer,j2eeType=Deployer,*
+
+
+#following is an experiment
+geronimo.packaging.classPath= \
+    ../lib/geronimo-spec-qname-${geronimo_spec_qname_version}.jar \
+    ../lib/geronimo-common-${geronimo_version}.jar \
+    ../lib/geronimo-kernel-${geronimo_version}.jar \
+    ../lib/geronimo-system-${geronimo_version}.jar \
+    ../lib/cglib-nodep-${cglib_version}.jar \
+    ../lib/commons-cli-${commons_cli_version}.jar \
+    ../lib/commons-logging-${commons_logging_version}.jar \
+    ../lib/log4j-${log4j_version}.jar \
+    ../lib/mx4j-${mx4j_version}.jar \
+    ../lib/mx4j-remote-${mx4j_version}.jar \
+    ../lib/endorsed/xercesImpl-${xerces_version}.jar \
+    ../lib/endorsed/xmlParserAPIs-${xml_parser_apis_version}.jar
+
+geronimo.packaging.mainClass=org.apache.geronimo.deployment.cli.DeployTool
+geronimo.packaging.endorsedDirs=lib/endorsed
+geronimo.packaging.extensionDirs=lib/ext
\ No newline at end of file

Modified: geronimo/trunk/configs/geronimo-gbean-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/geronimo-gbean-deployer/project.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/project.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/project.xml Tue Nov 29 15:14:42 2005
@@ -97,6 +97,16 @@
             <artifactId>geronimo-deploy-tool</artifactId>
             <version>${geronimo_version}</version>
         </dependency>
+        <!-- dependency on deployer -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-packaging-plugin</artifactId>
+            <version>${geronimo_version}</version>
+            <type>plugin</type>
+            <properties>
+                <packaging.classpath>true</packaging.classpath>
+            </properties>
+        </dependency>
 
     </dependencies>
 </project>

Modified: geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -17,14 +17,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"
                domain="geronimo.maven"
                server="geronimo"
         >
 
 
     <!-- Deployer used to process modules and plans -->
-    <gbean gbeanName="geronimo.maven:name=Deployer,j2eeType=Deployer,J2EEModule=${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car" class="org.apache.geronimo.deployment.Deployer">
+    <gbean gbeanName="geronimo.maven:name=Deployer,j2eeType=Deployer,J2EEModule=${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car" class="org.apache.geronimo.deployment.Deployer">
         <references name="Store">
             <!--gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name-->
             <pattern><gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name></pattern>
@@ -37,7 +37,7 @@
 
     <!-- Builder for handling plans defining Geronimo configurations -->
     <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>
         <references name="Repository">
             <pattern><gbean-name>geronimo.maven:name=Repository</gbean-name></pattern>
             <pattern><gbean-name>geronimo.server:name=Repository,*</gbean-name></pattern>

Modified: geronimo/trunk/configs/j2ee-corba/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-corba/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/project.properties (original)
+++ geronimo/trunk/configs/j2ee-corba/project.properties Tue Nov 29 15:14:42 2005
@@ -28,7 +28,7 @@
 PlanORBSSLPort=2001
 
 #j2ee-deployer needed for login config xml-reference builder
-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
 
 PlanHTTPPort=8080
 PlanHTTPSPort=8443

Modified: geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-corba/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -20,12 +20,12 @@
 
 <!--
 Configuration for corba on a Geronimo serverl, including client and target security examples.
-               parentId="${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car"
+               parentId="${pom.groupId}/j2ee-server/${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"
     >
 
     <!-- CORBA -->
@@ -33,7 +33,7 @@
 
     <gbean name="NameServer" class="org.openejb.corba.SunNameService">
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/System</module>
+            <module>geronimo/j2ee-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/configs/j2ee-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/project.properties (original)
+++ geronimo/trunk/configs/j2ee-deployer/project.properties Tue Nov 29 15:14:42 2005
@@ -22,4 +22,4 @@
 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

Modified: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -17,14 +17,14 @@
 -->
 
 <!--
-               parentId="${pom.groupId}/cars/geronimo-gbean-deployer-${pom.currentVersion}.car"
+               parentId="${pom.groupId}/geronimo-gbean-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="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car</attribute>
+        <attribute name="defaultParentId">${pom.groupId}/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>
@@ -61,14 +61,14 @@
     <gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
         <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
         <references name="ModuleBuilders">
-            <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/cars/jetty-deployer-${pom.currentVersion}.car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=JettyWebBuilder</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/cars/tomcat-deployer-${pom.currentVersion}.car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=TomcatWebBuilder</gbean-name></pattern>
+            <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/jetty-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=JettyWebBuilder</gbean-name></pattern>
+            <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/tomcat-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=TomcatWebBuilder</gbean-name></pattern>
         </references>
      </gbean>
 
     <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car</attribute>
-        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car,J2EEServer=geronimo,j2eeType=GBean,name=WebContainer</attribute>
+        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
+        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=WebContainer</attribute>
         <reference name="WebServiceLinkTemplate">
             <name>WebServiceEJBLinkTemplate</name>
         </reference>
@@ -81,7 +81,7 @@
     </gbean>
 
     <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car</attribute>
+        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
         <attribute name="defaultMaxSize">10</attribute>
         <attribute name="defaultMinSize">0</attribute>
         <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
@@ -95,7 +95,7 @@
 
     <gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
         <attribute name="defaultClientParentId">org/apache/geronimo/Client</attribute>
-        <attribute name="defaultServerParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car</attribute>
+        <attribute name="defaultServerParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
         <attribute name="transactionContextManagerObjectName">geronimo.client:name=TransactionContextManager,*</attribute>
         <attribute name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
         <reference name="EJBReferenceBuilder">
@@ -121,7 +121,7 @@
     </gbean>
 
     <gbean name="JBIBuilder" class="org.apache.geronimo.servicemix.deployment.ServiceMixConfigBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car</attribute>
+        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
         <attribute name="deploymentDependencies">
             servicemix/jars/spring-${servicemix_spring_version}.jar,
             servicemix/jars/servicemix-${servicemix_version}.jar

Modified: geronimo/trunk/configs/j2ee-security/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-security/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-security/project.properties (original)
+++ geronimo/trunk/configs/j2ee-security/project.properties Tue Nov 29 15:14:42 2005
@@ -23,7 +23,7 @@
 
 
 #j2ee-deployer needed for login config xml-reference builder
-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
 
 PlanHTTPPort=8080
 PlanHTTPSPort=8443

Modified: geronimo/trunk/configs/j2ee-security/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-security/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-security/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-security/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -20,18 +20,18 @@
 
 <!--
 Configuration for the security of a Geronimo 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"
     >
 
 
     <!--runtime dependencies-->
 
     <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
-        <reference name="ServerInfo"><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><module>geronimo/j2ee-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>
@@ -84,7 +84,7 @@
         <reference name="LoginModuleConfiguration">
             <name>properties-login</name>
         </reference>
-        <reference name="ServerInfo"><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><module>geronimo/j2ee-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/configs/j2ee-server/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/project.properties (original)
+++ geronimo/trunk/configs/j2ee-server/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/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/src/plan/plan.xml?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-server/src/plan/plan.xml Tue Nov 29 15:14:42 2005
@@ -23,12 +23,12 @@
 
 This configuration should contain those services normally provided
 by the 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"
     >
 
     <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
@@ -60,7 +60,7 @@
         <attribute name="maxLogFiles">2</attribute>
         <attribute name="minBuffers">4</attribute>
         <attribute name="threadsWaitingForceThreshold">-1</attribute>
-        <reference name="ServerInfo"><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
     </gbean>
 
     <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
@@ -110,14 +110,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>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><module>geronimo/j2ee-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/configs/j2ee-system/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/project.properties (original)
+++ geronimo/trunk/configs/j2ee-system/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
 
 geronimo.packaging.classPath= \
     ../lib/geronimo-spec-qname-${geronimo_spec_qname_version}.jar \
@@ -39,4 +39,5 @@
     ../lib/endorsed/xmlParserAPIs-${xml_parser_apis_version}.jar
 
 geronimo.packaging.mainClass=org.apache.geronimo.system.main.Daemon
-geronimo.packaging.endorsedDirs=lib/endorsed
\ No newline at end of file
+geronimo.packaging.endorsedDirs=lib/endorsed
+geronimo.packaging.extensionDirs=lib/ext
\ No newline at end of file

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

Modified: geronimo/trunk/configs/jetty-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/project.properties?rev=349830&r1=349829&r2=349830&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/project.properties (original)
+++ geronimo/trunk/configs/jetty-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



Mime
View raw message