maguro 2005/03/07 23:08:31
Modified: modules/openejb-builder/src/schema geronimo-naming.xsd
xmlconfig.xml
Added: modules/openejb-builder/src/schema corba-css-config_1_0.xsd
corba-tss-config_1_0.xsd
Log:
Intermediate CORBA checkin.
Revision Changes Path
1.2 +106 -21
openejb/modules/openejb-builder/src/schema/geronimo-naming.xsd
Index: geronimo-naming.xsd
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/schema/geronimo-naming.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geronimo-naming.xsd 10 Nov 2004 01:35:10 -0000 1.1
+++ geronimo-naming.xsd 8 Mar 2005 04:08:31 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2004 The Apache Software Foundation
+ Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<xsd:schema
targetNamespace="http://geronimo.apache.org/xml/ns/naming";
xmlns:gernaming="http://geronimo.apache.org/xml/ns/naming";
@@ -28,8 +28,6 @@
<xsd:documentation>
<![CDATA[
Partial schema containing common naming elements which can be
included in other schemas.
- This schema does not define a targetNamespace and so all
definitions from this
- schema instance will end up in the targetNamespace of the
including document.
]]>
</xsd:documentation>
</xsd:annotation>
@@ -40,11 +38,10 @@
<xsd:element name="ejb-ref" type="gernaming:ejb-refType"/>
<xsd:element name="ejb-local-ref" type="gernaming:ejb-local-refType"/>
- <!-- leave web services out until I know what they do -->
- <!--xsd:group ref="service-refGroup"/-->
+ <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:group name="jndiEnvironmentRefsGroup">
<xsd:annotation>
<xsd:documentation>
@@ -55,10 +52,10 @@
</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"/>
- <!-- leave web services out until I know what they do -->
- <!--xsd:group ref="service-refGroup"/-->
+ <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>
@@ -79,6 +76,7 @@
<xsd:element name="ref-name" type="xsd:string"/>
<xsd:choice>
<xsd:group ref="gernaming:objectNameGroup"/>
+ <xsd:group ref="gernaming:corbaNameGroup"/>
<xsd:element name="ejb-link" type="xsd:string"/>
<xsd:element name="target-name" type="xsd:string"/>
</xsd:choice>
@@ -108,8 +106,24 @@
</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"/>
+ <xsd:element name="proxy-type" type="xsd:string" minOccurs="0"/>
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:group ref="gernaming:objectNameGroup"/>
+ <xsd:element name="target-name" type="xsd:string"/>
+ </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>
@@ -132,18 +146,89 @@
</xsd:sequence>
</xsd:complexType>
+ <!--used by resource adapter -->
+ <xsd:element name="workmanager" type="gernaming:gbean-locatorType"/>
+
+ <xsd:complexType name="gbean-locatorType">
+ <xsd:sequence>
+ <xsd:choice>
+ <xsd:group ref="gernaming:objectNameGroup"/>
+ <xsd:element name="gbean-link" type="xsd:string"/>
+ <xsd:element name="target-name" type="xsd:string"/>
+ </xsd:choice>
+ </xsd:sequence>
+ </xsd:complexType>
+
<xsd:group name="objectNameGroup">
- <xsd:annotation>
- <xsd:documentation>This group contains the components of a
jsr-77 object name</xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element name="domain" type="xsd:string" minOccurs="0"/>
- <xsd:element name="server" type="xsd:string" minOccurs="0"/>
- <xsd:element name="application" type="xsd:string"
minOccurs="0"/>
- <xsd:element name="module" type="xsd:string" minOccurs="0"/>
- <xsd:element name="type" type="xsd:string" minOccurs="0"/>
- <xsd:element name="name" type="xsd:string"/>
- </xsd:sequence>
- </xsd:group>
+ <xsd:annotation>
+ <xsd:documentation>This group contains the components of a
jsr-77 object name</xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="domain" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="server" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="application" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="module" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="type" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="name" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:group>
+
+ <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:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="service-refType">
+ <xsd:sequence>
+ <xsd:element name="service-ref-name" type="xsd:string"/>
+ <xsd:element name="port" type="gernaming:portType"
maxOccurs="unbounded"/>
+ </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: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:sequence>
+ </xsd:group>
</xsd:schema>
1.2 +8 -0 openejb/modules/openejb-builder/src/schema/xmlconfig.xml
Index: xmlconfig.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/schema/xmlconfig.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmlconfig.xml 10 Nov 2004 01:35:10 -0000 1.1
+++ xmlconfig.xml 8 Mar 2005 04:08:31 -0000 1.2
@@ -15,5 +15,13 @@
<xb:package>org.apache.geronimo.xbeans.geronimo.security</xb:package>
<xb:prefix>Ger</xb:prefix>
</xb:namespace>
+ <xb:namespace uri="http://www.openejb.org/xml/ns/corba-tss-config_1_0";>
+ <xb:package>org.openejb.xbeans.csiv2.tss</xb:package>
+ <xb:prefix>TSS</xb:prefix>
+ </xb:namespace>
+ <xb:namespace uri="http://www.openejb.org/xml/ns/corba-css-config_1_0";>
+ <xb:package>org.openejb.xbeans.csiv2.css</xb:package>
+ <xb:prefix>CSS</xb:prefix>
+ </xb:namespace>
</xb:config>
1.1
openejb/modules/openejb-builder/src/schema/corba-css-config_1_0.xsd
Index: corba-css-config_1_0.xsd
===================================================================
<?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 [EMAIL PROTECTED]
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/>.
================================================================ -->
<xsd:schema
xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0";
targetNamespace="http://www.openejb.org/xml/ns/corba-css-config_1_0";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:j2ee="http://java.sun.com/xml/ns/j2ee";
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
<xsd:import namespace="http://java.sun.com/xml/ns/j2ee";
schemaLocation="j2ee_1_4.xsd"/>
<xsd:element name="css" type="css:cssType"/>
<xsd:complexType name="cssType">
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:schema>
1.1
openejb/modules/openejb-builder/src/schema/corba-tss-config_1_0.xsd
Index: corba-tss-config_1_0.xsd
===================================================================
<?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 [EMAIL PROTECTED]
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/>.
================================================================ -->
<xsd:schema
xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config_1_0";
targetNamespace="http://www.openejb.org/xml/ns/corba-tss-config_1_0";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:j2ee="http://java.sun.com/xml/ns/j2ee";
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
<xsd:import namespace="http://java.sun.com/xml/ns/j2ee";
schemaLocation="j2ee_1_4.xsd"/>
<xsd:element name="tss" type="tss:tssType"/>
<xsd:complexType name="tssType">
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
<xsd:group ref="tss:transportMechGroup" minOccurs="0"/>
<xsd:element name="compoundSecMechTypeList" minOccurs="0">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="compoundSecMech"
type="tss:compoundSecMechType" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="stateful" type="xsd:boolean"
use="optional" default="false"/>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="inherit" type="xsd:boolean" use="optional"
default="false"/>
</xsd:complexType>
<xsd:group name="transportMechGroup">
<xsd:choice>
<xsd:element name="SSL" type="tss:SSLType"/>
<xsd:element name="SECIOP" type="tss:SECIOPType"/>
</xsd:choice>
</xsd:group>
<xsd:complexType name="SSLType">
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="supports" type="tss:associationOptionList"/>
<xsd:element name="requires" type="tss:associationOptionList"/>
<xsd:group ref="tss:trustGroup"/>
</xsd:sequence>
<xsd:attribute name="port" type="xsd:short" use="required"/>
<xsd:attribute name="hostname" type="xsd:string" use="required"/>
<xsd:attribute name="handshakeTimeout" type="xsd:short"/>
</xsd:complexType>
<xsd:complexType name="SECIOPType">
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="supports" type="tss:associationOptionList"/>
<xsd:element name="requires" type="tss:associationOptionList"/>
<xsd:element name="transportAddress"
type="tss:transportAddressType" maxOccurs="unbounded"/>
<xsd:group ref="tss:trustGroup"/>
</xsd:sequence>
<xsd:attribute name="mechOID" type="xsd:string"/>
<xsd:attribute name="targetName" type="xsd:string"/>
</xsd:complexType>
<xsd:group name="trustGroup">
<xsd:choice>
<xsd:element name="trustEveryone" type="tss:trustEveryoneType"/>
<xsd:element name="trustNoone" type="tss:trustNooneType"/>
<xsd:element name="trustList">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="entity" type="tss:entityType"
maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:group>
<xsd:complexType name="trustEveryoneType">
<xsd:complexContent>
<xsd:restriction base="xsd:anyType"/>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="trustNooneType">
<xsd:complexContent>
<xsd:restriction base="xsd:anyType"/>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="entityType">
<xsd:complexContent>
<xsd:restriction base="xsd:anyType">
<xsd:attribute name="hostname" type="xsd:string"
use="optional"/>
<xsd:attribute name="distinguishedName" type="xsd:string"
use="optional"/>
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="transportAddressType">
<xsd:simpleContent>
<xsd:extension base="xsd:string">
<xsd:attribute name="port" type="xsd:short"/>
<xsd:attribute name="hostname" type="xsd:string"/>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="compoundSecMechType">
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
<xsd:group ref="tss:asMechGroup" minOccurs="0"/>
<xsd:element name="sasMech" type="tss:sasMechType" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
<xsd:group name="asMechGroup">
<xsd:choice>
<xsd:element name="GSSUP" type="tss:GSSUPType"/>
</xsd:choice>
</xsd:group>
<xsd:complexType name="GSSUPType">
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="targetName" type="xsd:string"/>
<xsd:attribute name="required" type="xsd:boolean" use="optional"
default="false"/>
</xsd:complexType>
<xsd:complexType name="sasMechType">
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="serviceConfigurationList" minOccurs="0">
<xsd:complexType>
<xsd:sequence>
<xsd:group ref="tss:serviceConfigurationGroup"
maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="required" type="xsd:boolean"
use="optional" default="false"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="OIDList" minOccurs="0">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="OID" type="xsd:string"
maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="identityTokenTypes"
type="tss:identityTokenTypeList"/>
</xsd:sequence>
</xsd:complexType>
<xsd:group name="serviceConfigurationGroup">
<xsd:choice>
<xsd:element name="generalName" type="tss:generalNameType"/>
<xsd:element name="gssExportedName"
type="tss:gssExportedNameType"/>
</xsd:choice>
</xsd:group>
<xsd:complexType name="generalNameType">
<xsd:complexContent>
<xsd:restriction base="xsd:anyType">
<xsd:attribute name="privilegeAuthority" type="xsd:string"/>
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="gssExportedNameType">
<xsd:complexContent>
<xsd:restriction base="xsd:anyType">
<xsd:attribute name="OID" type="xsd:string"/>
<xsd:attribute name="privilegeAuthority" type="xsd:string"/>
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
<xsd:simpleType name="associationOption">
<xsd:restriction base="xsd:token">
<xsd:enumeration value="NoProtection"/>
<xsd:enumeration value="Integrity"/>
<xsd:enumeration value="Confidentiality"/>
<xsd:enumeration value="DetectReplay"/>
<xsd:enumeration value="DetectMisordering"/>
<xsd:enumeration value="EstablishTrustInTarget"/>
<xsd:enumeration value="EstablishTrustInClient"/>
<xsd:enumeration value="NoDelegation"/>
<xsd:enumeration value="SimpleDelegation"/>
<xsd:enumeration value="CompositeDelegation"/>
<xsd:enumeration value="IdentityAssertion"/>
<xsd:enumeration value="DelegationByClient"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="associationOptionList">
<xsd:list itemType="tss:associationOption"/>
</xsd:simpleType>
<xsd:simpleType name="identityTokenType">
<xsd:restriction base="xsd:token">
<xsd:enumeration value="ITTAbsent"/>
<xsd:enumeration value="ITTAnonymous"/>
<xsd:enumeration value="ITTPrincipalName"/>
<xsd:enumeration value="ITTDistinguishedName"/>
<xsd:enumeration value="ITTX509CertChain"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="identityTokenTypeList">
<xsd:list itemType="tss:identityTokenType"/>
</xsd:simpleType>
</xsd:schema>
