[jboss-svn-commits] JBoss Common SVN: r2565 - jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test.

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

Author: scott.stark at jboss.org
Date: 2007-09-20 16:50:28 -0400 (Thu, 20 Sep 2007)
New Revision: 2565

Modified:
   jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJarJBossMergeEverythingUnitTestCase.java
Log:
Test DefaultSchemaResolver.addClassBinding

Modified: jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJarJBossMergeEverythingUnitTestCase.java
===================================================================
--- jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJarJBossMergeEverythingUnitTestCase.java	2007-09-20 20:01:54 UTC (rev 2564)
+++ jbossxb/trunk/src/test/java/org/jboss/test/ejb/metadata/test/EjbJarJBossMergeEverythingUnitTestCase.java	2007-09-20 20:50:28 UTC (rev 2565)
@@ -31,10 +31,9 @@
 import org.jboss.ejb.metadata.spec.SessionBeanMetaData;
 import org.jboss.javaee.metadata.spec.JavaEEMetaDataConstants;
 import org.jboss.test.ejb.AbstractEJBEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-import org.jboss.xb.builder.JBossXBBuilder;
-import org.w3c.dom.ls.LSInput;
+import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
 
 /**
  * 
@@ -51,46 +50,14 @@
 
    public static SchemaBindingResolver initResolver()
    {
-      return new SchemaBindingResolver()
-      {
-         public String getBaseURI()
-         {
-            return null;
-         }
-
-         public SchemaBinding resolve(String nsUri, String baseURI, String schemaLocation)
-         {
-            SchemaBinding schema;
-            if(JavaEEMetaDataConstants.JAVAEE_NS.equals(nsUri))
-            {
-               schema = JBossXBBuilder.build(EjbJar30MetaData.class);
-            }
-            else if(JavaEEMetaDataConstants.J2EE_NS.equals(nsUri))
-            {
-               schema = JBossXBBuilder.build(EjbJar21MetaData.class);
-            }
-            else if(JavaEEMetaDataConstants.JBOSS_NS.equals(nsUri))
-            {
-               schema = JBossXBBuilder.build(JBoss50MetaData.class);
-            }
-            else
-            {
-               throw new IllegalStateException("Unexpected namespace: " + nsUri);
-            }
-            return schema;
-         }
-
-         public LSInput resolveAsLSInput(String nsUri, String baseUri, String schemaLocation)
-         {
-            return null;
-         }
-
-         public void setBaseURI(String baseURI)
-         {
-         }
-      };
+      SingletonSchemaResolverFactory factory = SingletonSchemaResolverFactory.getInstance();
+      DefaultSchemaResolver resolver = (DefaultSchemaResolver) factory.getSchemaBindingResolver();
+      resolver.addClassBinding(JavaEEMetaDataConstants.JAVAEE_NS, EjbJar30MetaData.class);
+      resolver.addClassBinding(JavaEEMetaDataConstants.J2EE_NS, EjbJar21MetaData.class);
+      resolver.addClassBinding(JavaEEMetaDataConstants.JBOSS_NS, JBoss50MetaData.class);
+      return resolver;
    }
-   
+
    public EjbJarJBossMergeEverythingUnitTestCase(String name)
    {
       super(name);