geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r675043 - in /geronimo/server/branches/2.1/testsuite/enterprise-testsuite: jpa-tests/jpa-ejb/src/main/resources/META-INF/ sec-tests/sec-ejb/src/main/resources/META-INF/ sec-tests/sec-war/src/main/webapp/WEB-INF/
Date Tue, 08 Jul 2008 23:13:33 GMT
Author: jbohn
Date: Tue Jul  8 16:13:33 2008
New Revision: 675043

URL: http://svn.apache.org/viewvc?rev=675043&view=rev
Log:
merge 619160 from trunk - let maven insert the moduleId info -- less maintenance

Modified:
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=675043&r1=675042&r2=675043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml
(original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/src/main/resources/META-INF/openejb-jar.xml
Tue Jul  8 16:13:33 2008
@@ -18,10 +18,10 @@
 <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
     <environment>
         <moduleId>
-            <groupId>default</groupId>
-            <artifactId>jpa-ejb</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
-            <type>car</type>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>${pom.artifactId}</artifactId>
+            <version>${version}</version>
+            <type>ejb</type>
         </moduleId>
         <dependencies>
             <dependency>

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=675043&r1=675042&r2=675043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml
(original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/openejb-jar.xml
Tue Jul  8 16:13:33 2008
@@ -18,10 +18,10 @@
 <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
     <environment>
         <moduleId>
-            <groupId>default</groupId>
-            <artifactId>sec-ejb</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
-            <type>car</type>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>${pom.artifactId}</artifactId>
+            <version>${version}</version>
+            <type>ejb</type>
         </moduleId>
         <dependencies>
 

Modified: geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=675043&r1=675042&r2=675043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/server/branches/2.1/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml
Tue Jul  8 16:13:33 2008
@@ -19,10 +19,10 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
     <environment>
         <moduleId>
-            <groupId>default</groupId>
-            <artifactId>sec-war</artifactId>
-            <version>2.1.2-SNAPSHOT</version>
-            <type>car</type>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>${pom.artifactId}</artifactId>
+            <version>${version}</version>
+            <type>war</type>
         </moduleId>
         <dependencies>
 



Mime
View raw message