[jbpm-commits] JBoss JBPM SVN: r4647 - in jbpm4/trunk: modules/distro/src/main/files/jboss and 1 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-04-28 03:45:57 -0400 (Tue, 28 Apr 2009) New Revision: 4647 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 Log: properties cleanup in the ci driver scripts Modified: jbpm4/trunk/modules/distro/src/main/files/db/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-04-27 22:47:15 UTC (rev 4646) +++ jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-04-28 07:45:57 UTC (rev 4647) @@ -8,48 +8,26 @@ <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> <property file="${user.home}/.jbpm4/build.properties" /> - <!-- DISPLAY INPUT PARAMETERS --> - <echo message="database: ${database}" /> - <fail message="property database not specified. specify -Ddatabase=... on the command line or add database=... in your ${user.home}/.jbpm4/build.properties" unless="database" /> - - <echo message="jboss.version: ${jboss.version}" /> - <fail message="property jboss.version not specified. specify -Djboss.version=... on the command line or add jboss.version=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.version" /> - - <echo message="workspace: ${workspace}" /> - <fail message="property workspace not specified. specify -Dworkspace=... on the command line or add workspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> - - <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="database" value="hsqldb" /> <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> <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.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="jboss.server.configuration" value="default" /> - <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> <!-- ### 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.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.server.configuration: ${jboss.server.configuration}" /> - <echo message="jboss.server.config.dir: ${jboss.server.config.dir}" /> - </target> - + <echo message="jdbc.driver.... ${jdbc.driver}" /> + <echo message="jdbc.url....... ${jdbc.url}" /> + <echo message="jdbc.username.. ${jdbc.username}" /> + <echo message="jdbc.password.. ${jdbc.password}" /> + <echo message="jbpm.home...... ${jbpm.home}" /> + <echo message="database....... ${database}" /> + </target> + <!-- ### CREATE JBPM SCHEMA ############################################# --> <target name="create.jbpm.schema" depends="log.properties"> + <fail message="property 'workspace' not specified. workspace is the directory in which jbpm and jboss will be installed. specify -Dworkspace=... on the command line or add workspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> <sql driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}" @@ -65,7 +43,8 @@ </target> <!-- ### DROP JBPM SCHEMA ############################################### --> - <target name="drop.jbpm.schema"> + <target name="drop.jbpm.schema" depends="log.properties"> + <fail message="property 'workspace' not specified. workspace is the directory in which jbpm and jboss will be installed. specify -Dworkspace=... on the command line or add workspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> <sql driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}" @@ -82,6 +61,7 @@ <!-- ### START HSQLDB DATABASE MGR ##################################### --> <target name="hsqldb.databasemanager"> + <fail message="property 'workspace' not specified. workspace is the directory in which jbpm and jboss will be installed. specify -Dworkspace=... on the command line or add workspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> <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/jboss/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-27 22:47:15 UTC (rev 4646) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-04-28 07:45:57 UTC (rev 4647) @@ -8,24 +8,13 @@ <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> <property file="${user.home}/.jbpm4/build.properties" /> - <!-- DISPLAY INPUT PARAMETERS --> - <echo message="database: ${database}" /> - <fail message="property database not specified. specify -Ddatabase=... on the command line or add database=... in your ${user.home}/.jbpm4/build.properties" unless="database" /> - - <echo message="jboss.version: ${jboss.version}" /> - <fail message="property jboss.version not specified. specify -Djboss.version=... on the command line or add jboss.version=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.version" /> - - <echo message="workspace: ${workspace}" /> - <fail message="property workspace not specified. specify -Dworkspace=... on the command line or add workspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> - - <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="database" value="hsqldb" /> <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> <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.home" value="${workspace}/jbpm-${jbpm.version}" /> + <property name="jboss.version" value="5.0.0.GA" /> <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}" /> @@ -34,6 +23,7 @@ <!-- ### LOG PROPERTIES ################################################# --> <target name="log.properties"> + <echo message="database: ${database}" /> <echo message="jdbc.driver: ${jdbc.driver}" /> <echo message="jdbc.url: ${jdbc.url}" /> <echo message="jdbc.username: ${jdbc.username}" /> @@ -41,6 +31,7 @@ <echo message="jbpm.filename: ${jbpm.filename}" /> <echo message="jbpm.distro.path: ${jbpm.distro.path}" /> <echo message="jbpm.home: ${jbpm.home}" /> + <echo message="jboss.version: ${jboss.version}" /> <echo message="jboss.filename: ${jboss.filename}" /> <echo message="jboss.distro.path: ${jboss.distro.path}" /> <echo message="jboss.home: ${jboss.home}" /> @@ -56,16 +47,32 @@ <equals arg1="${database}" arg2="hsqldb" /> </condition> - <!-- TARGETS --> + <!-- ### JBOSS INSTALLATION TARGETS ##################################### --> + <target name="reinstall.jboss" + depends="log.properties, delete.jboss.installation, install.jboss" + description="re-installs jboss and then installs jbpm in there" /> + + <target name="delete.jboss.installation" depends="log.properties"> + <delete dir="${jboss.home}" /> + </target> + + <target name="install.jboss" depends="log.properties"> + <fail message="property 'jboss.distro.dir' not specified. jboss.distro.dir should point to a directory that contains the jboss distribution zip file(s). specify -Djboss.distro.dir=... on the command line or add jboss.distro.dir=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.distro.dir" /> + <fail message="property 'workspace' not specified. workspace is the directory in which jbpm and jboss will be installed. specify -Dworkspace=... on the command line or add workspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> + <unzip src="${jboss.distro.path}" dest="${jboss.home}/.." /> + </target> + <!-- ### MAIN TARGET TO INSTALL JBPM INTO JBOSS ######################### --> - <target name="install.jbpm.into.jboss" description="installs jBPM into JBoss"> - <antcall target="install.jbpm.into.jboss.common" /> - <antcall target="install.jbpm.into.jboss.500specifics" /> - <antcall target="install.jbpm.into.jboss.db.hsqldb" /> + <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> <!-- ### THE JBOSS GENERIC PART ######################################### --> - <target name="install.jbpm.into.jboss.common"> + <target name="internal.install.jbpm.into.jboss.common"> + <fail message="property 'workspace' not specified. workspace is the directory in which jbpm and jboss will be installed. specify -Dworkspace=... on the command line or add workspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> + <!-- copy static configuration files --> <copy todir="${jboss.server.config.dir}" overwrite="true"> <fileset dir="${jbpm.home}/jboss/config.common" /> @@ -111,7 +118,7 @@ </target> <!-- ### THE JBOSS 5.0.0.GA SPECIFIC PART ############################### --> - <target name="install.jbpm.into.jboss.500specifics" if="jboss.version.500"> + <target name="internal.install.jbpm.into.jboss.500specifics" if="jboss.version.500"> <!-- copy static configuration files --> <copy todir="${jboss.server.config.dir}" overwrite="true"> <fileset dir="${jbpm.home}/jboss/config.jboss5" /> @@ -128,7 +135,7 @@ </target> <!-- ### THE HSQLDB SPECIFIC PART ####################################### --> - <target name="install.jbpm.into.jboss.db.hsqldb" if="database.hsqldb"> + <target name="internal.install.jbpm.into.jboss.db.hsqldb" if="database.hsqldb"> <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> <fileset dir="${jbpm.home}/jboss/datasources"> <include name="jbpm-hsqldb-ds.xml"/> @@ -137,7 +144,7 @@ </target> <!-- ### THE MYSQL SPECIFIC PART ####################################### --> - <target name="install.jbpm.into.jboss.db.mysql" if="database.mysql"> + <target name="internal.install.jbpm.into.jboss.db.mysql" if="database.mysql"> <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> <fileset dir="${jbpm.home}/jboss/datasources"> <!-- TODO define jdbc property filters --> @@ -152,7 +159,7 @@ </target> <!-- ### THE ORACLE SPECIFIC PART ####################################### --> - <target name="install.jbpm.into.jboss.db.oracle" if="database.oracle"> + <target name="internal.install.jbpm.into.jboss.db.oracle" if="database.oracle"> <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> <!-- TODO define jdbc property filters --> <fileset dir="${jbpm.home}/jboss/datasources"> @@ -162,21 +169,9 @@ </target> - <!-- ### JBOSS INSTALLATION TARGETS ##################################### --> - <target name="reinstall.jboss" - depends="delete.jboss.installation, install.jboss" - description="re-installs jboss and then installs jbpm in there" /> - - <target name="delete.jboss.installation"> - <delete dir="${jboss.home}" /> - </target> - - <target name="install.jboss"> - <unzip src="${jboss.distro.path}" dest="${jboss.home}/.." /> - </target> - <!-- ### START JBOSS ################################################### --> <target name="start.jboss" description="starts jboss and waits till jboss is booted, then lets jboss run in the background"> + <fail message="property 'workspace' not specified. workspace is the directory in which jbpm and jboss will be installed. specify -Dworkspace=... on the command line or add workspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> <taskdef name="start-jboss" classname="org.jbpm.pvm.internal.ant.StartJBossTask"> <classpath> @@ -190,6 +185,7 @@ <!-- ### STOP JBOSS ################################################### --> <target name="stop.jboss" description="signals jboss to stop, but doesn't wait till its finished"> + <fail message="property 'workspace' not specified. workspace is the directory in which jbpm and jboss will be installed. specify -Dworkspace=... on the command line or add workspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> <exec executable="${jboss.home}/bin/shutdown.bat" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> <arg line="-S"/> </exec> Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2009-04-27 22:47:15 UTC (rev 4646) +++ jbpm4/trunk/qa/build.xml 2009-04-28 07:45:57 UTC (rev 4647) @@ -5,24 +5,13 @@ <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> <property file="${user.home}/.jbpm4/build.properties" /> - <!-- DISPLAY INPUT PARAMETERS --> - <echo message="database: ${database}" /> - <fail message="property database not specified. specify -Ddatabase=... on the command line or add database=... in your ${user.home}/.jbpm4/build.properties" unless="database" /> - - <echo message="jboss.version: ${jboss.version}" /> - <fail message="property jboss.version not specified. specify -Djboss.version=... on the command line or add jboss.version=... in your ${user.home}/.jbpm4/build.properties" unless="jboss.version" /> - - <echo message="workspace: ${workspace}" /> - <fail message="property workspace not specified. specify -Dworkspace=... on the command line or add workspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> - - <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="database" value="hsqldb" /> <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> <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.home" value="${workspace}/jbpm-${jbpm.version}" /> + <property name="jboss.version" value="5.0.0.GA" /> <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}" /> @@ -31,6 +20,7 @@ <!-- ### LOG PROPERTIES ################################################# --> <target name="log.properties"> + <echo message="database: ${database}" /> <echo message="jdbc.driver: ${jdbc.driver}" /> <echo message="jdbc.url: ${jdbc.url}" /> <echo message="jdbc.username: ${jdbc.username}" /> @@ -38,6 +28,7 @@ <echo message="jbpm.filename: ${jbpm.filename}" /> <echo message="jbpm.distro.path: ${jbpm.distro.path}" /> <echo message="jbpm.home: ${jbpm.home}" /> + <echo message="jboss.version: ${jboss.version}" /> <echo message="jboss.filename: ${jboss.filename}" /> <echo message="jboss.distro.path: ${jboss.distro.path}" /> <echo message="jboss.home: ${jboss.home}" /> @@ -47,10 +38,12 @@ <!-- TARGETS --> <target name="delete.jbpm.installation"> + <fail message="property 'workspace' not specified. workspace is the directory in which jbpm and jboss will be installed. specify -Dworkspace=... on the command line or add workspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> <delete dir="${jbpm.home}" /> </target> <target name="install.jbpm"> + <fail message="property workspace not specified. specify -Dworkspace=... on the command line or add workspace=... in your ${user.home}/.jbpm4/build.properties" unless="workspace" /> <unzip src="${jbpm.distro.path}" dest="${jbpm.home}/.." /> </target>