djencks 2005/06/01 22:57:01
Modified: modules/openejb-builder/src/schema openejb-jar.xsd
Log:
GERONIMO-659 Make the ejb container point to the TSS gbean, not the TSS to
the ejb container. Also GERONIMO-658, use nice short config to find the TSS
bean
Revision Changes Path
1.13 +25 -1
openejb/modules/openejb-builder/src/schema/openejb-jar.xsd
Index: openejb-jar.xsd
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/schema/openejb-jar.xsd,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openejb-jar.xsd 22 May 2005 22:27:59 -0000 1.12
+++ openejb-jar.xsd 2 Jun 2005 02:57:01 -0000 1.13
@@ -61,7 +61,7 @@
<xs:import namespace="http://geronimo.apache.org/xml/ns/security";
schemaLocation="geronimo-security.xsd"/>
<xs:import namespace="http://geronimo.apache.org/xml/ns/deployment";
schemaLocation="geronimo-config.xsd"/>
-<!-- <xs:include schemaLocation="geronimo-security.xsd"/>-->
+ <!-- <xs:include schemaLocation="geronimo-security.xsd"/>-->
<xs:group name="openejb-jndiEnvironmentRefsGroup">
<xs:annotation>
@@ -121,6 +121,7 @@
<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:group ref="openejb:openejb-jndiEnvironmentRefsGroup"/>
@@ -130,6 +131,28 @@
<xs:attribute name="id" type="xs:ID"/>
</xs:complexType>
+ <xs:group name="tssGroup">
+ <xs:sequence>
+ <xs:choice>
+ <xs:element name="tss-name" type="xs:string"/>
+ <xs:element name="tss-link" type="xs:string"/>
+ <xs:element name="tss" type="openejb:tssType"/>
+ </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"/>
@@ -162,6 +185,7 @@
<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"/>
