[jbpm-commits] JBoss JBPM SVN: r4641 - in jbpm4/trunk: modules/distro/src/main/files/jboss and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Apr 27 16:14:49 EDT 2009
Author: tom.baeyens at jboss.com
Date: 2009-04-27 16:14:49 -0400 (Mon, 27 Apr 2009)
New Revision: 4641
Modified:
jbpm4/trunk/modules/distro/src/main/files/db/build.xml
jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
jbpm4/trunk/qa/build.xml
jbpm4/trunk/qa/jbpm4-jboss.sh
Log:
removing the download of jbpm and jboss distro's in the qa driver script: replaced with direct unzip
Modified: jbpm4/trunk/modules/distro/src/main/files/db/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-04-27 16:43:53 UTC (rev 4640)
+++ jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-04-27 20:14:49 UTC (rev 4641)
@@ -18,40 +18,36 @@
<echo message="worspace: ${workspace}" />
<fail message="property worspace not specified. specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" />
- <echo message="maven.repo: ${maven.repo}" />
- <fail message="property maven.repo not specified. specify -Dmaven.repo=... on the command line or add maven.repo=... in your ${user.home}/.jbpm4/build.properties" unless="maven.repo" />
+ <echo message="jboss.distro.dir: ${jboss.distro.dir}" />
+ <fail message="property jboss.distro.dir not specified. specify -Djboss.distro.dir=... on the command line or add jboss.distro.dir=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.distro.dir" />
<!-- DERIVED PROPERTIES -->
<property name="jbpm.version" value="4.0.0-SNAPSHOT" />
<property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" />
- <property name="jbpm.distro.url" value="file:///${maven.repo}/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" />
+ <property name="jbpm.distro.path" value="../modules/distro/target/jbpm-${jbpm.version}.zip" />
<property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" />
<property name="jboss.filename" value="jboss-${jboss.version}.zip" />
- <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" />
<property name="jboss.home" value="${workspace}/jboss-${jboss.version}" />
- <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" />
+ <property name="jboss.distro.path" value="${jboss.distro.dir}/${jboss.filename}" />
<property name="jboss.server.configuration" value="default" />
<property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" />
- <property name="downloads.dir" value="${workspace}/downloads" />
<!-- ### LOG PROPERTIES ################################################# -->
- <target name="log.properties">
+ <target name="log.properties">
<echo message="jdbc.driver: ${jdbc.driver}" />
<echo message="jdbc.url: ${jdbc.url}" />
<echo message="jdbc.username: ${jdbc.username}" />
- <echo message="jbpm.version: ${jbpm.version}" />
- <echo message="jbpm.filename: ${jbpm.filename}" />
- <echo message="jbpm.distro.url: ${jbpm.distro.url}" />
- <echo message="jbpm.home: ${jbpm.home}" />
- <echo message="jboss.filename: ${jboss.filename}" />
- <echo message="jboss.distro.url: ${jboss.distro.url}" />
+ <echo message="jbpm.version: ${jbpm.version}" />
+ <echo message="jbpm.filename: ${jbpm.filename}" />
+ <echo message="jbpm.distro.path: ${jbpm.distro.path}" />
+ <echo message="jbpm.home: ${jbpm.home}" />
+ <echo message="jboss.filename: ${jboss.filename}" />
+ <echo message="jboss.distro.path: ${jboss.distro.path}" />
<echo message="jboss.home: ${jboss.home}" />
- <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" />
- <echo message="jboss.server.configuration: ${jboss.server.configuration}" />
- <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" />
- <echo message="downloads.dir: ${downloads.dir}" />
+ <echo message="jboss.server.configuration: ${jboss.server.configuration}" />
+ <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" />
</target>
-
+
<!-- ### CREATE JBPM SCHEMA ############################################# -->
<target name="create.jbpm.schema" depends="log.properties">
<sql driver="${jdbc.driver}"
Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-27 16:43:53 UTC (rev 4640)
+++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-27 20:14:49 UTC (rev 4641)
@@ -18,21 +18,19 @@
<echo message="worspace: ${workspace}" />
<fail message="property worspace not specified. specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" />
- <echo message="maven.repo: ${maven.repo}" />
- <fail message="property maven.repo not specified. specify -Dmaven.repo=... on the command line or add maven.repo=... in your ${user.home}/.jbpm4/build.properties" unless="maven.repo" />
+ <echo message="jboss.distro.dir: ${jboss.distro.dir}" />
+ <fail message="property jboss.distro.dir not specified. specify -Djboss.distro.dir=... on the command line or add jboss.distro.dir=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.distro.dir" />
<!-- DERIVED PROPERTIES -->
<property name="jbpm.version" value="4.0.0-SNAPSHOT" />
<property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" />
- <property name="jbpm.distro.url" value="file:///${maven.repo}/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" />
+ <property name="jbpm.distro.path" value="../modules/distro/target/jbpm-${jbpm.version}.zip" />
<property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" />
<property name="jboss.filename" value="jboss-${jboss.version}.zip" />
- <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" />
<property name="jboss.home" value="${workspace}/jboss-${jboss.version}" />
- <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" />
+ <property name="jboss.distro.path" value="${jboss.distro.dir}/${jboss.filename}" />
<property name="jboss.server.configuration" value="default" />
<property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" />
- <property name="downloads.dir" value="${workspace}/downloads" />
<!-- ### LOG PROPERTIES ################################################# -->
<target name="log.properties">
@@ -41,17 +39,15 @@
<echo message="jdbc.username: ${jdbc.username}" />
<echo message="jbpm.version: ${jbpm.version}" />
<echo message="jbpm.filename: ${jbpm.filename}" />
- <echo message="jbpm.distro.url: ${jbpm.distro.url}" />
+ <echo message="jbpm.distro.path: ${jbpm.distro.path}" />
<echo message="jbpm.home: ${jbpm.home}" />
<echo message="jboss.filename: ${jboss.filename}" />
- <echo message="jboss.distro.url: ${jboss.distro.url}" />
+ <echo message="jboss.distro.path: ${jboss.distro.path}" />
<echo message="jboss.home: ${jboss.home}" />
- <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" />
<echo message="jboss.server.configuration: ${jboss.server.configuration}" />
<echo message="jboss.server.config.dir: ${jboss.server.config.dir}" />
- <echo message="downloads.dir: ${downloads.dir}" />
</target>
-
+
<!-- CONDITIONS -->
<condition property="jboss.version.500">
<equals arg1="${jboss.version}" arg2="5.0.0.GA" />
@@ -176,16 +172,9 @@
</target>
<target name="install.jboss">
- <available file="${jboss.distro.local.path}" property="jboss.available.locally" />
- <antcall target="get.jboss" />
- <unzip src="${jboss.distro.local.path}" dest="${jboss.home}/.." />
+ <unzip src="${jboss.distro.path}" dest="${jboss.home}/.." />
</target>
- <target name="get.jboss" unless="jboss.available.locally">
- <mkdir dir="${downloads.dir}" />
- <get src="${jboss.distro.url}" dest="${jboss.distro.local.path}" />
- </target>
-
<!-- ### START JBOSS ################################################### -->
<target name="start.jboss" description="starts jboss and waits till jboss is booted, then lets jboss run in the background">
<taskdef name="start-jboss"
Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml 2009-04-27 16:43:53 UTC (rev 4640)
+++ jbpm4/trunk/qa/build.xml 2009-04-27 20:14:49 UTC (rev 4641)
@@ -15,21 +15,19 @@
<echo message="worspace: ${workspace}" />
<fail message="property worspace not specified. specify -Dworspace=... on the command line or add worspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" />
- <echo message="maven.repo: ${maven.repo}" />
- <fail message="property maven.repo not specified. specify -Dmaven.repo=... on the command line or add maven.repo=... in your ${user.home}/.jbpm4/build.properties" unless="maven.repo" />
+ <echo message="jboss.distro.dir: ${jboss.distro.dir}" />
+ <fail message="property jboss.distro.dir not specified. specify -Djboss.distro.dir=... on the command line or add jboss.distro.dir=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.distro.dir" />
<!-- DERIVED PROPERTIES -->
<property name="jbpm.version" value="4.0.0-SNAPSHOT" />
<property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" />
- <property name="jbpm.distro.url" value="file:///${maven.repo}/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" />
+ <property name="jbpm.distro.path" value="../modules/distro/target/jbpm-${jbpm.version}.zip" />
<property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" />
<property name="jboss.filename" value="jboss-${jboss.version}.zip" />
- <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" />
<property name="jboss.home" value="${workspace}/jboss-${jboss.version}" />
- <property name="jboss.distro.local.path" value="${downloads.dir}/${jboss.filename}" />
+ <property name="jboss.distro.path" value="${jboss.distro.dir}/${jboss.filename}" />
<property name="jboss.server.configuration" value="default" />
<property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" />
- <property name="downloads.dir" value="${workspace}/downloads" />
<!-- ### LOG PROPERTIES ################################################# -->
<target name="log.properties">
@@ -38,15 +36,13 @@
<echo message="jdbc.username: ${jdbc.username}" />
<echo message="jbpm.version: ${jbpm.version}" />
<echo message="jbpm.filename: ${jbpm.filename}" />
- <echo message="jbpm.distro.url: ${jbpm.distro.url}" />
+ <echo message="jbpm.distro.path: ${jbpm.distro.path}" />
<echo message="jbpm.home: ${jbpm.home}" />
<echo message="jboss.filename: ${jboss.filename}" />
- <echo message="jboss.distro.url: ${jboss.distro.url}" />
+ <echo message="jboss.distro.path: ${jboss.distro.path}" />
<echo message="jboss.home: ${jboss.home}" />
- <echo message="jboss.distro.local.path: ${jboss.distro.local.path}" />
<echo message="jboss.server.configuration: ${jboss.server.configuration}" />
<echo message="jboss.server.config.dir: ${jboss.server.config.dir}" />
- <echo message="downloads.dir: ${downloads.dir}" />
</target>
<!-- TARGETS -->
@@ -55,14 +51,12 @@
</target>
<target name="install.jbpm">
- <mkdir dir="${downloads.dir}" />
- <get src="${jbpm.distro.url}" dest="${downloads.dir}/${jbpm.filename}" />
- <unzip src="${downloads.dir}/${jbpm.filename}" dest="${jbpm.home}/.." />
+ <unzip src="${jbpm.distro.path}" dest="${jbpm.home}/.." />
</target>
<target name="reinstall.jbpm" depends="delete.jbpm.installation, install.jbpm" />
- <target name="integration.testrun.setup">
+ <target name="integration.testrun.setup" depends="log.properties">
<antcall target="reinstall.jbpm" />
<ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" />
<ant antfile="${jbpm.home}/jboss/build.xml" target="install.jbpm.into.jboss" />
Modified: jbpm4/trunk/qa/jbpm4-jboss.sh
===================================================================
--- jbpm4/trunk/qa/jbpm4-jboss.sh 2009-04-27 16:43:53 UTC (rev 4640)
+++ jbpm4/trunk/qa/jbpm4-jboss.sh 2009-04-27 20:14:49 UTC (rev 4641)
@@ -2,11 +2,12 @@
#
# runs the jboss integration test suite
-ANT_PROPERTIES="-Ddatabase=$DATABASE -Djboss.version=$JBOSS_VERSION -Dworspace=$WORKSPACE -Dmaven.repo=/home/hudson/.m2/repository"
+ANT_PROPERTIES="-Ddatabase=$DATABASE -Djboss.version=$JBOSS_VERSION -Dworspace=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO"
-echo database........ $DATABASE
-echo jboss.version... $JBOSS_VERSION
-echo worspace........ $WORKSPACE
+echo database.......... $DATABASE
+echo jboss.version..... $JBOSS_VERSION
+echo worspace.......... $WORKSPACE
+echo jboss.distro.dir.. $SOURCE_REPO
mvn -Pdistro -Pschemadocs clean install
More information about the jbpm-commits
mailing list