Return-Path: 
 <scm-return-29989-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 15888 invoked from network); 8 Jul 2008 23:14:05 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 8 Jul 2008 23:14:05 -0000
Received: (qmail 84116 invoked by uid 500); 8 Jul 2008 23:14:05 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 84067 invoked by uid 500); 8 Jul 2008 23:14:05 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 84053 invoked by uid 99); 8 Jul 2008 23:14:05 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jul 2008 16:14:05 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jul 2008 23:13:11 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 12B972388A07; Tue,  8 Jul 2008 16:13:34 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: scm@geronimo.apache.org
From: jbohn@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080708231334.12B972388A07@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>