Author: thomas.diesler(a)jboss.com Date: 2010-01-13 15:12:32 -0500 (Wed, 13 Jan 2010) New Revision: 99356 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/smoke/OSGiSmokeTestCase.java projects/jboss-osgi/trunk/reactor/pom.xml Log: Default to Bundle-ManifestVersion: 2 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-01-13 19:57:37 UTC (rev 99355) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-01-13 20:12:32 UTC (rev 99356) @@ -402,6 +402,7 @@ Attributes attributes = manifest.getMainAttributes(); attributes.put(new Name(Constants.BUNDLE_NAME), unit.getName()); attributes.put(new Name(Constants.BUNDLE_SYMBOLICNAME), unit.getName()); + attributes.put(new Name(Constants.BUNDLE_MANIFESTVERSION), "2"); osgiMetaData = new AbstractOSGiMetaData(manifest); unit.addAttachment(OSGiMetaData.class, osgiMetaData); } Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java 2010-01-13 19:57:37 UTC (rev 99355) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java 2010-01-13 20:12:32 UTC (rev 99356) @@ -61,6 +61,7 @@ Attributes attributes = manifest.getMainAttributes(); attributes.put(new Name(Constants.BUNDLE_NAME), Constants.SYSTEM_BUNDLE_SYMBOLICNAME); attributes.put(new Name(Constants.BUNDLE_SYMBOLICNAME), Constants.SYSTEM_BUNDLE_SYMBOLICNAME); + attributes.put(new Name(Constants.BUNDLE_MANIFESTVERSION), "2"); osgiMetaData = new AbstractOSGiMetaData(manifest); } Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java 2010-01-13 19:57:37 UTC (rev 99355) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java 2010-01-13 20:12:32 UTC (rev 99356) @@ -94,6 +94,7 @@ Dictionary expected = new Hashtable(); expected.put(Constants.BUNDLE_NAME, Constants.SYSTEM_BUNDLE_SYMBOLICNAME); expected.put(Constants.BUNDLE_SYMBOLICNAME, Constants.SYSTEM_BUNDLE_SYMBOLICNAME); + expected.put(Constants.BUNDLE_MANIFESTVERSION, "2"); // todo expected.put(Attributes.Name.IMPLEMENTATION_TITLE.toString(), "JBoss OSGi"); // todo expected.put(Attributes.Name.IMPLEMENTATION_VENDOR.toString(), "jboss.org"); // todo expected.put(Attributes.Name.IMPLEMENTATION_VERSION.toString(), "r4v41"); Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/smoke/OSGiSmokeTestCase.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/smoke/OSGiSmokeTestCase.java 2010-01-13 19:57:37 UTC (rev 99355) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/smoke/OSGiSmokeTestCase.java 2010-01-13 20:12:32 UTC (rev 99356) @@ -109,7 +109,6 @@ { Manifest manifest = new Manifest(); Attributes attributes = manifest.getMainAttributes(); - attributes.putValue("Bundle-Name", "SmokeDeployment"); attributes.putValue("Bundle-SymbolicName", "org.jboss.test.osgi.smoke.deployment"); OSGiMetaData metaData = new AbstractOSGiMetaData(manifest); Bundle bundle = deployBundle("smoke-deployment", metaData, A.class); Modified: projects/jboss-osgi/trunk/reactor/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/pom.xml 2010-01-13 19:57:37 UTC (rev 99355) +++ projects/jboss-osgi/trunk/reactor/pom.xml 2010-01-13 20:12:32 UTC (rev 99356) @@ -18,7 +18,7 @@ To pull in a particular subproject, set one or more svn:external definitions. For example - framework https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... + ../../projects/runtime/framework/trunk framework <module>framework</module>