[jboss-osgi-commits] JBoss-OSGI SVN: r93632 - in projects/jboss-osgi/projects: bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-09-17 02:18:06 -0400 (Thu, 17 Sep 2009) New Revision: 93632 Modified: projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/DeploymentRegistryServiceImpl.java projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/InstallActionExt.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleDeployment.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleDeploymentFactory.java Log: Use String instead of non-serializable Version Modified: projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/DeploymentRegistryServiceImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/DeploymentRegistryServiceImpl.java 2009-09-17 05:57:09 UTC (rev 93631) +++ projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/DeploymentRegistryServiceImpl.java 2009-09-17 06:18:06 UTC (rev 93632) @@ -66,7 +66,7 @@ for (BundleDeployment auxDep : deployments) { String auxName = auxDep.getSymbolicName(); - Version auxVersion = auxDep.getVersion(); + String auxVersion = auxDep.getVersion(); if (symbolicName.equals(auxName) && version.equals(auxVersion)) { dep = auxDep; Modified: projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java =================================================================== --- projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java 2009-09-17 05:57:09 UTC (rev 93631) +++ projects/jboss-osgi/projects/bundles/common/trunk/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java 2009-09-17 06:18:06 UTC (rev 93632) @@ -192,7 +192,7 @@ private Bundle getBundle(BundleDeployment dep) { String symbolicName = dep.getSymbolicName(); - Version version = dep.getVersion(); + Version version = Version.parseVersion(dep.getVersion()); Bundle bundle = null; for (Bundle aux : context.getBundles()) Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2009-09-17 05:57:09 UTC (rev 93631) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2009-09-17 06:18:06 UTC (rev 93632) @@ -318,7 +318,7 @@ private Bundle getBundle(BundleDeployment dep) { String symbolicName = dep.getSymbolicName(); - Version version = dep.getVersion(); + Version version = Version.parseVersion(dep.getVersion()); Bundle bundle = null; for (Bundle aux : context.getBundles()) 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-17 05:57:09 UTC (rev 93631) +++ projects/jboss-osgi/projects/bundles/webconsole/trunk/src/main/java/org/jboss/osgi/webconsole/internal/plugins/InstallActionExt.java 2009-09-17 06:18:06 UTC (rev 93632) @@ -87,7 +87,7 @@ private Bundle getBundle(BundleDeployment info) { String symbolicName = info.getSymbolicName(); - Version version = info.getVersion(); + Version version = Version.parseVersion(info.getVersion()); Bundle bundle = null; for (Bundle aux : getBundleContext().getBundles()) Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-09-17 05:57:09 UTC (rev 93631) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-09-17 06:18:06 UTC (rev 93632) @@ -68,9 +68,10 @@ public OSGiBundle installBundle(String location) throws BundleException { URL bundleURL = getTestHelper().getTestArchiveURL(location); + BundleDeployment bundleDep = BundleDeploymentFactory.createBundleDeployment(bundleURL); String symbolicName = bundleDep.getSymbolicName(); - Version version = bundleDep.getVersion(); + Version version = Version.parseVersion(bundleDep.getVersion()); OSGiBundle bundle; Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleDeployment.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleDeployment.java 2009-09-17 05:57:09 UTC (rev 93631) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleDeployment.java 2009-09-17 06:18:06 UTC (rev 93632) @@ -24,8 +24,6 @@ import java.io.Serializable; import java.net.URL; -import org.osgi.framework.Version; - //$Id$ /** @@ -40,18 +38,21 @@ private URL location; private String symbolicName; - private Version version; + private String version; private int startLevel; private boolean autoStart; private Object metadata; - public BundleDeployment(URL location, String symbolicName, Version version) + public BundleDeployment(URL location, String symbolicName, String version) { if (location == null) throw new IllegalArgumentException("Location cannot be null"); if (symbolicName == null) throw new IllegalArgumentException("Symbolic name cannot be null"); + if (version == null) + version = "0.0.0"; + this.symbolicName = symbolicName; this.location = location; this.version = version; @@ -76,7 +77,7 @@ /** * Get the bundle version */ - public Version getVersion() + public String getVersion() { return version; } @@ -148,6 +149,6 @@ @Override public String toString() { - return "[" + symbolicName + ":" + version + "]"; + return "[" + symbolicName + "-" + version + ",url=" + location + "]"; } } \ No newline at end of file Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleDeploymentFactory.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleDeploymentFactory.java 2009-09-17 05:57:09 UTC (rev 93631) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/BundleDeploymentFactory.java 2009-09-17 06:18:06 UTC (rev 93632) @@ -31,7 +31,6 @@ import org.osgi.framework.BundleException; import org.osgi.framework.Constants; -import org.osgi.framework.Version; /** * A factory for bundle deployments. @@ -61,8 +60,7 @@ if (symbolicName == null) throw new BundleException("Cannot obtain Bundle-SymbolicName for: " + url); - String versionStr = attribs.getValue(Constants.BUNDLE_VERSION); - Version version = Version.parseVersion(versionStr); + String version = attribs.getValue(Constants.BUNDLE_VERSION); return new BundleDeployment(url, symbolicName, version); } } \ No newline at end of file