JBoss-OSGI SVN: r102399 - projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-15 07:25:28 -0400 (Mon, 15 Mar 2010)
New Revision: 102399
Modified:
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java
Log:
smplify mount handling
Modified: projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java
===================================================================
--- projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java 2010-03-15 11:24:46 UTC (rev 102398)
+++ projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java 2010-03-15 11:25:28 UTC (rev 102399)
@@ -51,7 +51,7 @@
suffixes.add(".jar");
suffixes.add(".war");
}
-
+
public VirtualFile getRoot(URL url) throws IOException
{
try
@@ -68,49 +68,59 @@
{
if (other == null)
return null;
-
+
if (other instanceof org.jboss.vfs.VirtualFile == false)
throw new IllegalArgumentException("Not a org.jboss.vfs.VirtualFile: " + other);
-
+
org.jboss.vfs.VirtualFile nativeFile = (org.jboss.vfs.VirtualFile)other;
VirtualFile abstractFile = registry.get(other);
if (abstractFile != null)
return abstractFile;
-
+
// Accept the file for mounting
MountHandle mountHandle = null;
- if (nativeFile.isFile())
+ if (acceptForMount((org.jboss.vfs.VirtualFile)other) == true)
{
+ try
+ {
+ TempFileProvider tmp = TempFileProvider.create("osgimount-", null);
+ mountHandle = VFS.mountZip(nativeFile, nativeFile, tmp);
+ }
+ catch (IOException ex)
+ {
+ throw new IllegalStateException("Cannot mount native file: " + other, ex);
+ }
+ }
+
+ // Register the VirtualFile abstraction
+ abstractFile = new VirtualFileAdaptor30(nativeFile, mountHandle);
+ registry.put(nativeFile, abstractFile);
+ return abstractFile;
+ }
+
+ private boolean acceptForMount(org.jboss.vfs.VirtualFile nativeFile)
+ {
+ boolean accept = false;
+ if (nativeFile.isFile() == false)
+ {
String rootName = nativeFile.getName();
for (String suffix : suffixes)
{
if (rootName.endsWith(suffix))
{
- try
- {
- TempFileProvider tmp = TempFileProvider.create("osgimount-", null);
- mountHandle = VFS.mountZip(nativeFile, nativeFile, tmp);
- break;
- }
- catch (IOException ex)
- {
- throw new IllegalStateException("Cannot mount native file: " + other, ex);
- }
+ accept = true;
+ break;
}
}
}
-
- // Register the VirtualFile abstraction
- abstractFile = new VirtualFileAdaptor30(nativeFile, mountHandle);
- registry.put(nativeFile, abstractFile);
- return abstractFile;
+ return accept;
}
public Object adapt(VirtualFile virtualFile)
{
if (virtualFile == null)
return null;
-
+
VirtualFileAdaptor30 adaptor = (VirtualFileAdaptor30)virtualFile;
return adaptor.getDelegate();
}
@@ -118,7 +128,7 @@
static void safeClose(VirtualFileAdaptor30 virtualFile)
{
registry.remove(virtualFile.getDelegate());
-
+
MountHandle mountHandle = virtualFile.getMountHandle();
if (mountHandle != null)
VFSUtils.safeClose(mountHandle);
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102397 - in projects/jboss-osgi/projects/runtime/framework/trunk: metadata/src/main/java/org/jboss/osgi/framework/metadata/internal and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-15 06:34:27 -0400 (Mon, 15 Mar 2010)
New Revision: 102397
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractVersionRange.java
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
Log:
Update to latest kernel
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractVersionRange.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractVersionRange.java 2010-03-15 10:16:34 UTC (rev 102396)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/metadata/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractVersionRange.java 2010-03-15 10:34:27 UTC (rev 102397)
@@ -52,7 +52,7 @@
* @param rangeSpec the range spec
* @return the version range
*/
- public static VersionRange valueOf(String rangeSpec)
+ public static AbstractVersionRange valueOf(String rangeSpec)
{
return parseRangeSpec(rangeSpec);
}
@@ -63,7 +63,7 @@
* @param rangeSpec
* @return the version range
*/
- public static VersionRange parseRangeSpec(String rangeSpec)
+ public static AbstractVersionRange parseRangeSpec(String rangeSpec)
{
if (rangeSpec == null)
throw new IllegalArgumentException("Null rangeSpec");
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-15 10:16:34 UTC (rev 102396)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-15 10:34:27 UTC (rev 102397)
@@ -46,9 +46,9 @@
<version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin>
<version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
- <version.jboss.classloading>2.2.0.Alpha3</version.jboss.classloading>
- <version.jboss.deployers>2.2.0.Alpha3</version.jboss.deployers>
- <version.jboss.kernel>2.2.0.Alpha8</version.jboss.kernel>
+ <version.jboss.classloading>2.2.0.Alpha4</version.jboss.classloading>
+ <version.jboss.deployers>2.2.0.Alpha4</version.jboss.deployers>
+ <version.jboss.kernel>2.2.0.Alpha9</version.jboss.kernel>
<version.jboss.logging>2.2.0.CR1</version.jboss.logging>
<version.jboss.mdr>2.2.0.Alpha2</version.jboss.mdr>
<version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces>
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102396 - projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-15 06:16:34 -0400 (Mon, 15 Mar 2010)
New Revision: 102396
Modified:
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java
Log:
Fix NPE in SystemDeployer
Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java 2010-03-15 05:48:34 UTC (rev 102395)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java 2010-03-15 10:16:34 UTC (rev 102396)
@@ -101,9 +101,10 @@
Bundle bundle = entry.getValue();
StartLevel startLevel = getStartLevel();
- if (dep.getStartLevel() > 0)
+ Integer level = dep.getStartLevel();
+ if (level != null && level > 0)
{
- startLevel.setBundleStartLevel(bundle, dep.getStartLevel());
+ startLevel.setBundleStartLevel(bundle, level);
}
if (dep.isAutoStart())
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102381 - in projects/jboss-osgi: projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer and 7 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-14 12:26:12 -0400 (Sun, 14 Mar 2010)
New Revision: 102381
Added:
projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleManifestParsingDeployer.java
projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleManifestParsingDeployer.java
Removed:
projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleContainedBeansDeployer.java
projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java
projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java
projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleContainedBeansDeployer.java
projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java
projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java
Modified:
projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java
projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java
projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/Deployment.java
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java
projects/jboss-osgi/trunk/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
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Simplify AS deployers. Remove basic BundleMetaData.
Deleted: projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleContainedBeansDeployer.java
===================================================================
--- projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleContainedBeansDeployer.java 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleContainedBeansDeployer.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -1,97 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.deployer;
-
-// $Id$
-
-import java.util.Collections;
-import java.util.List;
-
-import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.structure.spi.ClassLoaderFactory;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryVisitor;
-import org.jboss.kernel.spi.deployment.KernelDeployment;
-import org.osgi.framework.Bundle;
-
-/**
- * Deploy the bundle contained MC beans onto the Kernel.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 06-May-2009
- */
-public class BundleContainedBeansDeployer extends AbstractComponentDeployer<KernelDeployment, BeanMetaData>
-{
- /*
- * Create a new KernelDeploymentDeployer.
- */
- public BundleContainedBeansDeployer()
- {
- addInput(Bundle.class);
- addInput(ClassLoaderFactory.class);
- setDeploymentVisitor(new KernelDeploymentVisitor());
- setComponentVisitor(new BeanMetaDataVisitor());
- }
-
- /*
- * KernelDeploymentVisitor.
- */
- public static class KernelDeploymentVisitor extends BeanMetaDataFactoryVisitor<KernelDeployment>
- {
- @Override
- public void deploy(DeploymentUnit unit, KernelDeployment deployment) throws DeploymentException
- {
- ClassLoaderFactory factory = unit.getAttachment(ClassLoaderFactory.class);
- unit.createClassLoader(factory);
-
- super.deploy(unit, deployment);
- }
-
- public Class<KernelDeployment> getVisitorType()
- {
- return KernelDeployment.class;
- }
-
- protected List<BeanMetaData> getComponents(KernelDeployment deployment)
- {
- return deployment.getBeans();
- }
- }
-
- /*
- * BeanMetaDataVisitor.
- */
- public static class BeanMetaDataVisitor extends BeanMetaDataFactoryVisitor<BeanMetaData>
- {
- public Class<BeanMetaData> getVisitorType()
- {
- return BeanMetaData.class;
- }
-
- protected List<BeanMetaData> getComponents(BeanMetaData deployment)
- {
- return Collections.singletonList(deployment);
- }
- }
-}
Added: projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleManifestParsingDeployer.java
===================================================================
--- projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleManifestParsingDeployer.java (rev 0)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleManifestParsingDeployer.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.deployer;
+
+//$Id: BundleMetaDataDeployer.java 101816 2010-03-04 12:26:58Z thomas.diesler(a)jboss.com $
+
+import java.io.IOException;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractParsingDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.osgi.deployment.deployer.Deployment;
+import org.jboss.osgi.deployment.deployer.DeploymentFactory;
+import org.jboss.osgi.spi.util.BundleInfo;
+import org.jboss.osgi.vfs.AbstractVFS;
+import org.jboss.virtual.VFSUtils;
+import org.jboss.virtual.VirtualFile;
+import org.osgi.framework.Constants;
+
+/**
+ * A deployer that parses the bundle's manifest and attaches a {@link Deployment} object.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Mar-2009
+ */
+public class BundleManifestParsingDeployer extends AbstractParsingDeployer
+{
+ @Override
+ public void deploy(DeploymentUnit unit) throws DeploymentException
+ {
+ // Deployemnt already attached, nothing to do
+ Deployment dep = unit.getAttachment(Deployment.class);
+ if (dep != null)
+ return;
+
+ // Not a VFSDeploymentUnit, nothing to do
+ if (unit instanceof VFSDeploymentUnit == false)
+ return;
+
+ // Extract the Bundle-SymbolicName
+ VirtualFile root = ((VFSDeploymentUnit)unit).getRoot();
+ String symbolicName = null;
+ try
+ {
+ Manifest manifest = VFSUtils.getManifest(root);
+ if (manifest == null)
+ return;
+
+ Attributes attribs = manifest.getMainAttributes();
+ symbolicName = attribs.getValue(Constants.BUNDLE_SYMBOLICNAME);
+ }
+ catch (IOException e)
+ {
+ // ignore
+ }
+
+ // No Bundle-SymbolicName
+ if (symbolicName == null)
+ return;
+
+ // Create and attach the Deployment
+ try
+ {
+ BundleInfo info = BundleInfo.createBundleInfo(AbstractVFS.adapt(root));
+ dep = DeploymentFactory.createDeployment(info);
+ unit.addAttachment(Deployment.class, dep);
+ dep.setAutoStart(true);
+ }
+ catch (Exception ex)
+ {
+ // ignore, not a bundle deployment
+ }
+ }
+}
Deleted: projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java
===================================================================
--- projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -1,80 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.deployer;
-
-//$Id$
-
-import org.jboss.deployers.vfs.spi.deployer.helpers.AbstractManifestMetaData;
-import org.osgi.framework.Version;
-
-/**
- * The Bundle metadata.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 03-Feb-2009
- */
-public class BundleMetaData extends AbstractManifestMetaData
-{
- private String symbolicName;
- private Version version;
- private String location;
-
- // exteralizable usage
- public BundleMetaData()
- {
- }
-
- public BundleMetaData(String symbolicName)
- {
- this.symbolicName = symbolicName;
- }
-
- public String getSymbolicName()
- {
- return symbolicName;
- }
-
- public Version getVersion()
- {
- return version;
- }
-
- public void setVersion(Version version)
- {
- this.version = version;
- }
-
- public String getLocation()
- {
- return location;
- }
-
- public void setLocation(String location)
- {
- this.location = location;
- }
-
- public String toString()
- {
- return "Bundle[" + symbolicName + "-" + version + "]";
- }
-}
Deleted: projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java
===================================================================
--- projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.deployer;
-
-//$Id$
-
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
-import org.jboss.deployers.vfs.spi.deployer.ManifestDeployer;
-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.osgi.framework.Constants;
-import org.osgi.framework.Version;
-
-/**
- * Create {@link BundleMetaData} from Manifest Headers.
- *
- * If the manifest does not contain a header Bundle-SymbolicName this deployer does nothing.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 03-Feb-2009
- */
-public class BundleMetaDataDeployer extends ManifestDeployer<BundleMetaData>
-{
- public BundleMetaDataDeployer()
- {
- super(BundleMetaData.class);
- addInput(Deployment.class);
- }
-
- @Override
- protected BundleMetaData parse(VFSDeploymentUnit unit, VirtualFile file, BundleMetaData root) throws Exception
- {
- BundleMetaData metaData = super.parse(unit, file, root);
- if (metaData != null)
- {
- String symbolicName = metaData.getSymbolicName();
- log.debug("Bundle-SymbolicName: " + symbolicName + " in " + file);
-
- Deployment dep = unit.getAttachment(Deployment.class);
- String location = (dep != null ? dep.getLocation() : unit.getName());
- metaData.setLocation(location);
-
- // Add a marker that this is an OSGi deployment
- unit.addAttachment(OSGiConstants.KEY_BUNDLE_SYMBOLIC_NAME, symbolicName);
- }
- return metaData;
- }
-
- @Override
- protected BundleMetaData createMetaData(Manifest manifest) throws Exception
- {
- BundleMetaData metaData = null;
- Attributes attribs = manifest.getMainAttributes();
- String symbolicName = attribs.getValue(Constants.BUNDLE_SYMBOLICNAME);
- if (symbolicName != null)
- {
- metaData = new BundleMetaData(symbolicName);
- String version = attribs.getValue(Constants.BUNDLE_VERSION);
- metaData.setVersion(Version.parseVersion(version));
- }
-
- return metaData;
- }
-}
Modified: projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java
===================================================================
--- projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs21/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -23,7 +23,6 @@
//$Id$
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -32,6 +31,8 @@
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.osgi.deployment.deployer.Deployment;
+import org.jboss.osgi.vfs.VirtualFile;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
@@ -40,20 +41,20 @@
* Installs the Bundle into the Framework's SystemContext.
*
* This deployer does not start the bundle. It leaves it in state INSTALLED.
- * On undeploy the Bundle gets uninstalled from the Framework's SystemContext.
+ * On undeploy the Bundle gets uninstalled from the Framework's system context.
*
* @author Thomas.Diesler(a)jboss.org
* @author Ales.Justin(a)jboss.org
* @since 03-Feb-2009
*/
-public class BundleRealDeployer extends AbstractSimpleRealDeployer<BundleMetaData>
+public class BundleRealDeployer extends AbstractSimpleRealDeployer<Deployment>
{
private BundleContext systemContext;
private List<URL> skipBundles = new ArrayList<URL>();
public BundleRealDeployer()
{
- super(BundleMetaData.class);
+ super(Deployment.class);
addOutput(Bundle.class);
setStage(DeploymentStages.POST_PARSE);
}
@@ -68,53 +69,45 @@
this.skipBundles = skipBundles;
}
- public void deploy(DeploymentUnit unit, BundleMetaData metadata) throws DeploymentException
+ public void deploy(DeploymentUnit unit, Deployment dep) throws DeploymentException
{
- String location = metadata.getLocation();
- if (location == null)
- throw new IllegalStateException("Cannot obtain bundle location for: " + metadata);
+ VirtualFile rootFile = dep.getRoot();
+ if (rootFile == null)
+ throw new IllegalStateException("Cannot obtain root file for: " + dep);
// Normalize the bundle install path
- String path = location;
- try
+ String path = rootFile.getPathName();
+ if (path.endsWith("/"))
+ path = path.substring(0, path.length() - 1);
+
+ boolean skipBundle = false;
+ for (URL skip : skipBundles)
{
- URL url = new URL(location);
- path = url.getPath();
- if (path.endsWith("/"))
- path = path.substring(0, path.length() - 1);
+ String skipPath = skip.getPath();
+ if (skipPath.equals(path))
+ {
+ skipBundle = true;
+ break;
+ }
}
- catch (MalformedURLException ex)
- {
- // ignore
- }
+ if (skipBundle == true)
+ return;
try
{
- boolean skipBundle = false;
- for (URL skip : skipBundles)
- {
- String skipPath = skip.getPath();
- if (skipPath.equals(path))
- {
- skipBundle = true;
- break;
- }
- }
- if (skipBundle == false)
- {
- Bundle bundle = systemContext.installBundle(location);
- unit.addAttachment(Bundle.class, bundle);
- log.info("Installed: " + bundle);
- }
+ String location = dep.getLocation();
+ Bundle bundle = systemContext.installBundle(location);
+ unit.addAttachment(Bundle.class, bundle);
+ log.info("Installed: " + bundle);
}
- catch (BundleException ex)
+ catch (Exception ex)
{
- throw DeploymentException.rethrowAsDeploymentException("Cannot install bundle: " + metadata, ex);
+ throw DeploymentException.rethrowAsDeploymentException("Cannot install bundle: " + dep, ex);
}
}
@Override
- public void undeploy(DeploymentUnit unit, BundleMetaData osGiMetaData)
+ public void undeploy(DeploymentUnit unit, Deployment dep)
{
Bundle bundle = unit.getAttachment(Bundle.class);
if (bundle != null)
Deleted: projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleContainedBeansDeployer.java
===================================================================
--- projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleContainedBeansDeployer.java 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleContainedBeansDeployer.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -1,97 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.deployer;
-
-// $Id$
-
-import java.util.Collections;
-import java.util.List;
-
-import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.structure.spi.ClassLoaderFactory;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryVisitor;
-import org.jboss.kernel.spi.deployment.KernelDeployment;
-import org.osgi.framework.Bundle;
-
-/**
- * Deploy the bundle contained MC beans onto the Kernel.
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 06-May-2009
- */
-public class BundleContainedBeansDeployer extends AbstractComponentDeployer<KernelDeployment, BeanMetaData>
-{
- /*
- * Create a new KernelDeploymentDeployer.
- */
- public BundleContainedBeansDeployer()
- {
- addInput(Bundle.class);
- addInput(ClassLoaderFactory.class);
- setDeploymentVisitor(new KernelDeploymentVisitor());
- setComponentVisitor(new BeanMetaDataVisitor());
- }
-
- /*
- * KernelDeploymentVisitor.
- */
- public static class KernelDeploymentVisitor extends BeanMetaDataFactoryVisitor<KernelDeployment>
- {
- @Override
- public void deploy(DeploymentUnit unit, KernelDeployment deployment) throws DeploymentException
- {
- ClassLoaderFactory factory = unit.getAttachment(ClassLoaderFactory.class);
- unit.createClassLoader(factory);
-
- super.deploy(unit, deployment);
- }
-
- public Class<KernelDeployment> getVisitorType()
- {
- return KernelDeployment.class;
- }
-
- protected List<BeanMetaData> getComponents(KernelDeployment deployment)
- {
- return deployment.getBeans();
- }
- }
-
- /*
- * BeanMetaDataVisitor.
- */
- public static class BeanMetaDataVisitor extends BeanMetaDataFactoryVisitor<BeanMetaData>
- {
- public Class<BeanMetaData> getVisitorType()
- {
- return BeanMetaData.class;
- }
-
- protected List<BeanMetaData> getComponents(BeanMetaData deployment)
- {
- return Collections.singletonList(deployment);
- }
- }
-}
Copied: projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleManifestParsingDeployer.java (from rev 101884, 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/BundleManifestParsingDeployer.java (rev 0)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleManifestParsingDeployer.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.deployer;
+
+//$Id$
+
+import java.io.IOException;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractParsingDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.osgi.deployment.deployer.Deployment;
+import org.jboss.osgi.deployment.deployer.DeploymentFactory;
+import org.jboss.osgi.spi.util.BundleInfo;
+import org.jboss.osgi.vfs.AbstractVFS;
+import org.jboss.vfs.VFSUtils;
+import org.jboss.vfs.VirtualFile;
+import org.osgi.framework.Constants;
+
+/**
+ * A deployer that parses the bundle's manifest and attaches a {@link Deployment} object.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 14-Mar-2009
+ */
+public class BundleManifestParsingDeployer extends AbstractParsingDeployer
+{
+ @Override
+ public void deploy(DeploymentUnit unit) throws DeploymentException
+ {
+ // Deployemnt already attached, nothing to do
+ Deployment dep = unit.getAttachment(Deployment.class);
+ if (dep != null)
+ return;
+
+ // Not a VFSDeploymentUnit, nothing to do
+ if (unit instanceof VFSDeploymentUnit == false)
+ return;
+
+ // Extract the Bundle-SymbolicName
+ VirtualFile root = ((VFSDeploymentUnit)unit).getRoot();
+ String symbolicName = null;
+ try
+ {
+ Manifest manifest = VFSUtils.getManifest(root);
+ if (manifest == null)
+ return;
+
+ Attributes attribs = manifest.getMainAttributes();
+ symbolicName = attribs.getValue(Constants.BUNDLE_SYMBOLICNAME);
+ }
+ catch (IOException e)
+ {
+ // ignore
+ }
+
+ // No Bundle-SymbolicName
+ if (symbolicName == null)
+ return;
+
+ // Create and attach the Deployment
+ try
+ {
+ BundleInfo info = BundleInfo.createBundleInfo(AbstractVFS.adapt(root));
+ dep = DeploymentFactory.createDeployment(info);
+ unit.addAttachment(Deployment.class, dep);
+ dep.setAutoStart(true);
+ }
+ catch (Exception ex)
+ {
+ // ignore, not a bundle deployment
+ }
+ }
+}
Deleted: projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java
===================================================================
--- projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -1,80 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.deployer;
-
-//$Id$
-
-import org.jboss.deployers.vfs.spi.deployer.helpers.AbstractManifestMetaData;
-import org.osgi.framework.Version;
-
-/**
- * The Bundle metadata.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 03-Feb-2009
- */
-public class BundleMetaData extends AbstractManifestMetaData
-{
- private String symbolicName;
- private Version version;
- private String location;
-
- // exteralizable usage
- public BundleMetaData()
- {
- }
-
- public BundleMetaData(String symbolicName)
- {
- this.symbolicName = symbolicName;
- }
-
- public String getSymbolicName()
- {
- return symbolicName;
- }
-
- public Version getVersion()
- {
- return version;
- }
-
- public void setVersion(Version version)
- {
- this.version = version;
- }
-
- public String getLocation()
- {
- return location;
- }
-
- public void setLocation(String location)
- {
- this.location = location;
- }
-
- public String toString()
- {
- return "Bundle[" + symbolicName + "-" + version + "]";
- }
-}
Deleted: 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/BundleMetaDataDeployer.java 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.deployer;
-
-//$Id$
-
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
-import org.jboss.deployers.vfs.spi.deployer.ManifestDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.osgi.deployment.deployer.Deployment;
-import org.jboss.osgi.spi.OSGiConstants;
-import org.jboss.vfs.VirtualFile;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Version;
-
-/**
- * Create {@link BundleMetaData} from Manifest Headers.
- *
- * If the manifest does not contain a header Bundle-SymbolicName this deployer does nothing.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 03-Feb-2009
- */
-public class BundleMetaDataDeployer extends ManifestDeployer<BundleMetaData>
-{
- public BundleMetaDataDeployer()
- {
- super(BundleMetaData.class);
- addInput(Deployment.class);
- }
-
- @Override
- protected BundleMetaData parse(VFSDeploymentUnit unit, VirtualFile file, BundleMetaData root) throws Exception
- {
- BundleMetaData metaData = super.parse(unit, file, root);
- if (metaData != null)
- {
- String symbolicName = metaData.getSymbolicName();
- log.debug("Bundle-SymbolicName: " + symbolicName + " in " + file);
-
- Deployment dep = unit.getAttachment(Deployment.class);
- String location = (dep != null ? dep.getLocation() : unit.getName());
- metaData.setLocation(location);
-
- // Add a marker that this is an OSGi deployment
- unit.addAttachment(OSGiConstants.KEY_BUNDLE_SYMBOLIC_NAME, symbolicName);
- }
- return metaData;
- }
-
- @Override
- protected BundleMetaData createMetaData(Manifest manifest) throws Exception
- {
- BundleMetaData metaData = null;
- Attributes attribs = manifest.getMainAttributes();
- String symbolicName = attribs.getValue(Constants.BUNDLE_SYMBOLICNAME);
- if (symbolicName != null)
- {
- metaData = new BundleMetaData(symbolicName);
- String version = attribs.getValue(Constants.BUNDLE_VERSION);
- metaData.setVersion(Version.parseVersion(version));
- }
-
- return metaData;
- }
-}
Modified: projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java
===================================================================
--- projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -23,7 +23,7 @@
//$Id$
-import java.net.MalformedURLException;
+import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -32,6 +32,8 @@
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.osgi.deployment.deployer.Deployment;
+import org.jboss.osgi.vfs.VirtualFile;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
@@ -40,20 +42,20 @@
* Installs the Bundle into the Framework's SystemContext.
*
* This deployer does not start the bundle. It leaves it in state INSTALLED.
- * On undeploy the Bundle gets uninstalled from the Framework's SystemContext.
+ * On undeploy the Bundle gets uninstalled from the Framework's system context.
*
* @author Thomas.Diesler(a)jboss.org
* @author Ales.Justin(a)jboss.org
* @since 03-Feb-2009
*/
-public class BundleRealDeployer extends AbstractSimpleRealDeployer<BundleMetaData>
+public class BundleRealDeployer extends AbstractSimpleRealDeployer<Deployment>
{
private BundleContext systemContext;
private List<URL> skipBundles = new ArrayList<URL>();
public BundleRealDeployer()
{
- super(BundleMetaData.class);
+ super(Deployment.class);
addOutput(Bundle.class);
setStage(DeploymentStages.POST_PARSE);
}
@@ -68,53 +70,46 @@
this.skipBundles = skipBundles;
}
- public void deploy(DeploymentUnit unit, BundleMetaData metadata) throws DeploymentException
+ public void deploy(DeploymentUnit unit, Deployment dep) throws DeploymentException
{
- String location = metadata.getLocation();
- if (location == null)
- throw new IllegalStateException("Cannot obtain bundle location for: " + metadata);
+ VirtualFile rootFile = dep.getRoot();
+ if (rootFile == null)
+ throw new IllegalStateException("Cannot obtain root file for: " + dep);
// Normalize the bundle install path
- String path = location;
- try
+ String path = rootFile.getPathName();
+ if (path.endsWith("/"))
+ path = path.substring(0, path.length() - 1);
+
+ boolean skipBundle = false;
+ for (URL skip : skipBundles)
{
- URL url = new URL(location);
- path = url.getPath();
- if (path.endsWith("/"))
- path = path.substring(0, path.length() - 1);
+ String skipPath = skip.getPath();
+ if (skipPath.equals(path))
+ {
+ skipBundle = true;
+ break;
+ }
}
- catch (MalformedURLException ex)
- {
- // ignore
- }
+ if (skipBundle == true)
+ return;
try
{
- boolean skipBundle = false;
- for (URL skip : skipBundles)
- {
- String skipPath = skip.getPath();
- if (skipPath.equals(path))
- {
- skipBundle = true;
- break;
- }
- }
- if (skipBundle == false)
- {
- Bundle bundle = systemContext.installBundle(location);
- unit.addAttachment(Bundle.class, bundle);
- log.info("Installed: " + bundle);
- }
+ String location = rootFile.toURL().toExternalForm();
+ InputStream instream = rootFile.getStreamURL().openStream();
+ Bundle bundle = systemContext.installBundle(location, instream);
+ unit.addAttachment(Bundle.class, bundle);
+ log.info("Installed: " + bundle);
}
- catch (BundleException ex)
+ catch (Exception ex)
{
- throw DeploymentException.rethrowAsDeploymentException("Cannot install bundle: " + metadata, ex);
+ throw DeploymentException.rethrowAsDeploymentException("Cannot install bundle: " + dep, ex);
}
}
@Override
- public void undeploy(DeploymentUnit unit, BundleMetaData osGiMetaData)
+ public void undeploy(DeploymentUnit unit, Deployment dep)
{
Bundle bundle = unit.getAttachment(Bundle.class);
if (bundle != null)
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-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/projects/deployers/trunk/vfs30/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -28,9 +28,10 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.structure.ContextInfo;
-import org.jboss.deployers.vfs.plugins.structure.AbstractVFSArchiveStructureDeployer;
+import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer;
import org.jboss.deployers.vfs.spi.structure.StructureContext;
-import org.jboss.vfs.VFSUtils;
+import org.jboss.osgi.vfs.AbstractVFS;
+import org.jboss.osgi.vfs.VFSUtils;
import org.jboss.vfs.VirtualFile;
import org.osgi.framework.Constants;
@@ -40,7 +41,7 @@
* @author Thomas.Diesler(a)jboss.com
* @since 16-Apr-2009
*/
-public class BundleStructureDeployer extends AbstractVFSArchiveStructureDeployer
+public class BundleStructureDeployer extends AbstractVFSStructureDeployer
{
/**
* Sets the default relative order.
@@ -53,15 +54,8 @@
}
@Override
- protected boolean hasValidSuffix(String name)
+ public boolean determineStructure(StructureContext structureContext) throws DeploymentException
{
- // 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();
@@ -69,7 +63,7 @@
{
// This file is not for me, because I'm only interested
// in root deployments that contain a MANIFEST.MF
- Manifest manifest = VFSUtils.getManifest(root);
+ Manifest manifest = VFSUtils.getManifest(AbstractVFS.adapt(root));
if (root != structureContext.getFile() || manifest == null)
return false;
Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/Deployment.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/Deployment.java 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/deployer/Deployment.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -62,12 +62,12 @@
/**
* Get the start level associated with this deployment
*/
- int getStartLevel();
+ Integer getStartLevel();
/**
* Set the start level associated with this deployment
*/
- void setStartLevel(int startLevel);
+ void setStartLevel(Integer startLevel);
/**
* Get the autostart flag associated with this deployment
Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/DeploymentImpl.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -41,7 +41,7 @@
private static final long serialVersionUID = 6216977125749367927L;
private BundleInfo info;
- private int startLevel;
+ private Integer startLevel;
private boolean autoStart;
private boolean update;
@@ -53,56 +53,70 @@
this.info = info;
}
+ @Override
public VirtualFile getRoot()
{
return info.getRoot();
}
+ @Override
public String getLocation()
{
return info.getLocation();
}
+ @Override
public String getSymbolicName()
{
return info.getSymbolicName();
}
+ @Override
public String getVersion()
{
return info.getVersion().toString();
}
+ @Override
public String getManifestHeader(String key)
{
return info.getManifestHeader(key);
}
- public int getStartLevel()
+ @Override
+ public Integer getStartLevel()
{
return startLevel;
}
- public void setStartLevel(int startLevel)
+ @Override
+ public void setStartLevel(Integer startLevel)
{
+ if (startLevel == null || startLevel < 1)
+ throw new IllegalArgumentException("Start level must be greater than one: " + startLevel);
+
this.startLevel = startLevel;
}
+ @Override
public boolean isAutoStart()
{
return autoStart;
}
+ @Override
public void setAutoStart(boolean autoStart)
{
this.autoStart = autoStart;
}
+ @Override
public boolean isBundleUpdate()
{
return update;
}
+ @Override
public void setBundleUpdate(boolean update)
{
this.update = update;
Modified: projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java
===================================================================
--- projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -35,7 +35,6 @@
import org.jboss.vfs.VFS;
import org.jboss.vfs.VFSUtils;
import org.jboss.vfs.spi.MountHandle;
-import org.jboss.vfs.util.automount.Automounter;
/**
* An adaptor to the jboss-vfs-3.0.x VFS.
@@ -45,7 +44,7 @@
*/
public class VFSAdaptor30 implements VFSAdaptor
{
- private static Map<String, VirtualFile> registry = new ConcurrentHashMap<String, VirtualFile>();
+ private static Map<Object, VirtualFile> registry = new ConcurrentHashMap<Object, VirtualFile>();
private static Set<String> suffixes = new HashSet<String>();
static
{
@@ -55,54 +54,58 @@
public VirtualFile getRoot(URL url) throws IOException
{
- VirtualFile virtualFile = registry.get(url.toExternalForm());
- if (virtualFile != null)
- return virtualFile;
-
- // Get the VFS file
- org.jboss.vfs.VirtualFile root;
try
{
- root = org.jboss.vfs.VFS.getChild(url);
+ return adapt(org.jboss.vfs.VFS.getChild(url));
}
catch (URISyntaxException ex)
{
throw new IOException(ex);
}
+ }
+
+ public VirtualFile adapt(Object other)
+ {
+ if (other == null)
+ return null;
+ if (other instanceof org.jboss.vfs.VirtualFile == false)
+ throw new IllegalArgumentException("Not a org.jboss.vfs.VirtualFile: " + other);
+
+ org.jboss.vfs.VirtualFile nativeFile = (org.jboss.vfs.VirtualFile)other;
+ VirtualFile abstractFile = registry.get(other);
+ if (abstractFile != null)
+ return abstractFile;
+
// Accept the file for mounting
MountHandle mountHandle = null;
- if (root.isFile() && Automounter.isMounted(root) == false)
+ if (nativeFile.isFile())
{
- String rootName = root.getName();
+ String rootName = nativeFile.getName();
for (String suffix : suffixes)
{
if (rootName.endsWith(suffix))
{
- TempFileProvider tmp = TempFileProvider.create("osgimount-", null);
- mountHandle = VFS.mountZip(root, root, tmp);
- break;
+ try
+ {
+ TempFileProvider tmp = TempFileProvider.create("osgimount-", null);
+ mountHandle = VFS.mountZip(nativeFile, nativeFile, tmp);
+ break;
+ }
+ catch (IOException ex)
+ {
+ throw new IllegalStateException("Cannot mount native file: " + other, ex);
+ }
}
}
}
- // Register the virtual file
- virtualFile = new VirtualFileAdaptor30(root, mountHandle, url);
- registry.put(url.toExternalForm(), virtualFile);
- return virtualFile;
+ // Register the VirtualFile abstraction
+ abstractFile = new VirtualFileAdaptor30(nativeFile, mountHandle);
+ registry.put(nativeFile, abstractFile);
+ return abstractFile;
}
- public VirtualFile adapt(Object virtualFile)
- {
- if (virtualFile == null)
- return null;
-
- if (virtualFile instanceof org.jboss.vfs.VirtualFile == false)
- throw new IllegalArgumentException("Not a org.jboss.vfs.VirtualFile: " + virtualFile);
-
- return new VirtualFileAdaptor30((org.jboss.vfs.VirtualFile)virtualFile);
- }
-
public Object adapt(VirtualFile virtualFile)
{
if (virtualFile == null)
@@ -114,7 +117,7 @@
static void safeClose(VirtualFileAdaptor30 virtualFile)
{
- registry.remove(virtualFile.getRootURL());
+ registry.remove(virtualFile.getDelegate());
MountHandle mountHandle = virtualFile.getMountHandle();
if (mountHandle != null)
Modified: projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java
===================================================================
--- projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java 2010-03-14 16:26:12 UTC (rev 102381)
@@ -44,13 +44,11 @@
{
private org.jboss.vfs.VirtualFile delegate;
private MountHandle mountHandle;
- private URL rootURL;
- VirtualFileAdaptor30(org.jboss.vfs.VirtualFile root, MountHandle mountHandle, URL rootURL)
+ VirtualFileAdaptor30(org.jboss.vfs.VirtualFile root, MountHandle mountHandle)
{
this(root);
this.mountHandle = mountHandle;
- this.rootURL = rootURL;
}
VirtualFileAdaptor30(org.jboss.vfs.VirtualFile delegate)
@@ -70,11 +68,6 @@
return mountHandle;
}
- URL getRootURL()
- {
- return rootURL;
- }
-
public String getName()
{
return delegate.getName();
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-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-03-14 16:26:12 UTC (rev 102381)
@@ -107,7 +107,7 @@
<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="BundleManifestParsingDeployer" class="org.jboss.osgi.deployer.BundleManifestParsingDeployer" />
<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>
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-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-03-14 16:26:12 UTC (rev 102381)
@@ -107,7 +107,7 @@
<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="BundleManifestParsingDeployer" class="org.jboss.osgi.deployer.BundleManifestParsingDeployer" />
<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>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-14 16:26:12 UTC (rev 102381)
@@ -432,11 +432,11 @@
<!-- Equinox Dependencies -->
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.equinox</groupId>
<artifactId>jboss-osgi-equinox</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.equinox</groupId>
<artifactId>jboss-osgi-equinox</artifactId>
<version>${version.jboss.osgi.equinox}</version>
<classifier>sources</classifier>
@@ -444,11 +444,11 @@
<!-- Felix Dependencies -->
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.felix</groupId>
<artifactId>jboss-osgi-felix</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.felix</groupId>
<artifactId>jboss-osgi-felix</artifactId>
<version>${version.jboss.osgi.felix}</version>
<classifier>sources</classifier>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/trunk/pom.xml 2010-03-14 16:26:12 UTC (rev 102381)
@@ -248,14 +248,14 @@
<!-- Equinox Dependencies -->
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.equinox</groupId>
<artifactId>jboss-osgi-equinox</artifactId>
<version>${version.jboss.osgi.equinox}</version>
</dependency>
<!-- Felix Dependencies -->
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.felix</groupId>
<artifactId>jboss-osgi-felix</artifactId>
<version>${version.jboss.osgi.felix}</version>
</dependency>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-14 15:54:22 UTC (rev 102380)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-14 16:26:12 UTC (rev 102381)
@@ -277,7 +277,7 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.equinox</groupId>
<artifactId>jboss-osgi-equinox</artifactId>
<scope>provided</scope>
</dependency>
@@ -306,7 +306,7 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.felix</groupId>
<artifactId>jboss-osgi-felix</artifactId>
<scope>provided</scope>
</dependency>
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102380 - in projects/jboss-osgi/projects/runtime: felix/trunk and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-14 11:54:22 -0400 (Sun, 14 Mar 2010)
New Revision: 102380
Modified:
projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
Log:
Modify groupID
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2010-03-14 14:17:19 UTC (rev 102379)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2010-03-14 15:54:22 UTC (rev 102380)
@@ -16,7 +16,7 @@
<name>JBossOSGi Equinox</name>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.equinox</groupId>
<artifactId>jboss-osgi-equinox</artifactId>
<packaging>jar</packaging>
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2010-03-14 14:17:19 UTC (rev 102379)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2010-03-14 15:54:22 UTC (rev 102380)
@@ -16,7 +16,7 @@
<name>JBossOSGi Felix</name>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.felix</groupId>
<artifactId>jboss-osgi-felix</artifactId>
<packaging>jar</packaging>
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102379 - projects/jboss-osgi/projects/runtime.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-14 10:17:19 -0400 (Sun, 14 Mar 2010)
New Revision: 102379
Removed:
projects/jboss-osgi/projects/runtime/deployers/
Log:
Delete runtime/deployers
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102378 - in projects/jboss-osgi/projects: runtime/deployers and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-14 10:16:46 -0400 (Sun, 14 Mar 2010)
New Revision: 102378
Added:
projects/jboss-osgi/projects/deployers/tags/
Removed:
projects/jboss-osgi/projects/runtime/deployers/tags/
Log:
Move deployers/tags
Copied: projects/jboss-osgi/projects/deployers/tags (from rev 102377, projects/jboss-osgi/projects/runtime/deployers/tags)
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102361 - in projects/jboss-osgi: projects/runtime/framework/trunk/bundle and 5 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-12 12:34:19 -0500 (Fri, 12 Mar 2010)
New Revision: 102361
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Fix native/jboss600
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-12 17:27:23 UTC (rev 102360)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-12 17:34:19 UTC (rev 102361)
@@ -167,11 +167,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-testing</artifactId>
<scope>test</scope>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-12 17:27:23 UTC (rev 102360)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-12 17:34:19 UTC (rev 102361)
@@ -37,6 +37,10 @@
<artifactId>jboss-osgi-framework-metadata</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ </dependency>
<!-- JBoss OSGi Dependencies -->
<dependency>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml 2010-03-12 17:27:23 UTC (rev 102360)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/metadata/pom.xml 2010-03-12 17:34:19 UTC (rev 102361)
@@ -35,6 +35,14 @@
<dependencies>
<dependency>
<groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
</dependency>
<dependency>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-12 17:27:23 UTC (rev 102360)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-12 17:34:19 UTC (rev 102361)
@@ -84,11 +84,26 @@
<dependencies>
<dependency>
<groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ <version>${version.jboss.classloading}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloading-vfs</artifactId>
<version>${version.jboss.classloading}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ <version>${version.jboss.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
<version>${version.jboss.deployers}</version>
</dependency>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-03-12 17:27:23 UTC (rev 102360)
+++ projects/jboss-osgi/trunk/pom.xml 2010-03-12 17:34:19 UTC (rev 102361)
@@ -290,12 +290,32 @@
<version>${version.apache.felix.core}</version>
</dependency>
- <!-- JBossMC Dependencies -->
+ <!-- Native Framework Dependencies -->
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
<version>${version.jboss.osgi.framework}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-core</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-metadata</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-vfs21</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-vfs30</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ </dependency>
<!-- OPS4J -->
<dependency>
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-12 17:27:23 UTC (rev 102360)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/fragments/FragmentTestCase.java 2010-03-12 17:34:19 UTC (rev 102361)
@@ -30,6 +30,7 @@
import java.net.URL;
+import org.jboss.osgi.jmx.BundleStateMBeanExt;
import org.jboss.osgi.jmx.FrameworkMBeanExt;
import org.jboss.osgi.jmx.JMXCapability;
import org.jboss.osgi.spi.capability.LogServiceCapability;
@@ -107,10 +108,14 @@
OSGiBundle fragA = runtime.installBundle("fragments-simple-fragA.jar");
assertBundleState(Bundle.INSTALLED, fragA.getState());
- URL entryURL = fragA.getEntry("resources/resource.txt");
+ // Use the BundleStateMBeanExt.getEntry() instead of OSGiBundle.getEntry()
+ // to normalize the differences in VFS protocols when running against a VFS21 target container.
+ BundleStateMBeanExt bundleState = (BundleStateMBeanExt)runtime.getBundleStateMBean();
+
+ String entryURL = bundleState.getEntry(fragA.getBundleId(), "resources/resource.txt");
assertNotNull("Entry URL not null", entryURL);
- URL resourceURL = fragA.getResource("resources/resource.txt");
+ String resourceURL = bundleState.getResource(fragA.getBundleId(), "resources/resource.txt");
assertNull("Resource URL null", resourceURL);
try
@@ -146,10 +151,14 @@
assertBundleState(Bundle.ACTIVE, hostA.getState());
assertBundleState(Bundle.RESOLVED, fragA.getState());
- URL entryURL = hostA.getEntry("resources/resource.txt");
+ // Use the BundleStateMBeanExt.getEntry() instead of OSGiBundle.getEntry()
+ // to normalize the differences in VFS protocols when running against a VFS21 target container.
+ BundleStateMBeanExt bundleState = (BundleStateMBeanExt)runtime.getBundleStateMBean();
+
+ String entryURL = bundleState.getEntry(hostA.getBundleId(), "resources/resource.txt");
assertNull("Entry URL null", entryURL);
- URL resourceURL = hostA.getResource("resources/resource.txt");
+ String resourceURL = bundleState.getResource(hostA.getBundleId(), "resources/resource.txt");
assertNotNull("Resource URL not null", resourceURL);
OSGiBundle fragBeanProvider = hostA.loadClass(FragBeanA.class.getName());
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-12 17:27:23 UTC (rev 102360)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-12 17:34:19 UTC (rev 102361)
@@ -333,15 +333,19 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-vfs30</artifactId>
- <version>${version.jboss.osgi.framework}</version>
+ <artifactId>jboss-osgi-framework-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework</artifactId>
+ <artifactId>jboss-osgi-framework-metadata</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-vfs30</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</profile>
<profile>
@@ -354,15 +358,19 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-vfs30</artifactId>
- <version>${version.jboss.osgi.framework}</version>
+ <artifactId>jboss-osgi-framework-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework</artifactId>
+ <artifactId>jboss-osgi-framework-metadata</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-vfs30</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</profile>
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102352 - in projects/jboss-osgi: projects/runtime/framework/trunk/vfs21 and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-12 11:29:26 -0500 (Fri, 12 Mar 2010)
New Revision: 102352
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml
Log:
Cleanup framework dependencies
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-12 16:26:37 UTC (rev 102351)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-12 16:29:26 UTC (rev 102352)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
-<!-- $Id$ -->
+ <!-- $Id$ -->
<!--
Set these VM properties in your IDE debugger
@@ -84,65 +84,15 @@
<dependencies>
<dependency>
<groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloader</artifactId>
- <version>${version.jboss.classloading}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading</artifactId>
- <version>${version.jboss.classloading}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloading-vfs</artifactId>
<version>${version.jboss.classloading}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
<version>${version.jboss.deployers}</version>
</dependency>
<dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-jmx</artifactId>
- <version>${version.jboss.deployers}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
<version>${version.jboss.kernel}</version>
@@ -158,16 +108,6 @@
<version>${version.jboss.kernel}</version>
</dependency>
<dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-dependency</artifactId>
- <version>${version.jboss.kernel}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging}</version>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-mdr</artifactId>
<version>${version.jboss.mdr}</version>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml 2010-03-12 16:26:37 UTC (rev 102351)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml 2010-03-12 16:29:26 UTC (rev 102352)
@@ -31,6 +31,7 @@
<properties>
<version.jboss.classloading>2.2.0.Alpha1</version.jboss.classloading>
<version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers>
+ <version.jboss.kernel>2.2.0.Alpha1</version.jboss.kernel>
</properties>
<!-- Dependencies -->
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2010-03-12 16:26:37 UTC (rev 102351)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2010-03-12 16:29:26 UTC (rev 102352)
@@ -18,6 +18,7 @@
<include>org.eclipse.equinox:org.eclipse.osgi.util:jar</include>
</includes>
<useStrictFiltering>false</useStrictFiltering>
+ <scope>provided</scope>
<unpack>false</unpack>
</dependencySet>
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml 2010-03-12 16:26:37 UTC (rev 102351)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml 2010-03-12 16:29:26 UTC (rev 102352)
@@ -18,6 +18,7 @@
<include>org.osgi:org.osgi.compendium:jar</include>
</includes>
<useStrictFiltering>false</useStrictFiltering>
+ <scope>provided</scope>
<unpack>false</unpack>
</dependencySet>
14 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r102350 - in projects/jboss-osgi: projects/runtime/framework/trunk/bundle and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-12 11:08:31 -0500 (Fri, 12 Mar 2010)
New Revision: 102350
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml
projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Cleanup framework dependencies
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-12 15:00:28 UTC (rev 102349)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-12 16:08:31 UTC (rev 102350)
@@ -34,19 +34,14 @@
<dependencies>
<dependency>
- <groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-core</artifactId>
- <version>${version}</version>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-metadata</artifactId>
+ <artifactId>jboss-osgi-framework-core</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- </dependency>
<!-- Test bundles dependencies -->
<dependency>
@@ -162,6 +157,21 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-jmx-aop-mc-int</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-jmx-mc-int</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-testing</artifactId>
<scope>test</scope>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-12 15:00:28 UTC (rev 102349)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-12 16:08:31 UTC (rev 102350)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
<!-- ====================================================================== -->
<!-- $Id$ -->
@@ -29,76 +29,14 @@
<dependencies>
<dependency>
- <groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-metadata</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloader</artifactId>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-metadata</artifactId>
+ <version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-jmx-aop-mc-int</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-jmx-mc-int</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.kernel</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- </dependency>
<!-- JBoss OSGi Dependencies -->
<dependency>
@@ -119,11 +57,6 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
-
</dependencies>
- <build>
- <plugins>
- </plugins>
- </build>
</project>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-12 15:00:28 UTC (rev 102349)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-12 16:08:31 UTC (rev 102350)
@@ -300,7 +300,10 @@
<profiles>
- <!-- Name: distro Desc: Build the distribution -->
+ <!--
+ Name: distro
+ Desc: Build the distribution
+ -->
<profile>
<id>distro</id>
<build>
@@ -315,6 +318,29 @@
</build>
</profile>
+ <!--
+ Name: remote-testing
+ Descr: Setup for remote integration testing
+ -->
+ <profile>
+ <id>remote-testing</id>
+ <activation>
+ <property>
+ <name>target.container</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml 2010-03-12 15:00:28 UTC (rev 102349)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml 2010-03-12 16:08:31 UTC (rev 102350)
@@ -18,6 +18,7 @@
<include>org.eclipse.equinox:org.eclipse.osgi.util:jar</include>
</includes>
<useStrictFiltering>false</useStrictFiltering>
+ <scope>provided</scope>
<unpack>false</unpack>
</dependencySet>
Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml 2010-03-12 15:00:28 UTC (rev 102349)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml 2010-03-12 16:08:31 UTC (rev 102350)
@@ -18,6 +18,7 @@
<include>org.osgi:org.osgi.compendium:jar</include>
</includes>
<useStrictFiltering>false</useStrictFiltering>
+ <scope>provided</scope>
<unpack>false</unpack>
</dependencySet>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-12 15:00:28 UTC (rev 102349)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-12 16:08:31 UTC (rev 102350)
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!-- ======================================================================
--->
+ <!-- ====================================================================== -->
<!-- -->
<!-- JBoss, the OpenSource J2EE webOS -->
<!-- -->
<!-- Distributable under LGPL license. -->
<!-- See terms of license at http://www.gnu.org. -->
<!-- -->
- <!-- ======================================================================
--->
+ <!-- ====================================================================== -->
- <!-- $Id$
--->
+ <!-- $Id$ -->
<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>
@@ -282,7 +279,13 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-equinox</artifactId>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</profile>
@@ -305,7 +308,13 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-felix</artifactId>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</profile>
@@ -322,15 +331,16 @@
</property>
</activation>
<dependencies>
- <!-- Promote the framework core dependencies -->
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-core</artifactId>
+ <artifactId>jboss-osgi-framework-vfs30</artifactId>
<version>${version.jboss.osgi.framework}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</profile>
@@ -342,15 +352,16 @@
</property>
</activation>
<dependencies>
- <!-- Promote the framework core dependencies -->
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-core</artifactId>
+ <artifactId>jboss-osgi-framework-vfs30</artifactId>
<version>${version.jboss.osgi.framework}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
</profile>
@@ -400,12 +411,6 @@
<properties>
<target.container.excludes>org/jboss/test/osgi/jbossas/**</target.container.excludes>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs30</artifactId>
- </dependency>
- </dependencies>
</profile>
<!--
@@ -430,10 +435,6 @@
<version>${version.jmx.invoker.adaptor.client}</version>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs30</artifactId>
- </dependency>
</dependencies>
</profile>
@@ -460,10 +461,6 @@
<scope>test</scope>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs21</artifactId>
- </dependency>
</dependencies>
</profile>
@@ -490,10 +487,6 @@
<scope>test</scope>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs21</artifactId>
- </dependency>
</dependencies>
</profile>
@@ -526,10 +519,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs21</artifactId>
- </dependency>
</dependencies>
</profile>
@@ -562,10 +551,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs30</artifactId>
- </dependency>
</dependencies>
</profile>
14 years, 3 months
- 1
- 0