[jboss-cvs] JBossAS SVN: r111313 - in projects/jboss-jca/trunk: common/src/main/java/org/jboss/jca/common/api/metadata/ds and 3 other directories.

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

Author: maeste
Date: 2011-05-09 11:28:10 -0400 (Mon, 09 May 2011)
New Revision: 111313

Modified:
   projects/jboss-jca/trunk/adapters/src/test/resources/h2-driver-ds.xml
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSources.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
   projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
   projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-driver-ds.xml
Log:
JBJCA-569 grouping drivers

Modified: projects/jboss-jca/trunk/adapters/src/test/resources/h2-driver-ds.xml
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/resources/h2-driver-ds.xml	2011-05-09 15:27:11 UTC (rev 111312)
+++ projects/jboss-jca/trunk/adapters/src/test/resources/h2-driver-ds.xml	2011-05-09 15:28:10 UTC (rev 111313)
@@ -10,8 +10,10 @@
       <password>sa</password>
     </security>
   </datasource>
-  <driver name="h2">
-    <driver-class>org.h2.Driver</driver-class>
-  </driver>
+  <drivers>
+      <driver name="h2">
+         <driver-class>org.h2.Driver</driver-class>
+      </driver>
+  </drivers>
 
 </datasources>

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSources.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSources.java	2011-05-09 15:27:11 UTC (rev 111312)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSources.java	2011-05-09 15:28:10 UTC (rev 111313)
@@ -88,6 +88,11 @@
       XA_DATASOURCE("xa-datasource"),
 
       /**
+       * driverS tag
+       */
+      DRIVERS("drivers"),
+
+      /**
        * driver tag
        */
       DRIVER("driver");

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java	2011-05-09 15:27:11 UTC (rev 111312)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java	2011-05-09 15:28:10 UTC (rev 111313)
@@ -134,6 +134,7 @@
       ArrayList<XaDataSource> xaDataSource = new ArrayList<XaDataSource>();
       ArrayList<DataSource> datasource = new ArrayList<DataSource>();
       HashMap<String, Driver> drivers = new HashMap<String, Driver>();
+      boolean driversMatched = false;
       while (reader.hasNext())
       {
          switch (reader.nextTag())
@@ -164,7 +165,13 @@
                      xaDataSource.add(parseXADataSource(reader));
                      break;
                   }
+                  case DRIVERS : {
+                     driversMatched = true;
+                     break;
+                  }
                   case DRIVER : {
+//                     if (!driversMatched)
+//                        throw new ParserException("Unexpected element:" + reader.getLocalName());
                      Driver driver = parseDriver(reader);
                      drivers.put(driver.getName(), driver);
                      break;

Modified: projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd	2011-05-09 15:27:11 UTC (rev 111312)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd	2011-05-09 15:28:10 UTC (rev 111313)
@@ -35,7 +35,7 @@
           </xs:annotation>
         </xs:element>
       </xs:choice>
-      <xs:element name="driver" type="driverType" maxOccurs="unbounded" minOccurs="0"></xs:element>
+      <xs:element name="drivers" type="driversType" maxOccurs="1" minOccurs="0"></xs:element>
     </xs:sequence>
   </xs:complexType>
   <xs:complexType name="datasourceType" mixed="false">
@@ -903,4 +903,10 @@
       </xs:annotation>
     </xs:attribute>
   </xs:complexType>
+
+  <xs:complexType name="driversType">
+    <xs:sequence>
+      <xs:element name="driver" type="driverType" maxOccurs="unbounded" minOccurs="1"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
 </xs:schema>

Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-driver-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-driver-ds.xml	2011-05-09 15:27:11 UTC (rev 111312)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-driver-ds.xml	2011-05-09 15:28:10 UTC (rev 111313)
@@ -11,8 +11,10 @@
       <password>sa</password>
     </security>
   </datasource>
-  <driver name="h2">
-    <driver-class>org.h2.Driver</driver-class>
-  </driver>
+  <drivers>
+      <driver name="h2">
+         <driver-class>org.h2.Driver</driver-class>
+      </driver>
+  </drivers>
 
 </datasources>