[jboss-osgi-commits] JBoss-OSGI SVN: r93460 - in projects/jboss-osgi/trunk: distribution/installer/scripts and 12 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-09-14 04:56:27 -0400 (Mon, 14 Sep 2009) New Revision: 93460 Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml Modified: projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/distribution/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceB.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/bundleA/ActivatorBundleA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Fix various integration issues Modified: projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml 2009-09-14 08:56:27 UTC (rev 93460) @@ -65,16 +65,6 @@ <unpack>false</unpack> </dependencySet> - <!-- resources --> - <dependencySet> - <outputDirectory>resources/jbossas-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jboss-osgi-runtime-jbossas:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - </dependencySets> <fileSets> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-14 08:56:27 UTC (rev 93460) @@ -325,7 +325,6 @@ <!-- deployers/osgi.deployer --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> <include name="jboss-osgi-deployers.jar" /> - <include name="jboss-osgi-runtime-jbossas.jar" /> <include name="jboss-osgi-spi.jar" /> </fileset> @@ -334,7 +333,10 @@ <include name="jboss-osgi-apache-xerces.jar" /> <include name="jboss-osgi-blueprint.jar" /> <include name="jboss-osgi-common.jar" /> + <include name="jboss-osgi-common-core.jar" /> <include name="jboss-osgi-jaxb.jar" /> + <include name="jboss-osgi-jmx.jar" /> + <include name="jboss-osgi-jndi.jar" /> <include name="jboss-osgi-webconsole.jar" /> <include name="jboss-osgi-xml-binding.jar" /> <include name="org.apache.felix.http.jetty.jar" /> @@ -345,6 +347,7 @@ <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> <include name="jboss-osgi-runtime-felix.jar" /> + <include name="jboss-osgi-runtime-jbossas.jar" /> <include name="org.apache.felix.framework.jar" /> </fileset> <singlefile condition="isFelix" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml&quot; @@ -364,6 +367,7 @@ <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> <include name="jboss-osgi-runtime-equinox.jar" /> + <include name="jboss-osgi-runtime-jbossas.jar" /> <include name="org.apache.equinox.framework.jar" /> <include name="org.eclipse.osgi.jar"/> </fileset> @@ -386,6 +390,7 @@ <singlefile condition="isJBossMC" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-jbossmc.xml&quot; target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/> <fileset condition="isJBossMC" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/lib" override="true"> + <include name="jboss-classloader.jar" /> <include name="jboss-classloading.jar" /> <include name="jboss-dependency.jar" /> </fileset> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/user-input-spec.xml 2009-09-14 08:56:27 UTC (rev 93460) @@ -3,9 +3,9 @@ <field type="radio" variable="frameworkSelection"> <description align="left" txt="Please choose the OSGi Framework" /> <spec> - <choice txt="Felix" value="felix" set="true"/> + <choice txt="Microcontainer" value="jbossmc" set="true"/> + <choice txt="Felix" value="felix"/> <choice txt="Equinox" value="equinox"/> - <choice txt="Microcontainer" value="jbossmc"/> </spec> </field> </panel> Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml (rev 0) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2009-09-14 08:56:27 UTC (rev 93460) @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + $Id$ +--> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + ******************************** + * * + * Framework * + * * + ******************************** + --> + + <!-- The OSGiFramework --> + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration"> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + <entry><key>org.osgi.service.http.port</key><value>8090</value></entry> + <entry><key>osgi.framework</key><value>${jboss.server.home.url}/deployers/osgi.deployer/org.eclipse.osgi.jar</value></entry> + <entry><key>osgi.install.area</key><value>${jboss.server.data.dir}/equinox</value></entry> + <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry> + <entry> + <key>org.osgi.framework.system.packages</key> + <value> + <!-- system --> + javax.management, + javax.xml.parsers, + org.xml.sax, + + <!-- jboss-osgi --> + 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, + + <!-- jboss --> + org.jboss.logging + </value> + </entry> + <!-- + If set to 'true' bundles can be deployed in any order. Deployed bundle will get started when their dependencies can be resolved. + If set to 'false' bundles must be deployed in the order that is required to start them. + --> + <entry><key>org.jboss.osgi.deferred.start</key><value>true</value></entry> + </map> + </property> + <property name="autoInstall"> + <list elementClass="java.net.URL"> + <value>${jboss.server.home.url}/deploy/osgi/org.eclipse.osgi.services.jar</value> + </list> + </property> + <property name="autoStart"> + <list elementClass="java.net.URL"> + <value>${jboss.server.home.url}/deploy/osgi/org.apache.felix.log.jar</value> + <value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-common.jar</value> + </list> + </property> + </bean> + + <!-- The Framework Management --> + <bean name="jboss.osgi:service=ManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + + <!-- + ******************************** + * * + * Services * + * * + ******************************** + --> + + <!-- Microcontainer Service --> + <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.microcontainer.integration.MicrocontainerServiceBean"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> + </bean> + + <!-- + ******************************** + * * + * Deployers * + * * + ******************************** + --> + + <!-- The OSGi MetaData Deployer --> + <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> + + <!-- The OSGi Bundle Structure Deployer --> + <bean name="jboss.osgi:service=BundleStructureDeployer" class="org.jboss.osgi.deployer.BundleStructureDeployer" /> + + <!-- The OSGi Bundle Deployer --> + <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> + <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property> + </bean> + + <!-- The Bundle ClassLoader Deployer --> + <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> + </bean> + + <!-- The Bundle Start/Stop Deployer --> + <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> + </bean> + + <!-- The Bundle Management Deployer --> + <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + +</deployment> \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml (rev 0) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-09-14 08:56:27 UTC (rev 93460) @@ -0,0 +1,146 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + $Id$ +--> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + ******************************** + * * + * Framework * + * * + ******************************** + --> + + <!-- The OSGiFramework --> + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> + <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.service.http.port</key><value>8090</value></entry> + <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</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> + <!-- + If set to 'true' bundles can be deployed in any order. Deployed bundle will get started when their dependencies can be resolved. + If set to 'false' bundles must be deployed in the order that is required to start them. + --> + <entry><key>org.jboss.osgi.deferred.start</key><value>true</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> + </map> + </property> + <property name="autoInstall"> + <list elementClass="java.net.URL"> + <value>${jboss.server.home.url}/deploy/osgi/org.osgi.compendium.jar</value> + </list> + </property> + <property name="autoStart"> + <list elementClass="java.net.URL"> + <value>${jboss.server.home.url}/deploy/osgi/org.apache.felix.log.jar</value> + <value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-common.jar</value> + </list> + </property> + </bean> + + <!-- The Framework Management --> + <bean name="jboss.osgi:service=ManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + + <!-- + ******************************** + * * + * Services * + * * + ******************************** + --> + + <!-- Microcontainer Service --> + <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.microcontainer.integration.MicrocontainerServiceBean"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> + </bean> + + <!-- + ******************************** + * * + * Deployers * + * * + ******************************** + --> + + <!-- The OSGi MetaData Deployer --> + <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> + + <!-- The OSGi Bundle Structure Deployer --> + <bean name="jboss.osgi:service=BundleStructureDeployer" class="org.jboss.osgi.deployer.BundleStructureDeployer" /> + + <!-- The OSGi Bundle Deployer --> + <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> + <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property> + </bean> + + <!-- The Bundle ClassLoader Deployer --> + <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> + </bean> + + <!-- The Bundle Start/Stop Deployer --> + <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext" /></property> + </bean> + + <!-- The Bundle Management Deployer --> + <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + +</deployment> \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-09-14 08:56:27 UTC (rev 93460) @@ -33,6 +33,9 @@ org.jboss.util.propertyeditor, org.jboss.util.xml, + org.jnp.interfaces, + org.jnp.server, + org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.capability;version=1.0, org.jboss.osgi.spi.framework;version=1.0, @@ -90,10 +93,10 @@ <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.plugins.facade.plugins.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> - <bean name="OSGiStoragePlugin" class="org.jboss.osgi.plugins.facade.plugins.BundleStoragePluginImpl"> + <bean name="OSGiSystemPackages" class="org.jboss.osgi.plugins.facade.plugins.SystemPackagesPluginImpl"> <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.plugins.facade.plugins.BundleStoragePluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> @@ -153,7 +156,6 @@ <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"> <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> </bean> - <bean name="OSGiClassLoaderPolicyDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderPolicyDeployer"/> <!-- ******************************** @@ -163,8 +165,17 @@ ******************************** --> + <!-- [TODO] use dependencies instead of bean order --> + <bean name="OSGiBundleManagerLifecycle" class="org.jboss.osgi.plugins.facade.bundle.OSGiBundleManagerLifecycle"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> + <bean name="OSGiManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework"> + <constructor> + <parameter><inject bean="OSGiBundleManager" property="bundleContext"/></parameter> + <parameter><inject bean="JMXKernel" property="mbeanServer"/></parameter> + </constructor> + </bean> + </deployment> \ No newline at end of file Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-09-14 08:56:27 UTC (rev 93460) @@ -179,7 +179,6 @@ <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"> <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> </bean> - <bean name="OSGiClassLoaderPolicyDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderPolicyDeployer"/> <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading"> <incallback method="addModule" state="Configured" /> Modified: projects/jboss-osgi/trunk/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-09-14 08:56:27 UTC (rev 93460) @@ -296,12 +296,6 @@ <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-runtime-jbossas</artifactId> <version>${version.jboss.osgi.runtime.jbossas}</version> - <classifier>config</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-jbossas</artifactId> - <version>${version.jboss.osgi.runtime.jbossas}</version> <classifier>sources</classifier> </dependency> <!-- jboss-osgi-runtime-jbossas: no javadoc --> Modified: projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml 2009-09-14 08:56:27 UTC (rev 93460) @@ -80,8 +80,10 @@ org.jboss.util.xml, org.jboss.xb.*, org.osgi.framework, - org.osgi.service.log, - org.osgi.util.tracker, + org.osgi.service.blueprint.container;version=1.0, + org.osgi.service.blueprint.reflect;version=1.0, + org.osgi.service.log;version=1.3, + org.osgi.util.tracker;version=1.4, org.w3c.dom, org.xml.sax, </Import-Package> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-09-14 08:56:27 UTC (rev 93460) @@ -24,6 +24,7 @@ //$Id: HttpServiceRemoteTestCase.java 87330 2009-04-15 10:57:57Z thomas.diesler(a)jboss.com $ import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -32,10 +33,12 @@ import org.jboss.osgi.spi.capability.HttpCapability; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; +import org.jboss.osgi.spi.testing.OSGiServiceReference; import org.jboss.osgi.spi.testing.OSGiTestHelper; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.osgi.service.http.HttpService; /** * A test that deployes a bundle that containes a HttpServlet which is registered through the OSGi HttpService @@ -46,7 +49,6 @@ public class HttpServiceTestCase { private static OSGiRuntime runtime; - private static OSGiBundle bundle; @BeforeClass public static void setUpClass() throws Exception @@ -54,9 +56,18 @@ runtime = new OSGiTestHelper().getDefaultRuntime(); runtime.addCapability(new HttpCapability()); - Thread.sleep(5000); + // Allow 2000ms for the HttpService to become available + long timeout = 10; + OSGiServiceReference sref = runtime.getServiceReference(HttpService.class.getName()); + while (sref == null && (timeout--) > 0) + { + Thread.sleep(200); + sref = runtime.getServiceReference(HttpService.class.getName()); + } + + assertNotNull("HttpService not null", sref); - bundle = runtime.installBundle("example-http.jar"); + OSGiBundle bundle = runtime.installBundle("example-http.jar"); bundle.start(); } 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-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-09-14 08:56:27 UTC (rev 93460) @@ -167,7 +167,6 @@ <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"> <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> </bean> - <bean name="OSGiClassLoaderPolicyDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderPolicyDeployer"/> <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading"> <incallback method="addModule" state="Configured" /> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-09-14 08:56:27 UTC (rev 93460) @@ -111,6 +111,7 @@ } @Test + @Ignore public void testCircularInstallCbeforeD() throws Exception { BundleContext sysContext = framework.getBundleContext(); Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceA.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceA.java 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceA.java 2009-09-14 08:56:27 UTC (rev 93460) @@ -28,7 +28,6 @@ import java.io.IOException; import java.io.OutputStreamWriter; -import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; @@ -44,21 +43,18 @@ ServiceA(BundleContext context) { - log = new LogServiceTracker(context); - context.getDataFile("config").mkdirs(); File dataFile = context.getDataFile("config/jbosgi41.txt"); try { - log.log(LogService.LOG_INFO, "dataFile: " + dataFile); OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(dataFile)); out.write(context.getBundle().getSymbolicName()); out.close(); } catch (IOException ex) { - log.log(LogService.LOG_ERROR, "Cannot write data file", ex); + throw new RuntimeException(ex); } } } Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceB.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceB.java 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceB.java 2009-09-14 08:56:27 UTC (rev 93460) @@ -23,18 +23,15 @@ //$Id: ServiceB.java 85293 2009-03-05 13:45:47Z thomas.diesler(a)jboss.com $ -import java.util.Arrays; import java.util.Dictionary; import java.util.Hashtable; -import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.cm.ManagedService; -import org.osgi.service.log.LogService; import org.osgi.util.tracker.ServiceTracker; /** @@ -46,18 +43,14 @@ public class ServiceB implements ManagedService { private ConfigurationAdmin configAdmin; - private LogService log; ServiceB(BundleContext context) { - log = new LogServiceTracker(context); - ServiceTracker tracker = new ServiceTracker(context, ConfigurationAdmin.class.getName(), null) { @Override public Object addingService(ServiceReference sref) { - log.log(LogService.LOG_INFO, "addingService ConfigurationAdmin"); configAdmin = (ConfigurationAdmin)super.addingService(sref); return configAdmin; } @@ -68,7 +61,6 @@ @SuppressWarnings("unchecked") public void updateConfig(String key, String value) { - log.log(LogService.LOG_INFO, "updateConfig"); if (configAdmin != null) { try @@ -84,7 +76,6 @@ config.update(props); Configuration[] configs = configAdmin.listConfigurations(null); - log.log(LogService.LOG_DEBUG, Arrays.asList(configs).toString()); } catch (Exception ex) { @@ -96,6 +87,5 @@ @SuppressWarnings("unchecked") public void updated(Dictionary props) throws ConfigurationException { - log.log(LogService.LOG_INFO, "updated: " + props); } } Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/bundleA/ActivatorBundleA.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/bundleA/ActivatorBundleA.java 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/bundleA/ActivatorBundleA.java 2009-09-14 08:56:27 UTC (rev 93460) @@ -26,63 +26,32 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.SAXParserFactory; -import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -import org.osgi.service.log.LogService; import org.osgi.util.xml.XMLParserActivator; public class ActivatorBundleA extends XMLParserActivator { - private LogService log; - + public void start(BundleContext context) throws Exception { - log = new LogServiceTracker(context); - super.start(context); - + logSAXParserFactory(context); logDOMParserFactory(context); } - + private void logSAXParserFactory(BundleContext context) { ServiceReference saxRef = context.getServiceReference(SAXParserFactory.class.getName()); - if (saxRef != null) - { - Object factory = context.getService(saxRef); - log.log(LogService.LOG_INFO, "SAXParserFactory: " + factory.getClass().getName()); - - for (String key : saxRef.getPropertyKeys()) - { - Object value = saxRef.getProperty(key); - log.log(LogService.LOG_INFO, " " + key + "=" + value); - } - } - else - { - log.log(LogService.LOG_WARNING, "No SAXParserFactory registered"); - } + if (saxRef == null) + throw new IllegalStateException("No SAXParserFactory registered"); } private void logDOMParserFactory(BundleContext context) { ServiceReference domRef = context.getServiceReference(DocumentBuilderFactory.class.getName()); - if (domRef != null) - { - Object factory = context.getService(domRef); - log.log(LogService.LOG_INFO, "DocumentBuilderFactory: " + factory.getClass().getName()); - - for (String key : domRef.getPropertyKeys()) - { - Object value = domRef.getProperty(key); - log.log(LogService.LOG_INFO, " " + key + "=" + value); - } - } - else - { - log.log(LogService.LOG_WARNING, "No DocumentBuilderFactory registered"); - } + if (domRef == null) + throw new IllegalStateException("No DocumentBuilderFactory registered"); } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java 2009-09-14 08:56:27 UTC (rev 93460) @@ -43,9 +43,7 @@ StartLevel service = (StartLevel)tracker.getService(); if (service == null) - throw new IllegalStateException("Cannot obtain StartLevel"); - - service.getStartLevel(); + throw new IllegalStateException("Cannot get StartLevel. Loaded with: " + StartLevel.class.getClassLoader()); } /* Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-09-14 08:56:27 UTC (rev 93460) @@ -153,7 +153,6 @@ <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiBundleClassLoadingDeployer"> <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> </bean> - <bean name="OSGiClassLoaderPolicyDeployer" class="org.jboss.osgi.plugins.facade.classloading.OSGiClassLoaderPolicyDeployer"/> <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading"> <incallback method="addModule" state="Configured" /> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-14 08:49:20 UTC (rev 93459) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-14 08:56:27 UTC (rev 93460) @@ -35,6 +35,7 @@ <!-- Properties --> <properties> <version.jboss.naming>5.0.1.GA</version.jboss.naming> + <version.jbossas.client>5.0.1.GA</version.jbossas.client> </properties> <!-- Dependencies --> @@ -340,6 +341,12 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> <version>${version.jbossas.client}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> <scope>test</scope> <type>pom</type> </dependency> @@ -366,6 +373,12 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> <version>${version.jbossas.client}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> <scope>test</scope> <type>pom</type> </dependency> @@ -373,6 +386,47 @@ </profile> <!-- + Name: jboss520 + Descr: Setup for jboss520 integration testing + --> + <profile> + <id>jboss520</id> + <activation> + <property> + <name>target.container</name> + <value>jboss520</value> + </property> + </activation> + <properties> + <target.container.excludes>org/jboss/test/osgi/nothing-to-exclude</target.container.excludes> + </properties> + <dependencies> + <!-- + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <classifier>jmx-invoker-adaptor-client</classifier> + <version>${version.jbossas.client}</version> + <scope>test</scope> + </dependency> + --> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-client</artifactId> + <version>${version.jbossas.client}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + <type>pom</type> + </dependency> + </dependencies> + </profile> + + <!-- Name: jboss600 Descr: Setup for jboss600 integration testing --> @@ -392,6 +446,12 @@ <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> <version>${version.jbossas.client}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> <scope>test</scope> <type>pom</type> </dependency>