JAL-1698 bug fix to enable addition of a single structure to an already launched...

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 0a16a10..49fd37e 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -632,11 +632,6 @@
       <include name="**/*"/>
     </fileset>
   </copy>
-       <replace token="http://www.jalview.org/launchApp" value="http://www.jalview.org/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}">