[jboss-osgi-commits] JBoss-OSGI SVN: r89552 - in projects/jboss-osgi/trunk: runtime/felix/src/main/resources and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-05-30 10:10:05 -0400 (Sat, 30 May 2009) New Revision: 89552 Removed: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/deployer/ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/jndi/ Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Allign equinox, knopflerfish AS integration - WIP Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-05-30 13:56:38 UTC (rev 89551) +++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-05-30 14:10:05 UTC (rev 89552) @@ -26,18 +26,31 @@ <entry> <key>org.osgi.framework.system.packages</key> <value> + <!-- system --> javax.management, javax.xml.parsers, - org.jboss.logging, + org.xml.sax + + <!-- jboss --> + org.jboss.osgi.common.service;version=1.0, + org.jboss.osgi.jbossas.integration, org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.logging;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.testing;version=1.0, org.jboss.osgi.spi.testing.capability;version=1.0, - org.osgi.framework; version=1.4, - org.osgi.service.packageadmin; version=1.2, - org.osgi.service.startlevel; version=1.1, - org.xml.sax + org.jboss.xb.binding;version=2.0, + org.jboss.xb.binding.sunday.unmarshalling;version=2.0, + + <!-- compendium --> + org.osgi.service.event;version=1.1, + org.osgi.service.http;version=1.2, + org.osgi.service.log;version=1.3, + + <!-- core --> + org.osgi.framework;version=1.4, + org.osgi.service.packageadmin;version=1.2, + org.osgi.service.startlevel;version=1.1, </value> </entry> <!-- @@ -74,20 +87,26 @@ ******************************** --> - <!-- A Service that gives access to the Microcontainer --> - <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.microcontainer.internal.MicrocontainerServiceBean"> + <!-- Common Services --> + <bean name="jboss.osgi:service=Common" class="org.jboss.osgi.jbossas.integration.CommonServicesBean"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + + <!-- Microcontainer Service --> + <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.jbossas.integration.MicrocontainerServiceBean"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> </bean> - <!-- A Service that gives access to JNDI --> - <bean name="jboss.osgi:service=Naming" class="org.jboss.osgi.jndi.internal.NamingServiceBean"> + <!-- Naming Service --> + <bean name="jboss.osgi:service=Naming" class="org.jboss.osgi.jbossas.integration.NamingServiceBean"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> </bean> - <!-- A Service that gives access to the MBeanServer --> - <bean name="jboss.osgi:service=Management" class="org.jboss.osgi.jmx.internal.ManagementServiceBean"> + <!-- Management Service --> + <bean name="jboss.osgi:service=Management" class="org.jboss.osgi.jbossas.integration.ManagementServiceBean"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> </bean> 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-30 13:56:38 UTC (rev 89551) +++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-05-30 14:10:05 UTC (rev 89552) @@ -25,8 +25,11 @@ <entry> <key>org.osgi.framework.system.packages.extra</key> <value> + <!-- system --> org.apache.xerces.dom, org.jboss.logging, + + <!-- jboss --> org.jboss.osgi.common.service;version=1.0, org.jboss.osgi.jbossas.integration, org.jboss.osgi.spi;version=1.0, @@ -36,6 +39,8 @@ org.jboss.osgi.spi.testing.capability;version=1.0, org.jboss.xb.binding;version=2.0, org.jboss.xb.binding.sunday.unmarshalling;version=2.0, + + <!-- compendium --> org.osgi.service.event;version=1.1, org.osgi.service.http;version=1.2, org.osgi.service.log;version=1.3, Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-05-30 13:56:38 UTC (rev 89551) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-05-30 14:10:05 UTC (rev 89552) @@ -25,18 +25,31 @@ <entry> <key>org.osgi.framework.system.packages</key> <value> + <!-- system --> javax.management, javax.xml.parsers, - org.jboss.logging, + org.xml.sax + + <!-- jboss --> + org.jboss.osgi.common.service;version=1.0, + org.jboss.osgi.jbossas.integration, org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.logging;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.testing;version=1.0, org.jboss.osgi.spi.testing.capability;version=1.0, - org.osgi.framework; version=1.4, - org.osgi.service.packageadmin; version=1.2, - org.osgi.service.startlevel; version=1.1, - org.xml.sax + org.jboss.xb.binding;version=2.0, + org.jboss.xb.binding.sunday.unmarshalling;version=2.0, + + <!-- compendium --> + org.osgi.service.event;version=1.1, + org.osgi.service.http;version=1.2, + org.osgi.service.log;version=1.3, + + <!-- core --> + org.osgi.framework;version=1.4, + org.osgi.service.packageadmin;version=1.2, + org.osgi.service.startlevel;version=1.1, </value> </entry> <!-- @@ -73,20 +86,26 @@ ******************************** --> - <!-- A Service that gives access to the Microcontainer --> - <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.microcontainer.internal.MicrocontainerServiceBean"> + <!-- Common Services --> + <bean name="jboss.osgi:service=Common" class="org.jboss.osgi.jbossas.integration.CommonServicesBean"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + + <!-- Microcontainer Service --> + <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.jbossas.integration.MicrocontainerServiceBean"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> </bean> - <!-- A Service that gives access to JNDI --> - <bean name="jboss.osgi:service=Naming" class="org.jboss.osgi.jndi.internal.NamingServiceBean"> + <!-- Naming Service --> + <bean name="jboss.osgi:service=Naming" class="org.jboss.osgi.jbossas.integration.NamingServiceBean"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> </bean> - <!-- A Service that gives access to the MBeanServer --> - <bean name="jboss.osgi:service=Management" class="org.jboss.osgi.jmx.internal.ManagementServiceBean"> + <!-- Management Service --> + <bean name="jboss.osgi:service=Management" class="org.jboss.osgi.jbossas.integration.ManagementServiceBean"> <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> </bean> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-05-30 13:56:38 UTC (rev 89551) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-05-30 14:10:05 UTC (rev 89552) @@ -276,8 +276,6 @@ <excludes> <!-- Exclude tests that require jboss access --> <exclude>org/jboss/test/osgi/jbossas/**</exclude> - <!-- Temporarily disable remote log against runtime (fails in hudson) --> - <exclude>org/jboss/test/osgi/example/log/LogServiceTestCase.java</exclude> </excludes> </configuration> </plugin>