Author: thomas.diesler(a)jboss.com Date: 2009-08-25 13:23:27 -0400 (Tue, 25 Aug 2009) New Revision: 92801 Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleState.java projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageCapability.java projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/resources/ Log: Fix symbolic name parser issue Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleState.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleState.java 2009-08-25 17:16:29 UTC (rev 92800) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleState.java 2009-08-25 17:23:27 UTC (rev 92801) @@ -181,10 +181,7 @@ public String getSymbolicName() { - String symbolicName = osgiMetaData.getBundleSymbolicName(); - if (symbolicName == null) - throw new IllegalStateException("Cannot obtain " + Constants.BUNDLE_SYMBOLICNAME); - return symbolicName; + return osgiMetaData.getBundleSymbolicName(); } public Version getVersion() Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageCapability.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageCapability.java 2009-08-25 17:16:29 UTC (rev 92800) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageCapability.java 2009-08-25 17:23:27 UTC (rev 92801) @@ -74,6 +74,7 @@ String name = exportPackage.getAttribute(); String versionString = exportPackage.getParameterValue(Constants.VERSION_ATTRIBUTE, String.class); + String oldVersionString = exportPackage.getParameterValue(Constants.PACKAGE_SPECIFICATION_VERSION, String.class); if (oldVersionString != null) { @@ -82,8 +83,13 @@ if (versionString == null) versionString = oldVersionString; } + + // [TODO] Handle version strings with quotes + //if (versionString.startsWith("\"") && versionString.endsWith("\"")) + // versionString = versionString.substring(1, versionString.length() - 1); + Version version = Version.parseVersion(versionString); - + return new OSGiPackageCapability(name, version, metadata, exportPackage); } Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java 2009-08-25 17:16:29 UTC (rev 92800) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java 2009-08-25 17:23:27 UTC (rev 92801) @@ -171,10 +171,20 @@ public String getBundleSymbolicName() { + String symbolicName = null; + ParameterizedAttribute parameters = parseSymbolicName(); - if (parameters == null) - return null; - return parameters.getAttribute(); + if (parameters != null) + symbolicName = parameters.getAttribute(); + + // [TODO] Remove this fall back + if (symbolicName == null) + symbolicName = getMainAttribute(Constants.BUNDLE_SYMBOLICNAME); + + if (symbolicName == null) + throw new IllegalStateException("Cannot obtain " + Constants.BUNDLE_SYMBOLICNAME); + + return symbolicName; } public ParameterizedAttribute getBundleParameters() Property changes on: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/resources ___________________________________________________________________ Name: svn:ignore + log4j.xml