schema

djencks 24 Sep 2004 22:17:02 -0000

Author: djencks
Date: Fri Sep 24 15:16:52 2004
New Revision: 47175

Modified:
   geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
   
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
   geronimo/trunk/modules/connector/src/schema/geronimo-connector_1_5.xsd
   geronimo/trunk/modules/connector/src/schema/xmlconfig.xml
   geronimo/trunk/modules/connector/src/test-data/connector_1_0/geronimo-ra.xml
   geronimo/trunk/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml
   
geronimo/trunk/modules/connector/src/test-data/data/external-application-plan.xml
   
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java
   
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
   geronimo/trunk/modules/j2ee/src/schema/geronimo-application.xsd
Log:
move embedded vendor-dds up one element nesting level.  Change connector schema 
namespace to be clearly unique. Clean up code slightly.


Modified: geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml  
(original)
+++ geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml  Fri Sep 
24 15:16:52 2004
@@ -18,7 +18,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee";
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector";
     version="1.5"
     configId="org/apache/geronimo/DefaultDatabase"
     parentId="org/apache/geronimo/Server">

Modified: 
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
==============================================================================
--- 
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
      (original)
+++ 
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
      Fri Sep 24 15:16:52 2004
@@ -139,7 +139,6 @@
         try {
             dd = SchemaConversionUtils.getNestedObjectAsType(dd, "connector", 
GerConnectorType.type);
             SchemaConversionUtils.validateDD(dd);
-            System.out.println("Successfully validated: " + dd);
             return dd;
         } catch (Exception e) {
             throw new DeploymentException(e);

Modified: geronimo/trunk/modules/connector/src/schema/geronimo-connector_1_5.xsd
==============================================================================
--- geronimo/trunk/modules/connector/src/schema/geronimo-connector_1_5.xsd      
(original)
+++ geronimo/trunk/modules/connector/src/schema/geronimo-connector_1_5.xsd      
Fri Sep 24 15:16:52 2004
@@ -17,8 +17,8 @@
 -->
 
 <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema";
-    xmlns:ger="http://geronimo.apache.org/xml/ns/j2ee";
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee";
+    xmlns:ger="http://geronimo.apache.org/xml/ns/j2ee/connector";
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/connector";
     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee";
     xmlns:xsd="http://www.w3.org/2001/XMLSchema";
     elementFormDefault="qualified"
@@ -31,7 +31,7 @@
         <xsd:documentation>
             <![CDATA[
             documents using this schema should start like:
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee";
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector";
     version="1.5">
 
           @(#)geronimo-connector_1_5.xsds

Modified: geronimo/trunk/modules/connector/src/schema/xmlconfig.xml
==============================================================================
--- geronimo/trunk/modules/connector/src/schema/xmlconfig.xml   (original)
+++ geronimo/trunk/modules/connector/src/schema/xmlconfig.xml   Fri Sep 24 
15:16:52 2004
@@ -1,15 +1,7 @@
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config";
     >
 
-    <!--xb:namespace uri="http://java.sun.com/xml/ns/j2ee";>
-        <xb:package>org.apache.geronimo.xbeans.j2ee</xb:package>
-    </xb:namespace-->
-
-    <!--xb:namespace uri="##local">
-        <xb:package>org.apache.geronimo.xbeans.j2ee.connector_1_0</xb:package>
-    </xb:namespace-->
-
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee";>
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/connector";>
         <xb:package>org.apache.geronimo.xbeans.geronimo</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>

Modified: 
geronimo/trunk/modules/connector/src/test-data/connector_1_0/geronimo-ra.xml
==============================================================================
--- 
geronimo/trunk/modules/connector/src/test-data/connector_1_0/geronimo-ra.xml    
    (original)
+++ 
geronimo/trunk/modules/connector/src/test-data/connector_1_0/geronimo-ra.xml    
    Fri Sep 24 15:16:52 2004
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee"; version="1.0"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"; 
version="1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: 
geronimo/trunk/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml
==============================================================================
--- 
geronimo/trunk/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml    
    (original)
+++ 
geronimo/trunk/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml    
    Fri Sep 24 15:16:52 2004
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee"; version="1.5"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"; 
version="1.5"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: 
geronimo/trunk/modules/connector/src/test-data/data/external-application-plan.xml
==============================================================================
--- 
geronimo/trunk/modules/connector/src/test-data/data/external-application-plan.xml
   (original)
+++ 
geronimo/trunk/modules/connector/src/test-data/data/external-application-plan.xml
   Fri Sep 24 15:16:52 2004
@@ -23,161 +23,157 @@
 
     <module>
         <connector>test-rar-10-noger.rar</connector>
-        <module-dd>
-            <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee"; 
version="1.0"
-                configId="org/apache/geronimo/j2ee/deployment/test"
-                parentId="org/apache/geronimo/Server">
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"; 
version="1.0"
+            configId="org/apache/geronimo/j2ee/deployment/test"
+            parentId="org/apache/geronimo/Server">
 
-                <resourceadapter>
-                    <outbound-resourceadapter>
-                        <connection-definition>
-                            
<connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
-                            <connectiondefinition-instance>
-                                <name>FirstTestOutboundConnectionFactory</name>
-                                <config-property-setting 
name="OutboundStringProperty1">newvalue1</config-property-setting>
-                                <config-property-setting 
name="OutboundStringProperty3">newvalue2</config-property-setting>
-                                <connectionmanager>
-                                    <realm-bridge>TargetRealm</realm-bridge>
-                                    <xa-transaction>
-                                        <transaction-caching/>
-                                    </xa-transaction>
-                                    <partitioned-pool>
-                                        <max-size>10</max-size>
-                                        
<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                        <match-one/>
-                                        <partition-by-subject/>
-                                    </partitioned-pool>
-                                </connectionmanager>
-                                
<global-jndi-name>connectionfactories/testcf</global-jndi-name>
-                                
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
-                            </connectiondefinition-instance>
-                            <connectiondefinition-instance>
-                                
<name>SecondTestOutboundConnectionFactory</name>
-                                <config-property-setting 
name="OutboundStringProperty4">newvalue3</config-property-setting>
-                                <config-property-setting 
name="OutboundStringProperty1">newvalue4</config-property-setting>
-                                <connectionmanager>
-                                    <xa-transaction>
-                                        <transaction-caching/>
-                                    </xa-transaction>
-                                    <single-pool>
-                                        <max-size>10</max-size>
-                                        
<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                        <match-one/>
-                                    </single-pool>
-                                </connectionmanager>
-                            </connectiondefinition-instance>
-                            <connectiondefinition-instance>
-                                <name>ThirdTestOutboundConnectionFactory</name>
-                                <config-property-setting 
name="OutboundStringProperty">StringValue3</config-property-setting>
-                                <connectionmanager>
-                                    <realm-bridge>TargetRealm</realm-bridge>
-                                    <xa-transaction>
-                                        <transaction-caching/>
-                                    </xa-transaction>
-                                    <partitioned-pool>
-                                        <max-size>10</max-size>
-                                        
<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                        <match-one/>
-                                        <partition-by-subject/>
-                                    </partitioned-pool>
-                                </connectionmanager>
-                            </connectiondefinition-instance>
-                        </connection-definition>
-                    </outbound-resourceadapter>
-                </resourceadapter>
+            <resourceadapter>
+                <outbound-resourceadapter>
+                    <connection-definition>
+                        
<connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>FirstTestOutboundConnectionFactory</name>
+                            <config-property-setting 
name="OutboundStringProperty1">newvalue1</config-property-setting>
+                            <config-property-setting 
name="OutboundStringProperty3">newvalue2</config-property-setting>
+                            <connectionmanager>
+                                <realm-bridge>TargetRealm</realm-bridge>
+                                <xa-transaction>
+                                    <transaction-caching/>
+                                </xa-transaction>
+                                <partitioned-pool>
+                                    <max-size>10</max-size>
+                                    
<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <match-one/>
+                                    <partition-by-subject/>
+                                </partitioned-pool>
+                            </connectionmanager>
+                            
<global-jndi-name>connectionfactories/testcf</global-jndi-name>
+                            
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+                        </connectiondefinition-instance>
+                        <connectiondefinition-instance>
+                            <name>SecondTestOutboundConnectionFactory</name>
+                            <config-property-setting 
name="OutboundStringProperty4">newvalue3</config-property-setting>
+                            <config-property-setting 
name="OutboundStringProperty1">newvalue4</config-property-setting>
+                            <connectionmanager>
+                                <xa-transaction>
+                                    <transaction-caching/>
+                                </xa-transaction>
+                                <single-pool>
+                                    <max-size>10</max-size>
+                                    
<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                        <connectiondefinition-instance>
+                            <name>ThirdTestOutboundConnectionFactory</name>
+                            <config-property-setting 
name="OutboundStringProperty">StringValue3</config-property-setting>
+                            <connectionmanager>
+                                <realm-bridge>TargetRealm</realm-bridge>
+                                <xa-transaction>
+                                    <transaction-caching/>
+                                </xa-transaction>
+                                <partitioned-pool>
+                                    <max-size>10</max-size>
+                                    
<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <match-one/>
+                                    <partition-by-subject/>
+                                </partitioned-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+                </outbound-resourceadapter>
+            </resourceadapter>
 
-            </connector>
-        </module-dd>
+        </connector>
     </module>
     <module>
         <connector>test-rar-15-noger.rar</connector>
-        <module-dd>
-            <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee"; 
version="1.5"
-                configId="org/apache/geronimo/j2ee/deployment/test"
-                parentId="org/apache/geronimo/Server">
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"; 
version="1.5"
+            configId="org/apache/geronimo/j2ee/deployment/test"
+            parentId="org/apache/geronimo/Server">
 
-                <resourceadapter>
-                    <resourceadapter-instance>
-                        <resourceadapter-name>testRA</resourceadapter-name>
-                        <config-property-setting 
name="RAStringProperty">NewStringValue</config-property-setting>
-                        <workmanager-name>DefaultWorkManager</workmanager-name>
-                    </resourceadapter-instance>
-                    <outbound-resourceadapter>
-                        <connection-definition>
-                            
<connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
-                            <connectiondefinition-instance>
-                                <name>FirstTestOutboundConnectionFactory</name>
-                                <config-property-setting 
name="OutboundStringProperty1">newvalue1</config-property-setting>
-                                <config-property-setting 
name="OutboundStringProperty3">newvalue2</config-property-setting>
-                                <connectionmanager>
-                                    <realm-bridge>TargetRealm</realm-bridge>
-                                    <xa-transaction>
-                                        <transaction-caching/>
-                                    </xa-transaction>
-                                    <partitioned-pool>
-                                        <max-size>10</max-size>
-                                        
<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                        <match-one/>
-                                        <partition-by-subject/>
-                                    </partitioned-pool>
-                                </connectionmanager>
-                                
<global-jndi-name>connectionfactories/testcf</global-jndi-name>
-                                
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
-                            </connectiondefinition-instance>
-                            <connectiondefinition-instance>
-                                
<name>SecondTestOutboundConnectionFactory</name>
-                                <config-property-setting 
name="OutboundStringProperty4">newvalue3</config-property-setting>
-                                <config-property-setting 
name="OutboundStringProperty1">newvalue4</config-property-setting>
-                                <connectionmanager>
-                                    <realm-bridge>TargetRealm</realm-bridge>
-                                    <xa-transaction>
-                                        <transaction-caching/>
-                                    </xa-transaction>
-                                    <partitioned-pool>
-                                        <max-size>10</max-size>
-                                        
<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                        <match-one/>
-                                        <partition-by-subject/>
-                                    </partitioned-pool>
-                                </connectionmanager>
-                            </connectiondefinition-instance>
-                        </connection-definition>
-                        <connection-definition>
-                            
<connectionfactory-interface>org.apache.geronimo.connector.mock.ConnectionFactoryExtension</connectionfactory-interface>
-                            <connectiondefinition-instance>
-                                <name>ThirdTestOutboundConnectionFactory</name>
-                                <config-property-setting 
name="OutboundStringProperty1">StringValue3</config-property-setting>
-                                <connectionmanager>
-                                    <realm-bridge>TargetRealm</realm-bridge>
-                                    <xa-transaction>
-                                        <transaction-caching/>
-                                    </xa-transaction>
-                                    <partitioned-pool>
-                                        <max-size>10</max-size>
-                                        
<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                                        <match-one/>
-                                        <partition-by-subject/>
-                                    </partitioned-pool>
-                                </connectionmanager>
-                            </connectiondefinition-instance>
-                        </connection-definition>
-                    </outbound-resourceadapter>
-                    <adminobject>
-                        
<adminobject-interface>org.apache.geronimo.connector.mock.MockAdminObject</adminobject-interface>
-                        
<adminobject-class>org.apache.geronimo.connector.mock.MockAdminObjectImpl</adminobject-class>
-                        <adminobject-instance>
-                            
<message-destination-name>tweedledee</message-destination-name>
-                            <config-property-setting 
name="Tweedle">Dee-value</config-property-setting>
-                        </adminobject-instance>
-                        <adminobject-instance>
-                            
<message-destination-name>tweedledum</message-destination-name>
-                            <config-property-setting 
name="Tweedle">Dum-value</config-property-setting>
-                        </adminobject-instance>
-                    </adminobject>
-                </resourceadapter>
+            <resourceadapter>
+                <resourceadapter-instance>
+                    <resourceadapter-name>testRA</resourceadapter-name>
+                    <config-property-setting 
name="RAStringProperty">NewStringValue</config-property-setting>
+                    <workmanager-name>DefaultWorkManager</workmanager-name>
+                </resourceadapter-instance>
+                <outbound-resourceadapter>
+                    <connection-definition>
+                        
<connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>FirstTestOutboundConnectionFactory</name>
+                            <config-property-setting 
name="OutboundStringProperty1">newvalue1</config-property-setting>
+                            <config-property-setting 
name="OutboundStringProperty3">newvalue2</config-property-setting>
+                            <connectionmanager>
+                                <realm-bridge>TargetRealm</realm-bridge>
+                                <xa-transaction>
+                                    <transaction-caching/>
+                                </xa-transaction>
+                                <partitioned-pool>
+                                    <max-size>10</max-size>
+                                    
<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <match-one/>
+                                    <partition-by-subject/>
+                                </partitioned-pool>
+                            </connectionmanager>
+                            
<global-jndi-name>connectionfactories/testcf</global-jndi-name>
+                            
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+                        </connectiondefinition-instance>
+                        <connectiondefinition-instance>
+                            <name>SecondTestOutboundConnectionFactory</name>
+                            <config-property-setting 
name="OutboundStringProperty4">newvalue3</config-property-setting>
+                            <config-property-setting 
name="OutboundStringProperty1">newvalue4</config-property-setting>
+                            <connectionmanager>
+                                <realm-bridge>TargetRealm</realm-bridge>
+                                <xa-transaction>
+                                    <transaction-caching/>
+                                </xa-transaction>
+                                <partitioned-pool>
+                                    <max-size>10</max-size>
+                                    
<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <match-one/>
+                                    <partition-by-subject/>
+                                </partitioned-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+                    <connection-definition>
+                        
<connectionfactory-interface>org.apache.geronimo.connector.mock.ConnectionFactoryExtension</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>ThirdTestOutboundConnectionFactory</name>
+                            <config-property-setting 
name="OutboundStringProperty1">StringValue3</config-property-setting>
+                            <connectionmanager>
+                                <realm-bridge>TargetRealm</realm-bridge>
+                                <xa-transaction>
+                                    <transaction-caching/>
+                                </xa-transaction>
+                                <partitioned-pool>
+                                    <max-size>10</max-size>
+                                    
<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <match-one/>
+                                    <partition-by-subject/>
+                                </partitioned-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+                </outbound-resourceadapter>
+                <adminobject>
+                    
<adminobject-interface>org.apache.geronimo.connector.mock.MockAdminObject</adminobject-interface>
+                    
<adminobject-class>org.apache.geronimo.connector.mock.MockAdminObjectImpl</adminobject-class>
+                    <adminobject-instance>
+                        
<message-destination-name>tweedledee</message-destination-name>
+                        <config-property-setting 
name="Tweedle">Dee-value</config-property-setting>
+                    </adminobject-instance>
+                    <adminobject-instance>
+                        
<message-destination-name>tweedledum</message-destination-name>
+                        <config-property-setting 
name="Tweedle">Dum-value</config-property-setting>
+                    </adminobject-instance>
+                </adminobject>
+            </resourceadapter>
 
-            </connector>
+        </connector>
 
-        </module-dd>
     </module>
 </application>

Modified: 
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java
==============================================================================
--- 
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java
    (original)
+++ 
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilderTest.java
    Fri Sep 24 15:16:52 2004
@@ -289,21 +289,24 @@
         ObjectName j2eeServer = new ObjectName(j2eeDomainName + ":name=" + 
j2eeServerName);
         Kernel kernel = new Kernel("blah");
         kernel.boot();
-
-        EARConfigBuilder configBuilder = new EARConfigBuilder(j2eeServer, 
null, connectionTrackerName, null, null, null, null, null, null, new 
ConnectorModuleBuilder(), null, kernel);
-        File rarFile = new File(basedir, "target/test-ear-noger.ear");
-        File outFile = File.createTempFile("EARTest", ".car");
         try {
-            File planFile = new File(basedir, 
"src/test-data/data/external-application-plan.xml");
-            XmlObject planDoc = 
SchemaConversionUtils.parse(planFile.toURL().openStream());
-            XmlCursor cursor = planDoc.newCursor();
-            cursor.toFirstChild();
-            XmlObject plan = cursor.getObject();
-            cursor.dispose();
-            configBuilder.buildConfiguration(outFile, null, rarFile, plan);
+            EARConfigBuilder configBuilder = new EARConfigBuilder(j2eeServer, 
null, connectionTrackerName, null, null, null, null, null, null, new 
ConnectorModuleBuilder(), null, kernel);
+            File rarFile = new File(basedir, "target/test-ear-noger.ear");
+            File outFile = File.createTempFile("EARTest", ".car");
+            try {
+                File planFile = new File(basedir, 
"src/test-data/data/external-application-plan.xml");
+                XmlObject planDoc = 
SchemaConversionUtils.parse(planFile.toURL().openStream());
+                XmlCursor cursor = planDoc.newCursor();
+                cursor.toFirstChild();
+                XmlObject plan = cursor.getObject();
+                cursor.dispose();
+                configBuilder.buildConfiguration(outFile, null, rarFile, plan);
 
+            } finally {
+                outFile.delete();
+            }
         } finally {
-            outFile.delete();
+            kernel.shutdown();
         }
     }
 

Modified: 
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
==============================================================================
--- 
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
      (original)
+++ 
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
      Fri Sep 24 15:16:52 2004
@@ -70,6 +70,7 @@
 import org.apache.xmlbeans.XmlBeans;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlCursor;
 
 /**
  * @version $Rev$ $Date$
@@ -433,7 +434,16 @@
                     altVendorDDs.put(path, dd);
                 } else {
                     //dd is included explicitly
-                    altVendorDDs.put(path, gerModuleType.getModuleDd());
+                    XmlCursor cursor = gerModuleType.newCursor();
+                    try {
+                        cursor.toFirstChild();
+                        cursor.toNextSibling();
+                        //should be at the "any" element
+                        XmlObject any = cursor.getObject();
+                        altVendorDDs.put(path, any);
+                    } finally {
+                        cursor.dispose();
+                    }
                 }
             }
 

Modified: geronimo/trunk/modules/j2ee/src/schema/geronimo-application.xsd
==============================================================================
--- geronimo/trunk/modules/j2ee/src/schema/geronimo-application.xsd     
(original)
+++ geronimo/trunk/modules/j2ee/src/schema/geronimo-application.xsd     Fri Sep 
24 15:16:52 2004
@@ -62,13 +62,14 @@
                         </xs:documentation>
                     </xs:annotation>
                 </xs:element>
-                <xs:element name="module-dd" type="geronimo:module-ddType">
+                <xs:any namespace="##other"/>
+                <!--xs:element name="module-dd" type="geronimo:module-ddType">
                     <xs:annotation>
                         <xs:documentation>
                             Include the literal vendor dd in the appropriate 
namespace.
                         </xs:documentation>
                     </xs:annotation>
-                </xs:element>
+                </xs:element-->
             </xs:choice>
         </xs:sequence>
     </xs:complexType>

Reply via email to