[jboss-cvs] JBossAS SVN: r94262 - in projects/jboss-osgi/branches/tdiesler: distribution and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 2 06:17:06 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-10-02 06:17:05 -0400 (Fri, 02 Oct 2009)
New Revision: 94262
Modified:
projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/runtime/conf/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
projects/jboss-osgi/branches/tdiesler/distribution/pom.xml
projects/jboss-osgi/branches/tdiesler/pom.xml
projects/jboss-osgi/branches/tdiesler/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/branches/tdiesler/testsuite/example/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml
Log:
Consolidate & simplify package structure
Modified: projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-02 10:00:02 UTC (rev 94261)
+++ projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-02 10:17:05 UTC (rev 94262)
@@ -158,7 +158,7 @@
<include name="jboss-osgi-runtime-equinox-sources.jar" />
<include name="jboss-osgi-runtime-felix-sources.jar" />
<include name="jboss-osgi-runtime-jbossas-sources.jar" />
- <include name="jboss-osgi-runtime-microcontainer-sources.jar" />
+ <include name="jboss-osgi-framework-sources.jar" />
<include name="jboss-osgi-spi-sources.jar" />
<include name="jboss-osgi-webconsole-sources.jar" />
<include name="jboss-osgi-xml-binding-sources.jar" />
@@ -317,7 +317,7 @@
<include name="jboss-mdr.jar" />
<include name="jboss-metatype.jar" />
<include name="jboss-osgi-deployers.jar" />
- <include name="jboss-osgi-runtime-microcontainer.jar" />
+ <include name="jboss-osgi-framework.jar" />
<include name="jboss-reflect.jar" />
<include name="jbossxb.jar" />
<include name="xercesImpl.jar" />
@@ -418,7 +418,7 @@
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
- <include name="jboss-osgi-runtime-microcontainer.jar" />
+ <include name="jboss-osgi-framework.jar" />
</fileset>
<singlefile condition="isJBossMC" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-jbossmc.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
override="true" />
Modified: projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-10-02 10:00:02 UTC (rev 94261)
+++ projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-10-02 10:17:05 UTC (rev 94262)
@@ -10,7 +10,7 @@
********************************
-->
- <bean name="OSGiBundleManager" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager">
+ <bean name="OSGiBundleManager" class="org.jboss.osgi.framework.bundle.OSGiBundleManager">
<constructor>
<parameter><inject bean="jboss.kernel:service=Kernel" /></parameter>
<parameter><inject bean="MainDeployer" /></parameter>
@@ -74,7 +74,7 @@
-->
<!-- [JBOSGI-147] Autostart in JBossAS recycle the bundle
- <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.plugins.facade.plugins.AutoInstallPluginImpl">
+ <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.framework.plugins.internal.AutoInstallPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
<property name="autoInstall">
<list elementClass="java.net.URL">
@@ -90,13 +90,13 @@
</bean>
-->
- <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.plugins.facade.plugins.FrameworkEventsPluginImpl">
+ <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="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.internal.SystemPackagesPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl">
+ <bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.internal.BundleStoragePluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
@@ -108,13 +108,13 @@
********************************
-->
- <bean name="MicrocontainerService" class="org.jboss.osgi.plugins.facade.service.MicrocontainerServiceImpl">
+ <bean name="MicrocontainerService" class="org.jboss.osgi.framework.service.internal.MicrocontainerServiceImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="StartLevelService" class="org.jboss.osgi.plugins.facade.service.StartLevelImpl">
+ <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.plugins.facade.service.PackageAdminImpl">
+ <bean name="PackageAdminService" class="org.jboss.osgi.framework.service.internal.PackageAdminImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
@@ -126,7 +126,7 @@
********************************
-->
- <bean name="OSGiDeployersWrapper" class="org.jboss.osgi.plugins.deployers.bundle.OSGiDeployersWrapper" >
+ <bean name="OSGiDeployersWrapper" class="org.jboss.osgi.framework.deployers.OSGiDeployersWrapper" >
<constructor>
<parameter><inject bean="MainDeployer"/></parameter>
<parameter><inject bean="OSGiBundleManager"/></parameter>
@@ -134,11 +134,11 @@
</bean>
<bean name="OSGiBundleStructure" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
- <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiManifestParsingDeployer" />
- <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer">
+ <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
+ <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateDeployer">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" />
+ <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" />
<!--
********************************
@@ -148,12 +148,12 @@
********************************
-->
- <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderDomain" >
+ <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderDomain" >
<constructor><parameter>OSGiClassLoaderDomain</parameter></constructor>
<property name="classLoaderSystem"><inject bean="ClassLoaderSystem"/></property>
<property name="bundleManager"><inject bean="OSGiBundleManager" /></property>
</bean>
- <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer">
+ <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.framework.classloading.OSGiBundleClassLoadingDeployer">
<property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
</bean>
@@ -167,7 +167,7 @@
<!-- [TODO] use dependencies instead of bean order -->
- <bean name="OSGiBundleManagerLifecycle" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManagerLifecycle">
+ <bean name="OSGiBundleManagerLifecycle" class="org.jboss.osgi.framework.bundle.OSGiBundleManagerLifecycle">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
Modified: projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/runtime/conf/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
===================================================================
--- projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/runtime/conf/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-10-02 10:00:02 UTC (rev 94261)
+++ projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/runtime/conf/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-10-02 10:17:05 UTC (rev 94262)
@@ -1,3 +1,3 @@
-org.jboss.osgi.plugins.facade.launch.OSGiFrameworkBootstrapProvider # The MC Framework bootstrap provider
-org.jboss.osgi.equinox.EquinoxBootstrapProvider # The Equinox bootstrap provider
-org.jboss.osgi.felix.FelixBootstrapProvider # The Felix bootstrap provider
\ No newline at end of file
+org.jboss.osgi.framework.launch.OSGiFrameworkBootstrapProvider # The MC Framework bootstrap provider
+org.jboss.osgi.equinox.EquinoxBootstrapProvider # The Equinox bootstrap provider
+org.jboss.osgi.felix.FelixBootstrapProvider # The Felix bootstrap provider
\ No newline at end of file
Modified: projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-10-02 10:00:02 UTC (rev 94261)
+++ projects/jboss-osgi/branches/tdiesler/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-10-02 10:17:05 UTC (rev 94262)
@@ -8,7 +8,7 @@
********************************
-->
- <bean name="OSGiBundleManager" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager">
+ <bean name="OSGiBundleManager" class="org.jboss.osgi.framework.bundle.OSGiBundleManager">
<constructor>
<parameter><inject bean="jboss.kernel:service=Kernel" /></parameter>
<parameter><inject bean="MainDeployer" /></parameter>
@@ -68,7 +68,7 @@
********************************
-->
- <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.plugins.facade.plugins.AutoInstallPluginImpl">
+ <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.framework.plugins.internal.AutoInstallPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
<property name="autoInstall">
<list elementClass="java.net.URL">
@@ -83,13 +83,13 @@
</list>
</property>
</bean>
- <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.plugins.facade.plugins.FrameworkEventsPluginImpl">
+ <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl">
+ <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.plugins.facade.plugins.SystemPackagesPluginImpl">
+ <bean name="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.internal.SystemPackagesPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
@@ -101,13 +101,13 @@
********************************
-->
- <bean name="MicrocontainerService" class="org.jboss.osgi.plugins.facade.service.MicrocontainerServiceImpl">
+ <bean name="MicrocontainerService" class="org.jboss.osgi.framework.service.internal.MicrocontainerServiceImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="StartLevelService" class="org.jboss.osgi.plugins.facade.service.StartLevelImpl">
+ <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.plugins.facade.service.PackageAdminImpl">
+ <bean name="PackageAdminService" class="org.jboss.osgi.framework.service.internal.PackageAdminImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
@@ -128,8 +128,10 @@
<!-- 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>
+ <!-- Accept any implementor of structure deployer -->
<incallback method="addDeployer" />
<uncallback method="removeDeployer" />
</bean>
@@ -137,6 +139,7 @@
<!-- The holder for deployers that do real deployment -->
<bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
<constructor><parameter><inject bean="jboss.kernel:service=KernelController" /></parameter></constructor>
+ <!-- Accept any implementor of deployer -->
<incallback method="addDeployer" />
<uncallback method="removeDeployer" />
</bean>
@@ -156,11 +159,11 @@
<!-- OSGI Deployment -->
<bean name="OSGiBundleStructure" class="org.jboss.osgi.deployer.BundleStructureDeployer" />
- <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiManifestParsingDeployer" />
- <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleStateDeployer">
+ <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
+ <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateDeployer">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" />
+ <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" />
<!--
********************************
@@ -170,16 +173,16 @@
********************************
-->
- <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" />
- <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderDomain" >
+ <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="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer">
+ <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.framework.classloading.OSGiBundleClassLoadingDeployer">
<property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
</bean>
-
+
<bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
<incallback method="addModule" state="Configured" />
<uncallback method="removeModule" state="Configured" />
Modified: projects/jboss-osgi/branches/tdiesler/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/distribution/pom.xml 2009-10-02 10:00:02 UTC (rev 94261)
+++ projects/jboss-osgi/branches/tdiesler/distribution/pom.xml 2009-10-02 10:17:05 UTC (rev 94262)
@@ -359,13 +359,13 @@
<!-- JBossMC Dependencies -->
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-microcontainer</artifactId>
- <version>${version.jboss.osgi.runtime.jbossmc}</version>
+ <artifactId>jboss-osgi-framework</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-microcontainer</artifactId>
- <version>${version.jboss.osgi.runtime.jbossmc}</version>
+ <artifactId>jboss-osgi-framework</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
<classifier>sources</classifier>
</dependency>
Modified: projects/jboss-osgi/branches/tdiesler/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/pom.xml 2009-10-02 10:00:02 UTC (rev 94261)
+++ projects/jboss-osgi/branches/tdiesler/pom.xml 2009-10-02 10:17:05 UTC (rev 94262)
@@ -47,6 +47,7 @@
<version.jboss.osgi.blueprint>1.0.0.Beta1</version.jboss.osgi.blueprint>
<version.jboss.osgi.common>1.0.1</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
+ <version.jboss.osgi.framework>1.0.0-SNAPSHOT</version.jboss.osgi.framework>
<version.jboss.osgi.hotdeploy>1.0.1</version.jboss.osgi.hotdeploy>
<version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP2</version.jboss.osgi.jaxb>
@@ -57,7 +58,6 @@
<version.jboss.osgi.runtime.equinox>3.5</version.jboss.osgi.runtime.equinox>
<version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.runtime.jbossas>1.0.1</version.jboss.osgi.runtime.jbossas>
- <version.jboss.osgi.runtime.jbossmc>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.jbossmc>
<version.jboss.osgi.spi>1.0.1</version.jboss.osgi.spi>
<version.jboss.osgi.webconsole>1.0.1</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
Modified: projects/jboss-osgi/branches/tdiesler/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-02 10:00:02 UTC (rev 94261)
+++ projects/jboss-osgi/branches/tdiesler/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-02 10:17:05 UTC (rev 94262)
@@ -8,7 +8,7 @@
********************************
-->
- <bean name="OSGiBundleManager" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager">
+ <bean name="OSGiBundleManager" class="org.jboss.osgi.framework.bundle.OSGiBundleManager">
<constructor>
<parameter><inject bean="jboss.kernel:service=Kernel" /></parameter>
<parameter><inject bean="MainDeployer" /></parameter>
@@ -52,7 +52,7 @@
********************************
-->
- <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.plugins.facade.plugins.AutoInstallPluginImpl">
+ <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.framework.plugins.internal.AutoInstallPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
<property name="autoInstall">
<list elementClass="java.net.URL">
@@ -66,13 +66,13 @@
</list>
</property>
</bean>
- <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.plugins.facade.plugins.FrameworkEventsPluginImpl">
+ <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl">
+ <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.plugins.facade.plugins.SystemPackagesPluginImpl">
+ <bean name="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.internal.SystemPackagesPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
@@ -84,13 +84,13 @@
********************************
-->
- <bean name="MicrocontainerService" class="org.jboss.osgi.plugins.facade.service.MicrocontainerServiceImpl">
+ <bean name="MicrocontainerService" class="org.jboss.osgi.framework.service.internal.MicrocontainerServiceImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="StartLevelService" class="org.jboss.osgi.plugins.facade.service.StartLevelImpl">
+ <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.plugins.facade.service.PackageAdminImpl">
+ <bean name="PackageAdminService" class="org.jboss.osgi.framework.service.internal.PackageAdminImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
@@ -144,11 +144,11 @@
</bean>
<!-- 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="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
+ <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateDeployer">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" />
+ <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" />
<!--
********************************
@@ -158,16 +158,16 @@
********************************
-->
- <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" />
- <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderDomain" >
+ <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="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer">
+ <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.framework.classloading.OSGiBundleClassLoadingDeployer">
<property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
</bean>
-
+
<bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
<incallback method="addModule" state="Configured" />
<uncallback method="removeModule" state="Configured" />
Modified: projects/jboss-osgi/branches/tdiesler/testsuite/example/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
===================================================================
--- projects/jboss-osgi/branches/tdiesler/testsuite/example/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-10-02 10:00:02 UTC (rev 94261)
+++ projects/jboss-osgi/branches/tdiesler/testsuite/example/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-10-02 10:17:05 UTC (rev 94262)
@@ -1,3 +1,3 @@
-org.jboss.osgi.plugins.facade.launch.OSGiFrameworkBootstrapProvider # The MC Framework bootstrap provider
-org.jboss.osgi.equinox.EquinoxBootstrapProvider # The Equinox bootstrap provider
-org.jboss.osgi.felix.FelixBootstrapProvider # The Felix bootstrap provider
\ No newline at end of file
+org.jboss.osgi.framework.launch.OSGiFrameworkBootstrapProvider # The MC Framework bootstrap provider
+org.jboss.osgi.equinox.EquinoxBootstrapProvider # The Equinox bootstrap provider
+org.jboss.osgi.felix.FelixBootstrapProvider # The Felix bootstrap provider
\ No newline at end of file
Modified: projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-02 10:00:02 UTC (rev 94261)
+++ projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-02 10:17:05 UTC (rev 94262)
@@ -8,7 +8,7 @@
********************************
-->
- <bean name="OSGiBundleManager" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager">
+ <bean name="OSGiBundleManager" class="org.jboss.osgi.framework.bundle.OSGiBundleManager">
<constructor>
<parameter><inject bean="jboss.kernel:service=Kernel" /></parameter>
<parameter><inject bean="MainDeployer" /></parameter>
@@ -20,10 +20,6 @@
<entry><key>org.osgi.framework.system.packages.extra</key><value>
<!-- [JBOSGI-145] JAXB classes are loaded from the system classpath -->
com.sun.xml.internal.bind.v2,
-
- <!-- YourKit Profiling
- com.yourkit.runtime,
- -->
org.jboss.beans.metadata.plugins;version=2.0,
org.jboss.beans.metadata.plugins.builder;version=2.0,
@@ -56,15 +52,29 @@
********************************
-->
- <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.plugins.facade.plugins.FrameworkEventsPluginImpl">
+ <bean name="OSGiAutoInstallPlugin" class="org.jboss.osgi.framework.plugins.internal.AutoInstallPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ <property name="autoInstall">
+ <list elementClass="java.net.URL">
+ <value>${test.archive.directory}/bundles/org.osgi.compendium.jar</value>
+ </list>
+ </property>
+ <property name="autoStart">
+ <list elementClass="java.net.URL">
+ <value>${test.archive.directory}/bundles/org.apache.felix.log.jar</value>
+ <value>${test.archive.directory}/bundles/jboss-osgi-common.jar</value>
+ </list>
+ </property>
</bean>
- <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl">
+ <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="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.internal.SystemPackagesPluginImpl">
+ <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ </bean>
<!--
********************************
@@ -74,13 +84,13 @@
********************************
-->
- <bean name="MicrocontainerService" class="org.jboss.osgi.plugins.facade.service.MicrocontainerServiceImpl">
+ <bean name="MicrocontainerService" class="org.jboss.osgi.framework.service.internal.MicrocontainerServiceImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="StartLevelService" class="org.jboss.osgi.plugins.facade.service.StartLevelImpl">
+ <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.plugins.facade.service.PackageAdminImpl">
+ <bean name="PackageAdminService" class="org.jboss.osgi.framework.service.internal.PackageAdminImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
@@ -134,11 +144,11 @@
</bean>
<!-- 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="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
+ <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateDeployer">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
- <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.plugins.deployers.bundle.OSGiBundleActivatorDeployer" />
+ <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" />
<!--
********************************
@@ -148,16 +158,16 @@
********************************
-->
- <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" />
- <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderDomain" >
+ <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="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer">
+ <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.framework.classloading.OSGiBundleClassLoadingDeployer">
<property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
</bean>
-
+
<bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
<incallback method="addModule" state="Configured" />
<uncallback method="removeModule" state="Configured" />
Modified: projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider
===================================================================
--- projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-10-02 10:00:02 UTC (rev 94261)
+++ projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-10-02 10:17:05 UTC (rev 94262)
@@ -1,3 +1,3 @@
-org.jboss.osgi.plugins.facade.launch.OSGiFrameworkBootstrapProvider # The MC Framework bootstrap provider
-org.jboss.osgi.equinox.EquinoxBootstrapProvider # The Equinox bootstrap provider
-org.jboss.osgi.felix.FelixBootstrapProvider # The Felix bootstrap provider
\ No newline at end of file
+org.jboss.osgi.framework.launch.OSGiFrameworkBootstrapProvider # The MC Framework bootstrap provider
+org.jboss.osgi.equinox.EquinoxBootstrapProvider # The Equinox bootstrap provider
+org.jboss.osgi.felix.FelixBootstrapProvider # The Felix bootstrap provider
\ No newline at end of file
Modified: projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml 2009-10-02 10:00:02 UTC (rev 94261)
+++ projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml 2009-10-02 10:17:05 UTC (rev 94262)
@@ -241,7 +241,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-microcontainer</artifactId>
+ <artifactId>jboss-osgi-framework</artifactId>
<version>${version.jboss.osgi.runtime.jbossmc}</version>
<scope>provided</scope>
</dependency>
@@ -267,8 +267,8 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
- <artifactId>jboss-osgi-runtime-microcontainer</artifactId>
- <version>${version.jboss.osgi.runtime.jbossmc}</version>
+ <artifactId>jboss-osgi-framework</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
<scope>provided</scope>
</dependency>
</dependencies>
More information about the jboss-cvs-commits
mailing list