Author: thomas.diesler(a)jboss.com Date: 2009-08-25 15:49:33 -0400 (Tue, 25 Aug 2009) New Revision: 92809 Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageRequirement.java projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/metadata/AbstractVersionRange.java projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTestCase.java Log: Fix import package version range parsing Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml 2009-08-25 19:27:32 UTC (rev 92808) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml 2009-08-25 19:49:33 UTC (rev 92809) @@ -33,7 +33,7 @@ <!-- Properties --> <properties> - <version.apache.felix.log>1.1.0-SNAPSHOT</version.apache.felix.log> + <version.apache.felix.log>1.0.0</version.apache.felix.log> <version.jboss.aop>2.1.0.CR3</version.jboss.aop> <version.jboss.classloading>2.0.7-SNAPSHOT</version.jboss.classloading> <version.jboss.deployers>2.0.8.GA</version.jboss.deployers> Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageRequirement.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageRequirement.java 2009-08-25 19:27:32 UTC (rev 92808) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageRequirement.java 2009-08-25 19:49:33 UTC (rev 92809) @@ -61,19 +61,19 @@ String name = requirePackage.getAttribute(); AbstractVersionRange range = null; - String version = requirePackage.getParameterValue(Constants.VERSION_ATTRIBUTE, String.class); - if (version != null) + String versionString = requirePackage.getParameterValue(Constants.VERSION_ATTRIBUTE, String.class); + if (versionString != null) { - range = (AbstractVersionRange) AbstractVersionRange.valueOf(version); - String old = requirePackage.getParameterValue(Constants.PACKAGE_SPECIFICATION_VERSION, String.class); - if (old != null && old.equals(version) == false) - throw new IllegalStateException(Constants.VERSION_ATTRIBUTE + " of " + version + " does not match " + Constants.PACKAGE_SPECIFICATION_VERSION + " of " + old); + range = (AbstractVersionRange) AbstractVersionRange.valueOf(versionString); + String oldVersionString = requirePackage.getParameterValue(Constants.PACKAGE_SPECIFICATION_VERSION, String.class); + if (oldVersionString != null && oldVersionString.equals(versionString) == false) + throw new IllegalStateException(Constants.VERSION_ATTRIBUTE + " of " + versionString + " does not match " + Constants.PACKAGE_SPECIFICATION_VERSION + " of " + oldVersionString); } else { - version = requirePackage.getParameterValue(Constants.PACKAGE_SPECIFICATION_VERSION, String.class); - if (version != null) - range = (AbstractVersionRange) AbstractVersionRange.valueOf(version); + versionString = requirePackage.getParameterValue(Constants.PACKAGE_SPECIFICATION_VERSION, String.class); + if (versionString != null) + range = (AbstractVersionRange) AbstractVersionRange.valueOf(versionString); } return new OSGiPackageRequirement(name, range, requirePackage); Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/metadata/AbstractVersionRange.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/metadata/AbstractVersionRange.java 2009-08-25 19:27:32 UTC (rev 92808) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/metadata/AbstractVersionRange.java 2009-08-25 19:49:33 UTC (rev 92809) @@ -68,6 +68,10 @@ if (rangeSpec == null) throw new IllegalArgumentException("Null rangeSpec"); + // Handle version strings with quotes + if (rangeSpec.startsWith("\"") && rangeSpec.endsWith("\"")) + rangeSpec = rangeSpec.substring(1, rangeSpec.length() - 1); + Version floor = null; Version ceiling = null; StringTokenizer st = new StringTokenizer(rangeSpec, ",[]()", true); Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTestCase.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTestCase.java 2009-08-25 19:27:32 UTC (rev 92808) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTestCase.java 2009-08-25 19:49:33 UTC (rev 92809) @@ -148,10 +148,8 @@ assertNotNull("Result property not null", result); assertTrue("BundleActivator start", result.indexOf("startBundleActivator") > 0); - - System.out.println("FIXME [JBOSGI-135] Cannot handle package beeing imported and exported by the same bundle"); - //assertTrue("getService", result.indexOf("getService") > 0); - //assertTrue("addingService", result.indexOf("addingService") > 0); + assertTrue("getService", result.indexOf("getService") > 0); + assertTrue("addingService", result.indexOf("addingService") > 0); framework.stop(); }