[jboss-osgi-commits] JBoss-OSGI SVN: r91596 - in projects/jboss-osgi/trunk: distribution and 6 other directories.

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=&quot;(a){deploy.artifacts.dir}/docs/userguide&quot; targetdir="$INSTALL_PATH/docs/userguide" override="true"/> - <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; 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=&quot;(a){deploy.artifacts.dir}/lib/jboss-osgi-javadoc-javadoc.jar&quot; targetdir="$INSTALL_PATH/docs/javadoc" unpack="true" override="true"/> <!-- JBossOSGi Examples --> <file src=&quot;(a){deploy.artifacts.dir}/lib/jboss-osgi-testsuite-example.zip&quot; targetdir="$INSTALL_PATH" unpack="true" override="true" /> <!-- JBossOSGi Source --> - <fileset dir=&quot;(a){deploy.artifacts.dir}/source&quot; targetdir="$INSTALL_PATH/source" override="true"> + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; 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/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... 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>