[jboss-cvs] JBossAS SVN: r106085 - in projects/demos/microcontainer/trunk: igloo and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 16 10:31:31 EDT 2010
Author: alesj
Date: 2010-06-16 10:31:30 -0400 (Wed, 16 Jun 2010)
New Revision: 106085
Removed:
projects/demos/microcontainer/trunk/igloo/src/main/java/org/jboss/demos/bootstrap/igloo/deployers/
Modified:
projects/demos/microcontainer/trunk/igloo/pom.xml
projects/demos/microcontainer/trunk/igloo/src/main/resources/META-INF/igloo-beans.xml
projects/demos/microcontainer/trunk/pom.xml
Log:
Re-enable OSGi, atm IglooMain starts.
Modified: projects/demos/microcontainer/trunk/igloo/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/igloo/pom.xml 2010-06-16 12:44:46 UTC (rev 106084)
+++ projects/demos/microcontainer/trunk/igloo/pom.xml 2010-06-16 14:31:30 UTC (rev 106085)
@@ -67,26 +67,11 @@
<!-- OSGi -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-deployers</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-microcontainer</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-core</artifactId>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: projects/demos/microcontainer/trunk/igloo/src/main/resources/META-INF/igloo-beans.xml
===================================================================
--- projects/demos/microcontainer/trunk/igloo/src/main/resources/META-INF/igloo-beans.xml 2010-06-16 12:44:46 UTC (rev 106084)
+++ projects/demos/microcontainer/trunk/igloo/src/main/resources/META-INF/igloo-beans.xml 2010-06-16 14:31:30 UTC (rev 106085)
@@ -8,37 +8,82 @@
********************************
-->
- <bean name="OSGiBundleManager" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager">
- <constructor><parameter><inject bean="MainDeployer" /></parameter></constructor>
- <property name="properties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.osgi.framework.storage</key><value>${log4j.output.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>
- org.jboss.logging;version=2.0,
- org.jboss.osgi.spi.capability;version=1.0,
- org.jboss.osgi.spi.logging;version=1.0,
- org.jboss.osgi.spi.management;version=1.0,
- org.jboss.osgi.spi.service;version=1.0,
- org.jboss.osgi.spi.testing;version=1.0,
- org.jboss.osgi.spi.util;version=1.0
- </value></entry>
- </map>
- </property>
- <incallback method="addPlugin" />
+ <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="ClassLoaderSystem" property="defaultDomain"/></property>
+ <incallback method="addPlugin" state="Instantiated"/>
<uncallback method="removePlugin" />
</bean>
- <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.plugins.facade.plugins.FrameworkEventsPluginImpl">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ <bean name="OSGiFrameworkProperties" class="org.jboss.osgi.framework.plugins.internal.FrameworkPropertiesImpl">
+ <constructor>
+ <parameter>
+ <map keyClass="java.lang.String" valueClass="java.lang.String"/>
+ </parameter>
+ </constructor>
</bean>
- <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl">
+
+ <!--
+ ********************************
+ * *
+ * 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="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.internal.SystemPackagesPluginImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" state="Instantiated"/></parameter></constructor>
+ </bean>
+ <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="OSGiSystemPackages" class="org.jboss.osgi.plugins.facade.plugins.SystemPackagesPluginImpl">
+ <bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.internal.BundleStoragePluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</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="OSGiServiceManagerPlugin" class="org.jboss.osgi.framework.bundle.ServiceManagerPluginImpl">
+ <constructor>
+ <parameter><inject bean="OSGiBundleManager" /></parameter>
+ <parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
+ </constructor>
+ </bean>
+
<!--
********************************
* *
@@ -47,27 +92,35 @@
********************************
-->
- <!-- Bundle Structure -->
- <bean name="BundleStructure" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
+ <!-- The deployment registry -->
+ <bean name="OSGiDeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
<!-- OSGI Deployment -->
- <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiManifestParsingDeployer" />
- <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer">
+ <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="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"/>
- <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" />
+ <bean name="OSGiBundleStateInstallDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateInstallDeployer"/>
+ <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="OSGiManifestMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestMetaDataDeployer" />
+ <bean name="OSGiNativeCodeMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiNativeCodeMetaDataDeployer" />
- <bean name="BundleResolver" class="org.jboss.demos.bootstrap.igloo.deployers.BundleResolver">
- <constructor><parameter><inject bean="jboss.kernel:service=KernelController" /></parameter></constructor>
+ <bean name="OSGiSingletonSchemaResolverFactory">
+ <constructor factoryClass="org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory" factoryMethod="getInstance" />
</bean>
- <bean name="OSGiBundleResolveDeployer" class="org.jboss.demos.bootstrap.igloo.deployers.BundleResolveDeployer">
- <constructor><parameter><inject bean="BundleResolver" /></parameter></constructor>
+ <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="OSGiBundleStartStopDeployer" class="org.jboss.demos.bootstrap.igloo.deployers.BundleStartStopDeployer" />
- <bean name="OSGiBundleRequiredStageDeployer" class="org.jboss.demos.bootstrap.igloo.deployers.BundleRequiredStageDeployer" />
- <bean name="OSGiBundleResetDeployer" class="org.jboss.demos.bootstrap.igloo.deployers.BundleResetDeployer">
- <constructor><parameter><inject bean="BundleResolver" /></parameter></constructor>
- </bean>
</deployment>
Modified: projects/demos/microcontainer/trunk/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/pom.xml 2010-06-16 12:44:46 UTC (rev 106084)
+++ projects/demos/microcontainer/trunk/pom.xml 2010-06-16 14:31:30 UTC (rev 106085)
@@ -28,8 +28,8 @@
<module>classloader</module>
<module>classloading</module>
<module>classpath</module>
- <!-- module>igloo</module>
- <module>bundle</module>
+ <module>igloo</module>
+ <!-- module>bundle</module>
<module>bundle_user</module -->
<module>vfs</module>
<module>policy</module>
@@ -43,28 +43,25 @@
<properties>
<version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
<version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
- <version.org.jboss.man>2.1.1.SP1</version.org.jboss.man>
- <version.org.jboss.mdr>2.2.0.Alpha2</version.org.jboss.mdr>
- <version.org.jboss.kernel>2.2.0.Alpha9</version.org.jboss.kernel>
- <version.org.jboss.classloader>2.2.0.Alpha4</version.org.jboss.classloader>
- <version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
+ <version.org.jboss.man>2.1.1.SP2</version.org.jboss.man>
+ <version.org.jboss.mdr>2.2.0.Alpha3</version.org.jboss.mdr>
+ <version.org.jboss.kernel>2.2.0.Alpha10</version.org.jboss.kernel>
+ <version.org.jboss.classloader>2.2.0.Alpha5</version.org.jboss.classloader>
+ <version.org.jboss.deployers>2.2.0.Alpha5</version.org.jboss.deployers>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.common.logging.spi>2.2.0.CR1</version.org.jboss.common.logging.spi>
<version.org.jboss.common.logging.log4j>2.2.0.CR1</version.org.jboss.common.logging.log4j>
- <version.org.jboss.xb>2.0.2.Beta6</version.org.jboss.xb>
+ <version.org.jboss.xb>2.0.2.Beta7</version.org.jboss.xb>
<version.org.jboss.threads>2.0.0.CR3</version.org.jboss.threads>
<version.org.jboss.aop>2.0.1.GA</version.org.jboss.aop>
<version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
<version.org.infinispan>4.1.0-SNAPSHOT</version.org.infinispan>
<version.junit>4.4</version.junit>
- <version.javassist>3.12.0.GA</version.javassist>
+ <version.javassist>3.12.1.GA</version.javassist>
<version.xerces>2.9.1</version.xerces>
<version.spring>2.5.6</version.spring>
<!-- OSGi Facade-->
- <version.org.jboss.osgi.runtime.mc>1.0.2-SNAPSHOT</version.org.jboss.osgi.runtime.mc>
- <version.org.jboss.osgi.common>1.0.1-SNAPSHOT</version.org.jboss.osgi.common>
- <version.org.jboss.osgi.runtime.deployers>1.0.1-SNAPSHOT</version.org.jboss.osgi.runtime.deployers>
- <version.org.jboss.osgi.spi>1.0.1-SNAPSHOT</version.org.jboss.osgi.spi>
+ <version.org.jboss.osgi>1.0.0.Alpha5-SNAPSHOT</version.org.jboss.osgi>
<version.osgi>r4v42-20090728</version.osgi>
</properties>
@@ -514,30 +511,10 @@
</dependency>
<!-- OSGi Dependencies -->
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-core</artifactId>
+ <version>${version.org.jboss.osgi}</version>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.org.jboss.osgi.spi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-deployers</artifactId>
- <version>${version.org.jboss.osgi.runtime.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-microcontainer</artifactId>
- <version>${version.org.jboss.osgi.runtime.mc}</version>
- </dependency>
<!-- test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
More information about the jboss-cvs-commits
mailing list