[jboss-osgi-commits] JBoss-OSGI SVN: r88423 - in projects/jboss-osgi/trunk: bundle/microcontainer/src/main/resources/META-INF and 1 other directories.
Author: thomas.diesler(a)jboss.com
Date: 2009-05-08 07:44:20 -0400 (Fri, 08 May 2009)
New Revision: 88423
Modified:
projects/jboss-osgi/trunk/bundle/microcontainer/src/main/resources/META-INF/base-deployers-beans.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
Log:
Fix unresolved constraint
Modified:
projects/jboss-osgi/trunk/bundle/microcontainer/src/main/resources/META-INF/base-deployers-beans.xml
===================================================================
---
projects/jboss-osgi/trunk/bundle/microcontainer/src/main/resources/META-INF/base-deployers-beans.xml 2009-05-08
11:33:07 UTC (rev 88422)
+++
projects/jboss-osgi/trunk/bundle/microcontainer/src/main/resources/META-INF/base-deployers-beans.xml 2009-05-08
11:44:20 UTC (rev 88423)
@@ -79,7 +79,8 @@
<!-- The Framework Management -->
<bean name="jboss.osgi:service=ManagedFramework"
class="org.jboss.osgi.spi.management.ManagedFramework">
- <property name="mbeanServer"><inject
bean="jboss.osgi:service=MBeanServer"/></property>
+ <property name="systemContext"><inject
bean="jboss.osgi:service=BundleContext" /></property>
+ <property name="mbeanServer"><inject
bean="jboss.osgi:service=MBeanServer"/></property>
</bean>
<bean name="BundleMetaDataDeployer"
class="org.jboss.osgi.deployer.BundleMetaDataDeployer" />
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-05-08 11:33:07 UTC (rev 88422)
+++ projects/jboss-osgi/trunk/pom.xml 2009-05-08 11:44:20 UTC (rev 88423)
@@ -519,6 +519,50 @@
</dependencies>
</profile>
+ <!--
+ Name: jboss510
+ Descr: Setup for jboss510 integration testing
+ -->
+ <profile>
+ <id>jboss510</id>
+ <activation>
+ <property>
+ <name>target.container</name>
+ <value>jboss510</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <scope>test</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!--
+ Name: jboss600
+ Descr: Setup for jboss600 integration testing
+ -->
+ <profile>
+ <id>jboss600</id>
+ <activation>
+ <property>
+ <name>target.container</name>
+ <value>jboss600</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <scope>test</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </profile>
+
</profiles>
</project>
Modified:
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
---
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-05-08
11:33:07 UTC (rev 88422)
+++
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-05-08
11:44:20 UTC (rev 88423)
@@ -29,6 +29,7 @@
org.jboss.osgi.jndi,
org.jboss.osgi.jmx,
org.jboss.osgi.microcontainer,
+ org.jboss.osgi.spi,
org.jboss.osgi.spi.logging,
org.jboss.osgi.spi.management,