[jboss-cvs] JBossAS SVN: r77427 - in trunk: component-matrix and 1 other directory.

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

Author: alesj
Date: 2008-08-25 08:59:06 -0400 (Mon, 25 Aug 2008)
New Revision: 77427

Modified:
   trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPoolFactory.java
   trunk/component-matrix/pom.xml
Log:
Update MC libs; VFS 2.0.0.Beta22, Deployers 2.0.0.Beta21.
Fix JBoss5ClassPoolFactory to work with in-memory vfs url.

Modified: trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPoolFactory.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPoolFactory.java	2008-08-25 12:22:43 UTC (rev 77426)
+++ trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPoolFactory.java	2008-08-25 12:59:06 UTC (rev 77427)
@@ -21,7 +21,6 @@
 */
 package org.jboss.aop.asintegration.jboss5;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map;
 
@@ -29,7 +28,6 @@
 import javassist.scopedpool.ScopedClassPool;
 import javassist.scopedpool.ScopedClassPoolFactory;
 import javassist.scopedpool.ScopedClassPoolRepository;
-
 import org.jboss.aop.classpool.AOPClassPool;
 import org.jboss.aop.classpool.AbstractJBossClassPoolFactory;
 import org.jboss.aop.classpool.ExtraClassPoolFactoryParameters;
@@ -48,8 +46,7 @@
 public class JBoss5ClassPoolFactory extends AbstractJBossClassPoolFactory implements ScopedClassPoolFactory
 {
    public ScopedClassPool create(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
-   {
-      
+   {      
       ClassPool parent = getCreateParentClassPools(cl, src, repository);
       Map props = ExtraClassPoolFactoryParameters.peekThreadProperties();
       boolean isWebCl = props == null ? false : ((Boolean)props.get("IsWebCl")).booleanValue();
@@ -75,16 +72,6 @@
       if (module == null)
          return null;
       
-      try
-      {
-         URL tempUrl = module.getDynamicClassRoot();
-         if (tempUrl == null)
-            return null;
-         return new URL(tempUrl,  "/classes");
-      }
-      catch (MalformedURLException e)
-      {
-         throw new RuntimeException(e);
-      } 
+      return module.getDynamicClassRoot();
    }
 }

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-08-25 12:22:43 UTC (rev 77426)
+++ trunk/component-matrix/pom.xml	2008-08-25 12:59:06 UTC (rev 77427)
@@ -53,10 +53,10 @@
     <version.org.jboss.jpa>0.1.1</version.org.jboss.jpa>
     <version.org.jboss.reflect>2.0.0.Beta13</version.org.jboss.reflect>
     <version.org.jboss.mdr>2.0.0.Beta17</version.org.jboss.mdr>
-    <version.org.jboss.vfs>2.0.0.Beta21</version.org.jboss.vfs>
+    <version.org.jboss.vfs>2.0.0.Beta22</version.org.jboss.vfs>
     <version.org.jboss.cl>2.0.0.Beta13</version.org.jboss.cl>
     <version.org.jboss.cluster>1.1.0.CR4</version.org.jboss.cluster>
-    <version.org.jboss.deployers>2.0.0.Beta20</version.org.jboss.deployers>
+    <version.org.jboss.deployers>2.0.0.Beta21</version.org.jboss.deployers>
     <version.org.jboss.integration>5.0.0.CR2</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.0.CR12</version.org.jboss.jbossxb>
     <version.org.jboss.man>2.0.0.Beta15</version.org.jboss.man>