geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1308024 - in /geronimo/server/branches/3.0-beta: framework/assemblies/geronimo-framework/ plugins/activemq/activemq-jetty-server/ plugins/aries/geronimo-aries-builder/ plugins/axis/geronimo-axis-builder/ plugins/connector-1_6/geronimo-conn...
Date Sun, 01 Apr 2012 08:02:38 GMT
Author: xiaming
Date: Sun Apr  1 08:02:37 2012
New Revision: 1308024

URL: http://svn.apache.org/viewvc?rev=1308024&view=rev
Log:
Use project.xxx to replace pom.xxx

Modified:
    geronimo/server/branches/3.0-beta/framework/assemblies/geronimo-framework/pom.xml
    geronimo/server/branches/3.0-beta/plugins/activemq/activemq-jetty-server/pom.xml
    geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries-builder/pom.xml
    geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/pom.xml
    geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-connector-server/pom.xml
    geronimo/server/branches/3.0-beta/plugins/jetty8/geronimo-jetty8-clustering-wadi/pom.xml
    geronimo/server/branches/3.0-beta/plugins/monitoring/mconsole-jetty-server/pom.xml
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-builder/pom.xml
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml
    geronimo/server/branches/3.0-beta/plugins/webservices/geronimo-webservices-builder/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jpa/jpa-pu/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jpa/jpa-wab/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsf/jsf-taglib/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsf/jsf-wab/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsp/jsp-taglib/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsp/jsp-wab/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-api/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-impl/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-wab/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/simple/simple-api/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/simple/simple-wab/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/url-binding-tests/pom.xml
    geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
    geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml
    geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
    geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml
    geronimo/server/branches/3.0-beta/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml
    geronimo/server/branches/3.0-beta/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml

Modified: geronimo/server/branches/3.0-beta/framework/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/assemblies/geronimo-framework/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/framework/assemblies/geronimo-framework/pom.xml Sun Apr  1 08:02:37 2012
@@ -67,7 +67,7 @@
                         <!--</assemblies>-->
 
                         <!--<defaultAssemblyId>activemq</defaultAssemblyId>-->
-                       <assemblyArchive>${project.build.directory}/${pom.artifactId}-${pom.version}-bin.zip</assemblyArchive>
+                       <assemblyArchive>${project.build.directory}/${project.artifactId}-${project.version}-bin.zip</assemblyArchive>
                         <optionSets>
                             <optionSet>
                                 <id>morememory</id>

Modified: geronimo/server/branches/3.0-beta/plugins/activemq/activemq-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/activemq/activemq-jetty-server/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/activemq/activemq-jetty-server/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/activemq/activemq-jetty-server/pom.xml Sun Apr  1 08:02:37 2012
@@ -96,7 +96,7 @@
                 <!--</assemblies>-->
 
                 <!--<defaultAssemblyId>activemq</defaultAssemblyId>-->
-               <assemblyArchive>${project.build.directory}/${pom.artifactId}-${pom.version}-bin.zip</assemblyArchive>
+               <assemblyArchive>${project.build.directory}/${project.artifactId}-${project.version}-bin.zip</assemblyArchive>
                 <optionSets>
                     <optionSet>
                         <id>morememory</id>
@@ -179,7 +179,7 @@
     <dependency>
         <groupId>org.apache.geronimo.framework.plugingroups</groupId>
         <artifactId>framework</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries-builder/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries-builder/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries-builder/pom.xml Sun Apr  1 08:02:37 2012
@@ -35,7 +35,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-aries</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/pom.xml Sun Apr  1 08:02:37 2012
@@ -36,19 +36,19 @@
     <dependencies>
         <!-- g-webservices-builder comes transitively from this -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-openejb-builder</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-axis</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-webservices-builder</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-connector-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-connector-server/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-connector-server/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-connector-server/pom.xml Sun Apr  1 08:02:37 2012
@@ -33,7 +33,7 @@
                 <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>car-maven-plugin</artifactId>
-                    <version>${pom.version}</version>
+                    <version>${project.version}</version>
                     <extensions>true</extensions>
                 </plugin>
                 <plugin>
@@ -54,7 +54,7 @@
                         <!--</assemblies>-->
 
                         <!--<defaultAssemblyId>activemq</defaultAssemblyId>-->
-                       <assemblyArchive>${project.build.directory}/${pom.artifactId}-${pom.version}-bin.zip</assemblyArchive>
+                       <assemblyArchive>${project.build.directory}/${project.artifactId}-${project.version}-bin.zip</assemblyArchive>
                         <optionSets>
                             <optionSet>
                                 <id>morememory</id>
@@ -187,19 +187,19 @@
         <dependency>
             <groupId>org.apache.geronimo.framework.plugingroups</groupId>
             <artifactId>framework</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction-1_6</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer-1_6</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>

Modified: geronimo/server/branches/3.0-beta/plugins/jetty8/geronimo-jetty8-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/jetty8/geronimo-jetty8-clustering-wadi/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/jetty8/geronimo-jetty8-clustering-wadi/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/jetty8/geronimo-jetty8-clustering-wadi/pom.xml Sun Apr  1 08:02:37 2012
@@ -35,13 +35,13 @@
     
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-clustering-wadi</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-jetty8</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: geronimo/server/branches/3.0-beta/plugins/monitoring/mconsole-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/monitoring/mconsole-jetty-server/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/monitoring/mconsole-jetty-server/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/monitoring/mconsole-jetty-server/pom.xml Sun Apr  1 08:02:37 2012
@@ -59,19 +59,19 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>mconsole-jetty</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>agent-car-ejb</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>agent-car-jmx</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
@@ -79,14 +79,14 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-ra</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.plugins</groupId>-->
             <!--<artifactId>sysdb-console-jetty</artifactId>-->
-            <!--<version>${pom.version}</version>-->
+            <!--<version>${project.version}</version>-->
             <!--<type>car</type>-->
         <!--</dependency>-->
     </dependencies>
@@ -237,7 +237,7 @@
                         <artifactId>geronimo-maven-plugin</artifactId>
                         <inherited>false</inherited>
                         <configuration>
-                           <assemblyArchive>${project.build.directory}/${pom.artifactId}-${pom.version}-bin.zip</assemblyArchive>
+                           <assemblyArchive>${project.build.directory}/${project.artifactId}-${project.version}-bin.zip</assemblyArchive>
                             <optionSets>
                                 <optionSet>
                                     <id>morememory</id>

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-builder/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-builder/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-builder/pom.xml Sun Apr  1 08:02:37 2012
@@ -35,7 +35,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-tomcat7</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -43,7 +43,7 @@
         <!-- g-j2ee-builder and hence g-service-builder comes via g-naming-builder -->
         <!-- g-security-builder comes from this -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-web-2.5-builder</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml Sun Apr  1 08:02:37 2012
@@ -42,21 +42,21 @@
         </dependency>
         <!-- xmlbeans, stax-api comes transitively via g-service-builder from this -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-tomcat7-builder</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-web-2.5-builder</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml Sun Apr  1 08:02:37 2012
@@ -35,7 +35,7 @@
     
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-clustering-wadi</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: geronimo/server/branches/3.0-beta/plugins/webservices/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/webservices/geronimo-webservices-builder/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/webservices/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/webservices/geronimo-webservices-builder/pom.xml Sun Apr  1 08:02:37 2012
@@ -35,14 +35,14 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-webservices</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <!-- g-kernel, g-common, g-j2ee g-j2ee-schema coming from this -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml Sun Apr  1 08:02:37 2012
@@ -41,7 +41,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>                        
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>                        
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>                        
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml Sun Apr  1 08:02:37 2012
@@ -57,7 +57,7 @@
                 <configuration>
                     <instructions>
                         <Web-ContextPath>/ds</Web-ContextPath>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Private-Package>org.apache.geronimo.testsuite.ds.web</Private-Package>
                         <Export-Package>!org.apache.geronimo.testsuite.ds.web</Export-Package>
                     </instructions>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml Sun Apr  1 08:02:37 2012
@@ -41,7 +41,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>                        
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>                       
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>                       
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml Sun Apr  1 08:02:37 2012
@@ -55,7 +55,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>                        
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml Sun Apr  1 08:02:37 2012
@@ -68,7 +68,7 @@
                 <configuration>
                     <instructions>
                         <Web-ContextPath>/ejb</Web-ContextPath>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Private-Package>org.apache.geronimo.testsuite.aries.ejb.web</Private-Package>
                         <Export-Package>!org.apache.geronimo.testsuite.aries.ejb.web</Export-Package>
                     </instructions>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jpa/jpa-pu/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jpa/jpa-pu/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jpa/jpa-pu/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jpa/jpa-pu/pom.xml Sun Apr  1 08:02:37 2012
@@ -48,7 +48,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
                     </instructions>
                 </configuration>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jpa/jpa-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jpa/jpa-wab/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jpa/jpa-wab/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jpa/jpa-wab/pom.xml Sun Apr  1 08:02:37 2012
@@ -57,7 +57,7 @@
                 <configuration>
                     <instructions>
                         <Web-ContextPath>/jpa</Web-ContextPath>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Private-Package>org.apache.geronimo.test.jpa.web</Private-Package>
                         <Export-Package>!org.apache.geronimo.test.jpa.web</Export-Package>
                     </instructions>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsf/jsf-taglib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsf/jsf-taglib/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsf/jsf-taglib/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsf/jsf-taglib/pom.xml Sun Apr  1 08:02:37 2012
@@ -49,7 +49,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsf/jsf-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsf/jsf-wab/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsf/jsf-wab/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsf/jsf-wab/pom.xml Sun Apr  1 08:02:37 2012
@@ -63,7 +63,7 @@
                 <configuration>
                     <instructions>
                         <Web-ContextPath>/jsf</Web-ContextPath>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Private-Package>org.apache.geronimo.test.jsf.web</Private-Package>
                         <Export-Package>!org.apache.geronimo.test.jsf.web</Export-Package>
                         <Import-Package>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsp/jsp-taglib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsp/jsp-taglib/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsp/jsp-taglib/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsp/jsp-taglib/pom.xml Sun Apr  1 08:02:37 2012
@@ -49,7 +49,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsp/jsp-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsp/jsp-wab/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsp/jsp-wab/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/jsp/jsp-wab/pom.xml Sun Apr  1 08:02:37 2012
@@ -63,7 +63,7 @@
                 <configuration>
                     <instructions>
                         <Web-ContextPath>/jsp</Web-ContextPath>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Private-Package>org.apache.geronimo.test.jsp.web</Private-Package>
                         <Export-Package>!org.apache.geronimo.test.jsp.web</Export-Package>
                         <Import-Package>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml Sun Apr  1 08:02:37 2012
@@ -69,7 +69,7 @@
                 <configuration>
                     <instructions>
                         <Web-ContextPath>/mail</Web-ContextPath>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Private-Package>org.apache.geronimo.testsuite.aries.mail.web</Private-Package>
                         <Export-Package>!org.apache.geronimo.testsuite.aries.mail.web</Export-Package>
                     </instructions>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-api/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-api/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-api/pom.xml Sun Apr  1 08:02:37 2012
@@ -40,7 +40,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>                        
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-impl/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-impl/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-impl/pom.xml Sun Apr  1 08:02:37 2012
@@ -49,7 +49,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>                        
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-wab/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-wab/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-wab/pom.xml Sun Apr  1 08:02:37 2012
@@ -66,7 +66,7 @@
                 <configuration>
                     <instructions>
                        <Web-ContextPath>/custom</Web-ContextPath>                    
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
         <Private-Package>org.apache.geronimo.testsuite.aries.custom.web</Private-Package>
          <Export-Package>!org.apache.geronimo.testsuite.aries.custom.web</Export-Package>
                     </instructions>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/simple/simple-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/simple/simple-api/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/simple/simple-api/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/simple/simple-api/pom.xml Sun Apr  1 08:02:37 2012
@@ -44,7 +44,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/simple/simple-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/simple/simple-wab/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/simple/simple-wab/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/simple/simple-wab/pom.xml Sun Apr  1 08:02:37 2012
@@ -57,7 +57,7 @@
                 <configuration>
                     <instructions>
                         <Web-ContextPath>/simple</Web-ContextPath>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Private-Package>org.apache.geronimo.test.eba</Private-Package>
                         <Export-Package>!org.apache.geronimo.test.eba</Export-Package>
                         <Import-Package>

Modified: geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml Sun Apr  1 08:02:37 2012
@@ -78,18 +78,18 @@
                     <version>5</version>
                     <modules>
                         <webModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>corba-helloworld-war</artifactId>
                             <contextRoot>/corba-helloworld</contextRoot>
                             <bundleFileName>corba-helloworld-war-${project.version}.war</bundleFileName>
                         </webModule>
                         <ejbModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>corba-helloworld-ejb</artifactId>
                             <bundleFileName>corba-helloworld-ejb-${project.version}.jar</bundleFileName>
                         </ejbModule>
                         <jarModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>corba-helloworld-client</artifactId>
                             <bundleFileName>corba-helloworld-client-${project.version}.jar</bundleFileName>
                         </jarModule>

Modified: geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml Sun Apr  1 08:02:37 2012
@@ -77,13 +77,13 @@
                     <version>5</version>
                     <modules>
                         <webModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>corba-mytime-war</artifactId>
                             <contextRoot>/corba-mytime</contextRoot>
                             <bundleFileName>corba-mytime-war-${project.version}.war</bundleFileName>
                         </webModule>
                         <ejbModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>corba-mytime-ejb</artifactId>
                             <bundleFileName>corba-mytime-ejb-${project.version}.jar</bundleFileName>
                         </ejbModule>

Modified: geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/url-binding-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/url-binding-tests/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/url-binding-tests/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/url-binding-tests/pom.xml Sun Apr  1 08:02:37 2012
@@ -108,7 +108,7 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${project.build.directory}/${pom.artifactId}-${pom.version}.war</moduleArchive>
+                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
                         </configuration>
                     </execution>
 

Modified: geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/pom.xml Sun Apr  1 08:02:37 2012
@@ -40,21 +40,21 @@
     
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>test-war-j2ee_1.3</artifactId>
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
         
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>test-ejb-j2ee_1.3</artifactId>
             <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
         
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>test-rar-j2ee_1.3</artifactId>
             <version>${project.version}</version>
             <type>rar</type>
@@ -72,20 +72,20 @@
                     <version>1.3</version>
                     <modules>
                         <webModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>test-war-j2ee_1.3</artifactId>
                             <contextRoot>/test-1_3</contextRoot>
                             <bundleFileName>web.war</bundleFileName>
                         </webModule>
                         
                         <ejbModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>test-ejb-j2ee_1.3</artifactId>
                             <bundleFileName>ejb.jar</bundleFileName>
                         </ejbModule>
                         
                         <rarModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>test-rar-j2ee_1.3</artifactId>
                             <bundleFileName>rar.rar</bundleFileName>
                         </rarModule>

Modified: geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/pom.xml Sun Apr  1 08:02:37 2012
@@ -40,7 +40,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>test-ejb-j2ee_1.3</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>

Modified: geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/pom.xml Sun Apr  1 08:02:37 2012
@@ -40,21 +40,21 @@
     
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>test-war-j2ee_1.4</artifactId>
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
         
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>test-ejb-j2ee_1.4</artifactId>
             <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
         
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>test-rar-j2ee_1.4</artifactId>
             <version>${project.version}</version>
             <type>rar</type>
@@ -72,20 +72,20 @@
                     <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                     <modules>
                         <webModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>test-war-j2ee_1.4</artifactId>
                             <contextRoot>/test-1_4</contextRoot>
                             <bundleFileName>web.war</bundleFileName>
                         </webModule>
                         
                         <ejbModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>test-ejb-j2ee_1.4</artifactId>
                             <bundleFileName>ejb.jar</bundleFileName>
                         </ejbModule>
                         
                         <rarModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>test-rar-j2ee_1.4</artifactId>
                             <bundleFileName>rar.rar</bundleFileName>
                         </rarModule>

Modified: geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/pom.xml Sun Apr  1 08:02:37 2012
@@ -40,7 +40,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>test-ejb-j2ee_1.4</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>

Modified: geronimo/server/branches/3.0-beta/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsupport/test-deployment-javaee_5/test-ear-javaee_5/pom.xml Sun Apr  1 08:02:37 2012
@@ -40,21 +40,21 @@
     
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>test-war-javaee_5</artifactId>
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
         
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>test-ejb-javaee_5</artifactId>
             <version>${project.version}</version>
             <type>ejb</type>
         </dependency>
         
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>test-rar-javaee_5</artifactId>
             <version>${project.version}</version>
             <type>rar</type>
@@ -72,20 +72,20 @@
                     <resourcesDir>${project.build.outputDirectory}</resourcesDir>
                     <modules>
                         <webModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>test-war-javaee_5</artifactId>
                             <contextRoot>/test-5</contextRoot>
                             <bundleFileName>web.war</bundleFileName>
                         </webModule>
                         
                         <ejbModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>test-ejb-javaee_5</artifactId>
                             <bundleFileName>ejb.jar</bundleFileName>
                         </ejbModule>
                         
                         <rarModule>
-                            <groupId>${pom.groupId}</groupId>
+                            <groupId>${project.groupId}</groupId>
                             <artifactId>test-rar-javaee_5</artifactId>
                             <bundleFileName>rar.rar</bundleFileName>
                         </rarModule>

Modified: geronimo/server/branches/3.0-beta/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml?rev=1308024&r1=1308023&r2=1308024&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsupport/test-deployment-javaee_5/test-war-javaee_5/pom.xml Sun Apr  1 08:02:37 2012
@@ -40,7 +40,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>test-ejb-javaee_5</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>



Mime
View raw message