[openejb-scm] [2650] branches/v2_1/openejb2/modules/openejb-builder/src/schema: GERONIMO-1988 Change "configId" to "moduleId" in xml

Mon, 08 May 2006 13:17:55 -0700

Title: [2650] branches/v2_1/openejb2/modules/openejb-builder/src/schema: GERONIMO-1988 Change "configId" to "moduleId" in xml
Revision
2650
Author
dain
Date
2006-05-08 16:25:25 -0400 (Mon, 08 May 2006)

Log Message

GERONIMO-1988 Change "configId" to "moduleId" in xml


Modified Paths

Diff

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.1.xsd (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.1.xsd	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.1.xsd	2006-05-08 20:25:25 UTC (rev 2650)
@@ -60,7 +60,7 @@
 
     <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.1" schemaLocation="geronimo-naming-1.1.xsd"/>
     <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-config-1.1.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
     <xs:import namespace="http://www.openejb.org/xml/ns/pkgen-2.0" schemaLocation="openejb-pkgen-2.0.xsd"/>
 
     <xs:element name="openejb-jar" type="openejb:openejb-jarType"/>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/cmr-name-nok-openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/cmr-name-nok-openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/cmr-name-nok-openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
 
     <cmp-connection-factory>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/names-ok-openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/names-ok-openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/names-ok-openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
 
     <cmp-connection-factory>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/source-name-nok-openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/source-name-nok-openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/source-name-nok-openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
 
     <cmp-connection-factory>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/ejb-ql/openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/ejb-ql/openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/ejb-ql/openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
 
     <cmp-connection-factory>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/manytomany/compoundpk/openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/manytomany/compoundpk/openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/manytomany/compoundpk/openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
 
     <cmp-connection-factory>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
 
     <cmp-connection-factory>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/unidirectional-openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/unidirectional-openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/unidirectional-openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
     
     <cmp-connection-factory>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
     
     <cmp-connection-factory>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
 
     <cmp-connection-factory>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/unidirectional-openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/unidirectional-openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/unidirectional-openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
 
     <cmp-connection-factory>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetoone/compoundpk/openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetoone/compoundpk/openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetoone/compoundpk/openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
 
     <cmp-connection-factory>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
 
     <cmp-connection-factory>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/unidirectional-openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/unidirectional-openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/unidirectional-openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
 
     <cmp-connection-factory>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-ear/META-INF/geronimo-application.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-ear/META-INF/geronimo-application.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-ear/META-INF/geronimo-application.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -18,12 +18,12 @@
 
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
         <dependencies>
             <dependency>
                 <groupId>test</groupId>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/openejb-jar.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/openejb-jar.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/openejb-jar.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
         xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
         <dependencies>
             <dependency>
                 <groupId>test</groupId>

Modified: branches/v2_1/openejb2/modules/openejb-builder/src/test-resources/plans/plan1.xml (2649 => 2650)

--- branches/v2_1/openejb2/modules/openejb-builder/src/test-resources/plans/plan1.xml	2006-05-06 21:11:20 UTC (rev 2649)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/test-resources/plans/plan1.xml	2006-05-08 20:25:25 UTC (rev 2650)
@@ -4,12 +4,12 @@
     xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
     <environment>
-        <configId>
+        <moduleId>
             <groupId>foo</groupId>
             <artifactId>bar</artifactId>
             <version>1</version>
             <type>car</type>
-        </configId>
+        </moduleId>
     </environment>
 
     <cmp-connection-factory>

Reply via email to