Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Insight manifest changes for webstart #11772 #2069

Merged
merged 11 commits into from
Feb 10, 2014
Merged

Insight manifest changes for webstart #11772 #2069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a68a5b4
Add Permissions to manifest (required for webstart)
manics Feb 5, 2014
ae3f2be
Change signjar task to apply/exec jarsigner with custom args
manics Feb 6, 2014
94b0f13
Replace jarsign.storepass property with jarsign.storepassfile
manics Feb 6, 2014
acee4dc
Replace genkey task with exec keytool -genkey
manics Feb 6, 2014
d375311
Add jarsigner timestamping
manics Feb 6, 2014
fe37c87
Set default timestamping authority to http://time.certum.pl
manics Feb 6, 2014
22757d7
Use old/new taks depending on whether jarsign.storepassfile is set
manics Feb 7, 2014
b6274b4
Revert "Replace jarsign.storepass property with jarsign.storepassfile"
manics Feb 7, 2014
a138781
Add commented out note about jarsign.storepassfile
manics Feb 7, 2014
79c1389
Add tsaurl to old signjar tasks
manics Feb 7, 2014
b823889
Move jarsign into a new macrodef, echo jar name when signing
manics Feb 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
104 changes: 83 additions & 21 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,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 @@ -847,11 +864,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 @@ -892,17 +917,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 @@ -913,11 +957,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
Open in desktop
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
Open in desktop
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