Author: tom.baeyens(a)jboss.com Date: 2009-08-27 15:38:40 -0400 (Thu, 27 Aug 2009) New Revision: 5569 Added: jbpm4/trunk/qa/demo.setup.jboss.bat Removed: jbpm4/trunk/qa/test.demo.setup.bat Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.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/install/build.xml jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml Log: jboss demo setup migration Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml =================================================================== --- jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-08-27 19:16:58 UTC (rev 5568) +++ jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-08-27 19:38:40 UTC (rev 5569) @@ -36,6 +36,7 @@ <exclude>org.jbpm.jbpm4:jbpm-distro:jar</exclude> <exclude>org.jbpm.jbpm4:jbpm-examples:jar</exclude> <exclude>org.jbpm.jbpm4:jbpm-gpd:zip</exclude> + <exclude>org.jbpm.jbpm4.dependencies.signavio:signavio:war</exclude> <exclude>org.jbpm.jbpm4:jbpm-test-db:jar</exclude> </excludes> <outputDirectory>lib</outputDirectory> @@ -45,8 +46,15 @@ <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> </includes> <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> - <outputDirectory>gpd</outputDirectory> + <outputDirectory>install/src/gpd</outputDirectory> </dependencySet> + <dependencySet> + <includes> + <include>org.jbpm.jbpm4.dependencies.signavio:signavio:war</include> + </includes> + <outputFileNameMapping>signavio.war</outputFileNameMapping> + <outputDirectory>install/src/signavio</outputDirectory> + </dependencySet> </dependencySets> <fileSets> Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-08-27 19:16:58 UTC (rev 5568) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-08-27 19:38:40 UTC (rev 5569) @@ -12,15 +12,6 @@ <property name="jboss.version" value="5.0.0.GA" /> <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> - <property name="jboss.parent.dir" value="${jbpm.home}" /> - <property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" /> - <property name="jboss.server.configuration" value="default" /> - <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> - - <property name="tomcat.version" value="6.0.20" /> - <property name="tomcat.parent.dir" value="${jbpm.home}" /> - <property name="tomcat.home" value="${tomcat.parent.dir}/apache-tomcat-${tomcat.version}" /> - <!-- JDBC PROPERTIES --> <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> <property file="${jbpm.home}/db/jdbc/${database}.properties" /> @@ -46,21 +37,13 @@ </target> <!-- ### DEPLOY EXAMPLE BUSINESS ARCHIVES ############################### --> - <target name="deploy.examples.into.jboss" - description="deploys all the example processes" - depends="jbpm.libs.path, examples.jar, create.and.deploy.examples"> - <mkdir dir="${jboss.server.config.dir}/deploy/jbpm/userlibs" /> - <copy file="${jbpm.home}/examples/target/examples.jar" - todir="${jboss.server.config.dir}/deploy/jbpm/userlibs" - overwrite="true" /> - </target> - - <target name="create.and.deploy.examples"> + <target name="create.and.deploy.examples" + depends="jbpm.libs.path, examples.jar"> <mkdir dir="${jbpm.home}/examples/target" /> - <copy file="${jbpm.home}/db/hibernate.cfg/${database}.hibernate.cfg.xml" + <copy file="${jbpm.home}/install/src/cfg/hibernate/jdbc/${database}.hibernate.cfg.xml" tofile="${jbpm.home}/examples/target/classes/jbpm.hibernate.cfg.xml" overwrite="true"> - <filterset filtersfile="${jbpm.home}/db/jdbc/${database}.properties" /> + <filterset filtersfile="${jbpm.home}/install/src/jdbc/${database}.properties" /> </copy> <jar destfile="${jbpm.home}/examples/target/examples.bar"> <fileset dir="${jbpm.home}/examples/src"> @@ -90,15 +73,6 @@ <jbpm-deploy file="${jbpm.home}/examples/target/examples.bar" /> </target> - <target name="deploy.examples.into.tomcat" - description="deploys all the example processes" - depends="jbpm.libs.path, examples.jar, create.and.deploy.examples"> - - <copy file="${jbpm.home}/examples/target/examples.jar" - todir="${tomcat.home}/lib" - overwrite="true" /> - </target> - <target name="examples.jar" depends="jbpm.libs.path"> <mkdir dir="${jbpm.home}/examples/target/classes" /> <javac srcdir="${jbpm.home}/examples/src" Modified: jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 2009-08-27 19:16:58 UTC (rev 5568) +++ jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 2009-08-27 19:38:40 UTC (rev 5569) @@ -65,7 +65,6 @@ <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}" /> @@ -73,51 +72,4 @@ <echo message="eclipse.distro.path.. ${eclipse.distro.path}" /> </target> - <!-- ### INSTALL ECLIPSE ################################################ --> - <target name="install.eclipse" - depends="log.properties, get.eclipse" - description="unzips eclipse, downloads eclipse if it is not available in ${eclipse.distro.dir}"> - <antcall target="internal.install.eclipse.windows" /> - <antcall target="internal.install.eclipse.non.windows" /> - </target> - - <target name="internal.install.eclipse.windows" if="isWindows"> - <unzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${jbpm.home}" overwrite="true" /> - </target> - - <target name="internal.install.eclipse.non.windows" if="isNotWindows"> - <gunzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${eclipse.distro.dir}" /> - <untar src="${eclipse.distro.dir}/${eclipse.tarfilename}" dest="${jbpm.home}" overwrite="true" /> - <delete file="${eclipse.distro.dir}/${eclipse.tarfilename}"/> - </target> - - <!-- ### GET ECLIPSE ##################################################### --> - <condition property="is.eclipse.distro.available"> - <available file="${eclipse.distro.path}" /> - </condition> - <target name="get.eclipse" - unless="is.eclipse.distro.available" - description="downloads eclipse to ${eclipse.distro.dir}"> - <mkdir dir="${eclipse.distro.dir}" /> - <get src="${eclipse.distro.url}" dest="${eclipse.distro.path}" /> - </target> - - <!-- ### START ECLIPSE ################################################## --> - <target name="start.eclipse" - description="starts eclipse"> - <!-- Windows --> - <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> - <!-- Unix --> - <chmod perm="+x"> - <fileset dir="${jbpm.home}/eclipse"> - <filename name="eclipse"/> - </fileset> - </chmod> - <exec executable="/bin/bash" os="Linux,Mac OS X"> - <arg line="-c &quot;${jbpm.home}/eclipse/eclipse&quot; &quot;-data&quot; &quot;${jbpm.home}/workspace&quot;" /> - </exec> - </target> - </project> Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-27 19:16:58 UTC (rev 5568) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-27 19:38:40 UTC (rev 5569) @@ -47,6 +47,90 @@ <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> <property name="jboss.server.data.dir" value="${jboss.home}/server/${jboss.server.configuration}/data" /> + <!-- GENERAL CONDITIONS --> + <condition property="is.jboss.distro.available"> + <available file="${jboss.distro.path}" /> + </condition> + <condition property="is.tomcat.distro.available"> + <available file="${tomcat.distro.path}" /> + </condition> + <condition property="is.linux.unix.or.mac"> + <or> + <os family="unix" /> + <os family="mac" /> + </or> + </condition> + + <!-- OS CONDITIONS --> + <condition property="isWindows"> + <os family="windows"/> + </condition> + <condition property="isNotWindows"> + <not> + <isset property="isWindows" /> + </not> + </condition> + + <!-- ECLIPSE RELATED CONDITIONS --> + <condition property="eclipse.filename" value="eclipse-jee-galileo-win32.zip"> + <contains string="${os.name}" casesensitive="false" substring="win" /> + </condition> + <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-macosx-carbon.tar"> + <contains string="${os.name}" casesensitive="false" substring="mac" /> + </condition> + <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz"> + <contains string="${os.name}" casesensitive="false" substring="mac" /> + </condition> + <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-linux-gtk.tar"> + <and> + <contains string="${os.name}" casesensitive="false" substring="linux" /> + <not> + <contains string="${os.arch}" casesensitive="false" substring="64" /> + </not> + </and> + </condition> + <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz"> + <and> + <contains string="${os.name}" casesensitive="false" substring="linux" /> + <not> + <contains string="${os.arch}" casesensitive="false" substring="64" /> + </not> + </and> + </condition> + <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-linux-gtk-x86_64.tar"> + <and> + <contains string="${os.name}" casesensitive="false" substring="linux" /> + <contains string="${os.arch}" casesensitive="false" substring="64" /> + </and> + </condition> + <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz"> + <and> + <contains string="${os.name}" casesensitive="false" substring="linux" /> + <contains string="${os.arch}" casesensitive="false" substring="64" /> + </and> + </condition> + <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" /> + <property name="eclipse.parent.dir" value="${jbpm.home}" /> + <property name="eclipse.distro.path" value="${eclipse.distro.dir}/${eclipse.filename}" /> + + <!-- ### DEMO SETUP JBOSS ##################################################### --> + <target name="demo.setup.jboss" + depends="install.jboss, install.jbpm.into.jboss, start.jboss" + description="installs jboss, installs jbpm into jboss, starts jboss, creates the jBPM DB schema, deploys examples, loads example identities, installs and starts eclipse"> + <antcall target="create.jbpm.schema" /> + <ant antfile="${jbpm.home}/examples/build.xml" target="create.and.deploy.examples" /> + <antcall target="load.example.identities" /> + <antcall target="install.eclipse" /> + <antcall target="start.eclipse" /> + </target> + + <target name="demo.teardown" + description="drops the jbpm db schema and stops jboss"> + <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" /> + <antcall target="stop.jboss" /> + </target> + <!-- ### CLEAN CONFIGURATION DIR ########################################### --> <target name="clean.cfg.dir" description="Deletes the ${cfg.dest.dir}"> <delete dir="${cfg.dest.dir}" /> @@ -149,9 +233,6 @@ </target> <!-- ### GET JBOSS ###################################################### --> - <condition property="is.jboss.distro.available"> - <available file="${jboss.distro.path}" /> - </condition> <target name="get.jboss" unless="is.jboss.distro.available" description="Downloads jboss into ${jboss.distro.dir}"> @@ -292,16 +373,10 @@ depends="get.tomcat" description="Downloads tomcat to ${tomcat.distro.dir} if its not available and then unzips tomcat"> <unzip src="${tomcat.distro.path}" dest="${tomcat.parent.dir}" /> - <condition property="isLinuxUnixOrMac"> - <or> - <os family="unix" /> - <os family="mac" /> - </or> - </condition> <antcall target="install.tomcat.linuxandmac" /> </target> - <target name="install.tomcat.linuxandmac" if="isLinuxUnixOrMac"> + <target name="install.tomcat.linuxandmac" if="is.linux.unix.or.mac"> <chmod perm="a+x" os="Linux, Mac OS X"> <fileset dir="${tomcat.home}/bin"> <include name="*.sh" /> @@ -310,9 +385,6 @@ </target> <!-- ### GET TOMCAT ###################################################### --> - <condition property="is.tomcat.distro.available"> - <available file="${tomcat.distro.path}" /> - </condition> <target name="get.tomcat" unless="is.tomcat.distro.available" description="Downloads tomcat into ${tomcat.distro.dir} if it is not available"> @@ -560,7 +632,7 @@ userid="${jdbc.username}" password="${jdbc.password}" onerror="continue"> - <transaction src="${jbpm.home}/db/example.identities.sql"/> + <transaction src="${jbpm.home}/install/src/demo/example.identities.sql"/> <classpath> <fileset dir="${jbpm.home}/lib"> <include name="*.jar"/> @@ -591,7 +663,6 @@ </java> </target> - <target name="internal.copy.database.driver.if.needed" if="database.driver"> <available file="${jbpm.home}/lib/${database.driver}" property="database.driver.jar.available" /> <fail message="please download the ${database} driver jar and put it in the ${jbpm.home}/lib directory" unless="database.driver.jar.available" /> @@ -599,4 +670,51 @@ <copy file="${jbpm.home}/lib/${database.driver}" todir="${database.driver.destination.dir}" /> </target> + <!-- ### INSTALL ECLIPSE ################################################ --> + <target name="install.eclipse" + depends="get.eclipse" + description="unzips eclipse, downloads eclipse if it is not available in ${eclipse.distro.dir}"> + <antcall target="internal.install.eclipse.windows" /> + <antcall target="internal.install.eclipse.non.windows" /> + </target> + + <target name="internal.install.eclipse.windows" if="isWindows"> + <unzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${jbpm.home}" overwrite="true" /> + </target> + + <target name="internal.install.eclipse.non.windows" if="isNotWindows"> + <gunzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${eclipse.distro.dir}" /> + <untar src="${eclipse.distro.dir}/${eclipse.tarfilename}" dest="${jbpm.home}" overwrite="true" /> + <delete file="${eclipse.distro.dir}/${eclipse.tarfilename}"/> + </target> + + <!-- ### GET ECLIPSE ##################################################### --> + <condition property="is.eclipse.distro.available"> + <available file="${eclipse.distro.path}" /> + </condition> + <target name="get.eclipse" + unless="is.eclipse.distro.available" + description="downloads eclipse to ${eclipse.distro.dir}"> + <mkdir dir="${eclipse.distro.dir}" /> + <get src="${eclipse.distro.url}" dest="${eclipse.distro.path}" /> + </target> + + <!-- ### START ECLIPSE ################################################## --> + <target name="start.eclipse" + description="starts eclipse"> + <!-- Windows --> + <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> + <!-- Unix --> + <chmod perm="+x"> + <fileset dir="${jbpm.home}/eclipse"> + <filename name="eclipse"/> + </fileset> + </chmod> + <exec executable="/bin/bash" os="Linux,Mac OS X"> + <arg line="-c &quot;${jbpm.home}/eclipse/eclipse&quot; &quot;-data&quot; &quot;${jbpm.home}/workspace&quot;" /> + </exec> + </target> + </project> Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-08-27 19:16:58 UTC (rev 5568) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-08-27 19:38:40 UTC (rev 5569) @@ -64,7 +64,7 @@ <target name="demo.setup" depends="install.jboss, install.jbpm.into.jboss, start.jboss" description="installs jboss, installs jbpm into jboss, starts jboss, creates the jBPM DB schema, deploys examples, loads example identities, installs and starts eclipse"> - <ant antfile="${jbpm.home}/db/build.xml" target="create.jbpm.schema" /> + <antcall target="create.jbpm.schema" /> <ant antfile="${jbpm.home}/examples/build.xml" target="deploy.examples.into.jboss" /> <ant antfile="${jbpm.home}/db/build.xml" target="load.example.identities" /> <ant antfile="${jbpm.home}/gpd/build.xml" target="install.eclipse" /> Copied: jbpm4/trunk/qa/demo.setup.jboss.bat (from rev 5567, jbpm4/trunk/qa/test.demo.setup.bat) =================================================================== --- jbpm4/trunk/qa/demo.setup.jboss.bat (rev 0) +++ jbpm4/trunk/qa/demo.setup.jboss.bat 2009-08-27 19:38:40 UTC (rev 5569) @@ -0,0 +1,6 @@ +echo To run this, make sure that at least you have jbpm.parent.dir specified in your ${user.home}/.jbpm4/build.properties +cmd /C mvn -U -Pdistro clean install +cmd /C ant -f qa/build.xml reinstall.jbpm +cmd /C ant -f modules/distro/src/main/files/install/build.xml demo.setup.jboss + +echo  \ No newline at end of file Deleted: jbpm4/trunk/qa/test.demo.setup.bat =================================================================== --- jbpm4/trunk/qa/test.demo.setup.bat 2009-08-27 19:16:58 UTC (rev 5568) +++ jbpm4/trunk/qa/test.demo.setup.bat 2009-08-27 19:38:40 UTC (rev 5569) @@ -1,6 +0,0 @@ -echo To run this, make sure that at least you have jbpm.parent.dir specified in your ${user.home}/.jbpm4/build.properties -cmd /C mvn -U -Pdistro,schemadocs clean install -cmd /C ant -f qa/build.xml reinstall.jbpm -cmd /C ant -f modules/distro/src/main/files/jboss/build.xml demo.setup - -echo  \ No newline at end of file