Index: src/test/java/org/jboss/injection/test/common/DummyInjectionContainer.java
===================================================================
--- src/test/java/org/jboss/injection/test/common/DummyInjectionContainer.java	(revision 101302)
+++ src/test/java/org/jboss/injection/test/common/DummyInjectionContainer.java	(working copy)
@@ -34,11 +34,11 @@
 
 import org.jboss.ejb3.Container;
 import org.jboss.ejb3.DependencyPolicy;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
 import org.jboss.injection.EncInjector;
 import org.jboss.injection.InjectionContainer;
 import org.jboss.injection.Injector;
 import org.jboss.metadata.javaee.spec.RemoteEnvironment;
-import org.jboss.virtual.VirtualFile;
 
 /**
  * @author <a href="mailto:cdewolf@redhat.com">Carlo de Wolf</a>
Index: src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java
===================================================================
--- src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java	(revision 101302)
+++ src/test/java/org/jboss/ejb3/test/cachepassivation/MockDeploymentUnit.java	(working copy)
@@ -30,8 +30,8 @@
 
 import org.jboss.ejb3.DeploymentUnit;
 import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
+import org.jboss.ejb3.vfs.spi.VirtualFileFilter;
 
 /**
  * Comment
@@ -175,7 +175,7 @@
    }
 
    /* (non-Javadoc)
-    * @see org.jboss.ejb3.DeploymentUnit#getResources(org.jboss.virtual.VirtualFileFilter)
+    * @see org.jboss.ejb3.DeploymentUnit#getResources(org.jboss.ejb3.vfs.spi.VirtualFileFilter)
     */
    public List<VirtualFile> getResources(VirtualFileFilter filter)
    {
Index: src/main/java/org/jboss/injection/InjectionContainer.java
===================================================================
--- src/main/java/org/jboss/injection/InjectionContainer.java	(revision 101302)
+++ src/main/java/org/jboss/injection/InjectionContainer.java	(working copy)
@@ -33,8 +33,8 @@
 
 import org.jboss.ejb3.Container;
 import org.jboss.ejb3.DependencyPolicy;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
 import org.jboss.metadata.javaee.spec.RemoteEnvironment;
-import org.jboss.virtual.VirtualFile;
 
 /**
  * This is the container that manages all injections.  Could be an EJB Container
Index: src/main/java/org/jboss/injection/ServiceRefInjector.java
===================================================================
--- src/main/java/org/jboss/injection/ServiceRefInjector.java	(revision 101302)
+++ src/main/java/org/jboss/injection/ServiceRefInjector.java	(working copy)
@@ -28,6 +28,7 @@
 import javax.naming.Context;
 import javax.xml.ws.WebServiceException;
 
+import org.jboss.ejb3.vfs.spi.UnifiedVirtualFileFactory;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
 import org.jboss.metadata.serviceref.ServiceReferenceHandler;
@@ -60,7 +61,7 @@
       {
          Context envCtx = container.getEnc();
          ClassLoader loader = container.getClassloader();
-         UnifiedVirtualFile vfsRoot = new VirtualFileAdaptor(container.getRootFile());
+         UnifiedVirtualFile vfsRoot = UnifiedVirtualFileFactory.getInstance().create(container.getRootFile());
          new ServiceReferenceHandler().bindServiceRef(envCtx, name, vfsRoot, loader, sref);
       }
       catch (Exception e)
Index: src/main/java/org/jboss/ejb3/DeploymentUnit.java
===================================================================
--- src/main/java/org/jboss/ejb3/DeploymentUnit.java	(revision 101302)
+++ src/main/java/org/jboss/ejb3/DeploymentUnit.java	(working copy)
@@ -27,8 +27,8 @@
 import java.util.Map;
 
 import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
+import org.jboss.ejb3.vfs.spi.VirtualFileFilter;
 
 /**
  * Comment
Index: src/main/java/org/jboss/ejb3/EJBContainer.java
===================================================================
--- src/main/java/org/jboss/ejb3/EJBContainer.java	(revision 101302)
+++ src/main/java/org/jboss/ejb3/EJBContainer.java	(working copy)
@@ -91,6 +91,7 @@
 import org.jboss.ejb3.security.SecurityDomainManager;
 import org.jboss.ejb3.statistics.InvocationStatistics;
 import org.jboss.ejb3.tx.UserTransactionImpl;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
 import org.jboss.injection.DependsHandler;
 import org.jboss.injection.EJBHandler;
 import org.jboss.injection.EJBInjectionContainer;
@@ -116,7 +117,6 @@
 import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
 import org.jboss.util.StringPropertyReplacer;
 import org.jboss.util.naming.Util;
-import org.jboss.virtual.VirtualFile;
 
 /**
  * Comment
Index: src/main/java/org/jboss/ejb3/ClientDescriptorFileFilter.java
===================================================================
--- src/main/java/org/jboss/ejb3/ClientDescriptorFileFilter.java	(revision 101302)
+++ src/main/java/org/jboss/ejb3/ClientDescriptorFileFilter.java	(working copy)
@@ -21,11 +21,12 @@
  */ 
 package org.jboss.ejb3;
 
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VirtualFile;
 
 import java.io.IOException;
 
+import org.jboss.ejb3.vfs.spi.VirtualFile;
+import org.jboss.ejb3.vfs.spi.VirtualFileFilter;
+
 /**
  * @author <a href="mailto:bdecoste@jboss.com">William DeCoste</a>
  */
Index: src/main/java/org/jboss/ejb3/ClassFileFilter.java
===================================================================
--- src/main/java/org/jboss/ejb3/ClassFileFilter.java	(revision 101302)
+++ src/main/java/org/jboss/ejb3/ClassFileFilter.java	(working copy)
@@ -21,11 +21,12 @@
  */ 
 package org.jboss.ejb3;
 
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VirtualFile;
 
 import java.io.IOException;
 
+import org.jboss.ejb3.vfs.spi.VirtualFile;
+import org.jboss.ejb3.vfs.spi.VirtualFileFilter;
+
 /**
  * Comment
  *
Index: src/main/java/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- src/main/java/org/jboss/ejb3/Ejb3Deployment.java	(revision 101302)
+++ src/main/java/org/jboss/ejb3/Ejb3Deployment.java	(working copy)
@@ -59,6 +59,7 @@
 import org.jboss.ejb3.proxy.factory.ProxyFactoryHelper;
 import org.jboss.ejb3.resolvers.DefaultMessageDestinationReferenceResolver;
 import org.jboss.ejb3.resolvers.MessageDestinationReferenceResolver;
+import org.jboss.ejb3.vfs.spi.VirtualFile;
 import org.jboss.injection.InjectionHandler;
 import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
 import org.jboss.logging.Logger;
@@ -71,7 +72,6 @@
 import org.jboss.metadata.javaee.spec.Environment;
 import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
 import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.virtual.VirtualFile;
 
 /**
  * An EjbModule represents a collection of beans that are deployed as a unit.
Index: pom.xml
===================================================================
--- pom.xml	(revision 101302)
+++ pom.xml	(working copy)
@@ -213,6 +213,10 @@
           <artifactId>jboss-jaxws</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-vfs</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.jboss.javaee</groupId>
           <artifactId>jboss-javaee</artifactId>
         </exclusion>
@@ -237,12 +241,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-vfs</artifactId>
-      <version>2.0.0.CR1</version>
-    </dependency>
-
-    <dependency>
       <groupId>org.jboss.naming</groupId>
       <artifactId>jnpserver</artifactId>
     </dependency>
@@ -457,6 +455,12 @@
     </dependency>
 
     <dependency>
+      <groupId>org.jboss.ejb3.vfs</groupId>
+      <artifactId>jboss-ejb3-vfs-spi</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.jboss.embedded</groupId>
       <artifactId>jboss-embedded</artifactId>
       <version>beta3</version>
@@ -513,6 +517,10 @@
           <artifactId>javassist</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-vfs</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.jboss.microcontainer</groupId>
           <artifactId>jboss-aop-mc-int</artifactId>
         </exclusion>
@@ -541,6 +549,10 @@
           <artifactId>javassist</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-vfs</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.jboss.microcontainer</groupId>
           <artifactId>jboss-aop-mc-int</artifactId>
         </exclusion>
@@ -622,7 +634,13 @@
     <dependency>
       <groupId>org.jboss.jpa</groupId>
       <artifactId>jboss-jpa-deployers</artifactId>
-      <version>1.0.0-CR1</version>
+      <version>1.0.2-alpha-1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-vfs</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -676,4 +694,5 @@
     </dependency>
 
   </dependencies>
+
 </project>