geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
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 GMT
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>



Mime
View raw message