From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Tue, 26 Nov 2013 16:50:37 +0000 (+0000)
Subject: Merge branch 'JAL-1400_signapplet' into testMerge
X-Git-Tag: Jalview_2_9~200^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=dfa464ab8518118e4c942a830221d1c4d1ca73fe;p=jalview.git

Merge branch 'JAL-1400_signapplet' into testMerge

Conflicts:
	build.xml
---

dfa464ab8518118e4c942a830221d1c4d1ca73fe
diff --cc build.xml
index 30cd4db,c29f2c1..12e16a8
--- a/build.xml
+++ b/build.xml
@@@ -597,9 -603,17 +606,16 @@@
  	  	        </fileset>
  	  </copy>
  	    <jar update="true" index="true" jarfile="${packageDir}/examples/${jalviewLiteJar}"/>
- 	    <jar update="true" index="true" jarfile="${packageDir}/examples/$(jmolJar}"/>
+ 	    <jar update="true" index="true" jarfile="${packageDir}/examples/${jmolJar}">
+ 	    	<manifest>
+ 	        <attribute name="Application-Name" value="Jmol (bundled with JalviewLite)"/>
+ 	        <!--          <attribute name="Permissions" value="sandbox" /> -->
+ 	        <!--<attribute name="Trusted-Lib" value="true" /> -->
+ 	        <attribute name="Codebase" value="${applet.codebase}"/>
+ 	        <attribute name="Caller-Allowable-Codebase" value="${applet.caller-codebase}"/>
+ 	    	  </manifest>
+ 	    	</jar>
 -    <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
 -
 +    <signjar sigalg="SHA1WithRSA" storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
- 
        <fileset dir="${packageDir}/examples">
          <include name="*.jar" />
        </fileset>