[jbpm-commits] JBoss JBPM SVN: r5019 - in jbpm3/branches/jbpm-3.2-soa/modules: distribution/src/main/resources/installer and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Jun 9 18:21:22 EDT 2009
Author: alex.guizar at jboss.com
Date: 2009-06-09 18:21:22 -0400 (Tue, 09 Jun 2009)
New Revision: 5019
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml
Log:
JBPM-2291: Process project creation wizard in JBDS 2.0 fails to create a complete sample project (RESOLVED)
Update the distribution script so that the installed examples conform to the layout produced by the process project wizard.
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-06-09 19:48:25 UTC (rev 5018)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/antrun-installer.xml 2009-06-09 22:21:22 UTC (rev 5019)
@@ -1,14 +1,5 @@
<?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$ -->
<project>
@@ -62,6 +53,28 @@
<!-- ================================================================== -->
<!-- Configuration -->
<!-- ================================================================== -->
+ <target name="reorganize-example">
+ <basename file="${basedir}" property="example.dir"/>
+ <echo message="${example.dir}" />
+ <!-- copy jpdl resources -->
+ <mkdir dir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl/${example.dir}"/>
+ <copy todir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/jpdl/${example.dir}">
+ <fileset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/resources/${example.dir}"/>
+ </copy>
+ <!-- copy main java files -->
+ <mkdir dir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/java"/>
+ <copy todir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/main/java">
+ <fileset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/java"
+ includes="org/jbpm/examples/${example.dir}/**" excludes="org/jbpm/examples/${example.dir}/*Test.java"/>
+ </copy>
+ <!-- copy test java files -->
+ <mkdir dir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/test/java"/>
+ <copy todir="${deploy.artifacts.resources}/jbpm-examples-dist/${example.dir}/src/test/java">
+ <fileset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/java"
+ includes="org/jbpm/examples/${example.dir}/*Test.java"/>
+ </copy>
+ </target>
+
<target name="configure" depends="init">
<property name="hsqldb.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml"/>
@@ -110,6 +123,9 @@
<equals arg1="${database}" arg2="oracle"/>
</condition>
+ <subant genericantfile="${ant.file}" target="reorganize-example" inheritall="yes">
+ <dirset dir="${deploy.artifacts.resources}/jbpm-examples-examples/src/test/resources" includes="*"/>
+ </subant>
</target>
<!-- ================================================================== -->
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-deploy-artifacts.xml 2009-06-09 19:48:25 UTC (rev 5018)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/scripts/assembly-deploy-artifacts.xml 2009-06-09 22:21:22 UTC (rev 5019)
@@ -50,6 +50,14 @@
</includes>
<unpack>true</unpack>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>resources/jbpm-examples-examples</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:jbpm-examples:jar:examples</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
<!-- sources -->
<dependencySet>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-06-09 19:48:25 UTC (rev 5018)
+++ jbpm3/branches/jbpm-3.2-soa/modules/distribution/src/main/resources/installer/install-definition.xml 2009-06-09 22:21:22 UTC (rev 5019)
@@ -9,18 +9,12 @@
<appversion>@{product.version}</appversion>
<uninstaller name="remove.task" write="yes" />
</info>
- <guiprefs width="600" height="440" resizable="yes">
- <!--
- <laf name="kunststoff">
- <os family="unix" />
- </laf>
- -->
- </guiprefs>
+ <guiprefs width="600" height="440" resizable="yes" />
<locale>
<langpack iso3="eng" />
</locale>
- <!-- It is necessary to include everything needed, in this case ant self -->
+ <!-- It is necessary to include everything needed, in this case ant itself -->
<jar src="@{deploy.artifacts.dir}/lib/ant.jar" stage="both" />
<jar src="@{deploy.artifacts.dir}/lib/ant-launcher.jar" stage="both" />
@@ -120,43 +114,31 @@
<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/designer
- -->
+ <!-- jbpm3/designer -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/designer" override="true">
<include name="jbpm-jpdl-designer-site.zip" />
</fileset>
<file src="@{deploy.artifacts.dir}/etc/version.info.xml" targetdir="$INSTALL_PATH/src/resources/gpd"
override="true" />
- <!--
- jbpm3/examples
- -->
- <file src="@{deploy.artifacts.dir}/lib/jbpm-examples-examples.jar" targetdir="$INSTALL_PATH/examples" unpack="true" override="true"/>
+ <!-- jbpm3/examples -->
+ <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-examples-dist" targetdir="$INSTALL_PATH/examples" override="true" />
- <!--
- jbpm3/docs
- -->
+ <!-- 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/lib
- -->
+ <!-- jbpm3/lib -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true">
<include name="activation.jar" />
<include name="antlr.jar" />
@@ -176,9 +158,7 @@
<include name="log4j.jar" />
</fileset>
- <!--
- jbpm3/src - Must be called 'src' because the GPD has a dependency on it
- -->
+ <!-- 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/branches/jbpm-3.2-soa/modules/examples/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2009-06-09 19:48:25 UTC (rev 5018)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/pom.xml 2009-06-09 22:21:22 UTC (rev 5019)
@@ -108,7 +108,7 @@
<!--
Repositories
- [JBPM-2050] jBPM exmaples cannot be compiled
+ [JBPM-2050] jBPM examples cannot be compiled
-->
<repositories>
<repository>
@@ -117,33 +117,4 @@
</repository>
</repositories>
- <profiles>
- <!--
- Name: sybase
- Descr: Sybase Database Setup
- -->
- <profile>
- <id>sybase</id>
- <activation>
- <property>
- <name>database</name>
- <value>sybase</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- [JBPM-1827] Investigate example test failures against Sybase -->
- <exclude>org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
More information about the jbpm-commits
mailing list