djencks 2005/09/28 22:15:13
Modified: modules/openejb-builder/src/test-cmp/cmr-mapping Tag:
v2_0_G1M5 cmr-name-nok-openejb-jar.xml
names-ok-openejb-jar.xml
source-name-nok-openejb-jar.xml
Log:
GERONIMO-1027, GERONIMO-957 Merge schema changes from trunk, fix some versions
Revision Changes Path
No revision
No revision
1.1.2.1 +3 -3
openejb/modules/openejb-builder/src/test-cmp/cmr-mapping/cmr-name-nok-openejb-jar.xml
Index: cmr-name-nok-openejb-jar.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test-cmp/cmr-mapping/cmr-name-nok-openejb-jar.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- cmr-name-nok-openejb-jar.xml 5 Aug 2005 10:55:29 -0000 1.1
+++ cmr-name-nok-openejb-jar.xml 29 Sep 2005 02:15:13 -0000 1.1.2.1
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<openejb-jar
- xmlns="http://www.openejb.org/xml/ns/openejb-jar"
+ xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
configId="org/openejb/deployment/test"
parentId="org/apache/geronimo/Server">
@@ -58,7 +58,7 @@
</cmr-field-mapping>
</role-mapping>
</ejb-relationship-role>
- </ejb-relation>
+ </ejb-relation>
</relationships>
-
+
</openejb-jar>
1.1.2.1 +3 -3
openejb/modules/openejb-builder/src/test-cmp/cmr-mapping/names-ok-openejb-jar.xml
Index: names-ok-openejb-jar.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test-cmp/cmr-mapping/names-ok-openejb-jar.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- names-ok-openejb-jar.xml 5 Aug 2005 10:55:29 -0000 1.1
+++ names-ok-openejb-jar.xml 29 Sep 2005 02:15:13 -0000 1.1.2.1
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<openejb-jar
- xmlns="http://www.openejb.org/xml/ns/openejb-jar"
+ xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
configId="org/openejb/deployment/test"
parentId="org/apache/geronimo/Server">
@@ -58,7 +58,7 @@
</cmr-field-mapping>
</role-mapping>
</ejb-relationship-role>
- </ejb-relation>
+ </ejb-relation>
</relationships>
-
+
</openejb-jar>
1.1.2.1 +3 -3
openejb/modules/openejb-builder/src/test-cmp/cmr-mapping/source-name-nok-openejb-jar.xml
Index: source-name-nok-openejb-jar.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test-cmp/cmr-mapping/source-name-nok-openejb-jar.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- source-name-nok-openejb-jar.xml 5 Aug 2005 10:55:29 -0000 1.1
+++ source-name-nok-openejb-jar.xml 29 Sep 2005 02:15:13 -0000 1.1.2.1
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<openejb-jar
- xmlns="http://www.openejb.org/xml/ns/openejb-jar"
+ xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
configId="org/openejb/deployment/test"
parentId="org/apache/geronimo/Server">
@@ -61,7 +61,7 @@
</cmr-field-mapping>
</role-mapping>
</ejb-relationship-role>
- </ejb-relation>
+ </ejb-relation>
</relationships>
-
+
</openejb-jar>