[jboss-cvs] JBossAS SVN: r82629 - in projects/metadata/trunk/src/main: resources/schema and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2009-01-06 08:05:34 -0500 (Tue, 06 Jan 2009)
New Revision: 82629

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java
   projects/metadata/trunk/src/main/resources/schema/jboss-ra_1_0.xsd
Log:
JBMETA-160

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java	2009-01-06 12:49:49 UTC (rev 82628)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java	2009-01-06 13:05:34 UTC (rev 82629)
@@ -34,11 +34,11 @@
  * @author Jeff Zhang
  * @version $Revision:  $
  */
- at XmlRootElement(name="connector", namespace=JavaEEMetaDataConstants.J2EE_NS)
+ at XmlRootElement(name="connector", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
 @JBossXmlSchema(
-      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+      xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
       ignoreUnresolvedFieldOrClass=false,
-      namespace=JavaEEMetaDataConstants.J2EE_NS,
+      namespace=JavaEEMetaDataConstants.JAVAEE_NS,
       elementFormDefault=XmlNsForm.QUALIFIED,
       normalizeSpace=true)
 public class JCA16MetaData extends Connector16MetaData

Modified: projects/metadata/trunk/src/main/resources/schema/jboss-ra_1_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss-ra_1_0.xsd	2009-01-06 12:49:49 UTC (rev 82628)
+++ projects/metadata/trunk/src/main/resources/schema/jboss-ra_1_0.xsd	2009-01-06 13:05:34 UTC (rev 82629)
@@ -2,13 +2,12 @@
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://www.jboss.org/schema/ra"
     xmlns:ra="http://www.jboss.org/schema/ra" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee/"
+    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
     elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0">
 
-    <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-    <xs:element name="jboss-ra" type="ra:jbossRaType">
-                              
-    </xs:element>
+    <xs:import namespace="http://java.sun.com/xml/ns/j2ee" schemaLocation="j2ee_1_4.xsd"/>
+
+    <xs:element name="jboss-ra" type="ra:jbossRaType"/>                              
     
     <xs:complexType name="jbossRaType">