Return-Path: 
 <geronimo-cvs-return-672-apmail-incubator-geronimo-cvs-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-geronimo-cvs-archive@incubator.apache.org
Received: (qmail 60078 invoked by uid 500); 24 Aug 2003 23:11:51 -0000
Mailing-List: contact geronimo-cvs-help@incubator.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:geronimo-cvs-help@incubator.apache.org>
list-unsubscribe: <mailto:geronimo-cvs-unsubscribe@incubator.apache.org>
list-post: <mailto:geronimo-cvs@incubator.apache.org>
Reply-To: geronimo-dev@incubator.apache.org
Delivered-To: mailing list geronimo-cvs@incubator.apache.org
Received: (qmail 60047 invoked from network); 24 Aug 2003 23:11:51 -0000
Received: from minotaur.apache.org (209.237.227.194)
  by daedalus.apache.org with SMTP; 24 Aug 2003 23:11:51 -0000
Received: (qmail 87922 invoked by uid 1715); 24 Aug 2003 21:25:06 -0000
Date: 24 Aug 2003 21:25:06 -0000
Message-ID: <20030824212506.87921.qmail@minotaur.apache.org>
From: jdillon@apache.org
To: incubator-geronimo-cvs@apache.org
Subject: cvs commit: incubator-geronimo/modules/core/src/xml components.xsd
 geronimo-ejb-jar.xsd
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jdillon     2003/08/24 14:25:06

  Added:       modules/core/src/schema components.xsd geronimo-ejb-jar.xsd
  Removed:     modules/core/src/xml components.xsd geronimo-ejb-jar.xsd
  Log:
   o Use consistence src location for XML schemas
  
  Revision  Changes    Path
  1.1                  incubator-geronimo/modules/core/src/schema/components.xsd
  
  Index: components.xsd
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
  	<xs:element name="components">
  		<xs:annotation>
  			<xs:documentation>Components to be deployed</xs:documentation>
  		</xs:annotation>
  		<xs:complexType>
  			<xs:sequence>
  				<xs:element name="class-space" minOccurs="0">
  					<xs:complexType>
  						<xs:sequence minOccurs="0" maxOccurs="unbounded">
  							<xs:element name="codebase" type="codebaseType"/>
  						</xs:sequence>
  						<xs:attribute name="name" type="objectName" use="required"/>
  						<xs:attribute name="dependencyType" type="dependencyType" use="optional" default="create"/>
  					</xs:complexType>
  				</xs:element>
  				<xs:element name="mbean" minOccurs="0" maxOccurs="unbounded">
  					<xs:complexType>
  						<xs:sequence>
  							<xs:element name="constructor" minOccurs="0">
  								<xs:complexType>
  									<xs:sequence minOccurs="0" maxOccurs="unbounded">
  										<xs:element ref="arg"/>
  									</xs:sequence>
  								</xs:complexType>
  							</xs:element>
  							<xs:element name="attribute" minOccurs="0" maxOccurs="unbounded">
  								<xs:complexType mixed="true">
  									<xs:sequence minOccurs="0">
  										<xs:any/>
  									</xs:sequence>
  									<xs:attribute name="name" type="xs:string" use="required"/>
  								</xs:complexType>
  							</xs:element>
  							<xs:element name="relationship" minOccurs="0" maxOccurs="unbounded">
  								<xs:complexType>
  									<xs:attribute name="name" type="xs:string" use="required"/>
  									<xs:attribute name="type" type="xs:string" use="required"/>
  									<xs:attribute name="role" type="xs:string" use="required"/>
                                      <xs:attribute name="target" type="objectName" use="optional"/>
                                      <xs:attribute name="targetRole" type="xs:string" use="optional"/>
  								</xs:complexType>
  							</xs:element>
                              <xs:element name="depends" minOccurs="0" maxOccurs="unbounded">
                                  <xs:complexType>
                                      <xs:attribute name="name" type="objectName" use="required"/>
                                  </xs:complexType>
                              </xs:element>
  						</xs:sequence>
  						<xs:attribute name="code" type="className" use="required"/>
  						<xs:attribute name="name" type="objectName" use="optional"/>
  					</xs:complexType>
  				</xs:element>
  			</xs:sequence>
  		</xs:complexType>
  	</xs:element>
  	<xs:complexType name="codebaseType">
  		<xs:sequence minOccurs="0" maxOccurs="unbounded">
  			<xs:element name="archive">
  				<xs:complexType>
  					<xs:attribute name="name" type="xs:string" use="required"/>
  				</xs:complexType>
  			</xs:element>
  		</xs:sequence>
  		<xs:attribute name="url" type="xs:anyURI" use="optional"/>
  	</xs:complexType>
  	<xs:simpleType name="objectName">
  		<xs:restriction base="xs:string"/>
  	</xs:simpleType>
  	<xs:simpleType name="className">
  		<xs:restriction base="xs:string"/>
  	</xs:simpleType>
  	<xs:simpleType name="dependencyType">
  		<xs:restriction base="xs:string"/>
  	</xs:simpleType>
  	<xs:element name="arg">
  		<xs:complexType mixed="true">
  			<xs:sequence minOccurs="0">
  				<xs:any/>
  			</xs:sequence>
  			<xs:attribute name="type" type="xs:string" use="required"/>
  		</xs:complexType>
  	</xs:element>
  </xs:schema>
  
  
  
  1.1                  incubator-geronimo/modules/core/src/schema/geronimo-ejb-jar.xsd
  
  Index: geronimo-ejb-jar.xsd
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  
  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
      xmlns="http://geronimo.apache.org/xml/schema/Geronimo/ejb-jar"
      targetNamespace="http://geronimo.apache.org/xml/schema/Geronimo/ejb-jar"
      elementFormDefault="qualified">
      <!--
          The top-level element is ejb-jar.
          Elements and named types are ordered alphabetically.
      -->
  
      <xsd:annotation>
          <xsd:documentation>
              This is the XML Schema for Apache Geronimo server-specific EJB DD.
          </xsd:documentation>
      </xsd:annotation>
  
  
      <xsd:complexType name="ejb">
          <xsd:annotation>
              <xsd:documentation>
                  Base features common to all EJBs
              </xsd:documentation>
          </xsd:annotation>
          <xsd:sequence>
              <xsd:element ref="ejb-name" minOccurs="1" maxOccurs="1"/>
              <xsd:element ref="jndi-name" minOccurs="0" maxOccurs="1"/>
              <xsd:element ref="env-entry" minOccurs="0" maxOccurs="unbounded"/>
              <xsd:element ref="ejb-ref" minOccurs="0" maxOccurs="unbounded"/>
              <xsd:element ref="ejb-local-ref" minOccurs="0" maxOccurs="unbounded"/>
              <xsd:element ref="security-role-ref" minOccurs="0" maxOccurs="unbounded"/>
              <xsd:element ref="resource-ref" minOccurs="0" maxOccurs="unbounded"/>
              <xsd:element ref="resource-env-ref" minOccurs="0" maxOccurs="unbounded"/>
          </xsd:sequence>
      </xsd:complexType>
  
      <xsd:element name="ejb-jar">
          <xsd:annotation>
              <xsd:documentation>
                  The root element for the EJB JAR.
              </xsd:documentation>
          </xsd:annotation>
          <xsd:complexType>
              <xsd:sequence>
                  <xsd:element ref="enterprise-beans" minOccurs="0" maxOccurs="1"/>
                  <!-- also need top-level configuration and assembly-descriptor -->
              </xsd:sequence>
          </xsd:complexType>
      </xsd:element>
  
      <xsd:element name="ejb-local-ref">
          <xsd:annotation>
              <xsd:documentation>
                  Configuration for a local EJB reference.  Note that a local
                  EJB must be in the same JVM, so if context parameters are
                  provided, they must almost certainly simply refer to a
                  different application within the same server.
              </xsd:documentation>
          </xsd:annotation>
          <xsd:complexType>
              <xsd:sequence>
                  <xsd:element ref="ejb-ref-name" minOccurs="1" maxOccurs="1"/>
                  <xsd:element ref="jndi-name" minOccurs="1" maxOccurs="1"/>
                  <xsd:element ref="jndi-context-params" minOccurs="0" maxOccurs="1"/>
              </xsd:sequence>
          </xsd:complexType>
      </xsd:element>
  
      <xsd:element name="ejb-name" type="xsd:string">
          <xsd:annotation>
              <xsd:documentation>
                  The unique identifier for an EJB within this EJB JAR.  This
                  must match the ejb-name for the same EJB in the standard
                  ejb-jar.xml deployment descriptor.
              </xsd:documentation>
          </xsd:annotation>
      </xsd:element>
  
      <xsd:element name="ejb-ref">
          <xsd:annotation>
              <xsd:documentation>
                  Configuration for an EJB reference
              </xsd:documentation>
          </xsd:annotation>
          <xsd:complexType>
              <xsd:sequence>
                  <xsd:element ref="ejb-ref-name" minOccurs="1" maxOccurs="1"/>
                  <xsd:element ref="jndi-name" minOccurs="1" maxOccurs="1"/>
                  <xsd:element ref="jndi-context-params" minOccurs="0" maxOccurs="1"/>
              </xsd:sequence>
          </xsd:complexType>
      </xsd:element>
  
      <xsd:element name="ejb-ref-name" type="xsd:string">
          <xsd:annotation>
              <xsd:documentation>
                  The unique identifier for an EJB reference within this EJB.  This
                  must match the ejb-ref-name for the same EJB reference for the
                  same EJB in the standard ejb-jar.xml deployment descriptor.
              </xsd:documentation>
          </xsd:annotation>
      </xsd:element>
  
      <xsd:element name="enterprise-beans">
          <xsd:annotation>
              <xsd:documentation>
                  Holds all the EJBs
              </xsd:documentation>
          </xsd:annotation>
          <xsd:complexType>
              <xsd:sequence>
                  <xsd:element ref="session" minOccurs="0" maxOccurs="unbounded"/>
                  <xsd:element ref="entity" minOccurs="0" maxOccurs="unbounded"/>
                  <xsd:element ref="message-driven" minOccurs="0" maxOccurs="unbounded"/>
              </xsd:sequence>
          </xsd:complexType>
      </xsd:element>
  
      <xsd:element name="entity" extends="ejb">
          <xsd:annotation>
              <xsd:documentation>
                  Configuration for a single entity bean
              </xsd:documentation>
          </xsd:annotation>
          <xsd:complexType>
              <xsd:complexContent>
                  <xsd:extension base="ejb">
                      <xsd:sequence>
                      </xsd:sequence>
                  </xsd:extension>
              </xsd:complexContent>
          </xsd:complexType>
      </xsd:element>
  
      <xsd:element name="env-entry">
          <xsd:annotation>
              <xsd:documentation>
                  Configuration for an environment entry.  Normally an env-entry
                  is fully configured by the assembler in the standard ejb-jar.xml
                  deployment descriptor.  However, the deployer can specify a
                  value here if there was no value specified in ejb-jar.xml, or
                  if the deployer wants to override the value specified there.
              </xsd:documentation>
          </xsd:annotation>
          <xsd:complexType>
              <xsd:sequence>
                  <xsd:element ref="env-entry-name" minOccurs="1" maxOccurs="1"/>
                  <xsd:element ref="env-entry-value" minOccurs="1" maxOccurs="1"/>
              </xsd:sequence>
          </xsd:complexType>
      </xsd:element>
  
      <xsd:element name="env-entry-name" type="xsd:string">
          <xsd:annotation>
              <xsd:documentation>
                  The unique name for this environment entry.  This must match the
                  env-entry-name for the env-entry in the standard ejb-jar.xml
                  deployment descriptor.
              </xsd:documentation>
          </xsd:annotation>
      </xsd:element>
  
      <xsd:element name="env-entry-value" type="xsd:string">
          <xsd:annotation>
              <xsd:documentation>
                  A value to use for this environment entry.  A value specified here
                  takes precedence over a value in the standard ejb-jar.xml
                  deployment descriptor.
              </xsd:documentation>
          </xsd:annotation>
      </xsd:element>
  
      <xsd:element name="jndi-context-param">
          <xsd:annotation>
              <xsd:documentation>
                  A single JNDI context parameter (name and value)
              </xsd:documentation>
          </xsd:annotation>
          <xsd:complexType>
              <xsd:sequence>
                  <xsd:element ref="param-name" minOccurs="1" maxOccurs="1"/>
                  <xsd:element ref="param-value" minOccurs="1" maxOccurs="1"/>
              </xsd:sequence>
          </xsd:complexType>
      </xsd:element>
  
      <xsd:element name="jndi-context-params">
          <xsd:annotation>
              <xsd:documentation>
                  Configuration for the JNDI context used to access a remote EJB
                  or resources
              </xsd:documentation>
          </xsd:annotation>
          <xsd:complexType>
              <xsd:sequence>
                  <xsd:element ref="jndi-context-param" minOccurs="1" maxOccurs="unbounded"/>
              </xsd:sequence>
          </xsd:complexType>
      </xsd:element>
  
      <xsd:element name="jndi-name" type="xsd:string">
          <xsd:annotation>
              <xsd:documentation>
                  A JNDI name.  This may be the location where an EJB should be
                  bound, or the location where an EJB or resource can be found to
                  resolve a reference.
              </xsd:documentation>
          </xsd:annotation>
      </xsd:element>
  
      <xsd:element name="message-driven">
          <xsd:annotation>
              <xsd:documentation>
                  Configuration for a single message-driven bean
              </xsd:documentation>
          </xsd:annotation>
          <xsd:complexType>
              <xsd:complexContent>
                  <xsd:extension base="ejb">
                      <xsd:sequence>
                      </xsd:sequence>
                  </xsd:extension>
              </xsd:complexContent>
          </xsd:complexType>
      </xsd:element>
  
      <xsd:element name="param-name" type="xsd:string">
          <xsd:annotation>
              <xsd:documentation>
                  The name of a parameter
              </xsd:documentation>
          </xsd:annotation>
      </xsd:element>
  
      <xsd:element name="param-value" type="xsd:string">
          <xsd:annotation>
              <xsd:documentation>
                  The value of a parameter
              </xsd:documentation>
          </xsd:annotation>
      </xsd:element>
  
      <xsd:element name="res-ref-name" type="xsd:string">
          <xsd:annotation>
              <xsd:documentation>
                  The unique identifier for a resource reference within this EJB.
                  This must match the res-ref-name for the same resource reference for
                  the same EJB in the standard ejb-jar.xml deployment descriptor.
              </xsd:documentation>
          </xsd:annotation>
      </xsd:element>
  
      <xsd:element name="resource-env-ref">
          <xsd:annotation>
              <xsd:documentation>
                  Configuration for a resource reference for a resource within
                  the application server.
              </xsd:documentation>
          </xsd:annotation>
          <xsd:complexType>
              <xsd:sequence>
                  <xsd:element ref="resource-env-ref-name" minOccurs="1" maxOccurs="1"/>
                  <xsd:element ref="jndi-name" minOccurs="1" maxOccurs="1"/>
              </xsd:sequence>
          </xsd:complexType>
      </xsd:element>
  
      <xsd:element name="resource-env-ref-name" type="xsd:string">
          <xsd:annotation>
              <xsd:documentation>
                  The unique identifier for a resource env reference within this EJB.
                  This must match the resource-env-ref-name for the same resource env
                  reference for the same EJB in the standard ejb-jar.xml deployment
                  descriptor.
              </xsd:documentation>
          </xsd:annotation>
      </xsd:element>
  
      <xsd:element name="resource-ref">
          <xsd:annotation>
              <xsd:documentation>
                  Configuration for a resource reference for a resource which may
                  be within the application server or may be an external resource.
              </xsd:documentation>
          </xsd:annotation>
          <xsd:complexType>
              <xsd:sequence>
                  <xsd:element ref="res-ref-name" minOccurs="1" maxOccurs="1"/>
                  <xsd:element ref="jndi-name" minOccurs="1" maxOccurs="1"/>
                  <xsd:element ref="jndi-context-params" minOccurs="0" maxOccurs="1"/>
              </xsd:sequence>
          </xsd:complexType>
      </xsd:element>
  
      <xsd:element name="role-name" type="xsd:string">
          <xsd:annotation>
              <xsd:documentation>
                  The unique name for this security role.  If used in a security
                  role reference, this must match the role-name for the
                  security-role-ref in the standard ejb-jar.xml deployment
                  descriptor.
              </xsd:documentation>
          </xsd:annotation>
      </xsd:element>
  
      <xsd:element name="role-link" type="xsd:string">
          <xsd:annotation>
              <xsd:documentation>
                  The security role that this security role reference should be
                  linked to.  A role specified here takes precedence over a role
                  specified in the standard ejb-jar.xml deployment descriptor.
              </xsd:documentation>
          </xsd:annotation>
      </xsd:element>
  
      <xsd:element name="security-role-ref">
          <xsd:annotation>
              <xsd:documentation>
                  Configuration for a security role reference.  Normally a
                  security role reference is fully configured by the assembler
                  in the standard ejb-jar.xml deployment descriptor (with the
                  role-link element).  However, the deployer can specify a value
                  here if there was no value specified in ejb-jar.xml, or
                  if the deployer wants to override the value specified there.
              </xsd:documentation>
          </xsd:annotation>
          <xsd:complexType>
              <xsd:sequence>
                  <xsd:element ref="role-name" minOccurs="1" maxOccurs="1"/>
                  <xsd:element ref="role-link" minOccurs="1" maxOccurs="1"/>
              </xsd:sequence>
          </xsd:complexType>
      </xsd:element>
  
      <xsd:element name="session" extends="ejb">
          <xsd:annotation>
              <xsd:documentation>
                  Configuration for a single session bean
              </xsd:documentation>
          </xsd:annotation>
          <xsd:complexType>
              <xsd:complexContent>
                  <xsd:extension base="ejb">
                      <xsd:sequence>
                      </xsd:sequence>
                  </xsd:extension>
              </xsd:complexContent>
          </xsd:complexType>
      </xsd:element>
  </xsd:schema>