geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r942493 [8/9] - in /geronimo/server/trunk: ./ assemblies/geronimo-jetty8-javaee6/ assemblies/geronimo-jetty8-minimal/ assemblies/geronimo-tomcat7-javaee6/ assemblies/geronimo-tomcat7-minimal/ framework/assemblies/geronimo-framework/ framewo...
Date Sun, 09 May 2010 06:36:48 GMT
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/datasource-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/datasource-test/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/datasource-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/datasource-test/pom.xml Sun May  9 06:36:39 2010
@@ -75,7 +75,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -85,7 +85,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml Sun May  9 06:36:39 2010
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>ejb-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>ejb-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
             <scope>provided</scope>
         </dependency>
@@ -62,7 +62,7 @@
         <dependency>
            <groupId>org.apache.geronimo.modules</groupId>
            <artifactId>geronimo-openejb</artifactId>
-           <version>${version}</version>
+           <version>${project.version}</version>
            <scope>test</scope>
         </dependency>
     </dependencies>
@@ -80,14 +80,14 @@
                       <ejbModule>
                             <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>ejb-ejb</artifactId>
-                            <bundleFileName>ejb-ejb-${version}.jar</bundleFileName>
+                            <bundleFileName>ejb-ejb-${project.version}.jar</bundleFileName>
                         </ejbModule>
 
                         <webModule>
                             <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>ejb-war</artifactId>
                             <contextRoot>/ejbtests</contextRoot>
-                            <bundleFileName>ejb-war-${version}.war</bundleFileName>
+                            <bundleFileName>ejb-war-${project.version}.war</bundleFileName>
                         </webModule>
                     </modules>
                 </configuration>
@@ -137,7 +137,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -147,7 +147,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml Sun May  9 06:36:39 2010
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>ejb-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml Sun May  9 06:36:39 2010
@@ -46,21 +46,21 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>jms-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>jms-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -159,7 +159,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -169,7 +169,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml Sun May  9 06:36:39 2010
@@ -42,14 +42,14 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>jpa-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>jpa-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
     </dependencies>
@@ -123,7 +123,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -133,7 +133,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml Sun May  9 06:36:39 2010
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>jpa-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
         
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml Sun May  9 06:36:39 2010
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -95,7 +95,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
                                 </configuration>
                             </execution>
 

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml Sun May  9 06:36:39 2010
@@ -44,13 +44,13 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>sec-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml Sun May  9 06:36:39 2010
@@ -46,20 +46,20 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>sec-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>sec-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>sec-client</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>jar</type>
         </dependency>
     </dependencies>
@@ -154,7 +154,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                                 </configuration>
                             </execution>
 
@@ -178,7 +178,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml Sun May  9 06:36:39 2010
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml Sun May  9 06:36:39 2010
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>sec-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
         
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml Sun May  9 06:36:39 2010
@@ -60,14 +60,14 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -94,7 +94,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -104,7 +104,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml Sun May  9 06:36:39 2010
@@ -64,7 +64,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -74,7 +74,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml Sun May  9 06:36:39 2010
@@ -77,7 +77,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -87,7 +87,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-jetty/pom.xml Sun May  9 06:36:39 2010
@@ -58,7 +58,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -68,7 +68,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/pom.xml Sun May  9 06:36:39 2010
@@ -39,7 +39,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>myfaces</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -101,7 +101,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -111,7 +111,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml Sun May  9 06:36:39 2010
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>test-tld-jar</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
@@ -70,7 +70,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -80,7 +80,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/pom.xml Sun May  9 06:36:39 2010
@@ -58,7 +58,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -68,7 +68,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml Sun May  9 06:36:39 2010
@@ -46,14 +46,14 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>web-forward-war-1</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>web-forward-war-2</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
     </dependencies>
@@ -144,7 +144,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -154,7 +154,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml Sun May  9 06:36:39 2010
@@ -46,14 +46,14 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>web-references-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>web-references-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
     </dependencies>
@@ -143,7 +143,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>
@@ -153,7 +153,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml Sun May  9 06:36:39 2010
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>web-references-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
             <type>ejb</type>
         </dependency>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml Sun May  9 06:36:39 2010
@@ -86,7 +86,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
                                 </configuration>
                             </execution>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml Sun May  9 06:36:39 2010
@@ -45,19 +45,19 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
@@ -77,7 +77,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml Sun May  9 06:36:39 2010
@@ -57,7 +57,7 @@
                                 <systemProperties>
                                     <property>
                                         <name>webAppName</name>
-                                        <value>${artifactId}-${version}</value>
+                                        <value>${project.artifactId}-${project.version}</value>
                                     </property>
                                 </systemProperties>
                             </configuration>
@@ -77,7 +77,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml Sun May  9 06:36:39 2010
@@ -94,7 +94,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
                                 </configuration>
                             </execution>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml Sun May  9 06:36:39 2010
@@ -45,19 +45,19 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -80,7 +80,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
                         </configuration>
                     </execution>
                             

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml Sun May  9 06:36:39 2010
@@ -67,7 +67,7 @@
                     <systemProperties>
                         <property>
                             <name>webAppName</name>
-                            <value>${artifactId}-${version}</value>
+                            <value>${project.artifactId}-${project.version}</value>
                         </property>
                     </systemProperties>
                 </configuration>
@@ -84,7 +84,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                         </configuration>
                     </execution>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml Sun May  9 06:36:39 2010
@@ -68,7 +68,7 @@
                     <systemProperties>
                         <property>
                             <name>webAppName</name>
-                            <value>${artifactId}-${version}</value>
+                            <value>${project.artifactId}-${project.version}</value>
                         </property>
                     </systemProperties>
                 </configuration>
@@ -85,7 +85,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                         </configuration>
                     </execution>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml Sun May  9 06:36:39 2010
@@ -43,19 +43,19 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -90,7 +90,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
                         </configuration>
                     </execution>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml Sun May  9 06:36:39 2010
@@ -50,7 +50,7 @@
                     <systemProperties>
                         <property>
                             <name>webAppName</name>
-                            <value>${artifactId}-${version}</value>
+                            <value>${project.artifactId}-${project.version}</value>
                         </property>
                     </systemProperties>
                 </configuration>
@@ -67,7 +67,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                         </configuration>
                     </execution>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml Sun May  9 06:36:39 2010
@@ -40,21 +40,21 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>catalog-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>catalog-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -72,12 +72,12 @@
                             <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>catalog-war</artifactId>
                             <contextRoot>/catalog</contextRoot>
-                            <bundleFileName>catalog-war-${version}.war</bundleFileName>
+                            <bundleFileName>catalog-war-${project.version}.war</bundleFileName>
                         </webModule>
                         <ejbModule>
                             <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>catalog-ejb</artifactId>
-                            <bundleFileName>catalog-ejb-${version}.jar</bundleFileName>
+                            <bundleFileName>catalog-ejb-${project.version}.jar</bundleFileName>
                         </ejbModule>
                     </modules>
                 </configuration>
@@ -107,7 +107,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                         </configuration>
                     </execution>
                             
@@ -118,7 +118,7 @@
                             <goal>undeploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                            <moduleId>${plugin.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
                         </configuration>
                     </execution>
                 </executions>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml Sun May  9 06:36:39 2010
@@ -38,21 +38,21 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>mtom-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>mtom-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>mtom-test-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
             <scope>test</scope>
         </dependency>
@@ -76,12 +76,12 @@
                             <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>mtom-war</artifactId>
                             <contextRoot>/mtom</contextRoot>
-                            <bundleFileName>mtom-war-${version}.war</bundleFileName>
+                            <bundleFileName>mtom-war-${project.version}.war</bundleFileName>
                         </webModule>
                         <ejbModule>
                             <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>mtom-ejb</artifactId>
-                            <bundleFileName>mtom-ejb-${version}.jar</bundleFileName>
+                            <bundleFileName>mtom-ejb-${project.version}.jar</bundleFileName>
                         </ejbModule>
                     </modules>
                 </configuration>
@@ -124,10 +124,10 @@
                                     <groupId>org.apache.geronimo.testsuite</groupId>
                                     <artifactId>mtom-test-war</artifactId>
                                     <type>war</type>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                 </module>
                             </modules>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                         </configuration>
                     </execution>
                             
@@ -143,10 +143,10 @@
                                     <groupId>org.apache.geronimo.testsuite</groupId>
                                     <artifactId>mtom-test-war</artifactId>
                                     <type>war</type>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                 </module>
                             </modules>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                            <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
                         </configuration>
                     </execution>
                 </executions>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml Sun May  9 06:36:39 2010
@@ -38,28 +38,28 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>provider-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>provider-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>provider-test-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>            
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>provider-common</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>jar</type>            
         </dependency>
         
@@ -82,12 +82,12 @@
                             <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>provider-war</artifactId>
                             <contextRoot>/provider</contextRoot>
-                            <bundleFileName>provider-war-${version}.war</bundleFileName>
+                            <bundleFileName>provider-war-${project.version}.war</bundleFileName>
                         </webModule>
                         <ejbModule>
                             <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>provider-ejb</artifactId>
-                            <bundleFileName>provider-ejb-${version}.jar</bundleFileName>
+                            <bundleFileName>provider-ejb-${project.version}.jar</bundleFileName>
                         </ejbModule>
                     </modules>
                 </configuration>
@@ -130,10 +130,10 @@
                                     <groupId>org.apache.geronimo.testsuite</groupId>
                                     <artifactId>provider-test-war</artifactId>
                                     <type>war</type>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                 </module>
                             </modules-->
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                         </configuration>
                     </execution>
                             
@@ -149,10 +149,10 @@
                                     <groupId>org.apache.geronimo.testsuite</groupId>
                                     <artifactId>provider-test-war</artifactId>
                                     <type>war</type>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                 </module-->
                             </modules>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                            <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
                         </configuration>
                     </execution>
                 </executions>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/pom.xml Sun May  9 06:36:39 2010
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>provider-common</artifactId>
-            <version>${version}</version>                     
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/pom.xml Sun May  9 06:36:39 2010
@@ -37,14 +37,14 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>provider-common</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <optional>true</optional>            
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>provider-ejb</artifactId>
             <scope>provided</scope>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/pom.xml Sun May  9 06:36:39 2010
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>provider-common</artifactId>            
-            <version>${version}</version>
+            <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml Sun May  9 06:36:39 2010
@@ -46,7 +46,7 @@
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>jaxws-war</artifactId>
             <type>war</type>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -101,10 +101,10 @@
                                             <groupId>org.apache.geronimo.testsuite</groupId>
                                             <artifactId>jaxws-war</artifactId>
                                             <type>war</type>
-                                            <version>${version}</version>
+                                            <version>${project.version}</version>
                                         </module>
                                     </modules>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar
                                     </moduleArchive>
                                 </configuration>
                             </execution>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml Sun May  9 06:36:39 2010
@@ -46,27 +46,27 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.buildsupport</groupId>
             <artifactId>geronimo-maven-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -81,7 +81,7 @@
                     <systemProperties>
                         <property>
                             <name>webAppName</name>
-                            <value>${artifactId}-${version}</value>
+                            <value>${project.artifactId}-${project.version}</value>
                         </property>
                     </systemProperties>
                 </configuration>
@@ -98,7 +98,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
                         </configuration>
                     </execution>
                             
@@ -109,7 +109,7 @@
                             <goal>undeploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/jar</moduleId>
+                            <moduleId>${project.groupId}/${project.artifactId}/${project.version}/jar</moduleId>
                         </configuration>
                     </execution>
                 </executions>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml Sun May  9 06:36:39 2010
@@ -46,20 +46,20 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -73,7 +73,7 @@
                     <systemProperties>
                         <property>
                             <name>webAppName</name>
-                            <value>${artifactId}-${version}</value>
+                            <value>${project.artifactId}-${project.version}</value>
                         </property>
                     </systemProperties>
                 </configuration>
@@ -90,7 +90,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
                         </configuration>
                     </execution>
                             

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml Sun May  9 06:36:39 2010
@@ -43,7 +43,7 @@
                     <systemProperties>
                         <property>
                             <name>webAppName</name>
-                            <value>${artifactId}</value>
+                            <value>${project.artifactId}</value>
                         </property>
                     </systemProperties>
                 </configuration>
@@ -60,7 +60,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                         </configuration>
                     </execution>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml Sun May  9 06:36:39 2010
@@ -50,7 +50,7 @@
                     <systemProperties>
                         <property>
                             <name>webAppName</name>
-                            <value>${artifactId}</value>
+                            <value>${project.artifactId}</value>
                         </property>
                     </systemProperties>
                 </configuration>
@@ -67,7 +67,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                         </configuration>
                     </execution>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml Sun May  9 06:36:39 2010
@@ -40,21 +40,21 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.buildsupport</groupId>
             <artifactId>geronimo-maven-plugin</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -68,7 +68,7 @@
                     <systemProperties>
                         <property>
                             <name>webAppName</name>
-                            <value>${artifactId}</value>
+                            <value>${project.artifactId}</value>
                         </property>
                     </systemProperties>
                 </configuration>
@@ -85,7 +85,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                         </configuration>
                     </execution>
                             
@@ -96,7 +96,7 @@
                             <goal>undeploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
+                            <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
                         </configuration>
                     </execution>
                 </executions>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml Sun May  9 06:36:39 2010
@@ -52,7 +52,7 @@
                     <systemProperties>
                         <property>
                             <name>webAppName</name>
-                            <value>${artifactId}</value>
+                            <value>${project.artifactId}</value>
                         </property>
                     </systemProperties>
                 </configuration>
@@ -69,7 +69,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                         </configuration>
                     </execution>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml Sun May  9 06:36:39 2010
@@ -40,21 +40,21 @@
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>wsa-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>wsa-ejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.testsuite</groupId>
             <artifactId>wsa-test-war</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
             <type>war</type>
             <scope>test</scope>
         </dependency>
@@ -78,12 +78,12 @@
                             <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>wsa-war</artifactId>
                             <contextRoot>/wsa</contextRoot>
-                            <bundleFileName>wsa-war-${version}.war</bundleFileName>
+                            <bundleFileName>wsa-war-${project.version}.war</bundleFileName>
                         </webModule>
                         <ejbModule>
                             <groupId>org.apache.geronimo.testsuite</groupId>
                             <artifactId>wsa-ejb</artifactId>
-                            <bundleFileName>wsa-ejb-${version}.jar</bundleFileName>
+                            <bundleFileName>wsa-ejb-${project.version}.jar</bundleFileName>
                         </ejbModule>
                     </modules>
                 </configuration>
@@ -126,10 +126,10 @@
                                     <groupId>org.apache.geronimo.testsuite</groupId>
                                     <artifactId>wsa-test-war</artifactId>
                                     <type>war</type>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                 </module>
                             </modules>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
                         </configuration>
                     </execution>
                             
@@ -145,10 +145,10 @@
                                     <groupId>org.apache.geronimo.testsuite</groupId>
                                     <artifactId>wsa-test-war</artifactId>
                                     <type>war</type>
-                                    <version>${version}</version>
+                                    <version>${project.version}</version>
                                 </module>
                             </modules>
-                            <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+                            <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
                         </configuration>
                     </execution>
                 </executions>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml Sun May  9 06:36:39 2010
@@ -85,7 +85,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
                                 </configuration>
                             </execution>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml Sun May  9 06:36:39 2010
@@ -62,7 +62,7 @@
                     <systemProperties>
                         <property>
                             <name>webAppName</name>
-                            <value>${artifactId}-${version}</value>
+                            <value>${project.artifactId}-${project.version}</value>
                         </property>
                     </systemProperties>
                 </configuration>
@@ -79,7 +79,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                         </configuration>
                     </execution>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml Sun May  9 06:36:39 2010
@@ -94,7 +94,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
                                 </configuration>
                             </execution>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml?rev=942493&r1=942492&r2=942493&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml Sun May  9 06:36:39 2010
@@ -45,19 +45,19 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openejb</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
-            <version>${version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -83,7 +83,7 @@
                                     <goal>deploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
                                 </configuration>
                             </execution>
                             <execution>



Mime
View raw message