Title: [2426] branches/configid/openejb2/modules/openejb-builder: Some new classes: Artifact and Environment, and EnvironmentBuilder.
- Revision
- 2426
- Author
- djencks
- Date
- 2006-02-04 21:15:30 -0500 (Sat, 04 Feb 2006)
Log Message
Some new classes: Artifact and Environment, and EnvironmentBuilder. Modified ServiceConfigBuilder, and some of DeploymentContext.
Some schemas partially modified for new elements. New code compiles but not new schemas.
Modified Paths
Added Paths
Diff
Modified: branches/configid/openejb2/modules/openejb-builder/maven.xml (2425 => 2426)
--- branches/configid/openejb2/modules/openejb-builder/maven.xml 2006-02-04 02:54:23 UTC (rev 2425)
+++ branches/configid/openejb2/modules/openejb-builder/maven.xml 2006-02-05 02:15:30 UTC (rev 2426)
@@ -9,7 +9,7 @@
<preGoal name="java:compile">
<xmlbeans:schema2java
- maven.xmlbeans2.sourceschema="schema/openejb-jar-2.0.xsd,schema/corba-tss-config-2.0.xsd,schema/corba-css-config-2.0.xsd"/>
+ maven.xmlbeans2.sourceschema="schema/openejb-jar-2.1.xsd,schema/corba-tss-config-2.0.xsd,schema/corba-css-config-2.0.xsd"/>
<mkdir dir="${basedir}/target/xmlbeans-classes"/>
<mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
<copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
Modified: branches/configid/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java (2425 => 2426)
--- branches/configid/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-02-04 02:54:23 UTC (rev 2425)
+++ branches/configid/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-02-05 02:15:30 UTC (rev 2426)
@@ -229,7 +229,7 @@
throw new DeploymentException("Invalid configId " + openejbJar.getConfigId(), e);
}
- List parentId = ServiceConfigBuilder.getParentID(openejbJar.getParentId(), openejbJar.getImportArray());
+ List parentId = ServiceConfigBuilder.toArtifacts(openejbJar.getParentId(), openejbJar.getImportArray());
if (parentId.isEmpty()) {
parentId = new ArrayList(defaultParentId);
}
Added: branches/configid/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.1.xsd (2425 => 2426)
--- branches/configid/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.1.xsd 2006-02-04 02:54:23 UTC (rev 2425)
+++ branches/configid/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.1.xsd 2006-02-05 02:15:30 UTC (rev 2426)
@@ -0,0 +1,388 @@
+<?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/>.
+
+ ================================================================ -->
+
+<xs:schema
+ xmlns:openejb="http://www.openejb.org/xml/ns/openejb-jar-2.0"
+ targetNamespace="http://www.openejb.org/xml/ns/openejb-jar-2.0"
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"
+ 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.0" schemaLocation="geronimo-naming-1.0.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-config-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:parent" minOccurs="0" maxOccurs="unbounded"/>-->
+<!-- <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>-->
+<!-- <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+<!-- <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>-->
+ <xs:group ref="sys:classloader-infoGroup"/>
+
+ <!-- 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:attribute name="configId" type="xs:string" use="required"/>
+ <xs:attribute name="parentId" type="xs:string" use="optional"/>
+ <xs:attribute name="inverseClassloading" type="xs:boolean" use="optional"/>
+ </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-target-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"/>
+ <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="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>
Modified: branches/configid/openejb2/modules/openejb-builder/src/schema/xmlconfig.xml (2425 => 2426)
--- branches/configid/openejb2/modules/openejb-builder/src/schema/xmlconfig.xml 2006-02-04 02:54:23 UTC (rev 2425)
+++ branches/configid/openejb2/modules/openejb-builder/src/schema/xmlconfig.xml 2006-02-05 02:15:30 UTC (rev 2426)
@@ -1,7 +1,7 @@
<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"
>
- <xb:namespace uri="http://www.openejb.org/xml/ns/openejb-jar-2.0">
+ <xb:namespace uri="http://www.openejb.org/xml/ns/openejb-jar-2.1">
<xb:package>org.openejb.xbeans.ejbjar</xb:package>
<xb:prefix>Openejb</xb:prefix>
</xb:namespace>
