3:08 p.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-12-14 16:08:40 -0500 (Mon, 14 Dec 2009)
New Revision: 97807
Modified:
projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java
projects/jboss-osgi/trunk/pom.xml
Log:
Update Deployers to use string location
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-12-14 21:07:03
UTC (rev 97806)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-12-14 21:08:40
UTC (rev 97807)
@@ -21,7 +21,7 @@
<artifactId>jboss-osgi-microcontainer</artifactId>
<packaging>bundle</packaging>
- <version>2.0.10-SNAPSHOT</version>
+ <version>2.0.9-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -44,13 +44,13 @@
<version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer>
<version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
- <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
- <version.jboss.osgi.husky>1.0.2</version.jboss.osgi.husky>
+
<version.jboss.osgi.deployment>1.0.1-SNAPSHOT</version.jboss.osgi.deployment>
+ <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb>
<version.jboss.osgi.jmx>1.0.2</version.jboss.osgi.jmx>
<version.jboss.osgi.reflect>2.0.2</version.jboss.osgi.reflect>
-
<version.jboss.osgi.runtime.deployers>1.0.3</version.jboss.osgi.runtime.deployers>
- <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+
<version.jboss.osgi.runtime.deployers>1.0.4-SNAPSHOT</version.jboss.osgi.runtime.deployers>
+ <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.xml.binding>2.0.2.Beta3</version.jboss.osgi.xml.binding>
<version.osgi>4.2.0</version.osgi>
</properties>
Modified: projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml 2009-12-14 21:07:03 UTC
(rev 97806)
+++ projects/jboss-osgi/projects/runtime/deployers/trunk/pom.xml 2009-12-14 21:08:40 UTC
(rev 97807)
@@ -31,8 +31,8 @@
<properties>
<version.jboss.deployers>2.0.9.GA</version.jboss.deployers>
- <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
- <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+
<version.jboss.osgi.deployment>1.0.1-SNAPSHOT</version.jboss.osgi.deployment>
+ <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
Modified:
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java
===================================================================
---
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java 2009-12-14
21:07:03 UTC (rev 97806)
+++
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleMetaData.java 2009-12-14
21:08:40 UTC (rev 97807)
@@ -23,11 +23,8 @@
//$Id$
-import java.net.URL;
-
import org.jboss.deployers.vfs.spi.deployer.helpers.AbstractManifestMetaData;
-
/**
* The Bundle metadata.
*
@@ -36,36 +33,36 @@
*/
public class BundleMetaData extends AbstractManifestMetaData
{
- private String symbolicName;
- private URL bundleLocation;
+ private String symbolicName;
+ private String bundleLocation;
// exteralizable usage
- public BundleMetaData()
- {
- }
+ public BundleMetaData()
+ {
+ }
public BundleMetaData(String symbolicName)
- {
- this.symbolicName = symbolicName;
- }
+ {
+ this.symbolicName = symbolicName;
+ }
- public String getSymbolicName()
- {
- return symbolicName;
- }
+ public String getSymbolicName()
+ {
+ return symbolicName;
+ }
- public URL getBundleLocation()
- {
- return bundleLocation;
- }
+ public String getBundleLocation()
+ {
+ return bundleLocation;
+ }
- public void setBundleLocation(URL bundleLocation)
- {
- this.bundleLocation = bundleLocation;
- }
-
- public String toString()
- {
- return "Bundle[name=" + symbolicName + "]";
- }
+ public void setBundleLocation(String bundleLocation)
+ {
+ this.bundleLocation = bundleLocation;
+ }
+
+ public String toString()
+ {
+ return "Bundle[name=" + symbolicName + "]";
+ }
}
Modified:
projects/jboss-osgi/projects/runtime/deployers/trunk/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 2009-12-14
21:07:03 UTC (rev 97806)
+++
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleMetaDataDeployer.java 2009-12-14
21:08:40 UTC (rev 97807)
@@ -23,7 +23,6 @@
//$Id$
-import java.net.URL;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
@@ -60,7 +59,7 @@
log.debug("Bundle-SymbolicName: " + symbolicName + " in " +
file);
Deployment dep = unit.getAttachment(Deployment.class);
- URL location = (dep != null ? dep.getLocation() : unit.getRoot().toURL());
+ String location = (dep != null ? dep.getLocation() : unit.getName());
metaData.setBundleLocation(location);
// Add a marker that this is an OSGi deployment
Modified:
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java
===================================================================
---
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java 2009-12-14
21:07:03 UTC (rev 97806)
+++
projects/jboss-osgi/projects/runtime/deployers/trunk/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java 2009-12-14
21:08:40 UTC (rev 97807)
@@ -69,21 +69,17 @@
public void deploy(DeploymentUnit unit, BundleMetaData metadata) throws
DeploymentException
{
- URL bundleURL = metadata.getBundleLocation();
- if (bundleURL == null)
+ String location = metadata.getBundleLocation();
+ if (location == null)
throw new IllegalStateException("Cannot obtain bundle location for: "
+ metadata);
- String bundlePath = bundleURL.getPath();
- if (bundlePath.endsWith("/"))
- bundlePath = bundlePath.substring(0, bundlePath.length() - 1);
-
try
{
boolean skipBundle = false;
for (URL skip : skipBundles)
{
String skipPath = skip.getPath();
- if (skipPath.equals(bundlePath))
+ if (skipPath.equals(location))
{
skipBundle = true;
break;
@@ -91,7 +87,7 @@
}
if (skipBundle == false)
{
- Bundle bundle = systemContext.installBundle(bundleURL.toString());
+ Bundle bundle = systemContext.installBundle(location);
unit.addAttachment(Bundle.class, bundle);
log.info("Installed: " + bundle);
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-12-14 21:07:03 UTC (rev 97806)
+++ projects/jboss-osgi/trunk/pom.xml 2009-12-14 21:08:40 UTC (rev 97807)
@@ -61,9 +61,9 @@
<version.jboss.osgi.jmx>1.0.2.SP1</version.jboss.osgi.jmx>
<version.jboss.osgi.jndi>1.0.2</version.jboss.osgi.jndi>
<version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta>
-
<version.jboss.osgi.microcontainer>2.0.9</version.jboss.osgi.microcontainer>
+
<version.jboss.osgi.microcontainer>2.0.9-SNAPSHOT</version.jboss.osgi.microcontainer>
<version.jboss.osgi.reflect>2.0.2</version.jboss.osgi.reflect>
-
<version.jboss.osgi.runtime.deployers>1.0.3</version.jboss.osgi.runtime.deployers>
+
<version.jboss.osgi.runtime.deployers>1.0.4-SNAPSHOT</version.jboss.osgi.runtime.deployers>
<version.jboss.osgi.runtime.equinox>3.5.1</version.jboss.osgi.runtime.equinox>
<version.jboss.osgi.runtime.felix>2.0.2</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.runtime.jbossas>1.0.2</version.jboss.osgi.runtime.jbossas>