[jbpm-commits] JBoss JBPM SVN: r3366 - in jbpm3/trunk: modules/distribution and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Dec 12 08:05:59 EST 2008
Author: thomas.diesler at jboss.com
Date: 2008-12-12 08:05:58 -0500 (Fri, 12 Dec 2008)
New Revision: 3366
Modified:
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/trunk/pom.xml
Log:
[JBPM-1866] add javadoc to installer
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-12-12 12:32:08 UTC (rev 3365)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-12-12 13:05:58 UTC (rev 3366)
@@ -10,8 +10,7 @@
<!-- ====================================================================== -->
<!-- $Id$ -->
-<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">
+<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>JBoss jBPM3 - Distribution</name>
<groupId>org.jbpm.jbpm3</groupId>
@@ -50,7 +49,7 @@
<classifier>config</classifier>
<version>${version}</version>
</dependency>
-
+
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-db</artifactId>
@@ -122,66 +121,80 @@
<groupId>org.jboss.bpm</groupId>
<artifactId>bpm-spec-dialect-api10</artifactId>
</dependency>
-
+
<!-- jBPM Projects -->
<dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console</artifactId>
- <type>war</type>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <type>war</type>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console</artifactId>
<type>war</type>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console-server</artifactId>
<type>war</type>
</dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>gwt-console-server</artifactId>
- <classifier>report</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
+ <dependency>
<groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gwt-console-server</artifactId>
+ <classifier>report</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl-designer-site</artifactId>
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.jbpm</groupId>
- <artifactId>report-server</artifactId>
- <type>war</type>
- </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>report-server</artifactId>
+ <type>war</type>
+ </dependency>
- <!-- Sources -->
+ <!-- Sources -->
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-jpdl</artifactId>
+ <artifactId>jbpm-enterprise</artifactId>
<classifier>sources</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console</artifactId>
+ <artifactId>jbpm-identity</artifactId>
<classifier>sources</classifier>
- <version>${jbpm.jsf-console.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-enterprise</artifactId>
+ <artifactId>jbpm-jpdl</artifactId>
<classifier>sources</classifier>
<version>${version}</version>
</dependency>
+
+ <!-- Javadoc -->
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-enterprise</artifactId>
+ <classifier>javadoc</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-identity</artifactId>
- <classifier>sources</classifier>
+ <classifier>javadoc</classifier>
<version>${version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-jpdl</artifactId>
+ <classifier>javadoc</classifier>
+ <version>${version}</version>
+ </dependency>
+
<!-- Thirdparty Dependencies -->
<dependency>
<groupId>org.apache.ant</groupId>
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-12 12:32:08 UTC (rev 3365)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-12 13:05:58 UTC (rev 3366)
@@ -70,8 +70,9 @@
<unpack>true</unpack>
</dependencySet>
- <!-- src -->
+ <!-- sources -->
<dependencySet>
+ <!-- Must be called 'src' because the GPD has a dependency on it -->
<outputDirectory>src</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
@@ -80,6 +81,17 @@
</includes>
<unpack>false</unpack>
</dependencySet>
+
+ <!-- javadoc -->
+ <dependencySet>
+ <outputDirectory>javadoc</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.jbpm:*:jar:javadoc</include>
+ </includes>
+ <unpack>false</unpack>
+ </dependencySet>
</dependencySets>
<fileSets>
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-12 12:32:08 UTC (rev 3365)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-12 13:05:58 UTC (rev 3366)
@@ -118,23 +118,29 @@
<file src="@{deploy.artifacts.dir}/etc/release.notes.html" targetdir="$INSTALL_PATH" override="true" />
<file src="@{deploy.artifacts.dir}/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH" override="true" />
- <!-- jbpm3/config -->
+ <!--
+ jbpm3/config
+ -->
<file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config"
unpack="true" override="true" />
<file src="@{deploy.artifacts.dir}/etc/version.info.xml" targetdir="$INSTALL_PATH/config"
override="true" />
- <!-- jbpm3/database -->
+ <!--
+ jbpm3/database
+ -->
<file src="@{deploy.artifacts.dir}/lib/jbpm-db.jar" targetdir="$INSTALL_PATH/database"
unpack="true" override="true" />
- <!-- jbpm3/docs -->
- <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide"
- unpack="true" override="true" />
- <file src="@{deploy.artifacts.dir}/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH"
- override="true" />
+ <!--
+ jbpm3/docs
+ -->
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide" unpack="true" override="true" />
+ <fileset dir="@{deploy.artifacts.dir}/javadoc" targetdir="$INSTALL_PATH/docs" override="true"/>
- <!-- jbpm3/designer -->
+ <!--
+ jbpm3/designer
+ -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/designer" override="true">
<include name="jbpm-jpdl-designer-site.zip" />
</fileset>
@@ -142,7 +148,9 @@
override="true" />
<fileset dir="@{deploy.artifacts.dir}/examples" targetdir="$INSTALL_PATH/examples" override="true"/>
- <!-- jbpm3/lib -->
+ <!--
+ jbpm3/lib
+ -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true">
<include name="bpm-spec-api.jar" />
<include name="activation.jar" />
@@ -167,7 +175,9 @@
<include name="log4j.jar" />
</fileset>
- <!-- jbpm3/src -->
+ <!--
+ jbpm3/src - Must be called 'src' because the GPD has a dependency on it
+ -->
<fileset dir="@{deploy.artifacts.dir}/src" targetdir="$INSTALL_PATH/src" override="true">
<include name="jsf-console-sources.jar" />
<include name="jbpm-jpdl-sources.jar" />
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-12-12 12:32:08 UTC (rev 3365)
+++ jbpm3/trunk/pom.xml 2008-12-12 13:05:58 UTC (rev 3366)
@@ -10,8 +10,7 @@
<!-- ====================================================================== -->
<!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler at 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">
+<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>JBoss jBPM3</name>
<groupId>org.jbpm.jbpm3</groupId>
@@ -29,20 +28,23 @@
<!-- Modules -->
<modules>
<module>modules/core</module>
- <module>modules/db</module>
<module>modules/identity</module>
<module>modules/enterprise</module>
<module>modules/examples</module>
<module>modules/simulation</module>
<module>modules/integration</module>
+
+ <!-- Execute as part of -Pdistro
+ <module>modules/db</module>
<module>modules/userguide</module>
+ -->
</modules>
<!-- Properties -->
<properties>
<apache.ant.version>1.7.0</apache.ant.version>
<apache.cactus.version>1.8.0</apache.cactus.version>
- <apache.jackrabbit.version>1.4.5</apache.jackrabbit.version>
+ <apache.jackrabbit.version>1.4.5</apache.jackrabbit.version>
<birt.version>2.2.2</birt.version>
<bsh.version>1.3.0</bsh.version>
<commons.fileupload.version>1.2.1</commons.fileupload.version>
@@ -93,7 +95,7 @@
<!-- DependencyManagement -->
<dependencyManagement>
<dependencies>
- <!-- jBPM Dependencies -->
+ <!-- jBPM Dependencies -->
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console</artifactId>
@@ -106,14 +108,14 @@
<version>${jbpm.gwt-console.version}</version>
<type>war</type>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console-server</artifactId>
<classifier>report</classifier>
<version>${jbpm.gwt-console.version}</version>
<type>zip</type>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console-server</artifactId>
<version>${jbpm.gwt-console.version}</version>
@@ -125,12 +127,12 @@
<version>${jbpm.designer.version}</version>
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.jbpm</groupId>
- <artifactId>report-server</artifactId>
- <version>${report-server.version}</version>
- <type>war</type>
- </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>report-server</artifactId>
+ <version>${report-server.version}</version>
+ <type>war</type>
+ </dependency>
<!-- BPM Spec Dependencies-->
<dependency>
@@ -156,7 +158,7 @@
<artifactId>bsh</artifactId>
<version>${bsh.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse.birt</groupId>
<artifactId>report-engine</artifactId>
<type>zip</type>
@@ -436,9 +438,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<testFailureIgnore>false</testFailureIgnore>
@@ -465,32 +464,23 @@
<profile>
<id>distro</id>
<modules>
- <module>modules/distribution</module>
- <!--
<module>modules/db</module>
<module>modules/userguide</module>
- -->
+ <module>modules/distribution</module>
</modules>
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: skiptests
- Desc: Skips the tests
- -->
- <profile>
- <id>skiptests</id>
- <build>
- <plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
More information about the jbpm-commits
mailing list