Commit emails of the iDok project

["Apache" <apache AT savannah.psi.ch>]

Author: geus AT PSI.CH
Date: Thu Jan 24 09:38:26 2008
New Revision: 686

Log:
Removed password for secret key from PSI specific ant build file; password 
needs to be entered by the user when regenerating the keystore

Modified:
   branches/opensource/sites/psi/build.xml

Modified: branches/opensource/sites/psi/build.xml
==============================================================================
--- branches/opensource/sites/psi/build.xml     (original)
+++ branches/opensource/sites/psi/build.xml     Thu Jan 24 09:38:26 2008
@@ -154,24 +154,28 @@
        <target name="generate-keystore" description="generate keys for 
encryption and signing">
                <delete file="${keystore.file}"/>
                
-               <!-- Generate keystore containing keypair for CORBA -->
+               <!-- Generate keystore containing keypair for signing jar 
files -->
                <genkey
                        keystore="${keystore.file}"
                        storepass="${keystore.passwd}"                  
-                       alias="dms_corba"
-                       keypass="VgxfhGau7WL1T4qlD1NE"
+                       alias="jarsign"
                        keyalg="RSA"
                        validity="700"
-                       dname="CN=Roman Geus, OU=AIT, O=PSI, L=Unknown, 
ST=Unknown, C=CH"/>
-
-               <!-- Generate keystore containing keypair for signing jar 
files -->
+                       dname="CN=AIT\2C Paul Scherrer Institute, OU=AIT, 
O=PSI, L=Unknown, ST=Unknown, C=CH"/>
+               
+               <!-- Generate keystore containing keypair for CORBA -->
+               <input
+                   message="Enter password for private key used for CORBA 
encryption: "
+                   addproperty="keystore.corba.passwd"
+               />
                <genkey
                        keystore="${keystore.file}"
                        storepass="${keystore.passwd}"                  
-                       alias="jarsign"
+                       alias="dms_corba"
+                       keypass="${keystore.corba.passwd}"
                        keyalg="RSA"
                        validity="700"
-                       dname="CN=AIT\2C Paul Scherrer Institute, OU=AIT, 
O=PSI, L=Unknown, ST=Unknown, C=CH"/>
+                       dname="CN=Roman Geus, OU=AIT, O=PSI, L=Unknown, 
ST=Unknown, C=CH"/>
        </target>
 
        <target name="sign-all-jars" description="sign all jar files for Java 
webstart">
@@ -199,19 +203,32 @@
                </exec>
        </target>
 
-       <target name="sdist-from-workdir" depends="clean" 
description="generate source distribution .zip and .tar.gz archives from a 
checked out working directory">
+       <target name="sdist-from-workdir" depends="dist" 
description="generate source/binary distribution .zip and .tar.gz archives 
from a checked out working directory">
                <property name="sdist.release.name" value="idok-workspace" />
                <property name="sdist.export.dir" 
value="${idok.basedir}/ant_sdist" />
                <property name="sdist.dir" 
value="${sdist.export.dir}/${sdist.release.name}" />
                <delete dir="${sdist.dir}" />
                <copy todir="${sdist.dir}" verbose="true" overwrite="true">
-                       <fileset dir="${idok.basedir}" excludes="**/*.svn"/>
+                       <fileset dir="${idok.basedir}" 
excludes="**/*.svn,*.zip,*.tar.gz"/>
                </copy>
                <tar basedir="${sdist.export.dir}" 
destfile="${sdist.release.name}.tar.gz" compression="gzip" longfile="gnu" />
                <zip basedir="${sdist.export.dir}" 
destfile="${sdist.release.name}.zip" />
                <delete dir="${sdist.dir}"/>
        </target>
 
+       <target name="bindist-from-workdir" depends="dist" 
description="generate binary distribution .zip and .tar.gz archives from a 
checked out working directory">
+               <property name="sdist.release.name" value="idok-workspace" />
+               <property name="sdist.export.dir" 
value="${idok.basedir}/ant_sdist" />
+               <property name="sdist.dir" 
value="${sdist.export.dir}/${sdist.release.name}" />
+               <delete dir="${sdist.dir}" />
+               <copy todir="${sdist.dir}" verbose="true" overwrite="true">
+                       <fileset dir="${idok.basedir}" 
excludes="**/*.svn,*.zip,*.tar.gz"/>
+               </copy>
+               <tar basedir="${sdist.export.dir}" 
destfile="${sdist.release.name}.tar.gz" compression="gzip" longfile="gnu" />
+               <zip basedir="${sdist.export.dir}" 
destfile="${sdist.release.name}.zip" />
+               <delete dir="${sdist.dir}"/>
+       </target>
+               
        <target name="sdist-from-svn" description="generate source 
distribution .zip and .tar.gz archives from svn repository">
                <input
                    message="Enter version string (e.g. 1.0.1-beta2): "