[jboss-osgi-commits] JBoss-OSGI SVN: r100696 - in projects/jboss-osgi/branches/1.0.0.Beta6: distribution/docbook/en/images and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2010-02-08 09:03:36 -0500 (Mon, 08 Feb 2010) New Revision: 100696 Modified: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/hudson-matrix-jbossmc.png projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/izpack01-welcome.png projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/izpack05-installpath.png projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/izpack10-packs.png projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/izpack30-verify.png projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/izpack35-done.png projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/runtime-structure.png projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch020-getting-started.xml projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch030-runtime.xml projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch050-developer-guide.xml projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch060-husky-testing.xml projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch070-provided-bundles.xml projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch080-provided-examples.xml projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/branches/1.0.0.Beta6/distribution/pom.xml projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java Log: Update docbook. Install serviceloader bundle Modified: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/hudson-matrix-jbossmc.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/izpack01-welcome.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/izpack05-installpath.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/izpack10-packs.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/izpack30-verify.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/izpack35-done.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/images/runtime-structure.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch020-getting-started.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch020-getting-started.xml 2010-02-08 12:31:10 UTC (rev 100695) +++ projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch020-getting-started.xml 2010-02-08 14:03:36 UTC (rev 100696) @@ -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/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch030-runtime.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch030-runtime.xml 2010-02-08 12:31:10 UTC (rev 100695) +++ projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch030-runtime.xml 2010-02-08 14:03:36 UTC (rev 100696) @@ -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/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch050-developer-guide.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch050-developer-guide.xml 2010-02-08 12:31:10 UTC (rev 100695) +++ projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch050-developer-guide.xml 2010-02-08 14:03:36 UTC (rev 100696) @@ -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/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch060-husky-testing.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch060-husky-testing.xml 2010-02-08 12:31:10 UTC (rev 100695) +++ projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch060-husky-testing.xml 2010-02-08 14:03:36 UTC (rev 100696) @@ -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/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch070-provided-bundles.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch070-provided-bundles.xml 2010-02-08 12:31:10 UTC (rev 100695) +++ projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch070-provided-bundles.xml 2010-02-08 14:03:36 UTC (rev 100696) @@ -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/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch080-provided-examples.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch080-provided-examples.xml 2010-02-08 12:31:10 UTC (rev 100695) +++ projects/jboss-osgi/branches/1.0.0.Beta6/distribution/docbook/en/modules/ch080-provided-examples.xml 2010-02-08 14:03:36 UTC (rev 100696) @@ -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/branches/1.0.0.Beta6/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-08 12:31:10 UTC (rev 100695) +++ projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-08 14:03:36 UTC (rev 100696) @@ -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" /> @@ -410,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" /> Modified: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/pom.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/distribution/pom.xml 2010-02-08 12:31:10 UTC (rev 100695) +++ projects/jboss-osgi/branches/1.0.0.Beta6/distribution/pom.xml 2010-02-08 14:03:36 UTC (rev 100696) @@ -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/branches/1.0.0.Beta6/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java 2010-02-08 12:31:10 UTC (rev 100695) +++ projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java 2010-02-08 14:03:36 UTC (rev 100696) @@ -70,21 +70,21 @@ @Test public void testResourceAccess() throws Exception { - String line = getHttpResponse("/message.txt", 10000); + String line = getHttpResponse("/message.txt", 5000); assertEquals("Hello from Resource", line); } @Test public void testServletAccess() throws Exception { - String line = getHttpResponse("/servlet?test=plain", 10000); + String line = getHttpResponse("/servlet?test=plain", 5000); assertEquals("Hello from Servlet", line); } @Test public void testServletInitProps() throws Exception { - String line = getHttpResponse("/servlet?test=initProp", 10000); + String line = getHttpResponse("/servlet?test=initProp", 5000); assertEquals("initProp=SomeValue", line); } } \ No newline at end of file