git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0e6d654
)
JAL-1400 update manifest in the JmolApplet jar
author
Jim Procter
<jprocter@compbio.dundee.ac.uk>
Tue, 26 Nov 2013 16:20:50 +0000
(16:20 +0000)
committer
Jim Procter
<jprocter@compbio.dundee.ac.uk>
Tue, 26 Nov 2013 16:20:50 +0000
(16:20 +0000)
build.xml
patch
|
blob
|
history
diff --git
a/build.xml
b/build.xml
index
2f71b50
..
c29f2c1
100755
(executable)
--- a/
build.xml
+++ b/
build.xml
@@
-85,6
+85,8
@@
<!-- Key Password -->
<property name="jalview.key.pass" value="alignmentisfun" />
<!-- 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" />
<!-- 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+"/>
<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" />
<!-- 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="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*/**" />
</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="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/**" />
</manifest>
<fileset dir="${outputDir}">
<include name="com/**" />
@@
-595,7
+603,15
@@
</fileset>
</copy>
<jar update="true" index="true" jarfile="${packageDir}/examples/${jalviewLiteJar}"/>
</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">
<signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
<fileset dir="${packageDir}/examples">