From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Tue, 26 Nov 2013 17:02:28 +0000 (+0000)
Subject: Merge branch 'testMerge' into trialMergeDev
X-Git-Tag: Jalview_2_9~210^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=46c08d3f7a387cb4e81f975a88bf5b0836f3ba35;p=jalview.git

Merge branch 'testMerge' into trialMergeDev

Conflicts:
	build.xml
---

46c08d3f7a387cb4e81f975a88bf5b0836f3ba35
diff --cc build.xml
index c60abe4,12e16a8..dc93408
--- a/build.xml
+++ b/build.xml
@@@ -91,8 -93,13 +93,14 @@@
  		<!-- 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+"/>
 +<!-- Anne's version needs 1.7 - should rebuild VARNA to java 1.6 for release -->
 +		<property name="j2sev" value="1.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.caller-codebase" value="${applet.codebase}"/>
+ 
  		<!-- build directory configuration -->
  		<property name="libDir" value="lib" />
  		<property name="resourceDir" value="resources" />