[jboss-osgi-commits] JBoss-OSGI SVN: r101762 - in projects/jboss-osgi: projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal and 24 other directories.

Wednesday, 3 March 2010

Author: thomas.diesler(a)jboss.com
Date: 2010-03-03 04:20:23 -0500 (Wed, 03 Mar 2010)
New Revision: 101762

Modified:
   projects/jboss-osgi/projects/bundles/serviceloader/trunk/pom.xml
  
projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal/ServiceLoaderInterceptor.java
   projects/jboss-osgi/projects/bundles/webapp/trunk/.settings/org.eclipse.jdt.core.prefs
   projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml
  
projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebXMLParserInterceptor.java
  
projects/jboss-osgi/projects/runtime/deployment/trunk/.settings/org.eclipse.jdt.core.prefs
   projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml
  
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/AbstractDeployerService.java
  
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/DeployerService.java
  
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/Deployment.java
  
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/DeploymentFactory.java
  
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/interceptor/InvocationContext.java
  
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java
  
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/InvocationContextImpl.java
  
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java
   projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
  
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractDeployedBundleState.java
  
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
  
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/DeployerServiceImpl.java
  
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/LifecycleInterceptorServiceImpl.java
  
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/WebXMLVerifierInterceptor.java
   projects/jboss-osgi/projects/spi/trunk/pom.xml
  
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleInfo.java
   projects/jboss-osgi/projects/testing/trunk/pom.xml
  
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/AbstractVFS.java
  
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VFSAdaptor.java
  
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VirtualFile.java
  
projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VFSAdaptor21.java
  
projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VirtualFileAdaptor21.java
  
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java
  
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java
   projects/jboss-osgi/trunk/pom.xml
  
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/ParserInterceptor.java
  
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
  
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
  
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
   projects/jboss-osgi/trunk/testsuite/functional/pom.xml
  
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
  
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
  
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
Log:
Migrate to jboss-osgi-vfs abstraction

Modified: projects/jboss-osgi/projects/bundles/serviceloader/trunk/pom.xml
===================================================================

--- projects/jboss-osgi/projects/bundles/serviceloader/trunk/pom.xml	2010-03-03 09:12:48
UTC (rev 101761)
+++ projects/jboss-osgi/projects/bundles/serviceloader/trunk/pom.xml	2010-03-03 09:20:23
UTC (rev 101762)
@@ -39,8 +39,8 @@
   
   <!-- Properties -->  
   <properties>
-    <version.jboss.osgi.deployment>1.0.1</version.jboss.osgi.deployment>
-    <version.jboss.osgi.spi>1.0.4</version.jboss.osgi.spi>
+   
<version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
+    <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
     <version.osgi>4.2.0</version.osgi>
   </properties>
   
@@ -82,6 +82,14 @@
           <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
            
<Bundle-Activator>org.jboss.osgi.serviceloader.internal.ServiceLoaderActivator</Bundle-Activator>
+            <Import-Package>
+               org.jboss.logging;version="[2.1,3.0)",
+               org.jboss.osgi.deployment*;version="[1.0,2.0)",
+               org.jboss.osgi.spi*;version="[1.0,2.0)",
+               org.jboss.osgi.vfs;version="[1.0,2.0)",
+               
+               org.osgi.framework;version="[1.5,2.0)",
+            </Import-Package>
             <Export-Package>
               org.jboss.osgi.serviceloader;version=${version}
             </Export-Package>

Modified:
projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal/ServiceLoaderInterceptor.java
===================================================================
---
projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal/ServiceLoaderInterceptor.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal/ServiceLoaderInterceptor.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -29,16 +29,15 @@
 import java.util.Enumeration;
 import java.util.Hashtable;
 
+import org.jboss.logging.Logger;
 import org.jboss.osgi.deployment.interceptor.AbstractLifecycleInterceptor;
 import org.jboss.osgi.deployment.interceptor.InvocationContext;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.osgi.vfs.VirtualFile;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceFactory;
 import org.osgi.framework.ServiceRegistration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * An interceptor that registeres service defined in META-INF/services.
@@ -49,7 +48,7 @@
 public class ServiceLoaderInterceptor extends AbstractLifecycleInterceptor
 {
    // Provide logging
-   private Logger log = LoggerFactory.getLogger(ServiceLoaderInterceptor.class);
+   private static final Logger log = Logger.getLogger(ServiceLoaderInterceptor.class);
 
    @SuppressWarnings("unchecked")
    public void invoke(int state, InvocationContext context)

Modified:
projects/jboss-osgi/projects/bundles/webapp/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
---
projects/jboss-osgi/projects/bundles/webapp/trunk/.settings/org.eclipse.jdt.core.prefs	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/bundles/webapp/trunk/.settings/org.eclipse.jdt.core.prefs	2010-03-03
09:20:23 UTC (rev 101762)
@@ -1,5 +1,6 @@
-#Fri Mar 06 10:50:43 CET 2009
+#Wed Mar 03 09:58:58 CET 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.5

Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml	2010-03-03 09:12:48 UTC (rev
101761)
+++ projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml	2010-03-03 09:20:23 UTC (rev
101762)
@@ -101,10 +101,11 @@
                javax.xml.parsers,
                 
                org.apache.commons.logging;version="[1.1,1.2)",
-               org.jboss.logging;version="[2.1,2.2)",
-               org.jboss.osgi.deployment.interceptor;version="[1.0,1.1)",
-               org.jboss.osgi.spi.capability;version="[1.0,1.1)",
-               org.jboss.virtual,
+               org.jboss.logging;version="[2.1,3.0)",
+               org.jboss.osgi.deployment*;version="[1.0,2.0)",
+               org.jboss.osgi.spi*;version="[1.0,2.0)",
+               org.jboss.osgi.vfs;version="[1.0,2.0)",
+               
                org.ops4j.pax.web.service,
                org.osgi.service.http, 
                org.osgi.framework,

Modified:
projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebXMLParserInterceptor.java
===================================================================
---
projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebXMLParserInterceptor.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebXMLParserInterceptor.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -30,7 +30,7 @@
 import org.jboss.osgi.deployment.interceptor.InvocationContext;
 import org.jboss.osgi.deployment.interceptor.LifecycleInterceptor;
 import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorException;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.osgi.vfs.VirtualFile;
 import org.ops4j.pax.web.extender.war.internal.model.WebApp;
 import org.ops4j.pax.web.extender.war.internal.parser.dom.DOMWebXmlParser;
 import org.osgi.framework.Bundle;

Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
---
projects/jboss-osgi/projects/runtime/deployment/trunk/.settings/org.eclipse.jdt.core.prefs	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/deployment/trunk/.settings/org.eclipse.jdt.core.prefs	2010-03-03
09:20:23 UTC (rev 101762)
@@ -1,4 +1,4 @@
-#Thu Feb 25 11:21:35 CET 2010
+#Tue Mar 02 21:52:19 CET 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml	2010-03-03 09:12:48 UTC
(rev 101761)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml	2010-03-03 09:20:23 UTC
(rev 101762)
@@ -38,8 +38,8 @@
   
   <!-- Properties -->
   <properties>
-    <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers>
     <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
+    <version.jboss.osgi.vfs>1.0.0-SNAPSHOT</version.jboss.osgi.vfs>
     <version.osgi>4.2.0</version.osgi>
   </properties>
 
@@ -55,14 +55,6 @@
       <version>${version.jboss.osgi.spi}</version>
     </dependency>
     
-    <!-- Provided Dependencies -->
-    <dependency>
-      <groupId>org.jboss.deployers</groupId>
-      <artifactId>jboss-deployers-vfs</artifactId>
-      <version>${version.jboss.deployers}</version>
-      <scope>provided</scope>
-    </dependency>
-
     <!-- OSGi Dependencies -->
     <dependency>
       <groupId>org.osgi</groupId>
@@ -79,6 +71,12 @@
 
     <!-- Test Dependecies -->
     <dependency>
+      <groupId>org.jboss.osgi.vfs</groupId>
+      <artifactId>jboss-osgi-vfs21</artifactId>
+      <version>${version.jboss.osgi.vfs}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/AbstractDeployerService.java
===================================================================
---
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/AbstractDeployerService.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/AbstractDeployerService.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -26,7 +26,7 @@
 import java.net.URL;
 
 import org.jboss.osgi.spi.util.BundleInfo;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.osgi.vfs.VirtualFile;
 import org.osgi.framework.BundleException;
 
 /**

Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/DeployerService.java
===================================================================
---
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/DeployerService.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/DeployerService.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -26,7 +26,7 @@
 import java.net.URL;
 
 import org.jboss.osgi.spi.util.BundleInfo;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.osgi.vfs.VirtualFile;
 import org.osgi.framework.BundleException;
 
 /**

Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/Deployment.java
===================================================================
---
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/Deployment.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/Deployment.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -21,12 +21,11 @@
  */
 package org.jboss.osgi.deployment.deployer;
 
-import org.jboss.osgi.spi.Attachments;
-import org.jboss.virtual.VirtualFile;
-
-
 //$Id$
 
+import org.jboss.osgi.spi.Attachments;
+import org.jboss.osgi.vfs.VirtualFile;
+
 /**
  * An abstraction of a bundle deployment
  * 

Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/DeploymentFactory.java
===================================================================
---
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/DeploymentFactory.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/DeploymentFactory.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -27,7 +27,7 @@
 
 import org.jboss.osgi.deployment.internal.DeploymentImpl;
 import org.jboss.osgi.spi.util.BundleInfo;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.osgi.vfs.VirtualFile;
 import org.osgi.framework.BundleException;
 
 /**

Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/interceptor/InvocationContext.java
===================================================================
---
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/interceptor/InvocationContext.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/interceptor/InvocationContext.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -24,7 +24,7 @@
 //$Id$
 
 import org.jboss.osgi.spi.Attachments;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.osgi.vfs.VirtualFile;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 

Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java
===================================================================
---
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -21,15 +21,15 @@
  */
 package org.jboss.osgi.deployment.internal;
 
+//$Id$
+
 import java.io.Serializable;
 
 import org.jboss.osgi.deployment.deployer.Deployment;
 import org.jboss.osgi.spi.util.AttachmentSupport;
 import org.jboss.osgi.spi.util.BundleInfo;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.osgi.vfs.VirtualFile;
 
-//$Id$
-
 /**
  * An abstraction of a bundle deployment
  * 

Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/InvocationContextImpl.java
===================================================================
---
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/InvocationContextImpl.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/InvocationContextImpl.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -27,7 +27,7 @@
 
 import org.jboss.osgi.deployment.interceptor.InvocationContext;
 import org.jboss.osgi.spi.Attachments;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.osgi.vfs.VirtualFile;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 

Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java
===================================================================
---
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -63,7 +63,6 @@
       this.context = context;
    }
 
-   @Override
    public void deploy(Deployment[] depArr) throws BundleException
    {
       DeploymentRegistryService registry = getDeploymentRegistry();
@@ -134,7 +133,6 @@
       }
    }
 
-   @Override
    public void undeploy(Deployment[] depArr) throws BundleException
    {
       DeploymentRegistryService registry = getDeploymentRegistry();

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml	2010-03-03 09:12:48 UTC
(rev 101761)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml	2010-03-03 09:20:23 UTC
(rev 101762)
@@ -54,13 +54,13 @@
    
<version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces>
     <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
    
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
-    <version.jboss.osgi.deployment>1.0.1</version.jboss.osgi.deployment>
+   
<version.jboss.osgi.deployers>1.0.5-SNAPSHOT</version.jboss.osgi.deployers>
+   
<version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
     <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky>
     <version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb>
     <version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
     <version.jboss.osgi.jndi>1.0.3-SNAPSHOT</version.jboss.osgi.jndi>
     <version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect>
-   
<version.jboss.osgi.runtime.deployers>1.0.4</version.jboss.osgi.runtime.deployers>
     <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
     <version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing>
    
<version.jboss.osgi.xml.binding>2.0.2.Beta4</version.jboss.osgi.xml.binding>
@@ -172,7 +172,7 @@
     <dependency>
       <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-deployers</artifactId>
-      <version>${version.jboss.osgi.runtime.deployers}</version>
+      <version>${version.jboss.osgi.deployers}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.runtime</groupId>

Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractDeployedBundleState.java
===================================================================
---
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractDeployedBundleState.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractDeployedBundleState.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -36,6 +36,7 @@
 import org.jboss.osgi.deployment.deployer.Deployment;
 import org.jboss.osgi.framework.metadata.OSGiMetaData;
 import org.jboss.osgi.framework.plugins.PackageAdminPlugin;
+import org.jboss.osgi.vfs.AbstractVFS;
 import org.jboss.virtual.VirtualFile;
 import org.osgi.framework.AdminPermission;
 import org.osgi.framework.Bundle;
@@ -82,7 +83,7 @@
       // The framework is expected to preserve the location passed into
installBundle(String)
       Deployment dep = unit.getAttachment(Deployment.class);
       location = (dep != null ? dep.getLocation() : unit.getName());
-      rootFile = (dep != null ? dep.getRoot() : ((VFSDeploymentUnit)unit).getRoot());
+      rootFile = (dep != null ? (VirtualFile)AbstractVFS.adapt(dep.getRoot()) :
((VFSDeploymentUnit)unit).getRoot());
 
       bundleId = bundleIDGenerator.incrementAndGet();
 

Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
===================================================================
---
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -73,6 +73,7 @@
 import org.jboss.osgi.framework.plugins.ServicePlugin;
 import org.jboss.osgi.framework.util.URLHelper;
 import org.jboss.osgi.spi.util.BundleInfo;
+import org.jboss.osgi.vfs.AbstractVFS;
 import org.jboss.util.platform.Java;
 import org.jboss.virtual.VFS;
 import org.jboss.virtual.VFSUtils;
@@ -507,7 +508,7 @@
       Deployment dep;
       try
       {
-         BundleInfo info = BundleInfo.createBundleInfo(root, location);
+         BundleInfo info = BundleInfo.createBundleInfo(AbstractVFS.adapt(root),
location);
          dep = DeploymentFactory.createDeployment(info);
          dep.setAutoStart(autoStart);
       }
@@ -532,7 +533,8 @@
       // Create the deployment and deploy it
       try
       {
-         VFSDeployment deployment =
VFSDeploymentFactory.getInstance().createVFSDeployment(dep.getRoot());
+         VirtualFile root = (VirtualFile)AbstractVFS.adapt(dep.getRoot());
+         VFSDeployment deployment =
VFSDeploymentFactory.getInstance().createVFSDeployment(root);
          MutableAttachments att =
(MutableAttachments)deployment.getPredeterminedManagedObjects();
          att.addAttachment(Deployment.class, dep);
 
@@ -685,7 +687,7 @@
          URL storageLocation = getBundleStorageLocation(in);
          VirtualFile root = VFS.getRoot(storageLocation);
 
-         BundleInfo info = BundleInfo.createBundleInfo(root, location);
+         BundleInfo info = BundleInfo.createBundleInfo(AbstractVFS.adapt(root),
location);
          Deployment dep = DeploymentFactory.createDeployment(info);
          dep.addAttachment(AbstractBundleState.class, bundleState);
          dep.setBundleUpdate(true);

Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/DeployerServiceImpl.java
===================================================================
---
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/DeployerServiceImpl.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/DeployerServiceImpl.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -36,7 +36,7 @@
 import org.jboss.osgi.framework.plugins.DeployerServicePlugin;
 import org.jboss.osgi.framework.plugins.internal.AbstractServicePlugin;
 import org.jboss.osgi.spi.util.BundleInfo;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.osgi.vfs.VirtualFile;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 
@@ -96,18 +96,8 @@
       delegate.deploy(bundleDeps);
    }
 
-   public void deploy(URL url) throws BundleException
-   {
-      delegate.deploy(url);
-   }
-
    public void undeploy(Deployment[] bundleDeps) throws BundleException
    {
       delegate.undeploy(bundleDeps);
    }
-
-   public void undeploy(URL url) throws BundleException
-   {
-      delegate.undeploy(url);
-   }
 }
\ No newline at end of file

Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/LifecycleInterceptorServiceImpl.java
===================================================================
---
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/LifecycleInterceptorServiceImpl.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/LifecycleInterceptorServiceImpl.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -34,6 +34,7 @@
 import org.jboss.osgi.framework.plugins.LifecycleInterceptorServicePlugin;
 import org.jboss.osgi.framework.plugins.internal.AbstractServicePlugin;
 import org.jboss.osgi.framework.util.DeploymentUnitAttachments;
+import org.jboss.osgi.vfs.AbstractVFS;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
@@ -76,7 +77,7 @@
             {
                BundleContext context =
bundleState.getBundleManager().getSystemContext();
                DeploymentUnitAttachments att = new DeploymentUnitAttachments(unit);
-               inv = new InvocationContextImpl(context, bundle, unit.getRoot(), att);
+               inv = new InvocationContextImpl(context, bundle,
AbstractVFS.adapt(unit.getRoot()), att);
                unit.addAttachment(InvocationContext.class, inv);
             }
             return inv;

Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/WebXMLVerifierInterceptor.java
===================================================================
---
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/WebXMLVerifierInterceptor.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/service/internal/WebXMLVerifierInterceptor.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -31,7 +31,7 @@
 import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorException;
 import org.jboss.osgi.framework.bundle.OSGiBundleManager;
 import org.jboss.osgi.framework.plugins.internal.AbstractServicePlugin;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.osgi.vfs.VirtualFile;
 import org.osgi.framework.Bundle;
 
 /**

Modified: projects/jboss-osgi/projects/spi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/pom.xml	2010-03-03 09:12:48 UTC (rev 101761)
+++ projects/jboss-osgi/projects/spi/trunk/pom.xml	2010-03-03 09:20:23 UTC (rev 101762)
@@ -39,7 +39,7 @@
   <!-- Properties -->
   <properties>
     <version.args4j>2.0.12</version.args4j>
-    <version.jboss.vfs>2.1.3.SP1</version.jboss.vfs>
+    <version.jboss.osgi.vfs>1.0.0-SNAPSHOT</version.jboss.osgi.vfs>
     <version.osgi>4.2.0</version.osgi>
   </properties>
   
@@ -57,9 +57,9 @@
       <artifactId>jboss-logging-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-vfs</artifactId>
-      <version>${version.jboss.vfs}</version>
+      <groupId>org.jboss.osgi.vfs</groupId>
+      <artifactId>jboss-osgi-vfs</artifactId>
+      <version>${version.jboss.osgi.vfs}</version>
     </dependency>
 
     <!-- Provided Dependencies -->

Modified:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleInfo.java
===================================================================
---
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleInfo.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleInfo.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -31,9 +31,9 @@
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VFSUtils;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.osgi.vfs.AbstractVFS;
+import org.jboss.osgi.vfs.VFSUtils;
+import org.jboss.osgi.vfs.VirtualFile;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
@@ -261,7 +261,7 @@
    {
       try
       {
-         return VFS.getRoot(url);
+         return AbstractVFS.getChild(url);
       }
       catch (IOException e)
       {

Modified: projects/jboss-osgi/projects/testing/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/testing/trunk/pom.xml	2010-03-03 09:12:48 UTC (rev
101761)
+++ projects/jboss-osgi/projects/testing/trunk/pom.xml	2010-03-03 09:20:23 UTC (rev
101762)
@@ -43,9 +43,10 @@
    
<version.apache.aries.jmx>1.0.0-incubating-SNAPSHOT</version.apache.aries.jmx>
     <version.apache.felix.log>1.0.0</version.apache.felix.log>
     <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
+    <version.jboss.osgi.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.felix>
     <version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
     <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
-   
<version.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix>
+    <version.jboss.osgi.vfs>1.0.0-SNAPSHOT</version.jboss.osgi.vfs>
     <version.osgi>4.2.0</version.osgi>
   </properties>
 
@@ -66,6 +67,11 @@
       <version>${version.jboss.osgi.jmx}</version>
     </dependency>
     <dependency>
+      <groupId>org.jboss.osgi.vfs</groupId>
+      <artifactId>jboss-osgi-vfs21</artifactId>
+      <version>${version.jboss.osgi.vfs}</version>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
@@ -124,7 +130,7 @@
     <dependency>
       <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-runtime-felix</artifactId>
-      <version>${version.jboss.osgi.runtime.felix}</version>
+      <version>${version.jboss.osgi.felix}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified:
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/AbstractVFS.java
===================================================================
---
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/AbstractVFS.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/AbstractVFS.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -46,6 +46,11 @@
       return getVFSAdaptor().adapt(virtualFile);
    }
    
+   public static Object adapt(VirtualFile virtualFile)
+   {
+      return getVFSAdaptor().adapt(virtualFile);
+   }
+   
    @SuppressWarnings("unchecked")
    private static VFSAdaptor getVFSAdaptor() 
    {

Modified:
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VFSAdaptor.java
===================================================================
---
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VFSAdaptor.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VFSAdaptor.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -51,5 +51,12 @@
     * @throws IllegalArgumentException If the given virtualFile is not a VirtualFile
supported by the VFSAdaptor implementation
     */
    VirtualFile adapt(Object virtualFile);
+
+   /**
+    * Adapt a VirtualFile to a concrete instance of a jboss-vfs VirtualFile.
+    * @param virtualFile The VirtualFile instance
+    * @return The jboss-vfs VirtualFile
+    */
+   Object adapt(VirtualFile virtualFile);
 }
 

Modified:
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VirtualFile.java
===================================================================
---
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VirtualFile.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VirtualFile.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -38,6 +38,14 @@
 public interface VirtualFile
 {
    /**
+    * Get the simple VF name (X.java)
+    *
+    * @return the simple file name
+    * @throws IllegalStateException if the file is closed
+    */
+   String getName();
+   
+   /**
     * Get the VF URL (file://root/org/jboss/X.java)
     *
     * @return the full URL to the VF in the VFS.

Modified:
projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VFSAdaptor21.java
===================================================================
---
projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VFSAdaptor21.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VFSAdaptor21.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -43,7 +43,19 @@
 
    public VirtualFile adapt(Object virtualFile)
    {
+      if (virtualFile == null)
+         return null;
+      
+      if (virtualFile instanceof org.jboss.virtual.VirtualFile == false)
+         throw new IllegalArgumentException("Not a org.jboss.virtual.VirtualFile:
" + virtualFile);
+      
       return new VirtualFileAdaptor21((org.jboss.virtual.VirtualFile)virtualFile);
    }
+
+   public Object adapt(VirtualFile virtualFile)
+   {
+      VirtualFileAdaptor21 adaptor = (VirtualFileAdaptor21)virtualFile;
+      return adaptor.getDelegate();
+   }
 }
 

Modified:
projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VirtualFileAdaptor21.java
===================================================================
---
projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VirtualFileAdaptor21.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VirtualFileAdaptor21.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -44,6 +44,16 @@
       this.delegate = delegate;
    }
 
+   org.jboss.virtual.VirtualFile getDelegate()
+   {
+      return delegate;
+   }
+
+   public String getName()
+   {
+      return delegate.getName();
+   }
+   
    public URL toURL() throws MalformedURLException, URISyntaxException
    {
       return delegate.toURL();

Modified:
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java
===================================================================
---
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -52,7 +52,18 @@
 
    public VirtualFile adapt(Object virtualFile)
    {
+      if (virtualFile == null)
+         return null;
+      
+      if (virtualFile instanceof org.jboss.vfs.VirtualFile == false)
+         throw new IllegalArgumentException("Not a org.jboss.vfs.VirtualFile: "
+ virtualFile);
+      
       return new VirtualFileAdaptor30((org.jboss.vfs.VirtualFile)virtualFile);
    }
-}
 
+   public Object adapt(VirtualFile virtualFile)
+   {
+      VirtualFileAdaptor30 adaptor = (VirtualFileAdaptor30)virtualFile;
+      return adaptor.getDelegate();
+   }
+}
\ No newline at end of file

Modified:
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java
===================================================================
---
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -44,6 +44,16 @@
       this.delegate = delegate;
    }
 
+   org.jboss.vfs.VirtualFile getDelegate()
+   {
+      return delegate;
+   }
+   
+   public String getName()
+   {
+      return delegate.getName();
+   }
+   
    public URL toURL() throws MalformedURLException, URISyntaxException
    {
       return delegate.toURL();

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2010-03-03 09:12:48 UTC (rev 101761)
+++ projects/jboss-osgi/trunk/pom.xml	2010-03-03 09:20:23 UTC (rev 101762)
@@ -72,7 +72,7 @@
     <version.jboss.osgi.jndi>1.0.3-SNAPSHOT</version.jboss.osgi.jndi>
     <version.jboss.osgi.jta>1.0.1-SNAPSHOT</version.jboss.osgi.jta>
     <version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect>
-   
<version.jboss.osgi.serviceloader>1.0.0</version.jboss.osgi.serviceloader>
+   
<version.jboss.osgi.serviceloader>1.0.1-SNAPSHOT</version.jboss.osgi.serviceloader>
     <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
     <version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing>
    
<version.jboss.osgi.webapp>0.7.2.SP2-SNAPSHOT</version.jboss.osgi.webapp>

Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/ParserInterceptor.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/ParserInterceptor.java	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/ParserInterceptor.java	2010-03-03
09:20:23 UTC (rev 101762)
@@ -30,7 +30,7 @@
 import org.jboss.osgi.deployment.interceptor.AbstractLifecycleInterceptor;
 import org.jboss.osgi.deployment.interceptor.InvocationContext;
 import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorException;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.osgi.vfs.VirtualFile;
 import org.osgi.framework.Bundle;
 
 /**

Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
---
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml	2010-03-03
09:20:23 UTC (rev 101762)
@@ -37,7 +37,8 @@
           org.jboss.osgi.spi.framework;version=1.0,
           org.jboss.osgi.spi.service;version=1.0,
           org.jboss.osgi.spi.util;version=1.0,
-          org.jboss.osgi.testing;version=1.0
+          org.jboss.osgi.testing;version=1.0,
+          org.jboss.osgi.vfs;version=1.0
         </value></entry>
       </map>
     </property>

Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
===================================================================
---
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties	2010-03-03
09:20:23 UTC (rev 101762)
@@ -29,6 +29,7 @@
   	org.jboss.osgi.spi.service;version=1.0, \
   	org.jboss.osgi.spi.util;version=1.0, \
   	org.jboss.osgi.testing;version=1.0, \
+  	org.jboss.osgi.vfs;version=1.0, \
   	org.jboss.virtual;version=2.1, \
   	org.jboss.virtual.plugins.registry;version=2.1, \
   	org.jboss.virtual.plugins.context.jar;version=2.1, \

Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
===================================================================
---
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties	2010-03-03
09:20:23 UTC (rev 101762)
@@ -32,6 +32,7 @@
   	org.jboss.osgi.spi.service;version=1.0, \
   	org.jboss.osgi.spi.util;version=1.0, \
   	org.jboss.osgi.testing;version=1.0, \
+  	org.jboss.osgi.vfs;version=1.0, \
   	org.jboss.virtual;version=2.1, \
   	org.jboss.virtual.plugins.registry;version=2.1, \
   	org.jboss.virtual.plugins.context.jar;version=2.1, \

Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2010-03-03 09:12:48 UTC (rev
101761)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2010-03-03 09:20:23 UTC (rev
101762)
@@ -44,17 +44,6 @@
   <!-- Dependencies -->
   <dependencies>
     <dependency>
-      <groupId>org.jboss.kernel</groupId>
-      <artifactId>jboss-aop-mc-int</artifactId>
-      <version>${version.jboss.aop.mc.int}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-mdr</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>javax.ejb</groupId>
       <artifactId>ejb-api</artifactId>
       <version>${version.javax.ejb}</version>

Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml	2010-03-03
09:20:23 UTC (rev 101762)
@@ -37,7 +37,8 @@
           org.jboss.osgi.spi.framework;version=1.0,
           org.jboss.osgi.spi.service;version=1.0,
           org.jboss.osgi.spi.util;version=1.0,
-          org.jboss.osgi.testing;version=1.0
+          org.jboss.osgi.testing;version=1.0,
+          org.jboss.osgi.vfs;version=1.0
         </value></entry>
       </map>
     </property>

Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties	2010-03-03
09:20:23 UTC (rev 101762)
@@ -26,6 +26,7 @@
   	org.jboss.osgi.spi.service;version=1.0, \
   	org.jboss.osgi.spi.util;version=1.0, \
   	org.jboss.osgi.testing;version=1.0, \
+  	org.jboss.osgi.vfs;version=1.0, \
     org.jboss.virtual;version=2.1, \
   	org.jboss.virtual.plugins.registry;version=2.1, \
   	org.jboss.virtual.plugins.context.jar;version=2.1, \

Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties	2010-03-03
09:12:48 UTC (rev 101761)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties	2010-03-03
09:20:23 UTC (rev 101762)
@@ -29,6 +29,7 @@
   	org.jboss.osgi.spi.service;version=1.0, \
   	org.jboss.osgi.spi.util;version=1.0, \
   	org.jboss.osgi.testing;version=1.0, \
+  	org.jboss.osgi.vfs;version=1.0, \
   	org.jboss.virtual;version=2.1, \
   	org.jboss.virtual.plugins.registry;version=2.1, \
   	org.jboss.virtual.plugins.context.jar;version=2.1, \


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[jboss-osgi-commits] JBoss-OSGI SVN: r101762 - in projects/jboss-osgi: projects/bundles/serviceloader/trunk/src/main/java/org/jboss/osgi/serviceloader/internal and 24 other directories.