From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Tue, 26 Nov 2013 16:21:17 +0000 (+0000)
Subject: Merge branch 'JAL-1400_signapplet' into Release_2_8_Branch
X-Git-Tag: Release_2_8_0b1~1^2~25
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=57097562617bf1c3186c6ff00928e85030ed813e;hp=c1c146787eaf062139dd8dfe7d8a5b244ab1b032;p=jalview.git

Merge branch 'JAL-1400_signapplet' into Release_2_8_Branch
---

diff --git a/build.xml b/build.xml
index 2f71b50..c29f2c1 100755
--- a/build.xml
+++ b/build.xml
@@ -85,6 +85,8 @@
 		<!-- Key Password -->
 		<property name="jalview.key.pass" value="alignmentisfun" />
 
+		    
+		    
 		<!-- Don't change anything below here unless you know what you are doing! -->
 		<!-- Url path for WebStart in JNLP file -->
 		<property name="WebStartLocation" value="http://www.jalview.org/webstart" />
@@ -92,6 +94,12 @@
 		<property name="WebStartImage" value="JalviewLogo_big.png"/>
 		<!-- J2SE version needed for webstart launch -->
 		<property name="j2sev" value="1.6+"/>
+
+    <!-- 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.caller-codebase" value="${applet.codebase}"/>
+
 		<!-- build directory configuration -->
 		<property name="libDir" value="lib" />
 		<property name="resourceDir" value="resources" />
@@ -418,7 +426,7 @@
         <attribute name="Permissions" value="all-permissions" />
         <!--<attribute name="Trusted-Lib" value="true" /> -->
         <attribute name="Application-Name" value="Jalview Desktop"/>
-        <attribute name="Codebase" value="*"/>
+        <attribute name="Codebase" value="${application.codebase}"/>
 			</manifest>
 			<fileset dir="${outputDir}/">
 				<exclude name="cache*/**" />
@@ -470,8 +478,8 @@
 				<attribute name="Application-Name" value="JalviewLite Applet"/>
 				<!--        	<attribute name="Permissions" value="sandbox" /> -->
 				<!--<attribute name="Trusted-Lib" value="true" /> -->
-				<attribute name="Codebase" value="*.jalview.org *"/>
-				<attribute name="Caller-Allowable-Codebase" value="*.jalview.org *"/>
+				<attribute name="Codebase" value="${applet.codebase}"/>
+				<attribute name="Caller-Allowable-Codebase" value="${applet.caller-codebase}"/>
 			</manifest>
 			<fileset dir="${outputDir}">
 				<include name="com/**" />
@@ -595,7 +603,15 @@
 	  	        </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">
 
       <fileset dir="${packageDir}/examples">