Commit emails of the iDok project

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

Author: huebner AT PSI.CH
Date: Wed May 14 13:44:09 2008
New Revision: 99

Log:
Minor bugfixes and created a target do deploy dmsd

Modified:
   trunk/sites/psi/build.xml

Modified: trunk/sites/psi/build.xml
==============================================================================
--- trunk/sites/psi/build.xml   (original)
+++ trunk/sites/psi/build.xml   Wed May 14 13:44:09 2008
@@ -74,7 +74,7 @@
        </target>
 
        <target name="dist-dms"
-               depends="compile"
+               depends="dist"
                description="prepare PSI specific distribution">
 
                <jar destfile="${dist.dir}/idok_thin.jar"
@@ -124,19 +124,7 @@
                        <arg value="-c" />
                        <arg value="cp --preserve=mode mailer.py 
${install.dir}" />
                </exec>
-               <echo message="Copying files..."/>
-               <copy todir="${dmsd_install.dir}" overwrite="yes" 
verbose="yes">
-                       <fileset 
dir="${psi-idok.basedir}/scripts/admin/dmsd/dist"/>
-               </copy>
-               <replace file="${dmsd_install.dir}/dmsd" 
token="DEFINE_DMSD_DIR" value="DMSD_DIR=${dmsd_install.dir}"/>
-               <replace file="${dmsd_install.dir}/dmsd.config" 
token="DEFINE_CLASS_PATH" value="${lib-all}"/>
-                               <chmod perm="u+x" verbose="yes">
-                       <fileset dir="${dmsd_install.dir}" 
casesensitive="yes">
-                               <include name="*.sh"/>
-                               <include name="dmsd"/>
-                       </fileset>
-               </chmod>
-               
+
                <!-- Copy jars if newer than destination -->
                <copy todir="${install.dir}" flatten="true">
                        <!-- idok jars -->
@@ -144,7 +132,6 @@
                        <!-- 3rd party jars -->
                        <fileset refid="idok.libs.runtime" />
                </copy>
-               <copy file="${dist.dir}/idok.jar" 
tofile="${dmsd_install.dir}/dmsd.jar"/>
 
                <!-- Copy additional files to install dir -->
                <copy todir="${install.dir}" flatten="true" overwrite="true">
@@ -153,11 +140,35 @@
                <copy todir="${install.dir}" flatten="false" overwrite="true">
                        <fileset file="${psi-idok.basedir}/www/**" />
                </copy>
+               <copy file="${psi-idok.basedir}/scripts/admin/logging.conf" 
todir="${install.dir}"/>
                
                <antcall target="sign-all-jars">
                </antcall>
-               
        </target>
+       
+    <target name="copy-dmsd" description="">
+        <!-- Copy the dmsd files to the dmsd directory -->
+               <echo message="Copying files..."/>
+       <copy file="${dist.dir}/idok.jar" 
tofile="${dmsd_install.dir}/dmsd.jar"/>
+               <copy todir="${dmsd_install.dir}" overwrite="yes" 
verbose="yes">
+                       <fileset 
dir="${psi-idok.basedir}/scripts/admin/dmsd/dist"/>
+               </copy>
+               <replace file="${dmsd_install.dir}/dmsd" 
token="DEFINE_DMSD_DIR" value="DMSD_DIR=${dmsd_install.dir}"/>
+               <replace file="${dmsd_install.dir}/dmsd.config" 
token="DEFINE_CLASS_PATH" value="${lib-all}"/>
+               <chmod perm="u+x" verbose="yes">
+                       <fileset dir="${dmsd_install.dir}" 
casesensitive="yes">
+                               <include name="*.sh"/>
+                               <include name="dmsd"/>
+                       </fileset>
+               </chmod>
+       <copy 
file="${psi-idok.basedir}/scripts/admin/nagios_check_dmsd_status" 
todir="${install.dir}"/>
+       <chmod perm="u+x" verbose="yes">
+               <fileset dir="${install.dir}" casesensitive="yes">
+                       <include name="*.sh"/>
+                       <include name="nagios_check_dmsd_status"/>
+               </fileset>
+               </chmod>
+    </target>
 
        <target name="install-windows"
                depends="dist-dms"