[jboss-osgi-commits] JBoss-OSGI SVN: r100710 - in projects/jboss-osgi/trunk: distribution and 16 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-02-08 12:15:46 -0500 (Mon, 08 Feb 2010) New Revision: 100710 Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss600/ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss600/jboss-logging.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/jms/ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/jms/JMSException.java Removed: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss600/jboss-logging.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/jms/JMSException.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/hudson-matrix-jbossmc.png projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack01-welcome.png projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack05-installpath.png projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack10-packs.png projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack30-verify.png projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack35-done.png projects/jboss-osgi/trunk/distribution/docbook/en/images/runtime-structure.png projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch020-getting-started.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml projects/jboss-osgi/trunk/distribution/installer/src/main/etc/ChangeLog.html projects/jboss-osgi/trunk/distribution/installer/src/main/etc/ReleaseNotes.html projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/ projects/jboss-osgi/trunk/reactor/pom.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/AbstractWebAppTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGi92TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd Log: Merge Beta6 changes from QA branch to trunk Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/hudson-matrix-jbossmc.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack01-welcome.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack05-installpath.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack10-packs.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack30-verify.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/izpack35-done.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/distribution/docbook/en/images/runtime-structure.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch020-getting-started.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch020-getting-started.xml 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch020-getting-started.xml 2010-02-08 17:15:46 UTC (rev 100710) @@ -21,7 +21,7 @@ <para>To run the installer execute the following command:</para> <programlisting> - java -jar jboss-osgi-installer-1.0.0.Beta5.jar + java -jar jboss-osgi-installer-1.0.0.Beta6.jar </programlisting> <para>The installer first shows a welcome screen</para> @@ -130,9 +130,9 @@ $ bin/run.sh ========================================================================= - JBoss OSGi Bootstrap Environment + JBossOSGi Bootstrap Environment - OSGI_HOME: /home/hudson/jboss-osgi-1.0.0.Beta5/runtime + OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta6/runtime JAVA: /usr/java/jdk1.6/bin/java @@ -140,18 +140,21 @@ ========================================================================= -16:20:27,991 INFO JBossOSGi - Framework - 1.0.0.Alpha2 +13:10:35,143 INFO [OSGiBundleManager] JBossOSGi Core Framework - 1.0.0.Alpha3 ... -16:20:29,203 INFO Bundle STARTED: Bundle{system.bundle-0.0.0} -16:20:29,243 INFO JBossOSGi Runtime booted in 1.241sec -16:20:29,569 INFO Bundle INSTALLED: Bundle{jboss-osgi-jndi-1.0.2} -16:20:29,843 INFO Bundle INSTALLED: Bundle{jboss-osgi-common-core-2.2.13.GA} -16:20:29,866 INFO Bundle INSTALLED: Bundle{jboss-osgi-jmx-1.0.2} -16:20:30,512 INFO Bundle STARTED: Bundle{jboss-osgi-jndi-1.0.2} -16:20:30,789 INFO Bundle STARTED: Bundle{jboss-osgi-jmx-1.0.2} -16:20:30,806 INFO Bundle STARTED: Bundle{jboss-osgi-common-core-2.2.13.GA} +13:10:36,405 INFO Start DeploymentScanner: [scandir=.../server/default/deploy,interval=2000ms] +13:10:36,416 INFO Bundle STARTED: Bundle{system.bundle-0.0.0} +13:10:36,442 INFO JBossOSGi Runtime booted in 1.297sec +13:10:36,742 INFO Bundle INSTALLED: Bundle{jboss-osgi-jndi-1.0.2} +13:10:36,967 INFO Bundle INSTALLED: Bundle{jboss-osgi-common-core-2.2.13.GA} +13:10:36,994 INFO Bundle INSTALLED: Bundle{jboss-osgi-jmx-1.0.3} +13:10:37,018 INFO Bundle INSTALLED: Bundle{org.apache.felix.eventadmin-1.0.0} +13:10:37,167 INFO Bundle STARTED: Bundle{jboss-osgi-common-core-2.2.13.GA} +13:10:37,297 INFO Bundle STARTED: Bundle{jboss-osgi-jmx-1.0.3} +13:10:37,829 INFO Bundle STARTED: Bundle{jboss-osgi-jndi-1.0.2} +13:10:38,070 INFO Bundle STARTED: Bundle{org.apache.felix.eventadmin-1.0.0} ... -<emphasis role="bold">16:20:30,824 INFO JBossOSGi Runtime started in 1.64sec</emphasis> +<emphasis role="bold">13:10:38,334 INFO JBossOSGi Runtime started in 1.939sec</emphasis> </programlisting> </sect1> @@ -171,6 +174,7 @@ <listitem><emphasis role="bold">JNDITestCase</emphasis> - Bind objects to the Naming Service</listitem> <listitem><emphasis role="bold">MicrocontainerTestCase</emphasis> - Call a service from an MC bean and vica versa</listitem> <listitem><emphasis role="bold">SAXParserTestCase</emphasis> - A test that uses a SAX parser to read an XML document</listitem> + <listitem><emphasis role="bold">ServiceLoaderTestCase</emphasis> - Autoregister META-INF/services</listitem> <listitem><emphasis role="bold">SimpleHuskyTestCase</emphasis> - Accesses a service from within the test case</listitem> <listitem><emphasis role="bold">SimpleTestCase</emphasis> - A simple bundle lifecycle test</listitem> <listitem><emphasis role="bold">TransactionTestCase</emphasis> - A simple transaction test</listitem> @@ -266,39 +270,39 @@ $ cp ant.properties.example ant.properties $ vi ant.properties -# The JBoss settings -jboss.server.instance=default -jboss.bind.address=127.0.0.1 +# Hudson Workspace Root +# hudson.root=/home/username/workspace/hudson/jboss-osgi +# Hudson QA Environment +# hudson.username=username + +#hudson.jboss501.zip=file:///home/username/Download/java/jboss/jboss-5.0.1.GA.zip +#hudson.jboss510.zip=file:///home/username/Download/java/jboss/jboss-5.1.0.GA.zip +#hudson.jboss600.zip=file:///home/username/Download/java/jboss/jboss-6.0.0.M1.zip + # JDK settings java.home.jdk15=/usr/java/jdk1.5.0_22 java.home.jdk16=/usr/java/jdk1.6.0_17 -# Hudson QA Environment -hudson.username=chageme -hudson.password=chageme - +# Maven settings hudson.maven.name=apache-maven-2.2.1 hudson.maven.path=/usr/java/apache-maven-2.2.1 +hudson.maven.profile=$HUDSONDIR/profiles.xml.local.qa -hudson.root=/home/hudson/workspace/hudson/jboss-osgi +# The JBoss settings +jboss.server.instance=default +jboss.bind.address=127.0.0.1 -hudson.maven.profile=$HUDSONDIR/profiles.xml.local.qa - -hudson.host=jbmuc.dyndns.org +hudson.host=localhost hudson.admin.port=8250 hudson.http.port=8280 -#hudson.jboss501.zip=file:///home/hudson/Download/java/jboss/jboss-5.0.1.GA.zip -#hudson.jboss510.zip=file:///home/hudson/download/java/jboss/jboss-5.1.0.GA.zip - hudson.mail.recipients= hudson.mail.admin=yourname(a)yourdomain.com hudson.smtp.host=localhost -# Hudson (1.290) -apache-tomcat=5.5.20 -sun-hudson=2402/128862 +apache-tomcat=5.5.27 +sun-hudson=1.336 </programlisting> <emphasis role="bold">Run Hudson Setup</emphasis> @@ -308,7 +312,7 @@ Buildfile: build.xml init: - [echo] V1.0.0.Beta5 + [echo] V1.0.0.Beta6 init-hudson: [echo] @@ -336,7 +340,7 @@ Buildfile: build.xml init: - [echo] V1.0.0.Beta5 + [echo] V1.0.0.Beta6 init-hudson: [echo] @@ -362,7 +366,7 @@ Buildfile: build.xml init: - [echo] V1.0.0.Beta5 + [echo] V1.0.0.Beta6 init-hudson: [echo] Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch030-runtime.xml 2010-02-08 17:15:46 UTC (rev 100710) @@ -143,7 +143,7 @@ JBossOSGi Bootstrap Environment - OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta5/runtime + OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta6/runtime JAVA: /usr/java/jdk1.6/bin/java @@ -151,7 +151,7 @@ ========================================================================= -12:10:48,713 INFO JBossOSGi Framework - 1.0.0.Alpha1 +12:10:48,713 INFO JBossOSGi Core Framework - 1.0.0.Alpha3 12:10:49,089 INFO Bundle INSTALLED: Bundle{osgi.cmpn:4.2.0.200908310645} 12:10:49,188 INFO Bundle INSTALLED: Bundle{org.apache.felix.log:1.0.0} 12:10:49,282 INFO Bundle INSTALLED: Bundle{jboss-osgi-common:1.0.2} Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml 2010-02-08 17:15:46 UTC (rev 100710) @@ -23,15 +23,15 @@ </imageobject> </mediaobject> - <para>The latest version of the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs">... OSGi SPI</ulink>.</para> + <para>The latest version of the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs">... OSGi SPI</ulink>.</para> <itemizedlist> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... - Common classes and interfaces.</listitem> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... - Capabilities that can be installed in the OSGi framework.</listitem> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... - Framework integration and bootstrap.</listitem> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... - Management view on deployed bundles.</listitem> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... - A collection of SPI provided services.</listitem> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... - A collection of SPI provided utilities.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... - Common classes and interfaces.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... - Capabilities that can be installed in the OSGi framework.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... - Framework integration and bootstrap.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... - Management view on deployed bundles.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... - A collection of SPI provided services.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... - A collection of SPI provided utilities.</listitem> </itemizedlist> <emphasis role="bold">Bootstrapping JBoss OSGi</emphasis> @@ -69,7 +69,7 @@ <para>The JBoss OSGi SPI comes with a default bootstrap provider:</para> <itemizedlist> - <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... </itemizedlist> <para>OSGiBootstrapProvider implementations that read their configurtation from some other source are possible, but currently not @@ -90,7 +90,7 @@ <emphasis role="bold">The ManagedFramework</emphasis> - <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... ManagedFramework</ulink> gives you access to the MBean views of the deployed Bundles. It is registerd under the name:</para> <itemizedlist> @@ -99,7 +99,7 @@ <emphasis role="bold">The ManagedBundle</emphasis> - <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... ManagedBundle</ulink> gives you access to the MBean views of a deployed Bundle. It is registerd under the name:</para> <itemizedlist> @@ -109,7 +109,7 @@ <emphasis role="bold">Accessing the Management Objects</emphasis> <para>If you work with the JBoss OSGi Testsuite you get access to these managed objects through the - <ulink url="http://junit.sourceforge.net/">JUnit</ulink> support package <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos...;. + <ulink url="http://junit.sourceforge.net/">JUnit</ulink> support package <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos...;. </para> <para>If you install JBoss OSGi in an already existing JBossAS instance you also get access to the Managed Objects through the JBoss provided @@ -130,7 +130,7 @@ <title>Writing Test Cases</title> <para>JBoss OSGi comes with <ulink url="http://www.junit.org">JUnit</ulink> test support as part of the SPI provided - <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... package. There are two distinct test scenarios that we support:</para> <itemizedlist> Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml 2010-02-08 17:15:46 UTC (rev 100710) @@ -64,39 +64,39 @@ <para>Here is how it works </para> <orderedlist> - <listitem>A <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <listitem>A <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... intercepts a test and determines the FQN of the test case and the test method from the call stack. It then delegates the execution to the same (or another) test in and isolated test environment. An isolated test environment is one that does not have the same class loading space as the test itself.</listitem> - <listitem>A Bridge is associated with an <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <listitem>A Bridge is associated with an <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... Invoker</ulink>. Invokers may be arbitarily complex. Local 'in proccess' invokers are possible just as well as remote invokers. </listitem> - <listitem>The Invoker sends the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... - Request</ulink> to a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <listitem>The Invoker sends the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... + Request</ulink> to a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... Connector</ulink> in the isolated test environment.</listitem> - <listitem>A Connector has associated <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <listitem>A Connector has associated <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... PackageListeners</ulink> that are responsible for processing test cases for their respective test packages.</listitem> - <listitem>A PackageListeners delegates the Request to a test <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... - Runner</ulink>, typicaly this would be a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <listitem>A PackageListeners delegates the Request to a test <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... + Runner</ulink>, typicaly this would be a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... JUnitRunner</ulink>.</listitem> - <listitem>The Runner injects the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... - Context</ulink> into the test case and returns a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <listitem>The Runner injects the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... + Context</ulink> into the test case and returns a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... Response</ulink>, which the Connector returns to the Invoker.</listitem> - <listitem>The Bridge finally translates potential <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <listitem>The Bridge finally translates potential <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... Failures</ulink> that may be contained in the Result, to test failures on the client side.</listitem> </orderedlist> <para>The JBoss OSGi <emphasis role="bold">jboss-osgi-husky.jar</emphasis> bundle registers the Connectors. - The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... JMXConnector</ulink> is always registered. - The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... SocketConnector</ulink> is registered when the appropriate configuration options are set. It then registers the - <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos...;, + <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos...;, which is a <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/framework/BundleList... that inspects every incomming bundle for the <emphasis role="bold">Test-Package</emphasis> manifest header. The Extender creates a PackageListener for every package in the 'Test-Package' manifest header and registers them with the available Connectors.</para> Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml 2010-02-08 17:15:46 UTC (rev 100710) @@ -9,7 +9,7 @@ <title>Blueprint Container Service</title> <para>The JBoss OSGi <emphasis role="bold">jboss-osgi-blueprint.jar</emphasis> bundle provides - an early access of a Blueprint extender service.</para> + together with <emphasis role="bold">org.apache.aries.blueprint.jar</emphasis> access to the Blueprint extender service.</para> <para>The <ulink url="http://jbossosgi.blogspot.com/2009/04/osgi-blueprint-service-rf... Container</ulink> service allows bundles to contain standard blueprint descriptors, which can be used for component wiring @@ -20,8 +20,8 @@ <emphasis role="bold">Blueprint Reflection</emphasis> packages.</para> <itemizedlist> - <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/osgi... - <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/osgi... + <listitem><emphasis role="bold"><ulink url="http://www.osgi.org/javadoc/r4v42/org/osgi/service/blueprint/co... + <listitem><emphasis role="bold"><ulink url="http://www.osgi.org/javadoc/r4v42/org/osgi/service/blueprint/re... </itemizedlist> </sect1> @@ -48,7 +48,7 @@ <para>The service is registered with the Framework under the name</para> <itemizedlist> - <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... </itemizedlist> </sect1> @@ -85,7 +85,7 @@ <itemizedlist> <listitem><emphasis role="bold"><ulink url="http://java.sun.com/javase/6/docs/api/javax/management/MBeanSer... - <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... <!-- https://jira.jboss.org/jira/browse/JBOSGI-125 --> </itemizedlist> @@ -153,11 +153,11 @@ <sect1 xml:id="SecBundleMicrocontainer"> <title>Microcontainer Service</title> - <para>The JBoss OSGi <emphasis role="bold">jboss-osgi-microcontainer.jar</emphasis> bundle provides a service that give access to the <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> Kernel. - The service is registered with the Framework under the name</para> + <para>The JBoss OSGi Microcontainer Service gives access to the <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> Kernel. + The service is registered with the Framework under the name.</para> <itemizedlist> - <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... </itemizedlist> <para>Here is an example of how an OSGi component can access an arbitrary MC bean.</para> @@ -176,6 +176,17 @@ </programlisting> </sect1> + <sect1 xml:id="SecServiceLoader"> + <title>ServiceLoader Interceptor</title> + + <para>The ServiceLoader, deployed as <emphasis role="bold">jboss-osgi-serviceloader.jar</emphasis> bundle, is a + <link linkend="SecLifecycleInterceptors">Lifecycle Interceptor</link> that automatically registers services + declared in META-INF/services.</para> + + <para>For more information, please hava a look at <ulink url="http://jbossosgi.blogspot.com/2010/01/suns-serviceloader-and-ho... + ServiceLoader and how it relates to OSGi</ulink>.</para> + </sect1> + <sect1 xml:id="SecWebAppExtender"> <title>WebApp Extender</title> @@ -226,7 +237,7 @@ <para>The service is registered with the Framework under the name</para> <itemizedlist> - <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... </itemizedlist> </sect1> Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml 2010-02-08 17:15:46 UTC (rev 100710) @@ -265,7 +265,7 @@ <note> <para>Please note that access to the MBeanServer from the test case is part of the - <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... OSGiRuntime</ulink> abstraction.</para> </note> @@ -311,7 +311,7 @@ <note> <para>Please note that access to the InitialContext from the test case is part of the - <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/apidocs/org/jbos... + <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/apidocs/org/jbos... OSGiRuntime</ulink> abstraction.</para> </note> @@ -557,6 +557,19 @@ </sect1> + <sect1 xml:id="SecServiceLoaderExample"> + <title>ServiceLoader Example</title> + + <para>The ServiceLoader example uses three bundles - <emphasis role="bold">example-serviceloader-api.jar, example-serviceloader-impl.jar, example-serviceloader-client.jar</emphasis>. + The implementation bundle contains a traditional service defined in META-INF/services. This service definition gets picked up by the ServiceLoader Interceptor and + is automatically registered with the OSGi Framework. + </para> + + <para>For details and more background information, please hava a look at <ulink url="http://jbossosgi.blogspot.com/2010/01/suns-serviceloader-and-ho... + ServiceLoader and how it relates to OSGi</ulink>.</para> + + </sect1> + <sect1 xml:id="SecXMLParserServiceExample"> <title>XML Parser Service</title> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/etc/ChangeLog.html =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/etc/ChangeLog.html 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/etc/ChangeLog.html 2010-02-08 17:15:46 UTC (rev 100710) @@ -1,6 +1,49 @@ <html> <body> +<h1>JBossOSGi 1.0.0 Beta6</h1> +<h2>Bug</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-210'>JBOSGI-21...>] - Bundle installed but not started with hot deploy</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-283'>JBOSGI-28...>] - WebApp extender not installed by default</li> +</ul> + +<h2>Task</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-263'>JBOSGI-26...>] - Integrate Aries Blueprint implementation</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-265'>JBOSGI-26...>] - Update to jboss-osgi-framework-1.0.0.Alpha3</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-281'>JBOSGI-28...>] - Release JBoss OSGi 1.0.0.Beta6</li> +</ul> + +<h1>JBossOSGi Framework 1.0.0 Alpha3</h1> +<h2>Bug</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-145'>JBOSGI-14...>] - JAXB classes are loaded from the system classpath</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-204'>JBOSGI-20...>] - Failure in Bundle.start() uninstalls the bundle</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-286'>JBOSGI-28...>] - Investigate classloading of javax.* classes</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-287'>JBOSGI-28...>] - Optional import loaded from system classloader</li> +</ul> + +<h2>Feature Request</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-269'>JBOSGI-26...>] - Add initial support for Bundle.update()</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-271'>JBOSGI-27...>] - Initial support for R3 bundles</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-272'>JBOSGI-27...>] - Implement bundle header localization</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-273'>JBOSGI-27...>] - Differenciate R3/R4 bundle validation</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-274'>JBOSGI-27...>] - Cache bundle header for default locale</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-275'>JBOSGI-27...>] - Add support for Bundle.update() from original location</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-276'>JBOSGI-27...>] - Add initial support for native code libraries</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-277'>JBOSGI-27...>] - Add initial bundle fragment support</li> +</ul> + +<h2>Task</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-264'>JBOSGI-26...>] - Update to jboss-kernel-2.2.x stable release</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-279'>JBOSGI-27...>] - Update to jboss-cl-2.2.x stable release</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-284'>JBOSGI-28...>] - Investigate version numbering scheme</li> +</ul> + + <h1>JBossOSGi 1.0.0 Beta5</h1> <h2>Bug</h2> <ul> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/etc/ReleaseNotes.html =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/etc/ReleaseNotes.html 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/etc/ReleaseNotes.html 2010-02-08 17:15:46 UTC (rev 100710) @@ -1,27 +1,27 @@ <body> -<h2>Release Notes - JBossOSGi-1.0.0.Beta5</h2> +<h2>Release Notes - JBossOSGi-1.0.0.Beta6</h2> -<p>I am happy to announce the release of JBossOSGi-1.0.0.Beta5.</p> +<p>I am happy to announce the release of JBossOSGi-1.0.0.Beta6.</p> <p/> -<p>You can download the binary here: <a href="http://sourceforge.net/projects/jboss/files/JBossOSGi/1.0.0.Be... +<p>You can download the binary here: <a href="http://sourceforge.net/projects/jboss/files/JBossOSGi/1.0.0.Be... <p/> <p>The release comes with improvements in the following areas</p> <p/> <ul> -<li>Improved JBoss Microcontainer based <a href="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/userguide/html/... support.</li> -<li>Improved Eclipse <a href="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/userguide/html/... Integration</a> support.</li> -<li>Added Enterprise OSGi <a href="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/userguide/html/... support.</li> -<li>Added Compendium <a href="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/userguide/html/... Admin</a> support.</li> -<li>Added JBossXB based <a href="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/userguide/html/... Binding</a> support.</li> -<li>Added <a href="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/userguide/html/... Interceptor</a> support.</li> +<li>Initial support for fragments.</li> +<li>Initial support for Bundle.update().</li> +<li>Initial support for native code libraries.</li> +<li>Support for R3 bundles.</li> +<li>Support for bundle header localization.</li> +<li>Improved Blueprint support, using Apache Aries Blueprint.</li> </ul> <p/> -<p>For details please have a look at the latest version of our <a href="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta5/userguide/html/... Guide</a>.</p> +<p>For details please have a look at the latest version of our <a href="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta6/userguide/html/... Guide</a>.</p> <p/> <p>Here are the change log details</p> @@ -29,49 +29,34 @@ <h2>Bug</h2> <ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-129'>JBOSGI-12...>] - Filter behaviour change in r4v42</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-137'>JBOSGI-13...>] - Cannot parse Bundle-SymbolicName</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-153'>JBOSGI-15...>] - Cannot parse Import-Package parameters</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-187'>JBOSGI-18...>] - Husky SocketInvocation may block forever</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-199'>JBOSGI-19...>] - Use thread safe collections where information is mutable</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-212'>JBOSGI-21...>] - Cannot refresh Microcontainer service</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-210'>JBOSGI-21...>] - Bundle installed but not started with hot deploy</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-283'>JBOSGI-28...>] - WebApp extender not installed by default</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-145'>JBOSGI-14...>] - JAXB classes are loaded from the system classpath</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-204'>JBOSGI-20...>] - Failure in Bundle.start() uninstalls the bundle</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-286'>JBOSGI-28...>] - Investigate classloading of javax.* classes</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-287'>JBOSGI-28...>] - Optional import loaded from system classloader</li> </ul> - + <h2>Feature Request</h2> <ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-125'>JBOSGI-12...>] - Add ManagedFramework service</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-202'>JBOSGI-20...>] - Allow override of where the bootstrap file comes from</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-269'>JBOSGI-26...>] - Add initial support for Bundle.update()</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-271'>JBOSGI-27...>] - Initial support for R3 bundles</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-272'>JBOSGI-27...>] - Implement bundle header localization</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-273'>JBOSGI-27...>] - Differenciate R3/R4 bundle validation</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-274'>JBOSGI-27...>] - Cache bundle header for default locale</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-275'>JBOSGI-27...>] - Add support for Bundle.update() from original location</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-276'>JBOSGI-27...>] - Add initial support for native code libraries</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-277'>JBOSGI-27...>] - Add initial bundle fragment support</li> </ul> - + <h2>Task</h2> <ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-157'>JBOSGI-15...>] - JTA (RFC-98) - Initial Implementation</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-181'>JBOSGI-18...>] - Add EventAdmin as available service</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-182'>JBOSGI-18...>] - Release JBoss OSGi 1.0.0.Beta5</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-183'>JBOSGI-18...>] - Introduce notion of OSGi Interceptors</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-188'>JBOSGI-18...>] - Separate DeployerService from SPI</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-190'>JBOSGI-19...>] - Allign getting started guide with latest release</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-200'>JBOSGI-20...>] - Split getParameter(s) calls into getDirective(s) and getAttribute(s)</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-215'>JBOSGI-21...>] - Update Blueprint to 1.0.0.Alpha3</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-216'>JBOSGI-21...>] - Update to Apache Felix-2.0.2</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-217'>JBOSGI-21...>] - Update to Eclipse Equinox-3.5.1</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-218'>JBOSGI-21...>] - Update to jboss-osgi-common-1.0.3</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-219'>JBOSGI-21...>] - Update to jboss-osgi-husky-1.0.2</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-220'>JBOSGI-22...>] - Update to jboss-osgi-jmx-1.0.2</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-221'>JBOSGI-22...>] - Update to jboss-osgi-jndi-1.0.2</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-222'>JBOSGI-22...>] - Update to jboss-osgi-microcontainer-2.0.9</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-223'>JBOSGI-22...>] - Update to jboss-osgi-spi-1.0.3</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-224'>JBOSGI-22...>] - Update to jboss-osgi-xml-binding-2.0.2.Beta3</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-225'>JBOSGI-22...>] - Update to jboss-osgi-apache-xerces-2.9.1.SP3</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-226'>JBOSGI-22...>] - Update to jboss-osgi-hotdeploy-1.0.3</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-227'>JBOSGI-22...>] - Update to jboss-osgi-framework-1.0.0.Alpha2</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-228'>JBOSGI-22...>] - Update to jboss-osgi-jaxb-2.1.10.SP3</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-229'>JBOSGI-22...>] - Add jboss-osgi-deployment-1.0.0</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-230'>JBOSGI-23...>] - Add jboss-osgi-jta-1.0.0</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-231'>JBOSGI-23...>] - Add jboss-osgi-reflect-2.0.2</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-232'>JBOSGI-23...>] - Add jboss-osgi-webapp-0.7.2</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-233'>JBOSGI-23...>] - Update to org.apache.felix.configadmin-1.2.4</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-234'>JBOSGI-23...>] - Add org.apache.felix.eventadmin-1.0.0</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-263'>JBOSGI-26...>] - Integrate Aries Blueprint implementation</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-265'>JBOSGI-26...>] - Update to jboss-osgi-framework-1.0.0.Alpha3</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-281'>JBOSGI-28...>] - Release JBoss OSGi 1.0.0.Beta6</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-264'>JBOSGI-26...>] - Update to jboss-kernel-2.2.x stable release</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-279'>JBOSGI-27...>] - Update to jboss-cl-2.2.x stable release</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-284'>JBOSGI-28...>] - Investigate version numbering scheme</li> </ul> <p/> 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 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-08 17:15:46 UTC (rev 100710) @@ -150,6 +150,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-serviceloader-sources.jar" /> <include name="jboss-osgi-spi-sources.jar" /> <include name="jboss-osgi-webapp-sources.jar" /> <include name="jboss-osgi-webconsole-sources.jar" /> @@ -246,6 +247,7 @@ <include name="jboss-osgi-jaxb.jar" /> <include name="jboss-osgi-jta.jar" /> <include name="jboss-osgi-reflect.jar" /> + <include name="jboss-osgi-serviceloader.jar" /> <include name="jboss-osgi-xml-binding.jar" /> <include name="org.apache.aries.blueprint.jar" /> <include name="org.apache.aries.util.jar" /> @@ -385,6 +387,11 @@ <include name="war-deployers-jboss-beans.xml" /> </fileset> + <fileset condition="isJBoss601" dir=&quot;(a){deploy.artifacts.dir}/resources/jbossas/jboss600&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy" override="true"> + <include name="jboss-logging.xml" /> + </fileset> + <!-- 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" /> @@ -405,6 +412,7 @@ <include name="jboss-osgi-jndi.jar" /> <include name="jboss-osgi-webconsole.jar" /> <include name="jboss-osgi-reflect.jar" /> + <include name="jboss-osgi-serviceloader.jar" /> <include name="jboss-osgi-xml-binding.jar" /> <include name="org.apache.aries.blueprint.jar" /> <include name="org.apache.aries.util.jar" /> Copied: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss600 (from rev 100701, projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/jbossas/jboss600) Deleted: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss600/jboss-logging.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/jbossas/jboss600/jboss-logging.xml 2010-02-08 14:58:38 UTC (rev 100701) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss600/jboss-logging.xml 2010-02-08 17:15:46 UTC (rev 100710) @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ===================================================================== --> -<!-- --> -<!-- Logging System Configuration --> -<!-- --> -<!-- ===================================================================== --> - -<logging xmlns="urn:jboss:logging:6.0" xmlns:b="urn:jboss:bean-deployer:2.0"> - - <!-- ================================= --> - <!-- Preserve messages in a local file --> - <!-- ================================= --> - - <!-- A time/date based rolling handler --> - - <periodic-rotating-file-handler - file-name="${jboss.server.log.dir}/server.log" - name="FILE" - autoflush="true" - append="false" - suffix=".yyyy-MM-dd"> <!-- To roll over at the top of each hour, use ".yyyy-MM-dd-HH" instead --> - - <error-manager> - <only-once/> - </error-manager> - - <formatter> - <!-- Uncomment this to get the class name in the log as well as the category - <pattern-formatter pattern="%d %-5p [%c] %C{1} (%t) %m%n"/> - --> - <!-- Uncomment this to log without the class name in the log --> - <pattern-formatter pattern="%d %-5p [%c] (%t) %m%n"/> - </formatter> - </periodic-rotating-file-handler> - - <!-- ============================== --> - <!-- Append messages to the console --> - <!-- ============================== --> - - <console-handler name="CONSOLE" autoflush="true" target="System.out"> - <error-manager> - <only-once/> - </error-manager> - - <level name="INFO"/> - - <formatter> - <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] %m%n"/> - </formatter> - </console-handler> - - <!-- =============================================== --> - <!-- Limit categories --> - <!-- if enabling "trace" at root logger level, --> - <!-- use limit category settings to disable trace --> - <!-- for packages that you don't want to trace --> - <!-- =============================================== --> - - <!-- Limit the org.apache category to INFO as its DEBUG is verbose --> - <logger category="org.jboss.osgi"> - <level name="TRACE"/> - </logger> - - - <!-- ======================= --> - <!-- Setup the Root category --> - <!-- ======================= --> - - <root-logger> - <!-- Set the root logger priority via a system property, with a default value. --> - <level name="${jboss.server.log.threshold:INFO}"/> - <handlers> - <handler-ref name="CONSOLE"/> - <handler-ref name="FILE"/> - </handlers> - </root-logger> - -</logging> Copied: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss600/jboss-logging.xml (from rev 100701, projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/jbossas/jboss600/jboss-logging.xml) =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss600/jboss-logging.xml (rev 0) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss600/jboss-logging.xml 2010-02-08 17:15:46 UTC (rev 100710) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ===================================================================== --> +<!-- --> +<!-- Logging System Configuration --> +<!-- --> +<!-- ===================================================================== --> + +<logging xmlns="urn:jboss:logging:6.0" xmlns:b="urn:jboss:bean-deployer:2.0"> + + <!-- ================================= --> + <!-- Preserve messages in a local file --> + <!-- ================================= --> + + <!-- A time/date based rolling handler --> + + <periodic-rotating-file-handler + file-name="${jboss.server.log.dir}/server.log" + name="FILE" + autoflush="true" + append="false" + suffix=".yyyy-MM-dd"> <!-- To roll over at the top of each hour, use ".yyyy-MM-dd-HH" instead --> + + <error-manager> + <only-once/> + </error-manager> + + <formatter> + <!-- Uncomment this to get the class name in the log as well as the category + <pattern-formatter pattern="%d %-5p [%c] %C{1} (%t) %m%n"/> + --> + <!-- Uncomment this to log without the class name in the log --> + <pattern-formatter pattern="%d %-5p [%c] (%t) %m%n"/> + </formatter> + </periodic-rotating-file-handler> + + <!-- ============================== --> + <!-- Append messages to the console --> + <!-- ============================== --> + + <console-handler name="CONSOLE" autoflush="true" target="System.out"> + <error-manager> + <only-once/> + </error-manager> + + <level name="INFO"/> + + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] %m%n"/> + </formatter> + </console-handler> + + <!-- =============================================== --> + <!-- Limit categories --> + <!-- if enabling "trace" at root logger level, --> + <!-- use limit category settings to disable trace --> + <!-- for packages that you don't want to trace --> + <!-- =============================================== --> + + <!-- Limit the org.apache category to INFO as its DEBUG is verbose --> + <logger category="org.jboss.osgi"> + <level name="TRACE"/> + </logger> + + + <!-- ======================= --> + <!-- Setup the Root category --> + <!-- ======================= --> + + <root-logger> + <!-- Set the root logger priority via a system property, with a default value. --> + <level name="${jboss.server.log.threshold:INFO}"/> + <handlers> + <handler-ref name="CONSOLE"/> + <handler-ref name="FILE"/> + </handlers> + </root-logger> + +</logging> Modified: projects/jboss-osgi/trunk/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-02-08 17:15:46 UTC (rev 100710) @@ -231,10 +231,6 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-webapp</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-reflect</artifactId> </dependency> <dependency> @@ -246,7 +242,27 @@ <!-- jboss-osgi-reflect: no javadoc --> <dependency> <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-serviceloader</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-serviceloader</artifactId> + <version>${version.jboss.osgi.serviceloader}</version> + <classifier>sources</classifier> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-serviceloader</artifactId> + <version>${version.jboss.osgi.serviceloader}</version> + <classifier>javadoc</classifier> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-webapp</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-webapp</artifactId> <version>${version.jboss.osgi.webapp}</version> <classifier>sources</classifier> </dependency> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/pom.xml 2010-02-08 17:15:46 UTC (rev 100710) @@ -54,27 +54,27 @@ <version.izpack>4.3.1</version.izpack> <version.javax.servlet>2.5</version.javax.servlet> <version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces> - <version.jboss.osgi.blueprint>1.0.0.Beta1-SNAPSHOT</version.jboss.osgi.blueprint> + <version.jboss.osgi.blueprint>1.0.0.Beta1</version.jboss.osgi.blueprint> <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> - <version.jboss.osgi.deployment>1.0.1-SNAPSHOT</version.jboss.osgi.deployment> - <version.jboss.osgi.framework>1.0.0.Alpha4-SNAPSHOT</version.jboss.osgi.framework> - <version.jboss.osgi.hotdeploy>1.0.4-SNAPSHOT</version.jboss.osgi.hotdeploy> - <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky> + <version.jboss.osgi.deployment>1.0.1</version.jboss.osgi.deployment> + <version.jboss.osgi.framework>1.0.0.Alpha3</version.jboss.osgi.framework> + <version.jboss.osgi.hotdeploy>1.0.4</version.jboss.osgi.hotdeploy> + <version.jboss.osgi.husky>1.0.3</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb> - <version.jboss.osgi.jmx>1.0.3-SNAPSHOT</version.jboss.osgi.jmx> + <version.jboss.osgi.jmx>1.0.3</version.jboss.osgi.jmx> <version.jboss.osgi.jndi>1.0.2</version.jboss.osgi.jndi> <version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta> - <version.jboss.osgi.reflect>2.2.0-SNAPSHOT</version.jboss.osgi.reflect> - <version.jboss.osgi.runtime.deployers>1.0.4-SNAPSHOT</version.jboss.osgi.runtime.deployers> + <version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect> + <version.jboss.osgi.runtime.deployers>1.0.4</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.runtime.equinox>3.5.1</version.jboss.osgi.runtime.equinox> <version.jboss.osgi.runtime.felix>2.0.2</version.jboss.osgi.runtime.felix> <version.jboss.osgi.runtime.jbossas>1.0.2</version.jboss.osgi.runtime.jbossas> - <version.jboss.osgi.serviceloader>1.0.0-SNAPSHOT</version.jboss.osgi.serviceloader> - <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi> - <version.jboss.osgi.webapp>0.7.2.SP1-SNAPSHOT</version.jboss.osgi.webapp> + <version.jboss.osgi.serviceloader>1.0.0</version.jboss.osgi.serviceloader> + <version.jboss.osgi.spi>1.0.4</version.jboss.osgi.spi> + <version.jboss.osgi.webapp>0.7.2.SP1</version.jboss.osgi.webapp> <version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole> - <version.jboss.osgi.xml.binding>2.0.2.Beta4-SNAPSHOT</version.jboss.osgi.xml.binding> + <version.jboss.osgi.xml.binding>2.0.2.Beta4</version.jboss.osgi.xml.binding> <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web> <version.osgi>4.2.0</version.osgi> Property changes on: projects/jboss-osgi/trunk/reactor ___________________________________________________________________ Name: svn:externals - ../../projects/runtime/framework/trunk framework Modified: projects/jboss-osgi/trunk/reactor/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/pom.xml 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/reactor/pom.xml 2010-02-08 17:15:46 UTC (rev 100710) @@ -46,7 +46,6 @@ <!-- Name: framework-jbossmc Descr: Build the JBossMC Framework - --> <profile> <id>framework-jbossmc</id> <activation> @@ -70,6 +69,7 @@ <module>framework</module> </modules> </profile> + --> <!-- Name: jbossmc-javadoc Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java 2010-02-08 17:15:46 UTC (rev 100710) @@ -87,7 +87,7 @@ } @Test - public void testBlueprintBundleInstall() throws Exception + public void testBlueprintContainerAvailable() throws Exception { if (context == null) BridgeFactory.getBridge().run(); @@ -96,16 +96,7 @@ Bundle bundle = context.getBundle(); assertEquals("example-blueprint", bundle.getSymbolicName()); - } - - @Test - public void testBlueprintContainerAvailable() throws Exception - { - if (context == null) - BridgeFactory.getBridge().run(); - assumeNotNull(context); - BlueprintContainer bpContainer = getBlueprintContainer(); assertNotNull("BlueprintContainer available", bpContainer); } @@ -145,12 +136,16 @@ private BlueprintContainer getBlueprintContainer() throws Exception { // 10sec for processing of STARTING event - int timeout = 50; + int timeout = 10000; ServiceReference sref = null; - while (sref == null && 0 < timeout--) + while (sref == null && 0 < (timeout -= 200)) { - sref = context.getServiceReference(BlueprintContainer.class.getName()); + String filter = "(osgi.blueprint.container.symbolicname=example-blueprint)"; + ServiceReference[] srefs = context.getServiceReferences(BlueprintContainer.class.getName(), filter); + if (srefs != null && srefs.length > 0) + sref = srefs[0]; + Thread.sleep(200); } assertNotNull("BlueprintContainer not null", sref); Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/serviceloader/ServiceLoaderTestCase.java 2010-02-08 17:15:46 UTC (rev 100710) @@ -25,6 +25,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; import org.jboss.osgi.serviceloader.ServiceLoaderCapability; @@ -34,6 +35,7 @@ import org.jboss.osgi.testing.OSGiServiceReference; import org.jboss.osgi.testing.OSGiTest; import org.jboss.test.osgi.example.serviceloader.service.AccountService; +import org.jboss.test.osgi.example.serviceloader.service.internal.AccountServiceImpl; import org.junit.Test; import org.osgi.framework.Bundle; @@ -77,7 +79,7 @@ try { // Install the API bundle - runtime.installBundle("example-serviceloader-api.jar"); + OSGiBundle apiBundle = runtime.installBundle("example-serviceloader-api.jar"); // Install/Start the client bundle OSGiBundle implBundle = runtime.installBundle("example-serviceloader-impl.jar"); @@ -93,6 +95,26 @@ assertBundleState(Bundle.ACTIVE, implBundle.getState()); assertBundleState(Bundle.ACTIVE, clientBundle.getState()); + + OSGiBundle apiProvider = clientBundle.loadClass(AccountService.class.getName()); + assertEquals(apiBundle, apiProvider); + + try + { + // The client cannot access the implementation class directly + clientBundle.loadClass(AccountServiceImpl.class.getName()); + fail("ClassNotFoundException expected"); + } + catch (ClassNotFoundException ex) + { + // expected + } + + // Stopping the implementation bundle should unregister the service + implBundle.stop(); + + OSGiServiceReference sref = runtime.getServiceReference(AccountService.class.getName()); + assertNull("AccountService not available", sref); } finally { Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/AbstractWebAppTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/AbstractWebAppTestCase.java 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/AbstractWebAppTestCase.java 2010-02-08 17:15:46 UTC (rev 100710) @@ -46,11 +46,10 @@ protected String getHttpResponse(String reqPath, int timeout) throws Exception { int fraction = 200; - int steps = Math.max(timeout / fraction, 1); String line = null; IOException lastException = null; - while (line == null && 0 < steps--) + while (line == null && 0 < (timeout -= fraction)) { try { Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java 2010-02-08 17:15:46 UTC (rev 100710) @@ -47,7 +47,7 @@ private static OSGiRuntime runtime; @BeforeClass - public static void setUpClass() throws Exception + public static void beforeClass() throws Exception { OSGiTestHelper osgiTestHelper = new OSGiTestHelper(); @@ -61,7 +61,7 @@ } @AfterClass - public static void tearDownClass() throws Exception + public static void afterClass() throws Exception { runtime.shutdown(); runtime = null; Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/jms (from rev 100701, projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/javax/jms) Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/jms/JMSException.java =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/javax/jms/JMSException.java 2010-02-08 14:58:38 UTC (rev 100701) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/jms/JMSException.java 2010-02-08 17:15:46 UTC (rev 100710) @@ -1,105 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package javax.jms; - -/** - * <P>This is the root class of all JMS API exceptions. - * - * <P>It provides the following information: - * <UL> - * <LI> A provider-specific string describing the error. This string is - * the standard exception message and is available via the - * <CODE>getMessage</CODE> method. - * <LI> A provider-specific string error code - * <LI> A reference to another exception. Often a JMS API exception will - * be the result of a lower-level problem. If appropriate, this - * lower-level exception can be linked to the JMS API exception. - * </UL> - **/ - -public class JMSException extends Exception -{ - private static final long serialVersionUID = 8951994251593378324L; - - /** Vendor-specific error code. - **/ - private String errorCode; - - /** <CODE>Exception</CODE> reference. - **/ - private Exception linkedException; - - /** Constructs a <CODE>JMSException</CODE> with the specified reason and - * error code. - * - * @param reason a description of the exception - * @param errorCode a string specifying the vendor-specific - * error code - **/ - public JMSException(String reason, String errorCode) - { - super(reason); - this.errorCode = errorCode; - linkedException = null; - } - - /** Constructs a <CODE>JMSException</CODE> with the specified reason and with - * the error code defaulting to null. - * - * @param reason a description of the exception - **/ - public JMSException(String reason) - { - super(reason); - this.errorCode = null; - linkedException = null; - } - - /** Gets the vendor-specific error code. - * @return a string specifying the vendor-specific - * error code - **/ - public String getErrorCode() - { - return this.errorCode; - } - - /** - * Gets the exception linked to this one. - * - * @return the linked <CODE>Exception</CODE>, null if none - **/ - public Exception getLinkedException() - { - return (linkedException); - } - - /** - * Adds a linked <CODE>Exception</CODE>. - * - * @param ex the linked <CODE>Exception</CODE> - **/ - public synchronized void setLinkedException(Exception ex) - { - linkedException = ex; - } -} Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/jms/JMSException.java (from rev 100701, projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/javax/jms/JMSException.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/jms/JMSException.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/jms/JMSException.java 2010-02-08 17:15:46 UTC (rev 100710) @@ -0,0 +1,105 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package javax.jms; + +/** + * <P>This is the root class of all JMS API exceptions. + * + * <P>It provides the following information: + * <UL> + * <LI> A provider-specific string describing the error. This string is + * the standard exception message and is available via the + * <CODE>getMessage</CODE> method. + * <LI> A provider-specific string error code + * <LI> A reference to another exception. Often a JMS API exception will + * be the result of a lower-level problem. If appropriate, this + * lower-level exception can be linked to the JMS API exception. + * </UL> + **/ + +public class JMSException extends Exception +{ + private static final long serialVersionUID = 8951994251593378324L; + + /** Vendor-specific error code. + **/ + private String errorCode; + + /** <CODE>Exception</CODE> reference. + **/ + private Exception linkedException; + + /** Constructs a <CODE>JMSException</CODE> with the specified reason and + * error code. + * + * @param reason a description of the exception + * @param errorCode a string specifying the vendor-specific + * error code + **/ + public JMSException(String reason, String errorCode) + { + super(reason); + this.errorCode = errorCode; + linkedException = null; + } + + /** Constructs a <CODE>JMSException</CODE> with the specified reason and with + * the error code defaulting to null. + * + * @param reason a description of the exception + **/ + public JMSException(String reason) + { + super(reason); + this.errorCode = null; + linkedException = null; + } + + /** Gets the vendor-specific error code. + * @return a string specifying the vendor-specific + * error code + **/ + public String getErrorCode() + { + return this.errorCode; + } + + /** + * Gets the exception linked to this one. + * + * @return the linked <CODE>Exception</CODE>, null if none + **/ + public Exception getLinkedException() + { + return (linkedException); + } + + /** + * Adds a linked <CODE>Exception</CODE>. + * + * @param ex the linked <CODE>Exception</CODE> + **/ + public synchronized void setLinkedException(Exception ex) + { + linkedException = ex; + } +} Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java 2010-02-08 17:15:46 UTC (rev 100710) @@ -1,64 +0,0 @@ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. - */ - -package javax.xml.ws; - -/** The <code>WebServiceException</code> class is the base - * exception class for all JAX-WS API runtime exceptions. - * - * @since JAX-WS 2.0 -**/ - -@SuppressWarnings("serial") -public class WebServiceException extends java.lang.RuntimeException -{ - - /** Constructs a new exception with <code>null</code> as its - * detail message. The cause is not initialized. - **/ - public WebServiceException() - { - super(); - } - - /** Constructs a new exception with the specified detail - * message. The cause is not initialized. - * @param message The detail message which is later - * retrieved using the getMessage method - **/ - public WebServiceException(String message) - { - super(message); - } - - /** Constructs a new exception with the specified detail - * message and cause. - * - * @param message The detail message which is later retrieved - * using the getMessage method - * @param cause The cause which is saved for the later - * retrieval throw by the getCause method - **/ - public WebServiceException(String message, Throwable cause) - { - super(message, cause); - } - - /** Constructs a new WebServiceException with the specified cause - * and a detail message of <tt>(cause==null ? null : - * cause.toString())</tt> (which typically contains the - * class and detail message of <tt>cause</tt>). - * - * @param cause The cause which is saved for the later - * retrieval throw by the getCause method. - * (A <tt>null</tt> value is permitted, and - * indicates that the cause is nonexistent or - * unknown.) - **/ - public WebServiceException(Throwable cause) - { - super(cause); - } -} Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java 2010-02-08 17:15:46 UTC (rev 100710) @@ -112,7 +112,7 @@ { if ("jbossmc".equals(getFrameworkName())) { - System.out.println("FIXME [JBOSGI-287] Optional import loaded from system classloader"); + System.out.println("FIXME [JBOSGI-151] Cannot resolve circular dependencies"); return; } @@ -147,7 +147,7 @@ } @Test - public void testServletAPI() throws Exception + public void testMessagingAPI() throws Exception { OSGiRuntime runtime = getDefaultRuntime(); try @@ -157,14 +157,14 @@ // Import-Package: javax.xml.ws OSGiBundle bundleA = runtime.installBundle("jbosgi287-bundleC.jar"); - OSGiBundle exporterA = bundleA.loadClass("javax.xml.ws.WebServiceException"); + OSGiBundle exporterA = bundleA.loadClass("javax.jms.JMSException"); assertEquals(Bundle.RESOLVED, bundleA.getState()); assertEquals(bundleA, exporterA); // Try to load a class that is not part of the bundle try { - bundleA.loadClass("javax.xml.ws.WebServiceContext"); + bundleA.loadClass("javax.jms.MessageProducer"); fail("ClassNotFoundException expected"); } catch (ClassNotFoundException ex) Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGi92TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGi92TestCase.java 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi92/OSGi92TestCase.java 2010-02-08 17:15:46 UTC (rev 100710) @@ -28,6 +28,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.SAXParserFactory; +import org.jboss.osgi.spi.capability.CompendiumCapability; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; import org.jboss.osgi.testing.OSGiServiceReference; @@ -35,7 +36,6 @@ import org.jboss.osgi.testing.OSGiTestHelper; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; @@ -53,9 +53,10 @@ private static OSGiRuntime runtime; @BeforeClass - public static void beforeClass() throws BundleException + public static void beforeClass() throws Exception { runtime = new OSGiTestHelper().getDefaultRuntime(); + runtime.addCapability(new CompendiumCapability()); } @AfterClass @@ -69,7 +70,6 @@ } @Test - @Ignore("Fails with apache felix compendium-1.2.0") public void testDeployParsers() throws Exception { OSGiBundle bundleA = runtime.installBundle("jbosgi92-bundleA.jar"); @@ -79,9 +79,9 @@ String filter = "(parser.factoryname=org.jboss.test.osgi.jbosgi92.bundleA.*)"; OSGiServiceReference[] domRefs = runtime.getServiceReferences(DocumentBuilderFactory.class.getName(), filter); - assertEquals("DocumentBuilderFactory servce available", 1, domRefs.length); + assertEquals("DocumentBuilderFactory service available", 1, domRefs.length); OSGiServiceReference[] saxRefs = runtime.getServiceReferences(SAXParserFactory.class.getName(), filter); - assertEquals("SAXParserFactory servce available", 1, saxRefs.length); + assertEquals("SAXParserFactory service available", 1, saxRefs.length); } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd 2010-02-08 16:54:11 UTC (rev 100709) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd 2010-02-08 17:15:46 UTC (rev 100710) @@ -1,6 +1,6 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi287-bundleB.jar src/test/resources/jbosgi287/jbosgi287-bundle.bnd Bundle-SymbolicName: jbosgi287-bundleC -Export-Package: javax.xml.ws -Import-Package: javax.xml.ws +Export-Package: javax.jms +Import-Package: javax.jms