[jbpm-commits] JBoss JBPM SVN: r4690 - in jbpm4/trunk: modules/distro/src/main/files/db and 4 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-05-01 08:22:18 -0400 (Fri, 01 May 2009) New Revision: 4690 Added: jbpm4/trunk/modules/distro/src/main/files/gpd/ jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 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/jboss/build.xml jbpm4/trunk/qa/build.xml Log: enabling build files for distribution usage Modified: jbpm4/trunk/modules/distro/src/main/files/db/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-05-01 09:12:16 UTC (rev 4689) +++ jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-05-01 12:22:18 UTC (rev 4690) @@ -5,14 +5,16 @@ <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> <property file="${user.home}/.jbpm4/build.properties" /> - <!-- DERIVED PROPERTIES --> + <!-- CONFIGURABLE PROPERTIES --> <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-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}" /> + + <!-- 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" /> @@ -28,7 +30,6 @@ <!-- ### 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}" @@ -45,7 +46,6 @@ <!-- ### 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}" @@ -79,7 +79,6 @@ <!-- ### 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/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-05-01 09:12:16 UTC (rev 4689) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-05-01 12:22:18 UTC (rev 4690) @@ -5,21 +5,19 @@ <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> <property file="${user.home}/.jbpm4/build.properties" /> - <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> - <property file="${user.home}/.jbpm4/build.properties" /> - - <!-- DERIVED PROPERTIES --> + <!-- CONFIGURABLE 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="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="jboss.server.configuration" value="default" /> - <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> <!-- JDBC PROPERTIES --> <property file="${jbpm.home}/db/jdbc/${database}.properties" /> @@ -27,19 +25,11 @@ <!-- ### 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}" /> - <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.version: ${jboss.version}" /> - <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}" /> + <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.home.......... ${jbpm.home}" /> </target> <!-- ### DEPLOY EXAMPLE BUSINESS ARCHIVES ############################### --> Added: jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 2009-05-01 12:22:18 UTC (rev 4690) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jbpm.eclipse.install"> + + <!-- USER SPECIFIC CONFIGURATIONS --> + <property file="${user.home}/.jbpm4/build.properties" /> + + <!-- CONFIGURABLE PROPERTIES --> + <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.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}" /> + + <!-- ### LOG PROPERTIES ################################################# --> + <target name="log.properties"> + <echo message="jbpm.version......... ${jbpm.version}" /> + <echo message="jbpm.home............ ${jbpm.home}" /> + <echo message="eclipse.distro.path.. ${eclipse.distro.path}" /> + </target> + + <!-- ### INSTALL ECLIPSE ################################################ --> + <target name="install.eclipse" depends="log.properties, get.eclipse"> + <unzip src="${eclipse.distro.path}" dest="${jbpm.home}" /> + </target> + + <!-- ### GET ECLIPSE ##################################################### --> + <condition property="is.eclipse.distro.available"> + <available file="${eclipse.distro.path}" /> + </condition> + <target name="get.eclipse" unless="is.eclipse.distro.available"> + <get src="${eclipse.distro.url}" dest="${eclipse.distro.path}" /> + </target> + + <!-- ### START ECLIPSE ################################################## --> + <target name="start.eclipse"> + <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> + <arg line="/C start &quot;${jbpm.home}/eclipse/eclipse.exe&quot; &quot;-data&quot; &quot;${jbpm.home}/workspace&quot;" /> + </exec> + </target> + +</project> Property changes on: jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-05-01 09:12:16 UTC (rev 4689) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-05-01 12:22:18 UTC (rev 4690) @@ -5,49 +5,41 @@ <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> <property file="${user.home}/.jbpm4/build.properties" /> - <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> - <property file="${user.home}/.jbpm4/build.properties" /> - - <!-- DERIVED PROPERTIES --> + <!-- CONFIGURABLE 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="jbpm.parent.dir" value="../.." /> + <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.parent.dir" value="${jbpm.home}" /> + + <!-- DERIVED PROPERTIES --> <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> - <property name="jboss.home" value="${workspace}/jboss-${jboss.version}" /> + <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}" /> - <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.version: ${jboss.version}" /> - <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}" /> + <echo message="database.................... ${database}" /> + <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}" /> + <echo message="jboss.server.configuration.. ${jboss.server.configuration}" /> + <echo message="jboss.server.config.dir..... ${jboss.server.config.dir}" /> </target> <!-- CONDITIONS --> <condition property="jboss.version.500"> <equals arg1="${jboss.version}" arg2="5.0.0.GA" /> </condition> - <condition property="database.hsqldb"> - <equals arg1="${database}" arg2="hsqldb" /> - </condition> <!-- ### JBOSS INSTALLATION TARGETS ##################################### --> <target name="reinstall.jboss" @@ -59,8 +51,6 @@ </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}/.." /> <chmod perm="a+x" file="${jboss.home}/bin/run.sh" os="Linux, Mac OS X" /> </target> @@ -75,8 +65,6 @@ <!-- ### THE JBOSS GENERIC PART ######################################### --> <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" /> @@ -87,7 +75,15 @@ tofile="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar/jbpm.hibernate.cfg.xml" overwrite="true" /> - + <!-- copy the right datasource configuration file and replace the jdbc properties with + the values in the jdbc/${database}.properties file --> + <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> + <filterset filtersfile="${jbpm.home}/db/jdbc/${database}.properties" /> + <fileset dir="${jbpm.home}/jboss/datasources"> + <include name="jbpm-${database}-ds.xml"/> + </fileset> + </copy> + <copy todir="${jboss.server.config.dir}/lib" overwrite="true"> <fileset dir="${jbpm.home}"> <include name="jbpm.jar" /> @@ -146,22 +142,10 @@ </target> <!-- ### THE HSQLDB SPECIFIC PART ####################################### --> - <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"/> - </fileset> - </copy> - </target> + <target name="internal.install.jbpm.into.jboss.db.hsqldb" /> <!-- ### THE MYSQL SPECIFIC PART ####################################### --> - <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 --> - <include name="jbpm-mysql-ds.xml"/> - </fileset> - </copy> + <target name="internal.install.jbpm.into.jboss.db.mysql"> <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> <fileset dir="${jbpm.home}/lib"> <include name="mysql-connector-java.jar"/> @@ -170,19 +154,11 @@ </target> <!-- ### THE ORACLE SPECIFIC PART ####################################### --> - <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"> - <include name="jbpm-oracle-ds.xml"/> - </fileset> - </copy> - </target> + <target name="internal.install.jbpm.into.jboss.db.oracle" /> <!-- ### 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" /> + <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> @@ -195,8 +171,7 @@ </target> <!-- ### 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" /> + <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> Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2009-05-01 09:12:16 UTC (rev 4689) +++ jbpm4/trunk/qa/build.xml 2009-05-01 12:22:18 UTC (rev 4690) @@ -4,43 +4,36 @@ <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> <property file="${user.home}/.jbpm4/build.properties" /> + + <fail message="property jbpm.parent.dir must be specified" unless="jbpm.parent.dir" /> - <!-- DERIVED PROPERTIES --> + <!-- CONFIGURABLE PROPERTIES --> <property name="database" value="hsqldb" /> <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="jboss.version" value="5.0.0.GA" /> + <property name="jboss.distro.dir" value="${jbpm.home}/downloads" /> + <property name="jboss.parent.dir" value="${jbpm.home}" /> + + <!-- 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.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}" /> - <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="database: ${database}" /> - <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.version: ${jboss.version}" /> - <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}" /> + <echo message="database.......... ${database}" /> + <echo message="jbpm.version...... ${jbpm.version}" /> + <echo message="jbpm.home......... ${jbpm.home}" /> + <echo message="jbpm.distro.path.. ${jbpm.distro.path}" /> </target> <!-- 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> @@ -52,11 +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" /> + <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> </target> <target name="integration.testrun.teardown"> - <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" inheritall="false" /> + <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}/jboss/build.xml" target="stop.jboss" /> </target> </project>