Author: thomas.diesler(a)jboss.com Date: 2010-03-04 09:49:38 -0500 (Thu, 04 Mar 2010) New Revision: 101828 Added: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.classpath projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs Removed: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.classpath projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderFactory.java projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/DeploymentAdaptor21.java projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentAttachmentDeployer.java projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/pom.xml Log: Add jboss-osgi-framework-vfs30 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-04 14:28:40 UTC (rev 101827) +++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-04 14:49:38 UTC (rev 101828) @@ -70,6 +70,7 @@ <module>core</module> <module>metadata</module> <module>vfs21</module> + <module>vfs30</module> <module>bundle</module> </modules> Copied: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30 (from rev 101805, projects/jboss-osgi/projects/runtime/framework/trunk/vfs21) Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.classpath =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.classpath 2010-03-04 06:45:53 UTC (rev 101805) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.classpath 2010-03-04 14:49:38 UTC (rev 101828) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Copied: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.classpath (from rev 101806, projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.classpath) =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.classpath (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.classpath 2010-03-04 14:49:38 UTC (rev 101828) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Deleted: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs 2010-03-04 06:45:53 UTC (rev 101805) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs 2010-03-04 14:49:38 UTC (rev 101828) @@ -1,6 +0,0 @@ -#Wed Mar 03 11:00:13 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 Copied: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs (from rev 101806, projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs) =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs 2010-03-04 14:49:38 UTC (rev 101828) @@ -0,0 +1,13 @@ +#Thu Mar 04 15:33:45 CET 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml 2010-03-04 06:45:53 UTC (rev 101805) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml 2010-03-04 14:49:38 UTC (rev 101828) @@ -16,9 +16,9 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi Framework - VFS21</name> + <name>JBossOSGi Framework - VFS30</name> <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework-vfs21</artifactId> + <artifactId>jboss-osgi-framework-vfs30</artifactId> <packaging>jar</packaging> <parent> @@ -29,6 +29,8 @@ <!-- Properties --> <properties> + <version.jboss.classloading>2.2.0.Alpha3</version.jboss.classloading> + <version.jboss.deployers>2.2.0.Alpha3</version.jboss.deployers> </properties> <!-- Dependencies --> @@ -40,7 +42,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi.vfs</groupId> - <artifactId>jboss-osgi-vfs21</artifactId> + <artifactId>jboss-osgi-vfs30</artifactId> <version>${version.jboss.osgi.vfs}</version> </dependency> </dependencies> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java 2010-03-04 06:45:53 UTC (rev 101805) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderDomain.java 2010-03-04 14:49:38 UTC (rev 101828) @@ -24,6 +24,7 @@ // $Id: $ import java.io.IOException; +import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.List; @@ -41,8 +42,8 @@ import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy; import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.plugins.SystemPackagesPlugin; -import org.jboss.virtual.VFS; -import org.jboss.virtual.VirtualFile; +import org.jboss.vfs.VFS; +import org.jboss.vfs.VirtualFile; /** * OSGiClassLoaderDomain.<p> @@ -110,7 +111,17 @@ // Initialize the configured policy roots VirtualFile[] roots = new VirtualFile[classPath.size()]; for (int i = 0; i < classPath.size(); i++) - roots[i] = VFS.createNewRoot(classPath.get(i)); + { + URL url = classPath.get(i); + try + { + roots[i] = VFS.getChild(url); + } + catch (URISyntaxException ex) + { + throw new IllegalStateException("Invalid classpath: " + url); + } + } // Create and register the ClassLoaderPolicy ClassLoaderPolicy systemPolicy = new VFSClassLoaderPolicy("OSGiSystemPolicy", roots); Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderFactory.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderFactory.java 2010-03-04 06:45:53 UTC (rev 101805) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderFactory.java 2010-03-04 14:49:38 UTC (rev 101828) @@ -34,7 +34,7 @@ import org.jboss.deployers.vfs.plugins.classloader.VFSDeploymentClassLoaderPolicyModule; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.osgi.framework.bundle.AbstractBundleState; -import org.jboss.virtual.VirtualFile; +import org.jboss.vfs.VirtualFile; /** * OSGiClassLoaderFactory Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java 2010-03-04 06:45:53 UTC (rev 101805) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/classloading/OSGiClassLoaderPolicy.java 2010-03-04 14:49:38 UTC (rev 101828) @@ -46,8 +46,8 @@ import org.jboss.osgi.framework.metadata.NativeLibraryMetaData; import org.jboss.osgi.framework.plugins.BundleStoragePlugin; import org.jboss.osgi.vfs.AbstractVFS; -import org.jboss.virtual.VFSUtils; -import org.jboss.virtual.VirtualFile; +import org.jboss.vfs.VFSUtils; +import org.jboss.vfs.VirtualFile; /** * The ClassLoaderPolicy for OSGi bundles. Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/DeploymentAdaptor21.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/deployers/DeploymentAdaptor21.java 2010-03-04 06:45:53 UTC (rev 101805) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/DeploymentAdaptor21.java 2010-03-04 14:49:38 UTC (rev 101828) @@ -41,7 +41,7 @@ public Deployment createDeployment(VirtualFile root) { VFSDeploymentFactory factory = VFSDeploymentFactory.getInstance(); - return factory.createVFSDeployment((org.jboss.virtual.VirtualFile)AbstractVFS.adapt(root)); + return factory.createVFSDeployment((org.jboss.vfs.VirtualFile)AbstractVFS.adapt(root)); } public VirtualFile getRoot(DeploymentUnit unit) Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentAttachmentDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentAttachmentDeployer.java 2010-03-04 06:45:53 UTC (rev 101805) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/OSGiFragmentAttachmentDeployer.java 2010-03-04 14:49:38 UTC (rev 101828) @@ -35,7 +35,7 @@ import org.jboss.osgi.framework.bundle.OSGiFragmentState; import org.jboss.osgi.framework.classloading.OSGiClassLoaderPolicy; import org.jboss.osgi.vfs.AbstractVFS; -import org.jboss.virtual.VirtualFile; +import org.jboss.vfs.VirtualFile; import org.osgi.framework.Bundle; /** Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java 2010-03-04 06:45:53 UTC (rev 101805) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java 2010-03-04 14:49:38 UTC (rev 101828) @@ -29,7 +29,7 @@ import org.jboss.osgi.framework.metadata.internal.AbstractOSGiMetaData; import org.jboss.osgi.spi.OSGiConstants; import org.jboss.osgi.spi.util.BundleInfo; -import org.jboss.virtual.VirtualFile; +import org.jboss.vfs.VirtualFile; /** * OSGiManifestParsingDeployer.<p> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-04 14:28:40 UTC (rev 101827) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-04 14:49:38 UTC (rev 101828) @@ -485,8 +485,15 @@ <include name="jboss-osgi-framework.jar" /> <include name="jboss-osgi-framework-core.jar" /> <include name="jboss-osgi-framework-metadata.jar" /> + </fileset> + <fileset condition="isJBossMC && !isJBoss601" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" + override="true"> <include name="jboss-osgi-framework-vfs21.jar" /> </fileset> + <fileset condition="isJBossMC && isJBoss601" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" + override="true"> + <include name="jboss-osgi-framework-vfs30.jar" /> + </fileset> <singlefile condition="isJBossMC" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas/jboss-beans-jbossmc.xml&quot; target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true" /> <fileset condition="isJBossMC" dir=&quot;(a){deploy.artifacts.dir}/lib/org.osgi&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" Modified: projects/jboss-osgi/trunk/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-04 14:28:40 UTC (rev 101827) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-04 14:49:38 UTC (rev 101828) @@ -496,6 +496,11 @@ </dependency> <dependency> <groupId>org.jboss.osgi.framework</groupId> + <artifactId>jboss-osgi-framework-vfs30</artifactId> + <version>${version.jboss.osgi.framework}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.framework</groupId> <artifactId>jboss-osgi-framework</artifactId> <version>${version.jboss.osgi.framework}</version> <classifier>sources</classifier>