You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/09/13 08:56:22 UTC
svn commit: r442874 - in
/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4:
test-ear-j2ee_1.4/src/main/resources/META-INF/
test-ejb-j2ee_1.4/src/main/resources/META-INF/
test-rar-j2ee_1.4/src/main/rar/META-INF/ test-war-j2ee_1.4/src/main/weba...
Author: jdillon
Date: Tue Sep 12 23:56:21 2006
New Revision: 442874
URL: http://svn.apache.org/viewvc?view=rev&rev=442874
Log:
Fix up configuration so that these archives will actually deploy in G
Removed:
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml
Modified:
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/openejb-jar.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-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/openejb-jar.xml?view=diff&rev=442874&r1=442873&r2=442874
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/openejb-jar.xml Tue Sep 12 23:56:21 2006
@@ -22,23 +22,8 @@
<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>org.apache.geronimo.test</groupId>
- <artifactId>test-ejb-j2ee-1.4</artifactId>
- <version>1.0</version>
- <type>ejb</type>
- </moduleId>
- <dependencies>
- <dependency>
- <groupId>console.dbpool</groupId>
- <artifactId>DefaultDatasource</artifactId>
- </dependency>
- </dependencies>
- </environment>
-
<cmp-connection-factory>
- <resource-link>DefaultDatasource</resource-link>
+ <resource-link>SystemDatasource</resource-link>
</cmp-connection-factory>
<enterprise-beans>
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?view=diff&rev=442874&r1=442873&r2=442874
==============================================================================
--- 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 12 23:56:21 2006
@@ -23,12 +23,6 @@
<rar:connector xmlns:rar="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
<sys:environment>
- <sys:moduleId>
- <sys:groupId>org.apache.geronimo.test-ear-j2ee-1_4</sys:groupId>
- <sys:artifactId>test-rar-j2ee-1.4</sys:artifactId>
- <sys:version>1.0</sys:version>
- <sys:type>rar</sys:type>
- </sys:moduleId>
<sys:dependencies>
<sys:dependency>
<sys:groupId>org.apache.derby</sys:groupId>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=442874&r1=442873&r2=442874
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml Tue Sep 12 23:56:21 2006
@@ -22,27 +22,14 @@
<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-1.2" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>org.apache.geronimo.test</sys:groupId>
- <sys:artifactId>test-war-j2ee-1.4</sys:artifactId>
- <sys:version>1.0</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- <sys:dependencies>
- <sys:dependency>
- <sys:groupId>console.dbpool</sys:groupId>
- <sys:artifactId>DefaultDatasource</sys:artifactId>
- </sys:dependency>
- </sys:dependencies>
- </sys:environment>
<naming:resource-ref>
<naming:ref-name>ejb/SimpleStatelessSession</naming:ref-name>
<naming:resource-link>SimpleStatelessSession</naming:resource-link>
</naming:resource-ref>
+
<naming:resource-ref>
<naming:ref-name>ds/DataSourceName</naming:ref-name>
- <naming:resource-link>DefaultDatasource</naming:resource-link>
+ <naming:resource-link>SystemDatasource</naming:resource-link>
</naming:resource-ref>
</tomcat:web-app>