3:44 p.m.
Author: tom.baeyens(a)jboss.com
Date: 2009-05-05 16:44:27 -0400 (Tue, 05 May 2009)
New Revision: 4739
Modified:
jbpm4/trunk/modules/distro/src/main/files/db/build.xml
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
Log:
property cleanup and and adding descriptions to build scripts
Modified: jbpm4/trunk/modules/distro/src/main/files/db/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-05-05 20:43:51 UTC (rev
4738)
+++ jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-05-05 20:44:27 UTC (rev
4739)
@@ -5,19 +5,16 @@
<!-- DEVELOPER SPECIFIC CONFIGURATIONS -->
<property file="${user.home}/.jbpm4/build.properties" />
- <!-- CONFIGURABLE PROPERTIES -->
+ <!-- JDBC PROPERTIES -->
+ <property file="${user.home}/jdbc/${database}.properties" />
+ <property file="${jbpm.home}/db/jdbc/${database}.properties" />
+
+ <!-- DEFAULT PROPERTY VALUES -->
<property name="database" value="hsqldb" />
<property name="jbpm.parent.dir" value="../.." />
<property name="jbpm.version" value="4.0.0-SNAPSHOT" />
-
- <!-- DERIVED PROPERTIES -->
<property name="jbpm.home"
value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />
- <!-- JDBC PROPERTIES -->
- <property name="jbpm.home"
value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />
- <property file="${jbpm.home}/db/jdbc/${database}.properties" />
-
-
<!-- ### LOG PROPERTIES ################################################# -->
<target name="log.properties">
<echo message="database....... ${database}" />
@@ -29,7 +26,9 @@
</target>
<!-- ### CREATE JBPM SCHEMA ############################################# -->
- <target name="create.jbpm.schema" depends="log.properties">
+ <target name="create.jbpm.schema"
+ depends="log.properties"
+ description="creates the jbpm tables in the database">
<sql driver="${jdbc.driver}"
url="${jdbc.url}"
userid="${jdbc.username}"
@@ -45,7 +44,9 @@
</target>
<!-- ### DROP JBPM SCHEMA ############################################### -->
- <target name="drop.jbpm.schema" depends="log.properties">
+ <target name="drop.jbpm.schema"
+ depends="log.properties"
+ description="drops the jbpm tables from the database">
<sql driver="${jdbc.driver}"
url="${jdbc.url}"
userid="${jdbc.username}"
@@ -61,7 +62,8 @@
</target>
<!-- ### LOAD EXAMPLE IDENTITIES ######################################## -->
- <target name="load.example.identities">
+ <target name="load.example.identities"
+ description="loads the example users and groups into the
database">
<sql driver="${jdbc.driver}"
url="${jdbc.url}"
userid="${jdbc.username}"
@@ -78,7 +80,8 @@
<!-- ### START HSQLDB DATABASE MGR ##################################### -->
- <target name="hsqldb.databasemanager">
+ <target name="hsqldb.databasemanager"
+ description="start the hsqldb database manager">
<java classname="org.hsqldb.util.DatabaseManager"
fork="true">
<arg line="-url jdbc:hsqldb:hsql://localhost:1701"/>
<classpath>
Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-05-05 20:43:51 UTC
(rev 4738)
+++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-05-05 20:44:27 UTC
(rev 4739)
@@ -5,23 +5,17 @@
<!-- DEVELOPER SPECIFIC CONFIGURATIONS -->
<property file="${user.home}/.jbpm4/build.properties" />
- <!-- CONFIGURABLE PROPERTIES -->
+ <!-- JDBC PROPERTIES -->
+ <property file="${user.home}/jdbc/${database}.properties" />
+ <property file="${jbpm.home}/db/jdbc/${database}.properties" />
+
+ <!-- DEFAULT PROPERTY VALUES -->
<property name="database" value="hsqldb" />
+ <property name="jbpm.parent.dir" value="../.." />
<property name="jbpm.version" value="4.0.0-SNAPSHOT" />
- <property name="jbpm.filename" value="jbpm-${jbpm.version}.zip"
/>
<property name="jboss.version" value="5.0.0.GA" />
-
- <!-- DERIVED PROPERTIES -->
- <property name="jbpm.distro.dir"
value="../modules/distro/target" />
- <property name="jbpm.distro.path"
value="${jbpm.distro.dir}/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.home"
value="${workspace}/jboss-${jboss.version}" />
- <property name="jboss.distro.path"
value="${jboss.distro.dir}/${jboss.filename}" />
+ <property name="jbpm.home"
value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />
- <!-- JDBC PROPERTIES -->
- <property file="${jbpm.home}/db/jdbc/${database}.properties" />
-
<!-- ### LOG PROPERTIES ################################################# -->
<target name="log.properties">
<echo message="database: ${database}" />
Modified: jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 2009-05-05 20:43:51 UTC (rev
4738)
+++ jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 2009-05-05 20:44:27 UTC (rev
4739)
@@ -5,15 +5,13 @@
<!-- USER SPECIFIC CONFIGURATIONS -->
<property file="${user.home}/.jbpm4/build.properties" />
- <!-- CONFIGURABLE PROPERTIES -->
+ <!-- DEFAULT PROPERTY VALUES -->
<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-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 -->
<property name="eclipse.parent.dir" value="${jbpm.home}" />
<property name="eclipse.distro.path"
value="${eclipse.distro.dir}/${eclipse.filename}" />
@@ -25,7 +23,9 @@
</target>
<!-- ### INSTALL ECLIPSE ################################################ -->
- <target name="install.eclipse" depends="log.properties,
get.eclipse">
+ <target name="install.eclipse"
+ depends="log.properties, get.eclipse"
+ description="unzips eclipse, downloads eclipse if it is not available in
${eclipse.distro.dir}">
<unzip src="${eclipse.distro.path}" dest="${jbpm.home}" />
</target>
@@ -33,12 +33,15 @@
<condition property="is.eclipse.distro.available">
<available file="${eclipse.distro.path}" />
</condition>
- <target name="get.eclipse"
unless="is.eclipse.distro.available">
+ <target name="get.eclipse"
+ unless="is.eclipse.distro.available"
+ description="downloads eclipse to ${eclipse.distro.dir}">
<get src="${eclipse.distro.url}" dest="${eclipse.distro.path}"
/>
</target>
<!-- ### START ECLIPSE ################################################## -->
- <target name="start.eclipse">
+ <target name="start.eclipse"
+ description="starts eclipse">
<exec executable="cmd" os="Windows Vista, Windows XP,Windows
2000,Windows 98">
<arg line="/C start "${jbpm.home}/eclipse/eclipse.exe"
"-data" "${jbpm.home}/workspace"" />
</exec>
Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-05-05 20:43:51 UTC (rev
4738)
+++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-05-05 20:44:27 UTC (rev
4739)
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="jbpm.jboss.install">
-
+
<!-- DEVELOPER SPECIFIC CONFIGURATIONS -->
<property file="${user.home}/.jbpm4/build.properties" />
- <!-- CONFIGURABLE PROPERTIES -->
+ <!-- JDBC PROPERTIES -->
+ <property file="${user.home}/jdbc/${database}.properties" />
+ <property file="${jbpm.home}/jdbc/${database}.properties" />
+
+ <!-- DEFAULT PROPERTY VALUES -->
<property name="database" value="hsqldb" />
<property name="jbpm.version" value="4.0.0-SNAPSHOT" />
<property name="jbpm.parent.dir" value="../.." />
@@ -15,17 +19,12 @@
<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 -->
<property name="jboss.filename"
value="jboss-${jboss.version}.zip" />
<property name="jboss.home"
value="${jboss.parent.dir}/jboss-${jboss.version}" />
<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}" />
- <!-- JDBC PROPERTIES -->
- <property file="${jbpm.home}/jdbc/${database}.properties" />
-
<!-- ### LOG PROPERTIES ################################################# -->
<target name="log.properties">
<echo message="database.................... ${database}" />
@@ -38,49 +37,57 @@
<echo message="jboss.server.config.dir..... ${jboss.server.config.dir}"
/>
</target>
- <!-- CONDITIONS -->
+ <!-- CONDITIONS -->
<condition property="jboss.version.5">
- <or>
- <equals arg1="${jboss.version}" arg2="5.0.0.GA" />
- <equals arg1="${jboss.version}" arg2="5.0.1.GA" />
- <equals arg1="${jboss.version}" arg2="5.1.0.GA" />
- </or>
+ <or>
+ <equals arg1="${jboss.version}" arg2="5.0.0.GA" />
+ <equals arg1="${jboss.version}" arg2="5.0.1.GA" />
+ <equals arg1="${jboss.version}" arg2="5.1.0.GA" />
+ </or>
</condition>
<!-- ### REINSTALL JBOSS ################################################ -->
<target name="reinstall.jboss"
depends="log.properties, delete.jboss.installation, install.jboss"
- description="re-installs jboss and then installs jbpm in there"
/>
+ description="deletes the previous jboss installation and re-installs
jboss" />
<!-- ### DELETE JBOSS ################################################### -->
- <target name="delete.jboss.installation"
depends="log.properties">
+ <target name="delete.jboss.installation"
+ depends="log.properties"
+ description="deletes jboss installation">
<delete dir="${jboss.home}" />
</target>
<!-- ### INSTALL JBOSS ################################################## -->
- <target name="install.jboss" depends="log.properties,
get.jboss">
+ <target name="install.jboss"
+ depends="log.properties, get.jboss"
+ description="unzips jboss, downloads jboss to $jboss.distro.dir} if its not
available">
<unzip src="${jboss.distro.path}" dest="${jboss.home}/.."
/>
- <chmod perm="a+x" file="${jboss.home}/bin/run.sh"
os="Linux, Mac OS X" />
+ <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">
+ <target name="get.jboss"
+ unless="is.jboss.distro.available"
+ description="downloads jboss into ${jboss.distro.dir}">
<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">
+ <target name="install.jbpm.into.jboss"
+ depends="log.properties"
+ description="installs jbpm into jboss">
<antcall target="internal.install.jbpm.into.jboss.common" />
<antcall target="internal.install.jbpm.into.jboss.500specifics" />
<antcall target="internal.install.jbpm.into.jboss.db.${database}" />
- </target>
+ </target>
<!-- ### THE JBOSS GENERIC PART ######################################### -->
<target name="internal.install.jbpm.into.jboss.common">
- <!-- copy static configuration files -->
+ <!-- copy static configuration files -->
<copy todir="${jboss.server.config.dir}" overwrite="true">
<fileset dir="${jbpm.home}/jboss/config.common" />
</copy>
@@ -99,7 +106,7 @@
</fileset>
</copy>
- <copy todir="${jboss.server.config.dir}/lib"
overwrite="true">
+ <copy todir="${jboss.server.config.dir}/lib"
overwrite="true">
<fileset dir="${jbpm.home}">
<include name="jbpm.jar" />
</fileset>
@@ -115,7 +122,7 @@
<include name="gwt-console-server.war" />
</fileset>
</copy>
-
+
<copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar"
overwrite="true">
<fileset dir="${jbpm.home}/lib">
<include name="jbpm-console-integration.jar" />
@@ -130,14 +137,14 @@
</fileset>
</copy>
- <mkdir dir="${jboss.home}/docs/examples/jbpm" />
+ <mkdir dir="${jboss.home}/docs/examples/jbpm" />
<copy todir="${jboss.home}/docs/examples/jbpm"
overwrite="true">
<fileset dir="${jbpm.home}/jboss/datasources" />
</copy>
</target>
-
+
<!-- ### THE JBOSS 5 SPECIFIC PART ############################### -->
- <target name="internal.install.jbpm.into.jboss.500specifics"
if="jboss.version.5">
+ <target name="internal.install.jbpm.into.jboss.500specifics"
if="jboss.version.5">
<!-- copy static configuration files -->
<copy todir="${jboss.server.config.dir}" overwrite="true">
<fileset dir="${jbpm.home}/jboss/config.jboss5" />
@@ -154,10 +161,10 @@
<include name="jbpm-jboss5.jar"/>
</fileset>
</copy>
- </target>
-
+ </target>
+
<!-- ### THE HSQLDB SPECIFIC PART ####################################### -->
- <target name="internal.install.jbpm.into.jboss.db.hsqldb" />
+ <target name="internal.install.jbpm.into.jboss.db.hsqldb" />
<!-- ### THE MYSQL SPECIFIC PART ####################################### -->
<target name="internal.install.jbpm.into.jboss.db.mysql">
@@ -170,12 +177,12 @@
<!-- ### THE ORACLE SPECIFIC PART ####################################### -->
<target name="internal.install.jbpm.into.jboss.db.oracle">
- <available file="${jbpm.home}/lib/ojdbc14.jar"
property="oracle.driver.jar.available" />
- <fail message="please download the oracle driver jar ojdbc14.jar from oracle
and put it in the ${jbpm.home}/lib directory"
unless="oracle.driver.jar.available" />
+ <available file="${jbpm.home}/lib/ojdbc14.jar"
property="oracle.driver.jar.available" />
+ <fail message="please download the oracle driver jar ojdbc14.jar from oracle
and put it in the ${jbpm.home}/lib directory"
unless="oracle.driver.jar.available" />
<copy file="${jbpm.home}/lib/ojdbc14.jar"
- todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" />
+ todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar"
/>
</target>
-
+
<!-- ### THE POSTGRESQL SPECIFIC PART ################################### -->
<target name="internal.install.jbpm.into.jboss.db.postgresql">
<copy file="${jbpm.home}/lib/postgresql.jar"
@@ -183,23 +190,27 @@
</target>
<!-- ### START JBOSS ################################################### -->
- <target name="start.jboss" depends="log.properties"
description="starts jboss and waits till jboss is booted, then lets jboss run in the
background">
+ <target name="start.jboss"
+ depends="log.properties"
+ description="starts jboss and waits till jboss is booted, then lets jboss
run in the background">
<taskdef name="start-jboss"
classname="org.jbpm.pvm.internal.ant.StartJBossTask">
<classpath>
<fileset dir="${jbpm.home}">
<include name="jbpm.jar" />
</fileset>
- </classpath>
+ </classpath>
</taskdef>
- <start-jboss jbosshome="${jboss.home}" />
- </target>
+ <start-jboss jbosshome="${jboss.home}" />
+ </target>
<!-- ### STOP JBOSS ################################################### -->
- <target name="stop.jboss" depends="log.properties"
description="signals jboss to stop, but doesn't wait till its finished">
- <exec executable="${jboss.home}/bin/shutdown.bat" os="Windows Vista,
Windows XP,Windows 2000,Windows 98">
- <arg line="-S"/>
- </exec>
+ <target name="stop.jboss"
+ depends="log.properties"
+ description="signals jboss to stop, but doesn't wait till its
finished">
+ <exec executable="${jboss.home}/bin/shutdown.bat" os="Windows
Vista, Windows XP,Windows 2000,Windows 98">
+ <arg line="-S"/>
+ </exec>
</target>
</project>
Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml 2009-05-05 20:43:51 UTC (rev 4738)
+++ jbpm4/trunk/qa/build.xml 2009-05-05 20:44:27 UTC (rev 4739)
@@ -17,7 +17,8 @@
<!-- DERIVED PROPERTIES -->
<property name="jbpm.filename"
value="jbpm-distro-${jbpm.version}.zip" />
- <property name="jbpm.distro.path"
value="../modules/distro/target/jbpm-${jbpm.version}.zip" />
+ <property name="jbpm.distro.dir"
value="../modules/distro/target" />
+ <property name="jbpm.distro.path"
value="${jbpm.distro.dir}/jbpm-${jbpm.version}.zip" />
<property name="jbpm.home"
value="${workspace}/jbpm-${jbpm.version}" />
<!-- ### LOG PROPERTIES ################################################# -->
@@ -29,17 +30,23 @@
</target>
<!-- TARGETS -->
- <target name="delete.jbpm.installation">
+ <target name="delete.jbpm.installation"
+ description="deletes ${jbpm.home}">
<delete dir="${jbpm.home}" />
</target>
- <target name="install.jbpm">
- <unzip src="${jbpm.distro.path}" dest="${jbpm.home}/.." />
+ <target name="install.jbpm"
+ description="unzips the jbpm distro file in the
${jbpm.parent.dir}">
+ <unzip src="${jbpm.distro.path}" dest="${jbpm.parent.dir}"
/>
</target>
- <target name="reinstall.jbpm" depends="delete.jbpm.installation,
install.jbpm" />
+ <target name="reinstall.jbpm"
+ depends="delete.jbpm.installation, install.jbpm"
+ description="deletes the jbpm installation and then reinstalls
jbpm"/>
- <target name="integration.testrun.setup" depends="log.properties,
reinstall.jbpm, post.install">
+ <target name="integration.testrun.setup"
+ depends="log.properties, reinstall.jbpm, post.install"
+ description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss,
starts jboss and then creates the jbpm schema">
<ant antfile="${jbpm.home}/jboss/build.xml"
target="reinstall.jboss" />
<ant antfile="${jbpm.home}/jboss/build.xml"
target="install.jbpm.into.jboss" />
<ant antfile="${jbpm.home}/jboss/build.xml"
target="start.jboss" />
@@ -62,19 +69,24 @@
todir="${jbpm.home}/lib"/>
</target>
- <target name="integration.testrun.teardown">
+ <target name="integration.testrun.teardown"
+ description="drops the jbpm schema and stops jboss">
<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">
+ <target name="manual.testrun.setup"
+ depends="log.properties, integration.testrun.setup"
+ description="full integration testrun setup, deploys the examples, loads
the identities, installs eclipse and then starts eclipse">
<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">
+ <target name="manual.testrun.teardown"
+ depends="log.properties"
+ description="stops jboss">
<ant antfile="${jbpm.home}/jboss/build.xml"
target="stop.jboss" />
</target>