From: Jalview build Manager <jalview-dev@jalview.org>
Date: Mon, 13 Jan 2014 18:09:37 +0000 (+0000)
Subject: JAL-1400 sign the applet with manifest attributes for Java 1.6 and Java 1.7
X-Git-Tag: Release_2_8_0b1~1^2~22
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9307d91822245dc9fb2dc741410e3a2658aa6a7a;p=jalview.git

JAL-1400 sign the applet with manifest attributes for Java 1.6 and Java 1.7
---

diff --git a/build.xml b/build.xml
index c29f2c1..e7f05bc 100755
--- a/build.xml
+++ b/build.xml
@@ -97,7 +97,7 @@
 
     <!-- Permissions for running Java applets and applications. Defaults are those suitable for deploying jalview webstart/jalviewLite at www.jalview.org -->
     <property name="application.codebase" value="*.jalview.org"/>
-    <property name="applet.codebase" value="*.jalview.org"/>
+    <property name="applet.codebase" value="*"/>
     <property name="applet.caller-codebase" value="${applet.codebase}"/>
 
 		<!-- build directory configuration -->
@@ -424,7 +424,6 @@
 			<manifest>
 				<attribute name="Main-Class" value="jalview.bin.Jalview" />
         <attribute name="Permissions" value="all-permissions" />
-        <!--<attribute name="Trusted-Lib" value="true" /> -->
         <attribute name="Application-Name" value="Jalview Desktop"/>
         <attribute name="Codebase" value="${application.codebase}"/>
 			</manifest>
@@ -475,11 +474,9 @@
 		<jar destfile="in.jar" index="true">
 			<manifest>
 				<attribute name="Main-Class" value="jalview.bin.JalviewLite" />
-				<attribute name="Application-Name" value="JalviewLite Applet"/>
-				<!--        	<attribute name="Permissions" value="sandbox" /> -->
-				<!--<attribute name="Trusted-Lib" value="true" /> -->
+				<attribute name="Application-Name" value="JalviewLite"/>
+        			<attribute name="Permissions" value="all-permissions" />
 				<attribute name="Codebase" value="${applet.codebase}"/>
-				<attribute name="Caller-Allowable-Codebase" value="${applet.caller-codebase}"/>
 			</manifest>
 			<fileset dir="${outputDir}">
 				<include name="com/**" />
@@ -596,22 +593,48 @@
       <include name="jmol/*"/>
 	  </fileset>
 	  	<fileset dir=".">
-	  	<include name="jalviewApplet.jar"/>
+	  	<include name="${jalviewLiteJar}"/>
 	  		</fileset>
 	  	<fileset dir="appletlib">
 	  	      <include name="**/*"/>
 	  	        </fileset>
 	  </copy>
-	    <jar update="true" index="true" jarfile="${packageDir}/examples/${jalviewLiteJar}"/>
-	    <jar update="true" index="true" jarfile="${packageDir}/examples/${jmolJar}">
+	  <presetdef name="applet.jar">
+	    <jar update="true" index="true">
 	    	<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>
+	        <attribute name="Application-Name" value="JalviewLite"/>
+     		<attribute name="Permissions" value="all-permissions"/>
+		<attribute name="Codebase" value="${applet.codebase}"/>
+		<attribute name="Caller-Allowable-Codebase" value="${applet.caller-codebase}"/>
+		<attribute name="Application-Library-Allowable-Codebase" value="${applet.codebase}"/>
+		<!--
+		<attribute name="Application-Library-Allowable-Codebase" value="${applet.codebase}"/>
+		-->
+<!--		<attribute name="Trusted-Only" value="true"/>
+-->
+<!-- 		<attribute name="Trusted-Library" value="true"/>
+-->
+		</manifest>
+	  </jar>
+	  </presetdef>
+	  <presetdef name="applet_tl.jar">
+	    <jar update="true" index="true" jarfile="@{jarfile}">
+	    	<manifest>
+	        <attribute name="Application-Name" value="JalviewLite"/>
+     		<attribute name="Permissions" value="all-permissions" />
+		<attribute name="Codebase" value="${applet.codebase}"/>
+		<attribute name="Trusted-Only" value="true"/>
+ 		<attribute name="Trusted-Library" value="true"/>
+		</manifest>
+	  </jar>
+
+	  </presetdef>
+	  <copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/tl_${jalviewLiteJar}"/>
+	  <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/tl_${jmolJar}"/>
+	  <applet.jar jarfile="${packageDir}/examples/${jalviewLiteJar}"/>
+	  <applet_tl.jar jarfile="${packageDir}/examples/tl_${jalviewLiteJar}"/>
+	  <applet.jar jarfile="${packageDir}/examples/${jmolJar}"/>
+	  <applet_tl.jar jarfile="${packageDir}/examples/tl_${jmolJar}"/>
     <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
 
       <fileset dir="${packageDir}/examples">