[jboss-osgi-commits] JBoss-OSGI SVN: r91433 - in projects/jboss-osgi: projects/runtime/jbossas/trunk/src/main and 5 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Mon Jul 20 14:31:02 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-07-20 14:31:01 -0400 (Mon, 20 Jul 2009)
New Revision: 91433
Removed:
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/
Modified:
projects/jboss-osgi/projects/parent/trunk/pom.xml
projects/jboss-osgi/projects/spi/trunk/pom.xml
projects/jboss-osgi/trunk/distribution/installer/pom.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/reactor/
Log:
[JBOSGI-111] Allign distributed sources with libs
Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-20 17:50:14 UTC (rev 91432)
+++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-20 18:31:01 UTC (rev 91433)
@@ -86,6 +86,20 @@
<failIfNoTests>false</failIfNoTests>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ <excludePackageNames>*.internal</excludePackageNames>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<!-- PluginManagement -->
Modified: projects/jboss-osgi/projects/spi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-07-20 17:50:14 UTC (rev 91432)
+++ projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-07-20 18:31:01 UTC (rev 91433)
@@ -97,25 +97,9 @@
</dependency>
</dependencies>
+ <!-- Build -->
<build>
<plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <quiet>true</quiet>
- <excludePackageNames>*.internal</excludePackageNames>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: projects/jboss-osgi/trunk/distribution/installer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/pom.xml 2009-07-20 17:50:14 UTC (rev 91432)
+++ projects/jboss-osgi/trunk/distribution/installer/pom.xml 2009-07-20 18:31:01 UTC (rev 91433)
@@ -33,6 +33,8 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</dependency>
+
+ <!-- jboss.osgi -->
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-deployers</artifactId>
@@ -61,6 +63,7 @@
<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>
@@ -91,7 +94,7 @@
<type>jdocbook</type>
</dependency>
- <!-- Bundles -->
+ <!-- jboss.osgi.bundles -->
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-apache-xerces</artifactId>
@@ -99,21 +102,59 @@
</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-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>
@@ -136,29 +177,101 @@
</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>
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-20 17:50:14 UTC (rev 91432)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-07-20 18:31:01 UTC (rev 91433)
@@ -109,36 +109,55 @@
</fileset>
<!-- JBossOSGi Docs -->
- <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-spi-javadoc.jar" targetdir="$INSTALL_PATH/docs/apidocs" unpack="true" override="true" />
<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-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>
<!-- JBossOSGi Examples -->
<file src="@{deploy.artifacts.dir}/lib/jboss-osgi-testsuite-example.zip" targetdir="$INSTALL_PATH" unpack="true" override="true" />
- <!-- JBossOSGi Lib -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true">
- <include name="jboss-osgi-deployers.jar" />
- <include name="jboss-osgi-runtime-felix.jar" />
- <include name="jboss-osgi-spi.jar" />
- <include name="jboss-osgi-common.jar" />
- <include name="jboss-osgi-husky-harness.jar" />
- <include name="jboss-osgi-webconsole.jar" />
- <include name="org.apache.felix.framework.jar" />
- <include name="org.apache.felix.configadmin.jar" />
- <include name="org.apache.felix.http.jetty.jar" />
- <include name="org.apache.felix.log.jar" />
- <include name="org.apache.felix.metatype.jar" />
- <include name="org.osgi.compendium.jar" />
- <include name="org.osgi.core.jar" />
- </fileset>
-
<!-- JBossOSGi Source -->
<fileset dir="@{deploy.artifacts.dir}/source" 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" />
+ <include name="jboss-osgi-apache-xerces-sources.jar" />
+ <include name="jboss-osgi-common-core-sources.jar" />
+ <include name="jboss-osgi-common-sources.jar" />
<include name="jboss-osgi-deployers-sources.jar" />
+ <include name="jboss-osgi-hotdeploy-sources.jar" />
+ <include name="jboss-osgi-husky-harness-sources.jar" />
+ <include name="jboss-osgi-jaxb-sources.jar" />
+ <include name="jboss-osgi-jmx-sources.jar" />
+ <include name="jboss-osgi-jndi-sources.jar" />
+ <include name="jboss-osgi-microcontainer-sources.jar" />
+ <include name="jboss-osgi-runtime-equinox-sources.jar" />
<include name="jboss-osgi-runtime-felix-sources.jar" />
+ <include name="jboss-osgi-runtime-jbossas-sources.jar" />
+ <include name="jboss-osgi-runtime-knopflerfish-sources.jar" />
<include name="jboss-osgi-spi-sources.jar" />
- <include name="jboss-osgi-common-sources.jar" />
<include name="jboss-osgi-webconsole-sources.jar" />
+ <include name="jboss-osgi-xml-binding-sources.jar" />
</fileset>
</pack>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-07-20 17:50:14 UTC (rev 91432)
+++ projects/jboss-osgi/trunk/pom.xml 2009-07-20 18:31:01 UTC (rev 91433)
@@ -104,7 +104,7 @@
<profile>
<id>reactor</id>
<modules>
- <!--
+ <!-- -->
<module>reactor/spi</module>
<module>reactor/runtime/equinox</module>
<module>reactor/runtime/felix</module>
@@ -123,7 +123,7 @@
<module>reactor/bundles/microcontainer</module>
<module>reactor/bundles/husky</module>
<module>reactor/runtime/jbossas</module>
- -->
+
<module>reactor/bundles/blueprint</module>
<module>testsuite</module>
</modules>
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/apache-xerces/trunk
#bundles/common https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/common/trunk
#bundles/hotdeploy https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/hotdeploy/trunk
#bundles/husky https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/husky/trunk
#bundles/jaxb https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jaxb/trunk
#bundles/jmx https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jmx/trunk
#bundles/jndi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jndi/trunk
#bundles/jboss-common-core https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jboss-common-core/trunk
#bundles/jboss-xml-binding https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk
#bundles/microcontainer https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/microcontainer/trunk
#bundles/remotelog https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/remotelog/trunk
#bundles/webconsole https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/webconsole/trunk
#runtime/deployers https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/deployers/trunk
#runtime/equinox https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/equinox/trunk
#runtime/felix https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/felix/trunk
#runtime/jbossas https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/jbossas/trunk
#runtime/knopflerfish https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/knopflerfish/trunk
+ 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/apache-xerces/trunk
bundles/common https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/common/trunk
bundles/hotdeploy https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/hotdeploy/trunk
bundles/husky https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/husky/trunk
bundles/jaxb https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jaxb/trunk
bundles/jmx https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jmx/trunk
bundles/jndi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jndi/trunk
bundles/jboss-common-core https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jboss-common-core/trunk
bundles/jboss-xml-binding https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk
bundles/microcontainer https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/microcontainer/trunk
bundles/remotelog https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/remotelog/trunk
bundles/webconsole https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/webconsole/trunk
runtime/deployers https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/deployers/trunk
runtime/equinox https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/equinox/trunk
runtime/felix https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/felix/trunk
runtime/jbossas https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/jbossas/trunk
runtime/knopflerfish https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/knopflerfish/trunk
More information about the jboss-osgi-commits
mailing list