[jboss-cvs] JBossAS SVN: r103008 - in projects/reloaded/trunk/vdf-bootstrap-minimal: src/main/resources and 1 other directories.

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

Author: ALRubinger
Date: 2010-03-26 02:49:11 -0400 (Fri, 26 Mar 2010)
New Revision: 103008

Modified:
   projects/reloaded/trunk/vdf-bootstrap-minimal/pom.xml
   projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_vdf.xml
   projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/org/jboss/reloaded/api/MainDeployerViaBootstrapUnitTest.java
Log:
[RELOADED-13] Update to new VFS API

Modified: projects/reloaded/trunk/vdf-bootstrap-minimal/pom.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/pom.xml	2010-03-26 06:24:35 UTC (rev 103007)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/pom.xml	2010-03-26 06:49:11 UTC (rev 103008)
@@ -20,12 +20,12 @@
 
   <properties>
     <!-- Versioning -->
-    <version.org.jboss.bootstrap>2.1.0-alpha-2</version.org.jboss.bootstrap>
-    <version.org.jboss.deployers_jboss.deployers.vfs>2.2.0.Alpha1</version.org.jboss.deployers_jboss.deployers.vfs>
+    <version.org.jboss.bootstrap>2.1.0-alpha-4</version.org.jboss.bootstrap>
+    <version.org.jboss.deployers_jboss.deployers.vfs>2.2.0.Alpha4</version.org.jboss.deployers_jboss.deployers.vfs>
     <version.org.jboss_jbossxb>2.0.2.Beta2</version.org.jboss_jbossxb>
-    <version.org.jboss_jboss.common.core>2.2.14.GA</version.org.jboss_jboss.common.core>
+    <version.org.jboss_jboss.common.core>2.2.17.GA</version.org.jboss_jboss.common.core>
     <version.junit_junit>4.7</version.junit_junit>
-    <version.org.jboss.shrinkwrap>1.0.0-alpha-3</version.org.jboss.shrinkwrap>
+    <version.org.jboss.shrinkwrap>1.0.0-alpha-6</version.org.jboss.shrinkwrap>
   </properties>
 
   <!-- SCM -->

Modified: projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_vdf.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_vdf.xml	2010-03-26 06:24:35 UTC (rev 103007)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/main/resources/org.jboss.reloaded_vdf.xml	2010-03-26 06:49:11 UTC (rev 103008)
@@ -52,7 +52,7 @@
           <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
              <!-- A filter to exclude some obvious non-subdeployments -->
              <property name="filter">
-                <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
+                <bean name="JARFilter" class="org.jboss.vfs.util.SuffixesExcludeFilter">
                    <constructor><parameter>
                       <list elementClass="java.lang.String">
                          <!-- Exclude class files as subdeployments -->

Modified: projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/org/jboss/reloaded/api/MainDeployerViaBootstrapUnitTest.java
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/org/jboss/reloaded/api/MainDeployerViaBootstrapUnitTest.java	2010-03-26 06:24:35 UTC (rev 103007)
+++ projects/reloaded/trunk/vdf-bootstrap-minimal/src/test/java/org/jboss/reloaded/api/MainDeployerViaBootstrapUnitTest.java	2010-03-26 06:49:11 UTC (rev 103008)
@@ -25,8 +25,8 @@
 import org.jboss.shrinkwrap.api.Archives;
 import org.jboss.shrinkwrap.api.exporter.ZipExporter;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -189,7 +189,7 @@
       tmpFile.deleteOnExit();
 
       // Deploy the test JAR
-      final VirtualFile vFile = VFS.createNewRoot(tmpFile.toURI());
+      final VirtualFile vFile = VFS.getChild(tmpFile.toURI());
       final VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(vFile);
       mainDeployer.addDeployment(deployment);
       mainDeployer.process();
@@ -197,7 +197,8 @@
 
       // Obtain the last deployed
       DeploymentUnit lastDeployed = deployer.lastDeployed;
-      TestCase.assertEquals(vFile.toURI().toURL().toExternalForm(), lastDeployed.getName());
+      final String path = vFile.toURI().toURL().getPath();
+      TestCase.assertEquals(path.substring(path.lastIndexOf('/') + 1, path.length()), lastDeployed.getSimpleName());
 
       // Undeploy
       mainDeployer.undeploy(deployment);
@@ -225,6 +226,9 @@
       public void deploy(final DeploymentUnit unit) throws DeploymentException
       {
          log.info("Deploying: " + unit);
+         // Hack into internals to get the underlying context
+
+         // Cache the real underlying deployemt if you have access to it.
          lastDeployed = unit;
       }