June 2009 - jboss-osgi-commits - Jboss List Archives

JBoss-OSGI SVN: r89703 - in projects/jboss-osgi/trunk/docbook: en/modules and 2 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-06-02 18:11:29 -0400 (Tue, 02 Jun 2009) New Revision: 89703 Added: projects/jboss-osgi/trunk/docbook/en/images/izpack-structure.png projects/jboss-osgi/trunk/docbook/en/images/jbossosgi-runtime.png projects/jboss-osgi/trunk/docbook/src/main/graphics/ projects/jboss-osgi/trunk/docbook/src/main/graphics/jbossosgi-runtime.odp Removed: projects/jboss-osgi/trunk/docbook/en/images/izpack-structure.jpg Modified: projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml projects/jboss-osgi/trunk/docbook/en/modules/ch03-framework-integration.xml Log: More userguide - WIP Deleted: projects/jboss-osgi/trunk/docbook/en/images/izpack-structure.jpg =================================================================== (Binary files differ) Copied: projects/jboss-osgi/trunk/docbook/en/images/izpack-structure.png (from rev 89672, projects/jboss-osgi/trunk/docbook/en/images/izpack-structure.jpg) =================================================================== (Binary files differ) Added: projects/jboss-osgi/trunk/docbook/en/images/jbossosgi-runtime.png =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/trunk/docbook/en/images/jbossosgi-runtime.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml 2009-06-02 21:45:22 UTC (rev 89702) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml 2009-06-02 22:11:29 UTC (rev 89703) @@ -97,22 +97,68 @@ <title>JBossOSGi Runtime</title> <para>If you selected 'JBossOSGi Runtime' during installation you should see a <emphasis role="bold">runtime</emphasis> folder, which contains - the JBossOSGi Runtime distribution. The JBossOSGi Runtime has now evolved into a pure OSGi container onto which services and applications - can be deployed.</para> + the JBossOSGi Runtime distribution. Formerly a trimmed down <ulink url="http://http://jboss.org/jbossas">JBossAS</ulink> distribution, the + JBossOSGi Runtime has now evolved into a pure OSGi container onto which services and applications can be deployed.</para> + <mediaobject> + <imageobject> + <imagedata fileref="images/jbossosgi-runtime.png"/> + </imageobject> + </mediaobject> + <para>The current JBossOSGi Runtime feature set includes</para> <itemizedlist> - <listitem><emphasis role="bold">Embedded and Standalone usage</emphasis> - [TODO]</listitem> - <listitem><emphasis role="bold">Hot Deployement</emphasis> - </listitem> - <listitem><emphasis role="bold">Multiple OSGi Frameworks</emphasis> - [TODO]</listitem> - <listitem><emphasis role="bold">Various Runtime Profiles</emphasis> - [TODO]</listitem> - <listitem><emphasis role="bold">Local and Remote JMX Support</emphasis> - [TODO]</listitem> - <listitem><emphasis role="bold">JNDI Support</emphasis> - [TODO]</listitem> - <listitem><emphasis role="bold">SAX/DOM Parser Support</emphasis> - [TODO]</listitem> - <listitem><emphasis role="bold">JAXB Support</emphasis> - [TODO]</listitem> - <listitem><emphasis role="bold">Http Service Support</emphasis> - [TODO]</listitem> - <listitem><emphasis role="bold">Config Admin Support</emphasis> - [TODO]</listitem> + <listitem><emphasis role="bold">Embedded and Standalone usage</emphasis> - + + The runtime can be bootstrapped as standalone container with a startup time of less than 2 sec + in its default configuration or embedded in some other container environment.</listitem> + + <listitem><emphasis role="bold">Various Runtime Profiles</emphasis> - + + It comes with various preconfigured profiles <link linkend="SecRuntimeProfileMinimal">Minimal</link>, + <link linkend="SecRuntimeProfileDefault">Default</link>, <link linkend="SecRuntimeProfileWeb">Web</link>, + <link linkend="SecRuntimeProfileWeb">All</link> which are explained in detail below. Setting up a new + profile is a mater of creating a new directory and putting some bundles in it.</listitem> + + <listitem><emphasis role="bold">Hot Deployement</emphasis> - + + Similar to <ulink url="http://http://jboss.org/jbossas">JBossAS</ulink> there is a deployment scanner that scans + the 'deploy' folder for new or removed bundles.</listitem> + + <listitem><emphasis role="bold">Multiple OSGi Frameworks</emphasis> - + + The Installer can setup the JBossOSGi Runtime using <link linkend="SecIntegrationFelix">Felix</link>, + <link linkend="SecIntegrationEquinox">Equinox</link> or <link linkend="SecIntegrationKnopflerfish">Knopflerfish</link>. + </listitem> + + <listitem><emphasis role="bold">Local and Remote JMX Support</emphasis> - + + There is local as well as remote support for <ulink url="http://java.sun.com/javase/6/docs/technotes/guides/jmx">Java Management Extensions (JMX)</ulink>. + Similar to <ulink url="http://http://jboss.org/jbossas">JBossAS</ulink> the JMXAdaptor which provides the + <ulink url="http://java.sun.com/javase/6/docs/api/javax/management/MBeanServerConnect...">MBeanServerConnection</ulink> is bound to JNDI. + </listitem> + + <listitem><emphasis role="bold">JNDI Support</emphasis> - + + Components can access the <ulink url="http://java.sun.com/javase/6/docs/technotes/guides/jndi">Java Naming and Directory Interface</ulink> + as a service from the registry. + </listitem> + + <listitem><emphasis role="bold">SAX/DOM Parser Support</emphasis> - + + The Runtime comes with an implementation of an <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/util/xml/XMLParserActivator.html">XMLParserActivator</ulink> + which provides access to a <ulink url="http://java.sun.com/javase/6/docs/api/javax/xml/parsers/SAXParserFactory....">SAXParserFactory</ulink> and + <ulink url="http://java.sun.com/javase/6/docs/api/javax/xml/parsers/DocumentBuilderFa...">DocumentBuilderFactory</ulink> + </listitem> + + <listitem><emphasis role="bold">JAXB Support</emphasis> - + + There is a bundle that provides initial <ulink url="https://jaxb.dev.java.net">JAXB</ulink> support. + </listitem> + + <listitem><emphasis role="bold">HttpService Support</emphasis> - [TODO]</listitem> + <listitem><emphasis role="bold">ConfigAdmin Support</emphasis> - [TODO]</listitem> <listitem><emphasis role="bold">Provisioning</emphasis> - [TODO]</listitem> <listitem><emphasis role="bold">Logging System</emphasis> - [TODO]</listitem> <listitem><emphasis role="bold">Microcontainer Support</emphasis> - [TODO]</listitem> @@ -122,7 +168,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/izpack-structure.jpg"/> + <imagedata fileref="images/izpack-structure.png"/> </imageobject> </mediaobject> @@ -130,9 +176,9 @@ options are:</para> <itemizedlist> - <listitem><emphasis role="bold">-c (--profile-name)</emphasis> - The runtime profile to start (-c minimal). + <listitem><emphasis role="bold">-c (--profile-name)</emphasis> - The runtime profile to start. The default is the 'default' profile.</listitem> - <listitem><emphasis role="bold">-b (--bind-address)</emphasis> - The network address various services can bind to (-b 127.0.0.1). + <listitem><emphasis role="bold">-b (--bind-address)</emphasis> - The network address various services can bind to. The default is 'localhost'</listitem> </itemizedlist> @@ -165,11 +211,11 @@ 16:18:34,170 INFO [jboss-osgi-jndi] JNDI started: JNP=localhost:1099, RMI=localhost:1098 16:18:34,543 INFO [jboss-osgi-jmx] MBeanServerConnection bound to: jmx/invoker/RMIAdaptor ... - 16:18:34,544 INFO [OSGiBootstrap] JBossOSGi Runtime started in 1.57sec + <emphasis role="bold">16:18:34,544 INFO [OSGiBootstrap] JBossOSGi Runtime started in 1.57sec</emphasis> </programlisting> - <sect2 xml:id="SecRuntimeProfileMinimum"> - <title>Minimum Profile</title> + <sect2 xml:id="SecRuntimeProfileMinimal"> + <title>Minimal Profile</title> <para>[TODO]</para> </sect2> Modified: projects/jboss-osgi/trunk/docbook/en/modules/ch03-framework-integration.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch03-framework-integration.xml 2009-06-02 21:45:22 UTC (rev 89702) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch03-framework-integration.xml 2009-06-02 22:11:29 UTC (rev 89703) @@ -5,7 +5,7 @@ <title>Framework Integration</title> - <sect1 xml:id="SecIntFelix"> + <sect1 xml:id="SecIntegrationFelix"> <title>Apache Felix Integration</title> <para>JBossOSGi provides integration for the <ulink url="http://felix.apache.org">Apache Felix</ulink> OSGi Framework and some @@ -106,7 +106,7 @@ </table> </sect1> - <sect1 xml:id="SecIntEquinox"> + <sect1 xml:id="SecIntegrationEquinox"> <title>Equinox Integration</title> <para>JBossOSGi also provides basic integration for the <ulink url="http://www.eclipse.org/equinox">Eclpipse Equinox</ulink> OSGi Framework.</para> @@ -162,7 +162,7 @@ </sect1> - <sect1 xml:id="SecIntKnopflerfish"> + <sect1 xml:id="SecIntegrationKnopflerfish"> <title>Knopflerfish Integration</title> <para>JBossOSGi provides basic integration for the <ulink url="http://www.knopflerfish.org">Makewave Knopflerfish</ulink> OSGi Framework.</para> Added: projects/jboss-osgi/trunk/docbook/src/main/graphics/jbossosgi-runtime.odp =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/trunk/docbook/src/main/graphics/jbossosgi-runtime.odp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 1 month

1
0
0 / 0

JBoss-OSGI SVN: r89690 - projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-06-02 14:22:23 -0400 (Tue, 02 Jun 2009) New Revision: 89690 Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml Log: Start matrix at 22:00 Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml =================================================================== --- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-06-02 18:09:45 UTC (rev 89689) +++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-06-02 18:22:23 UTC (rev 89690) @@ -27,7 +27,7 @@ <disabled>false</disabled> <triggers class="vector"> <hudson.triggers.TimerTrigger> - <spec>0 20 * * *</spec> + <spec>0 22 * * *</spec> </hudson.triggers.TimerTrigger> </triggers> <axes>

15 years, 1 month

1
0
0 / 0

JBoss-OSGI SVN: r89687 - projects/jboss-osgi/trunk/docbook/en/modules.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-06-02 13:47:17 -0400 (Tue, 02 Jun 2009) New Revision: 89687 Modified: projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml Log: More userguide - WIP Modified: projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml 2009-06-02 17:45:49 UTC (rev 89686) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml 2009-06-02 17:47:17 UTC (rev 89687) @@ -130,10 +130,10 @@ options are:</para> <itemizedlist> - <listitem><emphasis role="bold">-b (--bind-address)</emphasis>The network address various services can bind to (-b 127.0.0.1). + <listitem><emphasis role="bold">-c (--profile-name)</emphasis> - The runtime profile to start (-c minimal). + The default is the 'default' profile.</listitem> + <listitem><emphasis role="bold">-b (--bind-address)</emphasis> - The network address various services can bind to (-b 127.0.0.1). The default is 'localhost'</listitem> - <listitem><emphasis role="bold">-c (--profile-name)</emphasis>The runtime profile to start (-c minimal). - The default is the 'default' profile.</listitem> </itemizedlist> <programlisting>

15 years, 1 month

1
0
0 / 0

JBoss-OSGI SVN: r89686 - in projects/jboss-osgi/trunk: spi/src/main/java/org/jboss/osgi/spi/framework and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-06-02 13:45:49 -0400 (Tue, 02 Jun 2009) New Revision: 89686 Modified: projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java Log: More userguide - WIP Modified: projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml 2009-06-02 17:28:29 UTC (rev 89685) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml 2009-06-02 17:45:49 UTC (rev 89686) @@ -97,16 +97,9 @@ <title>JBossOSGi Runtime</title> <para>If you selected 'JBossOSGi Runtime' during installation you should see a <emphasis role="bold">runtime</emphasis> folder, which contains - the JBossOSGi Runtime distribution.</para> + the JBossOSGi Runtime distribution. The JBossOSGi Runtime has now evolved into a pure OSGi container onto which services and applications + can be deployed.</para> - <mediaobject> - <imageobject> - <imagedata fileref="images/izpack-structure.jpg"/> - </imageobject> - </mediaobject> - - <para>The JBossOSGi Runtime has now evolved into a pure OSGi container onto which services and applications can be deployed.</para> - <para>The current JBossOSGi Runtime feature set includes</para> <itemizedlist> @@ -125,7 +118,24 @@ <listitem><emphasis role="bold">Microcontainer Support</emphasis> - [TODO]</listitem> </itemizedlist> + <para>The layout of the JBossOSGi Runtime after installation is similar to what you know from <ulink url="http://http://jboss.org/jbossas">JBossAS</ulink>.</para> + <mediaobject> + <imageobject> + <imagedata fileref="images/izpack-structure.jpg"/> + </imageobject> + </mediaobject> + + <para>You can start the Runtime by running <emphasis role="bold">bin/run.sh</emphasis>. The supported command line + options are:</para> + + <itemizedlist> + <listitem><emphasis role="bold">-b (--bind-address)</emphasis>The network address various services can bind to (-b 127.0.0.1). + The default is 'localhost'</listitem> + <listitem><emphasis role="bold">-c (--profile-name)</emphasis>The runtime profile to start (-c minimal). + The default is the 'default' profile.</listitem> + </itemizedlist> + <programlisting> [tdiesler@tddell runtime]$ bin/run.sh ========================================================================= @@ -160,6 +170,7 @@ <sect2 xml:id="SecRuntimeProfileMinimum"> <title>Minimum Profile</title> + <para>[TODO]</para> </sect2> <sect2 xml:id="SecRuntimeProfileDefault"> Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java 2009-06-02 17:28:29 UTC (rev 89685) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java 2009-06-02 17:45:49 UTC (rev 89686) @@ -65,10 +65,10 @@ private static final String OSGI_SERVER_HOME = "osgi.server.home"; private static final String OSGI_HOME = "osgi.home"; - @Option(name = "-c", aliases = { "--server-name" }, usage = "Sets the server config (-c minimal)") + @Option(name = "-c", aliases = { "--profile-name" }, usage = "The runtime profile to start (-c minimal)", required = false) public String serverName = "default"; - @Option(name = "-b", aliases = { "--bind-address" }, usage = "Sets the bind address (-b 127.0.0.1)") + @Option(name = "-b", aliases = { "--bind-address" }, usage = "The network address various services can bind to (-b 127.0.0.1)", required = false) public String bindAdress = "localhost"; private String osgiHome;

15 years, 1 month

1
0
0 / 0

JBoss-OSGI SVN: r89685 - in projects/jboss-osgi/trunk: distribution/src/main/resources/installer and 2 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-06-02 13:28:29 -0400 (Tue, 02 Jun 2009) New Revision: 89685 Added: projects/jboss-osgi/trunk/docbook/en/modules/ch05-husky-testing.xml projects/jboss-osgi/trunk/docbook/en/modules/ch06-provided-bundles.xml projects/jboss-osgi/trunk/docbook/en/modules/ch07-provided-examples.xml projects/jboss-osgi/trunk/docbook/en/modules/ch08-references.xml projects/jboss-osgi/trunk/docbook/en/modules/ch09-getting-support.xml Removed: projects/jboss-osgi/trunk/docbook/en/modules/ch05-provided-bundles.xml projects/jboss-osgi/trunk/docbook/en/modules/ch06-provided-examples.xml projects/jboss-osgi/trunk/docbook/en/modules/ch07-references.xml projects/jboss-osgi/trunk/docbook/en/modules/ch08-getting-support.xml Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/docbook/en/master.xml projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml Log: More userguide - WIP Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties 2009-06-02 17:15:45 UTC (rev 89684) +++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties 2009-06-02 17:28:29 UTC (rev 89685) @@ -12,7 +12,7 @@ org.osgi.framework.storage.clean=onFirstInit # Hot Deployement -org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/bundles +org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/deploy # HTTP Service Port org.osgi.service.http.port=8090 @@ -89,10 +89,10 @@ # Bundles that need to be installed with the Framework automatically org.jboss.osgi.spi.framework.autoInstall=\ - file://${osgi.home}/server/minimal/bundles/org.eclipse.osgi.services.jar + file://${osgi.home}/server/minimal/deploy/org.eclipse.osgi.services.jar # Bundles that need to be started automatically org.jboss.osgi.spi.framework.autoStart=\ - file://${osgi.home}/server/minimal/bundles/org.apache.felix.log.jar \ - file://${osgi.home}/server/minimal/bundles/jboss-osgi-common.jar \ - file://${osgi.home}/server/minimal/bundles/jboss-osgi-hotdeploy.jar \ No newline at end of file + file://${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar \ + file://${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar \ + file://${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar \ No newline at end of file Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties 2009-06-02 17:15:45 UTC (rev 89684) +++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties 2009-06-02 17:28:29 UTC (rev 89685) @@ -12,7 +12,7 @@ org.osgi.framework.storage.clean=onFirstInit # Hot Deployement -org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/bundles +org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/deploy # HTTP Service Port org.osgi.service.http.port=8090 @@ -56,10 +56,10 @@ # Bundles that need to be installed with the Framework automatically org.jboss.osgi.spi.framework.autoInstall=\ - file://${osgi.home}/server/minimal/bundles/org.osgi.compendium.jar + file://${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar # Bundles that need to be started automatically org.jboss.osgi.spi.framework.autoStart=\ - file://${osgi.home}/server/minimal/bundles/org.apache.felix.log.jar \ - file://${osgi.home}/server/minimal/bundles/jboss-osgi-common.jar \ - file://${osgi.home}/server/minimal/bundles/jboss-osgi-hotdeploy.jar \ No newline at end of file + file://${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar \ + file://${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar \ + file://${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar \ No newline at end of file Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties 2009-06-02 17:15:45 UTC (rev 89684) +++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties 2009-06-02 17:28:29 UTC (rev 89685) @@ -12,7 +12,7 @@ org.osgi.framework.storage.clean=onFirstInit # Hot Deployement -org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/bundles +org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/deploy # HTTP Service Port org.osgi.service.http.port=8090 @@ -86,10 +86,10 @@ # Bundles that need to be installed with the Framework automatically org.jboss.osgi.spi.framework.autoInstall=\ - file://${osgi.home}/server/minimal/bundles/org.osgi.compendium.jar + file://${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar # Bundles that need to be started automatically org.jboss.osgi.spi.framework.autoStart=\ - file://${osgi.home}/server/minimal/bundles/org.apache.felix.log.jar \ - file://${osgi.home}/server/minimal/bundles/jboss-osgi-common.jar \ - file://${osgi.home}/server/minimal/bundles/jboss-osgi-hotdeploy.jar \ No newline at end of file + file://${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar \ + file://${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar \ + file://${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar \ No newline at end of file Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-06-02 17:15:45 UTC (rev 89684) +++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-06-02 17:28:29 UTC (rev 89685) @@ -176,14 +176,14 @@ </fileset>  - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/bundles" override="true"> + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true"> <include name="org.apache.felix.log.jar" /> <include name="jboss-osgi-common.jar" /> <include name="jboss-osgi-hotdeploy.jar" /> </fileset>  - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/bundles" override="true"> + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy" override="true">  <include name="jboss-osgi-common-core.jar" /> <include name="jboss-osgi-jmx.jar" /> @@ -191,7 +191,7 @@ </fileset>  - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/web/bundles" override="true"> + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/web/deploy" override="true">  <include name="jboss-osgi-common-core.jar" /> <include name="jboss-osgi-jmx.jar" /> @@ -204,7 +204,7 @@ </fileset>  - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/bundles" override="true"> + <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true">  <include name="jboss-osgi-common-core.jar" /> <include name="jboss-osgi-jmx.jar" /> @@ -228,7 +228,7 @@ <include name="jboss-osgi-runtime-felix.jar" /> <include name="org.apache.felix.framework.jar" /> </fileset> - <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/bundles" override="true"> + <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true"> <include name="org.osgi.compendium.jar" /> </fileset> @@ -239,7 +239,7 @@ <include name="jboss-osgi-runtime-equinox.jar" /> <include name="org.eclipse.osgi.jar" /> </fileset> - <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/bundles" override="true"> + <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true"> <include name="org.eclipse.osgi.services.jar" /> </fileset> @@ -250,7 +250,7 @@ <include name="jboss-osgi-runtime-knopflerfish.jar" /> <include name="org.knopflerfish.framework.jar" /> </fileset> - <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/bundles" override="true"> + <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true"> <include name="org.osgi.compendium.jar" /> </fileset> Modified: projects/jboss-osgi/trunk/docbook/en/master.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/master.xml 2009-06-02 17:15:45 UTC (rev 89684) +++ projects/jboss-osgi/trunk/docbook/en/master.xml 2009-06-02 17:28:29 UTC (rev 89685) @@ -14,9 +14,10 @@ <xi:include href="modules/ch02-getting-started.xml"/> <xi:include href="modules/ch03-framework-integration.xml"/> <xi:include href="modules/ch04-developer-guide.xml"/> - <xi:include href="modules/ch05-provided-bundles.xml"/> - <xi:include href="modules/ch06-provided-examples.xml"/> - <xi:include href="modules/ch07-references.xml"/> - <xi:include href="modules/ch08-getting-support.xml"/> + <xi:include href="modules/ch05-husky-testing.xml"/> + <xi:include href="modules/ch06-provided-bundles.xml"/> + <xi:include href="modules/ch07-provided-examples.xml"/> + <xi:include href="modules/ch08-references.xml"/> + <xi:include href="modules/ch09-getting-support.xml"/> </book> \ No newline at end of file Modified: projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml 2009-06-02 17:15:45 UTC (rev 89684) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml 2009-06-02 17:28:29 UTC (rev 89685) @@ -105,9 +105,27 @@ </imageobject> </mediaobject> -  - <para>The JBossOSGi Runtime is ... [TODO]</para> + <para>The JBossOSGi Runtime has now evolved into a pure OSGi container onto which services and applications can be deployed.</para> + <para>The current JBossOSGi Runtime feature set includes</para> + + <itemizedlist> + <listitem><emphasis role="bold">Embedded and Standalone usage</emphasis> - [TODO]</listitem> + <listitem><emphasis role="bold">Hot Deployement</emphasis> - </listitem> + <listitem><emphasis role="bold">Multiple OSGi Frameworks</emphasis> - [TODO]</listitem> + <listitem><emphasis role="bold">Various Runtime Profiles</emphasis> - [TODO]</listitem> + <listitem><emphasis role="bold">Local and Remote JMX Support</emphasis> - [TODO]</listitem> + <listitem><emphasis role="bold">JNDI Support</emphasis> - [TODO]</listitem> + <listitem><emphasis role="bold">SAX/DOM Parser Support</emphasis> - [TODO]</listitem> + <listitem><emphasis role="bold">JAXB Support</emphasis> - [TODO]</listitem> + <listitem><emphasis role="bold">Http Service Support</emphasis> - [TODO]</listitem> + <listitem><emphasis role="bold">Config Admin Support</emphasis> - [TODO]</listitem> + <listitem><emphasis role="bold">Provisioning</emphasis> - [TODO]</listitem> + <listitem><emphasis role="bold">Logging System</emphasis> - [TODO]</listitem> + <listitem><emphasis role="bold">Microcontainer Support</emphasis> - [TODO]</listitem> + </itemizedlist> + + <programlisting> [tdiesler@tddell runtime]$ bin/run.sh ========================================================================= @@ -140,6 +158,25 @@ 16:18:34,544 INFO [OSGiBootstrap] JBossOSGi Runtime started in 1.57sec </programlisting> + <sect2 xml:id="SecRuntimeProfileMinimum"> + <title>Minimum Profile</title> + </sect2> + + <sect2 xml:id="SecRuntimeProfileDefault"> + <title>Default Profile</title> + <para>[TODO]</para> + </sect2> + + <sect2 xml:id="SecRuntimeProfileWeb"> + <title>Web Profile</title> + <para>[TODO]</para> + </sect2> + + <sect2 xml:id="SecRuntimeProfileAll"> + <title>All Profile</title> + <para>[TODO]</para> + </sect2> + <emphasis role="bold">Provided Examples</emphasis> <para>JBossOSGi comes with a number of examples that you can build and deploy. Each example @@ -148,8 +185,8 @@ <itemizedlist> <listitem><emphasis role="bold">HTTP Service</emphasis> - Register servlets and resources with the HTTP Service</listitem> <listitem><emphasis role="bold">Log Service</emphasis> - Interact with a local and remote Log Service</listitem> - <listitem><emphasis role="bold">JMX Service</emphasis> - Register an MBean through the MBeanServer service</listitem> - <listitem><emphasis role="bold">JNDI Service</emphasis> - Bind/Unbind objects to/from JNDI</listitem> + <listitem><emphasis role="bold">JMX Service</emphasis> - Register an MBean through the JMX Service</listitem> + <listitem><emphasis role="bold">JNDI Service</emphasis> - Bind objects to the Naming Service</listitem> <listitem><emphasis role="bold">Microcontainer Service</emphasis> - Call a service from an MC bean</listitem> </itemizedlist> @@ -183,10 +220,10 @@ <emphasis role="bold">Bundle Deployment</emphasis> <para>Bundle deployment works, as you would probably expect, by dropping your OSGi Bundle into the - JBossOSGi Runtime <emphasis role="bold">bundles</emphasis> folder.</para> + JBossOSGi Runtime <emphasis role="bold">deploy</emphasis> folder.</para> <programlisting> - [tdiesler@tdvaio testsuite]$ cp .../test-libs/example/example-http.jar .../runtime/server/web/bundles + [tdiesler@tdvaio testsuite]$ cp .../test-libs/example/example-http.jar .../runtime/server/web/deploy ... 13:59:38,284 INFO [BundleRealDeployer] Installed: example-http [9] 13:59:38,289 INFO [example-http] BundleEvent INSTALLED Added: projects/jboss-osgi/trunk/docbook/en/modules/ch05-husky-testing.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch05-husky-testing.xml (rev 0) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch05-husky-testing.xml 2009-06-02 17:28:29 UTC (rev 89685) @@ -0,0 +1,29 @@ + +<chapter xml:id="ChapHuskyTesting"> + + <title>Husky OSGi Test Framework</title> + + <sect1 xml:id="SecHuskyOverview"> + <title>Overview</title> + + <para>[TODO]</para> + + </sect1> + + <sect1 xml:id="SecHuskyConfiguration"> + <title>Configuration</title> + + <para>[TODO]</para> + + </sect1> + + <sect1 xml:id="SecHuskyWritingTests"> + <title>Writing Husky Tests</title> + + <para>[TODO]</para> + + </sect1> + +</chapter> Property changes on: projects/jboss-osgi/trunk/docbook/en/modules/ch05-husky-testing.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: projects/jboss-osgi/trunk/docbook/en/modules/ch05-provided-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch05-provided-bundles.xml 2009-06-02 17:15:45 UTC (rev 89684) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch05-provided-bundles.xml 2009-06-02 17:28:29 UTC (rev 89685) @@ -1,141 +0,0 @@ - -<chapter xml:id="ChapProvidedBundles"> - - <title>Provided Bundles and Services</title> - - <sect1 xml:id="SecLoggingService"> - <title>Logging Bridge Service</title> - - <para>The JBossOSGi <emphasis role="bold">jboss-osgi-logging.jar</emphasis> bundle contains a simple Logging Bridge Service to - <ulink url="http://www.jboss.org/community/docs/DOC-11280">JBoss Logging</ulink>. It registers a trivial LogListener with the - LogReaderService in case that service is registered with the Framework.</para> - - <itemizedlist> - <listitem><ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogListener.html">LogListener</ulink> - Subscribes to LogEntry objects from the LogReaderService</listitem> - <listitem><ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogReaderService.html">LogReaderService</ulink> - Provides methods to retrieve LogEntry objects from the log</listitem> - </itemizedlist> - - <para>The LogReaderService is part of the standard <ulink url="http://www.osgi.org/Download/File?url=/download/r4v41/r4.cmpn.pdf">OSGi - Compendium Services</ulink>. JBossOSGi currently uses the <ulink url="http://felix.apache.org/site/apache-felix-log-service.html">Log Service</ulink> - from <ulink url="http://felix.apache.org">Apache Felix</ulink>, which gets deployed as Bundle <emphasis role="bold">org.apache.felix.log.jar</emphasis> - </para> - - <para>The LogListener itself logs messages under the Bundle's symbolic name.</para> - - <programlisting role="JAVA"> - public class JBossLoggingLogListener implements LogListener - { - public void logged(LogEntry entry) - { - Bundle bundle = entry.getBundle(); - int level = entry.getLevel(); - Throwable throwable = entry.getException(); - - String loggerName = bundle.getSymbolicName(); - Logger log = Logger.getLogger(loggerName); - - if (level == LogService.LOG_DEBUG) - log.debug(entry.getMessage(), throwable); - - else if (level == LogService.LOG_INFO) - log.info(entry.getMessage(), throwable); - - else if (level == LogService.LOG_WARNING) - log.warn(entry.getMessage(), throwable); - - else if (level == LogService.LOG_ERROR) - log.error(entry.getMessage(), throwable); - } - } - </programlisting> - - <para>You can therefore change the logging for specific Bundles by - <ulink url="http://www.jboss.org/community/docs/DOC-12490">setting the respective logging level</ulink>.</para> - </sect1> - - <sect1 xml:id="SecRemoteLogService"> - <title>Remote Log Service</title> - - <para>The JBossOSGi <emphasis role="bold">jboss-osgi-remotelog.jar</emphasis> bundle contains a client side - <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogReaderService.html">RemoteLogReaderService</ulink> that remotely - communicates with a server side <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogListener.html">LogListener</ulink>. - </para> - - <para>The Remote Log Service is configured with these properties.</para> - - <table> - <tr><th>Key</th><th>Value</th><th>Description</th></tr> - <tr valign="top"> - <td>org.jboss.osgi.service.remote.log.sender</td> - <td>true/false</td> - <td>Enable the server side LogListener</td> - </tr> - <tr valign="top"> - <td>org.jboss.osgi.service.remote.log.reader</td> - <td>true/false</td> - <td>Enable the client side LogReaderService</td> - </tr> - <tr valign="top"> - <td>org.jboss.osgi.service.remote.log.host</td> - <td>localhost</td> - <td>The remote host that log messages are sent to</td> - </tr> - <tr valign="top"> - <td>org.jboss.osgi.service.remote.log.port</td> - <td>5400</td> - <td>The remote port that log messages are sent to</td> - </tr> - </table> - - <para>On the client side you can install an arbitrary <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogListener.html">LogListener</ulink> - with the <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogReaderService.html">RemoteLogReaderService</ulink>. The testsuite typically - installs an <ulink url="http://jbmuc.dyndns.org:8280/hudson/job/jbossosgi-jdk16/ws/jboss-osgi/spi...">LogEntryCache</ulink> - that filters the received log messages.</para> - - <programlisting role="JAVA"> - LogEntryCache logEntryCache = new LogEntryCache(); - logEntryCache.addFilter(new LogEntryFilter("example-log(.*)", LogService.LOG_INFO, "\\[ServiceA\\](.*)")); - - // Track the RemoteLogReaderService to add the LogEntryCache as LogListener - ServiceTracker tracker = new ServiceTracker(sysContext, RemoteLogReaderService.class.getName(), null) - { - @Override - public Object addingService(ServiceReference sref) - { - LogReaderService service = (LogReaderService)super.addingService(sref); - service.addLogListener(logEntryCache); - return service; - } - }; - tracker.open(); - </programlisting> - </sect1> - - <sect1 xml:id="SecMicrocontainerService"> - <title>Microcontainer Service</title> - - <para>JBossOSGi SPI comes with a service that give access to the <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> Kernel - and the JMX <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/MBeanServer.html">MBeanServer</ulink>. The service is - registered with the Framework under the name</para> - - <itemizedlist> - <listitem><emphasis role="bold">org.jboss.osgi.service.MicrocontainerService</emphasis></listitem> - </itemizedlist> - - <para>Here is an example of how an OSGi component can register an arbitrary MBean with the - <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/MBeanServer.html">MBeanServer</ulink>.</para> - - <programlisting role="JAVA"> - ServiceReference sref = context.getServiceReference(MicrocontainerService.class.getName()); - if (sref == null) - throw new IllegalStateException("MicrocontainerService not registered"); - - MicrocontainerService mcService = (MicrocontainerService)context.getService(sref); - MBeanServer mbeanServer = mcService.getMbeanServer(); - mbeanServer.registerMBean(new Foo(), OBJECT_NAME); - </programlisting> - </sect1> - -</chapter> Copied: projects/jboss-osgi/trunk/docbook/en/modules/ch06-provided-bundles.xml (from rev 89672, projects/jboss-osgi/trunk/docbook/en/modules/ch05-provided-bundles.xml) =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch06-provided-bundles.xml (rev 0) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch06-provided-bundles.xml 2009-06-02 17:28:29 UTC (rev 89685) @@ -0,0 +1,141 @@ + +<chapter xml:id="ChapProvidedBundles"> + + <title>Provided Bundles and Services</title> + + <sect1 xml:id="SecLoggingService"> + <title>Logging Bridge Service</title> + + <para>The JBossOSGi <emphasis role="bold">jboss-osgi-logging.jar</emphasis> bundle contains a simple Logging Bridge Service to + <ulink url="http://www.jboss.org/community/docs/DOC-11280">JBoss Logging</ulink>. It registers a trivial LogListener with the + LogReaderService in case that service is registered with the Framework.</para> + + <itemizedlist> + <listitem><ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogListener.html">LogListener</ulink> - Subscribes to LogEntry objects from the LogReaderService</listitem> + <listitem><ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogReaderService.html">LogReaderService</ulink> - Provides methods to retrieve LogEntry objects from the log</listitem> + </itemizedlist> + + <para>The LogReaderService is part of the standard <ulink url="http://www.osgi.org/Download/File?url=/download/r4v41/r4.cmpn.pdf">OSGi + Compendium Services</ulink>. JBossOSGi currently uses the <ulink url="http://felix.apache.org/site/apache-felix-log-service.html">Log Service</ulink> + from <ulink url="http://felix.apache.org">Apache Felix</ulink>, which gets deployed as Bundle <emphasis role="bold">org.apache.felix.log.jar</emphasis> + </para> + + <para>The LogListener itself logs messages under the Bundle's symbolic name.</para> + + <programlisting role="JAVA"> + public class JBossLoggingLogListener implements LogListener + { + public void logged(LogEntry entry) + { + Bundle bundle = entry.getBundle(); + int level = entry.getLevel(); + Throwable throwable = entry.getException(); + + String loggerName = bundle.getSymbolicName(); + Logger log = Logger.getLogger(loggerName); + + if (level == LogService.LOG_DEBUG) + log.debug(entry.getMessage(), throwable); + + else if (level == LogService.LOG_INFO) + log.info(entry.getMessage(), throwable); + + else if (level == LogService.LOG_WARNING) + log.warn(entry.getMessage(), throwable); + + else if (level == LogService.LOG_ERROR) + log.error(entry.getMessage(), throwable); + } + } + </programlisting> + + <para>You can therefore change the logging for specific Bundles by + <ulink url="http://www.jboss.org/community/docs/DOC-12490">setting the respective logging level</ulink>.</para> + </sect1> + + <sect1 xml:id="SecRemoteLogService"> + <title>Remote Log Service</title> + + <para>The JBossOSGi <emphasis role="bold">jboss-osgi-remotelog.jar</emphasis> bundle contains a client side + <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogReaderService.html">RemoteLogReaderService</ulink> that remotely + communicates with a server side <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogListener.html">LogListener</ulink>. + </para> + + <para>The Remote Log Service is configured with these properties.</para> + + <table> + <tr><th>Key</th><th>Value</th><th>Description</th></tr> + <tr valign="top"> + <td>org.jboss.osgi.service.remote.log.sender</td> + <td>true/false</td> + <td>Enable the server side LogListener</td> + </tr> + <tr valign="top"> + <td>org.jboss.osgi.service.remote.log.reader</td> + <td>true/false</td> + <td>Enable the client side LogReaderService</td> + </tr> + <tr valign="top"> + <td>org.jboss.osgi.service.remote.log.host</td> + <td>localhost</td> + <td>The remote host that log messages are sent to</td> + </tr> + <tr valign="top"> + <td>org.jboss.osgi.service.remote.log.port</td> + <td>5400</td> + <td>The remote port that log messages are sent to</td> + </tr> + </table> + + <para>On the client side you can install an arbitrary <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogListener.html">LogListener</ulink> + with the <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogReaderService.html">RemoteLogReaderService</ulink>. The testsuite typically + installs an <ulink url="http://jbmuc.dyndns.org:8280/hudson/job/jbossosgi-jdk16/ws/jboss-osgi/spi...">LogEntryCache</ulink> + that filters the received log messages.</para> + + <programlisting role="JAVA"> + LogEntryCache logEntryCache = new LogEntryCache(); + logEntryCache.addFilter(new LogEntryFilter("example-log(.*)", LogService.LOG_INFO, "\\[ServiceA\\](.*)")); + + // Track the RemoteLogReaderService to add the LogEntryCache as LogListener + ServiceTracker tracker = new ServiceTracker(sysContext, RemoteLogReaderService.class.getName(), null) + { + @Override + public Object addingService(ServiceReference sref) + { + LogReaderService service = (LogReaderService)super.addingService(sref); + service.addLogListener(logEntryCache); + return service; + } + }; + tracker.open(); + </programlisting> + </sect1> + + <sect1 xml:id="SecMicrocontainerService"> + <title>Microcontainer Service</title> + + <para>JBossOSGi SPI comes with a service that give access to the <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> Kernel + and the JMX <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/MBeanServer.html">MBeanServer</ulink>. The service is + registered with the Framework under the name</para> + + <itemizedlist> + <listitem><emphasis role="bold">org.jboss.osgi.service.MicrocontainerService</emphasis></listitem> + </itemizedlist> + + <para>Here is an example of how an OSGi component can register an arbitrary MBean with the + <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/MBeanServer.html">MBeanServer</ulink>.</para> + + <programlisting role="JAVA"> + ServiceReference sref = context.getServiceReference(MicrocontainerService.class.getName()); + if (sref == null) + throw new IllegalStateException("MicrocontainerService not registered"); + + MicrocontainerService mcService = (MicrocontainerService)context.getService(sref); + MBeanServer mbeanServer = mcService.getMbeanServer(); + mbeanServer.registerMBean(new Foo(), OBJECT_NAME); + </programlisting> + </sect1> + +</chapter> Deleted: projects/jboss-osgi/trunk/docbook/en/modules/ch06-provided-examples.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch06-provided-examples.xml 2009-06-02 17:15:45 UTC (rev 89684) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch06-provided-examples.xml 2009-06-02 17:28:29 UTC (rev 89685) @@ -1,165 +0,0 @@ - -<chapter xml:id="ChapProvidedExamples"> - - <title>Provided Examples</title> - - <sect1 xml:id="SecBuildAndRunExamples"> - <title>Building the Examples</title> - - <para>JBossOSGi comes with a number of examples that demonstrate supported functionality - and show best practices. All examples are part of the binary distribution and tightly - integrated in our <ulink url="http://www.jboss.org/community/docs/DOC-13275">Maven Build Process</ulink> - and <ulink url="http://www.jboss.org/community/docs/DOC-13420">Hudson QA Environment</ulink>.</para> - - <para>The examples can be either run against a local embedded OSGi Framework or against - a remote OSGi Runtime instance. Here is how you build and run the against the embedded OSGi Framework.</para> - - <programlisting> - /home/yourname/jboss-osgi-1.0.0.Beta1/example - [tdiesler@tddell example]$ mvn test - ... - [INFO] ------------------------------------------------------------------------ - [INFO] Building JBossOSGi - Testsuite Examples - [INFO] task-segment: [test] - [INFO] ------------------------------------------------------------------------ - ... - build-example-jars: - # example-log (example-log.jar) 2 - # example-http (example-http.jar) 4 - # example-microcontainer (example-microcontainer.jar) 4 - ... - ------------------------------------------------------- - T E S T S - ------------------------------------------------------- - Running org.jboss.test.osgi.example.log.LogServiceTestCase - Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.876 sec - ... - [INFO] ------------------------------------------------------------------------ - [INFO] BUILD SUCCESSFUL - [INFO] ------------------------------------------------------------------------ - [INFO] Total time: 17 seconds - [INFO] Finished at: Tue Apr 21 14:32:31 CEST 2009 - [INFO] Final Memory: 21M/51M - [INFO] ------------------------------------------------------------------------ - </programlisting> - - <para>To run the examples against a remote OSGi Runtime, you need to provide the - host theat the runtime binds to. This can be done with the - <emphasis role="bold">-Djboss.bind.address=localhost</emphasis> property.</para> - - <programlisting> - /home/yourname/jboss-osgi-1.0.0.Beta1/example - [tdiesler@tddell example]$ mvn -Djboss.bind.address=localhost test - ... - [INFO] ------------------------------------------------------------------------ - [INFO] Building JBossOSGi - Testsuite Examples - [INFO] task-segment: [test] - [INFO] ------------------------------------------------------------------------ - ... - build-example-jars: - # example-log (example-log.jar) 2 - # example-http (example-http.jar) 4 - # example-microcontainer (example-microcontainer.jar) 4 - ... - ------------------------------------------------------- - T E S T S - ------------------------------------------------------- - Running org.jboss.test.osgi.example.http.HttpServiceRemoteTestCase - Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.435 sec - Running org.jboss.test.osgi.example.log.LogServiceTestCase - Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.06 sec - Running org.jboss.test.osgi.example.microcontainer.MBeanServiceRemoteTestCase - Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.177 sec - Running org.jboss.test.osgi.example.log.LogServiceRemoteTestCase - Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.632 sec - ... - [INFO] ------------------------------------------------------------------------ - [INFO] BUILD SUCCESSFUL - [INFO] ------------------------------------------------------------------------ - [INFO] Total time: 29 seconds - [INFO] Finished at: Tue Apr 21 14:47:33 CEST 2009 - [INFO] Final Memory: 44M/82M - [INFO] ------------------------------------------------------------------------ - </programlisting> - </sect1> - - <sect1 xml:id="SecHTTPServiceExample"> - <title>HTTP Service Example</title> - - <para>The <emphasis role="bold">example-http.jar</emphasis> bundle contains a Service - that registeres a servlet and a resource with the <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/http/HttpService.html">HttpService</ulink>. - </para> - - <programlisting role="JAVA"> - ServiceTracker tracker = new ServiceTracker(context, HttpService.class.getName(), null); - tracker.open(); - - HttpService httpService = (HttpService)tracker.getService(); - if (httpService == null) - throw new IllegalStateException("HttpService not registered"); - - Properties initParams = new Properties(); - initParams.setProperty("initProp", "SomeValue"); - httpService.registerServlet("/servlet", new EndpointServlet(context), initParams, null); - httpService.registerResources("/file", "/res", null); - </programlisting> - - <para>The test then verifies that the registered servlet context and the registered resource can be accessed.</para> - </sect1> - - <sect1 xml:id="SecLogServiceExample"> - <title>Log Service Example</title> - - <para>The <emphasis role="bold">example-log.jar</emphasis> bundle contains a Service - that logs messages to the <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogService.html">LogService</ulink>. - - </para> - - <programlisting role="JAVA"> - public ServiceA(BundleContext context) - { - log = new LogServiceTracker(context); - log.log(LOG_INFO, "[ServiceA] new Service"); - } - </programlisting> - - <para>The test then filters and verifies the log messages.</para> - - <programlisting role="JAVA"> - LogEntryCache logEntryCache = new LogEntryCache(); - logEntryCache.addFilter(new LogEntryFilter(null, 0, "\\[ServiceA\\](.*)")); - startLogEntryTracking(logEntryCache); - - // Verify the received log entries - List entries = logEntryCache.getLog(); - assertEquals("Number of entries", 1, entries.size()); - assertEquals("[ServiceA] new Service", entries.get(0).getMessage()); - </programlisting> - - <para>The test is available both for embedded and remote LogService testing.</para> - </sect1> - - <sect1 xml:id="SecMicrocontainerServiceExample"> - <title>MC Service Example</title> - - <para>The <emphasis role="bold">example-microcontainer.jar</emphasis> bundle contains a Service - that registers an MBean with the <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/MBeanServer.html">MBeanServer</ulink>. - </para> - - <programlisting role="JAVA"> - MicrocontainerService service = (MicrocontainerService)tracker.getService(); - mbeanServer = mcService.getMbeanServer(); - mbeanServer.registerMBean(new Foo(), OBJECT_NAME); - </programlisting> - - <para>The test then accesses the registered MBean.</para> - - <programlisting role="JAVA"> - FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, OBJECT_NAME, getServer()); - assertEquals("hello", foo.echo("hello")); - </programlisting> - </sect1> - -</chapter> Copied: projects/jboss-osgi/trunk/docbook/en/modules/ch07-provided-examples.xml (from rev 89672, projects/jboss-osgi/trunk/docbook/en/modules/ch06-provided-examples.xml) =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch07-provided-examples.xml (rev 0) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch07-provided-examples.xml 2009-06-02 17:28:29 UTC (rev 89685) @@ -0,0 +1,165 @@ + +<chapter xml:id="ChapProvidedExamples"> + + <title>Provided Examples</title> + + <sect1 xml:id="SecBuildAndRunExamples"> + <title>Building the Examples</title> + + <para>JBossOSGi comes with a number of examples that demonstrate supported functionality + and show best practices. All examples are part of the binary distribution and tightly + integrated in our <ulink url="http://www.jboss.org/community/docs/DOC-13275">Maven Build Process</ulink> + and <ulink url="http://www.jboss.org/community/docs/DOC-13420">Hudson QA Environment</ulink>.</para> + + <para>The examples can be either run against a local embedded OSGi Framework or against + a remote OSGi Runtime instance. Here is how you build and run the against the embedded OSGi Framework.</para> + + <programlisting> + /home/yourname/jboss-osgi-1.0.0.Beta1/example + [tdiesler@tddell example]$ mvn test + ... + [INFO] ------------------------------------------------------------------------ + [INFO] Building JBossOSGi - Testsuite Examples + [INFO] task-segment: [test] + [INFO] ------------------------------------------------------------------------ + ... + build-example-jars: + # example-log (example-log.jar) 2 + # example-http (example-http.jar) 4 + # example-microcontainer (example-microcontainer.jar) 4 + ... + ------------------------------------------------------- + T E S T S + ------------------------------------------------------- + Running org.jboss.test.osgi.example.log.LogServiceTestCase + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.876 sec + ... + [INFO] ------------------------------------------------------------------------ + [INFO] BUILD SUCCESSFUL + [INFO] ------------------------------------------------------------------------ + [INFO] Total time: 17 seconds + [INFO] Finished at: Tue Apr 21 14:32:31 CEST 2009 + [INFO] Final Memory: 21M/51M + [INFO] ------------------------------------------------------------------------ + </programlisting> + + <para>To run the examples against a remote OSGi Runtime, you need to provide the + host theat the runtime binds to. This can be done with the + <emphasis role="bold">-Djboss.bind.address=localhost</emphasis> property.</para> + + <programlisting> + /home/yourname/jboss-osgi-1.0.0.Beta1/example + [tdiesler@tddell example]$ mvn -Djboss.bind.address=localhost test + ... + [INFO] ------------------------------------------------------------------------ + [INFO] Building JBossOSGi - Testsuite Examples + [INFO] task-segment: [test] + [INFO] ------------------------------------------------------------------------ + ... + build-example-jars: + # example-log (example-log.jar) 2 + # example-http (example-http.jar) 4 + # example-microcontainer (example-microcontainer.jar) 4 + ... + ------------------------------------------------------- + T E S T S + ------------------------------------------------------- + Running org.jboss.test.osgi.example.http.HttpServiceRemoteTestCase + Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.435 sec + Running org.jboss.test.osgi.example.log.LogServiceTestCase + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.06 sec + Running org.jboss.test.osgi.example.microcontainer.MBeanServiceRemoteTestCase + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.177 sec + Running org.jboss.test.osgi.example.log.LogServiceRemoteTestCase + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.632 sec + ... + [INFO] ------------------------------------------------------------------------ + [INFO] BUILD SUCCESSFUL + [INFO] ------------------------------------------------------------------------ + [INFO] Total time: 29 seconds + [INFO] Finished at: Tue Apr 21 14:47:33 CEST 2009 + [INFO] Final Memory: 44M/82M + [INFO] ------------------------------------------------------------------------ + </programlisting> + </sect1> + + <sect1 xml:id="SecHTTPServiceExample"> + <title>HTTP Service Example</title> + + <para>The <emphasis role="bold">example-http.jar</emphasis> bundle contains a Service + that registeres a servlet and a resource with the <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/http/HttpService.html">HttpService</ulink>. + </para> + + <programlisting role="JAVA"> + ServiceTracker tracker = new ServiceTracker(context, HttpService.class.getName(), null); + tracker.open(); + + HttpService httpService = (HttpService)tracker.getService(); + if (httpService == null) + throw new IllegalStateException("HttpService not registered"); + + Properties initParams = new Properties(); + initParams.setProperty("initProp", "SomeValue"); + httpService.registerServlet("/servlet", new EndpointServlet(context), initParams, null); + httpService.registerResources("/file", "/res", null); + </programlisting> + + <para>The test then verifies that the registered servlet context and the registered resource can be accessed.</para> + </sect1> + + <sect1 xml:id="SecLogServiceExample"> + <title>Log Service Example</title> + + <para>The <emphasis role="bold">example-log.jar</emphasis> bundle contains a Service + that logs messages to the <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/service/log/LogService.html">LogService</ulink>. + + </para> + + <programlisting role="JAVA"> + public ServiceA(BundleContext context) + { + log = new LogServiceTracker(context); + log.log(LOG_INFO, "[ServiceA] new Service"); + } + </programlisting> + + <para>The test then filters and verifies the log messages.</para> + + <programlisting role="JAVA"> + LogEntryCache logEntryCache = new LogEntryCache(); + logEntryCache.addFilter(new LogEntryFilter(null, 0, "\\[ServiceA\\](.*)")); + startLogEntryTracking(logEntryCache); + + // Verify the received log entries + List entries = logEntryCache.getLog(); + assertEquals("Number of entries", 1, entries.size()); + assertEquals("[ServiceA] new Service", entries.get(0).getMessage()); + </programlisting> + + <para>The test is available both for embedded and remote LogService testing.</para> + </sect1> + + <sect1 xml:id="SecMicrocontainerServiceExample"> + <title>MC Service Example</title> + + <para>The <emphasis role="bold">example-microcontainer.jar</emphasis> bundle contains a Service + that registers an MBean with the <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/javax/management/MBeanServer.html">MBeanServer</ulink>. + </para> + + <programlisting role="JAVA"> + MicrocontainerService service = (MicrocontainerService)tracker.getService(); + mbeanServer = mcService.getMbeanServer(); + mbeanServer.registerMBean(new Foo(), OBJECT_NAME); + </programlisting> + + <para>The test then accesses the registered MBean.</para> + + <programlisting role="JAVA"> + FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, OBJECT_NAME, getServer()); + assertEquals("hello", foo.echo("hello")); + </programlisting> + </sect1> + +</chapter> Deleted: projects/jboss-osgi/trunk/docbook/en/modules/ch07-references.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch07-references.xml 2009-06-02 17:15:45 UTC (rev 89684) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch07-references.xml 2009-06-02 17:28:29 UTC (rev 89685) @@ -1,27 +0,0 @@ - -<chapter xml:id="ChapReferences"> - - <title>References</title> - - <para><emphasis role="bold">Resources</emphasis></para> - - <itemizedlist> - <listitem><ulink url="http://www.jboss.org/community/wiki/JBossOSGi">JBossOSGi Wiki</ulink></listitem> - <listitem><ulink url="http://jbossosgi.blogspot.com">JBossOSGi Diary (Blog)</ulink></listitem> - <listitem><ulink url="https://jira.jboss.org/jira/browse/JBOSGI">Issue Tracking</ulink></listitem> - <listitem><ulink url="http://jbmuc.dyndns.org:8280/hudson">Hudson QA</ulink></listitem> - <listitem><ulink url="https://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi">Subversion</ulink></listitem> - <listitem><ulink url="http://fisheye.jboss.com/browse/JBossOSGi">Fisheye</ulink></listitem> - <listitem><ulink url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=257">User Forum</ulink></listitem> - <listitem><ulink url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=256">Design Forum</ulink></listitem> - </itemizedlist> - - <para><emphasis role="bold">Authors</emphasis></para> - - <itemizedlist> - <listitem><ulink url="email:thomas.diesler@jboss.com">Thomas Diesler</ulink></listitem> - </itemizedlist> - -</chapter> Deleted: projects/jboss-osgi/trunk/docbook/en/modules/ch08-getting-support.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch08-getting-support.xml 2009-06-02 17:15:45 UTC (rev 89684) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch08-getting-support.xml 2009-06-02 17:28:29 UTC (rev 89685) @@ -1,16 +0,0 @@ - -<chapter xml:id="ChapGettingSupport"> - - <title>Getting Support</title> - - <para>We offer free support through the <ulink url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=257">JBossOSGi User Forum</ulink>.</para> - - <para>Please note, that posts to this forum will be dealt with at the community's leisure. - If your business is such that you need to rely on qualified answers within a known time frame, - this forum might not be your preferred support channel.</para> - - <para>For professional support please go to <ulink url="http://www.jboss.com/services">JBoss Support Services</ulink>.</para> - -</chapter> Copied: projects/jboss-osgi/trunk/docbook/en/modules/ch08-references.xml (from rev 89672, projects/jboss-osgi/trunk/docbook/en/modules/ch07-references.xml) =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch08-references.xml (rev 0) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch08-references.xml 2009-06-02 17:28:29 UTC (rev 89685) @@ -0,0 +1,27 @@ + +<chapter xml:id="ChapReferences"> + + <title>References</title> + + <para><emphasis role="bold">Resources</emphasis></para> + + <itemizedlist> + <listitem><ulink url="http://www.jboss.org/community/wiki/JBossOSGi">JBossOSGi Wiki</ulink></listitem> + <listitem><ulink url="http://jbossosgi.blogspot.com">JBossOSGi Diary (Blog)</ulink></listitem> + <listitem><ulink url="https://jira.jboss.org/jira/browse/JBOSGI">Issue Tracking</ulink></listitem> + <listitem><ulink url="http://jbmuc.dyndns.org:8280/hudson">Hudson QA</ulink></listitem> + <listitem><ulink url="https://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi">Subversion</ulink></listitem> + <listitem><ulink url="http://fisheye.jboss.com/browse/JBossOSGi">Fisheye</ulink></listitem> + <listitem><ulink url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=257">User Forum</ulink></listitem> + <listitem><ulink url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=256">Design Forum</ulink></listitem> + </itemizedlist> + + <para><emphasis role="bold">Authors</emphasis></para> + + <itemizedlist> + <listitem><ulink url="email:thomas.diesler@jboss.com">Thomas Diesler</ulink></listitem> + </itemizedlist> + +</chapter> Copied: projects/jboss-osgi/trunk/docbook/en/modules/ch09-getting-support.xml (from rev 89672, projects/jboss-osgi/trunk/docbook/en/modules/ch08-getting-support.xml) =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch09-getting-support.xml (rev 0) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch09-getting-support.xml 2009-06-02 17:28:29 UTC (rev 89685) @@ -0,0 +1,16 @@ + +<chapter xml:id="ChapGettingSupport"> + + <title>Getting Support</title> + + <para>We offer free support through the <ulink url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=257">JBossOSGi User Forum</ulink>.</para> + + <para>Please note, that posts to this forum will be dealt with at the community's leisure. + If your business is such that you need to rely on qualified answers within a known time frame, + this forum might not be your preferred support channel.</para> + + <para>For professional support please go to <ulink url="http://www.jboss.com/services">JBoss Support Services</ulink>.</para> + +</chapter>

15 years, 1 month

1
0
0 / 0

JBoss-OSGI SVN: r89680 - projects/jboss-osgi/trunk/docbook/src/main/resources.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-06-02 12:43:57 -0400 (Tue, 02 Jun 2009) New Revision: 89680 Modified: projects/jboss-osgi/trunk/docbook/src/main/resources/bookinfo.xml Log: Mark the user guide as (Draft) Modified: projects/jboss-osgi/trunk/docbook/src/main/resources/bookinfo.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/src/main/resources/bookinfo.xml 2009-06-02 16:41:48 UTC (rev 89679) +++ projects/jboss-osgi/trunk/docbook/src/main/resources/bookinfo.xml 2009-06-02 16:43:57 UTC (rev 89680) @@ -4,17 +4,6 @@ <bookinfo> <title>JBossOSGi - User Guide</title> - <releaseinfo>Version: ${version}</releaseinfo> + <releaseinfo>Version: ${version} (Draft)</releaseinfo> <pubdate>Date: ${buildNumber}</pubdate> - -  </bookinfo>

15 years, 1 month

1
0
0 / 0

JBoss-OSGI SVN: r89679 - in projects/jboss-osgi/trunk: bundles/common/src/main/java/org/jboss/osgi/common and 6 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-06-02 12:41:48 -0400 (Tue, 02 Jun 2009) New Revision: 89679 Added: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/DeployerServiceDelegate.java Removed: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/ Modified: projects/jboss-osgi/trunk/bundles/common/pom.xml projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/AbstractCommonServicesActivator.java projects/jboss-osgi/trunk/bundles/hotdeploy/pom.xml projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerImpl.java projects/jboss-osgi/trunk/bundles/jmx/pom.xml projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml projects/jboss-osgi/trunk/docbook/en/modules/ch03-framework-integration.xml Log: More userguide - WIP Modified: projects/jboss-osgi/trunk/bundles/common/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/common/pom.xml 2009-06-02 16:35:11 UTC (rev 89678) +++ projects/jboss-osgi/trunk/bundles/common/pom.xml 2009-06-02 16:41:48 UTC (rev 89679) @@ -53,7 +53,6 @@ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> <Bundle-Activator>org.jboss.osgi.common.internal.CommonServicesActivator</Bundle-Activator> <Export-Package> - org.jboss.osgi.common.service;version=${version}, org.jboss.osgi.common.log;version=${version} </Export-Package> <Private-Package> Modified: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/AbstractCommonServicesActivator.java =================================================================== --- projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/AbstractCommonServicesActivator.java 2009-06-02 16:35:11 UTC (rev 89678) +++ projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/AbstractCommonServicesActivator.java 2009-06-02 16:41:48 UTC (rev 89679) @@ -29,7 +29,6 @@ import javax.management.MBeanServer; import javax.management.StandardMBean; -import org.jboss.osgi.common.service.DeployerServiceDelegate; import org.jboss.osgi.spi.service.DeployerService; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; Copied: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/DeployerServiceDelegate.java (from rev 89672, projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/DeployerServiceDelegate.java) =================================================================== --- projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/DeployerServiceDelegate.java (rev 0) +++ projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/DeployerServiceDelegate.java 2009-06-02 16:41:48 UTC (rev 89679) @@ -0,0 +1,137 @@ +/* + * 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 org.jboss.osgi.common.internal; + +//$Id$ + +import java.net.URL; + +import org.jboss.osgi.spi.service.BundleInfo; +import org.jboss.osgi.spi.service.DeployerService; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceReference; + +/** + * A {@link DeployerService} that delegates to the service that is tracked by the given {@link DeployerServiceTracker} + * + * This delegate is registered as an MBean + * + * @author thomas.diesler(a)jboss.com + * @since 27-May-2009 + */ +public class DeployerServiceDelegate implements DeployerService +{ + private BundleContext context; + + public DeployerServiceDelegate(BundleContext context) + { + this.context = context; + } + + public void deploy(BundleInfo[] bundles) throws BundleException + { + DeployerService service = getDefaultDeployerService(); + service.deploy(bundles); + } + + public void deploy(URL url) throws BundleException + { + DeployerService service = getDefaultDeployerService(); + service.deploy(url); + } + + public void undeploy(BundleInfo[] bundles) throws BundleException + { + for (BundleInfo info : bundles) + undeploy(info.getLocation()); + } + + public boolean undeploy(URL url) throws BundleException + { + boolean undeployed = false; + + DeployerService service = getMicrocontainerDeployerService(); + if (service != null) + undeployed = service.undeploy(url); + + if (undeployed == false) + { + service = getSystemDeployerService(); + undeployed = service.undeploy(url); + } + + return undeployed; + } + + private DeployerService getDefaultDeployerService() + { + // First try the MC provider + DeployerService service = getMicrocontainerDeployerService(); + + // Fall back to the system provider + if (service == null) + service = getSystemDeployerService(); + + return service; + } + + private DeployerService getMicrocontainerDeployerService() + { + DeployerService service = null; + try + { + String filter = "(provider=microcontainer)"; + String serviceName = DeployerService.class.getName(); + ServiceReference[] srefs = context.getServiceReferences(serviceName, filter); + if (srefs != null) + service = (DeployerService)context.getService(srefs[0]); + } + catch (InvalidSyntaxException ex) + { + throw new IllegalArgumentException(ex); + } + return service; + } + + private DeployerService getSystemDeployerService() + { + DeployerService service = null; + try + { + String filter = "(provider=system)"; + String serviceName = DeployerService.class.getName(); + ServiceReference[] srefs = context.getServiceReferences(serviceName, filter); + if (srefs != null) + service = (DeployerService)context.getService(srefs[0]); + } + catch (InvalidSyntaxException ex) + { + throw new IllegalArgumentException(ex); + } + + if (service == null) + throw new IllegalStateException("Cannot obtain system DeployerService"); + return service; + } +} \ No newline at end of file Modified: projects/jboss-osgi/trunk/bundles/hotdeploy/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/hotdeploy/pom.xml 2009-06-02 16:35:11 UTC (rev 89678) +++ projects/jboss-osgi/trunk/bundles/hotdeploy/pom.xml 2009-06-02 16:41:48 UTC (rev 89679) @@ -59,7 +59,6 @@ <Import-Package> javax.management, org.jboss.osgi.common.log;version="1.0", - org.jboss.osgi.common.service;version="1.0", org.jboss.osgi.spi.service;version="1.0", org.osgi.framework, org.osgi.service.log, Modified: projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerImpl.java =================================================================== --- projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerImpl.java 2009-06-02 16:35:11 UTC (rev 89678) +++ projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerImpl.java 2009-06-02 16:41:48 UTC (rev 89679) @@ -109,7 +109,9 @@ public void scan() { - for (ScanListener listener : listeners) + // Use a copy so listeners can remove themselves from within the callback + List<ScanListener> listenerArr = new ArrayList<ScanListener>(listeners); + for (ScanListener listener : listenerArr) listener.beforeScan(this); List<BundleInfo> currScan = Arrays.asList(getBundles()); @@ -124,7 +126,7 @@ lastScan = currScan; scanCount++; - for (ScanListener listener : listeners) + for (ScanListener listener : listenerArr) listener.afterScan(this); } Modified: projects/jboss-osgi/trunk/bundles/jmx/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/jmx/pom.xml 2009-06-02 16:35:11 UTC (rev 89678) +++ projects/jboss-osgi/trunk/bundles/jmx/pom.xml 2009-06-02 16:41:48 UTC (rev 89679) @@ -68,7 +68,6 @@  org.jboss.osgi.common.log;version="1.0", - org.jboss.osgi.common.service;version="1.0", org.jboss.osgi.spi.management;version="1.0",  Modified: projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml 2009-06-02 16:35:11 UTC (rev 89678) +++ projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml 2009-06-02 16:41:48 UTC (rev 89679) @@ -110,7 +110,6 @@ org.jboss.joinpoint.*, org.jboss.logging, org.jboss.osgi.common.log;version="1.0", - org.jboss.osgi.common.service;version="1.0", org.jboss.osgi.spi;version="1.0", org.jboss.osgi.spi.management;version="1.0", org.jboss.reflect.*, Modified: projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml 2009-06-02 16:35:11 UTC (rev 89678) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml 2009-06-02 16:41:48 UTC (rev 89679) @@ -16,14 +16,12 @@ <para>To run the installer execute the following command:</para> -  <programlisting> java -jar jboss-osgi-installer-1.0.0.Beta2.jar </programlisting> <para>The installer first shows a welcome screen</para> -  <mediaobject> <imageobject> <imagedata fileref="images/izpack-welcome.png"/> @@ -107,39 +105,39 @@ </imageobject> </mediaobject> +  <para>The JBossOSGi Runtime is ... [TODO]</para> <programlisting> -[tdiesler@tddell runtime]$ bin/run.sh -========================================================================= - - JBossOSGi Bootstrap Environment - - OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta2/runtime - - JAVA: /usr/java/jdk1.6/bin/java - - JAVA_OPTS: ... - -========================================================================= - -16:18:32,974 INFO [FelixIntegration] OSGi Integration Felix - 1.0.0.Beta2 -16:18:33,403 INFO [FelixIntegration] Installed bundle [1]: org.osgi.compendium -16:18:33,412 INFO [FelixIntegration] Installed bundle [2]: org.apache.felix.log -16:18:33,425 INFO [FelixIntegration] Installed bundle [3]: jboss-osgi-common -16:18:33,435 INFO [FelixIntegration] Installed bundle [4]: jboss-osgi-hotdeploy -16:18:33,550 INFO [jboss-osgi-hotdeploy] Start DeploymentScanner: [scandir=server/default/bundles,interval=2000ms] -16:18:33,555 INFO [OSGiBootstrap] JBossOSGi Runtime booted in 0.581sec -... -16:18:33,617 INFO [jboss-osgi-common] Installed: jboss-osgi-jndi [5] -16:18:33,627 INFO [jboss-osgi-common] Installed: jboss-osgi-jmx [6] -16:18:33,659 INFO [jboss-osgi-common] Installed: jboss-osgi-common-core [7] -... -16:18:34,170 INFO [jboss-osgi-jndi] JNDI started: JNP=localhost:1099, RMI=localhost:1098 -16:18:34,401 INFO [jboss-osgi-jmx] JMXConnectorServer started: service:jmx:rmi://localhost/jndi/rmi://localhost:1098/jmxconnector -16:18:34,543 INFO [jboss-osgi-jmx] MBeanServerConnection bound to: jmx/invoker/RMIAdaptor -... -16:18:34,544 INFO [OSGiBootstrap] JBossOSGi Runtime started in 1.57sec + [tdiesler@tddell runtime]$ bin/run.sh + ========================================================================= + + JBossOSGi Bootstrap Environment + + OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta2/runtime + + JAVA: /usr/java/jdk1.6/bin/java + + JAVA_OPTS: ... + + ========================================================================= + + 16:18:32,974 INFO [FelixIntegration] OSGi Integration Felix - 1.0.0.Beta2 + 16:18:33,403 INFO [FelixIntegration] Installed bundle [1]: org.osgi.compendium + 16:18:33,412 INFO [FelixIntegration] Installed bundle [2]: org.apache.felix.log + 16:18:33,425 INFO [FelixIntegration] Installed bundle [3]: jboss-osgi-common + 16:18:33,435 INFO [FelixIntegration] Installed bundle [4]: jboss-osgi-hotdeploy + 16:18:33,550 INFO [jboss-osgi-hotdeploy] Start DeploymentScanner: [scandir=server/default/bundles,interval=2000ms] + 16:18:33,555 INFO [OSGiBootstrap] JBossOSGi Runtime booted in 0.581sec + ... + 16:18:33,617 INFO [jboss-osgi-common] Installed: jboss-osgi-jndi [5] + 16:18:33,627 INFO [jboss-osgi-common] Installed: jboss-osgi-jmx [6] + 16:18:33,659 INFO [jboss-osgi-common] Installed: jboss-osgi-common-core [7] + ... + 16:18:34,170 INFO [jboss-osgi-jndi] JNDI started: JNP=localhost:1099, RMI=localhost:1098 + 16:18:34,543 INFO [jboss-osgi-jmx] MBeanServerConnection bound to: jmx/invoker/RMIAdaptor + ... + 16:18:34,544 INFO [OSGiBootstrap] JBossOSGi Runtime started in 1.57sec </programlisting> <emphasis role="bold">Provided Examples</emphasis> @@ -150,7 +148,9 @@ <itemizedlist> <listitem><emphasis role="bold">HTTP Service</emphasis> - Register servlets and resources with the HTTP Service</listitem> <listitem><emphasis role="bold">Log Service</emphasis> - Interact with a local and remote Log Service</listitem> - <listitem><emphasis role="bold">Microcontainer Service</emphasis> - Register an MBean through the Microcontainer</listitem> + <listitem><emphasis role="bold">JMX Service</emphasis> - Register an MBean through the MBeanServer service</listitem> + <listitem><emphasis role="bold">JNDI Service</emphasis> - Bind/Unbind objects to/from JNDI</listitem> + <listitem><emphasis role="bold">Microcontainer Service</emphasis> - Call a service from an MC bean</listitem> </itemizedlist> <programlisting> @@ -160,22 +160,33 @@ [INFO] task-segment: [package] [INFO] ------------------------------------------------------------------------ ... - build-example-jars: + build-test-jars: + # example-http (example-http.jar) 4 + # example-jmx (example-jmx.jar) 4 + # example-jndi (example-jndi.jar) 1 # example-log (example-log.jar) 2 - # example-http (example-http.jar) 4 - # example-microcontainer (example-microcontainer.jar) 4 + # example-mcservice-bundleA (example-mcservice-bundleA.jar) 2 + # example-mcservice-bundleB (example-mcservice-bundleB.jar) 3 ... + Running org.jboss.test.osgi.example.microcontainer.MicrocontainerTestCase + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.418 sec + Running org.jboss.test.osgi.example.http.HttpServiceTestCase + Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.476 sec Running org.jboss.test.osgi.example.log.LogServiceTestCase - Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.849 sec + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.312 sec + Running org.jboss.test.osgi.example.jndi.JNDITestCase + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.231 sec + Running org.jboss.test.osgi.example.jmx.JMXTestCase + Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.517 sec </programlisting> <emphasis role="bold">Bundle Deployment</emphasis> <para>Bundle deployment works, as you would probably expect, by dropping your OSGi Bundle into the - JBossOSGi Runtime <emphasis role="bold">deploy</emphasis> folder.</para> + JBossOSGi Runtime <emphasis role="bold">bundles</emphasis> folder.</para> <programlisting> - [tdiesler@tdvaio testsuite]$ cp .../test-libs/example/example-http.jar .../runtime/server/default/deploy + [tdiesler@tdvaio testsuite]$ cp .../test-libs/example/example-http.jar .../runtime/server/web/bundles ... 13:59:38,284 INFO [BundleRealDeployer] Installed: example-http [9] 13:59:38,289 INFO [example-http] BundleEvent INSTALLED Modified: projects/jboss-osgi/trunk/docbook/en/modules/ch03-framework-integration.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch03-framework-integration.xml 2009-06-02 16:35:11 UTC (rev 89678) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch03-framework-integration.xml 2009-06-02 16:41:48 UTC (rev 89679) @@ -17,10 +17,39 @@ <listitem><ulink url="http://felix.apache.org/site/apache-felix-configuration-admin-service.html">Config Admin Service</ulink> - Management of configuration data for configurable components</listitem> </itemizedlist> - <para>The Apache Felix integration can be configured through a <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> beans - configuration</para> + <para>The Apache Felix integration can be configured through properties in the <link linkend="SecRuntime">JBossOSGi Runtime</link>. + </para> <programlisting role="XML"><![CDATA[ + cat conf/jboss-osgi-framework.properties + + # The OSGiFramework implementation + org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration + + # Properties to configure the Framework + org.osgi.framework.storage=${osgi.server.home}/data/osgi-store + org.osgi.framework.storage.clean=onFirstInit + + # Hot Deployement + org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/bundles + + ... + + # Bundles that need to be installed with the Framework automatically + org.jboss.osgi.spi.framework.autoInstall=\ + file://${osgi.home}/server/minimal/bundles/org.osgi.compendium.jar + + # Bundles that need to be started automatically + org.jboss.osgi.spi.framework.autoStart=\ + file://${osgi.home}/server/minimal/bundles/org.apache.felix.log.jar \ + file://${osgi.home}/server/minimal/bundles/jboss-osgi-common.jar \ + file://${osgi.home}/server/minimal/bundles/jboss-osgi-hotdeploy.jar + ]]></programlisting> + + <para>In the <ulink url="http://www.jboss.org/jbossas">JBossAS</ulink> integration we use + <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> beans configuration.</para> + + <programlisting role="XML"><![CDATA[ cat server/default/deployers/osgi.deployer/META-INF/osgi-deployers-jboss-beans.xml <deployment xmlns="urn:jboss:bean-deployer:2.0"> @@ -65,7 +94,7 @@ <td>Config Admin Service storage area</td> </tr> <tr valign="top"> - <td>org.osgi.framework.system.packages</td> + <td>org.osgi.framework.system.packages.extra</td> <td>javax.management, javax.xml...</td> <td>Packages provided by the OSGi System ClassLoader</td> </tr> @@ -82,10 +111,38 @@ <para>JBossOSGi also provides basic integration for the <ulink url="http://www.eclipse.org/equinox">Eclpipse Equinox</ulink> OSGi Framework.</para> - <para>Equinox integration can be configured through a <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> beans - configuration</para> + <para>Equinox integration can be configured through properties in the <link linkend="SecRuntime">JBossOSGi Runtime</link>.</para> <programlisting role="XML"><![CDATA[ + cat conf/jboss-osgi-framework.properties + + # The OSGiFramework implementation + org.jboss.osgi.spi.framework.impl=org.jboss.osgi.equinox.framework.EquinoxIntegration + + # Properties to configure the Framework + org.osgi.framework.storage=${osgi.server.home}/data/osgi-store + org.osgi.framework.storage.clean=onFirstInit + + # Hot Deployement + org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/bundles + + ... + + # Bundles that need to be installed with the Framework automatically + org.jboss.osgi.spi.framework.autoInstall=\ + file://${osgi.home}/server/minimal/bundles/org.osgi.compendium.jar + + # Bundles that need to be started automatically + org.jboss.osgi.spi.framework.autoStart=\ + file://${osgi.home}/server/minimal/bundles/org.apache.felix.log.jar \ + file://${osgi.home}/server/minimal/bundles/jboss-osgi-common.jar \ + file://${osgi.home}/server/minimal/bundles/jboss-osgi-hotdeploy.jar + ]]></programlisting> + + <para>In the <ulink url="http://www.jboss.org/jbossas">JBossAS</ulink> integration we use + <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> beans configuration.</para> + + <programlisting role="XML"><![CDATA[ <deployment xmlns="urn:jboss:bean-deployer:2.0">  @@ -110,10 +167,38 @@ <para>JBossOSGi provides basic integration for the <ulink url="http://www.knopflerfish.org">Makewave Knopflerfish</ulink> OSGi Framework.</para> - <para>Knopflerfish integration can be configured through a <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> beans - configuration</para> + <para>Knopflerfish integration can be configured through properties in the <link linkend="SecRuntime">JBossOSGi Runtime</link>.</para> <programlisting role="XML"><![CDATA[ + cat conf/jboss-osgi-framework.properties + + # The OSGiFramework implementation + org.jboss.osgi.spi.framework.impl=org.jboss.osgi.knopflerfish.framework.KnopflerfishIntegration + + # Properties to configure the Framework + org.osgi.framework.storage=${osgi.server.home}/data/osgi-store + org.osgi.framework.storage.clean=onFirstInit + + # Hot Deployement + org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/bundles + + ... + + # Bundles that need to be installed with the Framework automatically + org.jboss.osgi.spi.framework.autoInstall=\ + file://${osgi.home}/server/minimal/bundles/org.osgi.compendium.jar + + # Bundles that need to be started automatically + org.jboss.osgi.spi.framework.autoStart=\ + file://${osgi.home}/server/minimal/bundles/org.apache.felix.log.jar \ + file://${osgi.home}/server/minimal/bundles/jboss-osgi-common.jar \ + file://${osgi.home}/server/minimal/bundles/jboss-osgi-hotdeploy.jar + ]]></programlisting> + + <para>In the <ulink url="http://www.jboss.org/jbossas">JBossAS</ulink> integration we use + <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> beans configuration.</para> + + <programlisting role="XML"><![CDATA[ <deployment xmlns="urn:jboss:bean-deployer:2.0">

15 years, 1 month

1
0
0 / 0

JBoss-OSGI SVN: r89677 - in projects/jboss-osgi/trunk/testsuite/example/src/test: java/org/jboss/test/osgi/example/jmx and 3 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-06-02 12:10:01 -0400 (Tue, 02 Jun 2009) New Revision: 89677 Added: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/FooServiceActivator.java Removed: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/JMXTestService.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/ServiceActivator.java Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/FooMBean.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jmx/example-jmx.bnd Log: Simplify example tests Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-06-02 16:03:12 UTC (rev 89676) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-06-02 16:10:01 UTC (rev 89677) @@ -33,7 +33,6 @@ import org.jboss.osgi.spi.capability.HttpCapability; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.spi.testing.OSGiTestHelper; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -45,10 +44,10 @@ * @author thomas.diesler(a)jboss.com * @since 23-Jan-2009 */ -public class HttpServiceTestCase extends OSGiTest +public class HttpServiceTestCase { private static OSGiRuntime runtime; - private static OSGiBundle testBundle; + private static OSGiBundle bundle; @BeforeClass public static void setUpClass() throws Exception @@ -59,14 +58,16 @@ Thread.sleep(5000); - testBundle = runtime.installBundle("example-http.jar"); - testBundle.start(); + bundle = runtime.installBundle("example-http.jar"); + bundle.start(); } @AfterClass public static void tearDownClass() throws Exception { - testBundle.uninstall(); + if (bundle != null) + bundle.uninstall(); + runtime.shutdown(); } Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2009-06-02 16:03:12 UTC (rev 89676) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2009-06-02 16:10:01 UTC (rev 89677) @@ -23,16 +23,14 @@ //$Id$ +import static org.jboss.test.osgi.example.jmx.bundle.FooMBean.MBEAN_NAME; import static org.junit.Assert.assertEquals; -import javax.management.ObjectName; - import org.jboss.osgi.spi.capability.JMXCapability; import org.jboss.osgi.spi.capability.JNDICapability; import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.spi.testing.OSGiTestHelper; import org.jboss.test.osgi.example.jmx.bundle.FooMBean; import org.junit.AfterClass; @@ -45,7 +43,7 @@ * @author thomas.diesler(a)jboss.com * @since 12-Feb-2009 */ -public class JMXTestCase extends OSGiTest +public class JMXTestCase { private static OSGiRuntime runtime; private static OSGiBundle bundle; @@ -64,15 +62,16 @@ @AfterClass public static void tearDownClass() throws Exception { - bundle.uninstall(); + if (bundle != null) + bundle.uninstall(); + runtime.shutdown(); } @Test public void testMBeanAccess() throws Exception { - ObjectName oname = new ObjectName("jboss.osgi:service=mbean-test-service"); - FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, oname, runtime.getMBeanServer()); + FooMBean foo = (FooMBean)MBeanProxy.get(FooMBean.class, MBEAN_NAME, runtime.getMBeanServer()); assertEquals("hello", foo.echo("hello")); } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/FooMBean.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/FooMBean.java 2009-06-02 16:03:12 UTC (rev 89676) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/FooMBean.java 2009-06-02 16:10:01 UTC (rev 89677) @@ -21,9 +21,15 @@ */ package org.jboss.test.osgi.example.jmx.bundle; +import javax.management.ObjectName; + +import org.jboss.osgi.spi.management.ObjectNameFactory; + //$Id$ public interface FooMBean { - String echo(String msg); + ObjectName MBEAN_NAME = ObjectNameFactory.create("jboss.osgi:service=mbean-test-service"); + + String echo(String msg); } Copied: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/FooServiceActivator.java (from rev 89672, projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/ServiceActivator.java) =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/FooServiceActivator.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/FooServiceActivator.java 2009-06-02 16:10:01 UTC (rev 89677) @@ -0,0 +1,99 @@ +/* + * 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 org.jboss.test.osgi.example.jmx.bundle; + +//$Id$ + +import static org.jboss.test.osgi.example.jmx.bundle.FooMBean.MBEAN_NAME; + +import javax.management.JMException; +import javax.management.MBeanServer; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.util.tracker.ServiceTracker; + +/** + * A Service Activator + * + * @author thomas.diesler(a)jboss.com + * @since 24-Apr-2009 + */ +public class FooServiceActivator implements BundleActivator +{ + public void start(BundleContext context) + { + ServiceTracker tracker = new ServiceTracker(context, MBeanServer.class.getName(), null) + { + public Object addingService(ServiceReference reference) + { + MBeanServer mbeanServer = (MBeanServer)super.addingService(reference); + registerMBean(mbeanServer); + return mbeanServer; + } + + @Override + public void removedService(ServiceReference reference, Object service) + { + unregisterMBean((MBeanServer)service); + super.removedService(reference, service); + } + }; + tracker.open(); + } + + public void stop(BundleContext context) + { + ServiceReference sref = context.getServiceReference(MBeanServer.class.getName()); + if (sref != null) + { + MBeanServer mbeanServer = (MBeanServer)context.getService(sref); + unregisterMBean(mbeanServer); + } + } + + private void registerMBean(MBeanServer mbeanServer) + { + try + { + mbeanServer.registerMBean(new Foo(), MBEAN_NAME); + } + catch (JMException ex) + { + throw new IllegalStateException(ex); + } + } + + private void unregisterMBean(MBeanServer mbeanServer) + { + try + { + if (mbeanServer.isRegistered(MBEAN_NAME)) + mbeanServer.unregisterMBean(MBEAN_NAME); + } + catch (JMException ex) + { + throw new IllegalStateException(ex); + } + } +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/JMXTestService.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/JMXTestService.java 2009-06-02 16:03:12 UTC (rev 89676) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/JMXTestService.java 2009-06-02 16:10:01 UTC (rev 89677) @@ -1,85 +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 org.jboss.test.osgi.example.jmx.bundle; - -//$Id$ - -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import org.jboss.osgi.spi.management.ObjectNameFactory; -import org.osgi.framework.BundleContext; -import org.osgi.util.tracker.ServiceTracker; - -/** - * A service that registers an MBean - * - * @author thomas.diesler(a)jboss.com - * @since 24-Apr-2009 - */ -public class JMXTestService -{ - private ServiceTracker tracker; - private ObjectName objectName = ObjectNameFactory.create("jboss.osgi:service=mbean-test-service"); - - public JMXTestService(BundleContext context) - { - tracker = new ServiceTracker(context, MBeanServer.class.getName(), null); - tracker.open(); - - MBeanServer mbeanServer = getMBeanServer(); - if (mbeanServer == null) - throw new IllegalStateException("No MBeanServer"); - } - - public void start() - { - try - { - MBeanServer mbeanServer = getMBeanServer(); - mbeanServer.registerMBean(new Foo(), objectName); - } - catch (Exception ex) - { - throw new IllegalStateException(ex); - } - } - - public void stop() - { - try - { - MBeanServer mbeanServer = getMBeanServer(); - mbeanServer.isRegistered(objectName); - mbeanServer.unregisterMBean(objectName); - } - catch (Exception ex) - { - throw new IllegalStateException(ex); - } - } - - private MBeanServer getMBeanServer() - { - return (MBeanServer)tracker.getService(); - } -} Deleted: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/ServiceActivator.java 2009-06-02 16:03:12 UTC (rev 89676) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/bundle/ServiceActivator.java 2009-06-02 16:10:01 UTC (rev 89677) @@ -1,55 +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 org.jboss.test.osgi.example.jmx.bundle; - -//$Id$ - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -/** - * A Service Activator - * - * @author thomas.diesler(a)jboss.com - * @since 24-Apr-2009 - */ -public class ServiceActivator implements BundleActivator -{ - private JMXTestService service; - - public void start(BundleContext context) - { - service = new JMXTestService(context); - service.start(); - - context.registerService(JMXTestService.class.getName(), service, null); - } - - public void stop(BundleContext context) - { - if (service != null) - { - service.stop(); - service = null; - } - } -} \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java 2009-06-02 16:03:12 UTC (rev 89676) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java 2009-06-02 16:10:01 UTC (rev 89677) @@ -32,7 +32,6 @@ import org.jboss.osgi.spi.capability.JNDICapability; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.spi.testing.OSGiTestHelper; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -45,7 +44,7 @@ * @author thomas.diesler(a)jboss.com * @since 05-May-2009 */ -public class JNDITestCase extends OSGiTest +public class JNDITestCase { private static OSGiRuntime runtime; Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jmx/example-jmx.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jmx/example-jmx.bnd 2009-06-02 16:03:12 UTC (rev 89676) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jmx/example-jmx.bnd 2009-06-02 16:10:01 UTC (rev 89677) @@ -1,5 +1,5 @@ # bnd build -classpath target/test-classes -output target/test-libs/example-jmx.jar src/test/resources/jmx/example-jmx.bnd Bundle-SymbolicName: example-jmx -Bundle-Activator: org.jboss.test.osgi.example.jmx.bundle.ServiceActivator +Bundle-Activator: org.jboss.test.osgi.example.jmx.bundle.FooServiceActivator Export-Package: org.jboss.test.osgi.example.jmx.bundle

15 years, 1 month

1
0
0 / 0

JBoss-OSGI SVN: r89670 - in projects/jboss-osgi/trunk: bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal and 6 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-06-02 10:40:32 -0400 (Tue, 02 Jun 2009) New Revision: 89670 Added: projects/jboss-osgi/trunk/docbook/en/images/izpack-packs.png projects/jboss-osgi/trunk/docbook/en/images/izpack-target-container.png projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/DeploymentScannerService.java Removed: projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/DeploymentScannerService.java projects/jboss-osgi/trunk/docbook/en/images/izpack-packs.jpg projects/jboss-osgi/trunk/docbook/en/images/izpack-target-server.png Modified: projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerActivator.java projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerImpl.java projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/ScannerThread.java projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java projects/jboss-osgi/trunk/distribution/src/main/resources/installer/user-input-spec.xml projects/jboss-osgi/trunk/docbook/en/images/izpack-done.png projects/jboss-osgi/trunk/docbook/en/images/izpack-installpath.png projects/jboss-osgi/trunk/docbook/en/images/izpack-structure.jpg projects/jboss-osgi/trunk/docbook/en/images/izpack-verify.png projects/jboss-osgi/trunk/docbook/en/images/izpack-welcome.png projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java Log: Start work on Beta2 user guide Deleted: projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/DeploymentScannerService.java =================================================================== --- projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/DeploymentScannerService.java 2009-06-02 14:29:41 UTC (rev 89669) +++ projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/DeploymentScannerService.java 2009-06-02 14:40:32 UTC (rev 89670) @@ -1,76 +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 org.jboss.osgi.service.hotdeploy; - -//$Id$ - -import java.net.URL; - -import org.jboss.osgi.spi.service.BundleInfo; - - -/** - * A service that scans a directory location for new/removed bundles. - * - * @author thomas.diesler(a)jboss.com - * @since 27-May-2009 - */ -public interface DeploymentScannerService -{ - /** - * The property that names the scan location: org.jboss.osgi.hotdeploy.scandir - */ - String PROPERTY_SCAN_LOCATION = "org.jboss.osgi.hotdeploy.scandir"; - - /** - * The property to defines the scan interval: org.jboss.osgi.hotdeploy.interval - */ - String PROPERTY_SCAN_INTERVAL = "org.jboss.osgi.hotdeploy.interval"; - - /** - * Get the scan location URL. - * - * This is can be specified by setting the {@link PROPERTY_SCAN_LOCATION} property. - */ - URL getScanLocation(); - - /** - * The number of scans since the service started - */ - long getScanCount(); - - /** - * The number of milliseconds between scans - * Defaults to 2000ms - */ - long getScanInterval(); - - /** - * Run a directory scan - */ - void scan(); - - /** - * Returns the array of bundles currently known to the deployemtn scanner. - */ - BundleInfo[] getBundles(); -} \ No newline at end of file Modified: projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerActivator.java =================================================================== --- projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerActivator.java 2009-06-02 14:29:41 UTC (rev 89669) +++ projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerActivator.java 2009-06-02 14:40:32 UTC (rev 89670) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.osgi.service.hotdeploy.DeploymentScannerService; +import org.jboss.osgi.spi.service.DeploymentScannerService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerImpl.java =================================================================== --- projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerImpl.java 2009-06-02 14:29:41 UTC (rev 89669) +++ projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerImpl.java 2009-06-02 14:40:32 UTC (rev 89670) @@ -29,15 +29,17 @@ import java.net.URL; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; import java.util.jar.Attributes; import java.util.jar.JarFile; import java.util.jar.Manifest; import org.jboss.osgi.common.log.LogServiceTracker; -import org.jboss.osgi.service.hotdeploy.DeploymentScannerService; import org.jboss.osgi.spi.service.BundleInfo; import org.jboss.osgi.spi.service.DeployerService; +import org.jboss.osgi.spi.service.DeploymentScannerService; import org.jboss.osgi.spi.service.BundleInfo.State; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -63,6 +65,7 @@ private DeployerService deployer; private ScannerThread scannerThread; private List<BundleInfo> lastScan = new ArrayList<BundleInfo>(); + private Set<ScanListener> listeners = new LinkedHashSet<ScanListener>(); private boolean traceBundles = false; public DeploymentScannerImpl(BundleContext context) @@ -94,8 +97,21 @@ } } + public void addScanListener(ScanListener listener) + { + listeners.add(listener); + } + + public void removeScanListener(ScanListener listener) + { + listeners.remove(listener); + } + public void scan() { + for (ScanListener listener : listeners) + listener.beforeScan(this); + List<BundleInfo> currScan = Arrays.asList(getBundles()); if (traceBundles) @@ -107,6 +123,9 @@ lastScan = currScan; scanCount++; + + for (ScanListener listener : listeners) + listener.afterScan(this); } private void logBundleInfos(String message, List<BundleInfo> bundleInfos) Modified: projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/ScannerThread.java =================================================================== --- projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/ScannerThread.java 2009-06-02 14:29:41 UTC (rev 89669) +++ projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/ScannerThread.java 2009-06-02 14:40:32 UTC (rev 89670) @@ -24,7 +24,7 @@ //$Id$ import org.jboss.osgi.common.log.LogServiceTracker; -import org.jboss.osgi.service.hotdeploy.DeploymentScannerService; +import org.jboss.osgi.spi.service.DeploymentScannerService; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; Modified: projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java =================================================================== --- projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java 2009-06-02 14:29:41 UTC (rev 89669) +++ projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java 2009-06-02 14:40:32 UTC (rev 89670) @@ -106,7 +106,7 @@ jmxConnectorServer.start(); - log.log(LogService.LOG_INFO, "JMXConnectorServer started: " + serviceURL); + log.log(LogService.LOG_DEBUG, "JMXConnectorServer started: " + serviceURL); } catch (IOException ex) { Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/user-input-spec.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/user-input-spec.xml 2009-06-02 14:29:41 UTC (rev 89669) +++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/user-input-spec.xml 2009-06-02 14:40:32 UTC (rev 89670) @@ -12,7 +12,7 @@ <panel order="1"> <createForPack name="JBossOSGi Integration" /> <field type="radio" variable="jbossSelection"> - <description align="left" txt="Please choose your target server" /> + <description align="left" txt="Please choose your target container" /> <spec> <choice txt="JBoss-5.0.1" value="jboss501" set="true"/> <choice txt="JBoss-5.1.0" value="jboss510"/> Modified: projects/jboss-osgi/trunk/docbook/en/images/izpack-done.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/docbook/en/images/izpack-installpath.png =================================================================== (Binary files differ) Deleted: projects/jboss-osgi/trunk/docbook/en/images/izpack-packs.jpg =================================================================== (Binary files differ) Added: projects/jboss-osgi/trunk/docbook/en/images/izpack-packs.png =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/trunk/docbook/en/images/izpack-packs.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: projects/jboss-osgi/trunk/docbook/en/images/izpack-structure.jpg =================================================================== (Binary files differ) Added: projects/jboss-osgi/trunk/docbook/en/images/izpack-target-container.png =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/trunk/docbook/en/images/izpack-target-container.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: projects/jboss-osgi/trunk/docbook/en/images/izpack-target-server.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/docbook/en/images/izpack-verify.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/docbook/en/images/izpack-welcome.png =================================================================== (Binary files differ) Modified: projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml =================================================================== --- projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml 2009-06-02 14:29:41 UTC (rev 89669) +++ projects/jboss-osgi/trunk/docbook/en/modules/ch02-getting-started.xml 2009-06-02 14:40:32 UTC (rev 89670) @@ -18,7 +18,7 @@  <programlisting> - java -jar jboss-osgi-installer-1.0.0.Beta1.jar + java -jar jboss-osgi-installer-1.0.0.Beta2.jar </programlisting> <para>The installer first shows a welcome screen</para> @@ -43,7 +43,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/izpack-packs.jpg"/> + <imagedata fileref="images/izpack-packs.png"/> </imageobject> </mediaobject> @@ -65,7 +65,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/izpack-target-server.png"/> + <imagedata fileref="images/izpack-target-container.png"/> </imageobject> </mediaobject> @@ -107,37 +107,39 @@ </imageobject> </mediaobject> - <para>The JBossOSGi Runtime is a customized version of the <ulink url="http://www.jboss.org/jbossas">JBoss Application Server</ulink>. From that we removed the services - that are not absolutely necessary to run the installed OSGi Framework. Consequently, you can start the JBossOSGi Runtime in the same - way as you start <ulink url="http://www.jboss.org/jbossas">JBossAS</ulink></para> + <para>The JBossOSGi Runtime is ... [TODO]</para> <programlisting> - [tdiesler@tdvaio runtime]$ bin/run.sh - ========================================================================= - - JBoss Bootstrap Environment - - JBOSS_HOME: /usr/java/jboss-osgi-1.0.0.Beta1/runtime - - ... - - ========================================================================= - - 14:43:43,598 INFO [ServerImpl] Starting JBoss (Microcontainer)... - ... - 14:43:52,298 INFO [FelixIntegration] OSGi Integration Felix - 1.0.0.Beta1 - 14:43:52,692 INFO [FelixIntegration] Installed bundle: org.osgi.compendium - 14:43:52,700 INFO [FelixIntegration] Installed bundle: org.jboss.osgi.service.logging - 14:43:52,701 INFO [FelixIntegration] Started bundle: org.osgi.compendium - 14:43:52,766 INFO [FelixIntegration] Started bundle: org.jboss.osgi.service.logging - 14:43:53,290 INFO [OSGiDeployer] Installed: jboss-osgi-service-webconsole [3][INSTALLED] - 14:43:53,297 INFO [OSGiDeployer] Installed: org.apache.felix.bundlerepository [4][INSTALLED] - 14:43:53,308 INFO [OSGiDeployer] Installed: org.apache.felix.configadmin [5][INSTALLED] - 14:43:53,322 INFO [OSGiDeployer] Installed: org.apache.felix.http.jetty [6][INSTALLED] - 14:43:53,328 INFO [OSGiDeployer] Installed: org.apache.felix.log [7][INSTALLED] - 14:43:53,333 INFO [OSGiDeployer] Installed: org.apache.felix.metatype [8][INSTALLED] - ... - 14:43:55,250 INFO [ServerImpl] JBoss (Microcontainer) [5.0.1.GA ...] <emphasis role="bold">Started in 11s:645ms</emphasis> +[tdiesler@tddell runtime]$ bin/run.sh +========================================================================= + + JBossOSGi Bootstrap Environment + + OSGI_HOME: /home/tdiesler/jboss-osgi-1.0.0.Beta2/runtime + + JAVA: /usr/java/jdk1.6/bin/java + + JAVA_OPTS: ... + +========================================================================= + +16:18:32,974 INFO [FelixIntegration] OSGi Integration Felix - 1.0.0.Beta2 +16:18:33,403 INFO [FelixIntegration] Installed bundle [1]: org.osgi.compendium +16:18:33,412 INFO [FelixIntegration] Installed bundle [2]: org.apache.felix.log +16:18:33,425 INFO [FelixIntegration] Installed bundle [3]: jboss-osgi-common +16:18:33,435 INFO [FelixIntegration] Installed bundle [4]: jboss-osgi-hotdeploy +16:18:33,550 INFO [jboss-osgi-hotdeploy] Start DeploymentScanner: [scandir=server/default/bundles,interval=2000ms] +16:18:33,555 INFO [OSGiBootstrap] JBossOSGi Runtime booted in 0.581sec +... +16:18:33,617 INFO [jboss-osgi-common] Installed: jboss-osgi-jndi [5] +16:18:33,627 INFO [jboss-osgi-common] Installed: jboss-osgi-jmx [6] +16:18:33,659 INFO [jboss-osgi-common] Installed: jboss-osgi-common-core [7] +... +16:18:34,170 INFO [jboss-osgi-jndi] JNDI started: JNP=localhost:1099, RMI=localhost:1098 +16:18:34,401 INFO [jboss-osgi-jmx] JMXConnectorServer started: service:jmx:rmi://localhost/jndi/rmi://localhost:1098/jmxconnector +16:18:34,543 INFO [jboss-osgi-jmx] MBeanServerConnection bound to: jmx/invoker/RMIAdaptor +... +16:18:34,544 INFO [OSGiBootstrap] JBossOSGi Runtime started in 1.57sec </programlisting> <emphasis role="bold">Provided Examples</emphasis> @@ -278,7 +280,7 @@ Buildfile: build.xml init: - [echo] V1.0.0.Beta1 + [echo] V1.0.0.Beta2 init-hudson: [echo] @@ -306,7 +308,7 @@ Buildfile: build.xml init: - [echo] V1.0.0.Beta1 + [echo] V1.0.0.Beta2 init-hudson: [echo] @@ -332,7 +334,7 @@ Buildfile: build.xml init: - [echo] V1.0.0.Beta1 + [echo] V1.0.0.Beta2 init-hudson: [echo] Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java 2009-06-02 14:29:41 UTC (rev 89669) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java 2009-06-02 14:40:32 UTC (rev 89670) @@ -32,9 +32,13 @@ import java.util.Properties; import org.jboss.logging.Logger; +import org.jboss.osgi.spi.service.DeploymentScannerService; +import org.jboss.osgi.spi.service.DeploymentScannerService.ScanListener; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.Option; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; /** * The OSGiBootstrap provides an {@link OSGiFramework} through a {@link OSGiBootstrapProvider}. @@ -69,7 +73,7 @@ private String osgiHome; private String osgiServerHome; - + /* * The main entry point */ @@ -108,9 +112,9 @@ osgiHome = System.getProperty(OSGI_HOME); if (osgiHome == null) throw new IllegalStateException("Cannot obtain system property: '" + OSGI_HOME + "'"); - + osgiServerHome = osgiHome + "/server/" + serverName; - + Properties defaults = new Properties(); defaults.setProperty(OSGI_SERVER_NAME, serverName); defaults.setProperty(OSGI_SERVER_HOME, osgiServerHome); @@ -203,12 +207,38 @@ public void run() { // Start the framework - long start = System.currentTimeMillis(); + final long start = System.currentTimeMillis(); framework.start(); + + // Report how long it took to boot and do the first scan + BundleContext context = framework.getBundleContext(); + ServiceReference sref = context.getServiceReference(DeploymentScannerService.class.getName()); + if (sref != null) + { + DeploymentScannerService scannerService = (DeploymentScannerService)context.getService(sref); + ScanListener listener = new ScanListener() + { + public void beforeScan(DeploymentScannerService service) + { + // do nothing + } + + public void afterScan(DeploymentScannerService service) + { + long end = System.currentTimeMillis(); + float diff = (end - start) / 1000f; + getLogger().info("JBossOSGi Runtime started in " + diff + "sec"); + + // Remove this listener after the first scan + service.removeScanListener(this); + } + }; + scannerService.addScanListener(listener); + } + long end = System.currentTimeMillis(); - float diff = (end - start) / 1000f; - getLogger().info("JBossOSGi Runtime started in " + diff + "sec"); + getLogger().info("JBossOSGi Runtime booted in " + diff + "sec"); Reader br = new InputStreamReader(System.in); try Copied: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/DeploymentScannerService.java (from rev 89649, projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/DeploymentScannerService.java) =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/DeploymentScannerService.java (rev 0) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/DeploymentScannerService.java 2009-06-02 14:40:32 UTC (rev 89670) @@ -0,0 +1,100 @@ +/* + * 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 org.jboss.osgi.spi.service; + +//$Id$ + +import java.net.URL; + +/** + * A service that scans a directory location for new/removed bundles. + * + * @author thomas.diesler(a)jboss.com + * @since 27-May-2009 + */ +public interface DeploymentScannerService +{ + /** + * The property that names the scan location: org.jboss.osgi.hotdeploy.scandir + */ + String PROPERTY_SCAN_LOCATION = "org.jboss.osgi.hotdeploy.scandir"; + + /** + * The property to defines the scan interval: org.jboss.osgi.hotdeploy.interval + */ + String PROPERTY_SCAN_INTERVAL = "org.jboss.osgi.hotdeploy.interval"; + + /** + * Get the scan location URL. + * + * This is can be specified by setting the {@link PROPERTY_SCAN_LOCATION} property. + */ + URL getScanLocation(); + + /** + * The number of scans since the service started + */ + long getScanCount(); + + /** + * The number of milliseconds between scans + * Defaults to 2000ms + */ + long getScanInterval(); + + /** + * Run a directory scan + */ + void scan(); + + /** + * Returns the array of bundles currently known to the deployemtn scanner. + */ + BundleInfo[] getBundles(); + + /** + * Add a scan listener to this service + */ + void addScanListener(ScanListener listener); + + /** + * Remove the scan listener from this service + */ + void removeScanListener(ScanListener listener); + + /** + * A ScanListener can be registered with the {@link DeploymentScannerService} + * to monitor the progress of deployed bundles + */ + interface ScanListener + { + /** + * Called before every scan + */ + void beforeScan(DeploymentScannerService service); + + /** + * Called after every scan + */ + void afterScan(DeploymentScannerService service); + } +} \ No newline at end of file

15 years, 1 month

1
0
0 / 0

JBoss-OSGI SVN: r89666 - in projects/jboss-osgi/trunk: 3rdparty/jaxb and 13 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-06-02 09:27:23 -0400 (Tue, 02 Jun 2009) New Revision: 89666 Added: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/package.html Modified: projects/jboss-osgi/trunk/3rdparty/apache-xerces/pom.xml projects/jboss-osgi/trunk/3rdparty/jaxb/pom.xml projects/jboss-osgi/trunk/3rdparty/jboss-common-core/pom.xml projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml projects/jboss-osgi/trunk/blueprint/impl/pom.xml projects/jboss-osgi/trunk/bundles/common/pom.xml projects/jboss-osgi/trunk/bundles/hotdeploy/pom.xml projects/jboss-osgi/trunk/bundles/jmx/pom.xml projects/jboss-osgi/trunk/bundles/jndi/pom.xml projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml projects/jboss-osgi/trunk/bundles/remotelog/pom.xml projects/jboss-osgi/trunk/bundles/webconsole/pom.xml projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteBundle.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java Log: [JBOSGI-79] - Provide POM descriptions for bundles Modified: projects/jboss-osgi/trunk/3rdparty/apache-xerces/pom.xml =================================================================== --- projects/jboss-osgi/trunk/3rdparty/apache-xerces/pom.xml 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/3rdparty/apache-xerces/pom.xml 2009-06-02 13:27:23 UTC (rev 89666) @@ -3,6 +3,8 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi 3rd Party - Apache Xerces</name> + <description>A JBossOSGi provided Apache Xerces bundle</description> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-apache-xerces</artifactId> <packaging>bundle</packaging> Modified: projects/jboss-osgi/trunk/3rdparty/jaxb/pom.xml =================================================================== --- projects/jboss-osgi/trunk/3rdparty/jaxb/pom.xml 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/3rdparty/jaxb/pom.xml 2009-06-02 13:27:23 UTC (rev 89666) @@ -3,6 +3,8 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi 3rd Party - JAXB</name> + <description>A JBossOSGi provided JAXB bundle</description> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-jaxb</artifactId> <packaging>bundle</packaging> Modified: projects/jboss-osgi/trunk/3rdparty/jboss-common-core/pom.xml =================================================================== --- projects/jboss-osgi/trunk/3rdparty/jboss-common-core/pom.xml 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/3rdparty/jboss-common-core/pom.xml 2009-06-02 13:27:23 UTC (rev 89666) @@ -3,6 +3,8 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi 3rd Party - JBoss Common Core</name> + <description>A JBossOSGi provided JBoss Common Core bundle</description> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common-core</artifactId> <packaging>bundle</packaging> Modified: projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml =================================================================== --- projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml 2009-06-02 13:27:23 UTC (rev 89666) @@ -3,6 +3,8 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi 3rd Party - JBoss XML Binding</name> + <description>A JBossOSGi provided JBossXB bundle</description> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-xml-binding</artifactId> <packaging>bundle</packaging> Modified: projects/jboss-osgi/trunk/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-06-02 13:27:23 UTC (rev 89666) @@ -2,6 +2,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi Blueprint - Implementation</name> + <description>A JBossOSGi provided Blueprint implementation</description> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint</artifactId> Modified: projects/jboss-osgi/trunk/bundles/common/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/common/pom.xml 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/bundles/common/pom.xml 2009-06-02 13:27:23 UTC (rev 89666) @@ -2,6 +2,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi Bundles - Common</name> + <description>The JBossOSGi common services</description> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> Modified: projects/jboss-osgi/trunk/bundles/hotdeploy/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/hotdeploy/pom.xml 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/bundles/hotdeploy/pom.xml 2009-06-02 13:27:23 UTC (rev 89666) @@ -3,6 +3,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi Bundles - HotDeployment</name> + <description>The JBossOSGi Hot Deployment Service</description> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-hotdeploy</artifactId> Modified: projects/jboss-osgi/trunk/bundles/jmx/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/jmx/pom.xml 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/bundles/jmx/pom.xml 2009-06-02 13:27:23 UTC (rev 89666) @@ -2,6 +2,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi Bundles - JMX</name> + <description>The JBossOSGi MBeanServer Service</description> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-jmx</artifactId> Modified: projects/jboss-osgi/trunk/bundles/jndi/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/jndi/pom.xml 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/bundles/jndi/pom.xml 2009-06-02 13:27:23 UTC (rev 89666) @@ -2,6 +2,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi Bundles - JNDI</name> + <description>The JBossOSGi Naming Service</description> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-jndi</artifactId> Modified: projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml 2009-06-02 13:27:23 UTC (rev 89666) @@ -3,6 +3,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi Bundles - Microcontainer</name> + <description>The JBossOSGi Microcontainer Service</description> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-microcontainer</artifactId> Modified: projects/jboss-osgi/trunk/bundles/remotelog/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/remotelog/pom.xml 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/bundles/remotelog/pom.xml 2009-06-02 13:27:23 UTC (rev 89666) @@ -3,6 +3,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi Bundles - Remote Logging</name> + <description>The JBossOSGi Remote Logging Service</description> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-remotelog</artifactId> Modified: projects/jboss-osgi/trunk/bundles/webconsole/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/webconsole/pom.xml 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/bundles/webconsole/pom.xml 2009-06-02 13:27:23 UTC (rev 89666) @@ -2,6 +2,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi Bundles - WebConsole</name> + <description>The JBossOSGi Web Console</description> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-webconsole</artifactId> Added: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/package.html =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/package.html (rev 0) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/package.html 2009-06-02 13:27:23 UTC (rev 89666) @@ -0,0 +1,5 @@ +<html> +<body> +Capabilities that can be installed in the OSGi framework. +</body> +</html> Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteBundle.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteBundle.java 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteBundle.java 2009-06-02 13:27:23 UTC (rev 89666) @@ -30,7 +30,7 @@ import org.osgi.framework.Constants; /** - * An OSGi Test Case + * An implementation of a remote {@link OSGiBundle} * * @author Thomas.Diesler(a)jboss.org * @since 25-Sep-2008 Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-06-02 13:27:23 UTC (rev 89666) @@ -223,7 +223,7 @@ getPackageAdmin().refreshPackages(null); } - RemoteFramework getRemoteFramework() + private RemoteFramework getRemoteFramework() { try { Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java 2009-06-02 13:00:39 UTC (rev 89665) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java 2009-06-02 13:27:23 UTC (rev 89666) @@ -31,7 +31,6 @@ import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.spi.testing.OSGiBundle; import org.jboss.osgi.spi.testing.OSGiRuntime; -import org.jboss.osgi.spi.testing.OSGiTest; import org.jboss.osgi.spi.testing.OSGiTestHelper; import org.jboss.test.osgi.example.microcontainer.bundleB.SomeBeanMBean; import org.junit.AfterClass; @@ -44,7 +43,7 @@ * @author thomas.diesler(a)jboss.com * @since 12-Feb-2009 */ -public class MicrocontainerTestCase extends OSGiTest +public class MicrocontainerTestCase { static OSGiRuntime runtime; static OSGiBundle bundleA;

15 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits June 2009