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/07/21 01:45:55 UTC
svn commit: r424131 - in
/geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src: ./
test-data/geronimo/ejb-naming-post.xml
test-data/geronimo/ejb-naming-pre.xml test-data/geronimo/gbean-post.xml
test-data/geronimo/gbean-pre.xml
Author: jdillon
Date: Thu Jul 20 16:45:55 2006
New Revision: 424131
URL: http://svn.apache.org/viewvc?rev=424131&view=rev
Log:
r493@Bliss (orig r424119): jdillon | 2006-07-20 16:40:58 -0700
r473@Bliss (orig r424015): sppatel | 2006-07-20 11:23:38 -0700
GERONIMO-1492
Modified:
geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/ (props changed)
geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml
geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml
geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/gbean-post.xml
geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/gbean-pre.xml
Propchange: geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Thu Jul 20 16:45:55 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/j2ee-schema/src:424119
Modified: geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml?rev=424131&r1=424130&r2=424131&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml Thu Jul 20 16:45:55 2006
@@ -10,9 +10,10 @@
</dep:moduleId>
</dep:environment>
<nam:cmp-connection-factory>
- <nam:application>null</nam:application>
- <nam:module>org/apache/geronimo/DefaultDatabase</nam:module>
- <nam:name>DefaultDatasource</nam:name>
+ <nam:pattern>
+ <nam:groupId>geronimo</nam:groupId>
+ <nam:artifactId>system-database</nam:artifactId>
+ </nam:pattern>
</nam:cmp-connection-factory>
<enterprise-beans>
<!--
Modified: geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml?rev=424131&r1=424130&r2=424131&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml Thu Jul 20 16:45:55 2006
@@ -13,9 +13,10 @@
</environment>
<cmp-connection-factory>
- <application>null</application>
- <module>org/apache/geronimo/DefaultDatabase</module>
- <name>DefaultDatasource</name>
+ <pattern>
+ <groupId>geronimo</groupId>
+ <artifactId>system-database</artifactId>
+ </pattern>
</cmp-connection-factory>
<enterprise-beans>
@@ -231,4 +232,4 @@
</entity>
</enterprise-beans>
-</openejb-jar>
\ No newline at end of file
+</openejb-jar>
Modified: geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/gbean-post.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/gbean-post.xml?rev=424131&r1=424130&r2=424131&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/gbean-post.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/gbean-post.xml Thu Jul 20 16:45:55 2006
@@ -29,8 +29,11 @@
</css:compoundSecMechTypeList>
</css:css>
</xml-attribute>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>client</artifactId>
+ </dependency>
<reference name="ServerInfo">
- <module>org/apache/geronimo/ClientSystem</module>
<name>ServerInfo</name>
</reference>
<reference name="LoginService">
Modified: geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/gbean-pre.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/gbean-pre.xml?rev=424131&r1=424130&r2=424131&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/gbean-pre.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/j2ee-schema/src/test-data/geronimo/gbean-pre.xml Thu Jul 20 16:45:55 2006
@@ -29,8 +29,11 @@
</css:compoundSecMechTypeList>
</css:css>
</xml-attribute>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>client</artifactId>
+ </dependency>
<reference name="ServerInfo">
- <module>org/apache/geronimo/ClientSystem</module>
<name>ServerInfo</name>
</reference>
<reference name="LoginService">