JBoss-OSGI SVN: r88074 - projects/jboss-osgi/trunk/bundle.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-30 17:04:43 -0400 (Thu, 30 Apr 2009)
New Revision: 88074
Modified:
projects/jboss-osgi/trunk/bundle/pom.xml
Log:
build all bundles
Modified: projects/jboss-osgi/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-30 20:05:16 UTC (rev 88073)
+++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-30 21:04:43 UTC (rev 88074)
@@ -11,7 +11,7 @@
<version>1.0.0.Beta2</version>
</parent>
- <!-- Modules
+ <!-- Modules -->
<modules>
<module>blueprint</module>
<module>common</module>
@@ -21,12 +21,13 @@
<module>remotelog</module>
<module>webconsole</module>
</modules>
- -->
- <!-- -->
+
+ <!--
<modules>
<module>blueprint</module>
<module>microcontainer</module>
</modules>
+ -->
</project>
15 years
- 1
- 0
JBoss-OSGI SVN: r88068 - in projects/jboss-osgi/trunk/bundle: blueprint/scripts and 5 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-30 09:51:38 -0400 (Thu, 30 Apr 2009)
New Revision: 88068
Added:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleA.bnd
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleB.bnd
Removed:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/beans/
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundle/
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd
Modified:
projects/jboss-osgi/trunk/bundle/blueprint/scripts/antrun-test-jars.xml
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/ServiceActivator.java
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/SomeService.java
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/SomeBean.java
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/SomeBeanMBean.java
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/META-INF/mcservice-jboss-beans.xml
projects/jboss-osgi/trunk/bundle/pom.xml
Log:
Restructure mcservice test bundles
Modified: projects/jboss-osgi/trunk/bundle/blueprint/scripts/antrun-test-jars.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/scripts/antrun-test-jars.xml 2009-04-30 13:12:46 UTC (rev 88067)
+++ projects/jboss-osgi/trunk/bundle/blueprint/scripts/antrun-test-jars.xml 2009-04-30 13:51:38 UTC (rev 88068)
@@ -43,20 +43,12 @@
<!-- Please add alphabetically -->
- <!-- jmx-test -->
+ <!-- jmx -->
<bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jmx-test.jar" files="${tests.resources.dir}/jmx/jmx-test.bnd" />
- <!-- mcservice-test -->
- <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/mcservice-bundle.jar" files="${tests.resources.dir}/mcservice/mcservice-bundle.bnd" />
- <jar jarfile="${tests.output.dir}/test-libs/mcservice-beans.jar">
- <fileset dir="${tests.classes.dir}">
- <include name="org/jboss/test/osgi/blueprint/mcservice/beans/SomeBean.class" />
- <include name="org/jboss/test/osgi/blueprint/mcservice/beans/SomeBeanMBean.class" />
- </fileset>
- <fileset dir="${tests.resources.dir}/mcservice">
- <include name="META-INF/mcservice-jboss-beans.xml" />
- </fileset>
- </jar>
+ <!-- mcservice -->
+ <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/mcservice-bundleA.jar" files="${tests.resources.dir}/mcservice/mcservice-bundleA.bnd" />
+ <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/mcservice-bundleB.jar" files="${tests.resources.dir}/mcservice/mcservice-bundleB.bnd" />
<!-- Please add alphabetically -->
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java 2009-04-30 13:12:46 UTC (rev 88067)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java 2009-04-30 13:51:38 UTC (rev 88068)
@@ -92,18 +92,18 @@
public void testBundleDeployment() throws Exception
{
MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer());
- mcService.deploy(getTestArchiveURL("mcservice-bundle.jar"));
+ mcService.deploy(getTestArchiveURL("mcservice-bundleA.jar"));
ManagedFrameworkMBean frameworkMBean = MBeanProxy.get(ManagedFrameworkMBean.class, MBEAN_MANAGED_FRAMEWORK, getMBeanServer());
Set<ObjectName> bundles = frameworkMBean.getBundles();
- assertTrue("Managed bundle registered", bundles.toString().indexOf("jboss.osgi:bundle=mcservice-bundle") > 0);
+ assertTrue("Managed bundle registered", bundles.toString().indexOf("jboss.osgi:bundle=mcservice-bundleA") > 0);
- mcService.undeploy(getTestArchiveURL("mcservice-bundle.jar"));
+ mcService.undeploy(getTestArchiveURL("mcservice-bundleA.jar"));
}
public void testBeansDeployment() throws Exception
{
- // MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer());
- // mcService.deploy(getTestArchiveURL("mcservice-beans.jar"));
+ MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer());
+// mcService.deploy(getTestArchiveURL("mcservice-bundleB.jar"));
}
}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA (from rev 88047, projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundle)
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/ServiceActivator.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundle/ServiceActivator.java 2009-04-30 04:43:05 UTC (rev 88047)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/ServiceActivator.java 2009-04-30 13:51:38 UTC (rev 88068)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.osgi.blueprint.mcservice.bundle;
+package org.jboss.test.osgi.blueprint.mcservice.bundleA;
//$Id$
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/SomeService.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundle/SomeService.java 2009-04-30 04:43:05 UTC (rev 88047)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/SomeService.java 2009-04-30 13:51:38 UTC (rev 88068)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.osgi.blueprint.mcservice.bundle;
+package org.jboss.test.osgi.blueprint.mcservice.bundleA;
//$Id$
Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB (from rev 88047, projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/beans)
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/SomeBean.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/beans/SomeBean.java 2009-04-30 04:43:05 UTC (rev 88047)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/SomeBean.java 2009-04-30 13:51:38 UTC (rev 88068)
@@ -19,14 +19,14 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.osgi.blueprint.mcservice.beans;
+package org.jboss.test.osgi.blueprint.mcservice.bundleB;
//$Id$
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.jboss.test.osgi.blueprint.mcservice.bundle.SomeService;
+import org.jboss.test.osgi.blueprint.mcservice.bundleA.SomeService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/SomeBeanMBean.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/beans/SomeBeanMBean.java 2009-04-30 04:43:05 UTC (rev 88047)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/SomeBeanMBean.java 2009-04-30 13:51:38 UTC (rev 88068)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.osgi.blueprint.mcservice.beans;
+package org.jboss.test.osgi.blueprint.mcservice.bundleB;
//$Id$
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/META-INF/mcservice-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/META-INF/mcservice-jboss-beans.xml 2009-04-30 13:12:46 UTC (rev 88067)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/META-INF/mcservice-jboss-beans.xml 2009-04-30 13:51:38 UTC (rev 88068)
@@ -1,6 +1,7 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="SomeBean" class="org.jboss.test.osgi.blueprint.mcservice.beans.SomeBean">
+ <bean name="SomeBean" class="org.jboss.test.osgi.blueprint.mcservice.bundleB.SomeBean">
+ <property name="mbeanServer"><inject bean="jboss.osgi:service=MBeanServer"/></property>
</bean>
</deployment>
Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd 2009-04-30 13:12:46 UTC (rev 88067)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd 2009-04-30 13:51:38 UTC (rev 88068)
@@ -1,8 +0,0 @@
-# bnd build -classpath target/test-classes -output target/test-libs/mcservice-bundle.jar src/test/resources/mcservice/mcservice-bundle.bnd
-
-Bundle-SymbolicName: mcservice-bundle
-Bundle-Activator: org.jboss.test.osgi.blueprint.mcservice.bundle.ServiceActivator
-Export-Package: org.jboss.test.osgi.blueprint.mcservice.bundle
-Import-Package: org.jboss.osgi.microcontainer, org.osgi.framework
-
-#org.jboss.test.osgi.blueprint.mcservice.beans;resolution=optional
Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleA.bnd (from rev 88067, projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd)
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleA.bnd (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleA.bnd 2009-04-30 13:51:38 UTC (rev 88068)
@@ -0,0 +1,6 @@
+# bnd build -classpath target/test-classes -output target/test-libs/mcservice-bundleA.jar src/test/resources/mcservice/mcservice-bundleA.bnd
+
+Bundle-SymbolicName: mcservice-bundleA
+Bundle-Activator: org.jboss.test.osgi.blueprint.mcservice.bundleA.ServiceActivator
+Export-Package: org.jboss.test.osgi.blueprint.mcservice.bundleA
+Import-Package: org.jboss.osgi.microcontainer, org.osgi.framework
Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleB.bnd
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleB.bnd (rev 0)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleB.bnd 2009-04-30 13:51:38 UTC (rev 88068)
@@ -0,0 +1,6 @@
+# bnd build -classpath target/test-classes -output target/test-libs/mcservice-bundleB.jar src/test/resources/mcservice/mcservice-bundleB.bnd
+
+Bundle-SymbolicName: mcservice-bundleB
+Export-Package: org.jboss.test.osgi.blueprint.mcservice.bundleB
+Import-Package: javax.management, org.osgi.framework, org.jboss.test.osgi.blueprint.mcservice.bundleA
+Include-Resource: META-INF/mcservice-jboss-beans.xml=META-INF/mcservice-jboss-beans.xml
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-30 13:12:46 UTC (rev 88067)
+++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-30 13:51:38 UTC (rev 88068)
@@ -11,7 +11,7 @@
<version>1.0.0.Beta2</version>
</parent>
- <!-- Modules -->
+ <!-- Modules
<modules>
<module>blueprint</module>
<module>common</module>
@@ -21,12 +21,12 @@
<module>remotelog</module>
<module>webconsole</module>
</modules>
+ -->
- <!--
+ <!-- -->
<modules>
<module>blueprint</module>
<module>microcontainer</module>
</modules>
- -->
</project>
15 years
- 1
- 0
JBoss-OSGI SVN: r88067 - in projects/jboss-osgi/trunk: bundle and 17 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-30 09:12:46 -0400 (Thu, 30 Apr 2009)
New Revision: 88067
Removed:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/deployment/
projects/jboss-osgi/trunk/bundle/deployment/
Modified:
projects/jboss-osgi/trunk/bundle/blueprint/pom.xml
projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/basic-felix-framework.properties
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/log4j.xml
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd
projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml
projects/jboss-osgi/trunk/bundle/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
projects/jboss-osgi/trunk/bundle/microcontainer/src/main/resources/META-INF/base-deployers-beans.xml
projects/jboss-osgi/trunk/bundle/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java
projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/log4j.xml
projects/jboss-osgi/trunk/runtime/felix/src/test/resources/log4j.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/log4j.xml
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestHelper.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestSetup.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/management/ManagedFramework.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/management/ManagedFrameworkMBean.java
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml
Log:
Bundle deployment through MC service - ok
Modified: projects/jboss-osgi/trunk/bundle/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-30 13:12:46 UTC (rev 88067)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi - Bundle Blueprint Service</name>
+ <name>JBossOSGi - Bundle Blueprint</name>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-blueprint</artifactId>
@@ -60,12 +60,6 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-deployment</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
<version>${version}</version>
<scope>provided</scope>
Modified: projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml 2009-04-30 13:12:46 UTC (rev 88067)
@@ -20,7 +20,6 @@
<include>*:org.osgi.compendium:jar</include>
<include>*:jaxb-bundle:jar</include>
<include>*:jboss-osgi-common:jar</include>
- <include>*:jboss-osgi-deployment:jar</include>
<include>*:jboss-osgi-logging:jar</include>
<include>*:jboss-osgi-microcontainer:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java 2009-04-30 13:12:46 UTC (rev 88067)
@@ -23,20 +23,26 @@
//$Id$
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_KERNEL;
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_MAIN_DEPLOYER;
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_MBEAN_SERVER;
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_SYSTEM_BUNDLE_CONTEXT;
import static org.jboss.osgi.microcontainer.MicrocontainerServiceMBean.MBEAN_MICROCONTAINER_SERVICE;
-import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_SYSTEM_BUNDLE_CONTEXT;
-import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_MBEAN_SERVER;
-import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_MAIN_DEPLOYER;
-import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_KERNEL;
+import static org.jboss.osgi.spi.management.ManagedFrameworkMBean.MBEAN_MANAGED_FRAMEWORK;
import java.util.List;
+import java.util.Set;
+import javax.management.ObjectName;
+
+import junit.framework.Test;
+
import org.jboss.osgi.microcontainer.MicrocontainerServiceMBean;
import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.jboss.osgi.spi.junit.OSGiTestSetup;
import org.jboss.osgi.spi.management.MBeanProxy;
+import org.jboss.osgi.spi.management.ManagedFrameworkMBean;
import org.jboss.test.osgi.blueprint.BlueprintTest;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
/**
* A test that checks whether the MicrocontainerService can be accessed
@@ -46,32 +52,58 @@
*/
public class MicrocontainerServiceTestCase extends BlueprintTest
{
- public void testServiceAccess() throws Exception
+ private static OSGiFramework framework;
+
+ public static Test suite()
{
- OSGiFramework framework = getBootstrapProvider().getFramework();
- try
+ OSGiTestSetup setup = new OSGiTestSetup(MicrocontainerServiceTestCase.class)
{
- BundleContext sysContext = framework.getSystemBundleContext();
-
- Bundle bundle = installBundle(sysContext, "mcservice-bundle.jar", true);
- assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
-
- MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer());
- List<String> registeredBeans = mcService.getRegisteredBeans();
- assertTrue("MicrocontainerService registered with MC", registeredBeans.contains(BEAN_SYSTEM_BUNDLE_CONTEXT));
- assertTrue("MainDeployer registered with MC", registeredBeans.contains(BEAN_MAIN_DEPLOYER));
- assertTrue("MBeanServer registered with MC", registeredBeans.contains(BEAN_MBEAN_SERVER));
- assertTrue("Kernel registered with MC", registeredBeans.contains(BEAN_KERNEL));
- }
- finally
- {
- framework.stop();
- }
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ framework = getBootstrapProvider().getFramework();
+ framework.start();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ framework.stop();
+ super.tearDown();
+ }
+ };
+ return setup;
}
-
+
+ public void testServiceAccess() throws Exception
+ {
+ MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer());
+ List<String> registeredBeans = mcService.getRegisteredBeans();
+ assertTrue("MicrocontainerService registered with MC", registeredBeans.contains(BEAN_SYSTEM_BUNDLE_CONTEXT));
+ assertTrue("MainDeployer registered with MC", registeredBeans.contains(BEAN_MAIN_DEPLOYER));
+ assertTrue("MBeanServer registered with MC", registeredBeans.contains(BEAN_MBEAN_SERVER));
+ assertTrue("Kernel registered with MC", registeredBeans.contains(BEAN_KERNEL));
+ }
+
+ /**
+ * Test whether the bundle can be deployed through the MicrocontainerServiceMBean
+ */
+ public void testBundleDeployment() throws Exception
+ {
+ MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer());
+ mcService.deploy(getTestArchiveURL("mcservice-bundle.jar"));
+
+ ManagedFrameworkMBean frameworkMBean = MBeanProxy.get(ManagedFrameworkMBean.class, MBEAN_MANAGED_FRAMEWORK, getMBeanServer());
+ Set<ObjectName> bundles = frameworkMBean.getBundles();
+ assertTrue("Managed bundle registered", bundles.toString().indexOf("jboss.osgi:bundle=mcservice-bundle") > 0);
+
+ mcService.undeploy(getTestArchiveURL("mcservice-bundle.jar"));
+}
+
public void testBeansDeployment() throws Exception
{
- //MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer());
- //mcService.deploy(getTestArchiveURL("mcservice-beans.jar"));
+ // MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer());
+ // mcService.deploy(getTestArchiveURL("mcservice-beans.jar"));
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/basic-felix-framework.properties
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/basic-felix-framework.properties 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/basic-felix-framework.properties 2009-04-30 13:12:46 UTC (rev 88067)
@@ -21,5 +21,6 @@
framework.autoStart=\
file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
file://${test.archive.directory}/bundles/jboss-osgi-common.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-logging.jar
+ file://${test.archive.directory}/bundles/jboss-osgi-logging.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-jmx.jar
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-04-30 13:12:46 UTC (rev 88067)
@@ -13,7 +13,13 @@
framework.prop.org.osgi.framework.system.packages.extra=\
org.jboss.logging, \
org.jboss.osgi.spi, \
- org.jboss.osgi.spi.management
+ org.jboss.osgi.spi.management, \
+ org.jboss.virtual, \
+ org.jboss.virtual.plugins.registry, \
+ org.jboss.virtual.plugins.context.jar, \
+ org.jboss.virtual.plugins.vfs.helpers, \
+ org.jboss.net.protocol, \
+ org.jboss.virtual.protocol
# Bundles that need to be installed with the Framework automatically
framework.autoInstall=\
@@ -28,6 +34,6 @@
file://${test.archive.directory}/bundles/jbossxb-bundle.jar \
file://${test.archive.directory}/bundles/jboss-osgi-common.jar \
file://${test.archive.directory}/bundles/jboss-osgi-logging.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-microcontainer.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-jmx.jar
+ file://${test.archive.directory}/bundles/jboss-osgi-jmx.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-microcontainer.jar
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/log4j.xml 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/log4j.xml 2009-04-30 13:12:46 UTC (rev 88067)
@@ -32,37 +32,11 @@
<!-- Limit categories -->
<!-- ================ -->
- <category name="org.hibernate">
- <priority value="INFO" />
- </category>
-
- <!-- hide optimistic locking failures
- <category name="org.hibernate.event.def.AbstractFlushingEventListener">
- <priority value="FATAL" />
- </category>
- -->
-
- <!-- hide proxy narrowing warns -->
- <category name="org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog">
- <priority value="ERROR" />
- </category>
-
- <!-- show SQL DML statements as they are executed -->
- <category name="org.hibernate.SQL">
- <priority value="DEBUG" />
- </category>
-
- <!-- show JDBC parameters
- <category name="org.hibernate.type">
+ <!-- Show jboss deployer tracesraces -->
+ <category name="org.jboss.deployers">
<priority value="TRACE" />
</category>
- -->
- <!-- hide httpclient wire dumps -->
- <category name="httpclient.wire.header">
- <priority value="INFO" />
- </category>
-
<!-- ======================= -->
<!-- Setup the Root category -->
<!-- ======================= -->
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd 2009-04-30 13:12:46 UTC (rev 88067)
@@ -1,6 +1,6 @@
# bnd build -classpath target/test-classes -output target/test-libs/mcservice-bundle.jar src/test/resources/mcservice/mcservice-bundle.bnd
-Bundle-SymbolicName: mcservice-test
+Bundle-SymbolicName: mcservice-bundle
Bundle-Activator: org.jboss.test.osgi.blueprint.mcservice.bundle.ServiceActivator
Export-Package: org.jboss.test.osgi.blueprint.mcservice.bundle
Import-Package: org.jboss.osgi.microcontainer, org.osgi.framework
Modified: projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml 2009-04-30 13:12:46 UTC (rev 88067)
@@ -22,6 +22,11 @@
<artifactId>jboss-osgi-spi</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-deployer</artifactId>
+ <version>${version}</version>
+ </dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
@@ -111,6 +116,7 @@
org.jboss.osgi.spi,
org.jboss.reflect.*,
org.jboss.util.*,
+ org.jboss.virtual*,
org.jboss.xb.*,
<!-- optional -->
@@ -139,11 +145,10 @@
jboss-managed;inline=false,
jboss-metatype;inline=false,
jboss-mdr;inline=false,
+ jboss-osgi-runtime-deployer;inline=false,
jboss-kernel;inline=false,
- jboss-vfs;inline=false,
</Embed-Dependency>
<_exportcontents>
- org.jboss.virtual*,
org.jboss.dependency*,
org.jboss.deployers*,
</_exportcontents>
Modified: projects/jboss-osgi/trunk/bundle/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/bundle/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-04-30 13:12:46 UTC (rev 88067)
@@ -56,7 +56,6 @@
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.log.LogService;
-import org.osgi.util.tracker.ServiceTracker;
/**
* An OSGi Service the gives access to the Kernel.
@@ -68,7 +67,6 @@
{
private BundleContext context;
private EmbeddedBeansDeployer deployer;
- private MBeanServerTracker mbeanServerTracker;
private ServiceRegistration registration;
private LogService log;
@@ -80,6 +78,8 @@
this.context = context;
this.log = new LogServiceTracker(context);
+ VFS.init();
+
deployer = new EmbeddedBeansDeployer(context);
}
@@ -155,6 +155,9 @@
void start()
{
+ // Get the required MBeanServer
+ MBeanServer mbeanServer = getMBeanServer();
+
// Preregister some beans
try
{
@@ -164,6 +167,7 @@
controller.install(new AbstractControllerContext(BEAN_SYSTEM_BUNDLE_CONTEXT, actions, null, context));
controller.install(new AbstractControllerContext(BEAN_KERNEL_CONTROLLER, actions, null, controller));
controller.install(new AbstractControllerContext(BEAN_KERNEL, actions, null, kernel));
+ controller.install(new AbstractControllerContext(BEAN_MBEAN_SERVER, actions, null, mbeanServer));
URL deployersURL = context.getBundle().getResource("META-INF/base-deployers-beans.xml");
deployer.deploy(deployersURL);
@@ -179,10 +183,9 @@
log.log(LogService.LOG_DEBUG, "Register MicrocontainerService");
registration = context.registerService(MicrocontainerService.class.getName(), this, null);
-
- // Track the MBeanServer to register the MicrocontainerServiceMBean
- mbeanServerTracker = new MBeanServerTracker(context, this);
- mbeanServerTracker.open();
+
+ // Register the MicrocontainerServiceMBean
+ registerMicrocontainerServiceMBean(mbeanServer);
}
void stop()
@@ -190,91 +193,50 @@
if (registration != null)
{
log.log(LogService.LOG_DEBUG, "Unregister MicrocontainerService");
+ unregisterMicrocontainerServiceMBean(getMBeanServer());
registration.unregister();
registration = null;
}
}
- private void unregisterMBean(MBeanServer server)
+ private MBeanServer getMBeanServer()
{
- if (server.isRegistered(MBEAN_MICROCONTAINER_SERVICE))
- {
- try
- {
- log.log(LogService.LOG_DEBUG, "Unregister MicrocontainerServiceMBean");
- server.unregisterMBean(MBEAN_MICROCONTAINER_SERVICE);
- }
- catch (Exception ex)
- {
- log.log(LogService.LOG_ERROR, "Cannot register MicrocontainerServiceMBean", ex);
- }
- }
+ ServiceReference sref = context.getServiceReference(MBeanServer.class.getName());
+ if (sref == null)
+ throw new IllegalStateException("No MBeanServer registered");
+
+ MBeanServer mbeanServer = (MBeanServer)context.getService(sref);
+ return mbeanServer;
}
- class MBeanServerTracker extends ServiceTracker
+ private void registerMicrocontainerServiceMBean(MBeanServer server)
{
- private MicrocontainerServiceImpl mcService;
-
- public MBeanServerTracker(BundleContext context, MicrocontainerServiceImpl mcService)
+ // Register the MicrocontainerServiceMBean
+ try
{
- super(context, MBeanServer.class.getName(), null);
- this.mcService = mcService;
+ log.log(LogService.LOG_DEBUG, "Register MicrocontainerServiceMBean");
+ StandardMBean mbean = new StandardMBean(this, MicrocontainerServiceMBean.class);
+ server.registerMBean(mbean, MBEAN_MICROCONTAINER_SERVICE);
}
-
- public Object addingService(ServiceReference reference)
+ catch (Exception ex)
{
- MBeanServer server = (MBeanServer)super.addingService(reference);
-
- // Register the MicrocontainerServiceMBean
- try
- {
- log.log(LogService.LOG_DEBUG, "Register MicrocontainerServiceMBean");
- StandardMBean mbean = new StandardMBean(mcService, MicrocontainerServiceMBean.class);
- server.registerMBean(mbean, MBEAN_MICROCONTAINER_SERVICE);
- }
- catch (Exception ex)
- {
- throw new IllegalStateException("Cannot register MicrocontainerServiceMBean", ex);
- }
-
- // Install the MBeanServer with the Kernel
- try
- {
- ControllerContextActions actions = new AbstractControllerContextActions(new HashMap<ControllerState, ControllerContextAction>());
- mcService.getKernel().getController().install(new AbstractControllerContext(BEAN_MBEAN_SERVER, actions, null, server));
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Throwable ex)
- {
- throw new IllegalStateException("Cannot register MC bean", ex);
- }
-
- return server;
+ throw new IllegalStateException("Cannot register MicrocontainerServiceMBean", ex);
}
+ }
- @Override
- public void removedService(ServiceReference reference, Object service)
+ private void unregisterMicrocontainerServiceMBean(MBeanServer server)
+ {
+ if (server.isRegistered(MBEAN_MICROCONTAINER_SERVICE))
{
- // Unregister MBean
- unregisterMBean((MBeanServer)service);
-
- // Uninstall the MBeanServer from the Kernel
try
{
- mcService.getKernel().getController().uninstall(BEAN_MBEAN_SERVER);
+ log.log(LogService.LOG_DEBUG, "Unregister MicrocontainerServiceMBean");
+ server.unregisterMBean(MBEAN_MICROCONTAINER_SERVICE);
}
- catch (RuntimeException rte)
+ catch (Exception ex)
{
- throw rte;
+ log.log(LogService.LOG_ERROR, "Cannot unregister MicrocontainerServiceMBean", ex);
}
- catch (Throwable ex)
- {
- throw new IllegalStateException("Cannot register MC bean", ex);
- }
- super.removedService(reference, service);
}
}
}
\ No newline at end of file
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-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/bundle/microcontainer/src/main/resources/META-INF/base-deployers-beans.xml 2009-04-30 13:12:46 UTC (rev 88067)
@@ -12,62 +12,89 @@
<property name="structuralDeployers"><inject bean="StructuralDeployers" /></property>
<property name="deployers"><inject bean="Deployers" /></property>
</bean>
-
+
<!-- ModificationType structure processor -->
- <bean name="ModificationTypeStructureProcessor" class="org.jboss.deployers.vfs.plugins.structure.modify.ModificationTypeStructureProcessor">
- <incallback method="addMatcher"/>
- <uncallback method="removeMatcher"/>
- </bean>
+ <bean name="ModificationTypeStructureProcessor" class="org.jboss.deployers.vfs.plugins.structure.modify.ModificationTypeStructureProcessor">
+ <incallback method="addMatcher"/>
+ <uncallback method="removeMatcher"/>
+ </bean>
+
+ <!-- The holder for deployers that determine structure -->
+ <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
+ <property name="structureBuilder">
+ <!-- The consolidator of the structure information -->
+ <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder">
+ <property name="structureProcessor"><inject bean="ModificationTypeStructureProcessor"/></property>
+ </bean>
+ </property>
+ <!-- Accept any implementor of structure deployer -->
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+
+ <!-- The holder for deployers that do real deployment -->
+ <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
+ <constructor><parameter><inject bean="jboss.osgi:service=KernelController"/></parameter></constructor>
+ <!-- Accept any implementor of deployer -->
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+
+ <!-- JAR Structure -->
+ <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
+ <!-- Unless specified the default list of suffixes is .jar -->
+ <constructor>
+ <parameter>
+ <set elementClass="java.lang.String">
+ <value>.jar</value>
+ </set>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- File Structure -->
+ <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
+ <!-- Unless specified the default list of suffixes is -beans.xml -->
+ <constructor>
+ <parameter>
+ <set elementClass="java.lang.String">
+ <value>-beans.xml</value>
+ </set>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- POJO Deployment -->
+
+ <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
+ <property name="suffix">jboss-beans.xml</property>
+ </bean>
+ <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer">
+ </bean>
+ <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
+ <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.osgi:service=Kernel"/></parameter></constructor>
+ </bean>
+
+ <!-- OSGi Deployment -->
- <!-- The holder for deployers that determine structure -->
- <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
- <property name="structureBuilder">
- <!-- The consolidator of the structure information -->
- <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder">
- <property name="structureProcessor"><inject bean="ModificationTypeStructureProcessor"/></property>
- </bean>
- </property>
- <!-- Accept any implementor of structure deployer -->
- <incallback method="addDeployer"/>
- <uncallback method="removeDeployer"/>
- </bean>
-
- <!-- The holder for deployers that do real deployment -->
- <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
- <constructor><parameter><inject bean="jboss.osgi:service=KernelController"/></parameter></constructor>
- <!-- Accept any implementor of deployer -->
- <incallback method="addDeployer"/>
- <uncallback method="removeDeployer"/>
- </bean>
-
- <!-- JAR Structure -->
- <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
- <!-- Unless specified the default list of suffixes is .jar -->
- <constructor>
- <parameter>
- <set elementClass="java.lang.String">
- <value>.jar</value>
- </set>
- </parameter>
- </constructor>
- </bean>
-
- <!-- File Structure -->
- <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
- <!-- Unless specified the default list of suffixes is -beans.xml -->
- <constructor>
- <parameter>
- <set elementClass="java.lang.String">
- <value>-beans.xml</value>
- </set>
- </parameter>
- </constructor>
- </bean>
-
- <!-- POJO Deployment -->
+ <!-- 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>
+ </bean>
- <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
- <property name="suffix">jboss-beans.xml</property>
- </bean>
+ <bean name="BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" />
+ <bean name="BundleStructureDeployer" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
+ <bean name="BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=BundleContext" /></property>
+ </bean>
+ <bean name="BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=BundleContext" /></property>
+ </bean>
+ <bean name="BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=BundleContext" /></property>
+ </bean>
+ <bean name="BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer">
+ <property name="mbeanServer"><inject bean="jboss.osgi:service=MBeanServer"/></property>
+ </bean>
</deployment>
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-30 13:12:46 UTC (rev 88067)
@@ -15,7 +15,6 @@
<modules>
<module>blueprint</module>
<module>common</module>
- <module>deployment</module>
<module>jmx</module>
<module>logging</module>
<module>microcontainer</module>
@@ -26,7 +25,6 @@
<!--
<modules>
<module>blueprint</module>
- <module>deployment</module>
<module>microcontainer</module>
</modules>
-->
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/pom.xml 2009-04-30 13:12:46 UTC (rev 88067)
@@ -334,7 +334,15 @@
<name>org.apache.xerces.xni.parser.XMLParserConfiguration</name>
<value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value>
</property>
+ <!--
+ Implement URLStreamHandlerService
+ https://jira.jboss.org/jira/browse/JBOSGI-75
+ -->
<property>
+ <name>java.protocol.handler.pkgs</name>
+ <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
+ </property>
+ <property>
<name>test.archive.directory</name>
<value>${project.build.directory}/test-libs</value>
</property>
Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleRealDeployer.java 2009-04-30 13:12:46 UTC (rev 88067)
@@ -24,6 +24,7 @@
//$Id$
import java.net.URL;
+import java.util.ArrayList;
import java.util.List;
import org.jboss.deployers.spi.DeploymentException;
@@ -47,7 +48,7 @@
public class BundleRealDeployer extends AbstractSimpleRealDeployer<BundleMetaData>
{
private BundleContext systemContext;
- private List<URL> skipBundles;
+ private List<URL> skipBundles = new ArrayList<URL>();
public BundleRealDeployer()
{
@@ -75,29 +76,26 @@
String bundlePath = bundleURL.getPath();
if (bundlePath.endsWith("/"))
bundlePath = bundlePath.substring(0, bundlePath.length() - 1);
-
+
try
{
- if (skipBundles != null)
+ boolean skipBundle = false;
+ for (URL skip : skipBundles)
{
- boolean skipBundle = false;
- for (URL skip : skipBundles)
+ String skipPath = skip.getPath();
+ if (skipPath.equals(bundlePath))
{
- String skipPath = skip.getPath();
- if (skipPath.equals(bundlePath))
- {
- skipBundle = true;
- break;
- }
+ skipBundle = true;
+ break;
}
- if (skipBundle == false)
- {
- Bundle bundle = systemContext.installBundle(bundleURL.toString());
- unit.addAttachment(Bundle.class, bundle);
-
- log.info("Installed: " + bundle);
- }
}
+ if (skipBundle == false)
+ {
+ Bundle bundle = systemContext.installBundle(bundleURL.toString());
+ unit.addAttachment(Bundle.class, bundle);
+
+ log.info("Installed: " + bundle);
+ }
}
catch (BundleException ex)
{
Modified: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/log4j.xml 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/log4j.xml 2009-04-30 13:12:46 UTC (rev 88067)
@@ -32,15 +32,11 @@
<!-- Limit categories -->
<!-- ================ -->
- <category name="org.hibernate">
- <priority value="INFO" />
- </category>
- <category name="org.hibernate.SQL">
- <priority value="DEBUG" />
- </category>
- <category name="org.hibernate.connection">
+ <!-- Show jboss deployer traces
+ <category name="org.jboss.deployers">
<priority value="TRACE" />
</category>
+ -->
<!-- ======================= -->
<!-- Setup the Root category -->
Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/log4j.xml 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/log4j.xml 2009-04-30 13:12:46 UTC (rev 88067)
@@ -32,15 +32,11 @@
<!-- Limit categories -->
<!-- ================ -->
- <category name="org.hibernate">
- <priority value="INFO" />
- </category>
- <category name="org.hibernate.SQL">
- <priority value="DEBUG" />
- </category>
- <category name="org.hibernate.connection">
+ <!-- Show jboss deployer traces
+ <category name="org.jboss.deployers">
<priority value="TRACE" />
</category>
+ -->
<!-- ======================= -->
<!-- Setup the Root category -->
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/log4j.xml 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/log4j.xml 2009-04-30 13:12:46 UTC (rev 88067)
@@ -32,15 +32,11 @@
<!-- Limit categories -->
<!-- ================ -->
- <category name="org.hibernate">
- <priority value="INFO" />
- </category>
- <category name="org.hibernate.SQL">
- <priority value="DEBUG" />
- </category>
- <category name="org.hibernate.connection">
+ <!-- Show jboss deployer traces
+ <category name="org.jboss.deployers">
<priority value="TRACE" />
</category>
+ -->
<!-- ======================= -->
<!-- Setup the Root category -->
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java 2009-04-30 13:12:46 UTC (rev 88067)
@@ -212,7 +212,7 @@
public RemoteFramework getRemoteFramework() throws Exception
{
if (managedFramework == null)
- managedFramework = MBeanProxy.get(ManagedFrameworkMBean.class, ManagedFrameworkMBean.OBJECT_NAME, getServer());
+ managedFramework = MBeanProxy.get(ManagedFrameworkMBean.class, ManagedFrameworkMBean.MBEAN_MANAGED_FRAMEWORK, getServer());
return new RemoteFramework()
{
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestHelper.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestHelper.java 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestHelper.java 2009-04-30 13:12:46 UTC (rev 88067)
@@ -55,15 +55,15 @@
public OSGiBootstrapProvider createBootstrapProvider()
{
- return OSGiBootstrap.getBootstrapProvider();
+ bootProvider = OSGiBootstrap.getBootstrapProvider();
+ return bootProvider;
}
public OSGiBootstrapProvider getBootstrapProvider()
{
if (bootProvider == null)
- {
bootProvider = createBootstrapProvider();
- }
+
return bootProvider;
}
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestSetup.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestSetup.java 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/OSGiTestSetup.java 2009-04-30 13:12:46 UTC (rev 88067)
@@ -25,14 +25,13 @@
import java.net.MalformedURLException;
import java.net.URL;
+import junit.extensions.TestSetup;
+import junit.framework.TestSuite;
+
import org.jboss.logging.Logger;
-import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
import org.jboss.virtual.VFS;
-import junit.extensions.TestSetup;
-import junit.framework.TestSuite;
-
/**
* An OSGi Test Setup
*
@@ -41,69 +40,64 @@
*/
public class OSGiTestSetup extends TestSetup
{
- // Provide logging
- final Logger log = Logger.getLogger(OSGiTestSetup.class);
+ // Provide logging
+ final Logger log = Logger.getLogger(OSGiTestSetup.class);
- private OSGiTestHelper delegate = new OSGiTestHelper();
- private OSGiBootstrapProvider bootProvider;
-
- public OSGiTestSetup(Class<?> testCase)
- {
- super(new TestSuite(testCase));
- // Prevent unknown protocol: vfsfile
- VFS.init();
- }
+ private OSGiTestHelper delegate = new OSGiTestHelper();
- public OSGiBootstrapProvider createBootstrapProvider()
- {
- return OSGiBootstrap.getBootstrapProvider();
- }
+ public OSGiTestSetup(Class<?> testCase)
+ {
+ super(new TestSuite(testCase));
+ // Prevent unknown protocol: vfsfile
+ VFS.init();
+ }
- public OSGiBootstrapProvider getBootstrapProvider()
- {
- if (bootProvider == null)
- {
- bootProvider = createBootstrapProvider();
- }
- return bootProvider;
- }
+ public OSGiBootstrapProvider createBootstrapProvider()
+ {
+ return delegate.createBootstrapProvider();
+ }
- public void setBootstrapProvider(OSGiBootstrapProvider bootProvider)
- {
- this.bootProvider = bootProvider;
- }
+ public OSGiBootstrapProvider getBootstrapProvider()
+ {
+ return delegate.getBootstrapProvider();
+ }
- @Override
- protected void setUp() throws Exception
- {
- log.debug("### START SETUP " + getTest());
- super.setUp();
- }
+ public void setBootstrapProvider(OSGiBootstrapProvider bootProvider)
+ {
+ delegate.setBootstrapProvider(bootProvider);
+ }
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- log.debug("### END SETUP " + getTest());
- }
+ @Override
+ protected void setUp() throws Exception
+ {
+ log.debug("### START SETUP " + getTest());
+ super.setUp();
+ }
- protected URL getResourceURL(String resource)
- {
- return delegate.getResourceURL(resource);
- }
+ @Override
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ log.debug("### END SETUP " + getTest());
+ }
- protected File getResourceFile(String resource)
- {
- return delegate.getResourceFile(resource);
- }
+ protected URL getResourceURL(String resource)
+ {
+ return delegate.getResourceURL(resource);
+ }
- public File getTestArchiveFile(String archive)
- {
- return delegate.getTestArchiveFile(archive);
- }
+ protected File getResourceFile(String resource)
+ {
+ return delegate.getResourceFile(resource);
+ }
- public URL getTestArchiveURL(String archive) throws MalformedURLException
- {
- return delegate.getTestArchiveFile(archive).toURI().toURL();
- }
+ public File getTestArchiveFile(String archive)
+ {
+ return delegate.getTestArchiveFile(archive);
+ }
+
+ public URL getTestArchiveURL(String archive) throws MalformedURLException
+ {
+ return delegate.getTestArchiveFile(archive).toURI().toURL();
+ }
}
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/management/ManagedFramework.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/management/ManagedFramework.java 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/management/ManagedFramework.java 2009-04-30 13:12:46 UTC (rev 88067)
@@ -97,11 +97,11 @@
try
{
if (mbeanServer != null)
- mbeanServer.registerMBean(this, ManagedFrameworkMBean.OBJECT_NAME);
+ mbeanServer.registerMBean(this, ManagedFrameworkMBean.MBEAN_MANAGED_FRAMEWORK);
}
catch (Exception ex)
{
- log.warn("Cannot register: " + ManagedFrameworkMBean.OBJECT_NAME);
+ log.warn("Cannot register: " + ManagedFrameworkMBean.MBEAN_MANAGED_FRAMEWORK);
}
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/management/ManagedFrameworkMBean.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/management/ManagedFrameworkMBean.java 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/management/ManagedFrameworkMBean.java 2009-04-30 13:12:46 UTC (rev 88067)
@@ -36,7 +36,7 @@
public interface ManagedFrameworkMBean
{
/** The default object name: jboss.osgi:service=ManagedFramework */
- static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.osgi:service=ManagedFramework");
+ ObjectName MBEAN_MANAGED_FRAMEWORK = ObjectNameFactory.create("jboss.osgi:service=ManagedFramework");
/**
* Get the list of all installed bundles
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml 2009-04-30 13:12:46 UTC (rev 88067)
@@ -32,37 +32,12 @@
<!-- Limit categories -->
<!-- ================ -->
- <category name="org.hibernate">
- <priority value="INFO" />
- </category>
-
- <!-- hide optimistic locking failures
- <category name="org.hibernate.event.def.AbstractFlushingEventListener">
- <priority value="FATAL" />
- </category>
- -->
-
- <!-- hide proxy narrowing warns -->
- <category name="org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog">
- <priority value="ERROR" />
- </category>
-
- <!-- show SQL DML statements as they are executed -->
- <category name="org.hibernate.SQL">
- <priority value="DEBUG" />
- </category>
-
- <!-- show JDBC parameters
- <category name="org.hibernate.type">
+ <!-- Show jboss deployer traces
+ <category name="org.jboss.deployers">
<priority value="TRACE" />
</category>
-->
- <!-- hide httpclient wire dumps -->
- <category name="httpclient.wire.header">
- <priority value="INFO" />
- </category>
-
<!-- ======================= -->
<!-- Setup the Root category -->
<!-- ======================= -->
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml 2009-04-30 12:37:24 UTC (rev 88066)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml 2009-04-30 13:12:46 UTC (rev 88067)
@@ -32,37 +32,12 @@
<!-- Limit categories -->
<!-- ================ -->
- <category name="org.hibernate">
- <priority value="INFO" />
- </category>
-
- <!-- hide optimistic locking failures
- <category name="org.hibernate.event.def.AbstractFlushingEventListener">
- <priority value="FATAL" />
- </category>
- -->
-
- <!-- hide proxy narrowing warns -->
- <category name="org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog">
- <priority value="ERROR" />
- </category>
-
- <!-- show SQL DML statements as they are executed -->
- <category name="org.hibernate.SQL">
- <priority value="DEBUG" />
- </category>
-
- <!-- show JDBC parameters
- <category name="org.hibernate.type">
+ <!-- Show jboss deployer traces
+ <category name="org.jboss.deployers">
<priority value="TRACE" />
</category>
-->
- <!-- hide httpclient wire dumps -->
- <category name="httpclient.wire.header">
- <priority value="INFO" />
- </category>
-
<!-- ======================= -->
<!-- Setup the Root category -->
<!-- ======================= -->
15 years
- 1
- 0
JBoss-OSGI SVN: r88066 - projects/jboss-osgi/bundles/jboss-common-core.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-30 08:37:24 -0400 (Thu, 30 Apr 2009)
New Revision: 88066
Modified:
projects/jboss-osgi/bundles/jboss-common-core/pom.xml
Log:
Use jboss-common-core-2.2.11-SNAPSHOT
Modified: projects/jboss-osgi/bundles/jboss-common-core/pom.xml
===================================================================
--- projects/jboss-osgi/bundles/jboss-common-core/pom.xml 2009-04-30 11:49:12 UTC (rev 88065)
+++ projects/jboss-osgi/bundles/jboss-common-core/pom.xml 2009-04-30 12:37:24 UTC (rev 88066)
@@ -16,7 +16,7 @@
</parent>
<properties>
- <version.jboss.common.core>2.2.11.GA</version.jboss.common.core>
+ <version.jboss.common.core>2.2.11-SNAPSHOT</version.jboss.common.core>
</properties>
<dependencies>
15 years
- 1
- 0
JBoss-OSGI SVN: r88055 - projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-30 03:01:41 -0400 (Thu, 30 Apr 2009)
New Revision: 88055
Modified:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java
Log:
jbossxb requires jaxb on jdk1.5
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java 2009-04-30 06:56:30 UTC (rev 88054)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java 2009-04-30 07:01:41 UTC (rev 88055)
@@ -113,6 +113,7 @@
Bundle bundle = installBundle(context, "bundles/apache-xerces-bundle.jar", true);
bundle = installBundle(context, "bundles/jboss-common-core-bundle.jar", true);
+ bundle = installBundle(context, "bundles/jaxb-bundle.jar", true);
bundle = installBundle(context, "bundles/jbossxb-bundle.jar", true);
assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
15 years
- 1
- 0
JBoss-OSGI SVN: r88053 - in projects/jboss-osgi/trunk: bundle/blueprint and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-30 02:51:28 -0400 (Thu, 30 Apr 2009)
New Revision: 88053
Modified:
projects/jboss-osgi/trunk/bundle/blueprint/pom.xml
projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java
projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties
projects/jboss-osgi/trunk/pom.xml
Log:
Add jaxb-bundle
Modified: projects/jboss-osgi/trunk/bundle/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-30 06:44:11 UTC (rev 88052)
+++ projects/jboss-osgi/trunk/bundle/blueprint/pom.xml 2009-04-30 06:51:28 UTC (rev 88053)
@@ -1,18 +1,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<name>JBossOSGi - Bundle Blueprint Service</name>
-
+
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-blueprint</artifactId>
<packaging>jar</packaging>
-
+
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-bundle</artifactId>
<version>1.0.0.Beta2</version>
</parent>
-
+
<!-- Properties -->
<properties>
</properties>
@@ -35,7 +35,7 @@
<artifactId>org.apache.felix.log</artifactId>
<scope>provided</scope>
</dependency>
-
+
<!-- Bundle Dependencies -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -44,6 +44,11 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jaxb-bundle</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-common-core-bundle</artifactId>
<scope>provided</scope>
</dependency>
@@ -82,7 +87,7 @@
<artifactId>jbossxb-bundle</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -93,7 +98,7 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
-
+
<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.osgi</groupId>
@@ -146,5 +151,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
Modified: projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml 2009-04-30 06:44:11 UTC (rev 88052)
+++ projects/jboss-osgi/trunk/bundle/blueprint/scripts/assembly-bundles.xml 2009-04-30 06:51:28 UTC (rev 88053)
@@ -18,6 +18,7 @@
<include>*:apache-xerces-bundle:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.osgi.compendium:jar</include>
+ <include>*:jaxb-bundle:jar</include>
<include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-deployment:jar</include>
<include>*:jboss-osgi-logging:jar</include>
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java 2009-04-30 06:44:11 UTC (rev 88052)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/bootstrap/BundleTestCase.java 2009-04-30 06:51:28 UTC (rev 88053)
@@ -60,6 +60,26 @@
}
}
+ public void testJAXBBundle() throws BundleException
+ {
+ OSGiBootstrapProvider configProvider = OSGiBootstrap.getBootstrapProvider();
+ configProvider.configure("basic-felix-framework.properties");
+
+ OSGiFramework framework = configProvider.getFramework();
+ try
+ {
+ BundleContext context = framework.getSystemBundleContext();
+
+ Bundle bundle = installBundle(context, "bundles/jaxb-bundle.jar", true);
+
+ assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
+ }
+ finally
+ {
+ framework.stop();
+ }
+ }
+
public void testJBossCommonCoreBundle() throws BundleException
{
OSGiBootstrapProvider configProvider = OSGiBootstrap.getBootstrapProvider();
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-04-30 06:44:11 UTC (rev 88052)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/jboss-osgi-framework.properties 2009-04-30 06:51:28 UTC (rev 88053)
@@ -24,6 +24,7 @@
file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
file://${test.archive.directory}/bundles/apache-xerces-bundle.jar \
file://${test.archive.directory}/bundles/jboss-common-core-bundle.jar \
+ file://${test.archive.directory}/bundles/jaxb-bundle.jar \
file://${test.archive.directory}/bundles/jbossxb-bundle.jar \
file://${test.archive.directory}/bundles/jboss-osgi-common.jar \
file://${test.archive.directory}/bundles/jboss-osgi-logging.jar \
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-04-30 06:44:11 UTC (rev 88052)
+++ projects/jboss-osgi/trunk/pom.xml 2009-04-30 06:51:28 UTC (rev 88053)
@@ -48,9 +48,10 @@
<version.felix.webconsole>1.2.8</version.felix.webconsole>
<version.izpack>4.3.0</version.izpack>
<version.javax.servlet>2.4</version.javax.servlet>
+ <version.jaxb.bundle>2.1.10-SNAPSHOT</version.jaxb.bundle>
<version.jbossas>5.0.1.GA</version.jbossas>
<version.jboss.aop>2.0.1.GA</version.jboss.aop>
- <version.jboss.common.core>2.2.11-SNAPSHOT</version.jboss.common.core>
+ <version.jboss.common.core.bundle>2.2.11-SNAPSHOT</version.jboss.common.core.bundle>
<version.jboss.deployers>2.0.5.GA</version.jboss.deployers>
<version.jboss.jacc>1.1.0.GA</version.jboss.jacc>
<version.jboss.jdocbook.plugin>2.1.2</version.jboss.jdocbook.plugin>
@@ -180,8 +181,13 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jaxb-bundle</artifactId>
+ <version>${version.jaxb.bundle}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-common-core-bundle</artifactId>
- <version>${version.jboss.common.core}</version>
+ <version>${version.jboss.common.core.bundle}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
15 years
- 1
- 0
JBoss-OSGI SVN: r88052 - projects/jboss-osgi/bundles/jaxb.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-30 02:44:11 -0400 (Thu, 30 Apr 2009)
New Revision: 88052
Modified:
projects/jboss-osgi/bundles/jaxb/pom.xml
Log:
Ignore fastinfoset
Modified: projects/jboss-osgi/bundles/jaxb/pom.xml
===================================================================
--- projects/jboss-osgi/bundles/jaxb/pom.xml 2009-04-30 06:28:13 UTC (rev 88051)
+++ projects/jboss-osgi/bundles/jaxb/pom.xml 2009-04-30 06:44:11 UTC (rev 88052)
@@ -49,10 +49,10 @@
org.xml.sax*,
<!-- import -->
- com.sun.xml.fastinfoset.*;resolution=optional,
- org.jvnet.*;resolution=optional,
<!-- ignore -->
+ !com.sun.xml.fastinfoset.*,
+ !org.jvnet.*,
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
<Embed-Dependency>
15 years
- 1
- 0
JBoss-OSGI SVN: r88051 - in projects/jboss-osgi/trunk/build/hudson/hudson-home: jobs/JBoss-5.1.0 and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-30 02:28:13 -0400 (Thu, 30 Apr 2009)
New Revision: 88051
Modified:
projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml
Log:
JBOSS_BUILD=jboss-5.1.0.GA
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-04-30 06:25:01 UTC (rev 88050)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-04-30 06:28:13 UTC (rev 88051)
@@ -19,7 +19,7 @@
rm -rf $JBOSS_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
;;
'jboss510')
- JBOSS_BUILD=jboss-5.1.0.CR1
+ JBOSS_BUILD=jboss-5.1.0.GA
JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_BUILD.zip
JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
rm -rf $JBOSS_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml 2009-04-30 06:25:01 UTC (rev 88050)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml 2009-04-30 06:28:13 UTC (rev 88051)
@@ -31,7 +31,7 @@
<command>
HUDSONDIR=$WORKSPACE/jboss-osgi//build/hudson
-JBOSS_VERSION=jboss-5.1.0.CR1
+JBOSS_VERSION=jboss-5.1.0.GA
JBOSS_HOME=$WORKSPACE/jbossas/build/output/$JBOSS_VERSION
JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_VERSION.zip
15 years
- 1
- 0
JBoss-OSGI SVN: r88049 - in projects/jboss-osgi/bundles: jaxb and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-30 02:24:23 -0400 (Thu, 30 Apr 2009)
New Revision: 88049
Added:
projects/jboss-osgi/bundles/jaxb/
Removed:
projects/jboss-osgi/bundles/jaxb/src/main/java/org/
Modified:
projects/jboss-osgi/bundles/jaxb/pom.xml
projects/jboss-osgi/bundles/pom.xml
Log:
Add jaxb-bundle-2.1.10
Copied: projects/jboss-osgi/bundles/jaxb (from rev 87993, projects/jboss-osgi/bundles/apache-xerces)
Modified: projects/jboss-osgi/bundles/jaxb/pom.xml
===================================================================
--- projects/jboss-osgi/bundles/apache-xerces/pom.xml 2009-04-29 11:47:21 UTC (rev 87993)
+++ projects/jboss-osgi/bundles/jaxb/pom.xml 2009-04-30 06:24:23 UTC (rev 88049)
@@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi Bundles - Apache Xerces</name>
+ <name>JBossOSGi Bundles - JAXB</name>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>apache-xerces-bundle</artifactId>
+ <artifactId>jaxb-bundle</artifactId>
<packaging>bundle</packaging>
- <version>2.9.1-SNAPSHOT</version>
+ <version>2.1.10-SNAPSHOT</version>
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -16,43 +16,15 @@
</parent>
<properties>
- <version.apache.xerces>2.9.1</version.apache.xerces>
- <version.wutka.dtdparser>1.2.1</version.wutka.dtdparser>
- <version.xml.resolver>1.2</version.xml.resolver>
+ <version.xml.bind>2.1.10</version.xml.bind>
</properties>
<dependencies>
<dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${version.apache.xerces}</version>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${version.apache.xerces}</version>
- </dependency>
- <dependency>
- <groupId>wutka-dtdparser</groupId>
- <artifactId>dtdparser121</artifactId>
- <version>${version.wutka.dtdparser}</version>
- </dependency>
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- <version>${version.xml.resolver}</version>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${version.xml.bind}</version>
+ </dependency>
</dependencies>
<build>
@@ -63,33 +35,36 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.apache.xerces.internal.XercesParserActivator</Bundle-Activator>
<Private-Package>
- org.jboss.osgi.apache.xerces.internal
</Private-Package>
<Import-Package>
+ <!-- system -->
+ javax.imageio*,
javax.xml.datatype,
javax.xml.namespace,
javax.xml.parsers,
javax.xml.transform*,
javax.xml.validation,
- org.w3c.dom*,
+ org.w3c.dom,
org.xml.sax*,
- <!-- osgi -->
- org.osgi.framework,
- org.osgi.util.xml,
+ <!-- import -->
+ com.sun.xml.fastinfoset.*;resolution=optional,
+ org.jvnet.*;resolution=optional,
<!-- ignore -->
- !sun.io,
</Import-Package>
+ <Embed-Transitive>true</Embed-Transitive>
<Embed-Dependency>
- dtdparser121;inline=false,
- xercesImpl;inline=false,
- xml-resolver;inline=false,
+ jaxb-impl;inline=false,
+ jaxb-api;inline=false,
+ stax-api;inline=false,
+ activation;inline=false,
</Embed-Dependency>
<_exportcontents>
- *
+ javax.activation;version=1.1,
+ javax.xml.bind*;version=2.1,
+ javax.xml.stream*;version=1.0,
</_exportcontents>
</instructions>
</configuration>
Modified: projects/jboss-osgi/bundles/pom.xml
===================================================================
--- projects/jboss-osgi/bundles/pom.xml 2009-04-30 06:22:01 UTC (rev 88048)
+++ projects/jboss-osgi/bundles/pom.xml 2009-04-30 06:24:23 UTC (rev 88049)
@@ -33,6 +33,7 @@
<!-- Modules -->
<modules>
<module>apache-xerces</module>
+ <module>jaxb</module>
<module>jboss-common-core</module>
<module>jbossxb</module>
</modules>
15 years
- 1
- 0
JBoss-OSGI SVN: r88031 - in projects/jboss-osgi/trunk/bundle: deployment/src/main/java/org/jboss/osgi/deployment/internal and 4 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-29 18:36:30 -0400 (Wed, 29 Apr 2009)
New Revision: 88031
Added:
projects/jboss-osgi/trunk/bundle/deployment/src/main/resources/META-INF/osgi-deployers-jboss-beans.xml
Removed:
projects/jboss-osgi/trunk/bundle/deployment/src/main/resources/META-INF/jboss-osgi-deployers.xml
Modified:
projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/deployment/DeploymentServiceTestCase.java
projects/jboss-osgi/trunk/bundle/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeployersActivator.java
projects/jboss-osgi/trunk/bundle/microcontainer/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerService.java
projects/jboss-osgi/trunk/bundle/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
projects/jboss-osgi/trunk/bundle/microcontainer/src/main/resources/META-INF/base-deployers-beans.xml
Log:
Add some more base deployers - WIP
Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/deployment/DeploymentServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/deployment/DeploymentServiceTestCase.java 2009-04-29 22:24:32 UTC (rev 88030)
+++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/deployment/DeploymentServiceTestCase.java 2009-04-29 22:36:30 UTC (rev 88031)
@@ -49,12 +49,12 @@
{
BundleContext sysContext = framework.getSystemBundleContext();
-// Bundle bundle = installBundle(sysContext, "bundles/jboss-osgi-deployment.jar", true);
-// assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
-//
-// MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer());
-// List<String> registeredBeans = mcService.getRegisteredBeans();
-// System.out.println(registeredBeans);
+ Bundle bundle = installBundle(sysContext, "bundles/jboss-osgi-deployment.jar", true);
+ assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
+
+ MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer());
+ List<String> registeredBeans = mcService.getRegisteredBeans();
+ System.out.println(registeredBeans);
}
finally
{
Modified: projects/jboss-osgi/trunk/bundle/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeployersActivator.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeployersActivator.java 2009-04-29 22:24:32 UTC (rev 88030)
+++ projects/jboss-osgi/trunk/bundle/deployment/src/main/java/org/jboss/osgi/deployment/internal/DeployersActivator.java 2009-04-29 22:36:30 UTC (rev 88031)
@@ -51,7 +51,7 @@
try
{
- deployersURL = new File("../deployment/src/main/resources/META-INF/jboss-osgi-deployers.xml").toURL();
+ deployersURL = new File("../deployment/src/main/resources/META-INF/osgi-deployers-jboss-beans.xml").toURL();
service.deploy(deployersURL);
}
catch (Exception ex)
Deleted: projects/jboss-osgi/trunk/bundle/deployment/src/main/resources/META-INF/jboss-osgi-deployers.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/deployment/src/main/resources/META-INF/jboss-osgi-deployers.xml 2009-04-29 22:24:32 UTC (rev 88030)
+++ projects/jboss-osgi/trunk/bundle/deployment/src/main/resources/META-INF/jboss-osgi-deployers.xml 2009-04-29 22:36:30 UTC (rev 88031)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- 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>
- </bean>
-
- <!-- The OSGi MetaData Deployer -->
- <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" />
-
- <!-- The OSGi Bundle Structure Deployer -->
- <bean name="jboss.osgi:service=BundleStructureDeployer" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
-
- <!-- The OSGi Bundle Deployer -->
- <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer">
- <property name="systemContext"><inject bean="jboss.osgi:service=BundleContext" /></property>
- </bean>
-
- <!-- The Bundle ClassLoader Deployer -->
- <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer">
- <property name="systemContext"><inject bean="jboss.osgi:service=BundleContext" /></property>
- </bean>
-
- <!-- The Bundle Start/Stop Deployer -->
- <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer">
- <property name="systemContext"><inject bean="jboss.osgi:service=BundleContext" /></property>
- </bean>
-
- <!-- The Bundle Management Deployer -->
- <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer">
- <property name="mbeanServer"><inject bean="jboss.osgi:service=MBeanServer"/></property>
- </bean>
-
-</deployment>
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/bundle/deployment/src/main/resources/META-INF/osgi-deployers-jboss-beans.xml (from rev 88011, projects/jboss-osgi/trunk/bundle/deployment/src/main/resources/META-INF/jboss-osgi-deployers.xml)
===================================================================
--- projects/jboss-osgi/trunk/bundle/deployment/src/main/resources/META-INF/osgi-deployers-jboss-beans.xml (rev 0)
+++ projects/jboss-osgi/trunk/bundle/deployment/src/main/resources/META-INF/osgi-deployers-jboss-beans.xml 2009-04-29 22:36:30 UTC (rev 88031)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- 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>
+ </bean>
+
+ <!-- The OSGi MetaData Deployer -->
+ <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" />
+
+ <!-- The OSGi Bundle Structure Deployer -->
+ <bean name="jboss.osgi:service=BundleStructureDeployer" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
+
+ <!-- The OSGi Bundle Deployer -->
+ <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=BundleContext" /></property>
+ </bean>
+
+ <!-- The Bundle ClassLoader Deployer -->
+ <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=BundleContext" /></property>
+ </bean>
+
+ <!-- The Bundle Start/Stop Deployer -->
+ <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer">
+ <property name="systemContext"><inject bean="jboss.osgi:service=BundleContext" /></property>
+ </bean>
+
+ <!-- The Bundle Management Deployer -->
+ <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer">
+ <property name="mbeanServer"><inject bean="jboss.osgi:service=MBeanServer"/></property>
+ </bean>
+
+</deployment>
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/bundle/microcontainer/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerService.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/microcontainer/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerService.java 2009-04-29 22:24:32 UTC (rev 88030)
+++ projects/jboss-osgi/trunk/bundle/microcontainer/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerService.java 2009-04-29 22:36:30 UTC (rev 88031)
@@ -53,6 +53,11 @@
String BEAN_MAIN_DEPLOYER = "jboss.osgi:service=MainDeployer";
/**
+ * The name under which the KernelController is registered: 'jboss.osgi:service=KernelController'
+ */
+ String BEAN_KERNEL_CONTROLLER = "jboss.osgi:service=KernelController";
+
+ /**
* The name under which the Kernel is registered: 'jboss.osgi:service=Kernel'
*/
String BEAN_KERNEL = "jboss.osgi:service=Kernel";
Modified: projects/jboss-osgi/trunk/bundle/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-04-29 22:24:32 UTC (rev 88030)
+++ projects/jboss-osgi/trunk/bundle/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-04-29 22:36:30 UTC (rev 88031)
@@ -162,6 +162,7 @@
KernelController controller = kernel.getController();
ControllerContextActions actions = new AbstractControllerContextActions(new HashMap<ControllerState, ControllerContextAction>());
controller.install(new AbstractControllerContext(BEAN_SYSTEM_BUNDLE_CONTEXT, actions, null, context));
+ controller.install(new AbstractControllerContext(BEAN_KERNEL_CONTROLLER, actions, null, controller));
controller.install(new AbstractControllerContext(BEAN_KERNEL, actions, null, kernel));
URL deployersURL = context.getBundle().getResource("META-INF/base-deployers-beans.xml");
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-04-29 22:24:32 UTC (rev 88030)
+++ projects/jboss-osgi/trunk/bundle/microcontainer/src/main/resources/META-INF/base-deployers-beans.xml 2009-04-29 22:36:30 UTC (rev 88031)
@@ -2,11 +2,72 @@
<!--
The base deployers
+
+ $Id$
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- The MainDeployer -->
- <bean name="jboss.osgi:service=MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
+ <!-- The MainDeployer -->
+ <bean name="jboss.osgi:service=MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
+ <property name="structuralDeployers"><inject bean="StructuralDeployers" /></property>
+ <property name="deployers"><inject bean="Deployers" /></property>
+ </bean>
+
+ <!-- ModificationType structure processor -->
+ <bean name="ModificationTypeStructureProcessor" class="org.jboss.deployers.vfs.plugins.structure.modify.ModificationTypeStructureProcessor">
+ <incallback method="addMatcher"/>
+ <uncallback method="removeMatcher"/>
</bean>
+ <!-- The holder for deployers that determine structure -->
+ <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
+ <property name="structureBuilder">
+ <!-- The consolidator of the structure information -->
+ <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder">
+ <property name="structureProcessor"><inject bean="ModificationTypeStructureProcessor"/></property>
+ </bean>
+ </property>
+ <!-- Accept any implementor of structure deployer -->
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+
+ <!-- The holder for deployers that do real deployment -->
+ <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
+ <constructor><parameter><inject bean="jboss.osgi:service=KernelController"/></parameter></constructor>
+ <!-- Accept any implementor of deployer -->
+ <incallback method="addDeployer"/>
+ <uncallback method="removeDeployer"/>
+ </bean>
+
+ <!-- JAR Structure -->
+ <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
+ <!-- Unless specified the default list of suffixes is .jar -->
+ <constructor>
+ <parameter>
+ <set elementClass="java.lang.String">
+ <value>.jar</value>
+ </set>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- File Structure -->
+ <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
+ <!-- Unless specified the default list of suffixes is -beans.xml -->
+ <constructor>
+ <parameter>
+ <set elementClass="java.lang.String">
+ <value>-beans.xml</value>
+ </set>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- POJO Deployment -->
+
+ <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
+ <property name="suffix">jboss-beans.xml</property>
+ </bean>
+
</deployment>
\ No newline at end of file
15 years
- 1
- 0