[JBOSGI-328] Merge framework vfs30 support with core

jbosgi · May 13, 2010 · fe8f24a · fe8f24a
1 parent 8334e98
commit fe8f24a
Show file tree

Hide file tree

Showing 32 changed files with 18 additions and 1,145 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -50,6 +50,18 @@
       <groupId>org.jboss.osgi.deployment</groupId>
       <artifactId>jboss-osgi-deployment</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi.deployers</groupId>
+      <artifactId>jboss-osgi-deployers-vfs30</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi.vfs</groupId>
+      <artifactId>jboss-osgi-vfs30</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-vfs</artifactId>
+    </dependency>
 
     <!-- OSGi Dependencies -->
     <dependency>

diff --git a/...k/classloading/OSGiBundleClassLoader.java → ...k/classloading/OSGiBundleClassLoader.java b/...k/classloading/OSGiBundleClassLoader.java → ...k/classloading/OSGiBundleClassLoader.java
diff --git a/...k/classloading/OSGiClassLoaderDomain.java → ...k/classloading/OSGiClassLoaderDomain.java b/...k/classloading/OSGiClassLoaderDomain.java → ...k/classloading/OSGiClassLoaderDomain.java
diff --git a/.../classloading/OSGiClassLoaderFactory.java → .../classloading/OSGiClassLoaderFactory.java b/.../classloading/OSGiClassLoaderFactory.java → .../classloading/OSGiClassLoaderFactory.java
diff --git a/...k/classloading/OSGiClassLoaderPolicy.java → ...k/classloading/OSGiClassLoaderPolicy.java b/...k/classloading/OSGiClassLoaderPolicy.java → ...k/classloading/OSGiClassLoaderPolicy.java
diff --git a/...k/classloading/OSGiClassLoaderSystem.java → ...k/classloading/OSGiClassLoaderSystem.java b/...k/classloading/OSGiClassLoaderSystem.java → ...k/classloading/OSGiClassLoaderSystem.java
diff --git a/...mework/deployers/DeploymentAdaptor30.java → ...mework/deployers/DeploymentAdaptor30.java b/...mework/deployers/DeploymentAdaptor30.java → ...mework/deployers/DeploymentAdaptor30.java
diff --git a/...oyers/OSGiDeploymentMetaDataDeployer.java → ...oyers/OSGiDeploymentMetaDataDeployer.java b/...oyers/OSGiDeploymentMetaDataDeployer.java → ...oyers/OSGiDeploymentMetaDataDeployer.java
diff --git a/...oyers/OSGiFragmentAttachmentDeployer.java → ...oyers/OSGiFragmentAttachmentDeployer.java b/...oyers/OSGiFragmentAttachmentDeployer.java → ...oyers/OSGiFragmentAttachmentDeployer.java
diff --git a/...eployers/OSGiManifestParsingDeployer.java → ...eployers/OSGiManifestParsingDeployer.java b/...eployers/OSGiManifestParsingDeployer.java → ...eployers/OSGiManifestParsingDeployer.java
diff --git a/pom.xml b/pom.xml
@@ -45,8 +45,6 @@
   <modules>
     <module>core</module>
     <module>metadata</module>
-    <module>vfs21</module>
-    <module>vfs30</module>
     <module>bundle</module>
   </modules>
 
@@ -77,6 +75,7 @@
     <version.jboss.osgi.vfs>1.0.0</version.jboss.osgi.vfs>
     <version.jboss.osgi.xml.binding>2.0.2.Beta4.SP2-SNAPSHOT</version.jboss.osgi.xml.binding>
     <version.jboss.test>1.1.4.GA</version.jboss.test>
+    <version.jboss.vfs>3.0.0.CR5</version.jboss.vfs>
     <version.mockito>1.8.4</version.mockito>
     <version.osgi>4.2.0</version.osgi>
   </properties>
@@ -124,6 +123,11 @@
         <artifactId>jboss-jmx-mc-int</artifactId>
         <version>${version.jboss.kernel}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-vfs</artifactId>
+        <version>${version.jboss.vfs}</version>
+      </dependency>
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-mdr</artifactId>

diff --git a/vfs21/.classpath b/vfs21/.classpath
diff --git a/vfs21/.gitignore b/vfs21/.gitignore
diff --git a/vfs21/.project b/vfs21/.project
diff --git a/vfs21/.settings/org.eclipse.jdt.core.prefs b/vfs21/.settings/org.eclipse.jdt.core.prefs
diff --git a/vfs21/.settings/org.maven.ide.eclipse.prefs b/vfs21/.settings/org.maven.ide.eclipse.prefs
diff --git a/vfs21/pom.xml b/vfs21/pom.xml
diff --git a/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java b/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleClassLoader.java
diff --git a/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderFactory.java b/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderFactory.java