X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=c29f2c1aef963f01b59e76ea4405fb6d4242955e;hb=fe76692596c7d98452e2c93bcd934cb8c0dbf5b5;hp=b2a39c6144e15b66423ce2d0ff07733d65316a1d;hpb=d784cd9ba115825b38ae35af510bf435a5fb3a56;p=jalview.git

diff --git a/build.xml b/build.xml
index b2a39c6..c29f2c1 100755
--- a/build.xml
+++ b/build.xml
@@ -85,11 +85,21 @@
 		<!-- 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" />
+		<!-- Webstart Image - looked for in resources/images -->
+		<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" />
@@ -226,7 +236,7 @@
 
 	<target name="makefulldist" depends="makedist">
 		<!-- the default keystore details might need to be edited here -->
-		<signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
+		<signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" sigalg="SHA1withRSA">
 
 			<fileset dir="${packageDir}">
 				<include name="*.jar" />
@@ -234,7 +244,7 @@
 		</signjar>
 		<copy todir="${packageDir}">
 			<fileset dir="${resourceDir}/images">
-				<include name="JalviewLogo_big.png"/>
+				<include name="${WebStartImage}"/>
 			</fileset>
 					</copy>
 		
@@ -249,7 +259,7 @@
 				<homepage href="http://www.jalview.org" />
 				<description>Jalview Multiple Alignment Editor</description>
 				<description kind="short">Jalview</description>
-				<icon href="JalviewLogo_big.png" />
+				<icon href="${WebStartImage}" />
 				<offline_allowed/>
 			</information>
 			<resources>
@@ -277,7 +287,7 @@
 				<homepage href="http://www.jalview.org" />
 				<description>Jalview Multiple Alignment Editor</description>
 				<description kind="short">Jalview</description>
-				<icon href="JalviewLogo_big.png" />
+				<icon href="${WebStartImage}" />
 				<offline_allowed />
 			</information>
 			<resources>
@@ -305,7 +315,7 @@
 				<homepage href="http://www.jalview.org" />
 				<description>Jalview Multiple Alignment Editor</description>
 				<description kind="short">Jalview</description>
-				<icon href="JalviewLogo_big.png" />
+				<icon href="${WebStartImage}" />
 				<offline_allowed />
 			</information>
 			<resources>
@@ -410,9 +420,13 @@
 				<include name="*.jar"/>
 			</fileset>
 		</delete>
-		<jar destfile="${packageDir}/${outputJar}">
+		<jar destfile="${packageDir}/${outputJar}" index="true">
 			<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>
 			<fileset dir="${outputDir}/">
 				<exclude name="cache*/**" />
@@ -458,9 +472,14 @@
 	<target name="packageApplet" depends="compileApplet, buildPropertiesFile">
 		<copy file="${resourceDir}/images/idwidth.gif" toFile="${outputDir}/images/idwidth.gif" />
 		<copy file="${resourceDir}/images/link.gif" toFile="${outputDir}/images/link.gif" />
-		<jar destfile="in.jar">
+		<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="Codebase" value="${applet.codebase}"/>
+				<attribute name="Caller-Allowable-Codebase" value="${applet.caller-codebase}"/>
 			</manifest>
 			<fileset dir="${outputDir}">
 				<include name="com/**" />
@@ -490,11 +509,17 @@
 			<injar file="in.jar" />
 			<outjar file="${jalviewLiteJar}" />
 			<libraryjar refid="obfuscateDeps.path" />
+			<dontwarn/>
 			<keep access="public" type="class" name="jalview.bin.JalviewLite">
 				<field access="public" />
 				<method access="public" />
 				<constructor access="public" />
 			</keep>
+			<keep access="public" type="class" name="jalview.appletgui.AlignFrame">
+				<field access="public" />
+				<method access="public" />
+				<constructor access="public" />
+			</keep>
 			<!--      -libraryjars "${obfuscateDeps}"
       -injars      in.jar
       -outjars     jalviewApplet.jar
@@ -577,7 +602,22 @@
 	  	      <include name="**/*"/>
 	  	        </fileset>
 	  </copy>
-	  		
+	    <jar update="true" index="true" jarfile="${packageDir}/examples/${jalviewLiteJar}"/>
+	    <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">
+        <include name="*.jar" />
+      </fileset>
+    </signjar>
 	</target>
 	<target name="sourcedoc" description="Create jalview source documentation pages" depends="init">
 	 <javadoc destdir="${javadocDir}">