3:37 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2010-01-14 04:37:45 -0500 (Thu, 14 Jan 2010)
New Revision: 99394
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/trunk/testsuite/functional/pom.xml
Log:
Update jboss-aop-mc-int-2.2.0.Alpha1
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-14
09:01:51 UTC (rev 99393)
+++
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-01-14
09:37:45 UTC (rev 99394)
@@ -400,9 +400,7 @@
manifest = new Manifest();
// [TODO] populate some bundle information
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-14
09:01:51 UTC (rev 99393)
+++
projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java 2010-01-14
09:37:45 UTC (rev 99394)
@@ -59,9 +59,7 @@
{
Manifest manifest = new Manifest();
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-14
09:01:51 UTC (rev 99393)
+++
projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java 2010-01-14
09:37:45 UTC (rev 99394)
@@ -92,9 +92,7 @@
public void testGetHeaders() throws Exception
{
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/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-01-14 09:01:51 UTC (rev
99393)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-01-14 09:37:45 UTC (rev
99394)
@@ -38,21 +38,15 @@
<properties>
<version.javax.ejb>3.0</version.javax.ejb>
<version.jboss.ejb3>1.0.0</version.jboss.ejb3>
- <version.jboss.aop.mc.int>2.2.0.M2</version.jboss.aop.mc.int>
+ <version.jboss.aop.mc.int>2.2.0.Alpha2</version.jboss.aop.mc.int>
</properties>
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
<version>${version.jboss.aop.mc.int}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>javax.ejb</groupId>