geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r348020 - in /geronimo/trunk/modules: client-builder/src/schema/ connector-builder/src/schema/ j2ee-builder/src/schema/ j2ee-schema/src/java/org/apache/geronimo/schema/ j2ee-schema/src/test-data/geronimo/ j2ee-schema/src/test/org/apache/ger...
Date Mon, 21 Nov 2005 23:36:26 GMT
Author: djencks
Date: Mon Nov 21 15:36:16 2005
New Revision: 348020

URL: http://svn.apache.org/viewcvs?rev=348020&view=rev
Log:
GERONIMO-1214 uniformize the classloader directives in geronimo plan schemas

Added:
    geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/QNameConverter.java
    geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname1-post.xml
    geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname1-pre.xml
    geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname2-post.xml
    geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname2-pre.xml
Modified:
    geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.0.xsd
    geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.0.xsd
    geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd
    geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml
    geronimo/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
    geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-1.0.xsd
    geronimo/trunk/modules/service-builder/src/schema/geronimo-config-1.0.xsd
    geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd
    geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.0.xsd

Modified: geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.0.xsd?rev=348020&r1=348019&r2=348020&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.0.xsd (original)
+++ geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.0.xsd Mon
Nov 21 15:36:16 2005
@@ -37,9 +37,12 @@
 
     <xs:complexType name="application-clientType">
         <xs:sequence>
-            <xs:element ref="sys:import" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="include" type="sys:dependencyType" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>
+<!--            <xs:element ref="sys:parent" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element name="include" type="sys:dependencyType" minOccurs="0"
maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+            <xs:group ref="sys:classloader-include-infoGroup"/>
 
 
             <xs:element ref="naming:ejb-ref" minOccurs="0" maxOccurs="unbounded"/>

Modified: geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.0.xsd?rev=348020&r1=348019&r2=348020&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.0.xsd (original)
+++ geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.0.xsd Mon Nov
21 15:36:16 2005
@@ -290,10 +290,11 @@
         </xs:annotation>
 
         <xs:sequence>
-            <xs:element ref="sys:import" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>
+<!--            <xs:element ref="sys:parent" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+            <xs:group ref="sys:classloader-infoGroup"/>
 
             <xs:element name="resourceadapter" type="ger:resourceadapterType" maxOccurs="unbounded"/>
 

Modified: geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd?rev=348020&r1=348019&r2=348020&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd (original)
+++ geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd Mon Nov 21
15:36:16 2005
@@ -33,10 +33,12 @@
 
     <xs:complexType name="applicationType">
         <xs:sequence>
-            <xs:element ref="sys:import" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>
+<!--            <xs:element ref="sys:parent" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+            <xs:group ref="sys:classloader-infoGroup"/>
+
             <xs:element name="module" type="geronimo:moduleType" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="ext-module" type="geronimo:ext-moduleType" minOccurs="0"
maxOccurs="unbounded"/>
             <xs:element ref="security:security" minOccurs="0"/>

Added: geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/QNameConverter.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/QNameConverter.java?rev=348020&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/QNameConverter.java
(added)
+++ geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/QNameConverter.java
Mon Nov 21 15:36:16 2005
@@ -0,0 +1,53 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.schema;
+
+import javax.xml.namespace.QName;
+
+import org.apache.xmlbeans.XmlCursor;
+
+/**
+ * @version $Rev: 345353 $ $Date: 2005-11-17 14:40:43 -0800 (Thu, 17 Nov 2005) $
+ */
+public class QNameConverter implements ElementConverter {
+
+    private final String sourceLocalName;
+    private final String namespace;
+    private final QName qname;
+
+    public QNameConverter(String sourceLocalName, String namespace, String localName) {
+        this.sourceLocalName = sourceLocalName;
+        this.namespace = namespace;
+        qname = new QName(namespace, localName);
+    }
+
+    public void convertElement(XmlCursor cursor, XmlCursor end) {
+        end.toCursor(cursor);
+        end.toEndToken();
+        while (cursor.hasNextToken() && cursor.isLeftOf(end)) {
+            if (cursor.isStart()) {
+                QName name = cursor.getName();
+                if (name.getLocalPart().equals(sourceLocalName)) {
+                    cursor.setName(qname);
+                } else {
+                    cursor.setName(new QName(namespace, name.getLocalPart()));
+                }
+            }
+            cursor.toNextToken();
+        }
+    }
+}

Modified: geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml?rev=348020&r1=348019&r2=348020&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml (original)
+++ geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml Mon Nov
21 15:36:16 2005
@@ -1,218 +1,218 @@
 <?xml version="1.0"?>
 
-<openejb-jar configId="org/openejb/Itests" parentId="org/apache/geronimo/DefaultDatabase"
xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.0">
-  <dependency>
-    <uri>junit/jars/junit-3.8.jar</uri>
-  </dependency>
+<openejb-jar configId="org/openejb/Itests" parentId="org/apache/geronimo/DefaultDatabase"
xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.0"
xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.0">
+    <dep:dependency>
+        <dep:uri>junit/jars/junit-3.8.jar</dep:uri>
+    </dep:dependency>
     <nam:cmp-connection-factory>
         <nam:application>null</nam:application>
         <nam:module>org/apache/geronimo/DefaultDatabase</nam:module>
         <nam:name>DefaultDatasource</nam:name>
     </nam:cmp-connection-factory>
-  <enterprise-beans>
-    <!--
-        ########################################################
-        Stateless
-        ########################################################
-        -->
-    <session>
-      <ejb-name>BasicStatelessBean</ejb-name>
-      <jndi-name>client/tests/stateless/BasicStatelessHome</jndi-name>
-      <nam:resource-ref>
-        <nam:ref-name>stateless/references/Resource_manager_access</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </session>
-    <session>
-      <ejb-name>BasicBMTStatelessBean</ejb-name>
-      <jndi-name>client/tests/stateless/BeanManagedBasicStatelessHome</jndi-name>
-      <nam:resource-ref>
-        <nam:ref-name>stateless/references/Resource_manager_access</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </session>
-    <session>
-      <ejb-name>DatabaseBean</ejb-name>
-      <jndi-name>client/tools/DatabaseHome</jndi-name>
-      <nam:resource-ref>
-        <nam:ref-name>database</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </session>
-    <session>
-      <ejb-name>BMTStatelessBean</ejb-name>
-      <jndi-name>client/tests/stateless/BeanManagedTransactionTests/EJBHome</jndi-name>
-      <nam:resource-ref>
-        <nam:ref-name>database</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </session>
-    <session>
-      <ejb-name>EncStatelessBean</ejb-name>
-      <jndi-name>client/tests/stateless/EncBean</jndi-name>
-      <nam:resource-ref>
-        <nam:ref-name>datasource</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </session>
-    <session>
-      <ejb-name>StatelessRMIIIOPBean</ejb-name>
-      <jndi-name>client/tests/stateless/RMI-over-IIOP/EJBHome</jndi-name>
-    </session>
-    <!--
-        ########################################################
-        Stateless
-        ########################################################
-        -->
-    <session>
-      <ejb-name>BasicStatefulBean</ejb-name>
-      <jndi-name>client/tests/stateful/BasicStatefulHome</jndi-name>
-      <nam:resource-ref>
-        <nam:ref-name>stateful/references/Resource_manager_access</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </session>
-    <session>
-      <ejb-name>BasicBMTStatefulBean</ejb-name>
-      <jndi-name>client/tests/stateful/BeanManagedBasicStatefulHome</jndi-name>
-      <nam:resource-ref>
-        <nam:ref-name>stateful/references/Resource_manager_access</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </session>
-    <session>
-      <ejb-name>BMTStatefulBean</ejb-name>
-      <jndi-name>client/tests/stateful/BeanManagedTransactionTests/EJBHome</jndi-name>
-      <nam:resource-ref>
-        <nam:ref-name>datasource</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </session>
-    <session>
-      <ejb-name>EncStatefulBean</ejb-name>
-      <jndi-name>client/tests/stateful/EncBean</jndi-name>
-      <nam:resource-ref>
-        <nam:ref-name>datasource</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </session>
-    <session>
-      <ejb-name>StatefulRMIIIOPBean</ejb-name>
-      <jndi-name>client/tests/stateful/RMI-over-IIOP/EJBHome</jndi-name>
-    </session>
-    <!--
-        ########################################################
-        BMP
-        ########################################################
-        -->
-    <entity>
-      <ejb-name>BasicBmpBean</ejb-name>
-      <jndi-name>client/tests/entity/bmp/BasicBmpHome</jndi-name>
-      <nam:resource-ref>
-        <nam:ref-name>jdbc/basic/entityDatabase</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </entity>
-    <entity>
-      <ejb-name>AOBasicBmpBean</ejb-name>
-      <jndi-name>client/tests/entity/bmp/allowed_operations/EntityHome</jndi-name>
-      <nam:resource-ref>
-        <nam:ref-name>jdbc/basic/entityDatabase</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-      <nam:resource-ref>
-        <nam:ref-name>entity/references/Resource_manager_access</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </entity>
-    <entity>
-      <ejb-name>EncBmpBean</ejb-name>
-      <jndi-name>client/tests/entity/bmp/EncBean</jndi-name>
-      <nam:resource-ref>
-        <nam:ref-name>datasource</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-      <nam:resource-ref>
-        <nam:ref-name>jdbc/basic/entityDatabase</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </entity>
-    <entity>
-      <ejb-name>BmpRMIIIOPBean</ejb-name>
-      <jndi-name>client/tests/entity/bmp/RMI-over-IIOP/EJBHome</jndi-name>
-    </entity>
-    <!--
-        ########################################################
-        BMP
-        ########################################################
-        -->
-    <entity>
-      <ejb-name>BasicCmpBean</ejb-name>
-      <jndi-name>client/tests/entity/cmp/BasicCmpHome</jndi-name>
-      <query>
-        <query-method>
-          <method-name>findByLastName</method-name>
-          <method-params>
-            <method-param>java.lang.String</method-param>
-          </method-params>
-        </query-method>
-        <sql>SELECT id FROM BasicCmp WHERE lastName = ?</sql>
-      </query>
-      <query>
-        <query-method>
-          <method-name>findEmptyCollection</method-name>
-          <method-params/>
-        </query-method>
-        <sql>SELECT id FROM BasicCmp WHERE 1 = 0</sql>
-      </query>
-      <nam:resource-ref>
-        <nam:ref-name>jdbc/basic/entityDatabase</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </entity>
-    <entity>
-      <ejb-name>AOBasicCmpBean</ejb-name>
-      <jndi-name>client/tests/entity/cmp/allowed_operations/EntityHome</jndi-name>
-      <query>
-        <query-method>
-          <method-name>findByLastName</method-name>
-          <method-params>
-            <method-param>java.lang.String</method-param>
-          </method-params>
-        </query-method>
-        <sql>SELECT id FROM AOBasicCmp WHERE lastName = ?</sql>
-      </query>
-      <query>
-        <query-method>
-          <method-name>findEmptyCollection</method-name>
-          <method-params/>
-        </query-method>
-        <sql>SELECT id FROM AOBasicCmp WHERE 1 = 0</sql>
-      </query>
-      <nam:resource-ref>
-        <nam:ref-name>jdbc/basic/entityDatabase</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-      <nam:resource-ref>
-        <nam:ref-name>entity/references/Resource_manager_access</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </entity>
-    <entity>
-      <ejb-name>EncCmpBean</ejb-name>
-      <jndi-name>client/tests/entity/cmp/EncBean</jndi-name>
-      <nam:resource-ref>
-        <nam:ref-name>jdbc/basic/entityDatabase</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-      <nam:resource-ref>
-        <nam:ref-name>datasource</nam:ref-name>
-        <nam:target-name>DefaultDatasource</nam:target-name>
-      </nam:resource-ref>
-    </entity>
-    <entity>
-      <ejb-name>CmpRMIIIOPBean</ejb-name>
-      <jndi-name>client/tests/entity/cmp/RMI-over-IIOP/EJBHome</jndi-name>
-    </entity>
-  </enterprise-beans>
+    <enterprise-beans>
+        <!--
+            ########################################################
+            Stateless
+            ########################################################
+            -->
+        <session>
+            <ejb-name>BasicStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/BasicStatelessHome</jndi-name>
+            <nam:resource-ref>
+                <nam:ref-name>stateless/references/Resource_manager_access</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </session>
+        <session>
+            <ejb-name>BasicBMTStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/BeanManagedBasicStatelessHome</jndi-name>
+            <nam:resource-ref>
+                <nam:ref-name>stateless/references/Resource_manager_access</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </session>
+        <session>
+            <ejb-name>DatabaseBean</ejb-name>
+            <jndi-name>client/tools/DatabaseHome</jndi-name>
+            <nam:resource-ref>
+                <nam:ref-name>database</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </session>
+        <session>
+            <ejb-name>BMTStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/BeanManagedTransactionTests/EJBHome</jndi-name>
+            <nam:resource-ref>
+                <nam:ref-name>database</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </session>
+        <session>
+            <ejb-name>EncStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/EncBean</jndi-name>
+            <nam:resource-ref>
+                <nam:ref-name>datasource</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </session>
+        <session>
+            <ejb-name>StatelessRMIIIOPBean</ejb-name>
+            <jndi-name>client/tests/stateless/RMI-over-IIOP/EJBHome</jndi-name>
+        </session>
+        <!--
+            ########################################################
+            Stateless
+            ########################################################
+            -->
+        <session>
+            <ejb-name>BasicStatefulBean</ejb-name>
+            <jndi-name>client/tests/stateful/BasicStatefulHome</jndi-name>
+            <nam:resource-ref>
+                <nam:ref-name>stateful/references/Resource_manager_access</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </session>
+        <session>
+            <ejb-name>BasicBMTStatefulBean</ejb-name>
+            <jndi-name>client/tests/stateful/BeanManagedBasicStatefulHome</jndi-name>
+            <nam:resource-ref>
+                <nam:ref-name>stateful/references/Resource_manager_access</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </session>
+        <session>
+            <ejb-name>BMTStatefulBean</ejb-name>
+            <jndi-name>client/tests/stateful/BeanManagedTransactionTests/EJBHome</jndi-name>
+            <nam:resource-ref>
+                <nam:ref-name>datasource</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </session>
+        <session>
+            <ejb-name>EncStatefulBean</ejb-name>
+            <jndi-name>client/tests/stateful/EncBean</jndi-name>
+            <nam:resource-ref>
+                <nam:ref-name>datasource</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </session>
+        <session>
+            <ejb-name>StatefulRMIIIOPBean</ejb-name>
+            <jndi-name>client/tests/stateful/RMI-over-IIOP/EJBHome</jndi-name>
+        </session>
+        <!--
+            ########################################################
+            BMP
+            ########################################################
+            -->
+        <entity>
+            <ejb-name>BasicBmpBean</ejb-name>
+            <jndi-name>client/tests/entity/bmp/BasicBmpHome</jndi-name>
+            <nam:resource-ref>
+                <nam:ref-name>jdbc/basic/entityDatabase</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </entity>
+        <entity>
+            <ejb-name>AOBasicBmpBean</ejb-name>
+            <jndi-name>client/tests/entity/bmp/allowed_operations/EntityHome</jndi-name>
+            <nam:resource-ref>
+                <nam:ref-name>jdbc/basic/entityDatabase</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+            <nam:resource-ref>
+                <nam:ref-name>entity/references/Resource_manager_access</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </entity>
+        <entity>
+            <ejb-name>EncBmpBean</ejb-name>
+            <jndi-name>client/tests/entity/bmp/EncBean</jndi-name>
+            <nam:resource-ref>
+                <nam:ref-name>datasource</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+            <nam:resource-ref>
+                <nam:ref-name>jdbc/basic/entityDatabase</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </entity>
+        <entity>
+            <ejb-name>BmpRMIIIOPBean</ejb-name>
+            <jndi-name>client/tests/entity/bmp/RMI-over-IIOP/EJBHome</jndi-name>
+        </entity>
+        <!--
+            ########################################################
+            BMP
+            ########################################################
+            -->
+        <entity>
+            <ejb-name>BasicCmpBean</ejb-name>
+            <jndi-name>client/tests/entity/cmp/BasicCmpHome</jndi-name>
+            <query>
+                <query-method>
+                    <method-name>findByLastName</method-name>
+                    <method-params>
+                        <method-param>java.lang.String</method-param>
+                    </method-params>
+                </query-method>
+                <sql>SELECT id FROM BasicCmp WHERE lastName = ?</sql>
+            </query>
+            <query>
+                <query-method>
+                    <method-name>findEmptyCollection</method-name>
+                    <method-params/>
+                </query-method>
+                <sql>SELECT id FROM BasicCmp WHERE 1 = 0</sql>
+            </query>
+            <nam:resource-ref>
+                <nam:ref-name>jdbc/basic/entityDatabase</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </entity>
+        <entity>
+            <ejb-name>AOBasicCmpBean</ejb-name>
+            <jndi-name>client/tests/entity/cmp/allowed_operations/EntityHome</jndi-name>
+            <query>
+                <query-method>
+                    <method-name>findByLastName</method-name>
+                    <method-params>
+                        <method-param>java.lang.String</method-param>
+                    </method-params>
+                </query-method>
+                <sql>SELECT id FROM AOBasicCmp WHERE lastName = ?</sql>
+            </query>
+            <query>
+                <query-method>
+                    <method-name>findEmptyCollection</method-name>
+                    <method-params/>
+                </query-method>
+                <sql>SELECT id FROM AOBasicCmp WHERE 1 = 0</sql>
+            </query>
+            <nam:resource-ref>
+                <nam:ref-name>jdbc/basic/entityDatabase</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+            <nam:resource-ref>
+                <nam:ref-name>entity/references/Resource_manager_access</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </entity>
+        <entity>
+            <ejb-name>EncCmpBean</ejb-name>
+            <jndi-name>client/tests/entity/cmp/EncBean</jndi-name>
+            <nam:resource-ref>
+                <nam:ref-name>jdbc/basic/entityDatabase</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+            <nam:resource-ref>
+                <nam:ref-name>datasource</nam:ref-name>
+                <nam:target-name>DefaultDatasource</nam:target-name>
+            </nam:resource-ref>
+        </entity>
+        <entity>
+            <ejb-name>CmpRMIIIOPBean</ejb-name>
+            <jndi-name>client/tests/entity/cmp/RMI-over-IIOP/EJBHome</jndi-name>
+        </entity>
+    </enterprise-beans>
 </openejb-jar>

Added: geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname1-post.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname1-post.xml?rev=348020&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname1-post.xml (added)
+++ geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname1-post.xml Mon Nov 21 15:36:16
2005
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+    <parent xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0">
+        <uri>org/foo</uri>
+    </parent>
\ No newline at end of file

Added: geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname1-pre.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname1-pre.xml?rev=348020&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname1-pre.xml (added)
+++ geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname1-pre.xml Mon Nov 21 15:36:16
2005
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+    <import xmlns="http://foo.bar">
+        <uri>org/foo</uri>
+    </import>

Added: geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname2-post.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname2-post.xml?rev=348020&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname2-post.xml (added)
+++ geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname2-post.xml Mon Nov 21 15:36:16
2005
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+    <parent xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0">
+        <groupId>foo</groupId>
+        <type>car</type>
+        <artifactId>bar</artifactId>
+        <version>0.0</version>
+    </parent>

Added: geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname2-pre.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname2-pre.xml?rev=348020&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname2-pre.xml (added)
+++ geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/qname2-pre.xml Mon Nov 21 15:36:16
2005
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+    <import xmlns="http://foo.bar">
+        <groupId>foo</groupId>
+        <type>car</type>
+        <artifactId>bar</artifactId>
+        <version>0.0</version>
+    </import>

Modified: geronimo/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java?rev=348020&r1=348019&r2=348020&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
(original)
+++ geronimo/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
Mon Nov 21 15:36:16 2005
@@ -22,6 +22,8 @@
 import java.util.List;
 import java.net.URL;
 
+import javax.xml.namespace.QName;
+
 import junit.framework.TestCase;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlObject;
@@ -439,6 +441,53 @@
 
     }
 
+    public void testQNameConverter1() throws Exception {
+        URL srcXml = classLoader.getResource("geronimo/qname1-pre.xml");
+        URL expectedOutputXml = classLoader.getResource("geronimo/qname1-post.xml");
+        XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
+        ElementConverter elementConverter = new QNameConverter("import", "http://geronimo.apache.org/xml/ns/deployment-1.0",
"parent");
+        XmlCursor cursor = xmlObject.newCursor();
+        XmlCursor end = cursor.newCursor();
+        try {
+            elementConverter.convertElement(cursor, end);
+            //        System.out.println(xmlObject.toString());
+            XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
+            List problems = new ArrayList();
+            boolean ok = compareXmlObjects(xmlObject, expected, problems);
+            assertTrue("Differences: " + problems, ok);
+            SchemaConversionUtils.convertToGeronimoSubSchemas(cursor);
+            boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
+            assertTrue("Differences: " + problems, ok2);
+        } finally {
+            cursor.dispose();
+            end.dispose();
+        }
+
+    }
+    public void testQNameConverter2() throws Exception {
+        URL srcXml = classLoader.getResource("geronimo/qname2-pre.xml");
+        URL expectedOutputXml = classLoader.getResource("geronimo/qname2-post.xml");
+        XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
+        ElementConverter elementConverter = new QNameConverter("import", "http://geronimo.apache.org/xml/ns/deployment-1.0",
"parent");
+        XmlCursor cursor = xmlObject.newCursor();
+        XmlCursor end = cursor.newCursor();
+        try {
+            elementConverter.convertElement(cursor, end);
+            //        System.out.println(xmlObject.toString());
+            XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
+            List problems = new ArrayList();
+            boolean ok = compareXmlObjects(xmlObject, expected, problems);
+            assertTrue("Differences: " + problems, ok);
+            SchemaConversionUtils.convertToGeronimoSubSchemas(cursor);
+            boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
+            assertTrue("Differences: " + problems, ok2);
+        } finally {
+            cursor.dispose();
+            end.dispose();
+        }
+
+    }
+
     private boolean compareXmlObjects(XmlObject xmlObject, XmlObject expectedObject, List
problems) {
         XmlCursor test = xmlObject.newCursor();
         XmlCursor expected = expectedObject.newCursor();
@@ -450,10 +499,10 @@
                 problems.add("test longer than expected at element: " + elementCount);
                 return false;
             }
-            String actualChars = test.getName().getLocalPart();
-            String expectedChars = expected.getName().getLocalPart();
-            if (!actualChars.equals(expectedChars)) {
-                problems.add("Different elements at elementCount: " + elementCount + ", test:
" + actualChars + ", expected: " + expectedChars);
+            QName actualQName = test.getName();
+            QName expectedQName = expected.getName();
+            if (!actualQName.equals(expectedQName)) {
+                problems.add("Different elements at elementCount: " + elementCount + ", test:
" + actualQName + ", expected: " + expectedQName);
                 similar = false;
             }
             test.toNextToken();

Modified: geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-1.0.xsd?rev=348020&r1=348019&r2=348020&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-1.0.xsd (original)
+++ geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-1.0.xsd Mon Nov 21 15:36:16
2005
@@ -36,11 +36,12 @@
 
     <xs:complexType name="web-appType">
         <xs:sequence>
-            <xs:element ref="sys:import" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>
-
+<!--            <xs:element ref="sys:parent" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+            <xs:group ref="sys:classloader-infoGroup"/>
+                                                       
             <xs:element name="context-root" type="xs:string" minOccurs="0"/>
             <xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>
             <xs:element name="virtual-host" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>

Modified: geronimo/trunk/modules/service-builder/src/schema/geronimo-config-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/schema/geronimo-config-1.0.xsd?rev=348020&r1=348019&r2=348020&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/src/schema/geronimo-config-1.0.xsd (original)
+++ geronimo/trunk/modules/service-builder/src/schema/geronimo-config-1.0.xsd Mon Nov 21 15:36:16
2005
@@ -36,11 +36,7 @@
 
     <xs:complexType name="configurationType">
         <xs:sequence>
-            <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:import" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="include" type="sys:dependencyType" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:group ref="sys:classloader-include-infoGroup"/>
             <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
         <xs:attribute name="configId" type="xs:string" use="required"/>
@@ -57,10 +53,29 @@
         <xs:attribute name="inverseClassloading" type="xs:boolean" use="optional"/>
     </xs:complexType>
 
-    <xs:element name="hidden-classes" type="sys:classFilterType"/>
-    <xs:element name="non-overridable-classes" type="sys:classFilterType"/>
+    <xs:group name="classloader-infoGroup">
+        <xs:sequence>
+            <xs:element ref="sys:import" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+    <xs:group name="classloader-include-infoGroup">
+        <xs:sequence>
+            <xs:element ref="sys:import" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="sys:include" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:group>
+
     <xs:element name="import" type="sys:dependencyType"/>
+    <xs:element name="include" type="sys:dependencyType"/>
     <xs:element name="dependency" type="sys:dependencyType"/>
+    <xs:element name="hidden-classes" type="sys:classFilterType"/>
+    <xs:element name="non-overridable-classes" type="sys:classFilterType"/>
     <xs:element name="gbean" type="sys:gbeanType"/>
 
     <xs:complexType name="classFilterType">

Modified: geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd?rev=348020&r1=348019&r2=348020&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd (original)
+++ geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd Mon Nov 21 15:36:16
2005
@@ -36,10 +36,11 @@
 
     <xs:complexType name="web-appType">
         <xs:sequence>
-            <xs:element ref="sys:import" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>
+<!--            <xs:element ref="sys:parent" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+            <xs:group ref="sys:classloader-infoGroup"/>
 
             <xs:element name="context-root" type="xs:string" minOccurs="0"/>
             <xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>
@@ -49,7 +50,7 @@
             <xs:element name="valve-chain" type="xs:string" minOccurs="0"/>
             <xs:element name="tomcat-realm" type="xs:string" minOccurs="0"/>
             <xs:element name="cluster" type="xs:string" minOccurs="0"/>
-            
+
             <xs:group ref="naming:jndiEnvironmentRefsGroup"/>
             <xs:element ref="naming:message-destination" minOccurs="0" maxOccurs="unbounded"/>
 
@@ -63,7 +64,7 @@
         </xs:sequence>
         <xs:attribute name="configId" type="xs:string" use="required"/>
         <xs:attribute name="parentId" type="xs:string" use="optional"/>
-        <xs:attribute name="inverseClassloading" type="xs:boolean" use="optional"/>
+        <xs:attribute name="inverseClassloading" type="xs:boolean" use="optional"/>
     </xs:complexType>
 
     <xs:complexType name="emptyType"/>

Modified: geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.0.xsd?rev=348020&r1=348019&r2=348020&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.0.xsd (original)
+++ geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.0.xsd Mon Nov 21 15:36:16
2005
@@ -36,8 +36,11 @@
 
     <xs:complexType name="web-appType">
         <xs:sequence>
-            <xs:element ref="sys:import" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>
+<!--            <xs:element ref="sys:parent" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+<!--            <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+            <xs:group ref="sys:classloader-infoGroup"/>
 
             <xs:element name="context-root" type="xs:string" minOccurs="0"/>
             <xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>



Mime
View raw message