From: Jim Procter <jprocter@dundee.ac.uk>
Date: Thu, 5 Mar 2015 15:48:04 +0000 (+0000)
Subject: JAL-1678 fix replace token for launchApp in a buildwq
X-Git-Tag: Jalview_2_9~81
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=66a98d4269e55b7ac14e09f726318ea9d8beaff7;p=jalview.git

JAL-1678 fix replace token for launchApp in a buildwq
---

diff --git a/build.xml b/build.xml
index 861d587..4fe6d7f 100755
--- a/build.xml
+++ b/build.xml
@@ -632,11 +632,6 @@
       <include name="**/*"/>
     </fileset>
   </copy>
-	<replace token="http://www.jalview.org/services/launchApp" value="http://www.jalview.org/services/launchApp?version=${JALVIEW_VERSION}">
-		<fileset dir="${packageDir}/examples">
-			<include name="**/*.html"/>
-		</fileset>
-	</replace>
   <jar update="true" index="true" jarfile="${packageDir}/examples/${jalviewLiteJar}"/>
   <jar update="true" index="true" jarfile="${packageDir}/examples/${jmolJar}">
     <manifest>
@@ -751,6 +746,20 @@
   </signjar>
   <!-- bizarre bug causes JmolApplet to always get signed, even if excluded from above. so copy explicitly -->
   <copy file="appletlib/${jmolJar}" tofile="${packageDir}/examples/u_${jmolJar}" overwrite="true" />
+	<!-- finally, replace any launchApp servlet tags with a version specification -->
+	<replace value="http://www.jalview.org/services/launchApp?version=${JALVIEW_VERSION}&quot;">
+		<replacetoken><![CDATA[http://www.jalview.org/services/launchApp"]]></replacetoken>
+		<fileset dir="${packageDir}/examples">
+			<include name="**/*.html"/>
+		</fileset>
+	</replace>
+	<replace value="http://www.jalview.org/services/launchApp?version=${JALVIEW_VERSION}'">
+		<replacetoken><![CDATA[http://www.jalview.org/services/launchApp']]></replacetoken>
+		<fileset dir="${packageDir}/examples">
+			<include name="**/*.html"/>
+		</fileset>
+	</replace>
+
 </target>
 <target name="sourcedoc" description="Create jalview source documentation pages" depends="init">
   <javadoc destdir="${javadocDir}">