Author: thomas.diesler(a)jboss.com Date: 2009-03-27 06:14:37 -0400 (Fri, 27 Mar 2009) New Revision: 86415 Modified: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml projects/jboss-osgi/trunk/build/docbook/en/master.xml projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml projects/jboss-osgi/trunk/build/docbook/en/modules/gettingstarted.xml projects/jboss-osgi/trunk/build/docbook/en/modules/references.xml projects/jboss-osgi/trunk/build/docbook/pom.xml Log: Cleanup the docs. Provide feedback on jdocbook-plugin Modified: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml 2009-03-27 10:03:36 UTC (rev 86414) +++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml 2009-03-27 10:14:37 UTC (rev 86415) @@ -62,7 +62,10 @@ <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" /> <mkdir dir="${izpack.temp.dir}" /> - <!-- Expand jdocbook --> + <!-- + Installed target artefact not compatible with dependency-plugin + https://jira.jboss.org/jira/browse/MPJDOCBOOK-31 + --> <unzip src="${deploy.artifacts.dir}/docs/jboss-osgi-userguide-${product.version}.jdocbook" dest="${deploy.artifacts.dir}/docs/userguide"> <patternset> <exclude name="META-INF/**"/> Modified: projects/jboss-osgi/trunk/build/docbook/en/master.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/master.xml 2009-03-27 10:03:36 UTC (rev 86414) +++ projects/jboss-osgi/trunk/build/docbook/en/master.xml 2009-03-27 10:14:37 UTC (rev 86415) @@ -12,6 +12,10 @@ <!ENTITY ChapReferences SYSTEM "modules/references.xml"> <!ENTITY ChapGettingSupport SYSTEM "modules/gettingsupport.xml"> +<!-- + Maven build steps do not include 'process-resources' + https://jira.jboss.org/jira/browse/MPJDOCBOOK-30 +--> <!ENTITY version "1.0.0.Alpha3"> <!ENTITY pubdate "26-Mar-2009"> ]> Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-27 10:03:36 UTC (rev 86414) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/devguide.xml 2009-03-27 10:14:37 UTC (rev 86415) @@ -42,12 +42,25 @@ <para>In both cases the key is the fully qalified name of the <code>org.jboss.osgi.spi.framework.OSGiBootstrapProvider</code> interface.</para> + <para>The following code shows how to get the default <code>OSGiFramework</code> from the <code>OSGiBootstrapProvider</code>.</para> + <programlisting role="JAVA"> OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider(); OSGiFramework framework = bootProvider.getFramework(); Bundle bundle = framework.getSystemBundle(); </programlisting> + <para>The <code>OSGiBootstrapProvider</code> can also be configured explicitly. The <code>OSGiFramework</code> is a named + object from the configuration.</para> + + <programlisting role="JAVA"> + OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider(); + bootProvider.configure(configURL); + + OSGiFramework framework = bootProvider.getFramework("AnotherOSGiFramework"); + 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> Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/gettingstarted.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/gettingstarted.xml 2009-03-27 10:03:36 UTC (rev 86414) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/gettingstarted.xml 2009-03-27 10:14:37 UTC (rev 86415) @@ -131,7 +131,7 @@ 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 ...] Started in 11s:645ms + 14:43:55,250 INFO [ServerImpl] JBoss (Microcontainer) [5.0.1.GA ...] <emphasis role="bold">Started in 11s:645ms</emphasis> </programlisting> Modified: projects/jboss-osgi/trunk/build/docbook/en/modules/references.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/en/modules/references.xml 2009-03-27 10:03:36 UTC (rev 86414) +++ projects/jboss-osgi/trunk/build/docbook/en/modules/references.xml 2009-03-27 10:14:37 UTC (rev 86415) @@ -5,21 +5,23 @@ <title>References</title> - <para><emphasis role="bold">Links</emphasis></para> + <para><emphasis role="bold">Resources</emphasis></para> - <para>[1] JBossOSGi Wiki - <ulink url="http://www.jboss.org/community/docs/DOC-13273">http://w... - <para>[2] JBossOSGi Blog - <ulink url="http://jbossosgi.blogspot.com">http://jbossosgi.blogspot.com</ulink></para> - <para>[3] Issue Tracking - <ulink url="https://jira.jboss.org/jira/browse/JBOSGI">https://jira... - <para>[4] Hudson QA - <ulink url="http://jbmuc.dyndns.org:8280/hudson">http://jbmuc.dyndns.org:8280/hudson</ulink></para> - <para>[5] Subversion - <ulink url="https://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi&quo... - <para>[6] Fisheye - <ulink url="http://fisheye.jboss.com/browse/JBossOSGi">http://fishe... - <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&... + <itemizedlist> + <listitem><ulink url="http://www.jboss.org/community/docs/DOC-13273">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&quo... + <listitem><ulink url="http://fisheye.jboss.com/browse/JBossOSGi">Fisheye</... + <listitem><ulink url="http://www.jboss.org/index.html?module=bb&amp;op=viewforum&... Forum</ulink></listitem> + <listitem><ulink url="http://www.jboss.org/index.html?module=bb&amp;op=viewforum&... Forum</ulink></listitem> + </itemizedlist> <para><emphasis role="bold">Authors</emphasis></para> <itemizedlist> - <listitem><ulink url="email:thomas.diesler@jboss.com">thomas.diesler@jboss.com</ulink></listitem> + <listitem><ulink url="email:thomas.diesler@jboss.com">Thomas Diesler</ulink></listitem> </itemizedlist> </chapter> Modified: projects/jboss-osgi/trunk/build/docbook/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-03-27 10:03:36 UTC (rev 86414) +++ projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-03-27 10:14:37 UTC (rev 86415) @@ -29,11 +29,26 @@ <!-- Plugins --> <build> + <!-- + Maven build steps do not include 'process-resources' + https://jira.jboss.org/jira/browse/MPJDOCBOOK-30 + --> + <resources> + <resource> + <directory>${pom.basedir}/en</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <!-- Maven JDocbook Plugin - http://www.jboss.org/maven-jdocbook-plugin + http://www.jboss.org/maven-jdocbook-plugin + Broken links on project page + https://jira.jboss.org/jira/browse/MPJDOCBOOK-29 + + + mvn jdocbook:generate mvn jdocbook:bundle -->