Commit emails of the iDok project

["AFS account Stadler Hans Christian" <stadler_h AT savannah.psi.ch>]

Author: stadler_h
Date: Tue Mar 31 15:07:36 2009
New Revision: 354

Log:
Add possibility to dmsd ant file to install dmsd directly to qa by specifying 
env variable SERVER=qa

Modified:
   trunk/sites/psi/scripts/admin/dmsd/build.xml
   trunk/sites/psi/scripts/admin/dmsd/dist/dmsd.config

Modified: trunk/sites/psi/scripts/admin/dmsd/build.xml
==============================================================================
--- trunk/sites/psi/scripts/admin/dmsd/build.xml        (original)
+++ trunk/sites/psi/scripts/admin/dmsd/build.xml        Tue Mar 31 15:07:36 
2009
@@ -39,7 +39,11 @@
        <property name="distlib" location="${dist}/lib"/>
        
        <!-- final installation directories -->
-       <property name="dest" 
location="/afs/psi.ch/project/dms/admin/devel/opt/dmsd"/>
+       <property environment="env"/>
+       <condition property="server" value="${env.SERVER}" else="devel">
+               <isset property="env.SERVER"/>
+       </condition>
+       <property name="dest" 
location="/afs/psi.ch/project/dms/admin/${server}/opt/dmsd"/>
        <property name="destlib" location="${dest}/lib"/>
        
        <!-- UNO directory -->
@@ -66,9 +70,11 @@
        <property name="uno-all" 
value="${uno-1}:${uno-2}:${uno-3}:${uno-4}:${uno-5}:${uno-6}"/>
        <property name="lib-all" 
value="${jsvn}:${lucene}:${pdf}:${fontbox}:${bcprov}:${bcmail}:${uno-all}:${exif}:${tar}:${htmlparser}"/>
        
+       <!-- Initialisation -->
        <target name="init" description="Initialize timestamp properties and 
create necessary directories">
                <echo message="initializing"/>
                <exec executable="pwd" failonerror="true"/>
+               <echo message="server=${server}"/>
                <tstamp/>
                <mkdir dir="${src}"/>
                <mkdir dir="${build}"/>
@@ -151,10 +157,15 @@
                        <arg value="-n"/>
                </exec>
                <echo message="svnversion is ${svnversion}"/>
-               <replace file="${dist}/dmsd" token="DEFINE_DMSD_DIR" 
value="DMSD_DIR=${dest}" summary="yes"/>
-               <replace file="${dist}/dmsd" token="DEFINE_DMSD_VERSION" 
value="DMSD_VERSION=${svnversion}"/>
-               <replace file="${dist}/dmsd.config" token="DEFINE_CLASS_PATH" 
value="${lib-all}"/>
-               <replace file="${dist}/dmsd.config" token="${dist}/" 
value=""/>
+               <replace file="${dist}/dmsd" summary="yes">
+                       <replacefilter token="DEFINE_DMSD_DIR" 
value="DMSD_DIR=${dest}"/>
+                       <replacefilter token="DEFINE_DMSD_VERSION" 
value="DMSD_VERSION=${svnversion}"/>
+               </replace>
+               <replace file="${dist}/dmsd.config" summary="yes">
+                       <replacefilter token="DEFINE_CLASS_PATH" 
value="${lib-all}"/>
+                       <replacefilter token="${dist}/" value=""/>
+                       <replacefilter token="DEFINE_SERVER" 
value="${server}"/>
+               </replace>
        </target>
        
        <!-- Install -->

Modified: trunk/sites/psi/scripts/admin/dmsd/dist/dmsd.config
==============================================================================
--- trunk/sites/psi/scripts/admin/dmsd/dist/dmsd.config (original)
+++ trunk/sites/psi/scripts/admin/dmsd/dist/dmsd.config Tue Mar 31 15:07:36 
2009
@@ -35,11 +35,12 @@
 VM_MAX_HEAP_SIZE=800m
 
 # Daemon configuration
+SERVER=DEFINE_SERVER
 CONFIGURATOR=ch.idok.dmsd.impl.config.svnlucene.Config
 DMS_DIR=/afs/psi.ch/dms
 AUX_DIR=/data/dmsd
-INDEX_DIR=devel-index
-LVF_NAME=last-indexed-devel-version
+INDEX_DIR=${SERVER}-index
+LVF_NAME=last-indexed-${SERVER}-version
 INDEXING_MODE=all
 SVN_URL="file:///afs/psi.ch/dms"