*** empty log message ***

releng/org.eclipse.epp.usagedata.releng.tycho/sign.xml

diff --git a/releng/org.eclipse.epp.usagedata.releng.tycho/sign.xml b/releng/org.eclipse.epp.usagedata.releng.tycho/sign.xml
index 86140e5..01a5908 100644
--- a/releng/org.eclipse.epp.usagedata.releng.tycho/sign.xml
+++ b/releng/org.eclipse.epp.usagedata.releng.tycho/sign.xml
@@ -1,57 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project default="makeZip"
+<project default="signJars"
 	name="Sign all jar files with Eclipse Foundation key">
 
 	<property name="target.dir" value="${WORKSPACE}/org.eclipse.epp/releng/org.eclipse.epp.usagedata.repository/target/" />
-	<property name="archive.name" value="${WORKSPACE}/org.eclipse.epp.usagedata-${BUILD_ID}.zip" />
-	<property name="udc.archiveDir" value="${buildDirectory}/${buildLabel}" />
-	<property name="udc.signInputDir" value="/home/data/httpd/download-staging.priv/technology/epp" />
-	<property name="udc.inputFile" value="${udc.signInputDir}/${udc.archiveName}" />
-	<property name="udc.signOutputDir" value="${udc.signInputDir}/output" />
-	<property name="udc.outputFile" value="${udc.signOutputDir}/${udc.archiveName}" />
-
-	<target name="makeZip" depends="test.update.site.exists" if="update.site.exists">
-		<echo message="Zipping update site into ${archive.name}" />
-		<zip destfile="${archive.name}" basedir="${target.dir}"/>
-	</target>
+	<property name="archive.name" value="org.eclipse.epp.usagedata-unsigned.zip" />
+	<property name="unsigned.dir" value="${WORKSPACE}/unsigned" />
+	<property name="unsigned.file" value="${unsigned.dir}/${archive.name}" />
+	<property name="signed.dir" value="${WORKSPACE}/signed" />
 	
-	<target name="test.update.site.exists">
-		<available file="${target.dir}" type="dir" property="update.site.exists" />
-		<echo message="${target.dir} exists: ${update.site.exists}" />
-	</target>
-	
-	<target name="signJars" depends="test.signer.exists" if="signer.exists">
-		<mkdir dir="${udc.signOutputDir}" />
-		<chmod dir="${udc.signOutputDir}" perm="ugo+rw" />
+	<property name="signer.input.dir" value="/home/data/httpd/download-staging.priv/technology/epp" />
+	<property name="signer.output.dir" value="${signer.input.dir}/output" />
+	<property name="signer.input.file" value="${signer.input.dir}/${archive.name}" />
+	<property name="signer.output.file" value="${signer.output.dir}/${archive.name}" />
+	<property name="signer.out" value="${signer.output.dir}/out.log" />
+	<property name="signer.err" value="${signer.output.dir}/err.log" />	
 
-		<copy file="${udc.archiveDir}/${udc.archiveName}" todir="${udc.signInputDir}"
-			overwrite="true" />
-		<!-- TODO add pack.properties to zip file -->
+	<target name="makeZip">
+		<echo message="Zipping update site into ${unsigned.file}" />
+		<zip destfile="${unsigned.file}" basedir="${target.dir}"/>
+	</target>
+		
+	<target name="signJars" depends="makeZip">
+		<mkdir dir="${signer.output.dir}" />
+		<chmod dir="${signer.output.dir}" perm="ugo+rw" />
+
+		<copy file="${unsigned.file}" todir="${signer.input.dir}" overwrite="true" />
 
 		<echo message="Start the external sign script" />
-		<exec executable="/usr/bin/sign" dir="${udc.signInputDir}"
-			output="sign.out" error="sign.err" append="true">
-			<arg value="${udc.inputFile}" />
+		<exec executable="/usr/bin/sign" dir="${signer.input.dir}" output="signer.out" error="signer.err" append="true">
+			<arg value="${signer.input.file}" />
 			<arg value="mail" />
-			<arg value="${udc.signOutputDir}" />
+			<arg value="${signer.output.dir}" />
 		</exec>
 
-		<echo message="Waiting for file ${udc.outputFile}" />
-		<waitfor maxwait="15" maxwaitunit="minute" checkevery="5"
-			checkeveryunit="second">
-			<available file="${udc.outputFile}" />
+		<echo message="Waiting for file ${archive.name}" />
+		<waitfor maxwait="15" maxwaitunit="minute" checkevery="5" checkeveryunit="second">
+			<available file="${signer.output.file}" />
 		</waitfor>
 
 		<sleep seconds="10" />
 		<echo message="Copying signed zip file to old location" />
-		<copy file="${udc.outputFile}" todir="${udc.archiveDir}"
-			overwrite="true" />
+		<copy todir="${signed.dir}" overwrite="true">
+			<fileset dir="$signer.output.dir" />
+		</copy>
 
 	</target>
-
-	<!-- This target tests to see if the signer is available. We'll only attempt 
-		to sign if it does. -->
-	<target name="test.signer.exists">
-		<available file="/usr/bin/sign" property="signer.exists" />
-	</target>
 </project>
\ No newline at end of file