JAL-957 standardise formatting for example preamble

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index eae1d94..e7f05bc 100755 (executable)
--- 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="*"/>
+    <property name="applet.caller-codebase" value="${applet.codebase}"/>
+
                <!-- build directory configuration -->
                <property name="libDir" value="lib" />
                <property name="resourceDir" value="resources" />
@@ -228,7 +236,7 @@
 
        <target name="makefulldist" depends="makedist">
                <!-- the default keystore details might need to be edited here -->
-               <signjar digestalg="SHA1" 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" />
@@ -416,9 +424,8 @@
                        <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="*"/>
+        <attribute name="Codebase" value="${application.codebase}"/>
                        </manifest>
                        <fileset dir="${outputDir}/">
                                <exclude name="cache*/**" />
@@ -467,10 +474,9 @@
                <jar destfile="in.jar" index="true">
                        <manifest>
                                <attribute name="Main-Class" value="jalview.bin.JalviewLite" />
-                               <attribute name="Permissions" value="sandbox" /> 
-        <!--<attribute name="Trusted-Lib" value="true" /> -->
-                               <attribute name="Application-Name" value="JalviewLite Applet"/>
-                               <attribute name="Codebase" value="www.jalview.org"/>
+                               <attribute name="Application-Name" value="JalviewLite"/>
+                               <attribute name="Permissions" value="all-permissions" />
+                               <attribute name="Codebase" value="${applet.codebase}"/>
                        </manifest>
                        <fileset dir="${outputDir}">
                                <include name="com/**" />
@@ -587,14 +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="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">