Author: tom.baeyens(a)jboss.com Date: 2009-04-23 14:57:59 -0400 (Thu, 23 Apr 2009) New Revision: 4608 Added: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml Removed: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml Modified: jbpm4/branches/tbaeyens/build.xml jbpm4/branches/tbaeyens/modules/distro/pom.xml jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-jbpm-single-jar.xml Log: zip file distro Modified: jbpm4/branches/tbaeyens/build.xml =================================================================== --- jbpm4/branches/tbaeyens/build.xml 2009-04-23 15:16:20 UTC (rev 4607) +++ jbpm4/branches/tbaeyens/build.xml 2009-04-23 18:57:59 UTC (rev 4608) @@ -134,7 +134,7 @@ </exec> </target> - <target name="update.configurations" description="update the pvm, jpdl, example and test-db test resources by running the config tool"> + <!-- target name="update.configurations" description="update the pvm, jpdl, example and test-db test resources by running the config tool"> <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" target="create.configuration.files" inheritall="false"> <property name="config.files.dir" value="${basedir}/modules/pvm/src/test/resources" /> <property name="tmp.dir" value="${basedir}/modules/pvm/target/config-tmp" /> @@ -152,7 +152,7 @@ <property name="config.files.dir" value="${basedir}/modules/test-db/src/test/resources" /> <property name="tmp.dir" value="${basedir}/modules/test-db/target/config-tmp" /> </ant> - </target> + </target --> <target name="test.configuration" description="create test configuration in target/config"> <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" Modified: jbpm4/branches/tbaeyens/modules/distro/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-04-23 15:16:20 UTC (rev 4607) +++ jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-04-23 18:57:59 UTC (rev 4608) @@ -10,7 +10,9 @@ <!-- ====================================================================== --> <!-- $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>jBPM 4 - Distro</name> @@ -169,37 +171,35 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> + <version>2.2-beta-3</version> <executions> <execution> - <id>prepare-files-for-installer</id> + <id>generate-jbpm-single-jar</id> <phase>process-resources</phase> <goals> - <goal>directory-single</goal> + <goal>single</goal> </goals> <configuration> - <finalName>deploy-artifacts</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>scripts/assembly-deploy-artifacts.xml</descriptor> + <descriptor>scripts/assembly-jbpm-single-jar.xml</descriptor> </descriptors> </configuration> </execution> <execution> - <id>generate-jbpm-single-jar</id> + <id>prepare-files-for-installer</id> <phase>package</phase> <goals> - <goal>assembly</goal> + <goal>single</goal> </goals> <configuration> - <finalName>jbpm</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>scripts/assembly-jbpm-single-jar.xml</descriptor> + <descriptor>scripts/assembly-distro.xml</descriptor> </descriptors> </configuration> </execution> @@ -207,7 +207,7 @@ </executions> </plugin> - <plugin> + <!-- plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -239,7 +239,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin --> </plugins> </build> Deleted: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-04-23 15:16:20 UTC (rev 4607) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-04-23 18:57:59 UTC (rev 4608) @@ -1,177 +0,0 @@ -<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>deploy-artifacts</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <!-- Dependency Sets --> - <dependencySets> - - <!-- lib --> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>compile</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>test</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <includes> - <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> - </includes> - <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> - <outputDirectory>gpd</outputDirectory> - </dependencySet> - <!-- resources --> - <dependencySet> - <outputDirectory>resources/jbpm-enterprise-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-enterprise:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-spi-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-spi:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-console-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-console-integration:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-jboss5-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-jboss5:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-jboss4-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-jboss4:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - </dependencySets> - - <fileSets> - <fileSet> - <directory>src/main/resources</directory> - <includes> - <include>jboss.eula.txt</include> - <include>license.txt</include> - <include>readme.html</include> - </includes> - <outputDirectory></outputDirectory> - </fileSet> - <fileSet> - <directory>../api/target/apidocs</directory> - <outputDirectory>doc/javadocs</outputDirectory> - </fileSet> - <fileSet> - <directory>../api/target/schemadoc</directory> - <outputDirectory>doc/schemadoc</outputDirectory> - </fileSet> - <fileSet> - <directory>../devguide/target/docbook/publish/en</directory> - <outputDirectory>doc/devguide</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../userguide/target/docbook/publish/en</directory> - <outputDirectory>doc/userguide</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../api/target/schemadocs</directory> - <outputDirectory>doc/schemadocs</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../api/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../api/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../log/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../pvm/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../pvm/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../jpdl/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../jpdl/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../task/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../task/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../test-base/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/test/java</directory> - <outputDirectory>examples/src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/test/resources</directory> - <outputDirectory>examples/src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/eclipse</directory> - <outputDirectory>examples</outputDirectory> - </fileSet> - </fileSets> -</assembly> Copied: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml 2009-04-23 18:57:59 UTC (rev 4608) @@ -0,0 +1,175 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>jbpm.distribution</id> + <finalName>jbpm-${version}</finalName> + + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>jbpm-${version}</baseDirectory> + + <!-- Dependency Sets --> + <dependencySets> + <!-- lib --> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>test</scope> + <unpack>false</unpack> + </dependencySet> + <dependencySet> + <includes> + <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> + </includes> + <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> + <outputDirectory>gpd</outputDirectory> + </dependencySet> + <!-- resources --> + <dependencySet> + <outputDirectory>resources/jbpm-enterprise-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-enterprise:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>resources/jbpm-spi-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-spi:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>resources/jbpm-console-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-console-integration:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>resources/jbpm-jboss5-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-jboss5:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>resources/jbpm-jboss4-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-jboss4:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + </dependencySets> + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <includes> + <include>jboss.eula.txt</include> + <include>license.txt</include> + <include>readme.html</include> + </includes> + <outputDirectory></outputDirectory> + </fileSet> + <fileSet> + <directory>../api/target/apidocs</directory> + <outputDirectory>doc/javadocs</outputDirectory> + </fileSet> + <fileSet> + <directory>../api/target/schemadoc</directory> + <outputDirectory>doc/schemadoc</outputDirectory> + </fileSet> + <fileSet> + <directory>../devguide/target/docbook/publish/en</directory> + <outputDirectory>doc/devguide</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../userguide/target/docbook/publish/en</directory> + <outputDirectory>doc/userguide</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../api/target/schemadocs</directory> + <outputDirectory>doc/schemadocs</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../api/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../api/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../log/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../pvm/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../pvm/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../jpdl/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../jpdl/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../task/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../task/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../test-base/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/test/java</directory> + <outputDirectory>examples/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/test/resources</directory> + <outputDirectory>examples/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/eclipse</directory> + <outputDirectory>examples</outputDirectory> + </fileSet> + </fileSets> +</assembly> Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-jbpm-single-jar.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-jbpm-single-jar.xml 2009-04-23 15:16:20 UTC (rev 4607) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-jbpm-single-jar.xml 2009-04-23 18:57:59 UTC (rev 4608) @@ -1,5 +1,12 @@ -<assembly> - <id>package</id> +<?xml version="1.0" encoding="UTF-8"?> + +<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>jbpm.all.jar</id> + <finalName>jbpm</finalName> + <formats> <format>jar</format> </formats>