[jboss-cvs] JBossAS SVN: r106751 - projects/jboss-jca/trunk/common/src/main/resources/schema.

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

Author: maeste
Date: 2010-07-15 10:38:35 -0400 (Thu, 15 Jul 2010)
New Revision: 106751

Modified:
   projects/jboss-jca/trunk/common/src/main/resources/schema/jboss-ra_2_0.xsd
Log:
first changes to xsds

Modified: projects/jboss-jca/trunk/common/src/main/resources/schema/jboss-ra_2_0.xsd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/schema/jboss-ra_2_0.xsd	2010-07-15 14:37:45 UTC (rev 106750)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/jboss-ra_2_0.xsd	2010-07-15 14:38:35 UTC (rev 106751)
@@ -5,12 +5,9 @@
     xmlns:javaee="http://java.sun.com/xml/ns/javaee"
     elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0">
 
-
-    <xs:import namespace="http://java.sun.com/xml/ns/javaee" schemaLocation="http://java.sun.com/xml/ns/javaee/javaee_5.xsd"/>
+    <xs:element name="jboss-ra" type="ra:jboss-ra-type"/>                              
     
-    <xs:element name="jboss-ra" type="ra:jbossRaType"/>                              
-    
-    <xs:complexType name="jbossRaType">           
+    <xs:complexType name="jboss-ra-type">           
         
         <xs:sequence>
             <xs:element name="ra-config-property" type="ra:ra-config-property-type" minOccurs="0" maxOccurs="unbounded"/>  
@@ -25,11 +22,11 @@
     <xs:complexType name="ra-config-property-type">
 
         <xs:sequence>
-            <xs:element name="ra-config-property-name" type="xs:string" minOccurs="1" maxOccurs="1"/>
-            <xs:element name="ra-config-property-type" type="ra:ra-config-property-typeType" minOccurs="1" maxOccurs="1"/>
-            <xs:element name="ra-config-property-value" type="xs:string" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="ra-config-property-name" type="xs:token" minOccurs="1" maxOccurs="1"/>
+            <xs:element name="ra-config-property-type" type="ra:ra-config-property-type-type" minOccurs="1" maxOccurs="1"/>
+            <xs:element name="ra-config-property-value" type="xs:token" minOccurs="0" maxOccurs="1"/>
         </xs:sequence>
-        <xs:attribute name="override-element" type="xs:string" default="resourceadapter"/>
+        <xs:attribute name="override-element" type="ra:override-element-type" default="resourceadapter"/>
     </xs:complexType>
 
      <xs:complexType name="bean-validation-groups-type">
@@ -45,31 +42,27 @@
        </xs:sequence>
      </xs:complexType>
      
-      <xs:complexType name="ra-config-property-typeType">
-	    <xs:simpleContent>
-	      <xs:restriction base="javaee:string">
-		    <xs:enumeration value="java.lang.Boolean"/>
-		    <xs:enumeration value="java.lang.String"/>
-		    <xs:enumeration value="java.lang.Integer"/>
-		    <xs:enumeration value="java.lang.Double"/>
-		    <xs:enumeration value="java.lang.Byte"/>
-		    <xs:enumeration value="java.lang.Short"/>
-		    <xs:enumeration value="java.lang.Long"/>
-		    <xs:enumeration value="java.lang.Float"/>
-		    <xs:enumeration value="java.lang.Character"/>
-	      </xs:restriction>
-	    </xs:simpleContent>
-      </xs:complexType>
+      <xs:simpleType name="ra-config-property-type-type">
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="java.lang.Boolean"/>
+            <xs:enumeration value="java.lang.String"/>
+            <xs:enumeration value="java.lang.Integer"/>
+            <xs:enumeration value="java.lang.Double"/>
+            <xs:enumeration value="java.lang.Byte"/>
+            <xs:enumeration value="java.lang.Short"/>
+            <xs:enumeration value="java.lang.Long"/>
+            <xs:enumeration value="java.lang.Float"/>
+            <xs:enumeration value="java.lang.Character"/>
+          </xs:restriction>
+      </xs:simpleType>
       
-      <xs:complexType name="override-elementType">
-        <xs:simpleContent>
-          <xs:restriction base="javaee:string">
+      <xs:simpleType name="override-element-type">
+          <xs:restriction base="xs:token">
             <xs:enumeration value="connection-definition"/>
             <xs:enumeration value="resourceadapter"/>
             <xs:enumeration value="activationspec"/>
             <xs:enumeration value="adminobject"/>
             <xs:enumeration value="authentication-mechanism"/>
           </xs:restriction>
-        </xs:simpleContent>
-      </xs:complexType>      
+      </xs:simpleType>      
 </xs:schema>
\ No newline at end of file