Author: tom.baeyens(a)jboss.com Date: 2009-06-29 10:51:06 -0400 (Mon, 29 Jun 2009) New Revision: 5156 Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml Log: JBPM-2367 added copying of examples.jar to jboss userlib dir in standalone distro script Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-06-29 13:47:09 UTC (rev 5155) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-06-29 14:51:06 UTC (rev 5156) @@ -12,6 +12,11 @@ <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}" /> + <!-- JDBC PROPERTIES --> <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> <property file="${jbpm.home}/db/jdbc/${database}.properties" /> @@ -70,6 +75,11 @@ classname="org.jbpm.pvm.internal.ant.JbpmDeployTask" classpathref="jbpm.libs.incl.dependencies" /> <jbpm-deploy file="${jbpm.home}/examples/target/examples.bar" /> + + <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="examples.jar" depends="jbpm.libs.path"> Modified: jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 2009-06-29 13:47:09 UTC (rev 5155) +++ jbpm4/trunk/modules/distro/src/main/files/gpd/build.xml 2009-06-29 14:51:06 UTC (rev 5156) @@ -1,102 +1,104 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="jbpm.eclipse.install"> - + <!-- USER SPECIFIC CONFIGURATIONS --> <property file="${user.home}/.jbpm4/build.properties" /> - + <!-- OS PROPERTIES --> <condition property="isWindows"> <os family="windows"/> - </condition> + </condition> + <condition property="isNotWindows"> + <not> + <isset property="isWindows" /> + </not> + </condition> <!-- DEFAULT PROPERTY VALUES --> <property name="jbpm.parent.dir" value="../.." /> <property name="jbpm.version" value="4.0-SNAPSHOT" /> - <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> <!-- jbpm.home should not be configured. change jbpm.parent.dir instead --> - - <!-- Eclipse version is dependent on OS --> + <!-- jbpm.home should not be configured. change jbpm.parent.dir instead --> + <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> + + <!-- eclipse.filename --> <condition property="eclipse.filename" value="eclipse-jee-ganymede-SR2-win32.zip"> - <contains string="${os.name}" casesensitive="false" substring="win"/> + <contains string="${os.name}" casesensitive="false" substring="win" /> </condition> <condition property="eclipse.filename" value="eclipse-jee-ganymede-SR2-macosx-carbon.tar.gz"> - <contains string="${os.name}" casesensitive="false" substring="mac"/> - </condition> + <contains string="${os.name}" casesensitive="false" substring="mac" /> + </condition> <condition property="eclipse.filename" value="eclipse-jee-ganymede-SR2-linux-gtk.tar.gz"> <and> - <contains string="${os.name}" casesensitive="false" substring="linux"/> - <not> - <contains string="${os.arch}" casesensitive="false" substring="64" /> + <contains string="${os.name}" casesensitive="false" substring="linux" /> + <not> + <contains string="${os.arch}" casesensitive="false" substring="64" /> </not> - </and> - </condition> + </and> + </condition> <condition property="eclipse.filename" value="eclipse-jee-ganymede-SR2-linux-gtk-x86_64.tar.gz"> - <and> - <contains string="${os.name}" casesensitive="false" substring="linux"/> - <contains string="${os.arch}" casesensitive="false" substring="64" /> - </and> + <and> + <contains string="${os.name}" casesensitive="false" substring="linux" /> + <contains string="${os.arch}" casesensitive="false" substring="64" /> + </and> </condition> - + <!-- general eclipse properties --> <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}" /> + <!-- ### 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> + </target> - <!-- ### INSTALL ECLIPSE ################################################ --> + <!-- ### 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}"> - <unzip dest="${jbpm.home}" overwrite="true"> - <fileset dir="${eclipse.distro.dir}"> - <filename name="*eclipse*.zip" casesensitive="false" /> - </fileset> - </unzip> - <gunzip> - <fileset dir="${eclipse.distro.dir}"> - <filename name="**eclipse*.tar.gz" casesensitive="false" /> - </fileset> - </gunzip> - <untar dest="${jbpm.home}" overwrite="true"> - <fileset dir="${eclipse.distro.dir}"> - <filename name="**eclipse*.tar" casesensitive="false" /> - </fileset> - </untar> + 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="${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" - description="downloads eclipse to ${eclipse.distro.dir}"> + <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> + <get src="${eclipse.distro.url}" dest="${eclipse.distro.path}" /> + </target> <!-- ### START ECLIPSE ################################################## --> <target name="start.eclipse" - description="starts eclipse"> - <!-- Windows --> + 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> + <!-- 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>