geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r469322 - in /geronimo/server/trunk: applications/demo/src/main/webapp/WEB-INF/ applications/magicGball/magicGball-ear/src/main/plan/ configs/ configs/directory/src/main/resources/META-INF/ configs/dojo-jetty/src/main/resources/META-INF/ co...
Date Tue, 31 Oct 2006 00:05:26 GMT
Author: jdillon
Date: Mon Oct 30 16:05:24 2006
New Revision: 469322

URL: http://svn.apache.org/viewvc?view=rev&rev=469322
Log:
Remove pom.currentVersion, replace with version

Modified:
    geronimo/server/trunk/applications/demo/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml
    geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml
    geronimo/server/trunk/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/dojo-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/webconsole-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_dep_1.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_dep_1_result.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_ejb_1.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_ejb_1_result.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/assembly_1.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/assembly_1_result.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/ejb_pkgen_1.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_1.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_1_result.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_2.xml
    geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_2_result.xml

Modified: geronimo/server/trunk/applications/demo/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/demo/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/applications/demo/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/applications/demo/src/main/webapp/WEB-INF/geronimo-web.xml Mon Oct 30 16:05:24 2006
@@ -23,8 +23,8 @@
     parentId="geronimo/security/1.0/car">
 
 <!--
-    configId="geronimo/security-demo/${pom.currentVersion}/car"
-    parentId="geronimo/security/${pom.currentVersion}/car">
+    configId="geronimo/security-demo/${version}/car"
+    parentId="geronimo/security/${version}/car">
 -->
 
     <context-root>/demo</context-root>
@@ -61,10 +61,10 @@
             <name>demo-properties-login</name>
         </reference>
         <reference name="ServerInfo">
-            <module>geronimo/system/${pom.currentVersion}/car</module>
+            <module>geronimo/system/${version}/car</module>
             <name>ServerInfo</name>
         </reference>
-        <reference name="LoginService"><module>geronimo/security/${pom.currentVersion}/car</module><name>JaasLoginService</name></reference>
+        <reference name="LoginService"><module>geronimo/security/${version}/car</module><name>JaasLoginService</name></reference>
     </gbean>
 
     <gbean name="demo-properties-login" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">

Modified: geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml (original)
+++ geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml Mon Oct 30 16:05:24 2006
@@ -11,7 +11,7 @@
       <moduleId>
         <groupId>geronimo</groupId>
         <artifactId>magicGBall-corba-nosec</artifactId>
-        <version>${pom.currentVersion}</version>
+        <version>${version}</version>
         <type>car</type>
       </moduleId>
       <dependencies>
@@ -88,7 +88,7 @@
               <moduleId>
                 <groupId>geronimo</groupId>
                 <artifactId>magicGBall-corba-nosec-client</artifactId>
-                <version>${pom.currentVersion}</version>
+                <version>${version}</version>
                 <type>car</type>
               </moduleId>
               <dependencies>

Modified: geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml (original)
+++ geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml Mon Oct 30 16:05:24 2006
@@ -12,7 +12,7 @@
       <moduleId>
         <groupId>geronimo</groupId>
         <artifactId>magicGBall-corba-ssl</artifactId>
-        <version>${pom.currentVersion}</version>
+        <version>${version}</version>
         <type>car</type>
       </moduleId>
       <dependencies>
@@ -91,7 +91,7 @@
               <moduleId>
                 <groupId>geronimo</groupId>
                 <artifactId>magicGBall-corba-ssl-client</artifactId>
-                <version>${pom.currentVersion}</version>
+                <version>${version}</version>
                 <type>car</type>
               </moduleId>
               <dependencies>

Modified: geronimo/server/trunk/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/directory/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Apache Directory 0.92 for Geronimo</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Security</category>
     <description>
         This plugin integrates the Apache Directory Server (ApacheDS)
@@ -39,7 +39,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-directory//jar</dependency>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>

Modified: geronimo/server/trunk/configs/dojo-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/dojo-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/dojo-jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Geronimo Dojo App (jetty)</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Geronimo</category>
     <description>
         The Dojo AJAX library for Geronimo.  This binds to /dojo so that
@@ -29,7 +29,7 @@
     <url>http://dojotoolkit.org/</url>
     <author>Dojo Foundation</author>
     <license osi-approved="true">BSD and Academic Free License v2.1</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Geronimo Dojo App (Tomcat)</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Geronimo</category>
     <description>
         The Dojo AJAX library for Geronimo.  This binds to /dojo so that
@@ -29,7 +29,7 @@
     <url>http://dojotoolkit.org/</url>
     <author>Dojo Foundation</author>
     <license osi-approved="true">BSD and Academic Free License v2.1</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -17,13 +17,13 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Jetty Deployer</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
     <description>The Jetty Deployer for Geronimo. This module includes the Jetty Deployment module so that web applications can be deployed into a Jetty server.  This deployment module has a dependency on the Jetty web container.</description>
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -17,13 +17,13 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Jetty Web Server</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
     <description> The Jetty Web Container for Geronimo.  This module includes the Jetty Web Container for hosting web applications. It is one of two web servers available for the Geronimo framework. </description>
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.configs/j2ee-security//car</dependency>
     <dependency>org.apache.geronimo.configs/transaction//car</dependency>

Modified: geronimo/server/trunk/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Jakarta JSP Examples (Jetty)</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
     <description>
         The JSP examples originally developed for Tomcat.  Can be found
@@ -29,7 +29,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Jakarta JSP Examples (Tomcat)</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
     <description>
         The JSP examples originally developed for Tomcat.  Can be found
@@ -29,7 +29,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>LDAP Example Web App (Jetty)</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
     <description>
         A web application that walks you through configuring the sample
@@ -31,7 +31,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>LDAP Example Web App (Tomcat)</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
     <description>
         A web application that walks you through configuring the sample
@@ -31,7 +31,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/ldap-realm/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>LDAP Example Security Realm</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
     <description>
         A sample security realm pointing to an embedded Apache Directory
@@ -31,7 +31,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.configs/directory//car</dependency>
     <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Mon Oct 30 16:05:24 2006
@@ -37,9 +37,6 @@
         <!-- This property is required by the car:package mojo -->
         <geronimoVersion>${version}</geronimoVersion>
 
-        <!-- This property is required to process geronimo-plugin.xml (for m2 & m2) -->
-        <pom.currentVersion>${version}</pom.currentVersion>
-
         <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${version}/car</j2eeDeployer>
         <clientDeployer>org.apache.geronimo.configs/client-deployer/${version}/car</clientDeployer>

Modified: geronimo/server/trunk/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Jakarta Servlet Examples (Jetty)</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
     <description>
         The Servlet examples originally developed for Tomcat.  Can be found
@@ -29,7 +29,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Jakarta Servlet Examples (Tomcat)</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Examples</category>
     <description>
         The Servlet examples originally developed for Tomcat.  Can be found
@@ -29,7 +29,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -17,13 +17,13 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Tomcat Deployer</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
     <description> The Tomcat Deployer for Geronimo.  This module includes the Tomcat Deployment module so that web applications can be deployed into a tomcat server.  This deployment module has a dependency on the tomcat web container. </description>
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -17,13 +17,13 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Tomcat Web Server</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
     <description> The Tomcat Web Container for Geronimo.  This module includes the Tomcat Web Container for hosting web applications. It is one of two web servers available for the Geronimo framework. </description>
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
     <dependency>org.apache.geronimo.configs/j2ee-security//car</dependency>
     <dependency>org.apache.geronimo.configs/transaction//car</dependency>

Modified: geronimo/server/trunk/configs/webconsole-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Geronimo Admin Console (Jetty)</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
     <description>
         The web-based administration console for Geronimo.  You can
@@ -32,7 +32,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Geronimo Admin Console (Tomcat)</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
     <description>
         The web-based administration console for Geronimo.  You can
@@ -32,7 +32,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/welcome-jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Geronimo Welcome Web App (Jetty)</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
     <description>
         The welcome application for Geronimo.  This binds to / so it
@@ -31,7 +31,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/jetty//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Mon Oct 30 16:05:24 2006
@@ -19,7 +19,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Geronimo Welcome Web App (Tomcat)</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</module-id>
+    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
     <category>Core Geronimo</category>
     <description>
         The welcome application for Geronimo.  This binds to / so it
@@ -31,7 +31,7 @@
     <url>http://geronimo.apache.org/</url>
     <author>The Apache Geronimo development community</author>
     <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>${pom.currentVersion}</geronimo-version>
+    <geronimo-version>${version}</geronimo-version>
     <prerequisite>
         <id>org.apache.geronimo.configs/tomcat//car</id>
         <resource-type>Web Container</resource-type>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_dep_1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_dep_1.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_dep_1.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_dep_1.xml Mon Oct 30 16:05:24 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
     configId="appclient_dep"
-    parentId="${pom.groupId}/server-security/${pom.currentVersion}/car">
+    parentId="${pom.groupId}/server-security/${version}/car">
     <import>
         <uri>geronimo/j2ee-server/${geronimo_version}/car</uri>
     </import>
@@ -17,7 +17,7 @@
         <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
             configId="bar"
             clientConfigId="appclient_dep/appclient_dep_client"
-            clientParentId="${pom.groupId}/client-database/${pom.currentVersion}/car">
+            clientParentId="${pom.groupId}/client-database/${version}/car">
 
             <dependency>
                 <uri>geronimo/geronimo-common/${geronimo_version}/jar</uri>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_dep_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_dep_1_result.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_dep_1_result.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_dep_1_result.xml Mon Oct 30 16:05:24 2006
@@ -10,7 +10,7 @@
       <dep:dependency>
         <dep:groupId>${pom.groupId}</dep:groupId>
         <dep:artifactId>server-security</dep:artifactId>
-        <dep:version>${pom.currentVersion}</dep:version>
+        <dep:version>${version}</dep:version>
         <dep:type>car</dep:type>
       </dep:dependency>
       <dep:dependency>
@@ -43,7 +43,7 @@
           <dep:dependency>
             <dep:groupId>${pom.groupId}</dep:groupId>
             <dep:artifactId>client-database</dep:artifactId>
-            <dep:version>${pom.currentVersion}</dep:version>
+            <dep:version>${version}</dep:version>
             <dep:type>car</dep:type>
           </dep:dependency>
           <dep:dependency>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_ejb_1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_ejb_1.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_ejb_1.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_ejb_1.xml Mon Oct 30 16:05:24 2006
@@ -2,7 +2,7 @@
 <application
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
     configId="appclient_ejb_1"
-    parentId="${pom.groupId}/server-security/${pom.currentVersion}/car">
+    parentId="${pom.groupId}/server-security/${version}/car">
     <module>
         <ejb>appclient_ejb_1_ejb.jar</ejb>
         <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar" configId="ejb">
@@ -34,7 +34,7 @@
         <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
             configId="bar"
             clientConfigId="appclient_ejb_1/appclient_ejb_1_client"
-            clientParentId="${pom.groupId}/client-database/${pom.currentVersion}/car">
+            clientParentId="${pom.groupId}/client-database/${version}/car">
 
         </application-client>
     </module>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_ejb_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_ejb_1_result.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_ejb_1_result.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/appclient_ejb_1_result.xml Mon Oct 30 16:05:24 2006
@@ -10,7 +10,7 @@
       <dep:dependency>
         <dep:groupId>${pom.groupId}</dep:groupId>
         <dep:artifactId>server-security</dep:artifactId>
-        <dep:version>${pom.currentVersion}</dep:version>
+        <dep:version>${version}</dep:version>
         <dep:type>car</dep:type>
       </dep:dependency>
     </dep:dependencies>
@@ -68,7 +68,7 @@
           <dep:dependency>
             <dep:groupId>${pom.groupId}</dep:groupId>
             <dep:artifactId>client-database</dep:artifactId>
-            <dep:version>${pom.currentVersion}</dep:version>
+            <dep:version>${version}</dep:version>
             <dep:type>car</dep:type>
           </dep:dependency>
         </dep:dependencies>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/assembly_1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/assembly_1.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/assembly_1.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/assembly_1.xml Mon Oct 30 16:05:24 2006
@@ -2,14 +2,14 @@
 <application
         xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
         configId="assembly_1"
-        parentId="${pom.groupId}/server-security/${pom.currentVersion}/car">
+        parentId="${pom.groupId}/server-security/${version}/car">
 
     <module>
         <java>assembly_compat_standalone_jar_compat12_13_client.jar</java>
         <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
                             configId="bar"
                             clientConfigId="assembly_1/assembly_1_client"
-                            clientParentId="${pom.groupId}/client-database/${pom.currentVersion}/car">
+                            clientParentId="${pom.groupId}/client-database/${version}/car">
             <ejb-ref>
                 <ref-name>ejb/TestBean</ref-name>
                 <domain>geronimo.server</domain>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/assembly_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/assembly_1_result.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/assembly_1_result.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/assembly_1_result.xml Mon Oct 30 16:05:24 2006
@@ -11,7 +11,7 @@
             <dep:dependency>
                 <dep:groupId>${pom.groupId}</dep:groupId>
                 <dep:artifactId>server-security</dep:artifactId>
-                <dep:version>${pom.currentVersion}</dep:version>
+                <dep:version>${version}</dep:version>
                 <dep:type>car</dep:type>
             </dep:dependency>
         </dep:dependencies>
@@ -32,7 +32,7 @@
                     <dep:dependency>
                         <dep:groupId>${pom.groupId}</dep:groupId>
                         <dep:artifactId>client-database</dep:artifactId>
-                        <dep:version>${pom.currentVersion}</dep:version>
+                        <dep:version>${version}</dep:version>
                         <dep:type>car</dep:type>
                     </dep:dependency>
                 </dep:dependencies>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/ejb_pkgen_1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/ejb_pkgen_1.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/ejb_pkgen_1.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/ejb_pkgen_1.xml Mon Oct 30 16:05:24 2006
@@ -3,7 +3,7 @@
              xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
              xmlns:pk="http://tranql.codehaus.org/xml/ns/pkgen"
              configId="ejb_unknownpk"
-             parentId="${pom.groupId}/jms/${pom.currentVersion}/car">
+             parentId="${pom.groupId}/jms/${version}/car">
   <module>
     <ejb>ejb_unknownpk_ejb.jar</ejb>
     <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar" configId="ejb">
@@ -32,7 +32,7 @@
         <reference name="TransactionManager">
             <gbean-name>*:name=TransactionManager,*</gbean-name>
         </reference>
-        <reference name="ManagedConnectionFactoryWrapper"><gbean-name>geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo-cts/database/${pom.currentVersion}/car,j2eeType=JCAManagedConnectionFactory,name=jdbc/DB1</gbean-name></reference>
+        <reference name="ManagedConnectionFactoryWrapper"><gbean-name>geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo-cts/database/${version}/car,j2eeType=JCAManagedConnectionFactory,name=jdbc/DB1</gbean-name></reference>
         <attribute name="tableName">CUSTOM_UNKNOWNPK_TABLE1</attribute>
         <attribute name="sequenceName">ABC_SEQ</attribute>
         <attribute name="batchSize">10</attribute>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1.xml Mon Oct 30 16:05:24 2006
@@ -2,7 +2,7 @@
 <application
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
     configId="servlet_1"
-    parentId="${pom.groupId}/server-security/${pom.currentVersion}/car">
+    parentId="${pom.groupId}/server-security/${version}/car">
 
     <module>
         <web>servlet_deploy_ejblink_single_web.war</web>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/servlet_1_result.xml Mon Oct 30 16:05:24 2006
@@ -10,7 +10,7 @@
       <dep:dependency>
         <dep:groupId>${pom.groupId}</dep:groupId>
         <dep:artifactId>server-security</dep:artifactId>
-        <dep:version>${pom.currentVersion}</dep:version>
+        <dep:version>${version}</dep:version>
         <dep:type>car</dep:type>
       </dep:dependency>
     </dep:dependencies>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_1.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_1.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_1.xml Mon Oct 30 16:05:24 2006
@@ -5,14 +5,14 @@
     >
 
     <import>
-        <uri>${pom.groupId}/server-resources/${pom.currentVersion}/car</uri>
+        <uri>${pom.groupId}/server-resources/${version}/car</uri>
     </import>
 
     <module>
         <java>transport_1_client.jar</java>
         <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
             configId="bar"
-            clientParentId="${pom.groupId}/client-security/${pom.currentVersion}/car" clientConfigId="transport_ejb_vehicle/transport_ejb_vehicle_client">
+            clientParentId="${pom.groupId}/client-security/${version}/car" clientConfigId="transport_ejb_vehicle/transport_ejb_vehicle_client">
             <ejb-ref>
                 <ref-name>ejb/EJBVehicle</ref-name>
                 <ejb-link>common_ejb_EJBVehicle</ejb-link>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_1_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_1_result.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_1_result.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_1_result.xml Mon Oct 30 16:05:24 2006
@@ -11,7 +11,7 @@
       <dep:dependency>
         <dep:groupId>${pom.groupId}</dep:groupId>
         <dep:artifactId>server-resources</dep:artifactId>
-        <dep:version>${pom.currentVersion}</dep:version>
+        <dep:version>${version}</dep:version>
         <dep:type>car</dep:type>
       </dep:dependency>
     </dep:dependencies>
@@ -32,7 +32,7 @@
           <dep:dependency>
             <dep:groupId>${pom.groupId}</dep:groupId>
             <dep:artifactId>client-security</dep:artifactId>
-            <dep:version>${pom.currentVersion}</dep:version>
+            <dep:version>${version}</dep:version>
             <dep:type>car</dep:type>
           </dep:dependency>
         </dep:dependencies>

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_2.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_2.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_2.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_2.xml Mon Oct 30 16:05:24 2006
@@ -5,7 +5,7 @@
     >
 
     <import>
-        <uri>${pom.groupId}/server-resources/${pom.currentVersion}/car</uri>
+        <uri>${pom.groupId}/server-resources/${version}/car</uri>
     </import>
 </application>
         

Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_2_result.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_2_result.xml?view=diff&rev=469322&r1=469321&r2=469322
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_2_result.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/transport_2_result.xml Mon Oct 30 16:05:24 2006
@@ -11,7 +11,7 @@
       <dep:dependency>
         <dep:groupId>${pom.groupId}</dep:groupId>
         <dep:artifactId>server-resources</dep:artifactId>
-        <dep:version>${pom.currentVersion}</dep:version>
+        <dep:version>${version}</dep:version>
         <dep:type>car</dep:type>
       </dep:dependency>
     </dep:dependencies>



Mime
View raw message