JAL-1641 updated examples/applets.html

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 95f655d..273c9e0 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.
  * 
@@ -111,6 +111,9 @@
     <!-- Jalview Applet JMol Jar Dependency -->
     <property name="jmolJar" value="JmolApplet-12.2.4.jar" />
     <property name="varnaJar" value="VARNAv3-91.jar" />
+    <property name="jsoup" value="jsoup-1.8.1.jar" />
+    <property name="jsonSimple" value="json_simple-1.1.jar" />
+    <property name="javaJson" value="java-json.jar" />
     <property name="jalviewLiteJar" value="jalviewApplet.jar" />
     <!-- switch to indicate if we should obfuscate jalviewLite -->
     <!-- <property name="donotobfuscate" value="true"/> -->
@@ -165,6 +168,10 @@
       </fileset>
       <pathelement location="appletlib/${jmolJar}" />
       <pathelement location="lib/${varnaJar}" />
+      <pathelement location="lib/${jsoup}" />
+      <pathelement location="lib/${jsonSimple}" />
+      <pathelement location="lib/${javaJson}" />
+      
     </path>
     <!-- default location for outputting javadoc -->
     <property name="javadocDir" value="${packageDir}/javadoc"/>
@@ -632,11 +639,6 @@
       <include name="**/*"/>
     </fileset>
   </copy>
-       <replace token="http://www.jalview.org/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 +753,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}">