Skip to content

Commit

Permalink
Merge pull request #2069 from manics/insight_manifest_perms-11772
Browse files Browse the repository at this point in the history 
Insight manifest changes for webstart #11772
  • Loading branch information
@joshmoore
joshmoore committed Feb 10, 2014
2 parents d243708 + b823889 commit d1e5251
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 21 deletions.
104 changes: 83 additions & 21 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,23 @@ To get started using Eclipse, execute "./build.py build-dev" and import the top-
<ivy:retrieve conf="server" pattern="${dist.dir}/lib/server/[artifact].[ext]" sync="false" log="quiet" settingsRef="ivy.toplevel"/>
</target>

<macrodef name="signjar_passfile">
<attribute name="target"/>
<sequential>
<echo message="Signing jar: @{target} as ${jarsign.alias}"/>
<exec executable="jarsigner" failonerror="true">
<arg value="-keystore"/>
<arg value="${jarsign.keystore}"/>
<arg value="-storepass:file"/>
<arg value="${jarsign.storepassfile}"/>
<arg value="-tsa"/>
<arg value="${jarsign.tsa}"/>
<arg value="@{target}"/>
<arg value="${jarsign.alias}"/>
</exec>
</sequential>
</macrodef>

<macrodef name="jar_update_if">
<attribute name="destfile"/>
<attribute name="sign" default="true"/>
Expand All @@ -859,11 +876,19 @@ To get started using Eclipse, execute "./build.py build-dev" and import the top-
</jar>
<if><equals arg1="@{sign}" arg2="true"/>
<then>
<signjar alias="${jarsign.alias}"
keystore="${jarsign.keystore}"
storepass="${jarsign.storepass}"
preservelastmodified="true"
jar="@{destfile}"/>
<if><isset property="jarsign.storepassfile"/>
<then>
<signjar_passfile target="@{destfile}"/>
</then>
<else>
<signjar alias="${jarsign.alias}"
keystore="${jarsign.keystore}"
storepass="${jarsign.storepass}"
tsaurl="${jarsign.tsa}"
preservelastmodified="true"
jar="@{destfile}"/>
</else>
</if>
</then>
</if>
</then>
Expand Down Expand Up @@ -904,17 +929,36 @@ omero.version=${omero.version}
</target>

<target name="keystore" depends="init" description="Create keystore">
<genkey alias="${jarsign.alias}"
keystore="${jarsign.keystore}"
storepass="${jarsign.storepass}"
validity="${jarsign.validity}">
<dname>
<param name="CN" value="omedev"/>
<param name="OU" value="Open Microscopy Team"/>
<param name="O" value="openmicroscopy.org"/>
<param name="C" value="UK"/>
</dname>
</genkey>
<if><isset property="jarsign.storepassfile"/>
<then>
<exec executable="keytool" failonerror="true">
<arg value="-genkey"/>
<arg value="-alias"/>
<arg value="${jarsign.alias}"/>
<arg value="-dname"/>
<arg value="CN=omedev, OU=Open Microscopy Team, O=openmicroscopy.org, C=UK"/>
<arg value="-keystore"/>
<arg value="${jarsign.keystore}"/>
<arg value="-storepass:file"/>
<arg value="${jarsign.storepassfile}"/>
<arg value="-validity"/>
<arg value="${jarsign.validity}"/>
</exec>
</then>
<else>
<genkey alias="${jarsign.alias}"
keystore="${jarsign.keystore}"
storepass="${jarsign.storepass}"
validity="${jarsign.validity}">
<dname>
<param name="CN" value="omedev"/>
<param name="OU" value="Open Microscopy Team"/>
<param name="O" value="openmicroscopy.org"/>
<param name="C" value="UK"/>
</dname>
</genkey>
</else>
</if>
</target>

<target name="server-verify">
Expand All @@ -925,11 +969,29 @@ omero.version=${omero.version}
</target>

<target name="webstart-sign">
<signjar alias="${jarsign.alias}" keystore="${jarsign.keystore}" storepass="${jarsign.storepass}" preservelastmodified="false">
<path>
<fileset dir="${dist.dir}/lib/insight" includes="*.jar"/>
</path>
</signjar>
<if><isset property="jarsign.storepassfile"/>
<then>
<for param="target">
<path>
<fileset dir="${dist.dir}/lib/insight" includes="*.jar"/>
</path>
<sequential>
<signjar_passfile target="@{target}"/>
</sequential>
</for>
</then>
<else>
<signjar alias="${jarsign.alias}"
keystore="${jarsign.keystore}"
storepass="${jarsign.storepass}"
tsaurl="${jarsign.tsa}"
preservelastmodified="false">
<path>
<fileset dir="${dist.dir}/lib/insight" includes="*.jar"/>
</path>
</signjar>
</else>
</if>
</target>

<target name="webstart-verify">
Expand Down
3 changes: 3 additions & 0 deletions components/insight/build/dist.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,12 @@
<fileset dir="${app.compiled.dir}"/>
<fileset dir="${dist.jar.app.config.dir}" includes="${dist.jar.app.config.base}/**"/>
<manifest>
<attribute name="Application-Name" value="${distInsight.name}"/>
<attribute name="Codebase" value="*"/>
<attribute name="Created-By" value="OMERO Development Team"/>
<attribute name="Class-Path" value="${dist.jar.manifest.cp}"/>
<attribute name="Main-Class" value="${app.mainclass}"/>
<attribute name="Permissions" value="all-permissions"/>
</manifest>
</jar>
</target>
Expand Down
3 changes: 3 additions & 0 deletions etc/local.properties.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ ivy.log.resolved.revision=false
jarsign.keystore=${omero.home}/lib/keystore
jarsign.alias=omedev
jarsign.storepass=omedev
#Password can be stored in a file with Java>=1.7
#jarsign.storepassfile=
jarsign.validity=1000
jarsign.tsa=http://time.certum.pl

############################################
# Testing
Expand Down

0 comments on commit d1e5251

Please sign in to comment.