You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/10/27 05:00:12 UTC

svn commit: r468245 [1/4] - in /geronimo/server/trunk: ./ applications/console/geronimo-console-core/ applications/console/geronimo-console-ear/ applications/console/geronimo-console-standard/ applications/geronimo-dojo/ applications/geronimo-remote-de...

Author: jdillon
Date: Thu Oct 26 20:00:05 2006
New Revision: 468245

URL: http://svn.apache.org/viewvc?view=rev&rev=468245
Log:
Using ${version} instead of ${pom.version} in a feeble attempt to get around ${pom.version} changing to its timestamp version for SNAPSHOT artifacts

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-core/pom.xml
    geronimo/server/trunk/applications/console/geronimo-console-ear/pom.xml
    geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
    geronimo/server/trunk/applications/geronimo-dojo/pom.xml
    geronimo/server/trunk/applications/geronimo-remote-deploy/pom.xml
    geronimo/server/trunk/applications/geronimo-welcome/pom.xml
    geronimo/server/trunk/applications/magicGball/magicGball-client/pom.xml
    geronimo/server/trunk/applications/magicGball/magicGball-ear/pom.xml
    geronimo/server/trunk/applications/magicGball/magicGball-web/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
    geronimo/server/trunk/configs/activemq-broker/pom.xml
    geronimo/server/trunk/configs/activemq/pom.xml
    geronimo/server/trunk/configs/axis-deployer/pom.xml
    geronimo/server/trunk/configs/axis/pom.xml
    geronimo/server/trunk/configs/client-corba-sun/pom.xml
    geronimo/server/trunk/configs/client-corba-sun/src/plan/plan.xml
    geronimo/server/trunk/configs/client-corba-yoko/pom.xml
    geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml
    geronimo/server/trunk/configs/client-deployer/pom.xml
    geronimo/server/trunk/configs/client-security/pom.xml
    geronimo/server/trunk/configs/client-system/pom.xml
    geronimo/server/trunk/configs/client-transaction/pom.xml
    geronimo/server/trunk/configs/client/pom.xml
    geronimo/server/trunk/configs/clustering/pom.xml
    geronimo/server/trunk/configs/connector-deployer/pom.xml
    geronimo/server/trunk/configs/daytrader-jetty/src/plan/plan.xml
    geronimo/server/trunk/configs/daytrader-tomcat/src/plan/plan.xml
    geronimo/server/trunk/configs/directory/pom.xml
    geronimo/server/trunk/configs/dojo-jetty/pom.xml
    geronimo/server/trunk/configs/dojo-tomcat/pom.xml
    geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml
    geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/hot-deployer/pom.xml
    geronimo/server/trunk/configs/j2ee-corba-sun/pom.xml
    geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml
    geronimo/server/trunk/configs/j2ee-deployer/pom.xml
    geronimo/server/trunk/configs/j2ee-security/pom.xml
    geronimo/server/trunk/configs/j2ee-server/pom.xml
    geronimo/server/trunk/configs/j2ee-system/pom.xml
    geronimo/server/trunk/configs/javamail/pom.xml
    geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml
    geronimo/server/trunk/configs/jetty-deployer/pom.xml
    geronimo/server/trunk/configs/jetty/pom.xml
    geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml
    geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml
    geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml
    geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml
    geronimo/server/trunk/configs/ldap-realm/pom.xml
    geronimo/server/trunk/configs/online-deployer/pom.xml
    geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml
    geronimo/server/trunk/configs/openejb-deployer/pom.xml
    geronimo/server/trunk/configs/openejb/pom.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml
    geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml
    geronimo/server/trunk/configs/rmi-naming/pom.xml
    geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml
    geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml
    geronimo/server/trunk/configs/sharedlib/pom.xml
    geronimo/server/trunk/configs/shutdown/pom.xml
    geronimo/server/trunk/configs/system-database/pom.xml
    geronimo/server/trunk/configs/tomcat-deployer/pom.xml
    geronimo/server/trunk/configs/tomcat/pom.xml
    geronimo/server/trunk/configs/transaction/pom.xml
    geronimo/server/trunk/configs/uddi-jetty/pom.xml
    geronimo/server/trunk/configs/uddi-jetty/src/plan/plan.xml
    geronimo/server/trunk/configs/uddi-tomcat/pom.xml
    geronimo/server/trunk/configs/uddi-tomcat/src/plan/plan.xml
    geronimo/server/trunk/configs/unavailable-client-deployer/pom.xml
    geronimo/server/trunk/configs/unavailable-ejb-deployer/pom.xml
    geronimo/server/trunk/configs/unavailable-webservices-deployer/pom.xml
    geronimo/server/trunk/configs/upgrade-cli/pom.xml
    geronimo/server/trunk/configs/upgrade/pom.xml
    geronimo/server/trunk/configs/wadi-clustering/pom.xml
    geronimo/server/trunk/configs/webconsole-jetty/pom.xml
    geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
    geronimo/server/trunk/configs/welcome-jetty/pom.xml
    geronimo/server/trunk/configs/welcome-tomcat/pom.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml
    geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/pom.xml
    geronimo/server/trunk/maven-plugins/pom.xml
    geronimo/server/trunk/modules/geronimo-activemq-gbean-management/pom.xml
    geronimo/server/trunk/modules/geronimo-activemq-gbean/pom.xml
    geronimo/server/trunk/modules/geronimo-axis-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-axis/pom.xml
    geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-client/pom.xml
    geronimo/server/trunk/modules/geronimo-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-clustering-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-clustering/pom.xml
    geronimo/server/trunk/modules/geronimo-common/pom.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-connector/pom.xml
    geronimo/server/trunk/modules/geronimo-converter/pom.xml
    geronimo/server/trunk/modules/geronimo-core/pom.xml
    geronimo/server/trunk/modules/geronimo-deploy-jsr88/pom.xml
    geronimo/server/trunk/modules/geronimo-deploy-tool/pom.xml
    geronimo/server/trunk/modules/geronimo-deployment/pom.xml
    geronimo/server/trunk/modules/geronimo-derby/pom.xml
    geronimo/server/trunk/modules/geronimo-directory/pom.xml
    geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
    geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
    geronimo/server/trunk/modules/geronimo-j2ee/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty-clustering-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty/pom.xml
    geronimo/server/trunk/modules/geronimo-jmx-remoting/pom.xml
    geronimo/server/trunk/modules/geronimo-mail/pom.xml
    geronimo/server/trunk/modules/geronimo-management/pom.xml
    geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-naming/pom.xml
    geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-security/pom.xml
    geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-system/pom.xml
    geronimo/server/trunk/modules/geronimo-test-ddbean/pom.xml
    geronimo/server/trunk/modules/geronimo-timer/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
    geronimo/server/trunk/modules/geronimo-transaction/pom.xml
    geronimo/server/trunk/modules/geronimo-upgrade/pom.xml
    geronimo/server/trunk/modules/geronimo-web-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-webservices/pom.xml
    geronimo/server/trunk/modules/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml
    geronimo/server/trunk/testsuite/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml

Modified: geronimo/server/trunk/applications/console/geronimo-console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-core/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-core/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-core/pom.xml Thu Oct 26 20:00:05 2006
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
         
         <dependency>

Modified: geronimo/server/trunk/applications/console/geronimo-console-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-ear/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-ear/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-ear/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,14 +37,14 @@
         <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
             <artifactId>geronimo-console-framework</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
             <artifactId>geronimo-console-standard</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
         

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,42 +37,42 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-upgrade</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-converter</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-derby</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
             <artifactId>geronimo-console-core</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/server/trunk/applications/geronimo-dojo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-dojo/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/applications/geronimo-dojo/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-dojo/pom.xml Thu Oct 26 20:00:05 2006
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/applications/geronimo-remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-remote-deploy/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/applications/geronimo-remote-deploy/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-remote-deploy/pom.xml Thu Oct 26 20:00:05 2006
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
         
         <!-- Required for JSPC compilation -->

Modified: geronimo/server/trunk/applications/geronimo-welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-welcome/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/applications/geronimo-welcome/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-welcome/pom.xml Thu Oct 26 20:00:05 2006
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/applications/magicGball/magicGball-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/magicGball/magicGball-client/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/applications/magicGball/magicGball-client/pom.xml (original)
+++ geronimo/server/trunk/applications/magicGball/magicGball-client/pom.xml Thu Oct 26 20:00:05 2006
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>
             <artifactId>magicGball-ejb</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/applications/magicGball/magicGball-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/magicGball/magicGball-ear/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/applications/magicGball/magicGball-ear/pom.xml (original)
+++ geronimo/server/trunk/applications/magicGball/magicGball-ear/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,19 +37,19 @@
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>
             <artifactId>magicGball-client</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>
             <artifactId>magicGball-ejb</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>
             <artifactId>magicGball-web</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>war</type>
         </dependency>
         

Modified: geronimo/server/trunk/applications/magicGball/magicGball-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/magicGball/magicGball-web/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/applications/magicGball/magicGball-web/pom.xml (original)
+++ geronimo/server/trunk/applications/magicGball/magicGball-web/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>
             <artifactId>magicGball-ejb</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
         </dependency>
         
         <!-- Required for JSPC compilation -->

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml Thu Oct 26 20:00:05 2006
@@ -62,7 +62,7 @@
                                 <artifact>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>ge-activemq-rar</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                     <type>rar</type>
                                 </artifact>
 
@@ -126,7 +126,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.assemblies</groupId>
                                     <artifactId>geronimo-boilerplate-minimal</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                     <type>jar</type>
                                 </artifactItem>
                             </artifactItems>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Thu Oct 26 20:00:05 2006
@@ -112,37 +112,37 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-common</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-deploy-jsr88</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-deploy-tool</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-deployment</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-kernel</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-util</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-system</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
@@ -182,52 +182,52 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-system</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-axis-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-client-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-connector-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-j2ee-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-naming-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-security-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-service-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-web-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-j2ee-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>

Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Thu Oct 26 20:00:05 2006
@@ -41,70 +41,70 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-system</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>shutdown</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>online-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>unavailable-client-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>unavailable-webservices-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>unavailable-ejb-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
@@ -138,7 +138,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.assemblies</groupId>
                                     <artifactId>geronimo-boilerplate-minimal</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
@@ -156,12 +156,12 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-tomcat-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-jetty-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>

Modified: geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml Thu Oct 26 20:00:05 2006
@@ -8,7 +8,7 @@
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
     
-    <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -22,7 +22,7 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -35,18 +35,18 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/unavailable-webservices-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/unavailable-webservices-deployer/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/unavailable-client-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/unavailable-client-deployer/${version}/car"/>
 
 </attributes>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml Thu Oct 26 20:00:05 2006
@@ -41,216 +41,216 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-system</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-corba-yoko</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-corba-sun</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>directory</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>ldap-realm</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-broker</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-system</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-security</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-corba-sun</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-corba-yoko</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>javamail</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-corba-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>hot-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty-clustering-builder-wadi</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty-clustering-wadi</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>welcome-jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
@@ -258,42 +258,42 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>webconsole-jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>remote-deploy-jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>uddi-jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>shutdown</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>sharedlib</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>online-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
@@ -327,7 +327,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.assemblies</groupId>
                                     <artifactId>geronimo-boilerplate-j2ee</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
@@ -345,7 +345,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-jetty-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Thu Oct 26 20:00:05 2006
@@ -8,7 +8,7 @@
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
 
-    <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -22,11 +22,11 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/transaction/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/transaction/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -39,46 +39,46 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/axis/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/axis/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/openejb/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/openejb/${version}/car">
         <gbean name="EJBNetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${pom.version}/car" load="false">
+    <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car" load="false">
         <gbean name="NameServer">
             <attribute name="port">${PlanCOSNamingPort}</attribute>
             <attribute name="host">${PlanCOSNamingHost}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/j2ee-corba-sun/${pom.version}/car" load="false">
+    <module name="org.apache.geronimo.configs/j2ee-corba-sun/${version}/car" load="false">
         <gbean name="NameServer">
             <attribute name="port">${PlanCOSSunNamingPort}</attribute>
             <attribute name="host">${PlanCOSNamingHost}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/system-database/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/system-database/${version}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/activemq-broker/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/activemq-broker/${version}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/activemq/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/activemq/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/jetty/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/jetty/${version}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -98,52 +98,52 @@
     NOTE: n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer
           so that defaultEnvironment overrides work properly
     -->
-    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/connector-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/openejb-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/openejb-deployer/${version}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">?name=JettyWebContainer</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/openejb-corba-deployer/${pom.version}/car" load="false"/>
+    <module name="org.apache.geronimo.configs/openejb-corba-deployer/${version}/car" load="false"/>
 
-    <module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/client-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/axis-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/axis-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/javamail/${pom.version}/car" load="false">
+    <module name="org.apache.geronimo.configs/javamail/${version}/car" load="false">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/sharedlib/${version}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/jetty-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/jetty-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/welcome-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/welcome-jetty/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/webconsole-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/webconsole-jetty/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/uddi-jetty/${pom.version}/car" load="false"/>
+    <module name="org.apache.geronimo.configs/uddi-jetty/${version}/car" load="false"/>
 
-    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/hot-deployer/${version}/car"/>
 
 </attributes>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-minimal/pom.xml Thu Oct 26 20:00:05 2006
@@ -41,112 +41,112 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-system</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>remote-deploy-jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>shutdown</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>sharedlib</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>online-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>unavailable-client-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>unavailable-webservices-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>unavailable-ejb-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>hot-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
         
@@ -180,7 +180,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.assemblies</groupId>
                                     <artifactId>geronimo-boilerplate-minimal</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
@@ -198,7 +198,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-jetty-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty-minimal/src/main/var/config/config.xml Thu Oct 26 20:00:05 2006
@@ -8,7 +8,7 @@
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
     
-    <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -22,11 +22,11 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/transaction/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/transaction/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -39,7 +39,7 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/jetty/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/jetty/${version}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -55,33 +55,33 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/connector-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/jetty-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/jetty-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/unavailable-webservices-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/unavailable-webservices-deployer/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/unavailable-client-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/unavailable-client-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/sharedlib/${version}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${version}/car"/>
     
-    <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/hot-deployer/${version}/car"/>
     
 </attributes>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml Thu Oct 26 20:00:05 2006
@@ -41,245 +41,245 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-system</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-corba-yoko</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-corba-sun</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>directory</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>ldap-realm</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-broker</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-system</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-security</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-corba-sun</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-corba-yoko</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>javamail</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-corba-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>hot-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>welcome-tomcat</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>webconsole-tomcat</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>remote-deploy-tomcat</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>uddi-tomcat</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>shutdown</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>sharedlib</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>online-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
@@ -313,7 +313,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.assemblies</groupId>
                                     <artifactId>geronimo-boilerplate-j2ee</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
@@ -331,7 +331,7 @@
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-tomcat-builder</artifactId>
-                                    <version>${pom.version}</version>
+                                    <version>${version}</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml Thu Oct 26 20:00:05 2006
@@ -8,7 +8,7 @@
 
 <attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
 
-    <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
         </gbean>
@@ -22,11 +22,11 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/transaction/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/transaction/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -39,46 +39,46 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/axis/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/axis/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/openejb/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/openejb/${version}/car">
         <gbean name="EJBNetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${pom.version}/car" load="false">
+    <module name="org.apache.geronimo.configs/j2ee-corba-yoko/${version}/car" load="false">
         <gbean name="NameServer">
             <attribute name="port">${PlanCOSNamingPort}</attribute>
             <attribute name="host">${PlanCOSNamingHost}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/j2ee-corba-sun/${pom.version}/car" load="false">
+    <module name="org.apache.geronimo.configs/j2ee-corba-sun/${version}/car" load="false">
         <gbean name="NameServer">
             <attribute name="port">${PlanCOSSunNamingPort}</attribute>
             <attribute name="host">${PlanCOSNamingHost}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/system-database/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/system-database/${version}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/activemq-broker/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/activemq-broker/${version}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/activemq/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/activemq/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/tomcat/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/tomcat/${version}/car">
         <gbean name="TomcatEngine">
             <reference name="TomcatValveChain" />
         </gbean>
@@ -107,52 +107,52 @@
     NOTE: n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer
           so that defaultEnvironment overrides work properly
     -->
-    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/connector-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/openejb-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/openejb-deployer/${version}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">?name=TomcatWebContainer</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/openejb-corba-deployer/${pom.version}/car" load="false"/>
+    <module name="org.apache.geronimo.configs/openejb-corba-deployer/${version}/car" load="false"/>
 
-    <module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/client-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/axis-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/axis-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/javamail/${pom.version}/car" load="false">
+    <module name="org.apache.geronimo.configs/javamail/${version}/car" load="false">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/sharedlib/${version}/car">
         <gbean name="SharedLib">
             <attribute name="classesDirs">var/shared/classes</attribute>
             <attribute name="libDirs">var/shared/lib</attribute>
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/tomcat-deployer/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/welcome-tomcat/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/welcome-tomcat/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/webconsole-tomcat/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/webconsole-tomcat/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/uddi-tomcat/${pom.version}/car" load="false"/>
+    <module name="org.apache.geronimo.configs/uddi-tomcat/${version}/car" load="false"/>
 
-    <module name="org.apache.geronimo.configs/remote-deploy-tomcat/${pom.version}/car" />
+    <module name="org.apache.geronimo.configs/remote-deploy-tomcat/${version}/car" />
 
-    <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/hot-deployer/${version}/car"/>
 
 </attributes>