Author: alex.guizar(a)jboss.com Date: 2010-06-16 19:45:19 -0400 (Wed, 16 Jun 2010) New Revision: 6420 Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml Log: JBPM-2893: fix jboss demo setup Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-06-16 23:22:42 UTC (rev 6419) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-06-16 23:45:19 UTC (rev 6420) @@ -5,9 +5,11 @@ <property file="${user.home}/.jbpm4/build.properties" /> <!-- USER CUSTOMIZABLE PROPERTIES --> - <property name="database" value="hsqldb" /> <!-- {hsqldb | mysql | oracle | postgresql} --> + <!-- {hsqldb | mysql | oracle | postgresql} --> + <property name="database" value="hsqldb" /> <echo message="database......... ${database}" /> - <property name="tx" value="standalone" /> <!-- {standalone | jta | spring} --> + <!-- {standalone | jta | spring} --> + <property name="tx" value="standalone" /> <echo message="tx............... ${tx}" /> <property name="mail.smtp.host" value="localhost" /> <echo message="mail.smtp.host... ${mail.smtp.host}" /> @@ -16,8 +18,10 @@ <property name="jbpm.version" value="4.4-SNAPSHOT" /> <property name="jbpm.parent.dir" value="../.." /> <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> - <property name="hibernate.connection.type" value="jdbc" /> <!-- jdbc | datasource --> - <property name="logging" value="jdk" /> <!-- jdk | none --> + <!-- jdbc | datasource --> + <property name="hibernate.connection.type" value="jdbc" /> + <!-- jdk | none --> + <property name="logging" value="jdk" /> <property name="cfg.dest.dir" value="${jbpm.home}/install/generated/cfg" /> <property name="install.src.dir" value="${jbpm.home}/install/src" /> <property name="mail.cfg" value="default" /> @@ -42,7 +46,7 @@ <property name="hsqldb.server.install.dir" value="${jbpm.home}/hsqldb-server" /> <property name="hsqldb.server.source.dir" value="${jbpm.home}/install/src/hsqldb-server" /> - <property name="jboss.version" value="5.0.0.GA" /> + <property name="jboss.version" value="5.1.0.GA" /> <property name="jboss.parent.dir" value="${jbpm.home}" /> <property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" /> <property name="jboss.bind.address" value="localhost" /> @@ -151,7 +155,7 @@ <!-- ### DEMO SETUP JBOSS ##################################################### --> <target name="demo.setup.jboss" depends="install.jboss, install.jbpm.into.jboss" - description="installs jboss, installs jbpm into jboss, starts jboss, creates the jBPM DB schema, deploys examples, loads example identities, installs and starts eclipse"> + description="installs jboss and jbpm, starts jboss, creates the db schema, deploys examples, loads example identities, installs and starts eclipse"> <antcall target="internal.enable.jboss.debug.jboss500" /> <antcall target="internal.enable.jboss.debug.jboss510" /> <antcall target="install.hsqldb.server" /> @@ -165,8 +169,9 @@ </target> <!-- ### DEMO TEARDOWN JBOSS ##################################################### --> - <target name="demo.teardown.jboss" description="drops the jbpm db schema and stops jboss"> - <ant antfile="${jbpm.home}/db/build.xml" target="drop.jbpm.schema" /> + <target name="demo.teardown.jboss" description="drops the db schema and stops jboss"> + <antcall target="drop.jbpm.schema" /> + <antcall target="stop.hsqldb.server" /> <antcall target="stop.jboss" /> </target> @@ -357,7 +362,8 @@ <include name="jbpm-console-form-plugin.jar" /> <include name="jbpm-console-graphView-plugin.jar" /> <include name="joda-time.jar" /> - <include name="juel*.jar" /> + <include name="juel-engine.jar" /> + <include name="juel-impl.jar" /> <include name="livetribe-jsr223.jar" /> </fileset> </copy> @@ -413,8 +419,7 @@ <!-- ### START JBOSS ################################################### --> <target name="start.jboss" description="starts jboss and waits till jboss is booted, then lets jboss run in the background"> - <exec executable="${jboss.home}/bin/run.bat" - spawn="yes" + <exec executable="${jboss.home}/bin/run.bat" spawn="yes" os="Windows 7,Windows Vista,Windows XP,Windows 2000"> <arg value="-b" /> <arg value="${jboss.bind.address}" /> @@ -423,11 +428,14 @@ <arg value="-b" /> <arg value="${jboss.bind.address}" /> </exec> - <waitfor maxwait="5" maxwaitunit="minute" checkevery="30" checkeveryunit="second" - timeoutproperty="jboss.timeout"> + <waitfor maxwait="5" + maxwaitunit="minute" + checkevery="30" + checkeveryunit="second" + timeoutproperty="jboss.timeout"> <socket server="${jboss.bind.address}" port="8080" /> </waitfor> - <fail if="jboss.timeout" message="jboss did not start within 5 minutes"/> + <fail if="jboss.timeout" message="jboss did not start within 5 minutes" /> </target> <!-- ### STOP JBOSS ################################################### --> @@ -561,26 +569,26 @@ <!-- Copy jbpm-console wars and configuration into /webapps --> - <mkdir dir="${tomcat.home}/webapps/jbpm-console"/> - <mkdir dir="${tomcat.home}/webapps/gwt-console-server"/> + <mkdir dir="${tomcat.home}/webapps/jbpm-console" /> + <mkdir dir="${tomcat.home}/webapps/gwt-console-server" /> <unzip src="${jbpm.home}/lib/gwt-console-jbpm.war" - dest="${tomcat.home}/webapps/jbpm-console"/> + dest="${tomcat.home}/webapps/jbpm-console" /> <unzip src="${jbpm.home}/lib/gwt-console-server-jbpm.war" - dest="${tomcat.home}/webapps/gwt-console-server"/> + dest="${tomcat.home}/webapps/gwt-console-server" /> - <move todir="${tomcat.home}/lib"> - <fileset dir="${tomcat.home}/webapps/jbpm-console/WEB-INF/lib"> - <include name="guice*.jar"/> - <include name="errai*.jar"/> - <include name="mvel*.jar"/> - </fileset> - <fileset dir="${tomcat.home}/webapps/jbpm-console/WEB-INF/classes"> - <include name="ErraiService.properties"/> - <include name="ErraiApp.properties"/> - </fileset> - </move> + <move todir="${tomcat.home}/lib"> + <fileset dir="${tomcat.home}/webapps/jbpm-console/WEB-INF/lib"> + <include name="guice*.jar" /> + <include name="errai*.jar" /> + <include name="mvel*.jar" /> + </fileset> + <fileset dir="${tomcat.home}/webapps/jbpm-console/WEB-INF/classes"> + <include name="ErraiService.properties" /> + <include name="ErraiApp.properties" /> + </fileset> + </move> <!-- Copy Signavio war into /webapps --> <antcall target="install.signavio.into.tomcat" /> @@ -628,7 +636,7 @@ <!-- ### START HSQLDB SERVER ################################################ --> <target name="start.hsqldb.server" if="is.hsqldb"> - <java classname="org.hsqldb.Server"> + <java classname="org.hsqldb.Server" fork="yes" spawn="yes"> <classpath location="${hsqldb.server.install.dir}/hsqldb.jar" /> <arg value="-address" /> <arg value="${hsql.bind.address}" /> @@ -637,8 +645,11 @@ <arg value="-dbname.0" /> <arg value="jbpmDatabase" /> </java> - <waitfor maxwait="1" maxwaitunit="minute" checkevery="10" checkeveryunit="second" - timeoutproperty="hsqldb.timeout"> + <waitfor maxwait="1" + maxwaitunit="minute" + checkevery="10" + checkeveryunit="second" + timeoutproperty="hsqldb.timeout"> <socket server="${hsql.bind.address}" port="1701" /> </waitfor> <fail if="hsqldb.timeout" message="hsqldb server did not start within one minute" /> @@ -812,20 +823,16 @@ <arg value="-data" /> <arg value="${jbpm.home}/workspace" /> </exec> - <!-- Unix --> - <chmod perm="+x"> - <fileset dir="${jbpm.home}/eclipse"> - <filename name="eclipse" /> - </fileset> - <!-- Path is different for OS X --> - <fileset dir="${jbpm.home}/eclipse/Eclipse.app/Contents/MacOS/"> - <filename name="eclipse" /> - </fileset> - </chmod> + <!-- Linux --> + <chmod file="${jbpm.home}/eclipse/eclipse" perm="a+x" os="Linux" /> <exec executable="${jbpm.home}/eclipse/eclipse" os="Linux"> <arg value="-data" /> <arg value="${jbpm.home}/workspace" /> </exec> + <!-- Mac OS X --> + <chmod file="${jbpm.home}/eclipse/Eclipse.app/Contents/MacOS/eclipse" + perm="a+x" + os="Mac OS X" /> <exec executable="${jbpm.home}/eclipse/Eclipse.app/Contents/MacOS/eclipse" os="Mac OS X"> <arg value="-data" /> <arg value="${jbpm.home}/workspace" />