[jboss-cvs] JBossAS SVN: r104982 - in projects/jboss-deployers/branches/Branch_2_0: deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test and 1 other directories.

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

Author: alesj
Date: 2010-05-19 09:46:50 -0400 (Wed, 19 May 2010)
New Revision: 104982

Modified:
   projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java
   projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java
   projects/jboss-deployers/branches/Branch_2_0/pom.xml
Log:
Update MC libs, fix tests to follow new CNFE.

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java	2010-05-19 13:30:32 UTC (rev 104981)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java	2010-05-19 13:46:50 UTC (rev 104982)
@@ -31,12 +31,7 @@
 import org.jboss.classloader.spi.ParentPolicy;
 import org.jboss.classloading.spi.dependency.ClassLoading;
 import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
-import org.jboss.classloading.spi.metadata.CapabilitiesMetaData;
-import org.jboss.classloading.spi.metadata.Capability;
-import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
-import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
-import org.jboss.classloading.spi.metadata.Requirement;
-import org.jboss.classloading.spi.metadata.RequirementsMetaData;
+import org.jboss.classloading.spi.metadata.*;
 import org.jboss.classloading.spi.version.Version;
 import org.jboss.classloading.spi.version.VersionRange;
 import org.jboss.deployers.client.spi.DeployerClient;
@@ -124,7 +119,7 @@
       }
       catch (Exception e)
       {
-         checkThrowable(IllegalStateException.class, e);
+         checkThrowable(ClassNotFoundException.class, e);
       }
    }
 

Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java	2010-05-19 13:30:32 UTC (rev 104981)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java	2010-05-19 13:46:50 UTC (rev 104982)
@@ -31,12 +31,7 @@
 import org.jboss.classloader.spi.ClassLoaderSystem;
 import org.jboss.classloader.spi.ParentPolicy;
 import org.jboss.classloading.spi.dependency.ClassLoading;
-import org.jboss.classloading.spi.metadata.CapabilitiesMetaData;
-import org.jboss.classloading.spi.metadata.Capability;
-import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
-import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
-import org.jboss.classloading.spi.metadata.Requirement;
-import org.jboss.classloading.spi.metadata.RequirementsMetaData;
+import org.jboss.classloading.spi.metadata.*;
 import org.jboss.classloading.spi.version.Version;
 import org.jboss.classloading.spi.version.VersionRange;
 import org.jboss.deployers.client.plugins.deployment.AbstractDeployment;
@@ -147,7 +142,7 @@
       }
       catch (Exception e)
       {
-         checkThrowable(IllegalStateException.class, e);
+         checkThrowable(ClassNotFoundException.class, e);
       }
    }
 

Modified: projects/jboss-deployers/branches/Branch_2_0/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/pom.xml	2010-05-19 13:30:32 UTC (rev 104981)
+++ projects/jboss-deployers/branches/Branch_2_0/pom.xml	2010-05-19 13:46:50 UTC (rev 104982)
@@ -21,11 +21,11 @@
   </scm>
 
   <properties>
-    <version.jboss.vfs>2.2.0.Alpha2</version.jboss.vfs>
-    <version.jboss.man>2.1.1.CR1</version.jboss.man>
+    <version.jboss.vfs>2.2.0-SNAPSHOT</version.jboss.vfs>
+    <version.jboss.man>2.1.1.SP2</version.jboss.man>
     <version.jboss.mdr>2.0.2.GA</version.jboss.mdr>
-    <version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer>
-    <version.jboss.classloader>2.0.8.GA</version.jboss.classloader>
+    <version.jboss.microcontainer>2.0.10-SNAPSHOT</version.jboss.microcontainer>
+    <version.jboss.classloader>2.0.9-SNAPSHOT</version.jboss.classloader>
     <version.jboss.classloading.spi>5.1.0.SP1</version.jboss.classloading.spi>
     <version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
     <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>