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

[do-not-reply at jboss.org]

Author: jbarrez
Date: 2009-10-27 10:41:10 -0400 (Tue, 27 Oct 2009)
New Revision: 5813

Modified:
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
Log:
Fix for JBPM-2540: Fix replacement of Signavio repository path on Windows

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-10-27 11:31:02 UTC (rev 5812)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-10-27 14:41:10 UTC (rev 5813)
@@ -331,6 +331,9 @@
 
     <property name="container.lib.dir" value="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" />
     <antcall target="internal.copy.database.driver" />
+  	
+  	<!-- Signavio -->
+  	<antcall target="install.signavio.into.jboss" />
   </target>
   
   <!-- ### INSTALL EXAMPLES INTO JBOSS ################################################ -->  
@@ -479,10 +482,10 @@
       </fileset>
     </copy>
     
-    <!-- Copy Signavio war into /webapps
+    <!-- Copy Signavio war into /webapps -->
     <antcall target="install.signavio.into.tomcat" />
-    -->
     
+    
     <!-- Rename wars (the context root is configured by WEB-INF/jboss-web.xml,
         which is neglected by Tomcat -->
     <move file="${tomcat.home}/webapps/gwt-console-jbpm.war" tofile="${tomcat.home}/webapps/jbpm-console.war" />
@@ -797,13 +800,20 @@
     <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 Windows backslash with forward slash (see JBPM-2540) -->
+  	<pathconvert property="signavio.repo.path" targetos="unix">
+  	  <map from="${basedir}/" to='' />
+  	  <map from="${basedir}\\" to='' />
+  	  <path location="${current.dir}/${signavio.repo.dir.name}"/>
+  	</pathconvert>
     
     <!-- replace the repo dir in he unzipped WEB-INF/web.xml -->
     <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;${signavio.repo.path}&lt;/param-value&gt;"/>
     
-    <!-- zip it up again and copy it back to /lib-->
+    <!-- zip it up again and copy it back to the signavio src dir-->
     <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>