Return-Path: 
 <scm-return-47265-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 73A24769E
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Tue,  6 Sep 2011 15:44:33 +0000 (UTC)
Received: (qmail 11925 invoked by uid 500); 6 Sep 2011 15:44:33 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 11832 invoked by uid 500); 6 Sep 2011 15:44:32 -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 11821 invoked by uid 99); 6 Sep 2011 15:44:32 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Sep 2011 15:44:31 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 06 Sep 2011 15:44:28 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 50E5C2388900;
	Tue,  6 Sep 2011 15:44:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1165720 - in /geronimo/server/trunk/testsupport:
 test-deployment-j2ee_1.3/test-rar-j2ee_1.3/
 test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/
 test-deployment-j2ee_1.4/test-rar-j2ee_1.4/
 test-deployment-j2ee_1.4/test-rar-j2...
Date: Tue, 06 Sep 2011 15:44:07 -0000
To: scm@geronimo.apache.org
From: xiaming@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110906154407.50E5C2388900@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: xiaming
Date: Tue Sep  6 15:44:06 2011
New Revision: 1165720

URL: http://svn.apache.org/viewvc?rev=1165720&view=rev
Log:
GERONIMO-5461 repackage test apps with modified rar module after OSGi'ed

Modified:
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml
    geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml
    geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/src/main/rar/META-INF/geronimo-ra.xml

Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml?rev=1165720&r1=1165719&r2=1165720&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml Tue Sep  6 15:44:06 2011
@@ -44,6 +44,11 @@
             <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-common</artifactId>
+            <version>1.7</version>
+        </dependency>
     </dependencies>
     
     <!--

Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml?rev=1165720&r1=1165719&r2=1165720&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml Tue Sep  6 15:44:06 2011
@@ -25,9 +25,9 @@
     <sys:environment>
         <sys:dependencies>
             <sys:dependency>
-                <sys:groupId>org.apache.derby</sys:groupId>
-                <sys:artifactId>derby</sys:artifactId>
-                <sys:type>jar</sys:type>
+                <sys:groupId>org.apache.geronimo.configs</sys:groupId>
+                <sys:artifactId>system-database</sys:artifactId>
+                <sys:type>car</sys:type>
             </sys:dependency>
         </sys:dependencies>
     </sys:environment>

Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml?rev=1165720&r1=1165719&r2=1165720&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml Tue Sep  6 15:44:06 2011
@@ -44,6 +44,11 @@
             <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-common</artifactId>
+            <version>1.7</version>
+        </dependency>
     </dependencies>
     
     <!--

Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml?rev=1165720&r1=1165719&r2=1165720&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml Tue Sep  6 15:44:06 2011
@@ -25,9 +25,9 @@
     <sys:environment>
         <sys:dependencies>
             <sys:dependency>
-                <sys:groupId>org.apache.derby</sys:groupId>
-                <sys:artifactId>derby</sys:artifactId>
-                <sys:type>jar</sys:type>
+                <sys:groupId>org.apache.geronimo.configs</sys:groupId>
+                <sys:artifactId>system-database</sys:artifactId>
+                <sys:type>car</sys:type>
             </sys:dependency>
         </sys:dependencies>
     </sys:environment>

Modified: geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml?rev=1165720&r1=1165719&r2=1165720&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml Tue Sep  6 15:44:06 2011
@@ -44,6 +44,11 @@
             <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-common</artifactId>
+            <version>1.7</version>
+        </dependency>
     </dependencies>
     
     <!--

Modified: geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/src/main/rar/META-INF/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/src/main/rar/META-INF/geronimo-ra.xml?rev=1165720&r1=1165719&r2=1165720&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/src/main/rar/META-INF/geronimo-ra.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/src/main/rar/META-INF/geronimo-ra.xml Tue Sep  6 15:44:06 2011
@@ -25,9 +25,9 @@
     <sys:environment>
         <sys:dependencies>
             <sys:dependency>
-                <sys:groupId>org.apache.derby</sys:groupId>
-                <sys:artifactId>derby</sys:artifactId>
-                <sys:type>jar</sys:type>
+                <sys:groupId>org.apache.geronimo.configs</sys:groupId>
+                <sys:artifactId>system-database</sys:artifactId>
+                <sys:type>car</sys:type>
             </sys:dependency>
         </sys:dependencies>
     </sys:environment>
@@ -37,7 +37,7 @@
             <rar:connection-definition>
                 <rar:connectionfactory-interface>javax.sql.DataSource</rar:connectionfactory-interface>
                 <rar:connectiondefinition-instance>
-                    <rar:name>RARDBDatasource-1_4</rar:name>
+                    <rar:name>RARDBDatasource-1_5</rar:name>
                     <rar:config-property-setting name="Password"/>
                     <rar:config-property-setting name="LoginTimeout"/>
                     <rar:config-property-setting name="DatabaseName">DefaultDB-1_4</rar:config-property-setting>