[jboss-cvs] JBossAS SVN: r87559 - in branches/Branch_5_x/testsuite/src: resources/xml/mbeanserver and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2009-04-20 05:28:06 -0400 (Mon, 20 Apr 2009)
New Revision: 87559

Modified:
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/xml/SingletonSchemaBindingResolverUnitTestCase.java
   branches/Branch_5_x/testsuite/src/resources/xml/mbeanserver/testXMBean2.xml
Log:
JBAS-6579 xml and binding related fixes

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/xml/SingletonSchemaBindingResolverUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/xml/SingletonSchemaBindingResolverUnitTestCase.java	2009-04-20 09:05:28 UTC (rev 87558)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/xml/SingletonSchemaBindingResolverUnitTestCase.java	2009-04-20 09:28:06 UTC (rev 87559)
@@ -26,9 +26,10 @@
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
 import org.jboss.test.xml.initializer.Container;
 import org.jboss.test.xml.initializer.ContainerInitializer;
+import org.jboss.xb.binding.resolver.MultiClassSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+import org.jboss.xb.builder.JBossXBBuilder;
 
 /**
  * SingletonSchemaBindingResolverUnitTestCase.
@@ -38,13 +39,27 @@
  */
 public class SingletonSchemaBindingResolverUnitTestCase extends AbstractJBossXBTest
 {
+   // TODO remove this when JBAS-6744 is fixed
+   private boolean defaultUnorderedSequence;
+   
+   public void setUp() throws Exception
+   {
+      super.setUp();
+      defaultUnorderedSequence = JBossXBBuilder.isUseUnorderedSequence();
+      JBossXBBuilder.setUseUnorderedSequence(true);
+   }
+   
+   public void tearDown() throws Exception
+   {
+      JBossXBBuilder.setUseUnorderedSequence(defaultUnorderedSequence);
+   }
+   
    public static SchemaBindingResolver initResolver() throws Exception
    {
-      DefaultSchemaResolver resolver = (DefaultSchemaResolver) SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
-      Class clazz = SingletonSchemaBindingResolverUnitTestCase.class;
-      resolver.addSchemaInitializer(ContainerInitializer.NS, ContainerInitializer.class.getName());
-      String location = getSchemaLocation(clazz, "SchemaBindingInitializerUnitTestCaseContainer.xsd");
-      resolver.addSchemaLocation(ContainerInitializer.NS, location);
+      MultiClassSchemaResolver resolver = (MultiClassSchemaResolver) SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
+      resolver.mapSchemaInitializer(ContainerInitializer.NS, ContainerInitializer.class.getName());
+      String location = getSchemaLocation(SingletonSchemaBindingResolverUnitTestCase.class, "SchemaBindingInitializerUnitTestCaseContainer.xsd");
+      resolver.mapSchemaLocation(ContainerInitializer.NS, location);
       return resolver;
    }
 

Modified: branches/Branch_5_x/testsuite/src/resources/xml/mbeanserver/testXMBean2.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/xml/mbeanserver/testXMBean2.xml	2009-04-20 09:05:28 UTC (rev 87558)
+++ branches/Branch_5_x/testsuite/src/resources/xml/mbeanserver/testXMBean2.xml	2009-04-20 09:28:06 UTC (rev 87559)
@@ -5,7 +5,6 @@
    <description>An xmbean description with custom interceptors that are handled by the JavaBeanSchemaInitializer
    </description>
 
-   <class>org.jboss.naming.JNDIBindingService</class>
    <descriptors>
       <interceptors>
          <custom1:javabean xmlns:custom1="urn:jboss:simplejavabean:1.0"
@@ -27,9 +26,11 @@
       </interceptors>
    </descriptors>
 
+   <class>org.jboss.naming.JNDIBindingService</class>
+
    <constructor>
+      <description>The default no-arg constructor</description>
       <name>JNDIBindingService</name>
-      <description>The default no-arg constructor</description>
    </constructor>
 
    <attribute>