Commit emails of the iDok project

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

Author: geus AT PSI.CH
Date: Thu Jan 24 10:18:25 2008
New Revision: 687

Log:
Added functionality to support Java webstart on VMware test server

Modified:
   branches/opensource/local-server.xml

Modified: branches/opensource/local-server.xml
==============================================================================
--- branches/opensource/local-server.xml        (original)
+++ branches/opensource/local-server.xml        Thu Jan 24 10:18:25 2008
@@ -14,8 +14,10 @@
        <property name="server.httpd.conf.dir" 
value="${server.root.dir}/httpd/conf.d" />
        <property name="server.nameservice.dir" 
value="${server.root.dir}/orbd" />
        <property name="server.hostname" value="localhost" />
+       <property name="keystore.passwd.corba" value="90fd3498jw03riqdgs4f" 
/>  
 
        <property name="svnadmin.exec" value="svnadmin" />
+       <property name="svn.exec" value="svn" />
        <property name="orbd.exec" value="orbd" />
 
        <fileset id="idok.libs.server" dir="">
@@ -29,6 +31,21 @@
                <include name="lib/smtphandler.jar" />
        </fileset>
 
+       <fileset id="idok.libs.webstart" dir="">
+               <include name="ant_dist/idok.jar" />
+               <include name="ant_dist/qtgui.jar" />
+               <include name="lib/svnkit.jar" />
+               <include name="lib/commons-cli.jar" />
+               <include name="lib/avalon-framework.jar"/>
+               <include name="lib/jacorb.jar"/>
+               <include name="lib/logkit.jar"/>
+               <include name="lib/qtjambi.jar"/>
+               <include name="lib/os_jpedal.jar"/>
+               <include name="lib/qtjambi-win32-gpl-4.3.1_01.jar"/>
+               <include name="lib/qtjambi-linux32-gpl-4.3.1_01.jar"/>
+               <include name="lib/qtjambi-mac-gpl-4.3.1_01.jar"/>
+       </fileset>
+               
        <target name="init-server-dirs" description="create directory 
structure needed to start the server">
                <mkdir dir="${server.root.dir}" />
                <mkdir dir="${server.authzn.db.dir}" />
@@ -50,6 +67,17 @@
                        <arg value="create" />
                        <arg 
path="${test.project.dir}/${test.repository.name}" />
                </exec>
+               <exec executable="${svnadmin.exec}">
+                       <arg value="create" />
+                       <arg 
path="${test.project.dir}/${test.repository.name}" />
+               </exec>
+               <exec executable="${svn.exec}">
+                       <arg value="import" />
+                       <arg 
path="${idok.basedir}/misc/sample_repository_data" />
+                       <arg 
value="file://${test.project.dir}/${test.repository.name}" />
+                       <arg value="-m" />
+                       <arg value="Import sample data" />
+               </exec>
        </target>
 
        <target name="start-orbd" description="start CORBA naming service">
@@ -65,12 +93,14 @@
 
        <target name="start-server-sunorb" depends="" description="start 
local iDok server with Sun ORB">
                <java classname="ch.psi.dms.service.server.Daemon" 
fork="true" spawn="true">
+                       <!-- The standard output gets lost because we use 
spawn="true" -->
                        <jvmarg line="-server" />
 
                        <classpath>
                                <fileset refid="idok.libs.server" />
                        </classpath>
 
+                       <sysproperty key="java.util.logging.config.file" 
value="${idok.basedir}/scripts/admin/test_server/logging.conf" />
                        <sysproperty key="ch.psi.dms.server.projectRoot" 
value="${server.project.root.dir}" />
                        <sysproperty key="derby.system.home" 
value="${server.authzn.db.dir}" />
                        <sysproperty 
key="ch.psi.dms.service.admin.backup.dir" 
value="${server.authzn.db.backup.dir}" />
@@ -84,7 +114,7 @@
                        <sysproperty key="org.omg.CORBA.ORBInitialHost" 
value="${server.hostname}" />
                        <sysproperty key="org.omg.CORBA.ORBInitialPort" 
value="1050" />
                        <sysproperty key="ch.psi.dms.service.common.keypass" 
value="${keystore.passwd}" />
-                       <sysproperty key="ch.psi.dms.privateKeyPassword" 
value="VgxfhGau7WL1T4qlD1NE" />
+                       <sysproperty key="ch.psi.dms.privateKeyPassword" 
value="${keystore.passwd.corba}" />
                        <sysproperty 
key="ch.psi.dms.service.server.admin.masterAdminName" value="idokadmin" />
 
                        <!-- Omitted options:
@@ -98,6 +128,7 @@
 
        <target name="start-server-jacorb" depends="" description="start 
local iDok server with Sun ORB">
                <java classname="ch.psi.dms.service.server.Daemon" 
fork="true" spawn="true">
+                       <!-- The standard output gets lost because we use 
spawn="true" -->
                        <jvmarg line="-server 
-Xbootclasspath/p:lib/jacorb.jar:lib/logkit.jar:lib/avalon-framework.jar" />
 
                        <!--
@@ -114,6 +145,7 @@
                                <fileset refid="idok.libs.server" />
                        </classpath>
 
+                       <sysproperty key="java.util.logging.config.file" 
value="${idok.basedir}/scripts/admin/test_server/logging.conf" />
                        <sysproperty key="ch.psi.dms.server.projectRoot" 
value="${server.project.root.dir}" />
                        <sysproperty key="derby.system.home" 
value="${server.authzn.db.dir}" />
                        <sysproperty 
key="ch.psi.dms.service.admin.backup.dir" 
value="${server.authzn.db.backup.dir}" />
@@ -129,7 +161,7 @@
                        <sysproperty 
key="org.omg.PortableInterceptor.ORBInitializerClass.bidir_init" 
value="org.jacorb.orb.giop.BiDirConnectionInitializer" />
                        <sysproperty key="ORBInitRef.NameService" 
value="corbaloc::${server.hostname}:1050/NameService" />
                        <sysproperty key="ch.psi.dms.service.common.keypass" 
value="${keystore.passwd}" />
-                       <sysproperty key="ch.psi.dms.privateKeyPassword" 
value="VgxfhGau7WL1T4qlD1NE" />
+                       <sysproperty key="ch.psi.dms.privateKeyPassword" 
value="${keystore.passwd.corba}" />
                        <sysproperty 
key="ch.psi.dms.service.server.admin.masterAdminName" value="idokadmin" />
 
                        <!-- Omitted options:
@@ -141,5 +173,32 @@
                </java>
        </target>
 
+       <target name="sign-all-jars" description="sign all jar files for Java 
webstart">
+               <signjar alias="jarsign" storepass="${keystore.passwd}" 
+                                keystore="${keystore.file}">
+                       <fileset refid="idok.libs.webstart"/>
+               </signjar>
+       </target>
+
+       <target name="generate-keystore" description="generate keys for 
signing and encryption">
+               <!-- Generate keystore containing keypair for signing jar 
files -->
+               <delete file="${keystore.file}"/>
+               <genkey
+                       keystore="${keystore.file}"
+                       storepass="${keystore.passwd}"                  
+                       alias="jarsign"
+                       keyalg="RSA"
+                       validity="700"
+                       dname="CN=iDok project, OU=Unknown, O=idok.ch, 
L=Unknown, ST=Unknown, C=CH"/>
+               <!-- Generate keystore containing keypair for CORBA -->
+               <genkey
+                       keystore="${keystore.file}"
+                       storepass="${keystore.passwd}"                  
+                       alias="dms_corba"
+                       keypass="${keystore.passwd.corba}"
+                       keyalg="RSA"
+                       validity="700"
+                       dname="CN=iDok project, OU=Unknown, O=idok.ch, 
L=Unknown, ST=Unknown, C=CH"/>
+       </target>
 
 </project>