[jbpm-commits] JBoss JBPM SVN: r5630 - jbpm4/trunk/modules/distro/src/main/files/install.

[do-not-reply at jboss.org]

Author: jbarrez
Date: 2009-09-11 11:07:44 -0400 (Fri, 11 Sep 2009)
New Revision: 5630

Modified:
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
Log:
Fix for JBPM-2511: changed signavio war tmp folder to /install/generated/signavio-war
Fix for JBPM-2520: ant -p not showing Signavio install tasks

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-09-11 14:41:09 UTC (rev 5629)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-09-11 15:07:44 UTC (rev 5630)
@@ -55,6 +55,7 @@
 
   <property name="signavio.war.file.name" value="jbpmeditor.war" />
   <property name="signavio.src.dir" value="${jbpm.home}/install/src/signavio" />
+	<property name="signavio.tmp.dir" value="${jbpm.home}/install/generated/signavio-war" />
   <property name="signavio.repo.dir.name" value="signavio-repository" />
   <property name="signavio.repo.dir" value="${jbpm.home}/${signavio.repo.dir.name}"/>
 
@@ -718,12 +719,12 @@
     </exec>
   </target>
 
-  <target name="install.signavio.into.jboss" depends="internal.set.signavio.repo.dir">
+  <target name="install.signavio.into.jboss" depends="internal.set.signavio.repo.dir" description="installs signavio into jboss">
     <!-- Current version of Signavio needs to be unpacked in /deploy to work correctly -->
     <unzip src="${signavio.src.dir}/${signavio.war.file.name}" dest="${jboss.server.deploy.dir}/${signavio.war.file.name}" />
   </target>
 
-  <target name="install.signavio.into.tomcat" depends="internal.set.signavio.repo.dir">
+  <target name="install.signavio.into.tomcat" depends="internal.set.signavio.repo.dir" description="installs signavio into tomcat">
     <copy file="${signavio.src.dir}/${signavio.war.file.name}" todir="${tomcat.webapps.dir}"/>
   </target>
 	
@@ -791,20 +792,18 @@
     <mkdir dir="${jbpm.home}/signavio-repository" />
     
     <!-- unzip the signavio war -->
-    <property name="temp.signavio.unzip" value="${jbpm.home}/temp-signavio-unzip" />
-    <delete dir="${temp.signavio.unzip}" />
-    <mkdir dir="${temp.signavio.unzip}" />
-    <unzip src="${jbpm.home}/install/src/signavio/${signavio.war.file.name}" dest="${temp.signavio.unzip}" />
+    <delete dir="${signavio.tmp.dir}" />
+    <mkdir dir="${signavio.tmp.dir}" />
+    <unzip src="${jbpm.home}/install/src/signavio/${signavio.war.file.name}" dest="${signavio.tmp.dir}" />
     
     <!-- replace the repo dir in he unzipped WEB-INF/web.xml -->
-    <replaceregexp file="${temp.signavio.unzip}/WEB-INF/web.xml" flags="s"
+    <replaceregexp file="${signavio.tmp.dir}/WEB-INF/web.xml" flags="s"
                    match="&lt;param-name&gt;fileSystemRootDirectory&lt;/param-name&gt;.*?&lt;param-value&gt;.*?&lt;/param-value&gt;"
-                 replace="&lt;param-name&gt;fileSystemRootDirectory&lt;/param-name&gt;&lt;param-value&gt;${current.dir}/${signavio.repo.dir.name}&lt;/param-value&gt;"/>
+                   replace="&lt;param-name&gt;fileSystemRootDirectory&lt;/param-name&gt;&lt;param-value&gt;${current.dir}/${signavio.repo.dir.name}&lt;/param-value&gt;"/>
     
     <!-- zip it up again and copy it back to /lib-->
-    <zip destfile="${temp.signavio.unzip}/${signavio.war.file.name}" basedir="${temp.signavio.unzip}" />
-    <copy file="${temp.signavio.unzip}/${signavio.war.file.name}" todir="${signavio.src.dir}" overwrite="true"/>
-    <delete dir="${temp.signavio.unzip}" />
+    <zip destfile="${signavio.tmp.dir}/${signavio.war.file.name}" basedir="${signavio.tmp.dir}" />
+    <copy file="${signavio.tmp.dir}/${signavio.war.file.name}" todir="${signavio.src.dir}" overwrite="true"/>
   </target>
 
   <target name="internal.install.eclipse.windows" if="isWindows">