March 2010 - jboss-osgi-commits - Jboss List Archives

JBoss-OSGI SVN: r101886 - in projects/jboss-osgi/projects/runtime/framework/trunk: vfs30/src/main/java/org/jboss/osgi/framework/deployers and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-03-04 14:45:53 -0500 (Thu, 04 Mar 2010) New Revision: 101886 Added: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/DeploymentAdaptor30.java Removed: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/DeploymentAdaptor21.java Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/AbstractDeployment.java Log: Fall back to DeploymentAdaptor30 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/AbstractDeployment.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/AbstractDeployment.java 2010-03-04 19:40:30 UTC (rev 101885) +++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/deployers/AbstractDeployment.java 2010-03-04 19:45:53 UTC (rev 101886) @@ -61,8 +61,26 @@ } catch (Exception e) { + // ignore + } + + if (adaptor == null) + { + try + { + String classname = "org.jboss.osgi.framework.deployers.DeploymentAdaptor30"; + ClassLoader classLoader = AbstractDeployment.class.getClassLoader(); + Class<DeploymentAdaptor> clazz = (Class<DeploymentAdaptor>)classLoader.loadClass(classname); + adaptor = clazz.newInstance(); + } + catch (Exception e) + { + // ignore + } + } + + if (adaptor == null) throw new IllegalStateException("Cannot load DeploymentAdaptor"); - } } return adaptor; } Deleted: 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/DeploymentAdaptor21.java 2010-03-04 19:40:30 UTC (rev 101885) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/DeploymentAdaptor21.java 2010-03-04 19:45:53 UTC (rev 101886) @@ -1,52 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2009, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.osgi.framework.deployers; - -// $Id: AbstractOSGiClassLoadingDeployer.java 101391 2010-02-24 12:58:50Z thomas.diesler(a)jboss.com $ - -import org.jboss.deployers.client.spi.Deployment; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory; -import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; -import org.jboss.osgi.vfs.AbstractVFS; -import org.jboss.osgi.vfs.VirtualFile; - -/** - * An abstraction of the VFSDeploymentFactory for jboss-vfs-2.1.x - * - * @author Thomas.Diesler(a)jboss.com - * @since 03-Mar-2010 - */ -public class DeploymentAdaptor21 implements DeploymentAdaptor -{ - public Deployment createDeployment(VirtualFile root) - { - VFSDeploymentFactory factory = VFSDeploymentFactory.getInstance(); - return factory.createVFSDeployment((org.jboss.vfs.VirtualFile)AbstractVFS.adapt(root)); - } - - public VirtualFile getRoot(DeploymentUnit unit) - { - VFSDeploymentUnit vfsUnit = (VFSDeploymentUnit)unit; - return AbstractVFS.adapt(vfsUnit.getRoot()); - } -} Copied: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/DeploymentAdaptor30.java (from rev 101875, 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/DeploymentAdaptor30.java (rev 0) +++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/src/main/java/org/jboss/osgi/framework/deployers/DeploymentAdaptor30.java 2010-03-04 19:45:53 UTC (rev 101886) @@ -0,0 +1,52 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file in the +* distribution for a full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.osgi.framework.deployers; + +// $Id: AbstractOSGiClassLoadingDeployer.java 101391 2010-02-24 12:58:50Z thomas.diesler(a)jboss.com $ + +import org.jboss.deployers.client.spi.Deployment; +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory; +import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; +import org.jboss.osgi.vfs.AbstractVFS; +import org.jboss.osgi.vfs.VirtualFile; + +/** + * An abstraction of the VFSDeploymentFactory for jboss-vfs-3.0.x + * + * @author Thomas.Diesler(a)jboss.com + * @since 03-Mar-2010 + */ +public class DeploymentAdaptor30 implements DeploymentAdaptor +{ + public Deployment createDeployment(VirtualFile root) + { + VFSDeploymentFactory factory = VFSDeploymentFactory.getInstance(); + return factory.createVFSDeployment((org.jboss.vfs.VirtualFile)AbstractVFS.adapt(root)); + } + + public VirtualFile getRoot(DeploymentUnit unit) + { + VFSDeploymentUnit vfsUnit = (VFSDeploymentUnit)unit; + return AbstractVFS.adapt(vfsUnit.getRoot()); + } +}

14 years, 4 months

1
0
0 / 0

JBoss-OSGI SVN: r101884 - in projects/jboss-osgi/trunk/testsuite: functional and 3 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-03-04 14:36:00 -0500 (Thu, 04 Mar 2010) New Revision: 101884 Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java projects/jboss-osgi/trunk/testsuite/pom.xml Log: Use vfs21 for functional felix/equinox tests Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-03-04 19:26:16 UTC (rev 101883) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-03-04 19:36:00 UTC (rev 101884) @@ -346,7 +346,7 @@ </plugins> </build> </profile> - + </profiles> </project> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-03-04 19:26:16 UTC (rev 101883) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-03-04 19:36:00 UTC (rev 101884) @@ -63,7 +63,7 @@ } @After - public void tearDown() + public void tearDown() throws Exception { if (runtime != null) { Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java 2010-03-04 19:26:16 UTC (rev 101883) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi108/OSGi108TestCase.java 2010-03-04 19:36:00 UTC (rev 101884) @@ -40,7 +40,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.osgi.framework.BundleException; /** * [JBOSGI-108] Investigate statics on PackageAdmin.refresh @@ -63,7 +62,7 @@ } @AfterClass - public static void afterClass() throws BundleException + public static void afterClass() throws Exception { if (runtime != null) { Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java 2010-03-04 19:26:16 UTC (rev 101883) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi39/OSGi39TestCase.java 2010-03-04 19:36:00 UTC (rev 101884) @@ -65,7 +65,7 @@ } @After - public void tearDown() + public void tearDown() throws Exception { runtime.shutdown(); } Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-04 19:26:16 UTC (rev 101883) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-04 19:36:00 UTC (rev 101884) @@ -285,7 +285,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi.vfs</groupId> - <artifactId>jboss-osgi-vfs30</artifactId> + <artifactId>jboss-osgi-vfs21</artifactId> </dependency> </dependencies> </profile> @@ -312,7 +312,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi.vfs</groupId> - <artifactId>jboss-osgi-vfs30</artifactId> + <artifactId>jboss-osgi-vfs21</artifactId> </dependency> </dependencies> </profile>

14 years, 4 months

1
0
0 / 0

JBoss-OSGI SVN: r101876 - in projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi: fragments and 3 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-03-04 12:54:25 -0500 (Thu, 04 Mar 2010) New Revision: 101876 Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGi142TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGi143TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi284/OSGi284TestCase.java Log: Align runtime.shutdown(2000) Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2010-03-04 17:27:33 UTC (rev 101875) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2010-03-04 17:54:25 UTC (rev 101876) @@ -46,10 +46,18 @@ { OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider(); Framework framework = bootProvider.getFramework(); - assertNotNull("Framework not null", framework); + try + { + assertNotNull("Framework not null", framework); - assertEquals("BundleId == 0", 0, framework.getBundleId()); - assertNotNull("SymbolicName not null", framework.getSymbolicName()); + assertEquals("BundleId == 0", 0, framework.getBundleId()); + assertNotNull("SymbolicName not null", framework.getSymbolicName()); + } + finally + { + framework.stop(); + framework.waitForStop(2000); + } } @Test Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-03-04 17:27:33 UTC (rev 101875) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-03-04 17:54:25 UTC (rev 101876) @@ -66,7 +66,10 @@ public void tearDown() { if (runtime != null) + { runtime.shutdown(); + runtime = null; + } } @Test Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGi142TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGi142TestCase.java 2010-03-04 17:27:33 UTC (rev 101875) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi142/OSGi142TestCase.java 2010-03-04 17:54:25 UTC (rev 101876) @@ -88,7 +88,7 @@ finally { framework.stop(); - framework.waitForStop(1000); + framework.waitForStop(2000); } } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGi143TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGi143TestCase.java 2010-03-04 17:27:33 UTC (rev 101875) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGi143TestCase.java 2010-03-04 17:54:25 UTC (rev 101876) @@ -56,10 +56,10 @@ { OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider(); Framework framework = bootProvider.getFramework(); - framework.start(); - try { + framework.start(); + BundleContext sysContext = framework.getBundleContext(); Bundle bundleX = sysContext.installBundle(getTestArchiveURL("jbosgi143-bundleX.jar").toExternalForm()); bundleX.start(); @@ -77,7 +77,7 @@ finally { framework.stop(); - framework.waitForStop(1000); + framework.waitForStop(2000); } } Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi284/OSGi284TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi284/OSGi284TestCase.java 2010-03-04 17:27:33 UTC (rev 101875) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi284/OSGi284TestCase.java 2010-03-04 17:54:25 UTC (rev 101876) @@ -92,7 +92,7 @@ finally { framework.stop(); - framework.waitForStop(5000); + framework.waitForStop(2000); } } @@ -121,7 +121,7 @@ finally { framework.stop(); - framework.waitForStop(5000); + framework.waitForStop(2000); } } } \ No newline at end of file

14 years, 4 months

1
0
0 / 0

JBoss-OSGI SVN: r101829 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-03-04 09:53:27 -0500 (Thu, 04 Mar 2010) New Revision: 101829 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml Log: Conditionally install jboss-osgi-framework-vfs30 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:49:38 UTC (rev 101828) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-04 14:53:27 UTC (rev 101829) @@ -486,11 +486,11 @@ <include name="jboss-osgi-framework-core.jar" /> <include name="jboss-osgi-framework-metadata.jar" /> </fileset> - <fileset condition="isJBossMC && !isJBoss601" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" + <fileset condition="isJBossMC+!isJBoss601" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> <include name="jboss-osgi-framework-vfs21.jar" /> </fileset> - <fileset condition="isJBossMC && isJBoss601" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" + <fileset condition="isJBossMC+isJBoss601" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> <include name="jboss-osgi-framework-vfs30.jar" /> </fileset>

14 years, 4 months

1
0
0 / 0

JBoss-OSGI SVN: r101828 - in projects/jboss-osgi: projects/runtime/framework/trunk/vfs30 and 5 other directories.

by jboss-osgi-commits＠lists.jboss.org

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> + <version.jboss.classloading>2.2.0.Alpha3</version.jboss.classloading> + <version.jboss.deployers>2.2.0.Alpha3</version.jboss.deployers> </properties>  @@ -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="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" + override="true"> <include name="jboss-osgi-framework-vfs21.jar" /> </fileset> + <fileset condition="isJBossMC && isJBoss601" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" + override="true"> + <include name="jboss-osgi-framework-vfs30.jar" /> + </fileset> <singlefile condition="isJBossMC" src="@{deploy.artifacts.dir}/resources/jbossas/jboss-beans-jbossmc.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true" /> <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" 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>

14 years, 4 months

1
0
0 / 0

JBoss-OSGI SVN: r101826 - projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-03-04 09:16:11 -0500 (Thu, 04 Mar 2010) New Revision: 101826 Modified: projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java Log: Use AbstractVFSArchiveStructureDeployer Modified: projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2010-03-04 14:14:50 UTC (rev 101825) +++ projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2010-03-04 14:16:11 UTC (rev 101826) @@ -28,7 +28,7 @@ import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.structure.ContextInfo; -import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer; +import org.jboss.deployers.vfs.plugins.structure.AbstractVFSArchiveStructureDeployer; import org.jboss.deployers.vfs.spi.structure.StructureContext; import org.jboss.vfs.VFSUtils; import org.jboss.vfs.VirtualFile; @@ -40,7 +40,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 16-Apr-2009 */ -public class BundleStructureDeployer extends AbstractVFSStructureDeployer +public class BundleStructureDeployer extends AbstractVFSArchiveStructureDeployer { /** * Sets the default relative order. @@ -52,18 +52,19 @@ setRelativeOrder(500); } - /** - * Determine the structure of a bundle deployment - * - * @param context the structure context - * @return true when it recognised the context - * @throws DeploymentException for an error - */ - public boolean determineStructure(StructureContext structureContext) throws DeploymentException + @Override + protected boolean hasValidSuffix(String name) { + // We only accept bundles packaged as "*.jar" + return name.endsWith(".jar"); + } + + @Override + protected boolean doDetermineStructure(StructureContext structureContext) throws DeploymentException + { ContextInfo context = null; VirtualFile root = structureContext.getRoot(); - + try { // This file is not for me, because I'm only interested

14 years, 4 months

1
0
0 / 0

JBoss-OSGI SVN: r101825 - in projects/jboss-osgi/trunk: distribution and 2 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-03-04 09:14:50 -0500 (Thu, 04 Mar 2010) New Revision: 101825 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml projects/jboss-osgi/trunk/distribution/pom.xml projects/jboss-osgi/trunk/pom.xml Log: Use jboss-osgi-deployers-vfs 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:00:40 UTC (rev 101824) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-04 14:14:50 UTC (rev 101825) @@ -138,7 +138,6 @@ <include name="jboss-osgi-common-core-sources.jar" /> <include name="jboss-osgi-common-sources.jar" /> <include name="jboss-osgi-deployment-sources.jar" /> - <include name="jboss-osgi-deployers-sources.jar" /> <include name="jboss-osgi-framework-sources.jar" /> <include name="jboss-osgi-framework-core-sources.jar" /> <include name="jboss-osgi-framework-metadata-sources.jar" /> @@ -345,7 +344,7 @@ <include name="jboss-managed.jar" /> <include name="jboss-mdr.jar" /> <include name="jboss-metatype.jar" /> - <include name="jboss-osgi-deployers.jar" /> + <include name="jboss-osgi-deployers-vfs21.jar" /> <include name="jboss-osgi-framework.jar" /> <include name="jboss-osgi-framework-core.jar" /> <include name="jboss-osgi-framework-metadata.jar" /> @@ -405,7 +404,6 @@  <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> - <include name="jboss-osgi-deployers.jar" /> <include name="jboss-osgi-deployment.jar" /> <include name="jboss-osgi-jbossas.jar" /> <include name="jboss-osgi-spi.jar" /> @@ -413,9 +411,11 @@ <include name="jboss-osgi-vfs.jar" /> </fileset> <fileset condition="!isJBoss601" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> + <include name="jboss-osgi-deployers-vfs21.jar" /> <include name="jboss-osgi-vfs21.jar" /> </fileset> <fileset condition="isJBoss601" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> + <include name="jboss-osgi-deployers-vfs30.jar" /> <include name="jboss-osgi-vfs30.jar" /> </fileset> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-03-04 14:00:40 UTC (rev 101824) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-03-04 14:14:50 UTC (rev 101825) @@ -104,26 +104,20 @@ ******************************** --> -  - <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> - -  - <bean name="jboss.osgi:service=BundleStructureDeployer" class="org.jboss.osgi.deployer.BundleStructureDeployer" /> - -  - <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> + <bean name="BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> + </bean> + <bean name="BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> + <bean name="BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property> </bean> - -  - <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> + <bean name="BundleStartLevelDeployer" class="org.jboss.osgi.deployer.BundleStartLevelDeployer"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> </bean> - -  - <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> + <bean name="BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> </bean> + <bean name="BundleStructureDeployer" class="org.jboss.osgi.deployer.BundleStructureDeployer" /> </deployment> \ No newline at end of file Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-03-04 14:00:40 UTC (rev 101824) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-03-04 14:14:50 UTC (rev 101825) @@ -104,26 +104,20 @@ ******************************** --> -  - <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> - -  - <bean name="jboss.osgi:service=BundleStructureDeployer" class="org.jboss.osgi.deployer.BundleStructureDeployer" /> - -  - <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> + <bean name="BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> + </bean> + <bean name="BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> + <bean name="BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property> </bean> - -  - <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> + <bean name="BundleStartLevelDeployer" class="org.jboss.osgi.deployer.BundleStartLevelDeployer"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> </bean> - -  - <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> + <bean name="BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> </bean> + <bean name="BundleStructureDeployer" class="org.jboss.osgi.deployer.BundleStructureDeployer" /> </deployment> \ No newline at end of file Modified: projects/jboss-osgi/trunk/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-04 14:00:40 UTC (rev 101824) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-04 14:14:50 UTC (rev 101825) @@ -88,6 +88,68 @@ <classifier>javadoc</classifier> </dependency> <dependency> + <groupId>org.jboss.osgi.deployers</groupId> + <artifactId>jboss-osgi-deployers-vfs21</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.osgi.deployers</groupId> + <artifactId>jboss-osgi-deployers-vfs30</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jmx</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jmx</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + <version>${version.jboss.osgi.jmx}</version> + <classifier>sources</classifier> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jmx</groupId> + <artifactId>jboss-osgi-jmx-api</artifactId> + <version>${version.jboss.osgi.jmx}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jmx</groupId> + <artifactId>jboss-osgi-jmx-api</artifactId> + <version>${version.jboss.osgi.jmx}</version> + <classifier>sources</classifier> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jmx</groupId> + <artifactId>jboss-osgi-jmx-api</artifactId> + <version>${version.jboss.osgi.jmx}</version> + <classifier>javadoc</classifier> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jndi</groupId> + <artifactId>jboss-osgi-jndi</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jndi</groupId> + <artifactId>jboss-osgi-jndi</artifactId> + <version>${version.jboss.osgi.jndi}</version> + <classifier>sources</classifier> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jndi</groupId> + <artifactId>jboss-osgi-jndi-api</artifactId> + <version>${version.jboss.osgi.jndi}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jndi</groupId> + <artifactId>jboss-osgi-jndi-api</artifactId> + <version>${version.jboss.osgi.jndi}</version> + <classifier>sources</classifier> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jndi</groupId> + <artifactId>jboss-osgi-jndi-api</artifactId> + <version>${version.jboss.osgi.jndi}</version> + <classifier>javadoc</classifier> + </dependency> + <dependency> <groupId>org.jboss.osgi.vfs</groupId> <artifactId>jboss-osgi-vfs</artifactId> </dependency> @@ -234,60 +296,6 @@ <classifier>javadoc</classifier> </dependency> <dependency> - <groupId>org.jboss.osgi.jmx</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi.jmx</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - <version>${version.jboss.osgi.jmx}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi.jmx</groupId> - <artifactId>jboss-osgi-jmx-api</artifactId> - <version>${version.jboss.osgi.jmx}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.jmx</groupId> - <artifactId>jboss-osgi-jmx-api</artifactId> - <version>${version.jboss.osgi.jmx}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi.jmx</groupId> - <artifactId>jboss-osgi-jmx-api</artifactId> - <version>${version.jboss.osgi.jmx}</version> - <classifier>javadoc</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi.jndi</groupId> - <artifactId>jboss-osgi-jndi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi.jndi</groupId> - <artifactId>jboss-osgi-jndi</artifactId> - <version>${version.jboss.osgi.jndi}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi.jndi</groupId> - <artifactId>jboss-osgi-jndi-api</artifactId> - <version>${version.jboss.osgi.jndi}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.jndi</groupId> - <artifactId>jboss-osgi-jndi-api</artifactId> - <version>${version.jboss.osgi.jndi}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi.jndi</groupId> - <artifactId>jboss-osgi-jndi-api</artifactId> - <version>${version.jboss.osgi.jndi}</version> - <classifier>javadoc</classifier> - </dependency> - <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-jta</artifactId> </dependency> @@ -382,16 +390,6 @@  <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-deployers</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-deployers</artifactId> - <version>${version.jboss.osgi.deployers}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-deployment</artifactId> </dependency> <dependency> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2010-03-04 14:00:40 UTC (rev 101824) +++ projects/jboss-osgi/trunk/pom.xml 2010-03-04 14:14:50 UTC (rev 101825) @@ -132,6 +132,26 @@ <version>${version.jboss.osgi.testing}</version> </dependency> <dependency> + <groupId>org.jboss.osgi.deployers</groupId> + <artifactId>jboss-osgi-deployers-vfs21</artifactId> + <version>${version.jboss.osgi.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.deployers</groupId> + <artifactId>jboss-osgi-deployers-vfs30</artifactId> + <version>${version.jboss.osgi.deployers}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jmx</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + <version>${version.jboss.osgi.jmx}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.jndi</groupId> + <artifactId>jboss-osgi-jndi</artifactId> + <version>${version.jboss.osgi.jndi}</version> + </dependency> + <dependency> <groupId>org.jboss.osgi.vfs</groupId> <artifactId>jboss-osgi-vfs</artifactId> <version>${version.jboss.osgi.vfs}</version> @@ -184,16 +204,6 @@ <version>${version.jboss.osgi.jaxb}</version> </dependency> <dependency> - <groupId>org.jboss.osgi.jmx</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - <version>${version.jboss.osgi.jmx}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.jndi</groupId> - <artifactId>jboss-osgi-jndi</artifactId> - <version>${version.jboss.osgi.jndi}</version> - </dependency> - <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-jta</artifactId> <version>${version.jboss.osgi.jta}</version> @@ -227,11 +237,6 @@  <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-deployers</artifactId> - <version>${version.jboss.osgi.deployers}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-deployment</artifactId> <version>${version.jboss.osgi.deployment}</version> </dependency>

14 years, 4 months

1
0
0 / 0

JBoss-OSGI SVN: r101819 - in projects/jboss-osgi/projects/deployers/trunk: vfs30/.settings and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-03-04 07:46:14 -0500 (Thu, 04 Mar 2010) New Revision: 101819 Modified: projects/jboss-osgi/projects/deployers/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/deployers/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs Log: Update eclipse build to jdk1.6 Modified: projects/jboss-osgi/projects/deployers/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs 2010-03-04 12:45:19 UTC (rev 101818) +++ projects/jboss-osgi/projects/deployers/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs 2010-03-04 12:46:14 UTC (rev 101819) @@ -1,6 +1,13 @@ -#Thu Mar 04 12:54:44 CET 2010 +#Thu Mar 04 13:45:30 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.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.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: projects/jboss-osgi/projects/deployers/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs 2010-03-04 12:45:19 UTC (rev 101818) +++ projects/jboss-osgi/projects/deployers/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs 2010-03-04 12:46:14 UTC (rev 101819) @@ -1,13 +1,13 @@ -#Thu Mar 04 13:06:53 CET 2010 +#Thu Mar 04 13:45:44 CET 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +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.5 +org.eclipse.jdt.core.compiler.source=1.6

14 years, 4 months

1
0
0 / 0

JBoss-OSGI SVN: r101817 - in projects/jboss-osgi/projects/deployers/trunk: vfs21/.settings and 2 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-03-04 07:27:54 -0500 (Thu, 04 Mar 2010) New Revision: 101817 Added: projects/jboss-osgi/projects/deployers/trunk/vfs21/.classpath projects/jboss-osgi/projects/deployers/trunk/vfs21/.project projects/jboss-osgi/projects/deployers/trunk/vfs21/.settings/ projects/jboss-osgi/projects/deployers/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/deployers/trunk/vfs21/.settings/org.maven.ide.eclipse.prefs projects/jboss-osgi/projects/deployers/trunk/vfs30/.classpath projects/jboss-osgi/projects/deployers/trunk/vfs30/.project projects/jboss-osgi/projects/deployers/trunk/vfs30/.settings/ projects/jboss-osgi/projects/deployers/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/projects/deployers/trunk/vfs30/.settings/org.maven.ide.eclipse.prefs Log: Add deployers vfs abstraction Added: projects/jboss-osgi/projects/deployers/trunk/vfs21/.classpath =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs21/.classpath (rev 0) +++ projects/jboss-osgi/projects/deployers/trunk/vfs21/.classpath 2010-03-04 12:27:54 UTC (rev 101817) @@ -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> Added: projects/jboss-osgi/projects/deployers/trunk/vfs21/.project =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs21/.project (rev 0) +++ projects/jboss-osgi/projects/deployers/trunk/vfs21/.project 2010-03-04 12:27:54 UTC (rev 101817) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jboss-osgi-deployers-vfs21</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Added: projects/jboss-osgi/projects/deployers/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ projects/jboss-osgi/projects/deployers/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs 2010-03-04 12:27:54 UTC (rev 101817) @@ -0,0 +1,6 @@ +#Thu Mar 04 12:54:44 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 Added: projects/jboss-osgi/projects/deployers/trunk/vfs21/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs21/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/projects/deployers/trunk/vfs21/.settings/org.maven.ide.eclipse.prefs 2010-03-04 12:27:54 UTC (rev 101817) @@ -0,0 +1,9 @@ +#Thu Mar 04 12:54:42 CET 2010 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Added: projects/jboss-osgi/projects/deployers/trunk/vfs30/.classpath =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs30/.classpath (rev 0) +++ projects/jboss-osgi/projects/deployers/trunk/vfs30/.classpath 2010-03-04 12:27:54 UTC (rev 101817) @@ -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> Added: projects/jboss-osgi/projects/deployers/trunk/vfs30/.project =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs30/.project (rev 0) +++ projects/jboss-osgi/projects/deployers/trunk/vfs30/.project 2010-03-04 12:27:54 UTC (rev 101817) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jboss-osgi-deployers-vfs30</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Added: projects/jboss-osgi/projects/deployers/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ projects/jboss-osgi/projects/deployers/trunk/vfs30/.settings/org.eclipse.jdt.core.prefs 2010-03-04 12:27:54 UTC (rev 101817) @@ -0,0 +1,13 @@ +#Thu Mar 04 13:06:53 CET 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +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.5 Added: projects/jboss-osgi/projects/deployers/trunk/vfs30/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs30/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/projects/deployers/trunk/vfs30/.settings/org.maven.ide.eclipse.prefs 2010-03-04 12:27:54 UTC (rev 101817) @@ -0,0 +1,9 @@ +#Thu Mar 04 12:54:42 CET 2010 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1

14 years, 4 months

1
0
0 / 0

JBoss-OSGI SVN: r101816 - in projects/jboss-osgi/projects: deployers and 4 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2010-03-04 07:26:58 -0500 (Thu, 04 Mar 2010) New Revision: 101816 Added: projects/jboss-osgi/projects/deployers/ projects/jboss-osgi/projects/deployers/trunk/ projects/jboss-osgi/projects/deployers/trunk/vfs21/ projects/jboss-osgi/projects/deployers/trunk/vfs21/pom.xml projects/jboss-osgi/projects/deployers/trunk/vfs21/src/ projects/jboss-osgi/projects/deployers/trunk/vfs30/ projects/jboss-osgi/projects/deployers/trunk/vfs30/pom.xml projects/jboss-osgi/projects/deployers/trunk/vfs30/src/ Removed: projects/jboss-osgi/projects/deployers/trunk/src/ Modified: projects/jboss-osgi/projects/deployers/trunk/.project projects/jboss-osgi/projects/deployers/trunk/pom.xml projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java Log: Add deployers vfs abstraction Copied: projects/jboss-osgi/projects/deployers/trunk (from rev 101810, projects/jboss-osgi/projects/runtime/deployers/trunk) Modified: projects/jboss-osgi/projects/deployers/trunk/.project =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/.project 2010-03-04 10:26:57 UTC (rev 101810) +++ projects/jboss-osgi/projects/deployers/trunk/.project 2010-03-04 12:26:58 UTC (rev 101816) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss-osgi-runtime-deployer</name> + <name>jboss-osgi-deployers</name> <comment></comment> <projects> </projects> Modified: projects/jboss-osgi/projects/deployers/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml 2010-03-04 10:26:57 UTC (rev 101810) +++ projects/jboss-osgi/projects/deployers/trunk/pom.xml 2010-03-04 12:26:58 UTC (rev 101816) @@ -14,11 +14,11 @@ <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 Runtime - Deployers</name> + <name>JBossOSGi Deployers</name> - <groupId>org.jboss.osgi.runtime</groupId> + <groupId>org.jboss.osgi.deployers</groupId> <artifactId>jboss-osgi-deployers</artifactId> - <packaging>jar</packaging> + <packaging>pom</packaging> <version>1.0.5-SNAPSHOT</version> @@ -26,17 +26,24 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.4</version> + <version>1.0.5-SNAPSHOT</version> </parent> +  <properties> - <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers> <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> +  + <modules> + <module>vfs21</module> + <module>vfs30</module> + </modules> +  + <dependencyManagement> <dependencies> <dependency> <groupId>org.jboss.osgi</groupId> @@ -59,21 +66,20 @@ <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> <version>${version.osgi}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> <version>${version.osgi}</version> - <scope>provided</scope> </dependency> </dependencies> + </dependencyManagement>  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> - <url>http://fisheye.jboss.com/qsearch/JBossOSGi/projects/runtime/deployers/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> + <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> </scm> - + </project> Property changes on: projects/jboss-osgi/projects/deployers/trunk/vfs21 ___________________________________________________________________ Name: svn:ignore + target Copied: projects/jboss-osgi/projects/deployers/trunk/vfs21/pom.xml (from rev 101810, projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml) =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs21/pom.xml (rev 0) +++ projects/jboss-osgi/projects/deployers/trunk/vfs21/pom.xml 2010-03-04 12:26:58 UTC (rev 101816) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + +  +  +  +  +  +  +  +  + +  + +<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 Deployers - VFS21</name> + + <groupId>org.jboss.osgi.deployers</groupId> + <artifactId>jboss-osgi-deployers-vfs21</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jboss.osgi.deployers</groupId> + <artifactId>jboss-osgi-deployers</artifactId> + <version>1.0.5-SNAPSHOT</version> + </parent> + + <properties> + <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers> + </properties> + +  + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployment</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + +  + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + +</project> Copied: projects/jboss-osgi/projects/deployers/trunk/vfs21/src (from rev 101810, projects/jboss-osgi/projects/runtime/deployers/trunk/src) Property changes on: projects/jboss-osgi/projects/deployers/trunk/vfs30 ___________________________________________________________________ Name: svn:ignore + target Copied: projects/jboss-osgi/projects/deployers/trunk/vfs30/pom.xml (from rev 101810, projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml) =================================================================== --- projects/jboss-osgi/projects/deployers/trunk/vfs30/pom.xml (rev 0) +++ projects/jboss-osgi/projects/deployers/trunk/vfs30/pom.xml 2010-03-04 12:26:58 UTC (rev 101816) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + +  +  +  +  +  +  +  +  + +  + +<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 Deployers - VFS30</name> + + <groupId>org.jboss.osgi.deployers</groupId> + <artifactId>jboss-osgi-deployers-vfs30</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jboss.osgi.deployers</groupId> + <artifactId>jboss-osgi-deployers</artifactId> + <version>1.0.5-SNAPSHOT</version> + </parent> + + <properties> + <version.jboss.deployers>2.2.0.Alpha3</version.jboss.deployers> + </properties> + +  + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployment</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + +  + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + +</project> Copied: projects/jboss-osgi/projects/deployers/trunk/vfs30/src (from rev 101810, projects/jboss-osgi/projects/runtime/deployers/trunk/src) Modified: projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java 2010-03-04 10:26:57 UTC (rev 101810) +++ projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java 2010-03-04 12:26:58 UTC (rev 101816) @@ -30,7 +30,7 @@ import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.osgi.deployment.deployer.Deployment; import org.jboss.osgi.spi.OSGiConstants; -import org.jboss.virtual.VirtualFile; +import org.jboss.vfs.VirtualFile; import org.osgi.framework.Constants; import org.osgi.framework.Version; Modified: projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2010-03-04 10:26:57 UTC (rev 101810) +++ projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2010-03-04 12:26:58 UTC (rev 101816) @@ -23,7 +23,6 @@ // $Id$ -import java.io.IOException; import java.util.jar.Attributes; import java.util.jar.Manifest; @@ -31,8 +30,8 @@ import org.jboss.deployers.spi.structure.ContextInfo; import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer; import org.jboss.deployers.vfs.spi.structure.StructureContext; -import org.jboss.virtual.VFSUtils; -import org.jboss.virtual.VirtualFile; +import org.jboss.vfs.VFSUtils; +import org.jboss.vfs.VirtualFile; import org.osgi.framework.Constants; /** @@ -103,21 +102,14 @@ { // [TODO] publish a Framework Event of type INFO // [TODO] locate the class path entry in attached fragments - try - { - VirtualFile child = root.getChild(path); - addClassPath(structureContext, child, true, false, context); - } - catch (IOException ex) - { - log.info("Cannot find class path '" + path + "' in: " + root); - } + VirtualFile child = root.getChild(path); + addClassPath(structureContext, child, true, false, context); } } } - + // We don't process children as potential subdeployments - + return true; } catch (Exception e)

14 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits March 2010