[jboss-osgi-commits] JBoss-OSGI SVN: r93349 - in projects/jboss-osgi/projects/bundles/webconsole/trunk: src/main/java/org/jboss/osgi/service/webconsole and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-09-10 06:38:54 -0400 (Thu, 10 Sep 2009) New Revision: 93349 Removed: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/service/webconsole/internal/ Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/BundlesPlugin.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/InstallActionExt.java Log: Update to SPI 1.0.1 Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2009-09-10 10:33:59 UTC (rev 93348) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2009-09-10 10:38:54 UTC (rev 93349) @@ -21,13 +21,13 @@ <artifactId>jboss-osgi-webconsole</artifactId> <packaging>bundle</packaging> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> <!-- Parent --> <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <!-- Properties --> @@ -35,11 +35,11 @@ <version.commons.fileupload>1.1.1</version.commons.fileupload> <version.commons.io>1.4</version.commons.io> <version.felix.bundlerepository>1.0.3</version.felix.bundlerepository> - <version.felix.osgi.core>1.2.0</version.felix.osgi.core> + <version.felix.osgi.core>1.3.0-SNAPSHOT</version.felix.osgi.core> <version.felix.scr>1.0.0</version.felix.scr> <version.felix.webconsole>1.2.10</version.felix.webconsole> <version.javax.servlet>2.4</version.javax.servlet> - <version.jboss.osgi.spi>1.0.0</version.jboss.osgi.spi> + <version.jboss.osgi.spi>1.0.1-SNAPSHOT</version.jboss.osgi.spi> <version.json>20070829</version.json> </properties> Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/BundlesPlugin.java =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/BundlesPlugin.java 2009-09-10 10:33:59 UTC (rev 93348) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/BundlesPlugin.java 2009-09-10 10:38:54 UTC (rev 93349) @@ -34,8 +34,8 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; -import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference; +import org.osgi.framework.Version; import org.osgi.service.log.LogService; /** @@ -70,7 +70,7 @@ DeploymentRegistryService registry = (DeploymentRegistryService)context.getService(sref); String symbolicName = bundle.getSymbolicName(); - String version = (String)bundle.getHeaders().get(Constants.BUNDLE_VERSION); + Version version = bundle.getVersion(); BundleDeployment dep = registry.getBundleDeployment(symbolicName, version); if (dep == null) { Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/InstallActionExt.java =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/InstallActionExt.java 2009-09-10 10:33:59 UTC (rev 93348) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/InstallActionExt.java 2009-09-10 10:38:54 UTC (rev 93349) @@ -37,6 +37,7 @@ import org.osgi.framework.BundleException; import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference; +import org.osgi.framework.Version; import org.osgi.service.log.LogService; /** @@ -47,7 +48,6 @@ */ public class InstallActionExt extends InstallAction { - @Override protected void installBackground(final File bundleFile, final String location, final int startlevel, final boolean doStart, boolean refreshPackages) { BundleContext context = getBundleContext(); @@ -87,7 +87,7 @@ private Bundle getBundle(BundleDeployment info) { String symbolicName = info.getSymbolicName(); - String version = info.getVersion(); + Version version = info.getVersion(); Bundle bundle = null; for (Bundle aux : getBundleContext().getBundles())