[jboss-cvs] JBossAS SVN: r88855 - projects/metadata/trunk/src/main/resources/schema.

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2009-05-14 04:11:21 -0400 (Thu, 14 May 2009)
New Revision: 88855

Modified:
   projects/metadata/trunk/src/main/resources/schema/jboss-common_5_1.xsd
   projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd
Log:
JBMETA-200

Modified: projects/metadata/trunk/src/main/resources/schema/jboss-common_5_1.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss-common_5_1.xsd	2009-05-14 07:58:41 UTC (rev 88854)
+++ projects/metadata/trunk/src/main/resources/schema/jboss-common_5_1.xsd	2009-05-14 08:11:21 UTC (rev 88855)
@@ -45,7 +45,7 @@
          consistency with the Servlet API. </xsd:documentation>
    </xsd:annotation>
 
-   <xsd:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="javaee_5.xsd"/>
+   <xsd:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="http://java.sun.com/xml/ns/javaee/javaee_5.xsd"/>
 
    <xsd:group name="descriptionGroup">
       <xsd:sequence>

Modified: projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd	2009-05-14 07:58:41 UTC (rev 88854)
+++ projects/metadata/trunk/src/main/resources/schema/jboss_5_1.xsd	2009-05-14 08:11:21 UTC (rev 88855)
@@ -26,7 +26,7 @@
       <xsd:documentation>
          <![CDATA[
 
-	This is the XML Schema for the JBoss 5.0 EJB3.x deployment descriptor.
+	This is the XML Schema for the JBoss 5.1 EJB3.x deployment descriptor.
 	The deployment descriptor must be named "META-INF/jboss.xml" in
 	the EJB's jar file.  All EJB deployment descriptors must indicate
 	the JBoss schema by using the Java EE namespace:
@@ -39,8 +39,8 @@
 	    <jboss xmlns="http://www.jboss.com/xml/ns/javaee"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
-                            http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
-             version="5.0">
+                            http://www.jboss.org/j2ee/schema/jboss_5_1.xsd"
+             version="5.1">
 	       ...
 		 </jboss>
 
@@ -48,7 +48,7 @@
 	the schema using the xsi:schemaLocation attribute for the
 	Java EE namespace with the following location:
 
-	http://www.jboss.org/j2ee/schema/jboss_5_0.xsd
+	http://www.jboss.org/j2ee/schema/jboss_5_1.xsd
 
 	]]>
       </xsd:documentation>
@@ -65,7 +65,7 @@
    </xsd:annotation>
 
    <xsd:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"/> 
-   <xsd:include schemaLocation="jboss-common_5_1.xsd"/>
+   <xsd:include schemaLocation="http://www.jboss.org/j2ee/schema/jboss-common_5_1.xsd "/>
 
 
    <!-- **************************************************** -->
@@ -368,7 +368,6 @@
                       maxOccurs="unbounded"/>
          <xsd:element name="service-ref" type="jboss:service-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
-         <xsd:element name="security-identity" type="jboss:security-identityType" minOccurs="0"/>
          <xsd:element name="resource-ref" type="jboss:resource-refType" minOccurs="0"
                       maxOccurs="unbounded"/>
          <xsd:element name="resource-env-ref" type="jboss:resource-env-refType" minOccurs="0"