Merge branch 'Release_2_8_0b1_Branch' of https://source.jalview.org/git/jalview

diff --git a/build.xml b/build.xml
index 3710430..6eab52a 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -652,7 +652,7 @@
     </presetdef>
     <!-- create differently privileged artefacts -->
     <copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/u_${jalviewLiteJar}" />
-    <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/u_${jmolJar}"/>
+    <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/u_${jmolJar}" overwrite="true"/>
     <copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/ap_${jalviewLiteJar}" />
     <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/ap_${jmolJar}"/>
     <ap_applet.jar jarfile="${packageDir}/examples/ap_${jalviewLiteJar}" />
@@ -673,6 +673,7 @@
     <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
 
       <fileset dir="${packageDir}/examples">
+        <exclude name="u_*.jar"/>
         <include name="${jalviewLiteJar}" />
         <include name="${jmolJar}" />
         <include name="to_${jalviewLiteJar}" />
@@ -683,6 +684,8 @@
         <include name="ap_${jmolJar}" />
       </fileset>
     </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" />
   </target>
   <target name="sourcedoc" description="Create jalview source documentation pages" depends="init">
     <javadoc destdir="${javadocDir}">