[jboss-osgi-commits] JBoss-OSGI SVN: r97726 - in projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2: src/main/java/org/jboss/osgi/framework/bundle and 1 other directory.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-12-11 08:12:03 -0500 (Fri, 11 Dec 2009)
New Revision: 97726

Modified:
   projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/pom.xml
   projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
Log:
Update to new Deployment API

Modified: projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/pom.xml	2009-12-11 12:56:09 UTC (rev 97725)
+++ projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/pom.xml	2009-12-11 13:12:03 UTC (rev 97726)
@@ -26,7 +26,7 @@
   <artifactId>jboss-osgi-framework</artifactId>
   <packaging>bundle</packaging>
 
-  <version>1.0.0.Alpha2</version>
+  <version>1.0.0.Alpha2-SNAPSHOT</version>
 
   <parent>
     <groupId>org.jboss.osgi</groupId>
@@ -47,12 +47,12 @@
     <version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces>
     <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.runtime.deployers>1.0.3</version.jboss.osgi.runtime.deployers>
-    <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+    <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.jboss.test>1.1.4.GA</version.jboss.test>
     <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>

Modified: projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java	2009-12-11 12:56:09 UTC (rev 97725)
+++ projects/jboss-osgi/projects/runtime/framework/branches/1.0.0.Alpha2/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java	2009-12-11 13:12:03 UTC (rev 97726)
@@ -110,9 +110,6 @@
    /** The bundle manager's bean name: OSGiBundleManager */
    public static final String BEAN_BUNDLE_MANAGER = "OSGiBundleManager";
 
-   /** The string representation of this bundle's location identifier. */
-   public static final String PROPERTY_BUNDLE_LOCATION = "org.jboss.osgi.bundle.location";
-
    /** The framework version */
    private static String OSGi_FRAMEWORK_VERSION = "r4v42"; // [TODO] externalise
 
@@ -641,9 +638,10 @@
          osgiMetaData = new AbstractOSGiMetaData(manifest);
       }
 
-      String location = (String)unit.getAttachment(PROPERTY_BUNDLE_LOCATION);
-      if (location == null)
-         location = unit.getName();
+      // The bundle location is not necessarily the bundle root url
+      // The framework is expected to preserve the location passed into installBundle(String)
+      Deployment dep = unit.getAttachment(Deployment.class);
+      String location = (dep != null ? dep.getLocation() : unit.getName());
 
       OSGiBundleState bundleState = new OSGiBundleState(location, osgiMetaData, unit);
       addBundle(bundleState);