[jboss-cvs] JBossAS SVN: r95185 - projects/metadata/common/trunk/src/main/resources/schema.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 20 11:38:37 EDT 2009
Author: remy.maucherat at jboss.com
Date: 2009-10-20 11:38:37 -0400 (Tue, 20 Oct 2009)
New Revision: 95185
Modified:
projects/metadata/common/trunk/src/main/resources/schema/javaee_6.xsd
Log:
- EE6 schema update.
Modified: projects/metadata/common/trunk/src/main/resources/schema/javaee_6.xsd
===================================================================
--- projects/metadata/common/trunk/src/main/resources/schema/javaee_6.xsd 2009-10-20 15:35:29 UTC (rev 95184)
+++ projects/metadata/common/trunk/src/main/resources/schema/javaee_6.xsd 2009-10-20 15:38:37 UTC (rev 95185)
@@ -175,12 +175,38 @@
<xsd:annotation>
<xsd:documentation>
- This group collects elements that are common to all the
+ This group collects elements that are common to most
JNDI resource elements.
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
+ <xsd:group ref="javaee:resourceBaseGroup"/>
+ <xsd:element name="lookup-name"
+ type="javaee:xsdStringType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The JNDI name to be looked up to resolve a resource reference.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:group>
+
+ <xsd:group name="resourceBaseGroup">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ This group collects elements that are common to all the
+ JNDI resource elements. It does not include the lookup-name
+ element, that is only applicable to some resource elements.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
<xsd:element name="mapped-name"
type="javaee:xsdStringType"
minOccurs="0">
@@ -210,17 +236,6 @@
type="javaee:injection-targetType"
minOccurs="0"
maxOccurs="unbounded"/>
- <xsd:element name="lookup-name"
- type="javaee:xsdStringType"
- minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>
-
- The JNDI name to be looked up to resolve a resource reference.
-
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
</xsd:sequence>
</xsd:group>
@@ -308,14 +323,14 @@
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
A JDBC URL. If the <code>url</code> property is specified
along with other standard <code>DataSource</code> properties
such as <code>serverName</code>, <code>databaseName</code>
and <code>portNumber</code>, the more specific properties will
take precedence and <code>url</code> will be ignored.
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -504,7 +519,7 @@
<xsd:complexType name="display-nameType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The display-name type contains a short name that is intended
to be displayed by tools. It is used by display-name
elements. The display name need not be unique.
@@ -518,7 +533,7 @@
The value of the xml:lang attribute is "en" (English) by default.
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -534,7 +549,7 @@
<xsd:complexType name="ejb-linkType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The ejb-linkType is used by ejb-link
elements in the ejb-ref or ejb-local-ref elements to specify
that an EJB reference is linked to enterprise bean.
@@ -558,7 +573,7 @@
<ejb-link>../products/product.jar#ProductEJB</ejb-link>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -626,7 +641,7 @@
<xsd:complexType name="ejb-ref-nameType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The ejb-ref-name element contains the name of an EJB
reference. The EJB reference is an entry in the
Deployment Component's environment and is relative to the
@@ -639,7 +654,7 @@
<ejb-ref-name>ejb/Payroll</ejb-ref-name>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -782,7 +797,7 @@
type="javaee:jndi-nameType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The env-entry-name element contains the name of a
Deployment Component's environment entry. The name
is a JNDI name relative to the java:comp/env
@@ -795,7 +810,7 @@
<env-entry-name>minAmount</env-entry-name>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -804,7 +819,7 @@
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The env-entry-type element contains the Java language
type of the environment entry. If an injection target
is specified for the environment entry, the type may
@@ -816,7 +831,7 @@
<env-entry-type>java.lang.Integer</env-entry-type>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -825,7 +840,7 @@
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The env-entry-value designates the value of a
Deployment Component's environment entry. The value
must be a String that is valid for the
@@ -837,7 +852,7 @@
<env-entry-value>100.00</env-entry-value>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -853,7 +868,7 @@
<xsd:complexType name="env-entry-type-valuesType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
This type contains the fully-qualified Java type of the
environment entry value that is expected by the
application's code.
@@ -878,7 +893,7 @@
<env-entry-type>java.lang.Class</env-entry-type>
<env-entry-type>com.example.Color</env-entry-type>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -954,7 +969,7 @@
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The small-icon element contains the name of a file
containing a small (16 x 16) icon image. The file
name is a relative path within the Deployment
@@ -967,7 +982,7 @@
<small-icon>employee-service-icon16x16.jpg</small-icon>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -976,7 +991,7 @@
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The large-icon element contains the name of a file
containing a large
(32 x 32) icon image. The file name is a relative
@@ -990,7 +1005,7 @@
<large-icon>employee-service-icon32x32.jpg</large-icon>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1102,7 +1117,7 @@
<xsd:complexType name="jdbc-urlType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The jdbc-urlType contains the url pattern of the mapping.
It must follow the rules specified in Section 9.3 of the
JDBC Specification where the format is:
@@ -1113,7 +1128,7 @@
<url>jdbc:mysql://localhost:3307/testdb</url>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1148,7 +1163,7 @@
<xsd:complexType name="homeType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The homeType defines the fully-qualified name of
an enterprise bean's home interface.
@@ -1156,7 +1171,7 @@
<home>com.aardvark.payroll.PayrollHome</home>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1335,7 +1350,7 @@
<xsd:complexType name="persistence-context-refType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The persistence-context-ref element contains a declaration
of Deployment Component's reference to a persistence context
associated within a Deployment Component's
@@ -1366,7 +1381,7 @@
<persistence-context-type>Extended</persistence-context-type>
</persistence-context-ref>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1431,7 +1446,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
- <xsd:group ref="javaee:resourceGroup"/>
+ <xsd:group ref="javaee:resourceBaseGroup"/>
</xsd:sequence>
<xsd:attribute name="id"
type="xsd:ID"/>
@@ -1491,7 +1506,7 @@
<xsd:complexType name="persistence-unit-refType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The persistence-unit-ref element contains a declaration
of Deployment Component's reference to a persistence unit
associated within a Deployment Component's
@@ -1517,7 +1532,7 @@
</persistence-unit-name>
</persistence-unit-ref>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1561,7 +1576,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
- <xsd:group ref="javaee:resourceGroup"/>
+ <xsd:group ref="javaee:resourceBaseGroup"/>
</xsd:sequence>
<xsd:attribute name="id"
type="xsd:ID"/>
@@ -1573,7 +1588,7 @@
<xsd:complexType name="remoteType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The remote element contains the fully-qualified name
of the enterprise bean's remote interface.
@@ -1581,7 +1596,7 @@
<remote>com.wombat.empl.EmployeeService</remote>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -1595,7 +1610,7 @@
<xsd:complexType name="resource-env-refType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The resource-env-refType is used to define
resource-env-ref elements. It contains a declaration of a
Deployment Component's reference to an administered object
@@ -1623,7 +1638,7 @@
</resource-env-ref-type>
</resource-env-ref>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1672,7 +1687,7 @@
<xsd:complexType name="resource-refType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The resource-refType contains a declaration of a
Deployment Component's reference to an external resource. It
consists of an optional description, the resource manager
@@ -1701,7 +1716,7 @@
<res-sharing-scope>Shareable</res-sharing-scope>
</resource-ref>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -1854,7 +1869,7 @@
<xsd:complexType name="security-roleType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The security-roleType contains the definition of a security
role. The definition consists of an optional description of
the security role, and the security role name.
@@ -1869,7 +1884,7 @@
<role-name>employee</role-name>
</security-role>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -2163,7 +2178,7 @@
<xsd:complexType name="message-destinationType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The message-destinationType specifies a message
destination. The logical destination described by this
element is mapped to a physical destination by the Deployer.
@@ -2186,7 +2201,7 @@
</message-destination-name>
</message-destination>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -2252,7 +2267,7 @@
<xsd:complexType name="message-destination-refType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The message-destination-ref element contains a declaration
of Deployment Component's reference to a message destination
associated with a resource in Deployment Component's
@@ -2287,7 +2302,7 @@
</message-destination-link>
</message-destination-ref>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -2360,7 +2375,7 @@
<xsd:complexType name="message-destination-typeType">
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
The message-destination-typeType specifies the type of
the destination. The type is specified by the Java interface
expected to be implemented by the destination.
@@ -2370,7 +2385,7 @@
<message-destination-type>javax.jms.Queue
</message-destination-type>
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
More information about the jboss-cvs-commits
mailing list