[jboss-cvs] JBossAS SVN: r100981 - in branches/vfs3-int: server/src/etc/conf/all/bootstrap and 2 other directories.

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

Author: johnbailey
Date: 2010-02-15 13:13:38 -0500 (Mon, 15 Feb 2010)
New Revision: 100981

Modified:
   branches/vfs3-int/component-matrix/pom.xml
   branches/vfs3-int/server/src/etc/conf/all/bootstrap/deployers.xml
   branches/vfs3-int/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
   branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeploymentRepoAddContentTestCase.java
   branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHugeDeploymentUnitTestCase.java
Log:
[JBAS-7357] - Updates required to run testsuite smoke-tests

Modified: branches/vfs3-int/component-matrix/pom.xml
===================================================================
--- branches/vfs3-int/component-matrix/pom.xml	2010-02-15 18:10:13 UTC (rev 100980)
+++ branches/vfs3-int/component-matrix/pom.xml	2010-02-15 18:13:38 UTC (rev 100981)
@@ -130,7 +130,7 @@
     <version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
     <version.org.jboss.stdio>1.0.0.CR3</version.org.jboss.stdio>
     <version.org.jboss.threads>2.0.0.CR3</version.org.jboss.threads>
-    <version.org.jboss.vfs>3.0.0.CR1-SNAPSHOT</version.org.jboss.vfs>
+    <version.org.jboss.vfs>3.0.0.CR2-SNAPSHOT</version.org.jboss.vfs>
     <version.org.jboss.xnio>2.1.0.CR1</version.org.jboss.xnio>
     <version.org.jboss.xnio.metadata>2.1.0.CR1</version.org.jboss.xnio.metadata>
     <version.org.slf4j>1.5.6</version.org.slf4j>

Modified: branches/vfs3-int/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- branches/vfs3-int/server/src/etc/conf/all/bootstrap/deployers.xml	2010-02-15 18:10:13 UTC (rev 100980)
+++ branches/vfs3-int/server/src/etc/conf/all/bootstrap/deployers.xml	2010-02-15 18:13:38 UTC (rev 100981)
@@ -167,6 +167,7 @@
       <property name="suffix">-aop.xml</property>
    </bean>
    <bean name="AOPAnnotationMetaDataParserDeployer" class="org.jboss.aop.asintegration.jboss5.AOPAnnotationMetaDataParserDeployer">
+      <constructor><parameter>0</parameter></constructor>
    </bean>
    <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer">
       <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>

Modified: branches/vfs3-int/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
===================================================================
--- branches/vfs3-int/server/src/etc/deployers/metadata-deployer-jboss-beans.xml	2010-02-15 18:10:13 UTC (rev 100980)
+++ branches/vfs3-int/server/src/etc/deployers/metadata-deployer-jboss-beans.xml	2010-02-15 18:13:38 UTC (rev 100981)
@@ -23,7 +23,7 @@
   <bean name="JBossCustomDeployDUFilter" class="org.jboss.deployers.vfs.spi.structure.helpers.VirtualFileDeploymentUnitFilter">
     <constructor>
       <parameter>
-        <bean class="org.jboss.virtual.plugins.vfs.helpers.FileNameVirtualFileFilter">
+        <bean class="org.jboss.deployment.FileNameVirtualFileFilter">
           <constructor>
             <parameter>
               <map keyClass="java.lang.String" valueClass="java.util.Set">

Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeploymentRepoAddContentTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeploymentRepoAddContentTestCase.java	2010-02-15 18:10:13 UTC (rev 100980)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/ClusteredDeploymentRepoAddContentTestCase.java	2010-02-15 18:13:38 UTC (rev 100981)
@@ -42,7 +42,6 @@
 import org.jboss.profileservice.spi.ProfileKey;
 import org.jboss.profileservice.spi.ProfileService;
 import org.jboss.test.JBossClusteredTestCase;
-import org.jboss.vfs.VFS;
 
 /**
  *
@@ -131,7 +130,7 @@
       // TODO - hack to get off JDK's url handling
       String urlString = contentURL.toExternalForm();
       int p = urlString.indexOf(":/");
-      contentURL = new URL("vfszip" + urlString.substring(p));
+      contentURL = new URL("file" + urlString.substring(p));
       getLog().debug(contentURL);
 
       DeploymentStatus status;
@@ -210,8 +209,6 @@
          ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
          deployMgr = ps.getDeploymentManager();
          deployMgr.loadProfile(getProfileKey());
-         // Init the VFS to setup the vfs* protocol handlers
-         VFS.init();
       }
       return deployMgr;
    }
@@ -228,8 +225,6 @@
       {
          ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
          activeView = ps.getViewManager();
-         // Init the VFS to setup the vfs* protocol handlers
-         VFS.init();
       }
       // Reload
       activeView.load();

Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHugeDeploymentUnitTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHugeDeploymentUnitTestCase.java	2010-02-15 18:10:13 UTC (rev 100980)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/cluster/defaultcfg/profileservice/test/FarmedClusterHugeDeploymentUnitTestCase.java	2010-02-15 18:13:38 UTC (rev 100981)
@@ -256,8 +256,6 @@
       {
          ProfileService ps = (ProfileService) ctx.lookup("ProfileService");
          activeView = ps.getViewManager();
-         // Init the VFS to setup the vfs* protocol handlers
-         VFS.init();
       }
       // Reload
       activeView.load();