[gavia-ms-commit] r1284 - in branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise: . to_delete

commit at globus.org commit at globus.org
Thu Jul 30 10:33:22 CDT 2009


Author: andre
Date: 2009-07-30 10:33:21 -0500 (Thu, 30 Jul 2009)
New Revision: 1284

Added:
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/condor_config.in
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/build.properties
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/build.xml
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/classad-registration.xml.template
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/gavia-grid-resource.tar.gz
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/mds-sga
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/mds-sga.conf.template
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/xslTemplateFiles/
Removed:
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/build.properties
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/build.xml
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/classad-registration.xml.template
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/condor_config.template
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/gavia-grid-resource.tar.gz
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/mds-sga
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/mds-sga.conf.template
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/xslTemplateFiles/
Modified:
   branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/gavia-resource-advertise.conf.in
Log:
checkpoint commit to testing branch

Deleted: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/build.properties
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/build.properties	2009-07-30 15:21:25 UTC (rev 1283)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/build.properties	2009-07-30 15:33:21 UTC (rev 1284)
@@ -1,30 +0,0 @@
-# Default used if env var GLOBUS_LOCATION not defined
-#globus.location=/opt/globus-4.0.2
-
-# File used for mds-servicegroup-add
-mds.reg.file=classad-registration.xml
-
-# SVN
-svn.repository=https://neon.sao.nrc.ca:7861/svn/projects/gridx1_sp1/trunk/MetaScheduling
-svn.module=ClassAd
-svn.tool=/usr/bin/svn
-
-# CHMOD
-chmod.tool=/bin/chmod
-
-# CHOWN
-chown.tool=/bin/chown
-
-# Javac options
-javac.debug=on
-build.compiler=modern
-
-# Applic params
-src.dir=src
-lib.dir=lib
-build.dir=build
-dist.dir=dist
-app.jar=MdsClassAdExtractor.jar
-release.tmp.dir=${build.dir}/tmp
-doc.dir=doc
-api.doc.dir=${doc.dir}/api

Deleted: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/build.xml
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/build.xml	2009-07-30 15:21:25 UTC (rev 1283)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/build.xml	2009-07-30 15:33:21 UTC (rev 1284)
@@ -1,546 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="gavia-grid-resource" default="deploy" basedir=".">
-    
-  <!-- Get properties from build.properties file. -->
-  <property name="app.name" value="gavia-grid-resource" />
-  <property file="build.properties"/>
-
-  <!-- get environment vars -->
-  <property environment="env"/>
-
-  <property name="classad.dir"  value="libexec/aggrexec"/>
-  <property name="mds.aggr.dir" value="etc/globus_wsrf_mds_aggregator"/>
-  <property name="home.dir"    value="${env.HOME}"/>
-  <property name="init.dir"    value="/etc/init.d"/>
-  <property name="resource.name" value="${env.HOSTNAME}"/>
-
-  <!-- set root.dir to ${globus.location.env} or ${globus.location} --> 
-
-  <property name="globus.location.env" value="${env.GLOBUS_LOCATION}"/>
-
-  <!-- flags to indicate if globus.location.env is defined -->
-  <condition property="gl.env.defined" value="true">
-       <not><contains string="${globus.location.env}" substring="env.GLOBUS_LOCATION"/></not>
-  </condition>
-  <condition property="gl.env.undefined" value="true">
-       <not><equals arg1="${gl.defined}" arg2="true"/></not> 
-  </condition>
-
-  <!-- 
-      root.dir = ${globus.location.env} if(${gl.env.defined})
-                 ${globus.location}     otherwise
-  -->
-  <condition property="root.dir" value="${globus.location.env}"> 
-       <equals arg1="${gl.env.defined}" arg2="true"/>
-  </condition>
-  <condition property="root.dir" value="${globus.location}"> 
-       <and>
-         <equals arg1="${gl.env.undefined}" arg2="true"/>
-         <isSet property="globus.location" />
-       </and>
-  </condition>
-
-  <!-- flags to indicate if root.dir is defined -->
-  <condition property="root.dir.set" value="true"> 
-      <isSet property="root.dir" />
-  </condition>
-  <condition property="root.dir.unset" value="true"> 
-      <not><isSet property="root.dir" /></not>
-  </condition>
-
-
-
-  <!-- Set my.id = `whoami` -->
-  <exec executable="/usr/bin/whoami" os="Linux" outputproperty="my.id"></exec>
-  <!-- <echo> my.id = ${my.id}</echo> -->
-
-
-
-
-  <!-- Help target -->
-  <target name="help">    
-
-    <echo>Usage: ant { deploy | clean | mds-setup | mds-init | update | status | package}</echo>
-    <echo> </echo>
-    <echo message="  ------------------------------------"/>
-    <echo message="  target      description"/>
-    <echo message="  ------------------------------------"/>
-    <echo message="  deploy      deploy ClassAd to Globus"/>
-    <echo message="  status      check status against SVN"/>
-    <echo message="  update      update project from SVN"/>
-    <echo message="  mds-setup   set up MDS aggregator script"/>
-    <echo message="  mds-init    set up MDS init script"/>
-    <echo message="  clean       remove build files"/>
-    <echo message="  package     create distributable package"/>
-    <echo message="  ------------------------------------"/>
-    <echo> </echo>
-    <echo>NOTES</echo>  
-    <echo> </echo>
-    <echo>  1. Run "ant deploy" and "ant mds-setup" as user globus </echo>
-    <echo>     and run "ant mds-init" as user root </echo>
-    <echo> </echo>
-    <echo>  2. Before running "ant deploy", set either</echo>
-    <echo message="      2.1 the environment variable GLOBUS_LOCATION"/>  
-    <echo message="      2.2 set in build.properties"/>    
-    <echo message="            globus.location=VALUE_OF_GLOBUS_LOCATION"/>    
-    <echo message="     and note that setting GLOBUS_LOCATION overrides globus.location"/>    
-
-  </target>
-
-
-
-  <!-- Package target -->
-  <target name="package"> 
-    <echo message="${app.name}" />   
-    <mkdir dir="${app.name}" />
-    <copy file="README" todir="${app.name}" />
-    <copy file="build.xml" todir="${app.name}" />
-    <copy file="build.properties" todir="${app.name}" />
-    <copy file="classad.pm" todir="${app.name}" />
-    <copy file="classad.conf" todir="${app.name}" />
-    <copy file="classad-registration.xml.template" todir="${app.name}" />
-    <copy file="condor_config.template" todir="${app.name}" />
-    <copy file="mds-sga" todir="${app.name}" />
-    <copy file="mds-sga.conf.template" todir="${app.name}" />
-
-    <tar destfile="${app.name}.tar.gz" compression="gzip" basedir="." includes="${app.name}/**" />
-    <delete dir="${app.name}" />
-    <echo>Distributable package created: ${app.name}.tar.gz</echo>
-
-
-  </target>
-
-
-
-  <target name="all" depends="deploy">
-  </target>
-    
-
-
-  <!-- Deploy Target -->
-  <target name="deploy">
-
-    <condition property="not.globus.user" value="true"> 
-       <not><equals arg1="${my.id}" arg2="globus"/></not>
-    </condition>
-
-    <condition property="is.globus.user" value="true"> 
-        <equals arg1="${my.id}" arg2="globus"/>
-    </condition>
-
-    <condition property="root.dir.exist">
-       <available file="${root.dir}" type="dir"/>
-    </condition>
-    <condition property="root.dir.notexist">
-       <not><equals arg1="${root.dir.exist}" arg2="true"/></not> 
-    </condition>
-
-    <condition property="home.dir.notexist">
-       <contains string="${home.dir}" substring="home.dir"/>
-    </condition>
-
-    <condition property="root.dir.ok">
-       <and>
-          <equals arg1="${root.dir.set}" arg2="true"/>
-          <equals arg1="${root.dir.exist}" arg2="true"/>
-       </and>
-    </condition>
-
-    <condition property="root.and.home.dir.ok">
-       <and>
-          <equals arg1="${root.dir.ok}" arg2="true"/>
-          <not><equals arg1="${home.dir.notexist}" arg2="true"/></not>
-       </and>
-    </condition>
-
-
-    <condition property="can.deploy">
-       <and>
-          <equals arg1="${root.and.home.dir.ok}" arg2="true"/>
-          <equals arg1="${is.globus.user}"       arg2="true"/>
-       </and>
-    </condition>
-
-
-
-
-
-    <!-- Call deploy subtasks -->
-
-    <antcall target="printenv" />
-    <antcall target="checkGlobusId"/>
-    <antcall target="checkGlobusLocation" />
-    <antcall target="checkRootDir"/>
-    <antcall target="checkHomeDir"/>
-    <antcall target="customizeConfigFile"/>
-
-    <antcall target="doDeploy"/>
-
-    <!--
-      <antcall target="copy_files"/>
-     -->
-
-  </target>   <!-- end of deploy -->
-
-
-  <!-- Deploy subtargets -->
-
-  <target name="printenv" >
-
-    <echo>Installing the resource classAd generator</echo>
-    <echo>  </echo>
-    <echo>  globus.location     = ${globus.location}</echo>
-    <echo>  </echo>
-    <echo>  globus.location.env = ${globus.location.env}</echo>
-    <!--
-    <echo>  gl.env.defined    = ${gl.env.defined}</echo>
-    <echo>  gl.env.undefined  = ${gl.env.undefined}</echo>
-    -->
-    <echo>  </echo>
-    <!--
-    <echo>  root.dir       = ${root.dir}</echo>
-    <echo>  root.dir.set   = ${root.dir.set}</echo>
-    <echo>  root.dir.unset = ${root.dir.unset}</echo>
-    -->
-
-  </target>
-
-
-  <target name="checkGlobusId" if="not.globus.user">
-    <echo>ERROR </echo>
-    <echo>       Your user ID is "${my.id}", not "globus"</echo>
-    <echo>       Become "globus" and rerun "ant deploy"</echo>
-  </target>
-
-
-  <target name="checkGlobusLocation" if="root.dir.unset">
-    <echo>ERROR: env variable GLOBUS_LOCATION is not defined</echo>
-  </target>
-
-
-  <target name="checkRootDir" if="root.dir.notexist">
-    <echo>ERROR </echo>
-    <echo>       Target directory "${root.dir}" is not defined</echo>
-  </target>
-
-
-  <target name="checkHomeDir" if="home.dir.notexist">
-    <echo>ERROR </echo>
-    <echo>       Target directory "${home.dir}" is not defined</echo>
-  </target>
-
-  <!-- Customize files for this machine -->
-  <target name="customizeConfigFile">
-
-    <echo message="Customizing condor_config"/>
-    <exec executable="/usr/bin/id" os="Linux" outputproperty="globus.uid">
-      <arg line="-u globus"/>
-    </exec>
-    <exec executable="/usr/bin/id" os="Linux" outputproperty="globus.gid">
-      <arg line="-g globus"/>
-    </exec>
-    <delete file="${basedir}/condor_config" quiet="true"/>
-    <copy file="${basedir}/condor_config.template"
-          tofile="${basedir}/condor_config">
-      <filterchain>
-        <replacetokens>
-          <token key="globusUID" value="${globus.uid}"/>
-          <token key="globusGID" value="${globus.gid}"/>
-        </replacetokens>
-      </filterchain>
-    </copy>
-
-
-    <echo message="Customizing classad-registration.xml"/>
-    <delete file="${basedir}/classad-registration.xml" quiet="true"/>
-    <copy file="${basedir}/classad-registration.xml.template"
-          tofile="${basedir}/classad-registration.xml">
-      <filterchain>
-        <replacetokens>
-          <token key="resourceName" value="${resource.name}"/>
-        </replacetokens>
-      </filterchain>
-    </copy>
-
-
-    <echo message="Customizing mds-sga.conf"/>
-    <delete file="${basedir}/mds-sga.conf" quiet="true"/>
-    <copy file="${basedir}/mds-sga.conf.template"
-          tofile="${basedir}/mds-sga.conf">
-      <filterchain>
-        <replacetokens>
-          <token key="containerHost" value="${resource.name}"/>
-        </replacetokens>
-      </filterchain>
-    </copy>
-
-    <echo message="Adding classad.pm to jndi-config.xml"/>
-    <loadfile 
-     property="jndi.config" 
-     srcFile="${root.dir}/etc/globus_wsrf_mds_index/jndi-config.xml"
-    />
-    
-
-    <condition property="jndi.already.patched" value="true">
-      <not>
-        <contains string="${jndi.config}" substring="ClassAd" />
-      </not>
-    </condition>
-
-    <antcall target="patchJndiConfig"/>
-
-  </target>
-
-  <target name="patchJndiConfig" if="jndi.already.patched">
-
-    <echo message="Patching jndi-config" />
-    <replaceregexp
-     file="${root.dir}/etc/globus_wsrf_mds_index/jndi-config.xml"
-     match="(executableMappings./name.\s*.value.)"
-     replace="\1ClassAd=classad.pm, "
-     byline="false"
-    />
-    <!-- Remove comment tags from stock exacutableMappings tag -->
-    <replaceregexp
-     file="${root.dir}/etc/globus_wsrf_mds_index/jndi-config.xml"
-     match=".!--(.parameter.\s*.name.executableMappings)"
-     replace="\1"
-     byline="false"
-    />
-    <replaceregexp
-     file="${root.dir}/etc/globus_wsrf_mds_index/jndi-config.xml"
-     match="(parameter.)-->"
-     replace="\1"
-     byline="false"
-    />
-
-  </target>
-
-
-  <!-- The main work for deploy -->
-
-  <target name="doDeploy" if="can.deploy">
-
-    <echo message="Installing to ${root.dir}/etc"/>
-
-    <!-- Debug stufff -->   
-    <!-- See http://ant.apache.org/manual/using.html#arg
-    <echo>Current files under ${root.dir}/etc</echo>
-    <exec executable="/bin/ls" os="Linux">
-           <arg line="-l ${root.dir}/etc"/>
-    </exec>
-    -->
-
-
-    <echo message="" />
-    <echo message="Copy classad.pm to ${root.dir}/${classad.dir}"/>
-    <copy todir="${root.dir}/${classad.dir}" overwrite="true">
-      <fileset dir="." includes="classad.pm"/>
-    </copy>
-    <echo message="Set execute flag of classad.pm "/>
-    <exec executable="${chmod.tool}" os="Linux">
-           <arg line="+x ${root.dir}/${classad.dir}/classad.pm"/>
-    </exec>
-
-
-    <echo message="Copy config files to ${home.dir}/.condor"/>
-    <mkdir dir="${home.dir}/.condor"/>
-    <copy todir="${home.dir}/.condor" overwrite="true">
-      <fileset dir="." includes="classad.conf"/>
-      <fileset dir="." includes="condor_config"/>
-    </copy>
-
-
-  </target>  <!-- end of doDeploy -->
-
-
-
-
-
-
-
-  <!-- Mds-setup Target     -->
-  <!-- must be tun a globus -->
-  <target name="mds-setup">
-
-    <condition property="not.globus.user" value="true"> 
-       <not><equals arg1="${my.id}" arg2="globus"/></not>
-    </condition>
-
-    <condition property="is.globus.user" value="true"> 
-        <equals arg1="${my.id}" arg2="globus"/>
-    </condition>
-
-
-    <condition property="root.dir.exist">
-       <available file="${root.dir}" type="dir"/>
-    </condition>
-    <condition property="root.dir.notexist">
-       <not><equals arg1="${root.dir.exist}" arg2="true"/></not> 
-    </condition>
-
-    <condition property="root.dir.ok">
-       <and>
-          <equals arg1="${root.dir.set}" arg2="true"/>
-          <equals arg1="${root.dir.exist}" arg2="true"/>
-       </and>
-    </condition>
-
-
-    <condition property="can.mds-setup">
-       <and>
-          <equals arg1="${root.dir.ok}"      arg2="true"/>
-          <equals arg1="${is.globus.user}"   arg2="true"/>
-       </and>
-    </condition>
-
-
-    <!-- Call mds-setup subtasks -->
-
-    <antcall target="printenv" />
-
-     <!-- stuff done as globus -->
-    <antcall target="checkGlobusId"/>
-    <antcall target="checkGlobusLocation" />
-    <antcall target="checkRootDir"/>
-    <antcall target="doMdsSetup"/>
-
-  </target>
-
-
-
-
-
-  <!-- The main work for mds-setup -->
-  <target name="doMdsSetup" if="can.mds-setup">
-
-    <echo message="" />
-    <echo message="Install ${mds.reg.file} to ${mds.aggr.dir}"/>
-    <copy todir="${root.dir}/${mds.aggr.dir}" overwrite="true">
-      <fileset dir="." includes="${mds.reg.file}"/>
-    </copy>
-    <exec executable="${chown.tool}" os="Linux">
-           <arg line="globus ${root.dir}/${mds.aggr.dir}/${mds.reg.file}"/>
-    </exec>
-
-    <echo message="" />
-	<echo message="Install mds-sga and mds-sga.conf to ${root.dir}/etc and ${root.dir}/libexec"/>
-    <copy todir="${root.dir}/etc" overwrite="true">
-      <fileset dir="." includes="mds-sga.conf"/>
-    </copy>
-    <copy todir="${root.dir}/libexec" overwrite="true">
-      <fileset dir="." includes="mds-sga"/>
-    </copy>
-
-    <!-- not needed if I required to run as globus -->
-    <!-- 
-    <exec executable="${chown.tool}" os="Linux">
-           <arg line="globus ${root.dir}/etc/mds-sga ${root.dir}/etc/mds-sga.conf"/>
-    </exec>
-    -->
-
-    <echo message="Set execute mode for mds-sga"/>
-    <exec executable="${chmod.tool}" os="Linux">
-           <arg line="+x ${root.dir}/etc/mds-sga"/>
-    </exec>
-
-  </target>
-
-
-
-
-
-  <!-- Mds-init Target -->
-  <!-- Can only be run as root -->
-
-  <target name="mds-init">
-
-    <condition property="not.root.user" value="true"> 
-       <not><equals arg1="${my.id}" arg2="root"/></not>
-    </condition>
-    <condition property="is.root.user" value="true"> 
-       <equals arg1="${my.id}" arg2="root"/>
-    </condition>
-
-    <!-- Call mds-init subtasks -->
-    <antcall target="checkRootId"/>
-    <antcall target="doMdsInit"/>
-
-  </target>
-
-
-
-  <target name="checkRootId" if="not.root.user">
-    <echo>WARNING </echo>
-    <echo>       Your user ID is "${my.id}", not "root"</echo>
-    <echo>       Cannot install to ${init.dir}</echo>
-    <echo>       Become root user and rerun "ant mds-init"</echo>
-  </target>
-
-
-
-
-  <!-- mds-init work done as root -->
-  <!-- optional, if you want to install mds-sga to /etc/init.d -->
-  <target name="doMdsInit" if="is.root.user">
-
-    <echo message="Install init script mds-sga to ${init.dir}"/>
-    <mkdir dir="${init.dir}"/>
-    <copy todir="${init.dir}" overwrite="true">
-      <fileset dir="." includes="mds-sga"/>
-    </copy>
-    <echo message="Set execute flag of mds-sga "/>
-    <exec executable="${chmod.tool}" os="Linux">
-           <arg line="+x ${init.dir}/mds-sga"/>
-    </exec>
-
-  </target>  <!-- end of doMdsInit -->
-
-
-
-
-  <target name="status">
-
-    <echo message="Check status against SVN"/>
-    <echo message="  ${svn.repository}/${svn.module}"/>
-
-    <!-- See http://ant.apache.org/manual/using.html#arg -->
-    <exec executable="${svn.tool}" os="Linux">
-           <arg line="status -u"/>
-    </exec>
- 
-  </target>
-
-
-  <target name="update">
-
-    <echo message="Updating from SVN"/>
-    <echo message="  ${svn.repository}/${svn.module}"/>
-
-    <!-- See http://ant.apache.org/manual/using.html#arg -->
-    <exec executable="${svn.tool}" os="Linux">
-           <arg line="update"/>
-    </exec>
- 
-  </target>
-
-
-
-
-
-
-
-  <!-- Clean -->    
-  <target name="clean">
-    <delete dir="build"/>
-    <delete dir="dist"/>
-    <delete dir="${app.name}"/>
-    <delete file="${app.name}.tar.gz"/>
-    <delete file="CondorG~"/>
-    <delete file="classad-registration.xml"/>
-    <delete file="condor_config"/>
-    <delete file="mds-sga.conf"/>
-  </target>
-
-</project>

Deleted: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/classad-registration.xml.template
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/classad-registration.xml.template	2009-07-30 15:21:25 UTC (rev 1283)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/classad-registration.xml.template	2009-07-30 15:33:21 UTC (rev 1284)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ServiceGroupRegistrations
-    xmlns="http://mds.globus.org/servicegroup/client" 
-    xmlns:sgc="http://mds.globus.org/servicegroup/client" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing"
-    xmlns:agg="http://mds.globus.org/aggregator/types">
-
-  <defaultServiceGroupEPR>
-    <wsa:Address>https://@resourceName@:8443/wsrf/services/DefaultIndexService</wsa:Address>
-  </defaultServiceGroupEPR>
-
-  <!-- The defaultRegistrantEPR defines the grid resource that will be
-       registered, unless overridden in the ServiceGroupRegistrationParameters
-  -->
-  <defaultRegistrantEPR>
-    <wsa:Address>https://@resourceName@:8443/wsrf/services/classad</wsa:Address>
-  </defaultRegistrantEPR>
-
-<!--  <defaultSecurityDecriptorFile>some/other/sec/file.xml</defaultSecurityDecriptorFile> -->
-
-  <ServiceGroupRegistrationParameters
-      xmlns="http://mds.globus.org/servicegroup/client" >
-
-    <!-- Renew this registration every 600 seconds (10 minutes) -->
-    <RefreshIntervalSecs>600</RefreshIntervalSecs>
-    <Content xsi:type="agg:AggregatorContent"
-             xmlns:agg="http://mds.globus.org/aggregator/types">
-      <agg:AggregatorConfig xsi:type="agg:AggregatorConfig">
-        <agg:ExecutionPollType>
-
-          <!-- Run our script every 300,000 milliseconds (5 minutes) -->
-          <agg:PollIntervalMillis>300000</agg:PollIntervalMillis>
-
-          <!-- Specify our mapped ProbeName registered in the
-               $GLOBUS_LOCATION/etc/globus_wsrf_mds_index/jndi-config.xml
-               file -->
-          <agg:ProbeName>ClassAd</agg:ProbeName>
-
-        </agg:ExecutionPollType>
-      </agg:AggregatorConfig>
-      <agg:AggregatorData/>
-    </Content>
-  </ServiceGroupRegistrationParameters>
-
-</ServiceGroupRegistrations>
-

Copied: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/condor_config.in (from rev 1282, branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/condor_config.template)
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/condor_config.in	                        (rev 0)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/condor_config.in	2009-07-30 15:33:21 UTC (rev 1284)
@@ -0,0 +1,764 @@
+#####################################################################
+##
+##  condor_config
+##
+#
+#  Same as that from U Vic
+#
+##  This is the global configuration file for condor.
+##
+##  The file is divided into four main parts:
+##  Part 1:  Settings you should customize 
+##  Part 2:  Settings you may want to customize
+##  Part 3:  Settings that control the policy of when condor will
+##           start and stop jobs on your machines
+##  Part 4:  Settings you should probably leave alone (unless you
+##  know what you're doing)
+##
+##  Please read the INSTALL file (or the Install chapter in the
+##  Condor Administrator's Manual) for detailed explanations of the 
+##  various settings in here and possible ways to configure your
+##  pool. 
+##
+##  If you are installing Condor as root and then handing over the
+##  administration of this file to a person you do not trust with
+##  root access, please read the Installation chapter paying careful
+##  note to the condor_config.root entries.
+##
+##  Unless otherwise specified, settings that are commented out show
+##  the defaults that are used if you don't define a value.  Settings
+##  that are defined here MUST BE DEFINED since they have no default
+##  value.
+##
+##  Unless otherwise indicated, all settings which specify a time are
+##  defined in seconds.
+## 
+##  Any questions should be directed to condor-admin at cs.wisc.edu
+##
+######################################################################
+
+######################################################################
+######################################################################
+##
+##  ######                                     #
+##  #     #    ##    #####    #####           ##
+##  #     #   #  #   #    #     #            # #
+##  ######   #    #  #    #     #              #
+##  #        ######  #####      #              #
+##  #        #    #  #   #      #              #
+##  #        #    #  #    #     #            #####
+##
+##  Part 1:  Settings you must customize:
+######################################################################
+######################################################################
+
+##  What machine is your central manager?
+CONDOR_HOST	= $(FULL_HOSTNAME)
+#NEGOTIATOR_HOST = ggate01.triumf.ca
+NEGOTIATOR_HOST = $(CONDOR_HOST)
+#COLLECTOR_HOST  = ggate01.triumf.ca
+#COLLECTOR_HOST  = lcgce02.triumf.ca
+CONDOR_IDS       = @globusUID at .@globusGID@
+
+GRID_MONITOR        = $(SBIN)/grid_monitor.sh
+ENABLE_GRID_MONITOR = TRUE
+
+GRIDMANAGER_MAX_SUBMITTED_JOBS_PER_RESOURCE=100
+GRIDMANAGER_MAX_PENDING_SUBMITS_PER_RESOURCE=20
+
+#GSI_DAEMON_DIRECTORY = /etc/grid-security
+#GSI_DAEMON_PROXY=/tmp/x509up_u0
+
+##--------------------------------------------------------------------
+##  Pathnames:
+##--------------------------------------------------------------------
+##  Where have you installed the bin, sbin and lib condor directories?   
+RELEASE_DIR = /opt/condor-6.6.1
+
+##  Where is the local condor directory for each host?  
+LOCAL_DIR		= $(RELEASE_DIR)/var
+
+##--------------------------------------------------------------------
+##  Mail parameters:
+##--------------------------------------------------------------------
+##  When something goes wrong with condor at your site, who should get
+##  the email?
+CONDOR_ADMIN		= root at localhost 
+
+##  Full path to a mail delivery program that understands that "-s"
+##  means you want to specify a subject:
+MAIL			= /bin/mail
+
+##--------------------------------------------------------------------
+##  Network domain parameters:
+##--------------------------------------------------------------------
+##  Internet domain of machines sharing a common UID space.  If your
+##  machines don't share a common UID space, use the second entry
+##  which specifies that each machine has its own UID space.
+#UID_DOMAIN		= cs.wisc.edu
+UID_DOMAIN		= $(FULL_HOSTNAME)
+
+##  Internet domain of machines sharing a common file system.
+##  If your machines don't use a network file system, use the second
+##  entry which specifies that each machine has its own file system. 
+#FILESYSTEM_DOMAIN	= cs.wisc.edu
+FILESYSTEM_DOMAIN	= $(FULL_HOSTNAME)
+
+
+######################################################################
+######################################################################
+##  
+##  ######                                   #####
+##  #     #    ##    #####    #####         #     #
+##  #     #   #  #   #    #     #                 #
+##  ######   #    #  #    #     #            #####
+##  #        ######  #####      #           #
+##  #        #    #  #   #      #           #
+##  #        #    #  #    #     #           #######
+##  
+##  Part 2:  Settings you may want to customize: 
+##  (it is generally safe to leave these untouched) 
+######################################################################
+######################################################################
+
+##--------------------------------------------------------------------
+##  GlideIn: Using Globus resources to construct a virtual Condor Pool
+##--------------------------------------------------------------------
+##  
+## To use GlideIn, you'll need to set the two options below.
+##
+## List the sites you want to GlideIn to on the GLIDEIN_SITES. For example, 
+## if you'd like to GlideIn to some Alliance GiB resources, 
+## uncomment out the line below
+## IT MUST BE DEFINED!!! IF YOU DON"T WANT TO USE IT LEAVE IT BLANK
+#GLIDEIN_SITES = *.ncsa.uiuc.edu, *.cs.wisc.edu, *.mcs.anl.gov 
+GLIDEIN_SITES = lcgce01.triumf.ca
+
+## 
+## To Turn on GlideIn, you'll need to uncomment out the first daemon_list below
+## and turn on the second
+#DAEMON_LIST                     = MASTER, SCHEDD  
+DAEMON_LIST                    = MASTER, SCHEDD, COLLECTOR, NEGOTIATOR
+
+##--------------------------------------------------------------------
+##  Flocking: Submitting jobs to more than one pool
+##--------------------------------------------------------------------
+##  Flocking allows you to run your jobs in other pools, or lets
+##  others run jobs in your pool.
+## 
+##  To let others flock to you, define FLOCK_FROM.
+## 
+##  To flock to others, define FLOCK_TO.
+
+##  FLOCK_FROM defines the machines where you would like to grant
+##  people access to your pool via flocking. (i.e. you are granting
+##  access to these machines to join your pool).
+FLOCK_FROM = 
+##  An example of this is:
+#FLOCK_FROM = somehost.friendly.domain, anotherhost.friendly.domain
+
+##  FLOCK_TO defines the central managers of the pools that you want
+##  to flock to. (i.e. you are specifying the machines that you
+##  want your jobs to be negotiated at -- thereby specifying the
+##  pools they will run in.)
+FLOCK_TO = 
+##  An example of this is:
+#FLOCK_TO = central_manager.friendly.domain, condor.cs.wisc.edu
+
+##  FLOCK_COLLECTOR_HOSTS should almost always be the same as
+##  FLOCK_NEGOTIATOR_HOSTS (as shown below).  The only reason it would be
+##  different is if the collector and negotiator in the pool that you are
+##  flocking too are running on different machines (not recommended).
+##  The collectors must be specified in the same corresponding order as
+##  the FLOCK_NEGOTIATOR_HOSTS list.
+FLOCK_NEGOTIATOR_HOSTS = $(FLOCK_TO)
+FLOCK_COLLECTOR_HOSTS = $(FLOCK_TO)
+## An example of having the negotiator and the collector on different
+## machines is:
+#FLOCK_NEGOTIATOR_HOSTS = condor.cs.wisc.edu, condor-negotiator.friendly.domain
+#FLOCK_COLLECTOR_HOSTS =  condor.cs.wisc.edu, condor-collector.friendly.domain
+
+
+##--------------------------------------------------------------------
+##  Host/IP access levels
+##--------------------------------------------------------------------
+##  Please see the administrator's manual for details on these
+##  settings, what they're for, and how to use them.
+
+##  What machines have administrative rights for your pool?  This
+##  defaults to your central manager.  You should set it to the
+##  machine(s) where whoever is the condor administrator(s) works
+##  (assuming you trust all the users who log into that/those
+##  machine(s), since this is machine-wide access you're granting).
+HOSTALLOW_ADMINISTRATOR = $(CONDOR_HOST)
+
+##  If there are no machines that should have administrative access 
+##  to your pool (for example, there's no machine where only trusted
+##  users have accounts), you can uncomment this setting.
+##  Unfortunately, this will mean that administering your pool will 
+##  be more difficult.
+#HOSTDENY_ADMINISTRATOR = *
+
+##  What machines should have "owner" access to your machines, meaning
+##  they can issue commands that a machine owner should be able to
+##  issue to their own machine (like condor_vacate).  This defaults to
+##  machines with administrator access, and the local machine.  This
+##  is probably what you want.
+HOSTALLOW_OWNER = $(FULL_HOSTNAME), $(HOSTALLOW_ADMINISTRATOR)
+
+##  Read access.  Machines listed as allow (and/or not listed as deny)
+##  can view the status of your pool, but cannot join your pool 
+##  or run jobs.
+##  NOTE: By default, without these entries customized, you
+##  are granting read access to the whole world.  You may want to
+##  restrict that to hosts in your domain.  If possible, please also
+##  grant read access to "*.cs.wisc.edu", so the Condor developers
+##  will be able to view the status of your pool and more easily help
+##  you install, configure or debug your Condor installation.
+##  It is important to have this defined.
+HOSTALLOW_READ = * 
+#HOSTALLOW_READ = *.your.domain, *.cs.wisc.edu
+#HOSTDENY_READ = *.bad.subnet, bad-machine.your.domain, 144.77.88.*
+
+##  Write access.  Machines listed here can join your pool, submit
+##  jobs, etc.  Note: Any machine which has WRITE access must
+##  also be granted READ access.  Granting WRITE access below does
+##  not also automatically grant READ access; you must change
+##  HOSTALLOW_READ above as well.
+##  If you leave it as it is, it will be unspecified, and effectively
+##  it will be allowing anyone to write to your pool.
+HOSTALLOW_WRITE = $(FULL_HOSTNAME), $(GLIDEIN_SITES) 
+#HOSTALLOW_WRITE = *.your.domain, your-friend's-machine.other.domain
+#HOSTDENY_WRITE = bad-machine.your.domain
+
+##  Negotiator access.  Machines listed here are trusted central
+##  managers.  You should normally not have to change this.
+HOSTALLOW_NEGOTIATOR = $(NEGOTIATOR_HOST)
+##  Now, with flocking we need to let the SCHEDD trust the other 
+##  negotiators we are flocking with as well.  You should normally 
+##  not have to change this either.
+HOSTALLOW_NEGOTIATOR_SCHEDD = $(NEGOTIATOR_HOST), $(FLOCK_NEGOTIATOR_HOSTS)
+
+##  Config access.  Machines listed here can use the condor_config_val
+##  tool to modify all daemon configurations except those specified in
+##  the condor_config.root file.  This level of host-wide access
+##  should only be granted with extreme caution.  By default, config
+##  access is denied from all hosts.
+#HOSTALLOW_CONFIG = trusted-host.your.domain
+
+##  Flocking Configs.  These are the real things that Condor looks at,
+##  but we set them from the FLOCK_FROM/TO macros above.  It is safe
+##  to leave these unchanged.
+HOSTALLOW_WRITE_COLLECTOR = $(HOSTALLOW_WRITE), $(FLOCK_FROM)
+HOSTALLOW_WRITE_STARTD    = $(HOSTALLOW_WRITE), $(FLOCK_FROM)
+HOSTALLOW_READ_COLLECTOR  = $(HOSTALLOW_READ), $(FLOCK_FROM) 
+HOSTALLOW_READ_STARTD     = $(HOSTALLOW_READ), $(FLOCK_FROM) 
+
+
+##--------------------------------------------------------------------
+##  Miscellaneous:
+##--------------------------------------------------------------------
+##  Try to save this much swap space by not starting new shadows.  
+##  Specified in megabytes.
+#RESERVED_SWAP		= 5
+
+##  What's the maximum number of jobs you want a single submit machine
+##  to spawn shadows for?
+#MAX_JOBS_RUNNING	= 200
+
+##  Condor needs to create a few lock files to synchronize access to
+##  various log files.  Because of problems we've had with network
+##  filesystems and file locking over the years, we HIGHLY recommend
+##  that you put these lock files on a local partition on each
+##  machine.  If you don't have your LOCAL_DIR on a local partition,
+##  be sure to change this entry.  Whatever user (or group) condor is
+##  running as needs to have write access to this directory.  If
+##  you're not running as root, this is whatever user you started up
+##  the condor_master as.  If you are running as root, and there's a
+##  condor account, it's probably condor.  Otherwise, it's whatever
+##  you've set in the CONDOR_IDS environment variable.  See the Admin
+##  manual for details on this.
+LOCK		= $(LOG)
+
+##  If you don't use a fully qualified name in your /etc/hosts file
+##  (or NIS, etc.) for either your official hostname or as an alias,
+##  Condor wouldn't normally be able to use fully qualified names in
+##  places that it'd like to.  You can set this parameter to the
+##  domain you'd like appended to your hostname, if changing your host
+##  information isn't a good option.  This parameter must be set in
+##  the global config file (not the LOCAL_CONFIG_FILE from above). 
+#DEFAULT_DOMAIN_NAME = your.domain.name
+
+##  Condor can be told whether or not you want the Condor daemons to
+##  create a core file if something really bad happens.  This just
+##  sets the resource limit for the size of a core file.  By default,
+##  we don't do anything, and leave in place whatever limit was in
+##  effect when you started the Condor daemons.  If this parameter is
+##  set and "True", we increase the limit to as large as it gets.  If
+##  it's set to "False", we set the limit at 0 (which means that no
+##  core files are even created).  Core files greatly help the Condor
+##  developers debug any problems you might be having.
+#CREATE_CORE_FILES	= True
+
+
+##--------------------------------------------------------------------
+##  Settings that control the daemon's debugging output:
+##--------------------------------------------------------------------
+
+MAX_SCHEDD_LOG		= 64000
+SCHEDD_DEBUG		= D_COMMAND
+
+MAX_GRIDMANAGER_LOG	= 64000
+GRIDMANAGER_DEBUG	= D_COMMAND
+
+MAX_MASTER_LOG		= 64000
+MASTER_DEBUG		= D_COMMAND
+
+MAX_COLLECTOR_LOG       = 64000
+COLLECTOR_DEBUG         = D_COMMAND
+
+MAX_NEGOTIATOR_LOG      = 64000
+NEGOTIATOR_DEBUG        = D_MATCH
+MAX_NEGOTIATOR_MATCH_LOG = 64000
+ 
+MAX_SHADOW_LOG          = 64000
+SHADOW_DEBUG            =
+
+
+
+######################################################################
+######################################################################
+##  
+##  ######                                   #####
+##  #     #    ##    #####    #####         #     #
+##  #     #   #  #   #    #     #                 #
+##  ######   #    #  #    #     #            #####
+##  #        ######  #####      #                 #
+##  #        #    #  #   #      #           #     #
+##  #        #    #  #    #     #            #####
+##  
+##  Part 3:  Settings control the policy for running, stopping, and
+##  periodically checkpointing condor jobs:
+######################################################################
+######################################################################
+
+##  This section contains macros are here to help write legible
+##  expressions:
+MINUTE		= 60
+HOUR		= (60 * $(MINUTE))
+StateTimer	= (CurrentTime - EnteredCurrentState)
+ActivityTimer	= (CurrentTime - EnteredCurrentActivity)
+ActivationTimer = (CurrentTime - JobStart)
+LastCkpt	= (CurrentTime - LastPeriodicCheckpoint)
+
+##  The JobUniverse attribute is just an int.  These macros can be
+##  used to specify the universe in a human-readable way:
+STANDARD	= 1
+PVM		= 4
+VANILLA		= 5
+IsPVM           = (JobUniverse == $(PVM))
+IsVanilla       = (JobUniverse == $(VANILLA))
+IsStandard      = (JobUniverse == $(STANDARD))
+
+NonCondorLoadAvg	= (LoadAvg - CondorLoadAvg)
+BackgroundLoad		= 0.3
+HighLoad		= 0.5
+StartIdleTime		= 15 * $(MINUTE)
+ContinueIdleTime	=  5 * $(MINUTE)
+MaxSuspendTime		= 10 * $(MINUTE)
+MaxVacateTime		= 10 * $(MINUTE)
+
+KeyboardBusy		= (KeyboardIdle < $(MINUTE))
+ConsoleBusy		= (ConsoleIdle  < $(MINUTE))
+CPU_Idle		= ($(NonCondorLoadAvg) <= $(BackgroundLoad))
+CPU_Busy		= ($(NonCondorLoadAvg) >= $(HighLoad))
+
+BigJob		= (ImageSize >= (50 * 1024))
+MediumJob	= (ImageSize >= (15 * 1024) && ImageSize < (50 * 1024))
+SmallJob	= (ImageSize <  (15 * 1024))
+
+JustCPU			= ($(CPU_Busy) && ($(KeyboardBusy) == False))
+MachineBusy		= ($(CPU_Busy) || $(KeyboardBusy))
+
+######################################################################
+######################################################################
+##  
+##  ######                                  #
+##  #     #    ##    #####    #####         #    #
+##  #     #   #  #   #    #     #           #    #
+##  ######   #    #  #    #     #           #    #
+##  #        ######  #####      #           #######
+##  #        #    #  #   #      #                #
+##  #        #    #  #    #     #                #
+##  
+##  Part 4:  Settings you should probably leave alone:
+##  (unless you know what you're doing)
+######################################################################
+######################################################################
+
+######################################################################
+##  Daemon-wide settings:
+######################################################################
+
+
+# Disable the new authentication protocol in Condor 6.3, use the 6.2 method
+DISABLE_AUTH_NEGOTIATION = TRUE
+
+##  Pathnames
+LOG		= $(LOCAL_DIR)/log
+SPOOL		= $(LOCAL_DIR)/spool
+EXECUTE		= $(LOCAL_DIR)/execute
+BIN		= $(RELEASE_DIR)/bin
+LIB		= $(RELEASE_DIR)/lib
+SBIN		= $(RELEASE_DIR)/sbin
+HISTORY		= $(SPOOL)/history
+
+##  Log files
+MASTER_LOG	= $(LOG)/MasterLog
+SCHEDD_LOG	= $(LOG)/SchedLog
+GRIDMANAGER_LOG = /tmp/GridmanagerLog.$(USERNAME)
+SHADOW_LOG      = $(LOG)/ShadowLog
+COLLECTOR_LOG	= $(LOG)/CollectorLog
+NEGOTIATOR_LOG  = $(LOG)/NegotiatorLog
+NEGOTIATOR_MATCH_LOG = $(LOG)/MatchLog
+
+##  Lock files
+SHADOW_LOCK = $(LOCK)/ShadowLock
+
+##  In most cases, your condor_collector and condor_negotiator are
+##  going to run on the same machine.  If for some reason, this isn't
+##  the case, here's where you'd change it:
+#NEGOTIATOR_HOST = $(CONDOR_HOST)
+#COLLECTOR_HOST  = $(CONDOR_HOST)
+
+##  How long are you willing to let daemons try their graceful
+##  shutdown methods before they do a hard shutdown? (30 minutes)
+#SHUTDOWN_GRACEFUL_TIMEOUT	= 1800
+
+##  How much disk space would you like reserved from Condor?  In
+##  places where Condor is computing the free disk space on various
+##  partitions, it subtracts the amount it really finds by this
+##  many megabytes.  (If undefined, defaults to 0).
+RESERVED_DISK		= 5
+
+##  If your machine is running AFS and the AFS cache lives on the same
+##  partition as the other Condor directories, and you want Condor to
+##  reserve the space that your AFS cache is configured to use, set
+##  this to true.
+#RESERVE_AFS_CACHE	= False
+
+
+######################################################################
+##  Daemon-specific settings:
+######################################################################
+
+##--------------------------------------------------------------------
+##  condor_master
+##--------------------------------------------------------------------
+##  Daemons you want the master to keep running for you:
+
+##  Which daemons use the Condor DaemonCore library (i.e., not the
+##  checkpoint server or custom user daemons)?
+#DC_DAEMON_LIST = MASTER, STARTD, SCHEDD, KBDD, COLLECTOR, NEGOTIATOR, EVENTD
+
+##  Where are the binaries for these daemons?
+MASTER				= $(SBIN)/condor_master
+SCHEDD				= $(SBIN)/condor_schedd
+NEGOTIATOR			= $(SBIN)/condor_negotiator
+COLLECTOR			= $(SBIN)/condor_collector
+
+##  When the master starts up, it can place it's address (IP and port)
+##  into a file.  This way, tools running on the local machine don't
+##  need to query the central manager to find the master.  This
+##  feature can be turned off by commenting out this setting.
+MASTER_ADDRESS_FILE = $(LOG)/.master_address
+
+##  Where should the master find the condor_preen binary? If you don't
+##  want preen to run at all, just comment out this setting.
+PREEN				= $(SBIN)/condor_preen
+
+##  How do you want preen to behave?  The "-m" means you want email
+##  about files preen finds that it thinks it should remove.  The "-r"
+##  means you want preen to actually remove these files.  If you don't
+##  want either of those things to happen, just remove the appropriate
+##  one from this setting.
+PREEN_ARGS			= -m -r
+
+##  How often should the master start up condor_preen? (once a day)
+#PREEN_INTERVAL			= 86400
+
+##  If a daemon dies an unnatural death, do you want email about it?
+#PUBLISH_OBITUARIES		= True
+
+##  If you're getting obituaries, how many lines of the end of that
+##  daemon's log file do you want included in the obituary?
+#OBITUARY_LOG_LENGTH		= 20
+
+##  Should the master run?
+#START_MASTER			= True
+
+##  Should the master start up the daemons you want it to?
+#START_DAEMONS			= True
+
+##  How often do you want the master to send an update to the central
+##  manager? 
+#MASTER_UPDATE_INTERVAL		= 300
+
+##  How often do you want the master to check the timestamps of the
+##  daemons it's running?  If any daemons have been modified, the
+##  master restarts them.
+#MASTER_CHECK_NEW_EXEC_INTERVAL	= 300
+
+##  Once you notice new binaries, how long should you wait before you
+##  try to execute them?
+#MASTER_NEW_BINARY_DELAY	= 120
+
+##  What's the maximum amount of time you're willing to give the
+##  daemons to quickly shutdown before you just kill them outright?
+#SHUTDOWN_FAST_TIMEOUT		= 120
+
+######
+##  Exponential backoff settings:
+######
+##  When a daemon keeps crashing, we use "exponential backoff" so we
+##  wait longer and longer before restarting it.  This is the base of
+##  the exponent used to determine how long to wait before starting
+##  the daemon again:
+#MASTER_BACKOFF_FACTOR		= 2.0
+
+##  What's the maximum amount of time you want the master to wait
+##  between attempts to start a given daemon?  (With 2.0 as the
+##  MASTER_BACKOFF_FACTOR, you'd hit 1 hour in 12 restarts...)
+#MASTER_BACKOFF_CEILING		= 3600
+
+##  How long should a daemon run without crashing before we consider
+##  it "recovered".  Once a daemon has recovered, we reset the number
+##  of restarts so the exponential backoff stuff goes back to normal. 
+#MASTER_RECOVER_FACTOR		= 300
+
+##--------------------------------------------------------------------
+##  condor_schedd
+##--------------------------------------------------------------------
+##  Where is the GridManager binary installed?
+SHADOW				= $(SBIN)/condor_shadow
+SHADOW_PVM          = $(SBIN)/condor_shadow.pvm
+GRIDMANAGER			= $(SBIN)/condor_gridmanager
+GAHP				= $(SBIN)/gahp_server
+
+
+##  When the schedd starts up, it can place it's address (IP and port)
+##  into a file.  This way, tools running on the local machine don't
+##  need to query the central manager to find the schedd.  This
+##  feature can be turned off by commenting out this setting.
+SCHEDD_ADDRESS_FILE	= $(LOG)/.schedd_address
+
+##  How often should the schedd send an update to the central manager?
+#SCHEDD_INTERVAL	= 300 
+
+##  How long should the schedd wait between spawning each shadow?
+#JOB_START_DELAY	= 2
+
+##  How often should the schedd send a keep alive message to any
+##  startds it has claimed?  (5 minutes)
+#ALIVE_INTERVAL		= 300
+
+##  This setting controls the maximum number of times that a
+##  condor_shadow processes can have a fatal error (exception) before
+##  the condor_schedd will simply relinquish the match associated with
+##  the dying shadow.
+#MAX_SHADOW_EXCEPTIONS	= 5
+
+##  Estimated virtual memory size of each condor_shadow process. 
+##  Specified in kilobytes.
+SHADOW_SIZE_ESTIMATE	= 1800
+
+##  The condor_schedd can renice the condor_shadow processes on your
+##  submit machines.  How how "nice" do you want the shadows? (1-19).
+##  The higher the number, the lower priority the shadows have.
+##  This feature can be disabled entirely by commenting it out.
+SHADOW_RENICE_INCREMENT	= 10
+
+##  By default, when the schedd fails to start an idle job, it will
+##  not try to start any other idle jobs in the same cluster during
+##  that negotiation cycle.  This makes negotiation much more
+##  efficient for large job clusters.  However, in some cases other
+##  jobs in the cluster can be started even though an earlier job
+##  can't.  For example, the jobs' requirements may differ, because of
+##  different disk space, memory, or operating system requirements.
+##  Or, machines may be willing to run only some jobs in the cluster,
+##  because their requirements reference the jobs' virtual memory size
+##  or other attribute.  Setting NEGOTIATE_ALL_JOBS_IN_CLUSTER to True
+##  will force the schedd to try to start all idle jobs in each
+##  negotiation cycle.  This will make negotiation cycles last longer,
+##  but it will ensure that all jobs that can be started will be
+##  started.
+#NEGOTIATE_ALL_JOBS_IN_CLUSTER = False
+
+######
+## Queue management settings:
+######
+##  How often should the schedd truncate it's job queue transaction
+##  log?  (Specified in seconds, once a day is the default.)
+#QUEUE_CLEAN_INTERVAL	= 86400
+
+##  How often should the schedd commit "wall clock" run time for jobs
+##  to the queue, so run time statistics remain accurate when the
+##  schedd crashes?  (Specified in seconds, once per hour is the
+##  default.  Set to 0 to disable.)
+#WALL_CLOCK_CKPT_INTERVAL = 3600
+
+##  Do you want to allow remote machines to be able to submit jobs to
+##  this queue as user "nobody"?
+#ALLOW_REMOTE_SUBMIT	= False
+
+##  What users do you want to grant super user access to this job
+##  queue?  (These users will be able to remove other user's jobs). 
+##  By default, this only includes root.
+QUEUE_SUPER_USERS	= root, condor
+
+
+##--------------------------------------------------------------------
+##  condor_shadow
+##--------------------------------------------------------------------
+##  If the shadow is unable to read a checkpoint file from the
+##  checkpoint server, it keeps trying only if the job has accumulated
+##  more than MAX_DISCARDED_RUN_TIME seconds of CPU usage.  Otherwise,
+##  the job is started from scratch.  Defaults to 1 hour.  This
+##  setting is only used if USE_CKPT_SERVER (from above) is True.
+#MAX_DISCARDED_RUN_TIME = 3600 
+
+##  Should periodic checkpoints be compressed?
+#COMPRESS_PERIODIC_CKPT = False
+
+##  Should vacate checkpoints be compressed?
+#COMPRESS_VACATE_CKPT = False
+
+##  Should we commit the application's dirty memory pages to swap
+##  space during a periodic checkpoint?
+#PERIODIC_MEMORY_SYNC = False
+
+##  Should we write vacate checkpoints slowly?  If nonzero, this
+##  parameter specifies the speed at which vacate checkpoints should
+##  be written, in kilobytes per second.
+#SLOW_CKPT_SPEED = 0
+
+##--------------------------------------------------------------------
+##  condor_gridmanager
+##--------------------------------------------------------------------
+
+## If we're talking to a Globus 2.0 resource, Condor-G will use the new
+## version of the GRAM protocol. The first option is how often to check the
+## proxy on the submit site of things. If the GridManager discovers a new
+## proxy, it will restart itself and use the new proxy for all future 
+## jobs launched. In seconds,  and defaults to 10 minutes
+#GRIDMANAGER_CHECKPROXY_INTERVAL = 600
+
+## The GridManager will shut things down 3 minutes before loosing Contact
+## because of an expired proxy. 
+## In seconds, and defaults to 3 minutes
+#GRDIMANAGER_MINIMUM_PROXY_TIME  = 180
+
+##--------------------------------------------------------------------
+##  condor_shadow.pvm
+##--------------------------------------------------------------------
+##  Where is the condor pvm daemon installed?
+PVMD                    = $(SBIN)/condor_pvmd
+
+##  Where is the condor pvm group server daemon installed?
+PVMGS                   = $(SBIN)/condor_pvmgs
+
+
+##--------------------------------------------------------------------
+##  condor_submit
+##--------------------------------------------------------------------
+
+
+## Condor requires that each submitted job be designated to run under a
+## particular "universe". Condor-G is active when jobs are as marked as
+## "GLOBUS" universe jobs. The universe of a job is set in the submit file
+## with the 'universe = GLOBUS' line. 
+##
+## If no universe is specificed in the submit file, Condor must pick one
+## for the job to use. By default, it chooses the "standard" universe. 
+## The default can be overridden in the config file with the DEFAULT_UNIVERSE
+## setting, which is a string to insert into a job submit description if the
+## job does not try and define it's own universe
+
+DEFAULT_UNIVERSE = globus
+
+#
+# The Cred_min_time_left is the first-pass at making sure that Condor-G
+# does not submit your job without it having enough time left for the 
+# job to finish. For example, if you have a job that runs for 20 minutes, and
+# you might spend 40 minutes in the queue, it's a bad idea to submit with less
+# than an hour left before your proxy expires.
+# 2 hours seemed like a reasonable default.
+#
+CRED_MIN_TIME_LEFT		= 120 
+
+##  If you want condor_submit to automatically append an expression to
+##  the Requirements expression or Rank expression of jobs at your
+##  site, uncomment these entries.
+#APPEND_REQUIREMENTS	= (expression to append job requirements)
+#APPEND_RANK		= (expression to append job rank)
+
+##  If you want expressions only appended for either standard or
+##  vanilla universe jobs, you can uncomment these entries.  If any of
+##  them are defined, they are used for the given universe, instead of
+##  the generic entries above.
+#APPEND_REQ_VANILLA	= (expression to append to vanilla job requirements)
+#APPEND_REQ_STANDARD	= (expression to append to standard job requirements)
+#APPEND_RANK_STANDARD	= (expression to append to vanilla job rank)
+#APPEND_RANK_VANILLA	= (expression to append to standard job rank)
+
+##  This can be used to define a default value for the rank expression
+##  if one is not specified in the submit file.
+#DEFAULT_RANK	        = (default rank expression for all jobs)
+
+##  If you want universe-specific defaults, you can use the following
+##  entries:
+#DEFAULT_RANK_VANILLA	= (default rank expression for vanilla jobs)
+#DEFAULT_RANK_STANDARD	= (default rank expression for standard jobs)
+
+##  If you want condor_submit to automatically append expressions to
+##  the job ClassAds it creates, you can uncomment and define the
+##  SUBMIT_EXPRS setting.  It works just like the STARTD_EXPRS
+##  described above with respect to ClassAd vs. config file syntax,
+##  strings, etc.  One common use would be to have the full hostname
+##  of the machine where a job was submitted placed in the job
+##  ClassAd.  You would do this by uncommenting the following lines: 
+#MACHINE = "$(FULL_HOSTNAME)"
+#SUBMIT_EXPRS = MACHINE
+
+## Condor keeps a buffer of recently-used data for each file an
+## application opens.  This macro specifies the default maximum number
+## of bytes to be buffered for each open file at the executing
+## machine.
+#DEFAULT_IO_BUFFER_SIZE = 524288
+
+## Condor will attempt to consolidate small read and write operations
+## into large blocks.  This macro specifies the default block size
+## Condor will use.
+#DEFAULT_IO_BUFFER_BLOCK_SIZE = 32768
+
+##--------------------------------------------------------------------
+##  condor_preen 
+##--------------------------------------------------------------------
+##  Who should condor_preen send email to?
+#PREEN_ADMIN		= $(CONDOR_ADMIN)
+
+##  What files should condor_preen leave in the spool directory?
+VALID_SPOOL_FILES	= job_queue.log, job_queue.log.tmp, history, \
+                          Accountant.log, Accountantnew.log
+
+##  What files should condor_preen remove from the log directory?
+INVALID_LOG_FILES	= core
+
+##--------------------------------------------------------------------
+##  condor_glidein settings. These are not active in NMI R1
+##--------------------------------------------------------------------
+
+#GLIDEIN_SERVER_NAME = gridftp.cs.wisc.edu
+#GLIDEIN_SERVER_DIR = /p/condor/public/binaries/glidein
+GLIDEIN_SERVER_NAME = lcgse01.triumf.ca
+GLIDEIN_SERVER_DIR = /home/atlas001/condor

Deleted: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/condor_config.template
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/condor_config.template	2009-07-30 15:21:25 UTC (rev 1283)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/condor_config.template	2009-07-30 15:33:21 UTC (rev 1284)
@@ -1,764 +0,0 @@
-#####################################################################
-##
-##  condor_config
-##
-#
-#  Same as that from U Vic
-#
-##  This is the global configuration file for condor.
-##
-##  The file is divided into four main parts:
-##  Part 1:  Settings you should customize 
-##  Part 2:  Settings you may want to customize
-##  Part 3:  Settings that control the policy of when condor will
-##           start and stop jobs on your machines
-##  Part 4:  Settings you should probably leave alone (unless you
-##  know what you're doing)
-##
-##  Please read the INSTALL file (or the Install chapter in the
-##  Condor Administrator's Manual) for detailed explanations of the 
-##  various settings in here and possible ways to configure your
-##  pool. 
-##
-##  If you are installing Condor as root and then handing over the
-##  administration of this file to a person you do not trust with
-##  root access, please read the Installation chapter paying careful
-##  note to the condor_config.root entries.
-##
-##  Unless otherwise specified, settings that are commented out show
-##  the defaults that are used if you don't define a value.  Settings
-##  that are defined here MUST BE DEFINED since they have no default
-##  value.
-##
-##  Unless otherwise indicated, all settings which specify a time are
-##  defined in seconds.
-## 
-##  Any questions should be directed to condor-admin at cs.wisc.edu
-##
-######################################################################
-
-######################################################################
-######################################################################
-##
-##  ######                                     #
-##  #     #    ##    #####    #####           ##
-##  #     #   #  #   #    #     #            # #
-##  ######   #    #  #    #     #              #
-##  #        ######  #####      #              #
-##  #        #    #  #   #      #              #
-##  #        #    #  #    #     #            #####
-##
-##  Part 1:  Settings you must customize:
-######################################################################
-######################################################################
-
-##  What machine is your central manager?
-CONDOR_HOST	= $(FULL_HOSTNAME)
-#NEGOTIATOR_HOST = ggate01.triumf.ca
-NEGOTIATOR_HOST = $(CONDOR_HOST)
-#COLLECTOR_HOST  = ggate01.triumf.ca
-#COLLECTOR_HOST  = lcgce02.triumf.ca
-CONDOR_IDS       = @globusUID at .@globusGID@
-
-GRID_MONITOR        = $(SBIN)/grid_monitor.sh
-ENABLE_GRID_MONITOR = TRUE
-
-GRIDMANAGER_MAX_SUBMITTED_JOBS_PER_RESOURCE=100
-GRIDMANAGER_MAX_PENDING_SUBMITS_PER_RESOURCE=20
-
-#GSI_DAEMON_DIRECTORY = /etc/grid-security
-#GSI_DAEMON_PROXY=/tmp/x509up_u0
-
-##--------------------------------------------------------------------
-##  Pathnames:
-##--------------------------------------------------------------------
-##  Where have you installed the bin, sbin and lib condor directories?   
-RELEASE_DIR = /opt/condor-6.6.1
-
-##  Where is the local condor directory for each host?  
-LOCAL_DIR		= $(RELEASE_DIR)/var
-
-##--------------------------------------------------------------------
-##  Mail parameters:
-##--------------------------------------------------------------------
-##  When something goes wrong with condor at your site, who should get
-##  the email?
-CONDOR_ADMIN		= root at localhost 
-
-##  Full path to a mail delivery program that understands that "-s"
-##  means you want to specify a subject:
-MAIL			= /bin/mail
-
-##--------------------------------------------------------------------
-##  Network domain parameters:
-##--------------------------------------------------------------------
-##  Internet domain of machines sharing a common UID space.  If your
-##  machines don't share a common UID space, use the second entry
-##  which specifies that each machine has its own UID space.
-#UID_DOMAIN		= cs.wisc.edu
-UID_DOMAIN		= $(FULL_HOSTNAME)
-
-##  Internet domain of machines sharing a common file system.
-##  If your machines don't use a network file system, use the second
-##  entry which specifies that each machine has its own file system. 
-#FILESYSTEM_DOMAIN	= cs.wisc.edu
-FILESYSTEM_DOMAIN	= $(FULL_HOSTNAME)
-
-
-######################################################################
-######################################################################
-##  
-##  ######                                   #####
-##  #     #    ##    #####    #####         #     #
-##  #     #   #  #   #    #     #                 #
-##  ######   #    #  #    #     #            #####
-##  #        ######  #####      #           #
-##  #        #    #  #   #      #           #
-##  #        #    #  #    #     #           #######
-##  
-##  Part 2:  Settings you may want to customize: 
-##  (it is generally safe to leave these untouched) 
-######################################################################
-######################################################################
-
-##--------------------------------------------------------------------
-##  GlideIn: Using Globus resources to construct a virtual Condor Pool
-##--------------------------------------------------------------------
-##  
-## To use GlideIn, you'll need to set the two options below.
-##
-## List the sites you want to GlideIn to on the GLIDEIN_SITES. For example, 
-## if you'd like to GlideIn to some Alliance GiB resources, 
-## uncomment out the line below
-## IT MUST BE DEFINED!!! IF YOU DON"T WANT TO USE IT LEAVE IT BLANK
-#GLIDEIN_SITES = *.ncsa.uiuc.edu, *.cs.wisc.edu, *.mcs.anl.gov 
-GLIDEIN_SITES = lcgce01.triumf.ca
-
-## 
-## To Turn on GlideIn, you'll need to uncomment out the first daemon_list below
-## and turn on the second
-#DAEMON_LIST                     = MASTER, SCHEDD  
-DAEMON_LIST                    = MASTER, SCHEDD, COLLECTOR, NEGOTIATOR
-
-##--------------------------------------------------------------------
-##  Flocking: Submitting jobs to more than one pool
-##--------------------------------------------------------------------
-##  Flocking allows you to run your jobs in other pools, or lets
-##  others run jobs in your pool.
-## 
-##  To let others flock to you, define FLOCK_FROM.
-## 
-##  To flock to others, define FLOCK_TO.
-
-##  FLOCK_FROM defines the machines where you would like to grant
-##  people access to your pool via flocking. (i.e. you are granting
-##  access to these machines to join your pool).
-FLOCK_FROM = 
-##  An example of this is:
-#FLOCK_FROM = somehost.friendly.domain, anotherhost.friendly.domain
-
-##  FLOCK_TO defines the central managers of the pools that you want
-##  to flock to. (i.e. you are specifying the machines that you
-##  want your jobs to be negotiated at -- thereby specifying the
-##  pools they will run in.)
-FLOCK_TO = 
-##  An example of this is:
-#FLOCK_TO = central_manager.friendly.domain, condor.cs.wisc.edu
-
-##  FLOCK_COLLECTOR_HOSTS should almost always be the same as
-##  FLOCK_NEGOTIATOR_HOSTS (as shown below).  The only reason it would be
-##  different is if the collector and negotiator in the pool that you are
-##  flocking too are running on different machines (not recommended).
-##  The collectors must be specified in the same corresponding order as
-##  the FLOCK_NEGOTIATOR_HOSTS list.
-FLOCK_NEGOTIATOR_HOSTS = $(FLOCK_TO)
-FLOCK_COLLECTOR_HOSTS = $(FLOCK_TO)
-## An example of having the negotiator and the collector on different
-## machines is:
-#FLOCK_NEGOTIATOR_HOSTS = condor.cs.wisc.edu, condor-negotiator.friendly.domain
-#FLOCK_COLLECTOR_HOSTS =  condor.cs.wisc.edu, condor-collector.friendly.domain
-
-
-##--------------------------------------------------------------------
-##  Host/IP access levels
-##--------------------------------------------------------------------
-##  Please see the administrator's manual for details on these
-##  settings, what they're for, and how to use them.
-
-##  What machines have administrative rights for your pool?  This
-##  defaults to your central manager.  You should set it to the
-##  machine(s) where whoever is the condor administrator(s) works
-##  (assuming you trust all the users who log into that/those
-##  machine(s), since this is machine-wide access you're granting).
-HOSTALLOW_ADMINISTRATOR = $(CONDOR_HOST)
-
-##  If there are no machines that should have administrative access 
-##  to your pool (for example, there's no machine where only trusted
-##  users have accounts), you can uncomment this setting.
-##  Unfortunately, this will mean that administering your pool will 
-##  be more difficult.
-#HOSTDENY_ADMINISTRATOR = *
-
-##  What machines should have "owner" access to your machines, meaning
-##  they can issue commands that a machine owner should be able to
-##  issue to their own machine (like condor_vacate).  This defaults to
-##  machines with administrator access, and the local machine.  This
-##  is probably what you want.
-HOSTALLOW_OWNER = $(FULL_HOSTNAME), $(HOSTALLOW_ADMINISTRATOR)
-
-##  Read access.  Machines listed as allow (and/or not listed as deny)
-##  can view the status of your pool, but cannot join your pool 
-##  or run jobs.
-##  NOTE: By default, without these entries customized, you
-##  are granting read access to the whole world.  You may want to
-##  restrict that to hosts in your domain.  If possible, please also
-##  grant read access to "*.cs.wisc.edu", so the Condor developers
-##  will be able to view the status of your pool and more easily help
-##  you install, configure or debug your Condor installation.
-##  It is important to have this defined.
-HOSTALLOW_READ = * 
-#HOSTALLOW_READ = *.your.domain, *.cs.wisc.edu
-#HOSTDENY_READ = *.bad.subnet, bad-machine.your.domain, 144.77.88.*
-
-##  Write access.  Machines listed here can join your pool, submit
-##  jobs, etc.  Note: Any machine which has WRITE access must
-##  also be granted READ access.  Granting WRITE access below does
-##  not also automatically grant READ access; you must change
-##  HOSTALLOW_READ above as well.
-##  If you leave it as it is, it will be unspecified, and effectively
-##  it will be allowing anyone to write to your pool.
-HOSTALLOW_WRITE = $(FULL_HOSTNAME), $(GLIDEIN_SITES) 
-#HOSTALLOW_WRITE = *.your.domain, your-friend's-machine.other.domain
-#HOSTDENY_WRITE = bad-machine.your.domain
-
-##  Negotiator access.  Machines listed here are trusted central
-##  managers.  You should normally not have to change this.
-HOSTALLOW_NEGOTIATOR = $(NEGOTIATOR_HOST)
-##  Now, with flocking we need to let the SCHEDD trust the other 
-##  negotiators we are flocking with as well.  You should normally 
-##  not have to change this either.
-HOSTALLOW_NEGOTIATOR_SCHEDD = $(NEGOTIATOR_HOST), $(FLOCK_NEGOTIATOR_HOSTS)
-
-##  Config access.  Machines listed here can use the condor_config_val
-##  tool to modify all daemon configurations except those specified in
-##  the condor_config.root file.  This level of host-wide access
-##  should only be granted with extreme caution.  By default, config
-##  access is denied from all hosts.
-#HOSTALLOW_CONFIG = trusted-host.your.domain
-
-##  Flocking Configs.  These are the real things that Condor looks at,
-##  but we set them from the FLOCK_FROM/TO macros above.  It is safe
-##  to leave these unchanged.
-HOSTALLOW_WRITE_COLLECTOR = $(HOSTALLOW_WRITE), $(FLOCK_FROM)
-HOSTALLOW_WRITE_STARTD    = $(HOSTALLOW_WRITE), $(FLOCK_FROM)
-HOSTALLOW_READ_COLLECTOR  = $(HOSTALLOW_READ), $(FLOCK_FROM) 
-HOSTALLOW_READ_STARTD     = $(HOSTALLOW_READ), $(FLOCK_FROM) 
-
-
-##--------------------------------------------------------------------
-##  Miscellaneous:
-##--------------------------------------------------------------------
-##  Try to save this much swap space by not starting new shadows.  
-##  Specified in megabytes.
-#RESERVED_SWAP		= 5
-
-##  What's the maximum number of jobs you want a single submit machine
-##  to spawn shadows for?
-#MAX_JOBS_RUNNING	= 200
-
-##  Condor needs to create a few lock files to synchronize access to
-##  various log files.  Because of problems we've had with network
-##  filesystems and file locking over the years, we HIGHLY recommend
-##  that you put these lock files on a local partition on each
-##  machine.  If you don't have your LOCAL_DIR on a local partition,
-##  be sure to change this entry.  Whatever user (or group) condor is
-##  running as needs to have write access to this directory.  If
-##  you're not running as root, this is whatever user you started up
-##  the condor_master as.  If you are running as root, and there's a
-##  condor account, it's probably condor.  Otherwise, it's whatever
-##  you've set in the CONDOR_IDS environment variable.  See the Admin
-##  manual for details on this.
-LOCK		= $(LOG)
-
-##  If you don't use a fully qualified name in your /etc/hosts file
-##  (or NIS, etc.) for either your official hostname or as an alias,
-##  Condor wouldn't normally be able to use fully qualified names in
-##  places that it'd like to.  You can set this parameter to the
-##  domain you'd like appended to your hostname, if changing your host
-##  information isn't a good option.  This parameter must be set in
-##  the global config file (not the LOCAL_CONFIG_FILE from above). 
-#DEFAULT_DOMAIN_NAME = your.domain.name
-
-##  Condor can be told whether or not you want the Condor daemons to
-##  create a core file if something really bad happens.  This just
-##  sets the resource limit for the size of a core file.  By default,
-##  we don't do anything, and leave in place whatever limit was in
-##  effect when you started the Condor daemons.  If this parameter is
-##  set and "True", we increase the limit to as large as it gets.  If
-##  it's set to "False", we set the limit at 0 (which means that no
-##  core files are even created).  Core files greatly help the Condor
-##  developers debug any problems you might be having.
-#CREATE_CORE_FILES	= True
-
-
-##--------------------------------------------------------------------
-##  Settings that control the daemon's debugging output:
-##--------------------------------------------------------------------
-
-MAX_SCHEDD_LOG		= 64000
-SCHEDD_DEBUG		= D_COMMAND
-
-MAX_GRIDMANAGER_LOG	= 64000
-GRIDMANAGER_DEBUG	= D_COMMAND
-
-MAX_MASTER_LOG		= 64000
-MASTER_DEBUG		= D_COMMAND
-
-MAX_COLLECTOR_LOG       = 64000
-COLLECTOR_DEBUG         = D_COMMAND
-
-MAX_NEGOTIATOR_LOG      = 64000
-NEGOTIATOR_DEBUG        = D_MATCH
-MAX_NEGOTIATOR_MATCH_LOG = 64000
- 
-MAX_SHADOW_LOG          = 64000
-SHADOW_DEBUG            =
-
-
-
-######################################################################
-######################################################################
-##  
-##  ######                                   #####
-##  #     #    ##    #####    #####         #     #
-##  #     #   #  #   #    #     #                 #
-##  ######   #    #  #    #     #            #####
-##  #        ######  #####      #                 #
-##  #        #    #  #   #      #           #     #
-##  #        #    #  #    #     #            #####
-##  
-##  Part 3:  Settings control the policy for running, stopping, and
-##  periodically checkpointing condor jobs:
-######################################################################
-######################################################################
-
-##  This section contains macros are here to help write legible
-##  expressions:
-MINUTE		= 60
-HOUR		= (60 * $(MINUTE))
-StateTimer	= (CurrentTime - EnteredCurrentState)
-ActivityTimer	= (CurrentTime - EnteredCurrentActivity)
-ActivationTimer = (CurrentTime - JobStart)
-LastCkpt	= (CurrentTime - LastPeriodicCheckpoint)
-
-##  The JobUniverse attribute is just an int.  These macros can be
-##  used to specify the universe in a human-readable way:
-STANDARD	= 1
-PVM		= 4
-VANILLA		= 5
-IsPVM           = (JobUniverse == $(PVM))
-IsVanilla       = (JobUniverse == $(VANILLA))
-IsStandard      = (JobUniverse == $(STANDARD))
-
-NonCondorLoadAvg	= (LoadAvg - CondorLoadAvg)
-BackgroundLoad		= 0.3
-HighLoad		= 0.5
-StartIdleTime		= 15 * $(MINUTE)
-ContinueIdleTime	=  5 * $(MINUTE)
-MaxSuspendTime		= 10 * $(MINUTE)
-MaxVacateTime		= 10 * $(MINUTE)
-
-KeyboardBusy		= (KeyboardIdle < $(MINUTE))
-ConsoleBusy		= (ConsoleIdle  < $(MINUTE))
-CPU_Idle		= ($(NonCondorLoadAvg) <= $(BackgroundLoad))
-CPU_Busy		= ($(NonCondorLoadAvg) >= $(HighLoad))
-
-BigJob		= (ImageSize >= (50 * 1024))
-MediumJob	= (ImageSize >= (15 * 1024) && ImageSize < (50 * 1024))
-SmallJob	= (ImageSize <  (15 * 1024))
-
-JustCPU			= ($(CPU_Busy) && ($(KeyboardBusy) == False))
-MachineBusy		= ($(CPU_Busy) || $(KeyboardBusy))
-
-######################################################################
-######################################################################
-##  
-##  ######                                  #
-##  #     #    ##    #####    #####         #    #
-##  #     #   #  #   #    #     #           #    #
-##  ######   #    #  #    #     #           #    #
-##  #        ######  #####      #           #######
-##  #        #    #  #   #      #                #
-##  #        #    #  #    #     #                #
-##  
-##  Part 4:  Settings you should probably leave alone:
-##  (unless you know what you're doing)
-######################################################################
-######################################################################
-
-######################################################################
-##  Daemon-wide settings:
-######################################################################
-
-
-# Disable the new authentication protocol in Condor 6.3, use the 6.2 method
-DISABLE_AUTH_NEGOTIATION = TRUE
-
-##  Pathnames
-LOG		= $(LOCAL_DIR)/log
-SPOOL		= $(LOCAL_DIR)/spool
-EXECUTE		= $(LOCAL_DIR)/execute
-BIN		= $(RELEASE_DIR)/bin
-LIB		= $(RELEASE_DIR)/lib
-SBIN		= $(RELEASE_DIR)/sbin
-HISTORY		= $(SPOOL)/history
-
-##  Log files
-MASTER_LOG	= $(LOG)/MasterLog
-SCHEDD_LOG	= $(LOG)/SchedLog
-GRIDMANAGER_LOG = /tmp/GridmanagerLog.$(USERNAME)
-SHADOW_LOG      = $(LOG)/ShadowLog
-COLLECTOR_LOG	= $(LOG)/CollectorLog
-NEGOTIATOR_LOG  = $(LOG)/NegotiatorLog
-NEGOTIATOR_MATCH_LOG = $(LOG)/MatchLog
-
-##  Lock files
-SHADOW_LOCK = $(LOCK)/ShadowLock
-
-##  In most cases, your condor_collector and condor_negotiator are
-##  going to run on the same machine.  If for some reason, this isn't
-##  the case, here's where you'd change it:
-#NEGOTIATOR_HOST = $(CONDOR_HOST)
-#COLLECTOR_HOST  = $(CONDOR_HOST)
-
-##  How long are you willing to let daemons try their graceful
-##  shutdown methods before they do a hard shutdown? (30 minutes)
-#SHUTDOWN_GRACEFUL_TIMEOUT	= 1800
-
-##  How much disk space would you like reserved from Condor?  In
-##  places where Condor is computing the free disk space on various
-##  partitions, it subtracts the amount it really finds by this
-##  many megabytes.  (If undefined, defaults to 0).
-RESERVED_DISK		= 5
-
-##  If your machine is running AFS and the AFS cache lives on the same
-##  partition as the other Condor directories, and you want Condor to
-##  reserve the space that your AFS cache is configured to use, set
-##  this to true.
-#RESERVE_AFS_CACHE	= False
-
-
-######################################################################
-##  Daemon-specific settings:
-######################################################################
-
-##--------------------------------------------------------------------
-##  condor_master
-##--------------------------------------------------------------------
-##  Daemons you want the master to keep running for you:
-
-##  Which daemons use the Condor DaemonCore library (i.e., not the
-##  checkpoint server or custom user daemons)?
-#DC_DAEMON_LIST = MASTER, STARTD, SCHEDD, KBDD, COLLECTOR, NEGOTIATOR, EVENTD
-
-##  Where are the binaries for these daemons?
-MASTER				= $(SBIN)/condor_master
-SCHEDD				= $(SBIN)/condor_schedd
-NEGOTIATOR			= $(SBIN)/condor_negotiator
-COLLECTOR			= $(SBIN)/condor_collector
-
-##  When the master starts up, it can place it's address (IP and port)
-##  into a file.  This way, tools running on the local machine don't
-##  need to query the central manager to find the master.  This
-##  feature can be turned off by commenting out this setting.
-MASTER_ADDRESS_FILE = $(LOG)/.master_address
-
-##  Where should the master find the condor_preen binary? If you don't
-##  want preen to run at all, just comment out this setting.
-PREEN				= $(SBIN)/condor_preen
-
-##  How do you want preen to behave?  The "-m" means you want email
-##  about files preen finds that it thinks it should remove.  The "-r"
-##  means you want preen to actually remove these files.  If you don't
-##  want either of those things to happen, just remove the appropriate
-##  one from this setting.
-PREEN_ARGS			= -m -r
-
-##  How often should the master start up condor_preen? (once a day)
-#PREEN_INTERVAL			= 86400
-
-##  If a daemon dies an unnatural death, do you want email about it?
-#PUBLISH_OBITUARIES		= True
-
-##  If you're getting obituaries, how many lines of the end of that
-##  daemon's log file do you want included in the obituary?
-#OBITUARY_LOG_LENGTH		= 20
-
-##  Should the master run?
-#START_MASTER			= True
-
-##  Should the master start up the daemons you want it to?
-#START_DAEMONS			= True
-
-##  How often do you want the master to send an update to the central
-##  manager? 
-#MASTER_UPDATE_INTERVAL		= 300
-
-##  How often do you want the master to check the timestamps of the
-##  daemons it's running?  If any daemons have been modified, the
-##  master restarts them.
-#MASTER_CHECK_NEW_EXEC_INTERVAL	= 300
-
-##  Once you notice new binaries, how long should you wait before you
-##  try to execute them?
-#MASTER_NEW_BINARY_DELAY	= 120
-
-##  What's the maximum amount of time you're willing to give the
-##  daemons to quickly shutdown before you just kill them outright?
-#SHUTDOWN_FAST_TIMEOUT		= 120
-
-######
-##  Exponential backoff settings:
-######
-##  When a daemon keeps crashing, we use "exponential backoff" so we
-##  wait longer and longer before restarting it.  This is the base of
-##  the exponent used to determine how long to wait before starting
-##  the daemon again:
-#MASTER_BACKOFF_FACTOR		= 2.0
-
-##  What's the maximum amount of time you want the master to wait
-##  between attempts to start a given daemon?  (With 2.0 as the
-##  MASTER_BACKOFF_FACTOR, you'd hit 1 hour in 12 restarts...)
-#MASTER_BACKOFF_CEILING		= 3600
-
-##  How long should a daemon run without crashing before we consider
-##  it "recovered".  Once a daemon has recovered, we reset the number
-##  of restarts so the exponential backoff stuff goes back to normal. 
-#MASTER_RECOVER_FACTOR		= 300
-
-##--------------------------------------------------------------------
-##  condor_schedd
-##--------------------------------------------------------------------
-##  Where is the GridManager binary installed?
-SHADOW				= $(SBIN)/condor_shadow
-SHADOW_PVM          = $(SBIN)/condor_shadow.pvm
-GRIDMANAGER			= $(SBIN)/condor_gridmanager
-GAHP				= $(SBIN)/gahp_server
-
-
-##  When the schedd starts up, it can place it's address (IP and port)
-##  into a file.  This way, tools running on the local machine don't
-##  need to query the central manager to find the schedd.  This
-##  feature can be turned off by commenting out this setting.
-SCHEDD_ADDRESS_FILE	= $(LOG)/.schedd_address
-
-##  How often should the schedd send an update to the central manager?
-#SCHEDD_INTERVAL	= 300 
-
-##  How long should the schedd wait between spawning each shadow?
-#JOB_START_DELAY	= 2
-
-##  How often should the schedd send a keep alive message to any
-##  startds it has claimed?  (5 minutes)
-#ALIVE_INTERVAL		= 300
-
-##  This setting controls the maximum number of times that a
-##  condor_shadow processes can have a fatal error (exception) before
-##  the condor_schedd will simply relinquish the match associated with
-##  the dying shadow.
-#MAX_SHADOW_EXCEPTIONS	= 5
-
-##  Estimated virtual memory size of each condor_shadow process. 
-##  Specified in kilobytes.
-SHADOW_SIZE_ESTIMATE	= 1800
-
-##  The condor_schedd can renice the condor_shadow processes on your
-##  submit machines.  How how "nice" do you want the shadows? (1-19).
-##  The higher the number, the lower priority the shadows have.
-##  This feature can be disabled entirely by commenting it out.
-SHADOW_RENICE_INCREMENT	= 10
-
-##  By default, when the schedd fails to start an idle job, it will
-##  not try to start any other idle jobs in the same cluster during
-##  that negotiation cycle.  This makes negotiation much more
-##  efficient for large job clusters.  However, in some cases other
-##  jobs in the cluster can be started even though an earlier job
-##  can't.  For example, the jobs' requirements may differ, because of
-##  different disk space, memory, or operating system requirements.
-##  Or, machines may be willing to run only some jobs in the cluster,
-##  because their requirements reference the jobs' virtual memory size
-##  or other attribute.  Setting NEGOTIATE_ALL_JOBS_IN_CLUSTER to True
-##  will force the schedd to try to start all idle jobs in each
-##  negotiation cycle.  This will make negotiation cycles last longer,
-##  but it will ensure that all jobs that can be started will be
-##  started.
-#NEGOTIATE_ALL_JOBS_IN_CLUSTER = False
-
-######
-## Queue management settings:
-######
-##  How often should the schedd truncate it's job queue transaction
-##  log?  (Specified in seconds, once a day is the default.)
-#QUEUE_CLEAN_INTERVAL	= 86400
-
-##  How often should the schedd commit "wall clock" run time for jobs
-##  to the queue, so run time statistics remain accurate when the
-##  schedd crashes?  (Specified in seconds, once per hour is the
-##  default.  Set to 0 to disable.)
-#WALL_CLOCK_CKPT_INTERVAL = 3600
-
-##  Do you want to allow remote machines to be able to submit jobs to
-##  this queue as user "nobody"?
-#ALLOW_REMOTE_SUBMIT	= False
-
-##  What users do you want to grant super user access to this job
-##  queue?  (These users will be able to remove other user's jobs). 
-##  By default, this only includes root.
-QUEUE_SUPER_USERS	= root, condor
-
-
-##--------------------------------------------------------------------
-##  condor_shadow
-##--------------------------------------------------------------------
-##  If the shadow is unable to read a checkpoint file from the
-##  checkpoint server, it keeps trying only if the job has accumulated
-##  more than MAX_DISCARDED_RUN_TIME seconds of CPU usage.  Otherwise,
-##  the job is started from scratch.  Defaults to 1 hour.  This
-##  setting is only used if USE_CKPT_SERVER (from above) is True.
-#MAX_DISCARDED_RUN_TIME = 3600 
-
-##  Should periodic checkpoints be compressed?
-#COMPRESS_PERIODIC_CKPT = False
-
-##  Should vacate checkpoints be compressed?
-#COMPRESS_VACATE_CKPT = False
-
-##  Should we commit the application's dirty memory pages to swap
-##  space during a periodic checkpoint?
-#PERIODIC_MEMORY_SYNC = False
-
-##  Should we write vacate checkpoints slowly?  If nonzero, this
-##  parameter specifies the speed at which vacate checkpoints should
-##  be written, in kilobytes per second.
-#SLOW_CKPT_SPEED = 0
-
-##--------------------------------------------------------------------
-##  condor_gridmanager
-##--------------------------------------------------------------------
-
-## If we're talking to a Globus 2.0 resource, Condor-G will use the new
-## version of the GRAM protocol. The first option is how often to check the
-## proxy on the submit site of things. If the GridManager discovers a new
-## proxy, it will restart itself and use the new proxy for all future 
-## jobs launched. In seconds,  and defaults to 10 minutes
-#GRIDMANAGER_CHECKPROXY_INTERVAL = 600
-
-## The GridManager will shut things down 3 minutes before loosing Contact
-## because of an expired proxy. 
-## In seconds, and defaults to 3 minutes
-#GRDIMANAGER_MINIMUM_PROXY_TIME  = 180
-
-##--------------------------------------------------------------------
-##  condor_shadow.pvm
-##--------------------------------------------------------------------
-##  Where is the condor pvm daemon installed?
-PVMD                    = $(SBIN)/condor_pvmd
-
-##  Where is the condor pvm group server daemon installed?
-PVMGS                   = $(SBIN)/condor_pvmgs
-
-
-##--------------------------------------------------------------------
-##  condor_submit
-##--------------------------------------------------------------------
-
-
-## Condor requires that each submitted job be designated to run under a
-## particular "universe". Condor-G is active when jobs are as marked as
-## "GLOBUS" universe jobs. The universe of a job is set in the submit file
-## with the 'universe = GLOBUS' line. 
-##
-## If no universe is specificed in the submit file, Condor must pick one
-## for the job to use. By default, it chooses the "standard" universe. 
-## The default can be overridden in the config file with the DEFAULT_UNIVERSE
-## setting, which is a string to insert into a job submit description if the
-## job does not try and define it's own universe
-
-DEFAULT_UNIVERSE = globus
-
-#
-# The Cred_min_time_left is the first-pass at making sure that Condor-G
-# does not submit your job without it having enough time left for the 
-# job to finish. For example, if you have a job that runs for 20 minutes, and
-# you might spend 40 minutes in the queue, it's a bad idea to submit with less
-# than an hour left before your proxy expires.
-# 2 hours seemed like a reasonable default.
-#
-CRED_MIN_TIME_LEFT		= 120 
-
-##  If you want condor_submit to automatically append an expression to
-##  the Requirements expression or Rank expression of jobs at your
-##  site, uncomment these entries.
-#APPEND_REQUIREMENTS	= (expression to append job requirements)
-#APPEND_RANK		= (expression to append job rank)
-
-##  If you want expressions only appended for either standard or
-##  vanilla universe jobs, you can uncomment these entries.  If any of
-##  them are defined, they are used for the given universe, instead of
-##  the generic entries above.
-#APPEND_REQ_VANILLA	= (expression to append to vanilla job requirements)
-#APPEND_REQ_STANDARD	= (expression to append to standard job requirements)
-#APPEND_RANK_STANDARD	= (expression to append to vanilla job rank)
-#APPEND_RANK_VANILLA	= (expression to append to standard job rank)
-
-##  This can be used to define a default value for the rank expression
-##  if one is not specified in the submit file.
-#DEFAULT_RANK	        = (default rank expression for all jobs)
-
-##  If you want universe-specific defaults, you can use the following
-##  entries:
-#DEFAULT_RANK_VANILLA	= (default rank expression for vanilla jobs)
-#DEFAULT_RANK_STANDARD	= (default rank expression for standard jobs)
-
-##  If you want condor_submit to automatically append expressions to
-##  the job ClassAds it creates, you can uncomment and define the
-##  SUBMIT_EXPRS setting.  It works just like the STARTD_EXPRS
-##  described above with respect to ClassAd vs. config file syntax,
-##  strings, etc.  One common use would be to have the full hostname
-##  of the machine where a job was submitted placed in the job
-##  ClassAd.  You would do this by uncommenting the following lines: 
-#MACHINE = "$(FULL_HOSTNAME)"
-#SUBMIT_EXPRS = MACHINE
-
-## Condor keeps a buffer of recently-used data for each file an
-## application opens.  This macro specifies the default maximum number
-## of bytes to be buffered for each open file at the executing
-## machine.
-#DEFAULT_IO_BUFFER_SIZE = 524288
-
-## Condor will attempt to consolidate small read and write operations
-## into large blocks.  This macro specifies the default block size
-## Condor will use.
-#DEFAULT_IO_BUFFER_BLOCK_SIZE = 32768
-
-##--------------------------------------------------------------------
-##  condor_preen 
-##--------------------------------------------------------------------
-##  Who should condor_preen send email to?
-#PREEN_ADMIN		= $(CONDOR_ADMIN)
-
-##  What files should condor_preen leave in the spool directory?
-VALID_SPOOL_FILES	= job_queue.log, job_queue.log.tmp, history, \
-                          Accountant.log, Accountantnew.log
-
-##  What files should condor_preen remove from the log directory?
-INVALID_LOG_FILES	= core
-
-##--------------------------------------------------------------------
-##  condor_glidein settings. These are not active in NMI R1
-##--------------------------------------------------------------------
-
-#GLIDEIN_SERVER_NAME = gridftp.cs.wisc.edu
-#GLIDEIN_SERVER_DIR = /p/condor/public/binaries/glidein
-GLIDEIN_SERVER_NAME = lcgse01.triumf.ca
-GLIDEIN_SERVER_DIR = /home/atlas001/condor

Deleted: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/gavia-grid-resource.tar.gz
===================================================================
(Binary files differ)

Modified: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/gavia-resource-advertise.conf.in
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/gavia-resource-advertise.conf.in	2009-07-30 15:21:25 UTC (rev 1283)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/gavia-resource-advertise.conf.in	2009-07-30 15:33:21 UTC (rev 1284)
@@ -17,7 +17,7 @@
 queue_name = grid
 
 # Location of PBS/Torque binaries. Usually in /usr/local or /usr/pbs
-pbs_home = /usr/local
+pbs_home = @PBS_LOCATION@
 
 
 ################################################################################
@@ -27,10 +27,10 @@
 ################################################################################
 
 # This machine's hostname. (Only needed $HOSTNAME is your internal interface)
-#resource_name = @resourceName@
+#resource_name = @RESOURCE_NAME@
 
 # Globus grid-mapfile. Usually this is in /etc/grid-security
-#grid_mapfile = @gridMapfile@
+#grid_mapfile = @GRID_MAPFILE@
 
 # To use MOAB estimator rather than in-house
 # set native_estimator_wrapper and native_estimator
@@ -41,7 +41,7 @@
 #grid_users = @gridUsers@
 
 # Location of condor binaries. You only need this for Condor Head nodes
-#condor_home = @condorHome@
+#condor_home = @CONDOR_LOCATION@
 
 # Probe interval value (0 means run once)
 #probe_interval = @probeInterval@

Deleted: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/mds-sga
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/mds-sga	2009-07-30 15:21:25 UTC (rev 1283)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/mds-sga	2009-07-30 15:33:21 UTC (rev 1284)
@@ -1,123 +0,0 @@
-#!/bin/sh
-#
-# /etc/init.d/mds-sga
-#
-#  Simple script to start mds-servicegroup-add using the
-#  registration file in the $GLOBUS_LOCATION directory, 
-#  and saves its PID in $GLOBUS_LOCATION/var/mds-sga.pid
-#
-# this need to start after the globus service starts, so start priority is 30.
-# chkconfig: 2345 30 80 
-# description: Starts up mds-servicegroup-add
-
-# Source function library
-if [ -x  /etc/rc.d/init.d/functions ]; then
-    . /etc/rc.d/init.d/functions
-fi
-
-# Set up our environment variables
-if [ "x$GLOBUS_LOCATION" = "x" ] ; then
-    echo "Error: GLOBUS_LOCATION must be set."
-    exit 1;
-fi
-
-if [ "x$JAVA_HOME" = "x" ] ; then
-    echo "Error: JAVA_HOME must be set."
-    exit 1;
-fi
-PIDFILE=$GLOBUS_LOCATION/var/mds-sga.pid
-
-if [ -r $GLOBUS_LOCATION/etc/mds-sga.conf ] ; then 
-	. $GLOBUS_LOCATION/etc/mds-sga.conf
-else
-	echo "Error: $GLOBUS_LOCATION/etc/mds-sga.conf not readable. Please create an mds-sga config file and try again."
-	exit 1
-fi
-
-# Init functions.
-
-start () {
-
-  # check if mds-servicegroup-add is running
-  
-  if [ -f $PIDFILE ]; then 
-
-     PID=`cat $PIDFILE`
-     running=$(ps -p $PID &>/dev/null; echo $?)
-     if [ $running -eq 1 ]; then 
-        rm -f $PIDFILE
-      else 
-        echo "Error: mds-servicegroup-add is already running with PID" `cat $PIDFILE`
-        exit 1
-      fi
-  fi
-
-
-	# check that registration file exists
-	if [ ! -r $REGISTRATIONFILE ] ; then
-		echo "Error: $REGISTRATIONFILE does not exist! An xml registration file is needed."
-		exit 1
-	fi
-	
-	echo "Starting mds-servicegroup-add..."
-
-	${GLOBUS_LOCATION}/bin/mds-servicegroup-add -a -s https://${CONTAINERHOST}:8443/wsrf/services/DefaultIndexService $REGISTRATIONFILE > /dev/null &
-	PID=$!
-	echo "$PID" > $PIDFILE
-}
-
-stop () {
-	#check if mds-servicegroup-add is running
-	if [ -r $PIDFILE ] ; then
-		echo "Stopping mds-servicegroup-add..."
-		PID=`cat $PIDFILE`
-		kill -9 $PID
-		rm -f $PIDFILE
-	else
-		echo "Error: mds-servicegroup-add doesn't appear to be running!"
-	fi
-}
-
-restart () {
-	stop
-	start
-}
-
-status () {
-	if [ ! -r $PIDFILE ] ; then
-		echo "mds-servicegroup-add isn't running."
-		exit 0
-	fi
-
-	PID=`cat $PIDFILE 2> /dev/null`
-	ps $PID | grep "$PID" &> /dev/null
-	if [ $? -eq 0 ] ; then
-		echo "mds-servicegroup-add is running under PID $PID"
-		exit 0
-	else
-		echo "Error: mds-servicegroup-add isn't running, but the pidfile $PIDFILE exists. Please double check that mds-sga isn't running, and delete the pidfile."
-		exit 1
-	fi
-}
-
-# Standard init case structure. 
-
-case "$1" in
-        start)
-                start
-        ;;
-        stop)
-                stop
-        ;;
-        restart)
-                restart
-        ;;
-	status)
-		status
-        ;;
-
-        *)
-                echo "Usage: mds-sga {start|stop|status|restart}"
-                exit 1
-        ;;
-esac

Deleted: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/mds-sga.conf.template
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/mds-sga.conf.template	2009-07-30 15:21:25 UTC (rev 1283)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/mds-sga.conf.template	2009-07-30 15:33:21 UTC (rev 1284)
@@ -1,5 +0,0 @@
-# Configuration file for mds-sga init script
-
-CONTAINERHOST=@containerHost@
-REGISTRATIONFILE=$GLOBUS_LOCATION/etc/globus_wsrf_mds_aggregator/classad-registration.xml
-

Copied: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/build.properties (from rev 1282, branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/build.properties)
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/build.properties	                        (rev 0)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/build.properties	2009-07-30 15:33:21 UTC (rev 1284)
@@ -0,0 +1,30 @@
+# Default used if env var GLOBUS_LOCATION not defined
+#globus.location=/opt/globus-4.0.2
+
+# File used for mds-servicegroup-add
+mds.reg.file=classad-registration.xml
+
+# SVN
+svn.repository=https://neon.sao.nrc.ca:7861/svn/projects/gridx1_sp1/trunk/MetaScheduling
+svn.module=ClassAd
+svn.tool=/usr/bin/svn
+
+# CHMOD
+chmod.tool=/bin/chmod
+
+# CHOWN
+chown.tool=/bin/chown
+
+# Javac options
+javac.debug=on
+build.compiler=modern
+
+# Applic params
+src.dir=src
+lib.dir=lib
+build.dir=build
+dist.dir=dist
+app.jar=MdsClassAdExtractor.jar
+release.tmp.dir=${build.dir}/tmp
+doc.dir=doc
+api.doc.dir=${doc.dir}/api

Copied: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/build.xml (from rev 1282, branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/build.xml)
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/build.xml	                        (rev 0)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/build.xml	2009-07-30 15:33:21 UTC (rev 1284)
@@ -0,0 +1,546 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="gavia-grid-resource" default="deploy" basedir=".">
+    
+  <!-- Get properties from build.properties file. -->
+  <property name="app.name" value="gavia-grid-resource" />
+  <property file="build.properties"/>
+
+  <!-- get environment vars -->
+  <property environment="env"/>
+
+  <property name="classad.dir"  value="libexec/aggrexec"/>
+  <property name="mds.aggr.dir" value="etc/globus_wsrf_mds_aggregator"/>
+  <property name="home.dir"    value="${env.HOME}"/>
+  <property name="init.dir"    value="/etc/init.d"/>
+  <property name="resource.name" value="${env.HOSTNAME}"/>
+
+  <!-- set root.dir to ${globus.location.env} or ${globus.location} --> 
+
+  <property name="globus.location.env" value="${env.GLOBUS_LOCATION}"/>
+
+  <!-- flags to indicate if globus.location.env is defined -->
+  <condition property="gl.env.defined" value="true">
+       <not><contains string="${globus.location.env}" substring="env.GLOBUS_LOCATION"/></not>
+  </condition>
+  <condition property="gl.env.undefined" value="true">
+       <not><equals arg1="${gl.defined}" arg2="true"/></not> 
+  </condition>
+
+  <!-- 
+      root.dir = ${globus.location.env} if(${gl.env.defined})
+                 ${globus.location}     otherwise
+  -->
+  <condition property="root.dir" value="${globus.location.env}"> 
+       <equals arg1="${gl.env.defined}" arg2="true"/>
+  </condition>
+  <condition property="root.dir" value="${globus.location}"> 
+       <and>
+         <equals arg1="${gl.env.undefined}" arg2="true"/>
+         <isSet property="globus.location" />
+       </and>
+  </condition>
+
+  <!-- flags to indicate if root.dir is defined -->
+  <condition property="root.dir.set" value="true"> 
+      <isSet property="root.dir" />
+  </condition>
+  <condition property="root.dir.unset" value="true"> 
+      <not><isSet property="root.dir" /></not>
+  </condition>
+
+
+
+  <!-- Set my.id = `whoami` -->
+  <exec executable="/usr/bin/whoami" os="Linux" outputproperty="my.id"></exec>
+  <!-- <echo> my.id = ${my.id}</echo> -->
+
+
+
+
+  <!-- Help target -->
+  <target name="help">    
+
+    <echo>Usage: ant { deploy | clean | mds-setup | mds-init | update | status | package}</echo>
+    <echo> </echo>
+    <echo message="  ------------------------------------"/>
+    <echo message="  target      description"/>
+    <echo message="  ------------------------------------"/>
+    <echo message="  deploy      deploy ClassAd to Globus"/>
+    <echo message="  status      check status against SVN"/>
+    <echo message="  update      update project from SVN"/>
+    <echo message="  mds-setup   set up MDS aggregator script"/>
+    <echo message="  mds-init    set up MDS init script"/>
+    <echo message="  clean       remove build files"/>
+    <echo message="  package     create distributable package"/>
+    <echo message="  ------------------------------------"/>
+    <echo> </echo>
+    <echo>NOTES</echo>  
+    <echo> </echo>
+    <echo>  1. Run "ant deploy" and "ant mds-setup" as user globus </echo>
+    <echo>     and run "ant mds-init" as user root </echo>
+    <echo> </echo>
+    <echo>  2. Before running "ant deploy", set either</echo>
+    <echo message="      2.1 the environment variable GLOBUS_LOCATION"/>  
+    <echo message="      2.2 set in build.properties"/>    
+    <echo message="            globus.location=VALUE_OF_GLOBUS_LOCATION"/>    
+    <echo message="     and note that setting GLOBUS_LOCATION overrides globus.location"/>    
+
+  </target>
+
+
+
+  <!-- Package target -->
+  <target name="package"> 
+    <echo message="${app.name}" />   
+    <mkdir dir="${app.name}" />
+    <copy file="README" todir="${app.name}" />
+    <copy file="build.xml" todir="${app.name}" />
+    <copy file="build.properties" todir="${app.name}" />
+    <copy file="classad.pm" todir="${app.name}" />
+    <copy file="classad.conf" todir="${app.name}" />
+    <copy file="classad-registration.xml.template" todir="${app.name}" />
+    <copy file="condor_config.template" todir="${app.name}" />
+    <copy file="mds-sga" todir="${app.name}" />
+    <copy file="mds-sga.conf.template" todir="${app.name}" />
+
+    <tar destfile="${app.name}.tar.gz" compression="gzip" basedir="." includes="${app.name}/**" />
+    <delete dir="${app.name}" />
+    <echo>Distributable package created: ${app.name}.tar.gz</echo>
+
+
+  </target>
+
+
+
+  <target name="all" depends="deploy">
+  </target>
+    
+
+
+  <!-- Deploy Target -->
+  <target name="deploy">
+
+    <condition property="not.globus.user" value="true"> 
+       <not><equals arg1="${my.id}" arg2="globus"/></not>
+    </condition>
+
+    <condition property="is.globus.user" value="true"> 
+        <equals arg1="${my.id}" arg2="globus"/>
+    </condition>
+
+    <condition property="root.dir.exist">
+       <available file="${root.dir}" type="dir"/>
+    </condition>
+    <condition property="root.dir.notexist">
+       <not><equals arg1="${root.dir.exist}" arg2="true"/></not> 
+    </condition>
+
+    <condition property="home.dir.notexist">
+       <contains string="${home.dir}" substring="home.dir"/>
+    </condition>
+
+    <condition property="root.dir.ok">
+       <and>
+          <equals arg1="${root.dir.set}" arg2="true"/>
+          <equals arg1="${root.dir.exist}" arg2="true"/>
+       </and>
+    </condition>
+
+    <condition property="root.and.home.dir.ok">
+       <and>
+          <equals arg1="${root.dir.ok}" arg2="true"/>
+          <not><equals arg1="${home.dir.notexist}" arg2="true"/></not>
+       </and>
+    </condition>
+
+
+    <condition property="can.deploy">
+       <and>
+          <equals arg1="${root.and.home.dir.ok}" arg2="true"/>
+          <equals arg1="${is.globus.user}"       arg2="true"/>
+       </and>
+    </condition>
+
+
+
+
+
+    <!-- Call deploy subtasks -->
+
+    <antcall target="printenv" />
+    <antcall target="checkGlobusId"/>
+    <antcall target="checkGlobusLocation" />
+    <antcall target="checkRootDir"/>
+    <antcall target="checkHomeDir"/>
+    <antcall target="customizeConfigFile"/>
+
+    <antcall target="doDeploy"/>
+
+    <!--
+      <antcall target="copy_files"/>
+     -->
+
+  </target>   <!-- end of deploy -->
+
+
+  <!-- Deploy subtargets -->
+
+  <target name="printenv" >
+
+    <echo>Installing the resource classAd generator</echo>
+    <echo>  </echo>
+    <echo>  globus.location     = ${globus.location}</echo>
+    <echo>  </echo>
+    <echo>  globus.location.env = ${globus.location.env}</echo>
+    <!--
+    <echo>  gl.env.defined    = ${gl.env.defined}</echo>
+    <echo>  gl.env.undefined  = ${gl.env.undefined}</echo>
+    -->
+    <echo>  </echo>
+    <!--
+    <echo>  root.dir       = ${root.dir}</echo>
+    <echo>  root.dir.set   = ${root.dir.set}</echo>
+    <echo>  root.dir.unset = ${root.dir.unset}</echo>
+    -->
+
+  </target>
+
+
+  <target name="checkGlobusId" if="not.globus.user">
+    <echo>ERROR </echo>
+    <echo>       Your user ID is "${my.id}", not "globus"</echo>
+    <echo>       Become "globus" and rerun "ant deploy"</echo>
+  </target>
+
+
+  <target name="checkGlobusLocation" if="root.dir.unset">
+    <echo>ERROR: env variable GLOBUS_LOCATION is not defined</echo>
+  </target>
+
+
+  <target name="checkRootDir" if="root.dir.notexist">
+    <echo>ERROR </echo>
+    <echo>       Target directory "${root.dir}" is not defined</echo>
+  </target>
+
+
+  <target name="checkHomeDir" if="home.dir.notexist">
+    <echo>ERROR </echo>
+    <echo>       Target directory "${home.dir}" is not defined</echo>
+  </target>
+
+  <!-- Customize files for this machine -->
+  <target name="customizeConfigFile">
+
+    <echo message="Customizing condor_config"/>
+    <exec executable="/usr/bin/id" os="Linux" outputproperty="globus.uid">
+      <arg line="-u globus"/>
+    </exec>
+    <exec executable="/usr/bin/id" os="Linux" outputproperty="globus.gid">
+      <arg line="-g globus"/>
+    </exec>
+    <delete file="${basedir}/condor_config" quiet="true"/>
+    <copy file="${basedir}/condor_config.template"
+          tofile="${basedir}/condor_config">
+      <filterchain>
+        <replacetokens>
+          <token key="globusUID" value="${globus.uid}"/>
+          <token key="globusGID" value="${globus.gid}"/>
+        </replacetokens>
+      </filterchain>
+    </copy>
+
+
+    <echo message="Customizing classad-registration.xml"/>
+    <delete file="${basedir}/classad-registration.xml" quiet="true"/>
+    <copy file="${basedir}/classad-registration.xml.template"
+          tofile="${basedir}/classad-registration.xml">
+      <filterchain>
+        <replacetokens>
+          <token key="resourceName" value="${resource.name}"/>
+        </replacetokens>
+      </filterchain>
+    </copy>
+
+
+    <echo message="Customizing mds-sga.conf"/>
+    <delete file="${basedir}/mds-sga.conf" quiet="true"/>
+    <copy file="${basedir}/mds-sga.conf.template"
+          tofile="${basedir}/mds-sga.conf">
+      <filterchain>
+        <replacetokens>
+          <token key="containerHost" value="${resource.name}"/>
+        </replacetokens>
+      </filterchain>
+    </copy>
+
+    <echo message="Adding classad.pm to jndi-config.xml"/>
+    <loadfile 
+     property="jndi.config" 
+     srcFile="${root.dir}/etc/globus_wsrf_mds_index/jndi-config.xml"
+    />
+    
+
+    <condition property="jndi.already.patched" value="true">
+      <not>
+        <contains string="${jndi.config}" substring="ClassAd" />
+      </not>
+    </condition>
+
+    <antcall target="patchJndiConfig"/>
+
+  </target>
+
+  <target name="patchJndiConfig" if="jndi.already.patched">
+
+    <echo message="Patching jndi-config" />
+    <replaceregexp
+     file="${root.dir}/etc/globus_wsrf_mds_index/jndi-config.xml"
+     match="(executableMappings./name.\s*.value.)"
+     replace="\1ClassAd=classad.pm, "
+     byline="false"
+    />
+    <!-- Remove comment tags from stock exacutableMappings tag -->
+    <replaceregexp
+     file="${root.dir}/etc/globus_wsrf_mds_index/jndi-config.xml"
+     match=".!--(.parameter.\s*.name.executableMappings)"
+     replace="\1"
+     byline="false"
+    />
+    <replaceregexp
+     file="${root.dir}/etc/globus_wsrf_mds_index/jndi-config.xml"
+     match="(parameter.)-->"
+     replace="\1"
+     byline="false"
+    />
+
+  </target>
+
+
+  <!-- The main work for deploy -->
+
+  <target name="doDeploy" if="can.deploy">
+
+    <echo message="Installing to ${root.dir}/etc"/>
+
+    <!-- Debug stufff -->   
+    <!-- See http://ant.apache.org/manual/using.html#arg
+    <echo>Current files under ${root.dir}/etc</echo>
+    <exec executable="/bin/ls" os="Linux">
+           <arg line="-l ${root.dir}/etc"/>
+    </exec>
+    -->
+
+
+    <echo message="" />
+    <echo message="Copy classad.pm to ${root.dir}/${classad.dir}"/>
+    <copy todir="${root.dir}/${classad.dir}" overwrite="true">
+      <fileset dir="." includes="classad.pm"/>
+    </copy>
+    <echo message="Set execute flag of classad.pm "/>
+    <exec executable="${chmod.tool}" os="Linux">
+           <arg line="+x ${root.dir}/${classad.dir}/classad.pm"/>
+    </exec>
+
+
+    <echo message="Copy config files to ${home.dir}/.condor"/>
+    <mkdir dir="${home.dir}/.condor"/>
+    <copy todir="${home.dir}/.condor" overwrite="true">
+      <fileset dir="." includes="classad.conf"/>
+      <fileset dir="." includes="condor_config"/>
+    </copy>
+
+
+  </target>  <!-- end of doDeploy -->
+
+
+
+
+
+
+
+  <!-- Mds-setup Target     -->
+  <!-- must be tun a globus -->
+  <target name="mds-setup">
+
+    <condition property="not.globus.user" value="true"> 
+       <not><equals arg1="${my.id}" arg2="globus"/></not>
+    </condition>
+
+    <condition property="is.globus.user" value="true"> 
+        <equals arg1="${my.id}" arg2="globus"/>
+    </condition>
+
+
+    <condition property="root.dir.exist">
+       <available file="${root.dir}" type="dir"/>
+    </condition>
+    <condition property="root.dir.notexist">
+       <not><equals arg1="${root.dir.exist}" arg2="true"/></not> 
+    </condition>
+
+    <condition property="root.dir.ok">
+       <and>
+          <equals arg1="${root.dir.set}" arg2="true"/>
+          <equals arg1="${root.dir.exist}" arg2="true"/>
+       </and>
+    </condition>
+
+
+    <condition property="can.mds-setup">
+       <and>
+          <equals arg1="${root.dir.ok}"      arg2="true"/>
+          <equals arg1="${is.globus.user}"   arg2="true"/>
+       </and>
+    </condition>
+
+
+    <!-- Call mds-setup subtasks -->
+
+    <antcall target="printenv" />
+
+     <!-- stuff done as globus -->
+    <antcall target="checkGlobusId"/>
+    <antcall target="checkGlobusLocation" />
+    <antcall target="checkRootDir"/>
+    <antcall target="doMdsSetup"/>
+
+  </target>
+
+
+
+
+
+  <!-- The main work for mds-setup -->
+  <target name="doMdsSetup" if="can.mds-setup">
+
+    <echo message="" />
+    <echo message="Install ${mds.reg.file} to ${mds.aggr.dir}"/>
+    <copy todir="${root.dir}/${mds.aggr.dir}" overwrite="true">
+      <fileset dir="." includes="${mds.reg.file}"/>
+    </copy>
+    <exec executable="${chown.tool}" os="Linux">
+           <arg line="globus ${root.dir}/${mds.aggr.dir}/${mds.reg.file}"/>
+    </exec>
+
+    <echo message="" />
+	<echo message="Install mds-sga and mds-sga.conf to ${root.dir}/etc and ${root.dir}/libexec"/>
+    <copy todir="${root.dir}/etc" overwrite="true">
+      <fileset dir="." includes="mds-sga.conf"/>
+    </copy>
+    <copy todir="${root.dir}/libexec" overwrite="true">
+      <fileset dir="." includes="mds-sga"/>
+    </copy>
+
+    <!-- not needed if I required to run as globus -->
+    <!-- 
+    <exec executable="${chown.tool}" os="Linux">
+           <arg line="globus ${root.dir}/etc/mds-sga ${root.dir}/etc/mds-sga.conf"/>
+    </exec>
+    -->
+
+    <echo message="Set execute mode for mds-sga"/>
+    <exec executable="${chmod.tool}" os="Linux">
+           <arg line="+x ${root.dir}/etc/mds-sga"/>
+    </exec>
+
+  </target>
+
+
+
+
+
+  <!-- Mds-init Target -->
+  <!-- Can only be run as root -->
+
+  <target name="mds-init">
+
+    <condition property="not.root.user" value="true"> 
+       <not><equals arg1="${my.id}" arg2="root"/></not>
+    </condition>
+    <condition property="is.root.user" value="true"> 
+       <equals arg1="${my.id}" arg2="root"/>
+    </condition>
+
+    <!-- Call mds-init subtasks -->
+    <antcall target="checkRootId"/>
+    <antcall target="doMdsInit"/>
+
+  </target>
+
+
+
+  <target name="checkRootId" if="not.root.user">
+    <echo>WARNING </echo>
+    <echo>       Your user ID is "${my.id}", not "root"</echo>
+    <echo>       Cannot install to ${init.dir}</echo>
+    <echo>       Become root user and rerun "ant mds-init"</echo>
+  </target>
+
+
+
+
+  <!-- mds-init work done as root -->
+  <!-- optional, if you want to install mds-sga to /etc/init.d -->
+  <target name="doMdsInit" if="is.root.user">
+
+    <echo message="Install init script mds-sga to ${init.dir}"/>
+    <mkdir dir="${init.dir}"/>
+    <copy todir="${init.dir}" overwrite="true">
+      <fileset dir="." includes="mds-sga"/>
+    </copy>
+    <echo message="Set execute flag of mds-sga "/>
+    <exec executable="${chmod.tool}" os="Linux">
+           <arg line="+x ${init.dir}/mds-sga"/>
+    </exec>
+
+  </target>  <!-- end of doMdsInit -->
+
+
+
+
+  <target name="status">
+
+    <echo message="Check status against SVN"/>
+    <echo message="  ${svn.repository}/${svn.module}"/>
+
+    <!-- See http://ant.apache.org/manual/using.html#arg -->
+    <exec executable="${svn.tool}" os="Linux">
+           <arg line="status -u"/>
+    </exec>
+ 
+  </target>
+
+
+  <target name="update">
+
+    <echo message="Updating from SVN"/>
+    <echo message="  ${svn.repository}/${svn.module}"/>
+
+    <!-- See http://ant.apache.org/manual/using.html#arg -->
+    <exec executable="${svn.tool}" os="Linux">
+           <arg line="update"/>
+    </exec>
+ 
+  </target>
+
+
+
+
+
+
+
+  <!-- Clean -->    
+  <target name="clean">
+    <delete dir="build"/>
+    <delete dir="dist"/>
+    <delete dir="${app.name}"/>
+    <delete file="${app.name}.tar.gz"/>
+    <delete file="CondorG~"/>
+    <delete file="classad-registration.xml"/>
+    <delete file="condor_config"/>
+    <delete file="mds-sga.conf"/>
+  </target>
+
+</project>

Copied: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/classad-registration.xml.template (from rev 1282, branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/classad-registration.xml.template)
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/classad-registration.xml.template	                        (rev 0)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/classad-registration.xml.template	2009-07-30 15:33:21 UTC (rev 1284)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ServiceGroupRegistrations
+    xmlns="http://mds.globus.org/servicegroup/client" 
+    xmlns:sgc="http://mds.globus.org/servicegroup/client" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing"
+    xmlns:agg="http://mds.globus.org/aggregator/types">
+
+  <defaultServiceGroupEPR>
+    <wsa:Address>https://@resourceName@:8443/wsrf/services/DefaultIndexService</wsa:Address>
+  </defaultServiceGroupEPR>
+
+  <!-- The defaultRegistrantEPR defines the grid resource that will be
+       registered, unless overridden in the ServiceGroupRegistrationParameters
+  -->
+  <defaultRegistrantEPR>
+    <wsa:Address>https://@resourceName@:8443/wsrf/services/classad</wsa:Address>
+  </defaultRegistrantEPR>
+
+<!--  <defaultSecurityDecriptorFile>some/other/sec/file.xml</defaultSecurityDecriptorFile> -->
+
+  <ServiceGroupRegistrationParameters
+      xmlns="http://mds.globus.org/servicegroup/client" >
+
+    <!-- Renew this registration every 600 seconds (10 minutes) -->
+    <RefreshIntervalSecs>600</RefreshIntervalSecs>
+    <Content xsi:type="agg:AggregatorContent"
+             xmlns:agg="http://mds.globus.org/aggregator/types">
+      <agg:AggregatorConfig xsi:type="agg:AggregatorConfig">
+        <agg:ExecutionPollType>
+
+          <!-- Run our script every 300,000 milliseconds (5 minutes) -->
+          <agg:PollIntervalMillis>300000</agg:PollIntervalMillis>
+
+          <!-- Specify our mapped ProbeName registered in the
+               $GLOBUS_LOCATION/etc/globus_wsrf_mds_index/jndi-config.xml
+               file -->
+          <agg:ProbeName>ClassAd</agg:ProbeName>
+
+        </agg:ExecutionPollType>
+      </agg:AggregatorConfig>
+      <agg:AggregatorData/>
+    </Content>
+  </ServiceGroupRegistrationParameters>
+
+</ServiceGroupRegistrations>
+

Copied: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/gavia-grid-resource.tar.gz (from rev 1282, branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/gavia-grid-resource.tar.gz)
===================================================================
(Binary files differ)

Copied: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/mds-sga (from rev 1282, branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/mds-sga)
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/mds-sga	                        (rev 0)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/mds-sga	2009-07-30 15:33:21 UTC (rev 1284)
@@ -0,0 +1,123 @@
+#!/bin/sh
+#
+# /etc/init.d/mds-sga
+#
+#  Simple script to start mds-servicegroup-add using the
+#  registration file in the $GLOBUS_LOCATION directory, 
+#  and saves its PID in $GLOBUS_LOCATION/var/mds-sga.pid
+#
+# this need to start after the globus service starts, so start priority is 30.
+# chkconfig: 2345 30 80 
+# description: Starts up mds-servicegroup-add
+
+# Source function library
+if [ -x  /etc/rc.d/init.d/functions ]; then
+    . /etc/rc.d/init.d/functions
+fi
+
+# Set up our environment variables
+if [ "x$GLOBUS_LOCATION" = "x" ] ; then
+    echo "Error: GLOBUS_LOCATION must be set."
+    exit 1;
+fi
+
+if [ "x$JAVA_HOME" = "x" ] ; then
+    echo "Error: JAVA_HOME must be set."
+    exit 1;
+fi
+PIDFILE=$GLOBUS_LOCATION/var/mds-sga.pid
+
+if [ -r $GLOBUS_LOCATION/etc/mds-sga.conf ] ; then 
+	. $GLOBUS_LOCATION/etc/mds-sga.conf
+else
+	echo "Error: $GLOBUS_LOCATION/etc/mds-sga.conf not readable. Please create an mds-sga config file and try again."
+	exit 1
+fi
+
+# Init functions.
+
+start () {
+
+  # check if mds-servicegroup-add is running
+  
+  if [ -f $PIDFILE ]; then 
+
+     PID=`cat $PIDFILE`
+     running=$(ps -p $PID &>/dev/null; echo $?)
+     if [ $running -eq 1 ]; then 
+        rm -f $PIDFILE
+      else 
+        echo "Error: mds-servicegroup-add is already running with PID" `cat $PIDFILE`
+        exit 1
+      fi
+  fi
+
+
+	# check that registration file exists
+	if [ ! -r $REGISTRATIONFILE ] ; then
+		echo "Error: $REGISTRATIONFILE does not exist! An xml registration file is needed."
+		exit 1
+	fi
+	
+	echo "Starting mds-servicegroup-add..."
+
+	${GLOBUS_LOCATION}/bin/mds-servicegroup-add -a -s https://${CONTAINERHOST}:8443/wsrf/services/DefaultIndexService $REGISTRATIONFILE > /dev/null &
+	PID=$!
+	echo "$PID" > $PIDFILE
+}
+
+stop () {
+	#check if mds-servicegroup-add is running
+	if [ -r $PIDFILE ] ; then
+		echo "Stopping mds-servicegroup-add..."
+		PID=`cat $PIDFILE`
+		kill -9 $PID
+		rm -f $PIDFILE
+	else
+		echo "Error: mds-servicegroup-add doesn't appear to be running!"
+	fi
+}
+
+restart () {
+	stop
+	start
+}
+
+status () {
+	if [ ! -r $PIDFILE ] ; then
+		echo "mds-servicegroup-add isn't running."
+		exit 0
+	fi
+
+	PID=`cat $PIDFILE 2> /dev/null`
+	ps $PID | grep "$PID" &> /dev/null
+	if [ $? -eq 0 ] ; then
+		echo "mds-servicegroup-add is running under PID $PID"
+		exit 0
+	else
+		echo "Error: mds-servicegroup-add isn't running, but the pidfile $PIDFILE exists. Please double check that mds-sga isn't running, and delete the pidfile."
+		exit 1
+	fi
+}
+
+# Standard init case structure. 
+
+case "$1" in
+        start)
+                start
+        ;;
+        stop)
+                stop
+        ;;
+        restart)
+                restart
+        ;;
+	status)
+		status
+        ;;
+
+        *)
+                echo "Usage: mds-sga {start|stop|status|restart}"
+                exit 1
+        ;;
+esac

Copied: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/mds-sga.conf.template (from rev 1282, branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/mds-sga.conf.template)
===================================================================
--- branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/mds-sga.conf.template	                        (rev 0)
+++ branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/mds-sga.conf.template	2009-07-30 15:33:21 UTC (rev 1284)
@@ -0,0 +1,5 @@
+# Configuration file for mds-sga init script
+
+CONTAINERHOST=@containerHost@
+REGISTRATIONFILE=$GLOBUS_LOCATION/etc/globus_wsrf_mds_aggregator/classad-registration.xml
+

Copied: branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/to_delete/xslTemplateFiles (from rev 1282, branches/gavia-resource-advertise_new/MetaScheduling/GridResourceAdvertise/xslTemplateFiles)



More information about the gavia-ms-commit mailing list