[jboss-osgi-commits] JBoss-OSGI SVN: r92830 - in projects/jboss-osgi/trunk: reactor and 7 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-08-26 10:00:09 -0400 (Wed, 26 Aug 2009) New Revision: 92830 Removed: projects/jboss-osgi/trunk/reactor/bundles/ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-framework.xml Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Allign dependencies with MC Framework. Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-08-26 11:18:35 UTC (rev 92829) +++ projects/jboss-osgi/trunk/pom.xml 2009-08-26 14:00:09 UTC (rev 92830) @@ -45,14 +45,14 @@ <version.jboss.osgi.apache.xerces>2.9.1.SP1</version.jboss.osgi.apache.xerces> <version.jboss.osgi.blueprint>1.0.0.Beta1</version.jboss.osgi.blueprint> <version.jboss.osgi.common>1.0.1-SNAPSHOT</version.jboss.osgi.common> - <version.jboss.osgi.common.core>2.2.11.SP1</version.jboss.osgi.common.core> + <version.jboss.osgi.common.core>2.2.13-SNAPSHOT</version.jboss.osgi.common.core> <version.jboss.osgi.hotdeploy>1.0.0</version.jboss.osgi.hotdeploy> <version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10.SP1</version.jboss.osgi.jaxb> <version.jboss.osgi.jmx>1.0.0</version.jboss.osgi.jmx> <version.jboss.osgi.jndi>1.0.0</version.jboss.osgi.jndi> - <version.jboss.osgi.microcontainer>1.0.0</version.jboss.osgi.microcontainer> - <version.jboss.osgi.runtime.deployers>1.0.0</version.jboss.osgi.runtime.deployers> + <version.jboss.osgi.microcontainer>1.0.1-SNAPSHOT</version.jboss.osgi.microcontainer> + <version.jboss.osgi.runtime.deployers>1.0.1-SNAPSHOT</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.runtime.equinox>3.5-SNAPSHOT</version.jboss.osgi.runtime.equinox> <version.jboss.osgi.runtime.felix>1.9.0-SNAPSHOT</version.jboss.osgi.runtime.felix> <version.jboss.osgi.runtime.jbossas>1.0.1-SNAPSHOT</version.jboss.osgi.runtime.jbossas> Modified: projects/jboss-osgi/trunk/reactor/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-08-26 11:18:35 UTC (rev 92829) +++ projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-08-26 14:00:09 UTC (rev 92830) @@ -32,10 +32,11 @@ <!-- Properties --> <properties> <version.apache.felix.log>1.0.0</version.apache.felix.log> - <version.jboss.osgi.common.core>2.2.11.SP1</version.jboss.osgi.common.core> + <version.jboss.osgi.common.core>2.2.13-SNAPSHOT</version.jboss.osgi.common.core> <version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky> - <version.jboss.osgi.microcontainer>1.0.0</version.jboss.osgi.microcontainer> + <version.jboss.osgi.microcontainer>1.0.1-SNAPSHOT</version.jboss.osgi.microcontainer> <version.jboss.osgi.runtime.felix>1.9.0-SNAPSHOT</version.jboss.osgi.runtime.felix> + <version.jboss.osgi.spi>1.0.1-SNAPSHOT</version.jboss.osgi.spi> <version.osgi>r4v42-20090728</version.osgi> </properties> @@ -54,6 +55,11 @@ <version>${version.apache.felix.log}</version> </dependency> <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + <version>${version.jboss.osgi.spi}</version> + </dependency> + <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common-core</artifactId> <version>${version.jboss.osgi.common.core}</version> Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-08-26 11:18:35 UTC (rev 92829) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-08-26 14:00:09 UTC (rev 92830) @@ -38,26 +38,38 @@ <!-- Dependencies --> <dependencies> <dependency> + <groupId>biz.aQute</groupId> + <artifactId>bnd</artifactId> + </dependency> + <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-blueprint</artifactId> <version>${version}</version> <scope>provided</scope> </dependency> + <!-- OSGi Framework --> <dependency> - <groupId>biz.aQute</groupId> - <artifactId>bnd</artifactId> - </dependency> - <dependency> <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-runtime-felix</artifactId> + <scope>provided</scope> </dependency> - + <!-- Bundle Dependencies --> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.log</artifactId> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.compendium</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> @@ -70,18 +82,6 @@ <scope>provided</scope> </dependency> - <!-- OSGi Dependencies --> - <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> - <!-- Test Dependencies --> <dependency> <groupId>org.jboss.logging</groupId> Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-08-26 11:18:35 UTC (rev 92829) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-08-26 14:00:09 UTC (rev 92830) @@ -37,8 +37,18 @@ <!-- Properties --> <properties> + <version.javax.servlet>2.4</version.javax.servlet> </properties> + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${version.javax.servlet}</version> + </dependency> + </dependencies> + <!-- Build --> <build> <plugins> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-08-26 11:18:35 UTC (rev 92829) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-08-26 14:00:09 UTC (rev 92830) @@ -1,6 +1,144 @@ -<?xml version="1.0" encoding="UTF-8"?> -<bootstrap xmlns="urn:jboss:bootstrap:1.0"> +<deployment xmlns="urn:jboss:bean-deployer:2.0"> - <url>jboss-osgi-framework.xml</url> + <!-- + ******************************** + * * + * OSGi Framework * + * * + ******************************** + --> + + <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> + </map> + </property> + <incallback method="addPlugin" /> + <uncallback method="removePlugin" /> + </bean> + + <bean name="OSGiSystemPackages" class="org.jboss.osgi.plugins.facade.plugins.SystemPackagesPluginImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + <property name="extraPackages"> + <list elementClass="java.lang.String"> + <value>org.jboss.logging;version=2.0</value> + <value>org.jboss.osgi.spi.logging;version=1.0</value> + <value>org.jboss.osgi.spi.management;version=1.0</value> + <value>org.jboss.osgi.spi.service;version=1.0</value> + <value>org.jboss.osgi.spi.util;version=1.0</value> + </list> + </property> + </bean> + + <bean name="jboss.osgi:plugin=AutoInstall" class="org.jboss.osgi.plugins.facade.plugins.AutoInstallPluginImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + <property name="autoInstall"> + <list elementClass="java.net.URL"> + <!-- [JBOSGI-136] Cannot resolve dependency against unstarted bundle + <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.osgi.compendium.jar</value> + <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"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + + <!-- + ******************************** + * * + * OSGi Deployment * + * * + ******************************** + --> + + <!-- The MainDeployer --> + <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl"> + <property name="structuralDeployers"><inject bean="StructuralDeployers" /></property> + <property name="deployers"><inject bean="Deployers" /></property> + </bean> -</bootstrap> + <!-- 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> + + <!-- 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> + + <!-- Bundle Structure --> + <bean name="BundleStructure" class="org.jboss.osgi.deployer.BundleStructureDeployer" /> + + <!-- JAR & File Structure (needed for negative testing) --> + <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure" /> + <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure" /> + + <!-- POJO Deployment --> + <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer" /> + <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer" /> + <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer"> + <constructor> + <parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController" /></parameter> + </constructor> + </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"> + <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" /> + + <!-- + ******************************** + * * + * OSGi Classloading * + * * + ******************************** + --> + + <!-- ClassLoading --> + <bean name="ClassLoaderSystem" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderSystem" > + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading"> + <incallback method="addModule" state="Configured" /> + <uncallback method="removeModule" state="Configured" /> + </bean> + <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer"> + <property name="defaultMetaData"> + <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true" /> + </property> + </bean> + <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer" /> + <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer"> + <property name="classLoading"><inject bean="ClassLoading" /></property> + </bean> + <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer"> + <property name="classLoading"><inject bean="ClassLoading" /></property> + <property name="system"><inject bean="ClassLoaderSystem" /></property> + </bean> + +</deployment> Deleted: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-framework.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-framework.xml 2009-08-26 11:18:35 UTC (rev 92829) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-framework.xml 2009-08-26 14:00:09 UTC (rev 92830) @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - $Id: jboss-osgi-framework.xml 92605 2009-08-20 10:29:21Z thomas.diesler(a)jboss.com $ ---> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- - ******************************** - * * - * Framework * - * * - ******************************** - --> - - <!-- The OSGi Framework Factory --> - <bean name="jboss.osgi:service=FrameworkFactory" class="org.jboss.osgi.jbossmc.framework.launch.FrameworkFactoryBean"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> - <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> - <!-- system --> - javax.xml.bind.annotation;version=2.1, - org.apache.xerces.dom;version=2.9, - - <!-- jboss-osgi --> - org.jboss.osgi.jmx;version=1.0, - org.jboss.osgi.jndi;version=1.0, - org.jboss.osgi.microcontainer;version=1.0, - org.jboss.osgi.spi;version=1.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, - org.jboss.osgi.xml;version=1.0, - - <!-- jboss --> - org.jboss.beans.metadata.plugins;version=2.0, - org.jboss.beans.metadata.plugins.builder;version=2.0, - org.jboss.beans.metadata.spi.builder;version=2.0, - org.jboss.beans.metadata.spi;version=2.0, - org.jboss.dependency.spi;version=2.0, - org.jboss.kernel.spi.dependency;version=2.0, - org.jboss.logging, - org.jboss.reflect.spi;version=2.0, - org.jboss.util.xml;version=2.2, - org.jboss.virtual, - org.jboss.virtual.plugins.registry, - org.jboss.virtual.plugins.context.jar, - org.jboss.virtual.plugins.vfs.helpers, - org.jboss.virtual.protocol, - org.jboss.xb.annotations;version=2.0, - org.jboss.xb.binding;version=2.0, - org.jboss.xb.binding.sunday.unmarshalling;version=2.0, - </value> - </entry> - </map> - </property> - <property name="plugins"> - <list elementClass="org.jboss.osgi.jbossmc.api.AbstractPlugin"> - <inject bean="jboss.osgi:plugin=AutoInstall"/> - </list> - </property> - </bean> - - <!-- - ******************************** - * * - * Framework Plugins * - * * - ******************************** - --> - - <bean name="jboss.osgi:plugin=AutoInstall" class="org.jboss.osgi.jbossmc.framework.plugins.AutoInstallPluginImpl"> - <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> - -</deployment> \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-08-26 11:18:35 UTC (rev 92829) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-08-26 14:00:09 UTC (rev 92830) @@ -1,4 +1,3 @@ org.jboss.osgi.plugins.facade.launch.OSGiFrameworkBootstrapProvider # The MC Facade bootstrap provider -org.jboss.osgi.jbossmc.framework.launch.FrameworkBootstrapProvider # The legacy MC based 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/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-08-26 11:18:35 UTC (rev 92829) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-08-26 14:00:09 UTC (rev 92830) @@ -37,6 +37,7 @@ <!-- Properties --> <properties> + <version.jboss.microcontainer>2.0.9-SNAPSHOT</version.jboss.microcontainer> </properties> <!-- Dependencies --> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-08-26 11:18:35 UTC (rev 92829) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-08-26 14:00:09 UTC (rev 92830) @@ -34,10 +34,7 @@ <!-- Properties --> <properties> - <version.javax.servlet>2.4</version.javax.servlet> - <version.jbossas.client>5.0.1.GA</version.jbossas.client> <version.jboss.naming>5.0.1.GA</version.jboss.naming> - <version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer> </properties> <!-- Dependencies --> @@ -47,21 +44,11 @@ <artifactId>bnd</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${version.javax.servlet}</version> - </dependency> - <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnpserver</artifactId> - <version>${version.jboss.naming}</version> - </dependency> - <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> <version>${version.jboss.osgi.spi}</version> </dependency> - + <!-- Bundle Dependencies --> <dependency> <groupId>org.apache.felix</groupId> @@ -145,12 +132,19 @@ <version>${version.jboss.osgi.common}</version> <scope>provided</scope> </dependency> - + <!-- Test Dependencies --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.jboss.naming</groupId> + <artifactId>jnpserver</artifactId> + <version>${version.jboss.naming}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.logging</groupId> @@ -158,7 +152,7 @@ <scope>test</scope> </dependency> </dependencies> - + <!-- Build --> <build> <testResources> @@ -195,21 +189,10 @@ </dependencies> --> - <!-- default to jbossmc (legacy) + <!-- default to felix --> <dependencies> <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-jbossmc</artifactId> - <version>${version.jboss.osgi.runtime.jbossmc}</version> - <scope>provided</scope> - </dependency> - </dependencies> - --> - - <!-- default to felix --> - <dependencies> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-runtime-felix</artifactId> <version>${version.jboss.osgi.runtime.felix}</version> <scope>provided</scope> @@ -297,7 +280,7 @@ <dependencies> <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-jbossmc</artifactId> + <artifactId>jboss-osgi-runtime-microcontainer</artifactId> <version>${version.jboss.osgi.runtime.jbossmc}</version> <scope>provided</scope> </dependency>