JBoss-OSGI SVN: r91601 - projects/jboss-osgi/trunk/distribution/docbook/en/modules.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-23 04:57:59 -0400 (Thu, 23 Jul 2009)
New Revision: 91601
Modified:
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml
projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml
Log:
Update userguide
Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml 2009-07-23 08:28:39 UTC (rev 91600)
+++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch050-developer-guide.xml 2009-07-23 08:57:59 UTC (rev 91601)
@@ -24,17 +24,17 @@
</imageobject>
</mediaobject>
- <para>The latest version of the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs">JBoss OSGi SPI</ulink>.</para>
+ <para>The latest version of the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs">JBoss OSGi SPI</ulink>.</para>
<itemizedlist>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi</ulink> - Common classes and interfaces.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.capability</ulink> - Capabilities that can be installed in the OSGi framework.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.framework</ulink> - Framework integration and bootstrap.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.logging</ulink> - Support for Bundle logging.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.management</ulink> - Management view on deployed bundles.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.service</ulink> - A collection of SPI provided services.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.testing</ulink> - OSGi test support classes and interfaces.</listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.util</ulink> - A collection of SPI provided utilities.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi</ulink> - Common classes and interfaces.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.capability</ulink> - Capabilities that can be installed in the OSGi framework.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.framework</ulink> - Framework integration and bootstrap.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.logging</ulink> - Support for Bundle logging.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.management</ulink> - Management view on deployed bundles.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.service</ulink> - A collection of SPI provided services.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.testing</ulink> - OSGi test support classes and interfaces.</listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.util</ulink> - A collection of SPI provided utilities.</listitem>
</itemizedlist>
<emphasis role="bold">Bootstrapping JBoss OSGi</emphasis>
@@ -72,8 +72,8 @@
<para>The JBoss OSGi SPI comes with two bootstrap providers:</para>
<itemizedlist>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">PropertiesBootstrapProvider</ulink></listitem>
- <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">MicrocontainerBootstrapProvider</ulink></listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">PropertiesBootstrapProvider</ulink></listitem>
+ <listitem><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">MicrocontainerBootstrapProvider</ulink></listitem>
</itemizedlist>
<para>OSGiBootstrapProvider implementations that read their configurtation from some other source are possible, but currently not
@@ -181,7 +181,7 @@
<emphasis role="bold">The ManagedFramework</emphasis>
- <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">
+ <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">
ManagedFramework</ulink> gives you access to the MBean views of the deployed Bundles. It is registerd under the name:</para>
<itemizedlist>
@@ -190,7 +190,7 @@
<emphasis role="bold">The ManagedBundle</emphasis>
- <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">
+ <para>The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">
ManagedBundle</ulink> gives you access to the MBean views of a deployed Bundle. It is registerd under the name:</para>
<itemizedlist>
@@ -200,7 +200,7 @@
<emphasis role="bold">Accessing the Management Objects</emphasis>
<para>If you work with the JBoss OSGi Testsuite you get access to the Managed Objects through the JBoss OSGi SPI provided
- <ulink url="http://junit.sourceforge.net/">JUnit</ulink> support package <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.testing</ulink>.
+ <ulink url="http://junit.sourceforge.net/">JUnit</ulink> support package <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.testing</ulink>.
</para>
<para>If you install JBoss OSGi in an already existing JBossAS instance you also get access to the Managed Objects through the JBoss provided
@@ -221,7 +221,7 @@
<title>Writing Test Cases</title>
<para>JBoss OSGi comes with <ulink url="http://www.junit.org">JUnit</ulink> test support as part of the SPI provided
- <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">org.jboss.osgi.spi.testing</ulink>
+ <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.testing</ulink>
package. There are two distinct test scenarios that we support:</para>
<itemizedlist>
Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml 2009-07-23 08:28:39 UTC (rev 91600)
+++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch060-husky-testing.xml 2009-07-23 08:57:59 UTC (rev 91601)
@@ -64,39 +64,39 @@
<para>Here is how it works </para>
<orderedlist>
- <listitem>A <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">Bridge</ulink>
+ <listitem>A <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">Bridge</ulink>
intercepts a test and determines the FQN of the test case and the test method from the call stack. It then delegates the execution to the same
(or another) test in and isolated test environment. An isolated test environment is one that does not have the same class loading space as
the test itself.</listitem>
- <listitem>A Bridge is associated with an <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">
+ <listitem>A Bridge is associated with an <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
Invoker</ulink>. Invokers may be arbitarily complex. Local 'in proccess' invokers are possible just as well as remote invokers. </listitem>
- <listitem>The Invoker sends the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">
- Request</ulink> to a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">
+ <listitem>The Invoker sends the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
+ Request</ulink> to a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
Connector</ulink> in the isolated test environment.</listitem>
- <listitem>A Connector has associated <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">
+ <listitem>A Connector has associated <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
PackageListeners</ulink> that are responsible for processing test cases for their respective test packages.</listitem>
- <listitem>A PackageListeners delegates the Request to a test <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">
- Runner</ulink>, typicaly this would be a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">
+ <listitem>A PackageListeners delegates the Request to a test <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
+ Runner</ulink>, typicaly this would be a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
JUnitRunner</ulink>.</listitem>
- <listitem>The Runner injects the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">
- Context</ulink> into the test case and returns a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">
+ <listitem>The Runner injects the <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
+ Context</ulink> into the test case and returns a <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
Response</ulink>, which the Connector returns to the Invoker.</listitem>
- <listitem>The Bridge finally translates potential <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">
+ <listitem>The Bridge finally translates potential <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
Failures</ulink> that may be contained in the Result, to test failures on the client side.</listitem>
</orderedlist>
<para>The JBoss OSGi <emphasis role="bold">jboss-osgi-husky.jar</emphasis> bundle registers the Connectors.
- The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">
+ The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
JMXConnector</ulink> is always registered.
- The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">
+ The <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">
SocketConnector</ulink> is registered when the appropriate configuration options are set. It then registers the
- <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-husky-parent/jb...">HuskyExtender</ulink>,
+ <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/hus...">HuskyExtender</ulink>,
which is a <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/framework/BundleListener.html">BundleListener</ulink> that inspects every
incomming bundle for the <emphasis role="bold">Test-Package</emphasis> manifest header. The Extender creates a PackageListener
for every package in the 'Test-Package' manifest header and registers them with the available Connectors.</para>
Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml 2009-07-23 08:28:39 UTC (rev 91600)
+++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch070-provided-bundles.xml 2009-07-23 08:57:59 UTC (rev 91601)
@@ -14,8 +14,8 @@
<para>The services are registered with the Framework under the name</para>
<itemizedlist>
- <listitem><emphasis role="bold">javax.xml.parsers.SAXParserFactory</emphasis></listitem>
- <listitem><emphasis role="bold">javax.xml.parsers.DocumentBuilderFactory</emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://java.sun.com/javase/6/docs/api/javax/xml/parsers/SAXParserFactory....">javax.xml.parsers.SAXParserFactory</ulink></emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://java.sun.com/javase/6/docs/api/javax/xml/parsers/DocumentBuilderFa...">javax.xml.parsers.DocumentBuilderFactory</ulink></emphasis></listitem>
</itemizedlist>
<para>Please see <ulink url="http://www.osgi.org/javadoc/r4v41/org/osgi/util/xml/XMLParserActivator.html">XMLParserActivator</ulink>
@@ -33,7 +33,7 @@
<para>The service is registered with the Framework under the name</para>
<itemizedlist>
- <listitem><emphasis role="bold">org.jboss.osgi.jaxb.JAXBService</emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/jax...">org.jboss.osgi.jaxb.JAXBService</ulink></emphasis></listitem>
</itemizedlist>
</sect1>
@@ -69,9 +69,9 @@
<para>Here is the complete list of services that this bundle provides</para>
<itemizedlist>
- <listitem><emphasis role="bold">javax.management.MBeanServer</emphasis></listitem>
- <listitem><emphasis role="bold">org.jboss.osgi.spi.management.ManagedBundleService</emphasis></listitem>
- <listitem><emphasis role="bold">org.jboss.osgi.spi.management.ManagedFrameworkService</emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://java.sun.com/javase/6/docs/api/javax/management/MBeanServer.html">javax.management.MBeanServer</ulink></emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">org.jboss.osgi.spi.management.ManagedBundleService</ulink></emphasis></listitem>
+ <!-- https://jira.jboss.org/jira/browse/JBOSGI-125 -->
</itemizedlist>
</sect1>
@@ -106,7 +106,7 @@
<para>Here is the complete list of services that this bundle provides</para>
<itemizedlist>
- <listitem><emphasis role="bold">javax.naming.InitialContext</emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://java.sun.com/javase/6/docs/api/javax/naming/InitialContext.html">javax.naming.InitialContext</ulink></emphasis></listitem>
</itemizedlist>
</sect1>
@@ -168,7 +168,7 @@
<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/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">LogEntryCache</ulink>
+ installs an <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">LogEntryCache</ulink>
that filters the received log messages.</para>
<programlisting role="JAVA">
@@ -197,7 +197,7 @@
The service is registered with the Framework under the name</para>
<itemizedlist>
- <listitem><emphasis role="bold">org.jboss.osgi.microcontainer.MicrocontainerService</emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/mic...">org.jboss.osgi.microcontainer.MicrocontainerService</ulink></emphasis></listitem>
</itemizedlist>
<para>Here is an example of how an OSGi component can access an arbitrary MC bean.</para>
@@ -226,6 +226,15 @@
service allows bundles to contain standard blueprint descriptors, which can be used for component wiring
and injection of blueprint components. The idea is to use a plain POJO programming model and let
Blueprint do the wiring for you. There should be no need for OSGi API to "pollute" your application logic.</para>
+
+ <para>The Blueprint API is divided into the <emphasis role="bold">Blueprint Container</emphasis> and
+ <emphasis role="bold">Blueprint Reflection</emphasis> packages.</para>
+
+ <itemizedlist>
+ <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/osgi/service/b...">org.osgi.service.blueprint.container</ulink></emphasis></listitem>
+ <listitem><emphasis role="bold"><ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/osgi/service/b...">org.osgi.service.blueprint.reflect</ulink></emphasis></listitem>
+ </itemizedlist>
+
</sect1>
</chapter>
Modified: projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml 2009-07-23 08:28:39 UTC (rev 91600)
+++ projects/jboss-osgi/trunk/distribution/docbook/en/modules/ch080-provided-examples.xml 2009-07-23 08:57:59 UTC (rev 91601)
@@ -206,7 +206,7 @@
<note>
<para>Please note that access to the MBeanServer from the test case is part of the
- <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">
+ <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">
OSGiRuntime</ulink> abstraction.</para>
</note>
@@ -252,7 +252,7 @@
<note>
<para>Please note that access to the InitialContext from the test case is part of the
- <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/jboss-osgi-spi/apidocs/org...">
+ <ulink url="http://jbmuc.dyndns.org/jboss-osgi-1.0.0.Beta3/apidocs/org/jboss/osgi/spi...">
OSGiRuntime</ulink> abstraction.</para>
</note>
16 years, 5 months
- 1
- 0
JBoss-OSGI SVN: r91600 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/installer and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-23 04:28:39 -0400 (Thu, 23 Jul 2009)
New Revision: 91600
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/hudson/hudson-home/config.xml
Log:
Publish apidocs
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-07-23 08:19:43 UTC (rev 91599)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-07-23 08:28:39 UTC (rev 91600)
@@ -110,7 +110,7 @@
<!-- JBossOSGi Docs -->
<fileset dir="@{deploy.artifacts.dir}/docs/userguide" targetdir="$INSTALL_PATH/docs/userguide" override="true"/>
- <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-javadoc-javadoc.jar" targetdir="$INSTALL_PATH/docs/javadoc" unpack="true" override="true"/>
+ <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-javadoc-javadoc.jar" targetdir="$INSTALL_PATH/docs/apidocs" unpack="true" override="true"/>
<!-- JBossOSGi Examples -->
<file src="@{deploy.artifacts.dir}/lib/jboss-osgi-testsuite-example.zip" targetdir="$INSTALL_PATH" unpack="true" override="true" />
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-23 08:19:43 UTC (rev 91599)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-23 08:28:39 UTC (rev 91600)
@@ -10,6 +10,15 @@
<!-- ====================================================================== -->
<!-- $Id: pom.xml 91576 2009-07-22 19:42:25Z thomas.diesler(a)jboss.com $ -->
+
+ <!--
+
+ To copy a snapshot of the documentation run:
+
+ scp -r docbook/target/docbook/publish/en-US/* jbmuc.dyndns.org:/var/www/html/jboss-osgi-1.0.0.Beta3/userguide
+ scp -r javadoc/target/apidocs/* jbmuc.dyndns.org:/var/www/html/jboss-osgi-1.0.0.Beta3/apidocs
+
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/config.xml 2009-07-23 08:19:43 UTC (rev 91599)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/config.xml 2009-07-23 08:28:39 UTC (rev 91600)
@@ -9,7 +9,7 @@
<table>
<tr align="left"><th>Bind Addr</th><td>@jboss.bind.address@</td></tr>
<tr align="left"><th>Documentation</th><td>
-<a href='job/jbossosgi-jdk16/ws/jboss-osgi/distribution/installer/target/auto-install-dest/docs/javadoc/index.html'>Javadoc</a>
+<a href='job/jbossosgi-jdk16/ws/jboss-osgi/distribution/installer/target/auto-install-dest/docs/apidocs/index.html'>Javadoc</a>
<a href='job/jbossosgi-jdk16/ws/jboss-osgi/distribution/installer/target/auto-install-dest/docs/userguide/pdf/JBossOSGi - Userguide.pdf'>PDF</a>
<a href='job/jbossosgi-jdk16/ws/jboss-osgi/distribution/installer/target/auto-install-dest/docs/userguide/html/index.html'>HTML</a>
<a href='job/jbossosgi-jdk16/ws/jboss-osgi/distribution/installer/target/auto-install-dest/docs/userguide/html_single/index.html'>HTML-Single</a>
16 years, 5 months
- 1
- 0
JBoss-OSGI SVN: r91599 - in projects/jboss-osgi/trunk/hudson: hudson-home and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-23 04:19:43 -0400 (Thu, 23 Jul 2009)
New Revision: 91599
Modified:
projects/jboss-osgi/trunk/hudson/ant.properties.example
projects/jboss-osgi/trunk/hudson/hudson-home/config.xml
Log:
Update hudson front page
Modified: projects/jboss-osgi/trunk/hudson/ant.properties.example
===================================================================
--- projects/jboss-osgi/trunk/hudson/ant.properties.example 2009-07-23 08:06:22 UTC (rev 91598)
+++ projects/jboss-osgi/trunk/hudson/ant.properties.example 2009-07-23 08:19:43 UTC (rev 91599)
@@ -15,7 +15,7 @@
hudson.username=changeme
hudson.password=changeme
-hudson.maven.path=/usr/java/apache-maven-2.1.0
+hudson.maven.path=/usr/java/apache-maven-2.2.0
hudson.root=/home/hudson/workspace/hudson/jboss-osgi
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/config.xml 2009-07-23 08:06:22 UTC (rev 91598)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/config.xml 2009-07-23 08:19:43 UTC (rev 91599)
@@ -8,7 +8,8 @@
<table>
<tr align="left"><th>Bind Addr</th><td>@jboss.bind.address@</td></tr>
-<tr align="left"><th>Userguide</th><td>
+<tr align="left"><th>Documentation</th><td>
+<a href='job/jbossosgi-jdk16/ws/jboss-osgi/distribution/installer/target/auto-install-dest/docs/javadoc/index.html'>Javadoc</a>
<a href='job/jbossosgi-jdk16/ws/jboss-osgi/distribution/installer/target/auto-install-dest/docs/userguide/pdf/JBossOSGi - Userguide.pdf'>PDF</a>
<a href='job/jbossosgi-jdk16/ws/jboss-osgi/distribution/installer/target/auto-install-dest/docs/userguide/html/index.html'>HTML</a>
<a href='job/jbossosgi-jdk16/ws/jboss-osgi/distribution/installer/target/auto-install-dest/docs/userguide/html_single/index.html'>HTML-Single</a>
16 years, 5 months
- 1
- 0
JBoss-OSGI SVN: r91598 - in projects/jboss-osgi/trunk: distribution/javadoc and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-23 04:06:22 -0400 (Thu, 23 Jul 2009)
New Revision: 91598
Modified:
projects/jboss-osgi/trunk/distribution/javadoc/pom.xml
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml
projects/jboss-osgi/trunk/reactor/pom.xml
Log:
Attach blueprint sources to reactor
Modified: projects/jboss-osgi/trunk/distribution/javadoc/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/javadoc/pom.xml 2009-07-23 07:29:05 UTC (rev 91597)
+++ projects/jboss-osgi/trunk/distribution/javadoc/pom.xml 2009-07-23 08:06:22 UTC (rev 91598)
@@ -60,6 +60,7 @@
</configuration>
<executions>
<execution>
+ <phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-23 07:29:05 UTC (rev 91597)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-23 08:06:22 UTC (rev 91598)
@@ -29,8 +29,8 @@
<!-- Modules -->
<modules>
+ <module>javadoc</module>
<module>docbook</module>
- <module>javadoc</module>
<module>installer</module>
</modules>
Modified: projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml 2009-07-23 07:29:05 UTC (rev 91597)
+++ projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml 2009-07-23 08:06:22 UTC (rev 91598)
@@ -89,6 +89,29 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <!-- For some reason the distribution javadoc module needs this -->
+ <file>target/jboss-osgi-blueprint-${version}-sources.jar</file>
+ <classifier>sources</classifier>
+ <type>jar</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: projects/jboss-osgi/trunk/reactor/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/pom.xml 2009-07-23 07:29:05 UTC (rev 91597)
+++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-07-23 08:06:22 UTC (rev 91598)
@@ -11,6 +11,58 @@
<!-- $Id: pom.xml 91403 2009-07-18 14:01:46Z thomas.diesler(a)jboss.com $ -->
+ <!--
+
+ The reactor is used to pull in external subprojects and build them
+ as part of this maven reactor build. It is a one-stop entry point
+ to build, test and deploy dependent SNAPSHOTs.
+
+ To pull in a particular subproject, set one or more of these svn:external definitions
+
+ spi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/spi/trunk
+ bundles/apache-xerces https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
+ bundles/common https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
+ bundles/hotdeploy https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
+ bundles/husky https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
+ bundles/jaxb https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
+ bundles/jmx https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
+ bundles/jndi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
+ bundles/jboss-common-core https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
+ bundles/jboss-xml-binding https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
+ bundles/microcontainer https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
+ bundles/remotelog https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
+ bundles/webconsole https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
+ runtime/deployers https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
+ runtime/equinox https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
+ runtime/felix https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
+ runtime/jbossas https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
+ runtime/knopflerfish https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
+
+ and enable the associated maven module
+
+ <module>spi</module>
+ <module>runtime/equinox</module>
+ <module>runtime/felix</module>
+ <module>runtime/knopflerfish</module>
+ <module>runtime/deployers</module>
+ <module>bundles/common</module>
+ <module>bundles/jboss-common-core</module>
+ <module>bundles/apache-xerces</module>
+ <module>bundles/jaxb</module>
+ <module>bundles/jboss-xml-binding</module>
+ <module>bundles/jndi</module>
+ <module>bundles/jmx</module>
+ <module>bundles/remotelog</module>
+ <module>bundles/webconsole</module>
+ <module>bundles/hotdeploy</module>
+ <module>bundles/microcontainer</module>
+ <module>bundles/husky</module>
+ <module>runtime/jbossas</module>
+
+ A release MUST NOT contain any svn:external definitions.
+
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -25,28 +77,8 @@
<artifactId>jboss-osgi</artifactId>
<version>1.0.0.Beta3</version>
</parent>
-
+
<modules>
- <!--
- <module>spi</module>
- <module>runtime/equinox</module>
- <module>runtime/felix</module>
- <module>runtime/knopflerfish</module>
- <module>runtime/deployers</module>
- <module>bundles/common</module>
- <module>bundles/jboss-common-core</module>
- <module>bundles/apache-xerces</module>
- <module>bundles/jaxb</module>
- <module>bundles/jboss-xml-binding</module>
- <module>bundles/jndi</module>
- <module>bundles/jmx</module>
- <module>bundles/remotelog</module>
- <module>bundles/webconsole</module>
- <module>bundles/hotdeploy</module>
- <module>bundles/microcontainer</module>
- <module>bundles/husky</module>
- <module>runtime/jbossas</module>
- -->
<module>blueprint</module>
</modules>
16 years, 5 months
- 1
- 0
JBoss-OSGI SVN: r91597 - projects/jboss-osgi/trunk/distribution/javadoc.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-23 03:29:05 -0400 (Thu, 23 Jul 2009)
New Revision: 91597
Modified:
projects/jboss-osgi/trunk/distribution/javadoc/
Log:
svn:ignore target
Property changes on: projects/jboss-osgi/trunk/distribution/javadoc
___________________________________________________________________
Name: svn:ignore
+ target
16 years, 5 months
- 1
- 0
JBoss-OSGI SVN: r91596 - in projects/jboss-osgi/trunk: distribution and 6 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-23 03:27:57 -0400 (Thu, 23 Jul 2009)
New Revision: 91596
Added:
projects/jboss-osgi/trunk/distribution/javadoc/
projects/jboss-osgi/trunk/distribution/javadoc/pom.xml
projects/jboss-osgi/trunk/distribution/javadoc/scripts/
projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml
projects/jboss-osgi/trunk/distribution/pom.xml
Modified:
projects/jboss-osgi/trunk/distribution/docbook/pom.xml
projects/jboss-osgi/trunk/distribution/installer/pom.xml
projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/pom.xml
Log:
Add javadoc aggregation module
Modified: projects/jboss-osgi/trunk/distribution/docbook/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/docbook/pom.xml 2009-07-23 07:05:16 UTC (rev 91595)
+++ projects/jboss-osgi/trunk/distribution/docbook/pom.xml 2009-07-23 07:27:57 UTC (rev 91596)
@@ -14,7 +14,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi Userguide</name>
+ <name>JBossOSGi Distribution - Userguide</name>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-userguide</artifactId>
<packaging>jdocbook</packaging>
@@ -22,7 +22,7 @@
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
+ <artifactId>jboss-osgi-distribution</artifactId>
<version>1.0.0.Beta3</version>
</parent>
Modified: projects/jboss-osgi/trunk/distribution/installer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/pom.xml 2009-07-23 07:05:16 UTC (rev 91595)
+++ projects/jboss-osgi/trunk/distribution/installer/pom.xml 2009-07-23 07:27:57 UTC (rev 91596)
@@ -14,353 +14,35 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi Distribution</name>
+ <name>JBossOSGi Distribution - Installer</name>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-distribution</artifactId>
+ <artifactId>jboss-osgi-installer</artifactId>
<packaging>pom</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
+ <artifactId>jboss-osgi-distribution</artifactId>
<version>1.0.0.Beta3</version>
</parent>
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </dependency>
-
- <!-- jboss.osgi -->
- <dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-deployers</artifactId>
- <version>${version.jboss.osgi.runtime.deployers}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-deployers</artifactId>
- <version>${version.jboss.osgi.runtime.deployers}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-jbossas</artifactId>
- <version>${version.jboss.osgi.runtime.jbossas}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-jbossas</artifactId>
- <version>${version.jboss.osgi.runtime.jbossas}</version>
- <classifier>config</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-jbossas</artifactId>
- <version>${version.jboss.osgi.runtime.jbossas}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- jboss-osgi-runtime-jbossas: no javadoc -->
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <version>${version.jboss.osgi.spi}</version>
+ <artifactId>jboss-osgi-javadoc</artifactId>
+ <version>${version}</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite-example</artifactId>
- <version>${version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-userguide</artifactId>
<version>${version}</version>
<type>jdocbook</type>
</dependency>
-
- <!-- jboss.osgi.bundles -->
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-apache-xerces</artifactId>
- <version>${version.jboss.osgi.apache.xerces}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-apache-xerces</artifactId>
- <version>${version.jboss.osgi.apache.xerces}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-apache-xerces</artifactId>
- <version>${version.jboss.osgi.apache.xerces}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-blueprint</artifactId>
- <version>${version.jboss.osgi.blueprint}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-blueprint</artifactId>
- <version>${version.jboss.osgi.blueprint}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-blueprint</artifactId>
- <version>${version.jboss.osgi.blueprint}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</artifactId>
- <version>${version.jboss.osgi.common.core}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</artifactId>
- <version>${version.jboss.osgi.common.core}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- jboss-osgi-common-core: no javadoc -->
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-hotdeploy</artifactId>
- <version>${version.jboss.osgi.hotdeploy}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-hotdeploy</artifactId>
- <version>${version.jboss.osgi.hotdeploy}</version>
- <classifier>sources</classifier>
- </dependency>
- <!-- jboss-osgi-hotdeploy: no javadoc -->
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky</artifactId>
- <version>${version.jboss.osgi.husky}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky</artifactId>
- <version>${version.jboss.osgi.husky}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky</artifactId>
- <version>${version.jboss.osgi.husky}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jaxb</artifactId>
- <version>${version.jboss.osgi.jaxb}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jaxb</artifactId>
- <version>${version.jboss.osgi.jaxb}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jaxb</artifactId>
- <version>${version.jboss.osgi.jaxb}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi.jmx}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi.jmx}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi.jmx}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <version>${version.jboss.osgi.jndi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <version>${version.jboss.osgi.jndi}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jndi</artifactId>
- <version>${version.jboss.osgi.jndi}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-microcontainer</artifactId>
- <version>${version.jboss.osgi.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-microcontainer</artifactId>
- <version>${version.jboss.osgi.microcontainer}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-microcontainer</artifactId>
- <version>${version.jboss.osgi.microcontainer}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-webconsole</artifactId>
- <version>${version.jboss.osgi.webconsole}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-webconsole</artifactId>
- <version>${version.jboss.osgi.webconsole}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-webconsole</artifactId>
- <version>${version.jboss.osgi.webconsole}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-xml-binding</artifactId>
- <version>${version.jboss.osgi.xml.binding}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-xml-binding</artifactId>
- <version>${version.jboss.osgi.xml.binding}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-xml-binding</artifactId>
- <version>${version.jboss.osgi.xml.binding}</version>
- <classifier>javadoc</classifier>
- </dependency>
-
- <!-- Equinox Dependencies -->
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-equinox</artifactId>
- <version>${version.jboss.osgi.runtime.equinox}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-equinox</artifactId>
- <version>${version.jboss.osgi.runtime.equinox}</version>
- <classifier>sources</classifier>
- </dependency>
-
- <!-- Felix Dependencies -->
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version.jboss.osgi.runtime.felix}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version.jboss.osgi.runtime.felix}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>${version.apache.felix.configadmin}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>${version.apache.felix.http.jetty}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <version>${version.apache.felix.log}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <version>${version.apache.felix.metatype}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Knopflerfish Dependencies -->
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
- <version>${version.jboss.osgi.runtime.knopflerfish}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
- <version>${version.jboss.osgi.runtime.knopflerfish}</version>
- <classifier>sources</classifier>
- </dependency>
-
- <!-- izpack -->
- <dependency>
- <groupId>org.codehaus.izpack</groupId>
- <artifactId>izpack-standalone-compiler</artifactId>
- <version>${version.izpack}</version>
- </dependency>
</dependencies>
-
+
<!-- Plugins -->
<build>
<plugins>
Modified: projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml 2009-07-23 07:05:16 UTC (rev 91595)
+++ projects/jboss-osgi/trunk/distribution/installer/scripts/assembly-deploy-artifacts.xml 2009-07-23 07:27:57 UTC (rev 91596)
@@ -25,7 +25,10 @@
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<excludes>
- <!-- [JBOSGI-92] Class.forName issue with XMLParserActivator -->
+ <!--
+ Distribute the Apache Felix compendium jar
+ [JBOSGI-92] Class.forName issue with XMLParserActivator
+ -->
<exclude>org.osgi:org.osgi.compendium:jar</exclude>
</excludes>
<scope>compile</scope>
@@ -53,17 +56,6 @@
<unpack>true</unpack>
</dependencySet>
- <!-- source -->
- <dependencySet>
- <outputDirectory>source</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:jboss-osgi-*:jar:sources</include>
- </includes>
- <unpack>false</unpack>
- </dependencySet>
-
</dependencySets>
<fileSets>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-07-23 07:05:16 UTC (rev 91595)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-07-23 07:27:57 UTC (rev 91596)
@@ -110,35 +110,13 @@
<!-- JBossOSGi Docs -->
<fileset dir="@{deploy.artifacts.dir}/docs/userguide" targetdir="$INSTALL_PATH/docs/userguide" override="true"/>
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/docs/javadoc" override="true">
- <include name="jboss-common-core-javadoc.jar" />
- <include name="jboss-logging-log4j-javadoc.jar" />
- <include name="jboss-logging-spi-javadoc.jar" />
- <include name="jboss-osgi-apache-xerces-javadoc.jar" />
- <include name="jboss-osgi-blueprint-javadoc.jar" />
- <include name="jboss-osgi-common-core-javadoc.jar" />
- <include name="jboss-osgi-common-javadoc.jar" />
- <include name="jboss-osgi-deployers-javadoc.jar" />
- <include name="jboss-osgi-hotdeploy-javadoc.jar" />
- <include name="jboss-osgi-husky-harness-javadoc.jar" />
- <include name="jboss-osgi-jaxb-javadoc.jar" />
- <include name="jboss-osgi-jmx-javadoc.jar" />
- <include name="jboss-osgi-jndi-javadoc.jar" />
- <include name="jboss-osgi-microcontainer-javadoc.jar" />
- <include name="jboss-osgi-runtime-equinox-javadoc.jar" />
- <include name="jboss-osgi-runtime-felix-javadoc.jar" />
- <include name="jboss-osgi-runtime-jbossas-javadoc.jar" />
- <include name="jboss-osgi-runtime-knopflerfish-javadoc.jar" />
- <include name="jboss-osgi-spi-javadoc.jar" />
- <include name="jboss-osgi-webconsole-javadoc.jar" />
- <include name="jboss-osgi-xml-binding-javadoc.jar" />
- </fileset>
+ <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-javadoc-javadoc.jar" targetdir="$INSTALL_PATH/docs/javadoc" unpack="true" override="true"/>
<!-- JBossOSGi Examples -->
<file src="@{deploy.artifacts.dir}/lib/jboss-osgi-testsuite-example.zip" targetdir="$INSTALL_PATH" unpack="true" override="true" />
<!-- JBossOSGi Source -->
- <fileset dir="@{deploy.artifacts.dir}/source" targetdir="$INSTALL_PATH/source" override="true">
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/source" override="true">
<include name="jboss-common-core-sources.jar" />
<include name="jboss-logging-log4j-sources.jar" />
<include name="jboss-logging-spi-sources.jar" />
Added: projects/jboss-osgi/trunk/distribution/javadoc/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/javadoc/pom.xml (rev 0)
+++ projects/jboss-osgi/trunk/distribution/javadoc/pom.xml 2009-07-23 07:27:57 UTC (rev 91596)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id: pom.xml 91576 2009-07-22 19:42:25Z thomas.diesler(a)jboss.com $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBossOSGi Distribution - Javadoc</name>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-javadoc</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-distribution</artifactId>
+ <version>1.0.0.Beta3</version>
+ </parent>
+
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>javadoc-src</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>directory-single</goal>
+ </goals>
+ <configuration>
+ <finalName>javadoc-src</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-javadoc-src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ <sourcepath>target/javadoc-src</sourcepath>
+ <excludePackageNames>*.internal:*.integration:org.jboss.osgi.blueprint:org.osgi.framework</excludePackageNames>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Added: projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml (rev 0)
+++ projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml 2009-07-23 07:27:57 UTC (rev 91596)
@@ -0,0 +1,31 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+ <id>javadoc-src</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:jboss-osgi-apache-xerces:jar:sources</include>
+ <include>*:jboss-osgi-blueprint:jar:sources</include>
+ <include>*:jboss-osgi-common:jar:sources</include>
+ <include>*:jboss-osgi-hotdeploy:jar:sources</include>
+ <include>*:jboss-osgi-husky:jar:sources</include>
+ <include>*:jboss-osgi-jaxb:jar:sources</include>
+ <include>*:jboss-osgi-jmx:jar:sources</include>
+ <include>*:jboss-osgi-jndi:jar:sources</include>
+ <include>*:jboss-osgi-microcontainer:jar:sources</include>
+ <include>*:jboss-osgi-spi:jar:sources</include>
+ <include>*:jboss-osgi-xml-binding:jar:sources</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Added: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml (rev 0)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-07-23 07:27:57 UTC (rev 91596)
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id: pom.xml 91576 2009-07-22 19:42:25Z thomas.diesler(a)jboss.com $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBossOSGi Distribution</name>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-distribution</artifactId>
+ <packaging>pom</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi</artifactId>
+ <version>1.0.0.Beta3</version>
+ </parent>
+
+ <!-- Modules -->
+ <modules>
+ <module>docbook</module>
+ <module>javadoc</module>
+ <module>installer</module>
+ </modules>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </dependency>
+
+ <!-- jboss.osgi -->
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-deployers</artifactId>
+ <version>${version.jboss.osgi.runtime.deployers}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-deployers</artifactId>
+ <version>${version.jboss.osgi.runtime.deployers}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-jbossas</artifactId>
+ <version>${version.jboss.osgi.runtime.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-jbossas</artifactId>
+ <version>${version.jboss.osgi.runtime.jbossas}</version>
+ <classifier>config</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-jbossas</artifactId>
+ <version>${version.jboss.osgi.runtime.jbossas}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <!-- jboss-osgi-runtime-jbossas: no javadoc -->
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-testsuite-example</artifactId>
+ <version>${version}</version>
+ <type>zip</type>
+ </dependency>
+
+ <!-- jboss.osgi.bundles -->
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-apache-xerces</artifactId>
+ <version>${version.jboss.osgi.apache.xerces}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-apache-xerces</artifactId>
+ <version>${version.jboss.osgi.apache.xerces}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-apache-xerces</artifactId>
+ <version>${version.jboss.osgi.apache.xerces}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-blueprint</artifactId>
+ <version>${version.jboss.osgi.blueprint}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-blueprint</artifactId>
+ <version>${version.jboss.osgi.blueprint}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-blueprint</artifactId>
+ <version>${version.jboss.osgi.blueprint}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common-core</artifactId>
+ <version>${version.jboss.osgi.common.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common-core</artifactId>
+ <version>${version.jboss.osgi.common.core}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <!-- jboss-osgi-common-core: no javadoc -->
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-hotdeploy</artifactId>
+ <version>${version.jboss.osgi.hotdeploy}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-hotdeploy</artifactId>
+ <version>${version.jboss.osgi.hotdeploy}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <!-- jboss-osgi-hotdeploy: no javadoc -->
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-husky</artifactId>
+ <version>${version.jboss.osgi.husky}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-husky</artifactId>
+ <version>${version.jboss.osgi.husky}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-husky</artifactId>
+ <version>${version.jboss.osgi.husky}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jaxb</artifactId>
+ <version>${version.jboss.osgi.jaxb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jaxb</artifactId>
+ <version>${version.jboss.osgi.jaxb}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jaxb</artifactId>
+ <version>${version.jboss.osgi.jaxb}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jndi</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-microcontainer</artifactId>
+ <version>${version.jboss.osgi.microcontainer}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-microcontainer</artifactId>
+ <version>${version.jboss.osgi.microcontainer}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-microcontainer</artifactId>
+ <version>${version.jboss.osgi.microcontainer}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webconsole</artifactId>
+ <version>${version.jboss.osgi.webconsole}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webconsole</artifactId>
+ <version>${version.jboss.osgi.webconsole}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-webconsole</artifactId>
+ <version>${version.jboss.osgi.webconsole}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-xml-binding</artifactId>
+ <version>${version.jboss.osgi.xml.binding}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-xml-binding</artifactId>
+ <version>${version.jboss.osgi.xml.binding}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-xml-binding</artifactId>
+ <version>${version.jboss.osgi.xml.binding}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+
+ <!-- Equinox Dependencies -->
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <version>${version.jboss.osgi.runtime.equinox}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <version>${version.jboss.osgi.runtime.equinox}</version>
+ <classifier>sources</classifier>
+ </dependency>
+
+ <!-- Felix Dependencies -->
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version.jboss.osgi.runtime.felix}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version.jboss.osgi.runtime.felix}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>${version.apache.felix.configadmin}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>${version.apache.felix.http.jetty}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>${version.apache.felix.log}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.metatype</artifactId>
+ <version>${version.apache.felix.metatype}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Knopflerfish Dependencies -->
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
+ <version>${version.jboss.osgi.runtime.knopflerfish}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
+ <version>${version.jboss.osgi.runtime.knopflerfish}</version>
+ <classifier>sources</classifier>
+ </dependency>
+
+ <!-- izpack -->
+ <dependency>
+ <groupId>org.codehaus.izpack</groupId>
+ <artifactId>izpack-standalone-compiler</artifactId>
+ <version>${version.izpack}</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-07-23 07:05:16 UTC (rev 91595)
+++ projects/jboss-osgi/trunk/pom.xml 2009-07-23 07:27:57 UTC (rev 91596)
@@ -97,8 +97,7 @@
<profile>
<id>distro</id>
<modules>
- <module>distribution/docbook</module>
- <module>distribution/installer</module>
+ <module>distribution</module>
</modules>
</profile>
16 years, 5 months
- 1
- 0
JBoss-OSGI SVN: r91586 - in projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main: resources and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-22 17:48:11 -0400 (Wed, 22 Jul 2009)
New Revision: 91586
Modified:
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml
Log:
Register XMLBindingService
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-07-22 21:47:17 UTC (rev 91585)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java 2009-07-22 21:48:11 UTC (rev 91586)
@@ -33,6 +33,7 @@
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.logging.Logger;
+import org.jboss.osgi.jbossxb.XMLBindingService;
import org.jboss.osgi.microcontainer.MicrocontainerService;
import org.jboss.osgi.spi.management.MicrocontainerServiceMBean;
import org.jboss.osgi.spi.service.DeployerService;
@@ -94,11 +95,17 @@
context.registerService(MBeanServer.class.getName(), mbeanServer, null);
log.debug("MBeanServer registered");
- // Register the InitialContext service
- registerInitialContext();
+ // Register the InitialContext
+ InitialContext initialContext = getInitialContext();
+ context.registerService(InitialContext.class.getName(), initialContext, null);
log.debug("InitialContext registered");
- // Preregister some beans
+ // Register the XMLBindingService
+ XMLBindingService xbService = new XMLBindingService(){};
+ context.registerService(XMLBindingService.class.getName(), xbService, null);
+ log.debug("XMLBindingService registered");
+
+ // Preregister some MC beans
installBean(controller, BEAN_SYSTEM_BUNDLE_CONTEXT, context);
installBean(controller, BEAN_KERNEL, kernel);
installBean(controller, BEAN_KERNEL_CONTROLLER, controller);
@@ -125,12 +132,11 @@
unregisterMicrocontainerServiceMBean(mbeanServer);
}
- public void registerInitialContext()
+ private InitialContext getInitialContext()
{
try
{
- InitialContext initialContext = new InitialContext();
- context.registerService(InitialContext.class.getName(), initialContext, null);
+ return new InitialContext();
}
catch (NamingException ex)
{
Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml 2009-07-22 21:47:17 UTC (rev 91585)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/resources/jboss-beans-felix.xml 2009-07-22 21:48:11 UTC (rev 91586)
@@ -26,7 +26,8 @@
<key>org.osgi.framework.system.packages.extra</key>
<value>
<!-- system -->
- org.apache.xerces.dom,
+ javax.xml.bind.annotation;version=2.1,
+ org.apache.xerces.dom;version=2.9,
<!-- jboss-osgi -->
org.jboss.osgi.jmx;version=1.0,
@@ -49,11 +50,14 @@
org.jboss.dependency.spi;version=2.0,
org.jboss.kernel.spi.dependency;version=2.0,
org.jboss.logging,
+ org.jboss.reflect.spi;version=2.0,
+ org.jboss.util.xml;version=2.2,
org.jboss.virtual,
org.jboss.virtual.plugins.registry,
org.jboss.virtual.plugins.context.jar,
org.jboss.virtual.plugins.vfs.helpers,
org.jboss.virtual.protocol,
+ org.jboss.xb.annotations;version=2.0,
org.jboss.xb.binding;version=2.0,
org.jboss.xb.binding.sunday.unmarshalling;version=2.0,
</value>
16 years, 5 months
- 1
- 0
JBoss-OSGI SVN: r91585 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-22 17:47:17 -0400 (Wed, 22 Jul 2009)
New Revision: 91585
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
Log:
Install bluprint and dependencies in AS
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-07-22 21:24:00 UTC (rev 91584)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-07-22 21:47:17 UTC (rev 91585)
@@ -312,7 +312,10 @@
<!-- deploy/osgi -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
+ <include name="jboss-osgi-apache-xerces.jar" />
+ <include name="jboss-osgi-blueprint.jar" />
<include name="jboss-osgi-common.jar" />
+ <include name="jboss-osgi-jaxb.jar" />
<include name="jboss-osgi-webconsole.jar" />
<include name="org.apache.felix.configadmin.jar" />
<include name="org.apache.felix.http.jetty.jar" />
16 years, 5 months
- 1
- 0
JBoss-OSGI SVN: r91578 - projects/jboss-osgi/trunk/distribution/installer/src/main/etc.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-22 16:06:15 -0400 (Wed, 22 Jul 2009)
New Revision: 91578
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/etc/ReleaseNotes.html
Log:
Update release notes
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/etc/ReleaseNotes.html
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/etc/ReleaseNotes.html 2009-07-22 19:50:34 UTC (rev 91577)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/etc/ReleaseNotes.html 2009-07-22 20:06:15 UTC (rev 91578)
@@ -1,10 +1,57 @@
<html>
<body>
-<h1>JBossOSGi 1.0.0 Beta2</h1>
+<h1>JBossOSGi 1.0.0 Beta3</h1>
+<h2>Bug</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-66'>JBOSGI-66</a>] - Support bundle deployment through web console
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-92'>JBOSGI-92</a>] - Class.forName issue with XMLParserActivator
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-99'>JBOSGI-99</a>] - No explicit control over bundle.start()
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-107'>JBOSGI-107</a>] - MC beans cannot be redeployed after refresh
+</li>
+</ul>
<h2>Feature Request</h2>
<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-93'>JBOSGI-93</a>] - Uninstall bundles on OSGiRuntime.shutdown()
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-98'>JBOSGI-98</a>] - Support configuration per profile
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-102'>JBOSGI-102</a>] - Add support for static Husky context injection
+</li>
+</ul>
+<h2>Task</h2>
+<ul>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-71'>JBOSGI-71</a>] - Upgrade to IzPack 4.3.1
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-73'>JBOSGI-73</a>] - Provide Blueprint example
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-95'>JBOSGI-95</a>] - Provide JAXB example
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-97'>JBOSGI-97</a>] - Provide SAX/DOM parser example
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-101'>JBOSGI-101</a>] - Create a ziped source distribution
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-103'>JBOSGI-103</a>] - Add support for BlueprintContainer API
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-104'>JBOSGI-104</a>] - Upgrade to Felix Web Console 1.2.10
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-108'>JBOSGI-108</a>] - Investigate statics on PackageAdmin.refresh
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-109'>JBOSGI-109</a>] - Upgrade to Felix-1.8.1
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-111'>JBOSGI-111</a>] - Allign distributed sources with libs
+</li>
+<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-112'>JBOSGI-112</a>] - Investigate Exception in SynchronousBundleListener
+</li>
+</ul>
+
+<h1>JBossOSGi 1.0.0 Beta2</h1>
+<h2>Feature Request</h2>
+<ul>
<li>[<a href='https://jira.jboss.org/jira/browse/JBOSGI-70'>JBOSGI-70</a>] - Expose bundle headers through JMX
</li>
</ul>
16 years, 5 months
- 1
- 0
JBoss-OSGI SVN: r91577 - projects/jboss-osgi/trunk/reactor.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-07-22 15:50:34 -0400 (Wed, 22 Jul 2009)
New Revision: 91577
Modified:
projects/jboss-osgi/trunk/reactor/
projects/jboss-osgi/trunk/reactor/pom.xml
Log:
Remove external reactor projects
Property changes on: projects/jboss-osgi/trunk/reactor
___________________________________________________________________
Name: svn:externals
- spi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/spi/trunk
bundles/apache-xerces https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
bundles/common https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
bundles/hotdeploy https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
bundles/husky https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
bundles/jaxb https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
bundles/jmx https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
bundles/jndi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
bundles/jboss-common-core https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
bundles/jboss-xml-binding https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
bundles/microcontainer https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
bundles/remotelog https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
bundles/webconsole https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
runtime/deployers https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
runtime/equinox https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
runtime/felix https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
runtime/jbossas https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
runtime/knopflerfish https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
+ #spi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/spi/trunk
#bundles/apache-xerces https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
#bundles/common https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
#bundles/hotdeploy https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
#bundles/husky https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
#bundles/jaxb https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
#bundles/jmx https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
#bundles/jndi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
#bundles/jboss-common-core https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
#bundles/jboss-xml-binding https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
#bundles/microcontainer https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
#bundles/remotelog https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
#bundles/webconsole https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/...
#runtime/deployers https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
#runtime/equinox https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
#runtime/felix https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
#runtime/jbossas https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
#runtime/knopflerfish https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...
Modified: projects/jboss-osgi/trunk/reactor/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/pom.xml 2009-07-22 19:42:25 UTC (rev 91576)
+++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-07-22 19:50:34 UTC (rev 91577)
@@ -27,6 +27,7 @@
</parent>
<modules>
+ <!--
<module>spi</module>
<module>runtime/equinox</module>
<module>runtime/felix</module>
@@ -45,6 +46,7 @@
<module>bundles/microcontainer</module>
<module>bundles/husky</module>
<module>runtime/jbossas</module>
+ -->
<module>blueprint</module>
</modules>
16 years, 5 months
- 1
- 0