Author: tom.baeyens(a)jboss.com
Date: 2009-05-01 10:59:52 -0400 (Fri, 01 May 2009)
New Revision: 4691
Added:
jbpm4/trunk/qa/manual.testrun.setup.bat
Removed:
jbpm4/trunk/qa/jbossremote/
jbpm4/trunk/qa/test.distribution.bat
Modified:
jbpm4/trunk/modules/distro/src/main/files/examples/build.xml
jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml
jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
jbpm4/trunk/qa/build.xml
jbpm4/trunk/qa/jbpm4-jboss.sh
Log:
added script to support manual test runs
Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-05-01 12:22:18 UTC
(rev 4690)
+++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-05-01 14:59:52 UTC
(rev 4691)
@@ -47,23 +47,24 @@
destdir="${jbpm.home}/examples/target/classes"
classpathref="jbpm.libs.incl.dependencies" />
<copy todir="${jbpm.home}/examples/target/classes">
- <fileset dir="src">
+ <fileset dir="${jbpm.home}/examples/src">
<exclude name="**/*.java" />
</fileset>
</copy>
- <copy
tofile="${jbpm.home}/examples/target/classes/jbpm.hibernate.cfg.xml"
overwrite="true">
+ <copy file="${jbpm.home}/db/hibernate.cfg/${database}.hibernate.cfg.xml"
+ tofile="${jbpm.home}/examples/target/classes/jbpm.hibernate.cfg.xml"
+ overwrite="true">
<filterset filtersfile="${jbpm.home}/db/jdbc/${database}.properties"
/>
- <fileset
dir="${jbpm.home}/db/hibernate.cfg/${database}.hibernate.cfg.xml" />
</copy>
- <jar destfile="target/examples.bar">
- <fileset dir="src">
+ <jar destfile="${jbpm.home}/examples/target/examples.bar">
+ <fileset dir="${jbpm.home}/examples/src">
<include name="**/*.jpdl.xml" />
</fileset>
</jar>
<taskdef name="jbpm-deploy"
classname="org.jbpm.pvm.internal.ant.JbpmDeployTask"
classpathref="jbpm.libs.incl.dependencies" />
- <jbpm-deploy file="target/examples.bar" />
+ <jbpm-deploy file="${jbpm.home}/examples/target/examples.bar" />
</target>
</project>
Modified: jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 2009-05-01 12:22:18 UTC (rev
4690)
+++ jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 2009-05-01 14:59:52 UTC (rev
4691)
@@ -9,8 +9,8 @@
<property name="jbpm.parent.dir" value="../.." />
<property name="jbpm.version" value="4.0.0-SNAPSHOT" />
<property name="jbpm.home"
value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> <!-- jbpm.home should
not be configured. change jbpm.parent.dir instead -->
- <property name="eclipse.filename"
value="eclipse-jee-ganymede-SR1-win32.zip" />
- <property name="eclipse.distro.url"
value="http://todo/find/public/eclipse/distro/url" />
+ <property name="eclipse.filename"
value="eclipse-jee-ganymede-SR2-win32.zip" />
+ <property name="eclipse.distro.url"
value="http://mirror.cc.vt.edu/pub/eclipse/technology/epp/downloads/...
/>
<property name="eclipse.distro.dir"
value="${jbpm.home}/downloads" />
<!-- DERIVED PROPERTIES -->
Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-05-01 12:22:18 UTC (rev
4690)
+++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-05-01 14:59:52 UTC (rev
4691)
@@ -12,6 +12,8 @@
<property name="jbpm.home"
value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> <!-- jbpm.home should
not be configured. change jbpm.parent.dir instead -->
<property name="jboss.version" value="5.0.0.GA" />
<property name="jboss.distro.dir" value="${jbpm.home}/downloads"
/>
+ <property name="jboss.distro.filename"
value="jboss-${jboss.version}.zip" />
+ <property name="jboss.distro.url"
value="http://downloads.sourceforge.net/jboss/${jboss.distro.filenam... />
<property name="jboss.parent.dir" value="${jbpm.home}" />
<!-- DERIVED PROPERTIES -->
@@ -41,20 +43,29 @@
<equals arg1="${jboss.version}" arg2="5.0.0.GA" />
</condition>
- <!-- ### JBOSS INSTALLATION TARGETS ##################################### -->
+ <!-- ### REINSTALL JBOSS ################################################ -->
<target name="reinstall.jboss"
depends="log.properties, delete.jboss.installation, install.jboss"
description="re-installs jboss and then installs jbpm in there"
/>
+ <!-- ### DELETE JBOSS ################################################### -->
<target name="delete.jboss.installation"
depends="log.properties">
<delete dir="${jboss.home}" />
</target>
- <target name="install.jboss" depends="log.properties">
+ <!-- ### INSTALL JBOSS ################################################## -->
+ <target name="install.jboss" depends="log.properties,
get.jboss">
<unzip src="${jboss.distro.path}" dest="${jboss.home}/.."
/>
<chmod perm="a+x" file="${jboss.home}/bin/run.sh"
os="Linux, Mac OS X" />
</target>
+ <!-- ### GET JBOSS ###################################################### -->
+ <condition property="is.jboss.distro.available">
+ <available file="${jboss.distro.path}" />
+ </condition>
+ <target name="get.jboss" unless="is.jboss.distro.available">
+ <get src="${jboss.distro.url}" dest="${jboss.distro.path}"
/>
+ </target>
<!-- ### MAIN TARGET TO INSTALL JBPM INTO JBOSS ######################### -->
<target name="install.jbpm.into.jboss" depends="log.properties"
description="installs jBPM into JBoss">
Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml 2009-05-01 12:22:18 UTC (rev 4690)
+++ jbpm4/trunk/qa/build.xml 2009-05-01 14:59:52 UTC (rev 4691)
@@ -45,23 +45,23 @@
<ant antfile="${jbpm.home}/jboss/build.xml"
target="install.jbpm.into.jboss" />
<ant antfile="${jbpm.home}/jboss/build.xml"
target="start.jboss" />
<copy file="db/${database}.properties"
tofile="${jbpm.home}/db/jdbc/${database}.properties" overwrite="true"
/>
- <ant antfile="${jbpm.home}/db/build.xml"
target="create.jbpm.schema" inheritall="false">
- <property name="database" value="${database}" />
- <property name="jbpm.parent.dir" value="${jbpm.parent.dir}"
/>
- <property name="jboss.version" value="${jboss.version}"
/>
- <property name="jboss.distro.dir"
value="${jboss.distro.dir}" />
- <property name="jboss.parent.dir"
value="${jboss.parent.dir}" />
- </ant>
+ <ant antfile="${jbpm.home}/db/build.xml"
target="create.jbpm.schema" />
</target>
<target name="integration.testrun.teardown">
- <ant antfile="${jbpm.home}/db/build.xml"
target="drop.jbpm.schema" inheritall="false">
- <property name="database" value="${database}" />
- <property name="jbpm.parent.dir" value="${jbpm.parent.dir}"
/>
- <property name="jboss.version" value="${jboss.version}"
/>
- <property name="jboss.distro.dir"
value="${jboss.distro.dir}" />
- <property name="jboss.parent.dir"
value="${jboss.parent.dir}" />
- </ant>
+ <ant antfile="${jbpm.home}/db/build.xml"
target="drop.jbpm.schema" />
<ant antfile="${jbpm.home}/jboss/build.xml"
target="stop.jboss" />
</target>
+
+ <target name="manual.testrun.setup" depends="log.properties,
integration.testrun.setup">
+ <ant antfile="${jbpm.home}/examples/build.xml"
target="deploy.examples" />
+ <ant antfile="${jbpm.home}/db/build.xml"
target="load.example.identities" />
+ <ant antfile="${jbpm.home}/gpd/build.xml"
target="install.eclipse" />
+ <ant antfile="${jbpm.home}/gpd/build.xml"
target="start.eclipse" />
+ </target>
+
+ <target name="manual.testrun.teardown"
depends="log.properties">
+ <ant antfile="${jbpm.home}/jboss/build.xml"
target="stop.jboss" />
+ </target>
+
</project>
Modified: jbpm4/trunk/qa/jbpm4-jboss.sh
===================================================================
--- jbpm4/trunk/qa/jbpm4-jboss.sh 2009-05-01 12:22:18 UTC (rev 4690)
+++ jbpm4/trunk/qa/jbpm4-jboss.sh 2009-05-01 14:59:52 UTC (rev 4691)
@@ -2,12 +2,9 @@
#
# runs the jboss integration test suite
-ANT_PROPERTIES="-Ddatabase=$DATABASE -Djboss.version=$JBOSS_VERSION
-Dworkspace=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss"
+ANT_PROPERTIES="-Ddatabase=$DATABASE -Djboss.version=$JBOSS_VERSION
-Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss"
-echo database.......... $DATABASE
-echo jboss.version..... $JBOSS_VERSION
-echo workspace......... $WORKSPACE
-echo jboss.distro.dir.. $SOURCE_REPO/jboss
+echo ANT_PROPERTIES=${ANT_PROPERTIES}
echo just in case the previous run didnt complete ok, we stop jboss
ant -f modules/distro/src/main/files/jboss/build.xml $ANT_PROPERTIES stop.jboss
Copied: jbpm4/trunk/qa/manual.testrun.setup.bat (from rev 4690,
jbpm4/trunk/qa/test.distribution.bat)
===================================================================
--- jbpm4/trunk/qa/manual.testrun.setup.bat (rev 0)
+++ jbpm4/trunk/qa/manual.testrun.setup.bat 2009-05-01 14:59:52 UTC (rev 4691)
@@ -0,0 +1,2 @@
+cmd /C mvn -Pdistro clean install
+cmd /C ant -f qa/build.xml manual.testrun.setup
Deleted: jbpm4/trunk/qa/test.distribution.bat
===================================================================
--- jbpm4/trunk/qa/test.distribution.bat 2009-05-01 12:22:18 UTC (rev 4690)
+++ jbpm4/trunk/qa/test.distribution.bat 2009-05-01 14:59:52 UTC (rev 4691)
@@ -1,2 +0,0 @@
-cmd /C mvn -Pdistro clean install
-cmd /C ant -f qa/build.xml integration.testrun.setup