[jboss-cvs] JBossAS SVN: r90452 - projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra.

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

Author: jeff.zhang
Date: 2009-06-18 20:09:27 -0400 (Thu, 18 Jun 2009)
New Revision: 90452

Modified:
   projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/RADeployer.java
Log:
[JBJCA-96] multi xsd version

Modified: projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/RADeployer.java	2009-06-18 23:26:40 UTC (rev 90451)
+++ projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/RADeployer.java	2009-06-19 00:09:27 UTC (rev 90452)
@@ -31,11 +31,13 @@
 import org.jboss.logging.Logger;
 import org.jboss.metadata.rar.jboss.JBossRAMetaData;
 import org.jboss.metadata.rar.spec.ConnectorMetaData;
+import org.jboss.metadata.rar.spec.JCA15MetaData;
 import org.jboss.metadata.rar.spec.JCA16MetaData;
 import org.jboss.xb.binding.Unmarshaller;
 import org.jboss.xb.binding.UnmarshallerFactory;
 import org.jboss.xb.binding.resolver.MultiClassSchemaResolver;
 import org.jboss.xb.binding.resolver.MutableSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
 
 /**
  * The RA deployer for JCA/SJC
@@ -97,8 +99,9 @@
       UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
       Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
 
-      MutableSchemaResolver resolver = new MultiClassSchemaResolver();
+      MutableSchemaResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
       resolver.mapLocationToClass("http://java.sun.com/xml/ns/j2ee/connector_1_6.xsd", JCA16MetaData.class);
+      resolver.mapLocationToClass("http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd", JCA15MetaData.class);
 
       File metadataFile = new File(root, "/META-INF/ra.xml");
 
@@ -109,9 +112,10 @@
          {
             long start = System.currentTimeMillis();
 
-            result = (JCA16MetaData)unmarshaller.unmarshal(url, resolver);
+            result = (ConnectorMetaData)unmarshaller.unmarshal(url, resolver);
             
             log.debug("Total parse for " + url + " took " + (System.currentTimeMillis() - start) + "ms");
+            log.info(result);
          }
          catch (Exception e)
          {
@@ -136,7 +140,7 @@
       UnmarshallerFactory unmarshallerFactory = UnmarshallerFactory.newInstance();
       Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
 
-      MutableSchemaResolver resolver = new MultiClassSchemaResolver();
+      MutableSchemaResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
       resolver.mapLocationToClass("http://www.jboss.org/schema/jboss-ra_1_0.xsd", JBossRAMetaData.class);
 
       File metadataFile = new File(root, "/META-INF/jboss-ra.xml");