[jboss-osgi-commits] JBoss-OSGI SVN: r86358 - in projects/jboss-osgi/trunk: build/docbook and 6 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-03-25 11:46:25 -0400 (Wed, 25 Mar 2009) New Revision: 86358 Added: projects/jboss-osgi/trunk/build/docbook/en/images/jboss-osgi.png projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiStateFormat.java Removed: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/StateFormat.java Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml projects/jboss-osgi/trunk/build/docbook/en/modules/frameworkintegration.xml projects/jboss-osgi/trunk/build/docbook/en/modules/introduction.xml projects/jboss-osgi/trunk/build/docbook/en/modules/references.xml projects/jboss-osgi/trunk/build/docbook/pom.xml projects/jboss-osgi/trunk/build/eclipse/eclipse.code.style.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStartStopDeployer.java projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiDeployer.java projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrapProvider.java projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java Log: docbook: spi Added: projects/jboss-osgi/trunk/build/docbook/en/images/jboss-osgi.png =================================================================== (Binary files differ) Property changes on: projects/jboss-osgi/trunk/build/docbook/en/images/jboss-osgi.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-25 15:45:37 UTC (rev 86357) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-25 15:46:25 UTC (rev 86358) @@ -8,9 +8,82 @@ <sect1 id="SecSPI"> <title>Service Provider Interface</title> - <note> - <para>TODO: Document the SPI</para> - </note> + <para>The JBossOSGi Service Provider Interface (SPI) is the integration point between the supported OSGi Frameworks and + the <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink>. The configuration defines MC beans for the + framework itself and its associated deployers.</para> + + <mediaobject> + <imageobject> + <imagedata fileref="images/jboss-osgi.png"/> + </imageobject> + </mediaobject> + + <para>The latest version of the <ulink url="http://jbmuc.dyndns.org:8280/hudson/job/Container-JDK1.6/javadoc">JBossOSGi SPI</ulink> + JavaDoc is published online as part of the JBossOSGi <ulink url="http://jbmuc.dyndns.org:8280/hudson">Hudson QA Environment</ulink>.</para> + + <itemizedlist> + <listitem><ulink url="http://jbmuc.dyndns.org:8280/hudson/job/Container-JDK1.6/javadoc/org/jboss/osgi/service/package-summary.html">org.jboss.osgi.service</ulink> - A collection of SPI provided services.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org:8280/hudson/job/Container-JDK1.6/javadoc/org/jboss/osgi/spi/package-summary.html">org.jboss.osgi.spi</ulink> - Common classes and interfaces.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org:8280/hudson/job/Container-JDK1.6/javadoc/org/jboss/osgi/spi/framework/package-summary.html">org.jboss.osgi.spi.framework</ulink> - OSGi framework integration and bootstrap.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org:8280/hudson/job/Container-JDK1.6/javadoc/org/jboss/osgi/spi/junit/package-summary.html">org.jboss.osgi.spi.junit</ulink> - JUnit test integration.</listitem> + <listitem><ulink url="http://jbmuc.dyndns.org:8280/hudson/job/Container-JDK1.6/javadoc/org/jboss/osgi/spi/management/package-summary.html">org.jboss.osgi.spi.management</ulink> - Management view on deployed bundles.</listitem> + </itemizedlist> + + <emphasis role="bold">Bootstrapping JBossOSGi</emphasis> + + <para>The OSGiBootstrap provides an OSGiFramework through a OSGiBootstrapProvider.</para> + + <para>A OSGiBootstrapProvider is discovered in two stages</para> + + <orderedlist> + <listitem>Read the bootstrap provider class name from a system property</listitem> + <listitem>Read the bootstrap provider class name from a resource file</listitem> + </orderedlist> + + <para>In both cases the key is the fully qalified name of the <code>org.jboss.osgi.spi.framework.OSGiBootstrapProvider</code> interface.</para> + + <programlisting role="JAVA"> + OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider(); + OSGiFramework framework = bootProvider.getFramework(); + Bundle bundle = framework.getSystemBundle(); + </programlisting> + + <para>The JBossOSGi SPI comes with a OSGiBootstrapProvider that uses a <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> + bean configuration.</para> + + <programlisting role="XML"><![CDATA[ + <deployment xmlns="urn:jboss:bean-deployer:2.0" ...> + + <!-- The OSGiFramework --> + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> + <property name="felixProperties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + <entry> + <key>org.osgi.framework.system.packages</key> + <value> + org.osgi.framework; version=1.4, + org.osgi.util.tracker + </value> + </entry> + </map> + </property> + </bean> + + ... + + </deployment> + ]]></programlisting> + + <para>OSGiBootstrapProvider implementations that read their configurtation from some other source are possible, but currently not + part of the JBossOSGi SPI.</para> + + <tip> + <title>Using the SPI from within an JBossAS deployed components</title> + <para>If you need access to the OSGi Framework from within an JBossAS deployed component (e.g. servlet, ejb, mbean) you + <emphasis role="bold">would not</emphasis> bootstrap JBossOSGi through the SPI. Instead, you would inject the already bootstrapped + OSGi Framework instance in your component.</para> + </tip> </sect1> <sect1 id="SecDeployers"> Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/frameworkintegration.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/frameworkintegration.xml 2009-03-25 15:45:37 UTC (rev 86357) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/frameworkintegration.xml 2009-03-25 15:46:25 UTC (rev 86358) @@ -20,7 +20,7 @@ <para>The Apache Felix integration can be configured through a <ulink url="http://www.jboss.org/jbossmc">JBoss Microcontainer</ulink> beans configuration</para> - <programlisting><![CDATA[ + <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"> Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/introduction.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/introduction.xml 2009-03-25 15:45:37 UTC (rev 86357) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/introduction.xml 2009-03-25 15:46:25 UTC (rev 86358) @@ -36,16 +36,12 @@ On top of that you can install multiple versions of the same code and resolve dependencies by version and other criteria. OSGi also offers advanced security and lifecycle, which I'll explain in more detail further down.</para> - - <emphasis role="bold">What kind of applications benefit from OSGi?</emphasis> <para>Any application that is designed in a modular fashion where it is necessary to start, stop, update individual modules with minimal impact on other modules. Modules can define their own transitive dependencies without the need to resolve these dependencies at the container level. The OSGi platform builds an exellent foundation for the next generation JBoss ESB for example.</para> - - <emphasis role="bold">Should Java EE developers adopt the OSGi programming model?</emphasis> <para>Probably not. The OSGi runtime may be used internally by Java EE container providers to achieve the desired isolation and configuration @@ -75,132 +71,130 @@ </mediaobject> - <emphasis role="bold">OSGi Security Layer</emphasis> + <emphasis role="bold">OSGi Security Layer</emphasis> + + <para>The OSGi Security Layer is an optional layer that underlies the OSGi Service Platform. + The layer is based on the Java 2 security architecture. It provides the infrastructure to deploy and manage + applications that must run in fine grained controlled environments.</para> - <para>The OSGi Security Layer is an optional layer that underlies the OSGi Service Platform. - The layer is based on the Java 2 security architecture. It provides the infrastructure to deploy and manage - applications that must run in fine grained controlled environments.</para> - - <para>The OSGi Service Platform can authenticate code in the following ways:</para> + <para>The OSGi Service Platform can authenticate code in the following ways:</para> + + <itemizedlist> + <listitem>By location</listitem> + <listitem>By signer</listitem> + </itemizedlist> + + <para>For example, an Operator can grant the ACME company the right to use networking on their devices. + The ACME company can then use networking in every bundle they digitally sign and deploy on the Operator’s device. + Also, a specific bundle can be granted permission to only manage the life cycle of bundles that are signed by the ACME company.</para> + + <mediaobject> + <imageobject> + <imagedata fileref="images/osgi-delegation.png"/> + </imageobject> + </mediaobject> - <itemizedlist> - <listitem>By location</listitem> - <listitem>By signer</listitem> - </itemizedlist> - - <para>For example, an Operator can grant the ACME company the right to use networking on their devices. - The ACME company can then use networking in every bundle they digitally sign and deploy on the Operator’s device. - Also, a specific bundle can be granted permission to only manage the life cycle of bundles that are signed by the ACME company.</para> - - <mediaobject> - <imageobject> - <imagedata fileref="images/osgi-delegation.png"/> - </imageobject> - </mediaobject> + <emphasis role="bold">OSGi Module Layer</emphasis> + <para>The OSGi Module Layer provides a generic and standardized solution for Java modularization. + The Framework defines a unit of modularization, called a bundle. A bundle is comprised of Java classes and other resources, + which together can provide functions to end users. Bundles can share Java packages among an exporter bundle and an importer bundle + in a well-defined way.</para> + + <para>Once a <emphasis role="bold">Bundle</emphasis> is started, its functionality is provided and services are exposed to other bundles installed in the OSGi Service Platform. + A bundle can carry descriptive information about itself in the manifest file that is contained in its JAR file. + Here are a few important <emphasis role="bold">Manifest Headers</emphasis> defined by the OSGi Framework:</para> + <itemizedlist> + <listitem><emphasis role="bold">Bundle-Activator</emphasis> - class used to start, stop the bundle</listitem> + <listitem><emphasis role="bold">Bundle-SymbolicName</emphasis> - identifies the bundle</listitem> + <listitem><emphasis role="bold">Bundle-Version</emphasis> - specifies the version of the bundle</listitem> + <listitem><emphasis role="bold">Export-Package</emphasis> - declaration of exported packages</listitem> + <listitem><emphasis role="bold">Import-Package</emphasis> - declaration of imported packages</listitem> + </itemizedlist> - <emphasis role="bold">OSGi Module Layer</emphasis> - - <para>The OSGi Module Layer provides a generic and standardized solution for Java modularization. - The Framework defines a unit of modularization, called a bundle. A bundle is comprised of Java classes and other resources, - which together can provide functions to end users. Bundles can share Java packages among an exporter bundle and an importer bundle - in a well-defined way.</para> - - <para>Once a <emphasis role="bold">Bundle</emphasis> is started, its functionality is provided and services are exposed to other bundles installed in the OSGi Service Platform. - A bundle can carry descriptive information about itself in the manifest file that is contained in its JAR file. - Here are a few important <emphasis role="bold">Manifest Headers</emphasis> defined by the OSGi Framework:</para> - - <itemizedlist> - <listitem><emphasis role="bold">Bundle-Activator</emphasis> - class used to start, stop the bundle</listitem> - <listitem><emphasis role="bold">Bundle-SymbolicName</emphasis> - identifies the bundle</listitem> - <listitem><emphasis role="bold">Bundle-Version</emphasis> - specifies the version of the bundle</listitem> - <listitem><emphasis role="bold">Export-Package</emphasis> - declaration of exported packages</listitem> - <listitem><emphasis role="bold">Import-Package</emphasis> - declaration of imported packages</listitem> - </itemizedlist> - - <para>The notion of OSGi Version Range describes a range of versions using a mathematical interval notation. For example</para> - - <programlisting> - Import-Package: com.acme.foo;version="[1.23, 2)", com.acme.bar;version="[4.0, 5.0)" - </programlisting> - - <para>With the OSGi Class Loading Architecture many bundles can share a single virtual machine (VM). - Within this VM, bundles can hide packages and classes from other bundles, as well as share packages with other bundles.</para> - - <mediaobject> - <imageobject> - <imagedata fileref="images/osgi-classloader.png"/> - </imageobject> - </mediaobject> - - <para>For example, the following import and export definition resolve correctly because the version range in the import definition - matches the version in the export definition:</para> - - <programlisting> - A: Import-Package: p; version="[1,2)" - B: Export-Package: p; version=1.5.1 - </programlisting> - - <mediaobject> - <imageobject> - <imagedata fileref="images/osgi-version-constraint.png"/> - </imageobject> - </mediaobject> + <para>The notion of OSGi Version Range describes a range of versions using a mathematical interval notation. For example</para> - <para>Appart from bundle versions, OSGi Attribute Matching is a generic mechanism to allow the importer and exporter to influence the - matching process in a declarative way. For example, the following statements will match.</para> + <programlisting> + Import-Package: com.acme.foo;version="[1.23, 2)", com.acme.bar;version="[4.0, 5.0)" + </programlisting> + + <para>With the OSGi Class Loading Architecture many bundles can share a single virtual machine (VM). + Within this VM, bundles can hide packages and classes from other bundles, as well as share packages with other bundles.</para> + + <mediaobject> + <imageobject> + <imagedata fileref="images/osgi-classloader.png"/> + </imageobject> + </mediaobject> + + <para>For example, the following import and export definition resolve correctly because the version range in the import definition + matches the version in the export definition:</para> + + <programlisting> + A: Import-Package: p; version="[1,2)" + B: Export-Package: p; version=1.5.1 + </programlisting> + + <mediaobject> + <imageobject> + <imagedata fileref="images/osgi-version-constraint.png"/> + </imageobject> + </mediaobject> + + <para>Appart from bundle versions, OSGi Attribute Matching is a generic mechanism to allow the importer and exporter to influence the + matching process in a declarative way. For example, the following statements will match.</para> - <programlisting> - A: Import-Package: com.acme.foo;company=ACME - B: Export-Package: com.acme.foo;company=ACME; security=false - </programlisting> + <programlisting> + A: Import-Package: com.acme.foo;company=ACME + B: Export-Package: com.acme.foo;company=ACME; security=false + </programlisting> - <para>An exporter can limit the visibility of the classes in a package with the include and exclude directives on the export definition.</para> + <para>An exporter can limit the visibility of the classes in a package with the include and exclude directives on the export definition.</para> - <programlisting> - Export-Package: com.acme.foo; include:="Qux*,BarImpl"; exclude:=QuxImpl - </programlisting> + <programlisting> + Export-Package: com.acme.foo; include:="Qux*,BarImpl"; exclude:=QuxImpl + </programlisting> + + <emphasis role="bold">OSGi Life Cycle Layer</emphasis> - <emphasis role="bold">OSGi Life Cycle Layer</emphasis> - - <para>The Life Cycle Layer provides an API to control the security and life cycle operations of bundles.</para> + <para>The Life Cycle Layer provides an API to control the security and life cycle operations of bundles.</para> - <para>A bundle can be in one of the following states:</para> - - <mediaobject> - <imageobject> - <imagedata fileref="images/osgi-life-cycle.png"/> - </imageobject> - </mediaobject> - - <para>A bundle is activated by calling its <emphasis role="bold">Bundle Activator</emphasis> object, if one exists. - The BundleActivator interface defines methods that the Framework invokes when it starts and stops the bundle.</para> + <para>A bundle can be in one of the following states:</para> + + <mediaobject> + <imageobject> + <imagedata fileref="images/osgi-life-cycle.png"/> + </imageobject> + </mediaobject> + + <para>A bundle is activated by calling its <emphasis role="bold">Bundle Activator</emphasis> object, if one exists. + The BundleActivator interface defines methods that the Framework invokes when it starts and stops the bundle.</para> - <para>A Bundle Context object represents the execution context of a single bundle within the OSGi Service Platform, - and acts as a proxy to the underlying Framework. A <emphasis role="bold">Bundle Context</emphasis> object is created by the Framework when a bundle is started. - The bundle can use this private BundleContext object for the following purposes:</para> - - <itemizedlist> - <listitem>Installing new bundles into the OSGi environment</listitem> - <listitem>Interrogating other bundles installed in the OSGi environment</listitem> - <listitem>Obtaining a persistent storage area</listitem> - <listitem>Retrieving service objects of registered services</listitem> - <listitem>Registering services in the Framework service</listitem> - <listitem>Subscribing or unsubscribing to Famework events</listitem> - </itemizedlist> - - <emphasis role="bold">OSGi Service Layer</emphasis> - - <para>The OSGi Service Layer defines a dynamic collaborative model that is highly integrated with the Life Cycle Layer. - The service model is a publish, find and bind model. A service is a normal Java object that is registered under one or more - Java interfaces with the service registry.</para> - - <mediaobject> - <imageobject> - <imagedata fileref="images/osgi-service-registration.png"/> - </imageobject> - </mediaobject> + <para>A Bundle Context object represents the execution context of a single bundle within the OSGi Service Platform, + and acts as a proxy to the underlying Framework. A <emphasis role="bold">Bundle Context</emphasis> object is created by the Framework when a bundle is started. + The bundle can use this private BundleContext object for the following purposes:</para> + + <itemizedlist> + <listitem>Installing new bundles into the OSGi environment</listitem> + <listitem>Interrogating other bundles installed in the OSGi environment</listitem> + <listitem>Obtaining a persistent storage area</listitem> + <listitem>Retrieving service objects of registered services</listitem> + <listitem>Registering services in the Framework service</listitem> + <listitem>Subscribing or unsubscribing to Famework events</listitem> + </itemizedlist> + + <emphasis role="bold">OSGi Service Layer</emphasis> + + <para>The OSGi Service Layer defines a dynamic collaborative model that is highly integrated with the Life Cycle Layer. + The service model is a publish, find and bind model. A service is a normal Java object that is registered under one or more + Java interfaces with the service registry.</para> + + <mediaobject> + <imageobject> + <imagedata fileref="images/osgi-service-registration.png"/> + </imageobject> + </mediaobject> </sect1> <sect1 id="SecServiceCompendium"> Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/references.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/references.xml 2009-03-25 15:45:37 UTC (rev 86357) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/references.xml 2009-03-25 15:46:25 UTC (rev 86358) @@ -5,12 +5,6 @@ <title>References</title> - <para><emphasis role="bold">Authors</emphasis></para> - - <itemizedlist> - <listitem><ulink url="email:thomas.diesler@jboss.com">thomas.diesler@jboss.com</ulink></listitem> - </itemizedlist> - <para><emphasis role="bold">Links</emphasis></para> <para>[1] JBossOSGi Wiki - <ulink url="http://www.jboss.org/community/docs/DOC-13273">http://w... @@ -22,4 +16,10 @@ <para>[7] User Forum - <ulink url="http://www.jboss.org/index.html?module=bb&amp;op=viewforum&... <para>[8] Design Forum - <ulink url="http://www.jboss.org/index.html?module=bb&amp;op=viewforum&... + <para><emphasis role="bold">Authors</emphasis></para> + + <itemizedlist> + <listitem><ulink url="email:thomas.diesler@jboss.com">thomas.diesler@jboss.com</ulink></listitem> + </itemizedlist> + </chapter> Modified: projects/jboss-osgi/trunk/build/docbook/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-03-25 15:45:37 UTC (rev 86357) +++ projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-03-25 15:46:25 UTC (rev 86358) @@ -72,17 +72,17 @@ <formats> <format> <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/main-html.xsl</stylesheetResource> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> <finalName>index.html</finalName> </format> <format> <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/nochunk-html.xsl</stylesheetResource> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> <finalName>index.html</finalName> </format> <format> <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/main-pdf.xsl</stylesheetResource> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> <finalName>${pom.name}.pdf</finalName> </format> </formats> Modified: projects/jboss-osgi/trunk/build/eclipse/eclipse.code.style.xml =================================================================== --- projects/jboss-osgi/trunk/build/eclipse/eclipse.code.style.xml 2009-03-25 15:45:37 UTC (rev 86357) +++ projects/jboss-osgi/trunk/build/eclipse/eclipse.code.style.xml 2009-03-25 15:46:25 UTC (rev 86358) @@ -49,7 +49,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/> @@ -185,7 +185,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/> <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="168"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/> @@ -231,7 +231,7 @@ <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-03-25 15:45:37 UTC (rev 86357) +++ projects/jboss-osgi/trunk/pom.xml 2009-03-25 15:46:25 UTC (rev 86358) @@ -50,8 +50,8 @@ <version.jboss.common.core>2.2.11.GA</version.jboss.common.core> <version.jboss.deployers>2.0.5.GA</version.jboss.deployers> <version.jboss.jacc>1.1.0.GA</version.jboss.jacc> - <version.jboss.jdocbook.plugin>2.0.0</version.jboss.jdocbook.plugin> - <version.jboss.jdocbook.style>1.0.0</version.jboss.jdocbook.style> + <version.jboss.jdocbook.plugin>2.1.2</version.jboss.jdocbook.plugin> + <version.jboss.jdocbook.style>1.1.0</version.jboss.jdocbook.style> <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi> <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j> <version.jboss.metadata>1.0.0.CR11</version.jboss.metadata> Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStartStopDeployer.java =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStartStopDeployer.java 2009-03-25 15:45:37 UTC (rev 86357) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStartStopDeployer.java 2009-03-25 15:46:25 UTC (rev 86358) @@ -31,7 +31,7 @@ import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer; import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.osgi.spi.Constants; -import org.jboss.osgi.spi.framework.StateFormat; +import org.jboss.osgi.spi.framework.OSGiStateFormat; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; @@ -85,7 +85,7 @@ unresolvedBundles.remove(bundle); - String state = StateFormat.formatBundleState(bundle.getState()); + String state = OSGiStateFormat.formatBundleState(bundle.getState()); log.info("Stoped: " + bundle + state); } catch (BundleException e) @@ -99,7 +99,7 @@ try { bundle.start(); - String state = StateFormat.formatBundleState(bundle.getState()); + String state = OSGiStateFormat.formatBundleState(bundle.getState()); log.info("Started: " + bundle + state); } catch (BundleException e) @@ -139,7 +139,7 @@ try { auxBundle.start(); - String state = StateFormat.formatBundleState(bundle.getState()); + String state = OSGiStateFormat.formatBundleState(bundle.getState()); log.info("Started: " + bundle + state); } catch (BundleException e) Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiDeployer.java =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiDeployer.java 2009-03-25 15:45:37 UTC (rev 86357) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/OSGiDeployer.java 2009-03-25 15:46:25 UTC (rev 86358) @@ -30,7 +30,7 @@ import org.jboss.deployers.spi.deployer.DeploymentStages; import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer; import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.osgi.spi.framework.StateFormat; +import org.jboss.osgi.spi.framework.OSGiStateFormat; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; @@ -93,7 +93,7 @@ Bundle bundle = systemContext.installBundle(bundleUri.toString()); unit.addAttachment(Bundle.class, bundle); - String state = StateFormat.formatBundleState(bundle.getState()); + String state = OSGiStateFormat.formatBundleState(bundle.getState()); log.info("Installed: " + bundle + state); } } @@ -113,7 +113,7 @@ try { bundle.uninstall(); - String state = StateFormat.formatBundleState(bundle.getState()); + String state = OSGiStateFormat.formatBundleState(bundle.getState()); log.info("Uninstalled: " + bundle + state); } catch (BundleException ex) Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java 2009-03-25 15:45:37 UTC (rev 86357) +++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java 2009-03-25 15:46:25 UTC (rev 86358) @@ -28,8 +28,17 @@ import java.net.URL; /** - * The OSGiBootstrap provides an OSGiFramework through a OSGiBootstrapProvider + * The OSGiBootstrap provides an {@link OSGiFramework} through a {@link OSGiBootstrapProvider}. * + * A OSGiBootstrapProvider is discovered in two stages. + * + * <ol> + * <li>Read the bootstrap provider class name from a system property + * <li>Read the bootstrap provider class name from a resource file + * </ol> + * + * In both cases the key is the fully qalified name of the {@link OSGiBootstrapProvider} interface. + * * @author thomas.diesler(a)jboss.com * @since 18-Jun-2008 */ @@ -41,17 +50,7 @@ } /** - * Get an instance of an OSGiBootstrapProvider. - * </p> - * A OSGiBootstrapProvider is discovered in two stages - * <p/> - * - * <ol> - * <li>Read the bootstrap provider class name from a system property - * <li>Read the bootstrap provider class name from a resource file - * </ol> - * - * In both cases the key is the fully qalified name of the {@link OSGiBootstrapProvider} interface. + * Get an instance of an OSGiBootstrapProvider. */ public static OSGiBootstrapProvider getBootstrapProvider() { Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrapProvider.java =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrapProvider.java 2009-03-25 15:45:37 UTC (rev 86357) +++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrapProvider.java 2009-03-25 15:46:25 UTC (rev 86358) @@ -29,54 +29,54 @@ /** * An OSGiBootstrapProvider provides an OSGiFramework * <p/> - * Implementations would configure the OSGiFramework through some - * form of descriptor. + * Implementations would configure the OSGiFramework through some form of descriptor. * <p/> - * Natively, the SPI provides an OSGiBootstrapProvider that is based - * on the Microkernel. + * Natively, the SPI provides an OSGiBootstrapProvider that is based on the Microkernel. * * @author thomas.diesler(a)jboss.com * @since 18-Jun-2008 */ public interface OSGiBootstrapProvider extends NamedInstanceProvider { - /* The Framework bean name - jboss.osgi:service=Framework */ + /** The Framework bean name - jboss.osgi:service=Framework */ public static final String DEFAULT_FRAMEWORK_NAME = "jboss.osgi:service=Framework"; - /* The default framework beans: jboss-osgi-bootstrap-beans.xml */ + /** The default framework beans: jboss-osgi-bootstrap-beans.xml */ public static final String DEFAULT_BOOTSTRAP_BEANS = "jboss-osgi-bootstrap-beans.xml"; - /* The default framework beans: jboss-osgi-beans.xml */ + /** The default framework beans: jboss-osgi-beans.xml */ public static final String DEFAULT_FRAMEWORK_BEANS = "jboss-osgi-beans.xml"; - /* + /** * Get the OSGiFramework that registerd with the default name + * * @return The configured instance of a Framework * @throws IllegalArgumentException if this is not AttributeProvider instance */ OSGiFramework getFramework(); - /* + /** * Get an OSGiFramework with a given name from this OSGiBootstrapProvider + * * @param name the framework name * @return The configured instance of a Framework, or null */ OSGiFramework getFramework(String name); - /* + /** * Configure this provider with the default configuration */ void configure(); - /* + /** * Configure this provider from the given URL */ void configure(URL urlConfig); - /* + /** * Configure this provider from a given resource */ void configure(String resourceConfig); - /* + /** * Configure this provider from a given input stream */ void configure(InputStream streamConfig); Copied: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiStateFormat.java (from rev 86290, projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/StateFormat.java) =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiStateFormat.java (rev 0) +++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiStateFormat.java 2009-03-25 15:46:25 UTC (rev 86358) @@ -0,0 +1,63 @@ +/* + * 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.framework; + +//$Id$ + +import org.osgi.framework.Bundle; + +/** + * A string format helper for OSGi states + * + * @author thomas.diesler(a)jboss.com + * @since 02-Mar-2009 + */ +public abstract class OSGiStateFormat +{ + // Hide ctor + private OSGiStateFormat() + { + } + + /** + * Return the string representation of a bundle state + */ + public static String formatBundleState(int bundleState) + { + String retState = "[" + bundleState + "]"; + + if (Bundle.UNINSTALLED == bundleState) + retState = "[UNINSTALLED]"; + else if (Bundle.INSTALLED == bundleState) + retState = "[INSTALLED]"; + else if (Bundle.RESOLVED == bundleState) + retState = "[RESOLVED]"; + else if (Bundle.STARTING == bundleState) + retState = "[STARTING]"; + else if (Bundle.STOPPING == bundleState) + retState = "[STOPPING]"; + else if (Bundle.ACTIVE == bundleState) + retState = "[ACTIVE]"; + + return retState; + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiStateFormat.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/StateFormat.java =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/StateFormat.java 2009-03-25 15:45:37 UTC (rev 86357) +++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/framework/StateFormat.java 2009-03-25 15:46:25 UTC (rev 86358) @@ -1,58 +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.spi.framework; - -//$Id$ - -import org.osgi.framework.Bundle; - -/** - * A string format helper for OSGi states - * - * @author thomas.diesler(a)jboss.com - * @since 02-Mar-2009 - */ -public abstract class StateFormat -{ - /** - * Return the string representation of a bundle state - */ - public static String formatBundleState(int bundleState) - { - String retState = "[" + bundleState + "]"; - - if (Bundle.UNINSTALLED == bundleState) - retState = "[UNINSTALLED]"; - else if (Bundle.INSTALLED == bundleState) - retState = "[INSTALLED]"; - else if (Bundle.RESOLVED == bundleState) - retState = "[RESOLVED]"; - else if (Bundle.STARTING == bundleState) - retState = "[STARTING]"; - else if (Bundle.STOPPING == bundleState) - retState = "[STOPPING]"; - else if (Bundle.ACTIVE == bundleState) - retState = "[ACTIVE]"; - - return retState; - } -} \ No newline at end of file Modified: projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2009-03-25 15:45:37 UTC (rev 86357) +++ projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2009-03-25 15:46:25 UTC (rev 86358) @@ -27,7 +27,7 @@ import org.jboss.logging.Logger; import org.jboss.osgi.spi.Constants; -import org.jboss.osgi.spi.framework.StateFormat; +import org.jboss.osgi.spi.framework.OSGiStateFormat; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; @@ -80,7 +80,7 @@ { bundle.start(); - String state = StateFormat.formatBundleState(bundle.getState()); + String state = OSGiStateFormat.formatBundleState(bundle.getState()); log.info(bundle.getSymbolicName() + ",state=" + state); } @@ -88,7 +88,7 @@ { bundle.stop(); - String state = StateFormat.formatBundleState(bundle.getState()); + String state = OSGiStateFormat.formatBundleState(bundle.getState()); log.info(bundle.getSymbolicName() + ",state=" + state); } } \ No newline at end of file