You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sh...@apache.org on 2008/03/13 12:36:13 UTC

svn commit: r636723 [3/13] - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.deployment.v11.jaxbmodel/ org.apache.geronimo.deployment.v11.jaxbmodel/META-INF/ org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/ org.a...

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-naming-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-naming-1.1.xsd?rev=636723&r1=636722&r2=636723&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-naming-1.1.xsd (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-naming-1.1.xsd Thu Mar 13 04:36:06 2008
@@ -1,275 +1,275 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You 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.
--->
-<!-- $Rev$ $Date$ -->
-
-<xsd:schema
-        targetNamespace="http://geronimo.apache.org/xml/ns/naming-1.1"
-        xmlns:gernaming="http://geronimo.apache.org/xml/ns/naming-1.1"
-        xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        elementFormDefault="qualified"
-        attributeFormDefault="unqualified"
-        version="1.0">
-
-    <xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
-
-    <xsd:annotation>
-        <xsd:documentation>
-            <![CDATA[
-            Partial schema containing common naming elements which can be included in other schemas.
-            ]]>
-        </xsd:documentation>
-    </xsd:annotation>
-
-
-    <xsd:element name="gbean-ref" type="gernaming:gbean-refType"/>
-    <xsd:element name="ejb-ref" type="gernaming:ejb-refType"/>
-    <!--    <xsd:element name="ejb-local-ref" type="gernaming:ejb-local-refType"/>-->
-    <xsd:element name="service-ref" type="gernaming:service-refType"/>
-    <xsd:element name="resource-ref" type="gernaming:resource-refType"/>
-    <xsd:element name="resource-env-ref" type="gernaming:resource-env-refType"/>
-
-    <xsd:element name="message-destination" type="gernaming:message-destinationType"/>
-
-    <xsd:group name="jndiEnvironmentRefsGroup">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                This group keeps the usage of the contained JNDI environment
-                reference elements consistent across J2EE deployment descriptors.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="gbean-ref" type="gernaming:gbean-refType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="ejb-ref" type="gernaming:ejb-refType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="ejb-local-ref" type="gernaming:ejb-local-refType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="service-ref" type="gernaming:service-refType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="resource-ref" type="gernaming:resource-refType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="resource-env-ref" type="gernaming:resource-env-refType" minOccurs="0"
-                         maxOccurs="unbounded"/>
-        </xsd:sequence>
-    </xsd:group>
-
-    <!--ejb-link acts like ejb-link in spec descriptors-->
-    <!--resource-link contains the name of the outbound-connectionfactory-instance -->
-    <!--message-destination-link acts like message-destination-link in spec descriptors-->
-    <!--url in resource-ref contains the url for URL typed resource refs-->
-    <!--Possibly the external-uri element should be revived to connect to other naming systems-->
-    <!--when server to server communication exists we will need an element in ejb-ref to specify the geronimo server
-    we wish to talk to.  It might be possible to use the objectName server element for this depending on what we decide it means-->
-    <!--otherwise you can supply the entire object name using the gbean-nameGroup-->
-
-    <xsd:complexType name="ejb-refType">
-        <xsd:sequence>
-            <xsd:element name="ref-name" type="xsd:string"/>
-            <xsd:choice>
-                <xsd:element name="pattern" type="gernaming:patternType"/>
-                <xsd:group ref="gernaming:corbaNameGroup"/>
-                <xsd:element name="ejb-link" type="xsd:string"/>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="ejb-local-refType">
-        <xsd:sequence>
-            <xsd:element name="ref-name" type="xsd:string"/>
-            <xsd:choice>
-                <xsd:element name="pattern" type="gernaming:patternType"/>
-                <xsd:element name="ejb-link" type="xsd:string"/>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="resource-refType">
-        <xsd:sequence>
-            <xsd:element name="ref-name" type="xsd:string"/>
-            <xsd:choice>
-                <xsd:element name="pattern" type="gernaming:patternType"/>
-                <xsd:element name="resource-link" type="xsd:string"/>
-                <xsd:element name="url" type="xsd:string"/>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="gbean-refType">
-        <xsd:sequence>
-            <xsd:element name="ref-name" type="xsd:string"/>
-            <xsd:element name="ref-type" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:choice minOccurs="0" maxOccurs="unbounded">
-                <xsd:element name="pattern" type="gernaming:patternType"/>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <!--used by openejb cmp datasource specification -->
-    <xsd:element name="cmp-connection-factory" type="gernaming:resource-locatorType"/>
-
-    <!--used by openejb mdb resource adapter specification -->
-    <xsd:element name="resource-adapter" type="gernaming:resource-locatorType"/>
-
-    <xsd:complexType name="resource-locatorType">
-        <xsd:sequence>
-            <xsd:choice>
-                <xsd:element name="pattern" type="gernaming:patternType"/>
-                <xsd:element name="resource-link" type="xsd:string"/>
-                <xsd:element name="url" type="xsd:string"/>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="resource-env-refType">
-        <xsd:sequence>
-            <xsd:element name="ref-name" type="xsd:string"/>
-            <xsd:choice>
-                <xsd:element name="pattern" type="gernaming:patternType"/>
-                <xsd:element name="message-destination-link" type="xsd:string">
-                    <xsd:annotation>
-                        <xsd:documentation>
-                            This element is deprecated and should not be used. Use admin-object-link instead.
-                            That is effectively a renamed version of this.
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:sequence>
-                    <xsd:element name="admin-object-module" type="xsd:string" minOccurs="0"/>
-                    <xsd:element name="admin-object-link" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="message-destinationType">
-        <xsd:sequence>
-            <xsd:element name="message-destination-name" type="xsd:string"/>
-            <xsd:choice>
-                <xsd:element name="pattern" type="gernaming:patternType"/>
-                <xsd:sequence>
-                    <xsd:element name="admin-object-module" type="xsd:string" minOccurs="0"/>
-                    <xsd:element name="admin-object-link" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <!--used by resource adapter -->
-    <xsd:element name="workmanager" type="gernaming:gbean-locatorType"/>
-
-    <!-- used by web apps/builders-->
-    <xsd:element name="web-container" type="gernaming:gbean-locatorType"/>
-
-    <xsd:complexType name="gbean-locatorType">
-        <xsd:sequence>
-            <xsd:choice>
-                <xsd:element name="pattern" type="gernaming:patternType"/>
-                <xsd:element name="gbean-link" type="xsd:string"/>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="patternType">
-        <xsd:sequence>
-            <xsd:element name="groupId" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="artifactId" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="version" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="module" type="xsd:string" minOccurs="0"/>
-            <xsd:element name="name" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:group name="serverGroup">
-        <xsd:annotation>
-            <xsd:documentation>This group contains the protocol, address, and port for a server</xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="protocol" type="xsd:string"/>
-            <xsd:element name="host" type="xsd:string"/>
-            <xsd:element name="port" type="xsd:int"/>
-        </xsd:sequence>
-    </xsd:group>
-
-    <xsd:complexType name="portType">
-        <xsd:sequence>
-            <xsd:element name="port-name" type="xsd:string"/>
-            <xsd:group ref="gernaming:serverGroup" minOccurs="0"/>
-            <xsd:element name="uri" type="xsd:string"/>
-            <xsd:element name="credentials-name" type="xsd:string" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="service-refType">
-        <xsd:sequence>
-            <xsd:element name="service-ref-name" type="xsd:string"/>
-            <xsd:choice>
-                <xsd:element name="service-completion" type="gernaming:service-completionType"/>
-                <xsd:element name="port" type="gernaming:portType" maxOccurs="unbounded"/>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="service-completionType">
-        <xsd:sequence>
-            <xsd:element name="service-name" type="xsd:string"/>
-            <xsd:element name="port-completion" type="gernaming:port-completionType" maxOccurs="unbounded"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="port-completionType">
-        <xsd:sequence>
-            <xsd:element name="port" type="gernaming:portType"/>
-            <xsd:element name="binding-name" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:group name="corbaNameGroup">
-        <xsd:annotation>
-            <xsd:documentation>
-                This group contains the location of the CORBA name server, the
-                name, and the client security server used to make interop calls.
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="ns-corbaloc" type="xsd:anyURI">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        The corbaloc used to access the CORBA name server.
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="name" type="xsd:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        The name of the object in the name server.
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:choice>
-                <xsd:element name="css" type="gernaming:patternType"/>
-                <xsd:element name="css-link" type="xsd:string"/>
-                <xsd:element name="css-name" type="xsd:string">
-                    <xsd:annotation>
-                        <xsd:documentation>
-                            The GBean name of the client security server used to make interop calls.
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:group>
-
-</xsd:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+<!-- $Rev$ $Date$ -->
+
+<xsd:schema
+        targetNamespace="http://geronimo.apache.org/xml/ns/naming-1.1"
+        xmlns:gernaming="http://geronimo.apache.org/xml/ns/naming-1.1"
+        xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified"
+        attributeFormDefault="unqualified"
+        version="1.0">
+
+    <xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
+
+    <xsd:annotation>
+        <xsd:documentation>
+            <![CDATA[
+            Partial schema containing common naming elements which can be included in other schemas.
+            ]]>
+        </xsd:documentation>
+    </xsd:annotation>
+
+
+    <xsd:element name="gbean-ref" type="gernaming:gbean-refType"/>
+    <xsd:element name="ejb-ref" type="gernaming:ejb-refType"/>
+    <!--    <xsd:element name="ejb-local-ref" type="gernaming:ejb-local-refType"/>-->
+    <xsd:element name="service-ref" type="gernaming:service-refType"/>
+    <xsd:element name="resource-ref" type="gernaming:resource-refType"/>
+    <xsd:element name="resource-env-ref" type="gernaming:resource-env-refType"/>
+
+    <xsd:element name="message-destination" type="gernaming:message-destinationType"/>
+
+    <xsd:group name="jndiEnvironmentRefsGroup">
+        <xsd:annotation>
+            <xsd:documentation>
+
+                This group keeps the usage of the contained JNDI environment
+                reference elements consistent across J2EE deployment descriptors.
+
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element name="gbean-ref" type="gernaming:gbean-refType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="ejb-ref" type="gernaming:ejb-refType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="ejb-local-ref" type="gernaming:ejb-local-refType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="service-ref" type="gernaming:service-refType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="resource-ref" type="gernaming:resource-refType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="resource-env-ref" type="gernaming:resource-env-refType" minOccurs="0"
+                         maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:group>
+
+    <!--ejb-link acts like ejb-link in spec descriptors-->
+    <!--resource-link contains the name of the outbound-connectionfactory-instance -->
+    <!--message-destination-link acts like message-destination-link in spec descriptors-->
+    <!--url in resource-ref contains the url for URL typed resource refs-->
+    <!--Possibly the external-uri element should be revived to connect to other naming systems-->
+    <!--when server to server communication exists we will need an element in ejb-ref to specify the geronimo server
+    we wish to talk to.  It might be possible to use the objectName server element for this depending on what we decide it means-->
+    <!--otherwise you can supply the entire object name using the gbean-nameGroup-->
+
+    <xsd:complexType name="ejb-refType">
+        <xsd:sequence>
+            <xsd:element name="ref-name" type="xsd:string"/>
+            <xsd:choice>
+                <xsd:element name="pattern" type="gernaming:patternType"/>
+                <xsd:group ref="gernaming:corbaNameGroup"/>
+                <xsd:element name="ejb-link" type="xsd:string"/>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="ejb-local-refType">
+        <xsd:sequence>
+            <xsd:element name="ref-name" type="xsd:string"/>
+            <xsd:choice>
+                <xsd:element name="pattern" type="gernaming:patternType"/>
+                <xsd:element name="ejb-link" type="xsd:string"/>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="resource-refType">
+        <xsd:sequence>
+            <xsd:element name="ref-name" type="xsd:string"/>
+            <xsd:choice>
+                <xsd:element name="pattern" type="gernaming:patternType"/>
+                <xsd:element name="resource-link" type="xsd:string"/>
+                <xsd:element name="url" type="xsd:string"/>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="gbean-refType">
+        <xsd:sequence>
+            <xsd:element name="ref-name" type="xsd:string"/>
+            <xsd:element name="ref-type" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:choice minOccurs="0" maxOccurs="unbounded">
+                <xsd:element name="pattern" type="gernaming:patternType"/>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <!--used by openejb cmp datasource specification -->
+    <xsd:element name="cmp-connection-factory" type="gernaming:resource-locatorType"/>
+
+    <!--used by openejb mdb resource adapter specification -->
+    <xsd:element name="resource-adapter" type="gernaming:resource-locatorType"/>
+
+    <xsd:complexType name="resource-locatorType">
+        <xsd:sequence>
+            <xsd:choice>
+                <xsd:element name="pattern" type="gernaming:patternType"/>
+                <xsd:element name="resource-link" type="xsd:string"/>
+                <xsd:element name="url" type="xsd:string"/>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="resource-env-refType">
+        <xsd:sequence>
+            <xsd:element name="ref-name" type="xsd:string"/>
+            <xsd:choice>
+                <xsd:element name="pattern" type="gernaming:patternType"/>
+                <xsd:element name="message-destination-link" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            This element is deprecated and should not be used. Use admin-object-link instead.
+                            That is effectively a renamed version of this.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:element>
+                <xsd:sequence>
+                    <xsd:element name="admin-object-module" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="admin-object-link" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="message-destinationType">
+        <xsd:sequence>
+            <xsd:element name="message-destination-name" type="xsd:string"/>
+            <xsd:choice>
+                <xsd:element name="pattern" type="gernaming:patternType"/>
+                <xsd:sequence>
+                    <xsd:element name="admin-object-module" type="xsd:string" minOccurs="0"/>
+                    <xsd:element name="admin-object-link" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <!--used by resource adapter -->
+    <xsd:element name="workmanager" type="gernaming:gbean-locatorType"/>
+
+    <!-- used by web apps/builders-->
+    <xsd:element name="web-container" type="gernaming:gbean-locatorType"/>
+
+    <xsd:complexType name="gbean-locatorType">
+        <xsd:sequence>
+            <xsd:choice>
+                <xsd:element name="pattern" type="gernaming:patternType"/>
+                <xsd:element name="gbean-link" type="xsd:string"/>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="patternType">
+        <xsd:sequence>
+            <xsd:element name="groupId" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="artifactId" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="version" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="module" type="xsd:string" minOccurs="0"/>
+            <xsd:element name="name" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:group name="serverGroup">
+        <xsd:annotation>
+            <xsd:documentation>This group contains the protocol, address, and port for a server</xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element name="protocol" type="xsd:string"/>
+            <xsd:element name="host" type="xsd:string"/>
+            <xsd:element name="port" type="xsd:int"/>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:complexType name="portType">
+        <xsd:sequence>
+            <xsd:element name="port-name" type="xsd:string"/>
+            <xsd:group ref="gernaming:serverGroup" minOccurs="0"/>
+            <xsd:element name="uri" type="xsd:string"/>
+            <xsd:element name="credentials-name" type="xsd:string" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="service-refType">
+        <xsd:sequence>
+            <xsd:element name="service-ref-name" type="xsd:string"/>
+            <xsd:choice>
+                <xsd:element name="service-completion" type="gernaming:service-completionType"/>
+                <xsd:element name="port" type="gernaming:portType" maxOccurs="unbounded"/>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="service-completionType">
+        <xsd:sequence>
+            <xsd:element name="service-name" type="xsd:string"/>
+            <xsd:element name="port-completion" type="gernaming:port-completionType" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="port-completionType">
+        <xsd:sequence>
+            <xsd:element name="port" type="gernaming:portType"/>
+            <xsd:element name="binding-name" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:group name="corbaNameGroup">
+        <xsd:annotation>
+            <xsd:documentation>
+                This group contains the location of the CORBA name server, the
+                name, and the client security server used to make interop calls.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element name="ns-corbaloc" type="xsd:anyURI">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The corbaloc used to access the CORBA name server.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="name" type="xsd:string">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The name of the object in the name server.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:choice>
+                <xsd:element name="css" type="gernaming:patternType"/>
+                <xsd:element name="css-link" type="xsd:string"/>
+                <xsd:element name="css-name" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The GBean name of the client security server used to make interop calls.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:element>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:group>
+
+</xsd:schema>

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-naming-1.1.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-naming-1.1.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-naming-1.1.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-security-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-security-1.1.xsd?rev=636723&r1=636722&r2=636723&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-security-1.1.xsd (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-security-1.1.xsd Thu Mar 13 04:36:06 2008
@@ -1,170 +1,170 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You 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.
--->
-<!-- $Rev$ $Date$ -->
-
-<xsd:schema
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-    xmlns:geronimo="http://geronimo.apache.org/xml/ns/security-1.1"
-    targetNamespace="http://geronimo.apache.org/xml/ns/security-1.1"
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
-    version="1.0">
-    
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-
-    <xsd:element name="security" type="geronimo:securityType"/>
-    <xsd:element name="default-principal" type="geronimo:default-principalType"/>
-
-    <xsd:complexType name="securityType">
-        <xsd:annotation>
-            <xsd:documentation>
-                Security entries
-
-                If this element is present, all web and EJB modules MUST make the
-                appropriate access checks as outlined in the JACC spec.
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="default-principal" type="geronimo:default-principalType"/>
-            <xsd:element name="role-mappings" type="geronimo:role-mappingsType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="doas-current-caller" type="xsd:boolean" default="false">
-            <xsd:annotation>
-                <xsd:documentation>
-                    Set this attribute to "true" if the work is to be performed
-                    as the calling Subject.
-                </xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="use-context-handler" type="xsd:boolean" default="false">
-            <xsd:annotation>
-                <xsd:documentation>
-                    Set this attribute to "true" if the installed JACC policy
-                    contexts will use PolicyContextHandlers.
-                </xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="default-role" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation>
-                    Used by the the Deployer to assign method permissions for
-                    all of the unspecified methods, either by assigning them
-                    to security roles, or by marking them as unchecked.  If
-                    the value of default-role is empty, then the unspecified
-                    methods are marked unchecked
-                </xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
-
-    <xsd:complexType name="descriptionType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute ref="xml:lang"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-
-    <xsd:complexType name="default-principalType">
-        <xsd:sequence>
-            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:choice>
-                <xsd:element name="principal" type="geronimo:principalType"/>
-                <xsd:element name="login-domain-principal" type="geronimo:loginDomainPrincipalType"/>
-                <xsd:element name="realm-principal" type="geronimo:realmPrincipalType"/>
-            </xsd:choice>
-            <xsd:element name="named-username-password-credential" type="geronimo:named-username-password-credentialType" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="named-username-password-credentialType">
-        <xsd:sequence>
-            <xsd:element name="name" type="xsd:string"/>
-            <xsd:element name="username" type="xsd:string"/>
-            <xsd:element name="password" type="xsd:string"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="role-mappingsType">
-        <xsd:sequence>
-            <xsd:element name="role" type="geronimo:roleType" minOccurs="1" maxOccurs="unbounded"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="roleType">
-        <xsd:sequence>
-            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="realm-principal" type="geronimo:realmPrincipalType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="login-domain-principal" type="geronimo:loginDomainPrincipalType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="principal" type="geronimo:principalType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="distinguished-name" type="geronimo:distinguishedNameType" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="role-name" type="xsd:string" use="required"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="realmPrincipalType">
-        <xsd:complexContent>
-            <xsd:extension base="geronimo:loginDomainPrincipalType">
-                <xsd:attribute name="realm-name" type="xsd:string" use="required"/>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="loginDomainPrincipalType">
-        <xsd:complexContent>
-            <xsd:extension base="geronimo:principalType">
-                <xsd:attribute name="domain-name" type="xsd:string" use="required"/>
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="principalType">
-        <xsd:sequence>
-            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="class" type="xsd:string" use="required"/>
-        <xsd:attribute name="name" type="xsd:string" use="required"/>
-        <xsd:attribute name="designated-run-as" type="xsd:boolean" default="false">
-            <xsd:annotation>
-                <xsd:documentation>
-                    Set this attribute to "true" if this principal is to be
-                    used as the run-as principal for this role.
-                </xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
-
-    <xsd:complexType name="distinguishedNameType">
-        <xsd:sequence>
-            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="name" type="xsd:string" use="required"/>
-        <xsd:attribute name="designated-run-as" type="xsd:boolean" default="false">
-            <xsd:annotation>
-                <xsd:documentation>
-                    Set this attribute to "true" if this principal is to be
-                    used as the run-as principal for this role.
-                </xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
-
-</xsd:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+<!-- $Rev$ $Date$ -->
+
+<xsd:schema
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+    xmlns:geronimo="http://geronimo.apache.org/xml/ns/security-1.1"
+    targetNamespace="http://geronimo.apache.org/xml/ns/security-1.1"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified"
+    version="1.0">
+    
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
+
+    <xsd:element name="security" type="geronimo:securityType"/>
+    <xsd:element name="default-principal" type="geronimo:default-principalType"/>
+
+    <xsd:complexType name="securityType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Security entries
+
+                If this element is present, all web and EJB modules MUST make the
+                appropriate access checks as outlined in the JACC spec.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="default-principal" type="geronimo:default-principalType"/>
+            <xsd:element name="role-mappings" type="geronimo:role-mappingsType" minOccurs="0"/>
+        </xsd:sequence>
+        <xsd:attribute name="doas-current-caller" type="xsd:boolean" default="false">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Set this attribute to "true" if the work is to be performed
+                    as the calling Subject.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="use-context-handler" type="xsd:boolean" default="false">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Set this attribute to "true" if the installed JACC policy
+                    contexts will use PolicyContextHandlers.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="default-role" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Used by the the Deployer to assign method permissions for
+                    all of the unspecified methods, either by assigning them
+                    to security roles, or by marking them as unchecked.  If
+                    the value of default-role is empty, then the unspecified
+                    methods are marked unchecked
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="descriptionType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute ref="xml:lang"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+
+    <xsd:complexType name="default-principalType">
+        <xsd:sequence>
+            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:choice>
+                <xsd:element name="principal" type="geronimo:principalType"/>
+                <xsd:element name="login-domain-principal" type="geronimo:loginDomainPrincipalType"/>
+                <xsd:element name="realm-principal" type="geronimo:realmPrincipalType"/>
+            </xsd:choice>
+            <xsd:element name="named-username-password-credential" type="geronimo:named-username-password-credentialType" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="named-username-password-credentialType">
+        <xsd:sequence>
+            <xsd:element name="name" type="xsd:string"/>
+            <xsd:element name="username" type="xsd:string"/>
+            <xsd:element name="password" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="role-mappingsType">
+        <xsd:sequence>
+            <xsd:element name="role" type="geronimo:roleType" minOccurs="1" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="roleType">
+        <xsd:sequence>
+            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="realm-principal" type="geronimo:realmPrincipalType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="login-domain-principal" type="geronimo:loginDomainPrincipalType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="principal" type="geronimo:principalType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="distinguished-name" type="geronimo:distinguishedNameType" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="role-name" type="xsd:string" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="realmPrincipalType">
+        <xsd:complexContent>
+            <xsd:extension base="geronimo:loginDomainPrincipalType">
+                <xsd:attribute name="realm-name" type="xsd:string" use="required"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="loginDomainPrincipalType">
+        <xsd:complexContent>
+            <xsd:extension base="geronimo:principalType">
+                <xsd:attribute name="domain-name" type="xsd:string" use="required"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="principalType">
+        <xsd:sequence>
+            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="class" type="xsd:string" use="required"/>
+        <xsd:attribute name="name" type="xsd:string" use="required"/>
+        <xsd:attribute name="designated-run-as" type="xsd:boolean" default="false">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Set this attribute to "true" if this principal is to be
+                    used as the run-as principal for this role.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="distinguishedNameType">
+        <xsd:sequence>
+            <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="name" type="xsd:string" use="required"/>
+        <xsd:attribute name="designated-run-as" type="xsd:boolean" default="false">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Set this attribute to "true" if this principal is to be
+                    used as the run-as principal for this role.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+</xsd:schema>

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-security-1.1.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-security-1.1.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-security-1.1.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-web-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-web-1.1.xsd?rev=636723&r1=636722&r2=636723&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-web-1.1.xsd (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-web-1.1.xsd Thu Mar 13 04:36:06 2008
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You 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.
--->
-<!-- $Rev$ $Date$ -->
-
-<xs:schema
-    xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
-    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
-    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
-    version="1.0">
-
-    <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-module-1.1.xsd"/>
-
-    <xs:element name="web-app" type="web:web-appType"/>
-
-
-    <xs:complexType name="web-appType">
-        <xs:sequence>
-            <xs:element ref="sys:environment" minOccurs="0"/>
-
-            <xs:element name="context-root" type="xs:string" minOccurs="0"/>
-            <!--<xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>-->
-            <xs:element ref="naming:web-container" minOccurs="0"/>
-            <xs:element name="container-config" type="web:container-configType" minOccurs="0"/>
-
-            <xs:group ref="naming:jndiEnvironmentRefsGroup"/>
-            <xs:element ref="naming:message-destination" minOccurs="0" maxOccurs="unbounded"/>
-
-            <xs:sequence minOccurs="0">
-                <xs:element name="security-realm-name" type="xs:string"/>
-                <xs:element ref="security:security" minOccurs="0"/>
-            </xs:sequence>
-
-            <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
-
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="container-configType">
-        <xs:sequence>
-            <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+<!-- $Rev$ $Date$ -->
+
+<xs:schema
+    xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
+    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
+    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified"
+    version="1.0">
+
+    <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-module-1.1.xsd"/>
+
+    <xs:element name="web-app" type="web:web-appType"/>
+
+
+    <xs:complexType name="web-appType">
+        <xs:sequence>
+            <xs:element ref="sys:environment" minOccurs="0"/>
+
+            <xs:element name="context-root" type="xs:string" minOccurs="0"/>
+            <!--<xs:element name="context-priority-classloader" type="xs:boolean" minOccurs="0"/>-->
+            <xs:element ref="naming:web-container" minOccurs="0"/>
+            <xs:element name="container-config" type="web:container-configType" minOccurs="0"/>
+
+            <xs:group ref="naming:jndiEnvironmentRefsGroup"/>
+            <xs:element ref="naming:message-destination" minOccurs="0" maxOccurs="unbounded"/>
+
+            <xs:sequence minOccurs="0">
+                <xs:element name="security-realm-name" type="xs:string"/>
+                <xs:element ref="security:security" minOccurs="0"/>
+            </xs:sequence>
+
+            <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
+
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="container-configType">
+        <xs:sequence>
+            <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+</xs:schema>

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-web-1.1.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-web-1.1.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-web-1.1.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/openejb-jar-2.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/openejb-jar-2.1.xsd?rev=636723&r1=636722&r2=636723&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/openejb-jar-2.1.xsd (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/openejb-jar-2.1.xsd Thu Mar 13 04:36:06 2008
@@ -1,381 +1,381 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ================================================================
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
-    statements and notices.  Redistributions must also contain a
-    copy of this document.
-
- 2. Redistributions in binary form must reproduce this list of
-    conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
- 3. The name "OpenEJB" must not be used to endorse or promote
-    products derived from this Software without prior written
-    permission of The OpenEJB Group.  For written permission,
-    please contact openejb-group@openejb.sf.net.
-
- 4. Products derived from this Software may not be called "OpenEJB"
-    nor may "OpenEJB" appear in their names without prior written
-    permission of The OpenEJB Group. OpenEJB is a registered
-    trademark of The OpenEJB Group.
-
- 5. Due credit should be given to the OpenEJB Project
-    (http://openejb.org/).
-
- THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the OpenEJB Project.  For more information
- please see <http://openejb.org/>.
-
- ================================================================ -->
-
-<xs:schema
-    xmlns:openejb="http://www.openejb.org/xml/ns/openejb-jar-2.1"
-    targetNamespace="http://www.openejb.org/xml/ns/openejb-jar-2.1"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
-    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
-    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
-    xmlns:pkgen="http://www.openejb.org/xml/ns/pkgen-2.0"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
-    version="1.0">
-
-    <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-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"/>
-
-    <xs:complexType name="emptyType"/>
-
-    <xs:complexType name="openejb-jarType">
-        <xs:sequence>
-            <xs:element ref="sys:environment" minOccurs="0"/>
-
-            <!-- use a ref to put this element in the naming namespace rather than openejb namespace-->
-            <xs:element ref="naming:cmp-connection-factory" minOccurs="0"/>
-            <xs:element name="ejb-ql-compiler-factory" type="xs:string" minOccurs="0"/>
-            <xs:element name="db-syntax-factory" type="xs:string" minOccurs="0"/>
-            <xs:element name="enforce-foreign-key-constraints" type="openejb:emptyType" minOccurs="0"/>
-
-            <xs:element name="enterprise-beans">
-                <xs:complexType>
-                    <xs:choice minOccurs="0" maxOccurs="unbounded">
-                        <xs:element name="session" type="openejb:session-beanType"/>
-                        <xs:element name="entity" type="openejb:entity-beanType"/>
-                        <xs:element name="message-driven" type="openejb:message-driven-beanType"/>
-                    </xs:choice>
-                </xs:complexType>
-            </xs:element>
-
-            <xs:element name="relationships" type="openejb:relationshipsType" minOccurs="0">
-                <xs:unique name="relationship-name-uniqueness">
-                    <xs:selector xpath="openejb:ejb-relation"/>
-                    <xs:field xpath="openejb:ejb-relation-name"/>
-                </xs:unique>
-            </xs:element>
-
-            <xs:element ref="naming:message-destination" minOccurs="0" maxOccurs="unbounded"/>
-
-            <xs:element ref="security:security" minOccurs="0"/>
-            <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <!-- session bean section-->
-    <xs:complexType name="session-beanType">
-        <xs:sequence>
-            <xs:element name="ejb-name" type="xs:string"/>
-            <xs:element name="jndi-name" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="local-jndi-name" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:group ref="openejb:tssGroup" minOccurs="0"/>
-
-            <xs:group ref="naming:jndiEnvironmentRefsGroup"/>
-            <xs:element name="web-service-address" type="xs:string" minOccurs="0"/>
-            <xs:element name="web-service-virtual-host" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="web-service-security" type="openejb:web-service-securityType" minOccurs="0"/>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-
-    <xs:group name="tssGroup">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="tss-link" type="xs:string"/>
-                <xs:element name="tss" type="naming:patternType"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:group>
-
-    <xs:complexType name="tssType">
-        <xs:sequence>
-            <!-- this is object name group from geronimo-naming.xsd -->
-            <xs:element name="domain" type="xs:string" minOccurs="0"/>
-            <xs:element name="server" type="xs:string" minOccurs="0"/>
-            <xs:element name="application" type="xs:string" minOccurs="0"/>
-            <xs:element name="module" type="xs:string" minOccurs="0"/>
-            <!--            <xs:element name="type" type="xs:string" minOccurs="0"/>-->
-            <xs:element name="name" type="xs:string"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="web-service-securityType">
-        <xs:sequence>
-            <xs:element name="security-realm-name" type="xs:string"/>
-            <xs:element name="realm-name" type="xs:string" minOccurs="0"/>
-            <xs:element name="transport-guarantee" type="openejb:transport-guaranteeType"/>
-            <xs:element name="auth-method" type="openejb:auth-methodType"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:simpleType name="transport-guaranteeType">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="NONE"/>
-            <xs:enumeration value="INTEGRAL"/>
-            <xs:enumeration value="CONFIDENTIAL"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <xs:simpleType name="auth-methodType">
-        <xs:restriction base="xs:string">
-            <xs:enumeration value="BASIC"/>
-            <xs:enumeration value="DIGEST"/>
-            <xs:enumeration value="CLIENT-CERT"/>
-            <xs:enumeration value="NONE"/>
-        </xs:restriction>
-    </xs:simpleType>
-
-    <!--entity bean section -->
-    <xs:complexType name="entity-beanType">
-        <xs:sequence>
-            <xs:element name="ejb-name" type="xs:string"/>
-            <xs:element name="jndi-name" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="local-jndi-name" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:group ref="openejb:tssGroup" minOccurs="0"/>
-
-            <xs:sequence minOccurs="0">
-                <xs:element name="table-name" type="xs:string"/>
-                <xs:element name="static-sql" type="openejb:emptyType" minOccurs="0"/>
-                <xs:element name="cmp-field-mapping" maxOccurs="unbounded">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="cmp-field-name" type="xs:string"/>
-                            <xs:element name="cmp-field-class" type="xs:string" minOccurs="0"/>
-                            <xs:element name="table-column" type="xs:string"/>
-                            <xs:element name="sql-type" type="xs:string" minOccurs="0"/>
-                            <xs:element name="type-converter" type="xs:string" minOccurs="0"/>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-                <xs:element name="primkey-field" type="xs:string" minOccurs="0"/>
-                <xs:element ref="pkgen:key-generator" minOccurs="0"/>
-                <xs:element name="prefetch-group" minOccurs="0">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="group" minOccurs="0" maxOccurs="unbounded"
-                                type="openejb:groupType"/>
-                            <xs:element name="entity-group-mapping" minOccurs="0"
-                                type="openejb:entity-group-mappingType"/>
-                            <xs:element name="cmp-field-group-mapping" minOccurs="0" maxOccurs="unbounded"
-                                type="openejb:cmp-field-group-mappingType"/>
-                            <xs:element name="cmr-field-group-mapping" minOccurs="0" maxOccurs="unbounded"
-                                type="openejb:cmr-field-group-mappingType"/>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-
-            <xs:element name="cache" minOccurs="0">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="isolation-level">
-                            <xs:simpleType>
-                                <xs:restriction base="xs:string">
-                                    <xs:enumeration value="read-uncommitted"/>
-                                    <xs:enumeration value="read-committed"/>
-                                    <xs:enumeration value="repeatable-read"/>
-                                </xs:restriction>
-                            </xs:simpleType>
-                        </xs:element>
-                        <xs:element name="size" type="xs:int"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-
-            <xs:group ref="naming:jndiEnvironmentRefsGroup"/>
-
-            <xs:element name="query" type="openejb:queryType" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-
-    <xs:complexType name="groupType">
-        <xs:sequence>
-            <xs:element name="group-name" type="xs:string"/>
-            <xs:element name="cmp-field-name" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="cmr-field" minOccurs="0" maxOccurs="unbounded">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="cmr-field-name" type="xs:string"/>
-                        <xs:element name="group-name" type="xs:string" minOccurs="0"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="entity-group-mappingType">
-        <xs:sequence>
-            <xs:element name="group-name" type="xs:string"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="cmp-field-group-mappingType">
-        <xs:sequence>
-            <xs:element name="group-name" type="xs:string"/>
-            <xs:element name="cmp-field-name" type="xs:string"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="cmr-field-group-mappingType">
-        <xs:sequence>
-            <xs:element name="group-name" type="xs:string"/>
-            <xs:element name="cmr-field-name" type="xs:string"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="queryType">
-        <xs:sequence>
-            <xs:element name="query-method">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="method-name" type="xs:string"/>
-                        <xs:element name="method-params">
-                            <xs:complexType>
-                                <xs:sequence>
-                                    <xs:element name="method-param" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-                                </xs:sequence>
-                            </xs:complexType>
-                        </xs:element>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="result-type-mapping" minOccurs="0" type="xs:string"/>
-            <xs:element name="ejb-ql" type="xs:string" minOccurs="0"/>
-            <xs:element name="no-cache-flush" minOccurs="0"/>
-            <xs:element name="group-name" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="relationshipsType">
-        <xs:sequence>
-            <xs:element name="ejb-relation" type="openejb:ejb-relationType" maxOccurs="unbounded">
-                <xs:unique name="role-name-uniqueness">
-                    <xs:selector xpath=".//openejb:ejb-relationship-role-name"/>
-                    <xs:field xpath="."/>
-                </xs:unique>
-            </xs:element>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="ejb-relationType">
-        <xs:sequence>
-            <xs:element name="ejb-relation-name" type="xs:string" minOccurs="0"/>
-            <xs:element name="many-to-many-table-name" type="xs:string" minOccurs="0"/>
-            <xs:element name="ejb-relationship-role" type="openejb:ejb-relationship-roleType" maxOccurs="2"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="ejb-relationship-roleType">
-        <xs:sequence>
-            <xs:element name="ejb-relationship-role-name" type="xs:string" minOccurs="0"/>
-            <xs:element name="relationship-role-source">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="ejb-name" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="cmr-field" minOccurs="0">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="cmr-field-name" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-            <xs:element name="foreign-key-column-on-source" minOccurs="0"/>
-            <xs:element name="role-mapping">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="cmr-field-mapping" maxOccurs="unbounded">
-                            <xs:complexType>
-                                <xs:sequence>
-                                    <xs:element name="key-column" type="xs:string"/>
-                                    <xs:element name="foreign-key-column" type="xs:string"/>
-                                </xs:sequence>
-                            </xs:complexType>
-                        </xs:element>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-        </xs:sequence>
-    </xs:complexType>
-
-
-    <!--message driven bean section-->
-    <xs:complexType name="message-driven-beanType">
-        <xs:sequence>
-            <xs:element name="ejb-name" type="xs:string"/>
-            <xs:element ref="naming:resource-adapter"/>
-            <xs:element name="activation-config"
-                type="openejb:activation-configType"
-                minOccurs="0"/>
-
-            <xs:group ref="naming:jndiEnvironmentRefsGroup"/>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-
-    <xs:complexType name="activation-configType">
-        <xs:sequence>
-            <xs:element name="description"
-                type="xs:string"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xs:element name="activation-config-property"
-                type="openejb:activation-config-propertyType"
-                maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="activation-config-propertyType">
-        <xs:sequence>
-            <xs:element name="activation-config-property-name"
-                type="xs:string">
-            </xs:element>
-            <xs:element name="activation-config-property-value"
-                type="xs:string">
-            </xs:element>
-        </xs:sequence>
-    </xs:complexType>
-
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ================================================================
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided
+ that the following conditions are met:
+
+ 1. Redistributions of source code must retain copyright
+    statements and notices.  Redistributions must also contain a
+    copy of this document.
+
+ 2. Redistributions in binary form must reproduce this list of
+    conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. The name "OpenEJB" must not be used to endorse or promote
+    products derived from this Software without prior written
+    permission of The OpenEJB Group.  For written permission,
+    please contact openejb-group@openejb.sf.net.
+
+ 4. Products derived from this Software may not be called "OpenEJB"
+    nor may "OpenEJB" appear in their names without prior written
+    permission of The OpenEJB Group. OpenEJB is a registered
+    trademark of The OpenEJB Group.
+
+ 5. Due credit should be given to the OpenEJB Project
+    (http://openejb.org/).
+
+ THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ ====================================================================
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the OpenEJB Project.  For more information
+ please see <http://openejb.org/>.
+
+ ================================================================ -->
+
+<xs:schema
+    xmlns:openejb="http://www.openejb.org/xml/ns/openejb-jar-2.1"
+    targetNamespace="http://www.openejb.org/xml/ns/openejb-jar-2.1"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
+    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
+    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
+    xmlns:pkgen="http://www.openejb.org/xml/ns/pkgen-2.0"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified"
+    version="1.0">
+
+    <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-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"/>
+
+    <xs:complexType name="emptyType"/>
+
+    <xs:complexType name="openejb-jarType">
+        <xs:sequence>
+            <xs:element ref="sys:environment" minOccurs="0"/>
+
+            <!-- use a ref to put this element in the naming namespace rather than openejb namespace-->
+            <xs:element ref="naming:cmp-connection-factory" minOccurs="0"/>
+            <xs:element name="ejb-ql-compiler-factory" type="xs:string" minOccurs="0"/>
+            <xs:element name="db-syntax-factory" type="xs:string" minOccurs="0"/>
+            <xs:element name="enforce-foreign-key-constraints" type="openejb:emptyType" minOccurs="0"/>
+
+            <xs:element name="enterprise-beans">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:element name="session" type="openejb:session-beanType"/>
+                        <xs:element name="entity" type="openejb:entity-beanType"/>
+                        <xs:element name="message-driven" type="openejb:message-driven-beanType"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+
+            <xs:element name="relationships" type="openejb:relationshipsType" minOccurs="0">
+                <xs:unique name="relationship-name-uniqueness">
+                    <xs:selector xpath="openejb:ejb-relation"/>
+                    <xs:field xpath="openejb:ejb-relation-name"/>
+                </xs:unique>
+            </xs:element>
+
+            <xs:element ref="naming:message-destination" minOccurs="0" maxOccurs="unbounded"/>
+
+            <xs:element ref="security:security" minOccurs="0"/>
+            <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <!-- session bean section-->
+    <xs:complexType name="session-beanType">
+        <xs:sequence>
+            <xs:element name="ejb-name" type="xs:string"/>
+            <xs:element name="jndi-name" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="local-jndi-name" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:group ref="openejb:tssGroup" minOccurs="0"/>
+
+            <xs:group ref="naming:jndiEnvironmentRefsGroup"/>
+            <xs:element name="web-service-address" type="xs:string" minOccurs="0"/>
+            <xs:element name="web-service-virtual-host" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="web-service-security" type="openejb:web-service-securityType" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:ID"/>
+    </xs:complexType>
+
+    <xs:group name="tssGroup">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="tss-link" type="xs:string"/>
+                <xs:element name="tss" type="naming:patternType"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:group>
+
+    <xs:complexType name="tssType">
+        <xs:sequence>
+            <!-- this is object name group from geronimo-naming.xsd -->
+            <xs:element name="domain" type="xs:string" minOccurs="0"/>
+            <xs:element name="server" type="xs:string" minOccurs="0"/>
+            <xs:element name="application" type="xs:string" minOccurs="0"/>
+            <xs:element name="module" type="xs:string" minOccurs="0"/>
+            <!--            <xs:element name="type" type="xs:string" minOccurs="0"/>-->
+            <xs:element name="name" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="web-service-securityType">
+        <xs:sequence>
+            <xs:element name="security-realm-name" type="xs:string"/>
+            <xs:element name="realm-name" type="xs:string" minOccurs="0"/>
+            <xs:element name="transport-guarantee" type="openejb:transport-guaranteeType"/>
+            <xs:element name="auth-method" type="openejb:auth-methodType"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:simpleType name="transport-guaranteeType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="NONE"/>
+            <xs:enumeration value="INTEGRAL"/>
+            <xs:enumeration value="CONFIDENTIAL"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="auth-methodType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="BASIC"/>
+            <xs:enumeration value="DIGEST"/>
+            <xs:enumeration value="CLIENT-CERT"/>
+            <xs:enumeration value="NONE"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+    <!--entity bean section -->
+    <xs:complexType name="entity-beanType">
+        <xs:sequence>
+            <xs:element name="ejb-name" type="xs:string"/>
+            <xs:element name="jndi-name" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="local-jndi-name" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:group ref="openejb:tssGroup" minOccurs="0"/>
+
+            <xs:sequence minOccurs="0">
+                <xs:element name="table-name" type="xs:string"/>
+                <xs:element name="static-sql" type="openejb:emptyType" minOccurs="0"/>
+                <xs:element name="cmp-field-mapping" maxOccurs="unbounded">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="cmp-field-name" type="xs:string"/>
+                            <xs:element name="cmp-field-class" type="xs:string" minOccurs="0"/>
+                            <xs:element name="table-column" type="xs:string"/>
+                            <xs:element name="sql-type" type="xs:string" minOccurs="0"/>
+                            <xs:element name="type-converter" type="xs:string" minOccurs="0"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="primkey-field" type="xs:string" minOccurs="0"/>
+                <xs:element ref="pkgen:key-generator" minOccurs="0"/>
+                <xs:element name="prefetch-group" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="group" minOccurs="0" maxOccurs="unbounded"
+                                type="openejb:groupType"/>
+                            <xs:element name="entity-group-mapping" minOccurs="0"
+                                type="openejb:entity-group-mappingType"/>
+                            <xs:element name="cmp-field-group-mapping" minOccurs="0" maxOccurs="unbounded"
+                                type="openejb:cmp-field-group-mappingType"/>
+                            <xs:element name="cmr-field-group-mapping" minOccurs="0" maxOccurs="unbounded"
+                                type="openejb:cmr-field-group-mappingType"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+
+            <xs:element name="cache" minOccurs="0">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="isolation-level">
+                            <xs:simpleType>
+                                <xs:restriction base="xs:string">
+                                    <xs:enumeration value="read-uncommitted"/>
+                                    <xs:enumeration value="read-committed"/>
+                                    <xs:enumeration value="repeatable-read"/>
+                                </xs:restriction>
+                            </xs:simpleType>
+                        </xs:element>
+                        <xs:element name="size" type="xs:int"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+
+            <xs:group ref="naming:jndiEnvironmentRefsGroup"/>
+
+            <xs:element name="query" type="openejb:queryType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:ID"/>
+    </xs:complexType>
+
+    <xs:complexType name="groupType">
+        <xs:sequence>
+            <xs:element name="group-name" type="xs:string"/>
+            <xs:element name="cmp-field-name" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="cmr-field" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="cmr-field-name" type="xs:string"/>
+                        <xs:element name="group-name" type="xs:string" minOccurs="0"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="entity-group-mappingType">
+        <xs:sequence>
+            <xs:element name="group-name" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="cmp-field-group-mappingType">
+        <xs:sequence>
+            <xs:element name="group-name" type="xs:string"/>
+            <xs:element name="cmp-field-name" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="cmr-field-group-mappingType">
+        <xs:sequence>
+            <xs:element name="group-name" type="xs:string"/>
+            <xs:element name="cmr-field-name" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="queryType">
+        <xs:sequence>
+            <xs:element name="query-method">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="method-name" type="xs:string"/>
+                        <xs:element name="method-params">
+                            <xs:complexType>
+                                <xs:sequence>
+                                    <xs:element name="method-param" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                                </xs:sequence>
+                            </xs:complexType>
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="result-type-mapping" minOccurs="0" type="xs:string"/>
+            <xs:element name="ejb-ql" type="xs:string" minOccurs="0"/>
+            <xs:element name="no-cache-flush" minOccurs="0"/>
+            <xs:element name="group-name" type="xs:string" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="relationshipsType">
+        <xs:sequence>
+            <xs:element name="ejb-relation" type="openejb:ejb-relationType" maxOccurs="unbounded">
+                <xs:unique name="role-name-uniqueness">
+                    <xs:selector xpath=".//openejb:ejb-relationship-role-name"/>
+                    <xs:field xpath="."/>
+                </xs:unique>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="ejb-relationType">
+        <xs:sequence>
+            <xs:element name="ejb-relation-name" type="xs:string" minOccurs="0"/>
+            <xs:element name="many-to-many-table-name" type="xs:string" minOccurs="0"/>
+            <xs:element name="ejb-relationship-role" type="openejb:ejb-relationship-roleType" maxOccurs="2"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="ejb-relationship-roleType">
+        <xs:sequence>
+            <xs:element name="ejb-relationship-role-name" type="xs:string" minOccurs="0"/>
+            <xs:element name="relationship-role-source">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="ejb-name" type="xs:string"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="cmr-field" minOccurs="0">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="cmr-field-name" type="xs:string"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="foreign-key-column-on-source" minOccurs="0"/>
+            <xs:element name="role-mapping">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="cmr-field-mapping" maxOccurs="unbounded">
+                            <xs:complexType>
+                                <xs:sequence>
+                                    <xs:element name="key-column" type="xs:string"/>
+                                    <xs:element name="foreign-key-column" type="xs:string"/>
+                                </xs:sequence>
+                            </xs:complexType>
+                        </xs:element>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <!--message driven bean section-->
+    <xs:complexType name="message-driven-beanType">
+        <xs:sequence>
+            <xs:element name="ejb-name" type="xs:string"/>
+            <xs:element ref="naming:resource-adapter"/>
+            <xs:element name="activation-config"
+                type="openejb:activation-configType"
+                minOccurs="0"/>
+
+            <xs:group ref="naming:jndiEnvironmentRefsGroup"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:ID"/>
+    </xs:complexType>
+
+    <xs:complexType name="activation-configType">
+        <xs:sequence>
+            <xs:element name="description"
+                type="xs:string"
+                minOccurs="0"
+                maxOccurs="unbounded"/>
+            <xs:element name="activation-config-property"
+                type="openejb:activation-config-propertyType"
+                maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="activation-config-propertyType">
+        <xs:sequence>
+            <xs:element name="activation-config-property-name"
+                type="xs:string">
+            </xs:element>
+            <xs:element name="activation-config-property-value"
+                type="xs:string">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+</xs:schema>