[jboss-cvs] JBossAS SVN: r86797 - in projects/jboss-cl/trunk: classloading/src/test/resources/org/jboss/test/classloading/metadata/xml/test and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Apr 4 18:22:15 EDT 2009 

Author: alesj
Date: 2009-04-04 18:22:15 -0400 (Sat, 04 Apr 2009)
New Revision: 86797

Modified:
   projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/test/NoopClassLoaderFactoryXMLUnitTestCase.java
   projects/jboss-cl/trunk/classloading-vfs/src/test/resources/org/jboss/test/classloading/vfs/metadata/Common.xml
   projects/jboss-cl/trunk/classloading-vfs/src/test/resources/org/jboss/test/classloading/vfs/metadata/xml/test/ExportImportMixed.xml
   projects/jboss-cl/trunk/classloading/src/test/resources/org/jboss/test/classloading/metadata/xml/test/ExportImportMixed.xml
   projects/jboss-cl/trunk/pom.xml
Log:
Update libs, fix XB order.

Modified: projects/jboss-cl/trunk/classloading/src/test/resources/org/jboss/test/classloading/metadata/xml/test/ExportImportMixed.xml
===================================================================
--- projects/jboss-cl/trunk/classloading/src/test/resources/org/jboss/test/classloading/metadata/xml/test/ExportImportMixed.xml	2009-04-04 21:51:13 UTC (rev 86796)
+++ projects/jboss-cl/trunk/classloading/src/test/resources/org/jboss/test/classloading/metadata/xml/test/ExportImportMixed.xml	2009-04-04 22:22:15 UTC (rev 86797)
@@ -2,16 +2,16 @@
 
 <classloading xmlns="urn:jboss:classloading:1.0"
               name="test">
+   <requirements>
+      <module name="test2" from="2.0.0"/>
+      <package name="test2" from="2.0.0"/>
+      <module name="test1" from="1.0.0"/>
+      <package name="test1" from="1.0.0"/>
+   </requirements>
    <capabilities>
       <module name="test2" version="2.0.0"/>
       <package name="test2" version="2.0.0"/>
       <module name="test1" version="1.0.0"/>
       <package name="test1" version="1.0.0"/>
    </capabilities>
-   <requirements>
-      <module name="test2" from="2.0.0"/>
-      <package name="test2" from="2.0.0"/>
-      <module name="test1" from="1.0.0"/>
-      <package name="test1" from="1.0.0"/>
-   </requirements>
 </classloading>

Modified: projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/test/NoopClassLoaderFactoryXMLUnitTestCase.java
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/test/NoopClassLoaderFactoryXMLUnitTestCase.java	2009-04-04 21:51:13 UTC (rev 86796)
+++ projects/jboss-cl/trunk/classloading-vfs/src/test/java/org/jboss/test/classloading/vfs/metadata/xml/test/NoopClassLoaderFactoryXMLUnitTestCase.java	2009-04-04 22:22:15 UTC (rev 86797)
@@ -22,12 +22,12 @@
 package org.jboss.test.classloading.vfs.metadata.xml.test;
 
 import junit.framework.Test;
+import org.jboss.classloading.spi.vfs.metadata.VFSClassLoaderFactory10;
 import org.jboss.test.classloading.vfs.metadata.xml.AbstractJBossXBTest;
 import org.jboss.test.classloading.vfs.metadata.xml.support.NoopClassLoaderFactory;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
+import org.jboss.xb.binding.resolver.MultiClassSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
-import org.jboss.classloading.spi.vfs.metadata.VFSClassLoaderFactory10;
 
 /**
  * NoopClassLoaderFactoryXMLUnitTestCase.
@@ -50,9 +50,9 @@
    {
       SingletonSchemaResolverFactory factory = SingletonSchemaResolverFactory.getInstance();
       SchemaBindingResolver resolver = factory.getSchemaBindingResolver();
-      DefaultSchemaResolver dsr = assertInstanceOf(resolver, DefaultSchemaResolver.class);
-      dsr.removeClassBinding("urn:jboss:classloader:1.0");
-      dsr.addClassBinding("urn:jboss:classloader:1.0", clazz);
+      MultiClassSchemaResolver mcsr = assertInstanceOf(resolver, MultiClassSchemaResolver.class);
+      mcsr.removeLocationToClassMapping("urn:jboss:classloader:1.0");
+      mcsr.mapLocationToClass("urn:jboss:classloader:1.0", clazz);
    }
 
    @Override

Modified: projects/jboss-cl/trunk/classloading-vfs/src/test/resources/org/jboss/test/classloading/vfs/metadata/Common.xml
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/test/resources/org/jboss/test/classloading/vfs/metadata/Common.xml	2009-04-04 21:51:13 UTC (rev 86796)
+++ projects/jboss-cl/trunk/classloading-vfs/src/test/resources/org/jboss/test/classloading/vfs/metadata/Common.xml	2009-04-04 22:22:15 UTC (rev 86797)
@@ -8,8 +8,8 @@
 
    <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
       <incallback method="addModule" state="Configured"/>
+      <incallback method="addGlobalCapabilitiesProvider" state="Configured"/>
       <uncallback method="removeModule" state="Configured"/>
-      <incallback method="addGlobalCapabilitiesProvider" state="Configured"/>
       <uncallback method="removeGlobalCapabilitiesProvider" state="Configured"/>
    </bean>
 

Modified: projects/jboss-cl/trunk/classloading-vfs/src/test/resources/org/jboss/test/classloading/vfs/metadata/xml/test/ExportImportMixed.xml
===================================================================
--- projects/jboss-cl/trunk/classloading-vfs/src/test/resources/org/jboss/test/classloading/vfs/metadata/xml/test/ExportImportMixed.xml	2009-04-04 21:51:13 UTC (rev 86796)
+++ projects/jboss-cl/trunk/classloading-vfs/src/test/resources/org/jboss/test/classloading/vfs/metadata/xml/test/ExportImportMixed.xml	2009-04-04 22:22:15 UTC (rev 86797)
@@ -2,16 +2,16 @@
 
 <classloader xmlns="urn:jboss:classloader:1.0"
               name="test">
+   <requirements>
+      <module name="test2" from="2.0.0"/>
+      <package name="test2" from="2.0.0"/>
+      <module name="test1" from="1.0.0"/>
+      <package name="test1" from="1.0.0"/>
+   </requirements>
    <capabilities>
       <module name="test2" version="2.0.0"/>
       <package name="test2" version="2.0.0"/>
       <module name="test1" version="1.0.0"/>
       <package name="test1" version="1.0.0"/>
    </capabilities>
-   <requirements>
-      <module name="test2" from="2.0.0"/>
-      <package name="test2" from="2.0.0"/>
-      <module name="test1" from="1.0.0"/>
-      <package name="test1" from="1.0.0"/>
-   </requirements>
 </classloader>

Modified: projects/jboss-cl/trunk/pom.xml
===================================================================
--- projects/jboss-cl/trunk/pom.xml	2009-04-04 21:51:13 UTC (rev 86796)
+++ projects/jboss-cl/trunk/pom.xml	2009-04-04 22:22:15 UTC (rev 86797)
@@ -28,13 +28,13 @@
   </modules>
   
   <properties>
-    <version.jboss.vfs>2.1.0.GA</version.jboss.vfs>
+    <version.jboss.vfs>2.2.0.M1</version.jboss.vfs>
     <version.jboss.man>2.0.0.GA</version.jboss.man>
-    <version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer>
+    <version.jboss.microcontainer>2.2.0.M1</version.jboss.microcontainer>
     <version.jboss.common.core>2.2.10.GA</version.jboss.common.core>
     <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
     <version.jboss.classloading.spi>5.0.3.GA</version.jboss.classloading.spi>
-    <version.jbossxb>2.0.0.GA</version.jbossxb>
+    <version.jbossxb>2.0.1.Beta3</version.jbossxb>
     <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
     <version.junit>4.4</version.junit>
     <version.javassist>3.10.0.GA</version.javassist>
@@ -60,7 +60,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-7</version>
+        <version>2.0-beta-9</version>
         <configuration>
           <generateReleasePoms>false</generateReleasePoms>
           <tagBase>https://svn.jboss.org/repos/jbossas/projects/jboss-cl/tags</tagBase>
@@ -79,7 +79,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.4.1</version>
+          <version>2.4.2</version>
           <configuration>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
             <!--testFailureIgnore>true</testFailureIgnore-->

More information about the jboss-cvs-commits mailing list