maguro 2005/03/12 12:04:57
Modified: modules/openejb-builder/src/schema corba-css-config_1_0.xsd
corba-tss-config_1_0.xsd
Log:
Some fixes to POA policies and added default principal to the CORBA ORB.
Revision Changes Path
1.2 +101 -0
openejb/modules/openejb-builder/src/schema/corba-css-config_1_0.xsd
Index: corba-css-config_1_0.xsd
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/schema/corba-css-config_1_0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- corba-css-config_1_0.xsd 8 Mar 2005 04:08:31 -0000 1.1
+++ corba-css-config_1_0.xsd 12 Mar 2005 17:04:57 -0000 1.2
@@ -62,7 +62,108 @@
<xsd:complexType name="cssType">
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="compoundSecMechTypeList" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="compoundSecMech"
type="css:compoundSecMechType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="stateful" type="xsd:boolean"
use="optional" default="false"/>
+ </xsd:complexType>
+ </xsd:element>
</xsd:sequence>
</xsd:complexType>
+
+ <xsd:complexType name="compoundSecMechType">
+ <xsd:sequence>
+ <xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:group ref="css:transportMechGroup" minOccurs="0"/>
+ <!-- xsd:group ref="css:asMechGroup" minOccurs="0"/>
+ <xsd:element name="sasMech" type="css:sasMechType"
minOccurs="0"/ -->
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:group name="transportMechGroup">
+ <xsd:choice>
+ <xsd:element name="SSL" type="css:SSLType"/>
+ <xsd:element name="SECIOP" type="css: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="css:associationOptionList"/>
+ <xsd:element name="requires" type="css:associationOptionList"/>
+ <xsd:group ref="css:trustGroup" minOccurs="0"/>
+ </xsd:sequence>
+ <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="css:associationOptionList"/>
+ <xsd:element name="requires" type="css:associationOptionList"/>
+ <xsd:group ref="css: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="css:trustEveryoneType"/>
+ <xsd:element name="trustNoone" type="css:trustNooneType"/>
+ <xsd:element name="trustList">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="entity" type="css: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: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="css:associationOption"/>
+ </xsd:simpleType>
</xsd:schema>
1.3 +2 -0
openejb/modules/openejb-builder/src/schema/corba-tss-config_1_0.xsd
Index: corba-tss-config_1_0.xsd
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/schema/corba-tss-config_1_0.xsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- corba-tss-config_1_0.xsd 9 Mar 2005 06:00:45 -0000 1.2
+++ corba-tss-config_1_0.xsd 12 Mar 2005 17:04:57 -0000 1.3
@@ -51,6 +51,7 @@
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";
+ xmlns:security="http://geronimo.apache.org/xml/ns/security";
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
@@ -62,6 +63,7 @@
<xsd:complexType name="tssType">
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="default-principal"
type="security:default-principalType" minOccurs="0"/>
<xsd:group ref="tss:transportMechGroup" minOccurs="0"/>
<xsd:element name="compoundSecMechTypeList" minOccurs="0">
<xsd:complexType>
