[jboss-cvs] JBossAS SVN: r106698 - in trunk: component-matrix and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 14 12:36:46 EDT 2010
Author: thomas.diesler at jboss.com
Date: 2010-07-14 12:36:46 -0400 (Wed, 14 Jul 2010)
New Revision: 106698
Added:
trunk/osgi/zip/src/resources/jboss-osgi-system-jboss-beans.xml
Modified:
trunk/.gitignore
trunk/component-matrix/pom.xml
trunk/osgi/jar/.classpath
trunk/osgi/zip/pom.xml
trunk/osgi/zip/src/assembly/assembly.xml
trunk/osgi/zip/src/resources/jboss-osgi-jboss-beans.xml
Log:
Merge branch 'jbosgi'
Modified: trunk/.gitignore
===================================================================
--- trunk/.gitignore 2010-07-14 16:13:30 UTC (rev 106697)
+++ trunk/.gitignore 2010-07-14 16:36:46 UTC (rev 106698)
@@ -1,12 +1,13 @@
.svn
svn-commit.tmp
-/*/output
-/bootstrap/target
+*.project
+*.settings
+*.classpath
+*output/
+*target/
/build/build.log
/build/local.properties
-/jbossas/jmx-remoting/output
-/jbossas/remoting/output
/testsuite/build.log
/testsuite/run.tstamp
# not really, but a temp stop-gap
-/thirdparty/*
+/thirdparty/
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-07-14 16:13:30 UTC (rev 106697)
+++ trunk/component-matrix/pom.xml 2010-07-14 16:36:46 UTC (rev 106698)
@@ -30,8 +30,8 @@
<!-- Properties -->
<properties>
- <version.apache.aries.jmx>0.1-incubating-20100329</version.apache.aries.jmx>
- <version.apache.aries.util>0.1-incubating-20100329</version.apache.aries.util>
+ <version.apache.aries.jmx>0.1-incubating</version.apache.aries.jmx>
+ <version.apache.aries.util>0.1-incubating</version.apache.aries.util>
<version.apache.cxf>2.2.9-patch-01</version.apache.cxf>
<version.apache.neethi>2.0.4</version.apache.neethi>
<version.apache.felix.log>1.0.0</version.apache.felix.log>
@@ -58,25 +58,25 @@
<version.jboss.jbossws-spi>1.4.0.Beta1</version.jboss.jbossws-spi>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.jsf-deployer>1.0.1</version.jboss.jsf-deployer>
- <version.jboss.osgi.apache.xerces>2.9.1.SP4</version.jboss.osgi.apache.xerces>
<version.jboss.osgi.blueprint>1.0.0.Beta2</version.jboss.osgi.blueprint>
<version.jboss.osgi.common>1.0.4</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
<version.jboss.osgi.deployers>1.0.7</version.jboss.osgi.deployers>
<version.jboss.osgi.deployment>1.0.2</version.jboss.osgi.deployment>
- <version.jboss.osgi.framework>1.0.0.Alpha4</version.jboss.osgi.framework>
+ <version.jboss.osgi.framework>1.0.0.Alpha5</version.jboss.osgi.framework>
<version.jboss.osgi.husky>1.0.4</version.jboss.osgi.husky>
- <version.jboss.osgi.jaxb>2.1.10.SP4</version.jboss.osgi.jaxb>
+ <version.jboss.osgi.jaxb>2.1.10.SP5</version.jboss.osgi.jaxb>
<version.jboss.osgi.jbossas>1.0.3</version.jboss.osgi.jbossas>
- <version.jboss.osgi.jmx>1.0.5</version.jboss.osgi.jmx>
+ <version.jboss.osgi.jmx>1.0.7</version.jboss.osgi.jmx>
<version.jboss.osgi.jndi>1.0.3</version.jboss.osgi.jndi>
<version.jboss.osgi.jta>1.0.1</version.jboss.osgi.jta>
<version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect>
- <version.jboss.osgi.spi>1.0.6</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.9</version.jboss.osgi.spi>
<version.jboss.osgi.vfs>1.0.0</version.jboss.osgi.vfs>
- <version.jboss.osgi.webapp>0.7.2.SP2</version.jboss.osgi.webapp>
+ <version.jboss.osgi.webapp>1.0.0</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.3</version.jboss.osgi.webconsole>
- <version.jboss.osgi.xml.binding>2.0.2.Beta4.SP1</version.jboss.osgi.xml.binding>
+ <version.jboss.osgi.xerces>2.9.1.SP5</version.jboss.osgi.xerces>
+ <version.jboss.osgi.xml.binding>2.0.2.Beta4.SP2</version.jboss.osgi.xml.binding>
<version.jboss.web>3.0.0-beta-6</version.jboss.web>
<version.jgroups>2.10.0.Beta2</version.jgroups>
<version.jsr181.api>1.0-MR1</version.jsr181.api>
@@ -3570,10 +3570,20 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-core</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework-metadata</artifactId>
<version>${version.jboss.osgi.framework}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-resolver</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi.vfs</groupId>
<artifactId>jboss-osgi-vfs</artifactId>
<version>${version.jboss.osgi.vfs}</version>
@@ -3582,6 +3592,12 @@
<groupId>org.jboss.osgi.vfs</groupId>
<artifactId>jboss-osgi-vfs30</artifactId>
<version>${version.jboss.osgi.vfs}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: trunk/osgi/jar/.classpath
===================================================================
--- trunk/osgi/jar/.classpath 2010-07-14 16:13:30 UTC (rev 106697)
+++ trunk/osgi/jar/.classpath 2010-07-14 16:36:46 UTC (rev 106698)
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: trunk/osgi/zip/pom.xml
===================================================================
--- trunk/osgi/zip/pom.xml 2010-07-14 16:13:30 UTC (rev 106697)
+++ trunk/osgi/zip/pom.xml 2010-07-14 16:36:46 UTC (rev 106698)
@@ -50,23 +50,11 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework</artifactId>
- <version>${version.jboss.osgi.framework}</version>
+ <artifactId>jboss-osgi-framework-core</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-vfs30</artifactId>
- <version>${version.jboss.osgi.framework}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>jboss-osgi-framework-resolver</artifactId>
</dependency>
<!-- Apache Aries -->
@@ -91,25 +79,6 @@
<!-- Bundle Dependencies -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-apache-xerces</artifactId>
- <exclusions>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>wutka-dtdparser</groupId>
- <artifactId>dtdparser121</artifactId>
- </exclusion>
- </exclusions>
- <version>${version.jboss.osgi.apache.xerces}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-blueprint</artifactId>
<version>${version.jboss.osgi.blueprint}</version>
</dependency>
@@ -130,21 +99,6 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jaxb</artifactId>
- <version>${version.jboss.osgi.jaxb}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.jmx</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi.jmx}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.jndi</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <version>${version.jboss.osgi.jndi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jta</artifactId>
<exclusions>
<exclusion>
@@ -161,19 +115,53 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-webapp</artifactId>
- <version>${version.jboss.osgi.webapp}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-webconsole</artifactId>
<version>${version.jboss.osgi.webconsole}</version>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
+ <groupId>org.jboss.osgi.jaxb</groupId>
+ <artifactId>jboss-osgi-jaxb</artifactId>
+ <version>${version.jboss.osgi.jaxb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.jmx</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.jndi</groupId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.webapp</groupId>
+ <artifactId>jboss-osgi-webapp</artifactId>
+ <version>${version.jboss.osgi.webapp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.xb</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
<version>${version.jboss.osgi.xml.binding}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.xerces</groupId>
+ <artifactId>jboss-osgi-xerces</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ </exclusions>
+ <version>${version.jboss.osgi.xerces}</version>
+ </dependency>
<!-- OPS4J -->
<dependency>
Modified: trunk/osgi/zip/src/assembly/assembly.xml
===================================================================
--- trunk/osgi/zip/src/assembly/assembly.xml 2010-07-14 16:13:30 UTC (rev 106697)
+++ trunk/osgi/zip/src/assembly/assembly.xml 2010-07-14 16:36:46 UTC (rev 106698)
@@ -11,6 +11,7 @@
<directory>src/resources</directory>
<includes>
<include>jboss-osgi-jboss-beans.xml</include>
+ <include>jboss-osgi-system-jboss-beans.xml</include>
</includes>
<outputDirectory>deployers/osgi.deployer/META-INF</outputDirectory>
</fileSet>
@@ -28,12 +29,10 @@
<dependencySet>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>*:jboss-osgi-deployers-vfs30:jar</include>
<include>*:jboss-osgi-deployment:jar</include>
- <include>*:jboss-osgi-framework:jar</include>
<include>*:jboss-osgi-framework-core:jar</include>
<include>*:jboss-osgi-framework-metadata:jar</include>
- <include>*:jboss-osgi-framework-vfs30:jar</include>
+ <include>*:jboss-osgi-framework-resolver:jar</include>
<include>*:jboss-osgi-spi:jar</include>
<include>*:jboss-osgi-vfs:jar</include>
<include>*:jboss-osgi-vfs30:jar</include>
@@ -48,8 +47,7 @@
<dependencySet>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>*:jboss-osgi-apache-xerces:jar</include>
- <include>*:jboss-osgi-blueprint:jar</include>
+ <!-- include>*:jboss-osgi-blueprint:jar</include -->
<include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-common-core:jar</include>
<include>*:jboss-osgi-husky:jar</include>
@@ -59,6 +57,7 @@
<include>*:jboss-osgi-reflect:jar</include>
<include>*:jboss-osgi-webapp:jar</include>
<include>*:jboss-osgi-webconsole:jar</include>
+ <include>*:jboss-osgi-xerces:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.apache.aries.jmx:jar</include>
<include>*:org.apache.aries.util:jar</include>
Modified: trunk/osgi/zip/src/resources/jboss-osgi-jboss-beans.xml
===================================================================
--- trunk/osgi/zip/src/resources/jboss-osgi-jboss-beans.xml 2010-07-14 16:13:30 UTC (rev 106697)
+++ trunk/osgi/zip/src/resources/jboss-osgi-jboss-beans.xml 2010-07-14 16:36:46 UTC (rev 106698)
@@ -1,172 +1,73 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- $Id: $ -->
-
- <!--
- ********************************
- * *
- * OSGi Bundle Manager *
- * *
- ********************************
- -->
-
- <bean name="OSGiBundleManager" class="org.jboss.osgi.framework.bundle.OSGiBundleManager">
+ <bean name="OSGiFrameworkProperties" class="org.jboss.osgi.framework.plugins.internal.FrameworkPropertiesImpl">
<constructor>
- <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter>
- <parameter><inject bean="MainDeployer" /></parameter>
+ <parameter>
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/osgi-store</value></entry>
+ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
+ <entry><key>org.osgi.framework.system.packages.extra</key><value>
+
+ <!-- javax -->
+ javax.servlet,
+ javax.servlet.http,
+ javax.transaction,
+
+ <!-- jnp naming -->
+ org.jnp.interfaces;version=5.0,
+
+ <!-- logging -->
+ org.apache.log4j;version=1.2,
+ org.jboss.logging;version=2.1,
+
+ <!-- jboss -->
+ org.jboss.beans.metadata.plugins;version=2.2,
+ org.jboss.beans.metadata.plugins.builder;version=2.2,
+ org.jboss.beans.metadata.spi;version=2.2,
+ org.jboss.beans.metadata.spi.builder;version=2.2,
+ org.jboss.dependency.spi;version=2.2,
+ org.jboss.kernel.spi.dependency;version=2.2,
+
+ <!-- jboss-osgi -->
+ org.jboss.osgi.spi;version=1.0,
+ org.jboss.osgi.spi.capability;version=1.0,
+ org.jboss.osgi.spi.framework;version=1.0,
+ org.jboss.osgi.spi.service;version=1.0,
+ org.jboss.osgi.spi.util;version=1.0,
+ org.jboss.osgi.testing;version=1.0,
+ org.jboss.osgi.vfs;version=1.0
+ </value></entry>
+ <!-- Husky socket connector properties -->
+ <entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
+ <entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry>
+ <!-- HTTP Service Port -->
+ <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
+ <!-- Config Admin Service -->
+ <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>
+ <!-- JMX bundle properties -->
+ <entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry>
+ <!-- JNDI bundle properties -->
+ <entry><key>org.jboss.osgi.jndi.host</key><value>${jboss.bind.address}</value></entry>
+ <!-- JTA Object Store -->
+ <entry><key>com.arjuna.ats.arjuna.objectstore.objectStoreDir</key><value>${jboss.server.data.dir}/tx-object-store</value></entry>
+ </map>
+ </parameter>
</constructor>
- <property name="properties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.osgi.framework.storage</key><value>${jboss.server.data.dir}/osgi-store</value></entry>
- <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
- <entry><key>org.osgi.framework.system.packages.extra</key><value>
-
- <!-- JavaEE -->
- javax.transaction,
-
- <!-- jnp naming -->
- org.jnp.interfaces;version=5.0,
-
- <!-- logging -->
- org.apache.log4j;version=1.2,
- org.jboss.logging;version=2.1,
-
- <!-- jboss -->
- org.jboss.beans.metadata.plugins;version=2.2,
- org.jboss.beans.metadata.plugins.builder;version=2.2,
- org.jboss.beans.metadata.spi;version=2.2,
- org.jboss.beans.metadata.spi.builder;version=2.2,
- org.jboss.dependency.spi;version=2.2,
- org.jboss.kernel.spi.dependency;version=2.2,
-
- <!-- jboss-osgi -->
- org.jboss.osgi.spi;version=1.0,
- org.jboss.osgi.spi.capability;version=1.0,
- org.jboss.osgi.spi.framework;version=1.0,
- org.jboss.osgi.spi.service;version=1.0,
- org.jboss.osgi.spi.util;version=1.0,
- org.jboss.osgi.testing;version=1.0,
- org.jboss.osgi.vfs;version=1.0
- </value></entry>
- <!-- Husky socket connector properties -->
- <entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
- <entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry>
- <!-- HTTP Service Port -->
- <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
- <!-- Config Admin Service -->
- <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>
- <!-- JMX bundle properties -->
- <entry><key>org.jboss.osgi.jmx.host</key><value>${jboss.bind.address}</value></entry>
- <entry><key>org.jboss.osgi.jmx.port</key><value>1098</value></entry>
- <!-- JNDI bundle properties -->
- <entry><key>org.jboss.osgi.jndi.host</key><value>${jboss.bind.address}</value></entry>
- <entry><key>org.jboss.osgi.jndi.rmi.port</key><value>1098</value></entry>
- <entry><key>org.jboss.osgi.jndi.port</key><value>1099</value></entry>
- <!-- JTA Object Store -->
- <entry><key>com.arjuna.ats.arjuna.objectstore.objectStoreDir</key><value>${jboss.server.data.dir}/tx-object-store</value></entry>
- </map>
- </property>
- <incallback method="addPlugin" />
- <uncallback method="removePlugin" />
</bean>
- <!--
- ********************************
- * *
- * OSGi Manager Plugins *
- * *
- ********************************
- -->
-
- <!-- [JBOSGI-147] Autostart in JBossAS recycle the bundle
- <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.framework.plugins.internal.AutoInstallPluginImpl">
+ <bean name="StartLevelService" class="org.jboss.osgi.framework.service.internal.StartLevelImpl">
+ <related-class name="org.osgi.service.startlevel.StartLevel">OSGi</related-class>
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- <property name="autoInstall">
- <list elementClass="java.net.URL">
- <value>${jboss.server.home.dir}/deploy/osgi/org.osgi.compendium.jar</value>
- </list>
- </property>
- <property name="autoStart">
- <list elementClass="java.net.URL">
- <value>${jboss.server.home.dir}/deploy/osgi/org.apache.felix.log.jar</value>
- <value>${jboss.server.home.dir}/deploy/osgi/jboss-osgi-common.jar</value>
- </list>
- </property>
+ <demand state="PreInstall">MDRService</demand>
</bean>
- -->
- <bean name="OSGiControllerContextPlugin" class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl">
- <constructor>
- <parameter><inject bean="OSGiBundleManager" /></parameter>
- <parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
- </constructor>
- </bean>
- <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- </bean>
- <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- </bean>
- <bean name="OSGiServiceManager" class="org.jboss.osgi.framework.bundle.ServiceManagerPluginImpl">
- <constructor>
- <parameter><inject bean="OSGiBundleManager" /></parameter>
- <parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
- </constructor>
- <property name="enableMDRUsage">false</property>
- </bean>
- <bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.internal.BundleStoragePluginImpl">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- </bean>
- <bean name="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.internal.SystemPackagesPluginImpl">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- </bean>
-
- <!--
- ********************************
- * *
- * OSGi Service Plugins *
- * *
- ********************************
- -->
-
<bean name="MicrocontainerService" class="org.jboss.osgi.framework.service.internal.MicrocontainerServiceImpl">
+ <related-class name="org.jboss.osgi.spi.service.MicrocontainerService">OSGi</related-class>
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ <demand state="PreInstall">MDRService</demand>
</bean>
- <bean name="StartLevelService" class="org.jboss.osgi.framework.service.internal.StartLevelImpl">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- </bean>
- <bean name="PackageAdminService" class="org.jboss.osgi.framework.packageadmin.PackageAdminImpl">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- </bean>
- <bean name="DeployerService" class="org.jboss.osgi.framework.service.internal.DeployerServiceImpl">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- </bean>
- <bean name="LifecycleInterceptorService" class="org.jboss.osgi.framework.service.internal.LifecycleInterceptorServiceImpl">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- </bean>
- <!--
- ********************************
- * *
- * OSGi Interceptors *
- * *
- ********************************
- -->
-
- <bean name="WebXMLVerifier" class="org.jboss.osgi.framework.service.internal.WebXMLVerifierInterceptor">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- </bean>
-
- <!--
- ********************************
- * *
- * OSGi Deployment *
- * *
- ********************************
- -->
-
- <bean name="OSGiDeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
-
+ <bean name="OSGiBundleNoScanningDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleNoScanningDeployer" />
<bean name="OSGiDeployersWrapper" class="org.jboss.osgi.framework.deployers.OSGiDeployersWrapper" >
<constructor>
<parameter><inject bean="MainDeployer"/></parameter>
@@ -174,59 +75,12 @@
</constructor>
</bean>
- <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" />
- <bean name="OSGiBundleStateCreateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateCreateDeployer">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
- </bean>
- <bean name="OSGiBundleStateInstallDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateInstallDeployer"/>
- <bean name="OSGiBundleStateResolveDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateResolveDeployer"/>
- <bean name="OSGiBundleStructure" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
- <bean name="OSGiContextTrackerDeployer" class="org.jboss.osgi.framework.deployers.OSGiContextTrackerDeployer" />
- <bean name="OSGiDeploymentMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiDeploymentMetaDataDeployer" />
- <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
- <bean name="OSGiNativeCodeMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiNativeCodeMetaDataDeployer" />
-
- <!--
- ********************************
- * *
- * OSGi Classloading *
- * *
- ********************************
- -->
-
- <bean name="OSGiClassLoading" class="org.jboss.osgi.framework.classloading.OSGiClassLoading"/>
- <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderSystem" />
- <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderDomain" >
- <constructor><parameter>OSGiClassLoaderDomain</parameter></constructor>
- <property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property>
- <property name="bundleManager"><inject bean="OSGiBundleManager" /></property>
- </bean>
- <bean name="OSGiClassLoaderFactory" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderFactory" >
- <property name="system"><inject bean="OSGiClassLoaderSystem"/></property>
- </bean>
- <bean name="OSGiClassLoadingDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleClassLoadingDeployer">
- <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
- <property name="factory"><inject bean="OSGiClassLoaderFactory"/></property>
- </bean>
- <bean name="OSGiFragmentClassLoadingDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentClassLoadingDeployer">
- <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
- <property name="factory"><inject bean="OSGiClassLoaderFactory"/></property>
- </bean>
- <bean name="OSGiFragmentAttachmentDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentAttachmentDeployer"/>
- <bean name="OSGiModuleDeployer" class="org.jboss.osgi.framework.deployers.OSGiModuleDeployerTempWorkaround">
- <property name="classLoading"><inject bean="OSGiClassLoading" /></property>
- </bean>
-
- <!--
- ********************************
- * *
- * Framework *
- * *
- ********************************
- -->
-
+ <!-- Autostart the Framework, must come last -->
<bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.framework.launch.OSGiFramework">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ <depends>OSGiFrameworkEventsPlugin</depends>
+ <depends>OSGiServiceManagerPlugin</depends>
+ <depends>OSGiStoragePlugin</depends>
+ <depends>OSGiSystemPackages</depends>
</bean>
-
-</deployment>
\ No newline at end of file
+</deployment>
Copied: trunk/osgi/zip/src/resources/jboss-osgi-system-jboss-beans.xml (from rev 106697, trunk/osgi/zip/src/resources/jboss-osgi-jboss-beans.xml)
===================================================================
--- trunk/osgi/zip/src/resources/jboss-osgi-system-jboss-beans.xml (rev 0)
+++ trunk/osgi/zip/src/resources/jboss-osgi-system-jboss-beans.xml 2010-07-14 16:36:46 UTC (rev 106698)
@@ -0,0 +1,201 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!--
+ ********************************
+ * *
+ * OSGi Framework *
+ * *
+ ********************************
+ -->
+
+ <bean name="OSGiBundleManager" class="org.jboss.osgi.framework.bundle.OSGiBundleManager">
+ <constructor>
+ <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter>
+ <parameter><inject bean="OSGiFrameworkProperties" /></parameter>
+ <parameter><inject bean="MainDeployer" /></parameter>
+ </constructor>
+ <property name="classLoaderDomain"><inject bean="OSGiClassLoaderSystem" property="defaultDomain"/></property>
+ <incallback method="addPlugin" state="Instantiated"/>
+ <uncallback method="removePlugin" />
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * OSGi Metadata Repository *
+ * *
+ ********************************
+ -->
+
+ <bean name="MDRService" class="org.jboss.osgi.framework.bundle.MetaDataRetrievalService">
+ <constructor>
+ <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter>
+ <parameter><inject bean="OSGiBundleManager" property="systemBundle" /></parameter>
+ </constructor>
+ <property name="factory"><inject bean="InstanceMDRFactory" /></property>
+ </bean>
+ <bean name="InstanceMDRFactory" class="org.jboss.osgi.framework.bundle.InstanceMetaDataRetrievalFactory">
+ <constructor><parameter><inject bean="jboss.kernel:service=Kernel" /></parameter></constructor>
+ <incallback method="addFactory" />
+ <uncallback method="removeFactory" />
+ </bean>
+ <bean name="OSGiDictionaryFactory" class="org.jboss.osgi.framework.bundle.OSGiServiceStateDictionaryFactory" />
+ <bean name="KernelDictionaryFactory" class="org.jboss.osgi.framework.bundle.KernelDictionaryFactory">
+ <constructor><parameter><inject bean="jboss.kernel:service=KernelConfigurator" /></parameter>
+ </constructor>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * OSGi Framework Plugins *
+ * *
+ ********************************
+ -->
+
+ <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ <bean name="OSGiResolverPlugin" class="org.jboss.osgi.framework.resolver.felix.FelixResolverPlugin">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ <bean name="OSGiServiceManagerPlugin" class="org.jboss.osgi.framework.bundle.ServiceManagerPluginImpl">
+ <constructor>
+ <parameter><inject bean="OSGiBundleManager" /></parameter>
+ <parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
+ </constructor>
+ </bean>
+ <bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.internal.BundleStoragePluginImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ <bean name="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.internal.SystemPackagesPluginImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" state="Instantiated"/></parameter></constructor>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * OSGi Service Plugins *
+ * *
+ ********************************
+ -->
+
+ <bean name="DeployerService" class="org.jboss.osgi.framework.service.internal.DeployerServiceImpl">
+ <related-class name="org.jboss.osgi.deployment.deployer.DeployerService">OSGi</related-class>
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ <demand state="PreInstall">MDRService</demand>
+ </bean>
+ <bean name="PackageAdminService" class="org.jboss.osgi.framework.packageadmin.PackageAdminImpl">
+ <related-class name="org.osgi.service.packageadmin.PackageAdmin">OSGi</related-class>
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ <demand state="PreInstall">MDRService</demand>
+ </bean>
+ <bean name="LifecycleInterceptorService" class="org.jboss.osgi.framework.service.internal.LifecycleInterceptorServiceImpl">
+ <related-class name="org.jboss.osgi.deployment.interceptor.LifecycleInterceptorService">OSGi</related-class>
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ <demand state="PreInstall">MDRService</demand>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * OSGi Interceptors *
+ * *
+ ********************************
+ -->
+
+ <bean name="WebXMLVerifier" class="org.jboss.osgi.framework.service.internal.WebXMLVerifierInterceptor">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * OSGi Deployment *
+ * *
+ ********************************
+ -->
+
+ <!-- The deployment registry -->
+ <bean name="OSGiDeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
+
+ <!-- OSGI Deployment -->
+ <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" />
+ <bean name="OSGiBundleResolvedDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleResolvedDeployer"/>
+ <bean name="OSGiBundleStateCreateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateCreateDeployer">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+ <bean name="OSGiBundleStateInstallDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateInstallDeployer"/>
+ <bean name="OSGiBundleStructureDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStructureDeployer" />
+ <bean name="OSGiContextTrackerDeployer" class="org.jboss.osgi.framework.deployers.OSGiContextTrackerDeployer" />
+ <bean name="OSGiDeploymentMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiDeploymentMetaDataDeployer" />
+ <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
+ <bean name="OSGiManifestMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestMetaDataDeployer" />
+ <bean name="OSGiNativeCodeMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiNativeCodeMetaDataDeployer" />
+ <bean name="OSGiStartLevelMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiStartLevelMetaDataDeployer">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
+
+ <!--
+ ********************************
+ * *
+ * OSGi Classloading *
+ * *
+ ********************************
+ -->
+
+ <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderSystem">
+ <constructor><parameter><inject bean="OSGiSystemPackages" /></parameter></constructor>
+ </bean>
+ <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderDomain" >
+ <property name="parent"><inject bean="OSGiClassLoaderSystem" property="defaultDomain"/></property>
+ <property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property>
+ </bean>
+ <bean name="OSGiClassLoaderFactory" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderFactory" >
+ <property name="system"><inject bean="OSGiClassLoaderSystem"/></property>
+ </bean>
+ <bean name="OSGiClassLoadingDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleClassLoadingDeployer">
+ <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
+ <property name="factory"><inject bean="OSGiClassLoaderFactory"/></property>
+ </bean>
+ <bean name="OSGiFragmentClassLoadingDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentClassLoadingDeployer">
+ <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
+ <property name="factory"><inject bean="OSGiClassLoaderFactory"/></property>
+ </bean>
+ <bean name="OSGiModuleDeployer" class="org.jboss.osgi.framework.deployers.OSGiModuleDeployer">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ <property name="classLoading"><inject bean="ClassLoading" /></property>
+ </bean>
+ <bean name="OSGiFragmentAttachmentDeployer" class="org.jboss.osgi.framework.deployers.OSGiFragmentAttachmentDeployer"/>
+
+ <!--
+ ********************************
+ * *
+ * OSGi Custom Bean Schemas *
+ * *
+ ********************************
+ -->
+ <bean name="OSGiSingletonSchemaResolverFactory">
+ <constructor factoryClass="org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory" factoryMethod="getInstance" />
+ </bean>
+ <bean name="Pojo2OSGiSchema" class="org.jboss.xb.binding.resolver.MutableSchemaResolver">
+ <constructor factoryMethod="getSchemaBindingResolver"><factory bean="OSGiSingletonSchemaResolverFactory" /></constructor>
+ <install method="mapURIToClass">
+ <parameter>urn:jboss:pojo2osgi:1.0</parameter>
+ <parameter>org.jboss.osgi.framework.metadata.internal.OSGiPojoMetaData</parameter>
+ </install>
+ <uninstall method="removeURIToClassMapping">
+ <parameter>urn:jboss:pojo2osgi:1.0</parameter>
+ </uninstall>
+ </bean>
+ <bean name="StartLevelSchema" class="org.jboss.xb.binding.resolver.MutableSchemaResolver">
+ <constructor factoryMethod="getSchemaBindingResolver"><factory bean="OSGiSingletonSchemaResolverFactory" /></constructor>
+ <install method="mapURIToClass">
+ <parameter>urn:jboss:startlevel:1.0</parameter>
+ <parameter>org.jboss.osgi.framework.service.internal.StartLevelBeanDefinition</parameter>
+ </install>
+ <uninstall method="removeURIToClassMapping">
+ <parameter>urn:jboss:startlevel:1.0</parameter>
+ </uninstall>
+ </bean>
+</deployment>
More information about the jboss-cvs-commits
mailing list