From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Thu, 7 Nov 2013 13:54:20 +0000 (+0000)
Subject: Merge branch 'JAL-1286' into Release_2_8_1_Branch
X-Git-Tag: Jalview_2_9~200^2~8
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=93762210516927cf4eafff52af32d1d90d499f28;p=jalview.git

Merge branch 'JAL-1286' into Release_2_8_1_Branch
slightly dirty merge - JAL-1400 patches have been brought in too
Conflicts:
	build.xml
---

93762210516927cf4eafff52af32d1d90d499f28
diff --cc build.xml
index 0e13756,2673e9b..bf84feb
--- a/build.xml
+++ b/build.xml
@@@ -460,11 -464,13 +464,15 @@@
  	<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" />
 +		<copy todir="${outputDir}/lang">
 +			<fileset dir="${resourceDir}/lang"><include name="**.*"/></fileset></copy>
- 		<jar destfile="in.jar">
+ 		<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"/>
  			</manifest>
  			<fileset dir="${outputDir}">
  				<include name="com/**" />