GLITE_LOCATION_VAR the same during configuration-time and run-time in YAIM.

Get rid off dependency of lb-plugin on lb.client.

diff --git a/org.glite.jp.index/config/functions/config_glite_jpis b/org.glite.jp.index/config/functions/config_glite_jpis
index d88af86..9778397 100644 (file)
--- a/org.glite.jp.index/config/functions/config_glite_jpis
+++ b/org.glite.jp.index/config/functions/config_glite_jpis
@@ -99,6 +99,7 @@ function config_glite_jpis() {
     yaimlog "Database jpis already exists"
   fi
 
+  . /opt/glite/etc/profile.d/grid-env.sh
   GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-/var/glite}
   mkdir -p $GLITE_LOCATION_VAR   # Needed to store PID of JP IS server 
 
@@ -128,7 +129,6 @@ function config_glite_jpis() {
     echo "${GLITE_LOCATION}/etc/init.d/glite-jp-indexd" >> ${GLITE_LOCATION}/etc/gLiteservices
   fi
 
-  . /opt/glite/etc/profile.d/grid-env.sh
   ${GLITE_LOCATION}/etc/init.d/glite-jp-indexd stop
   ${GLITE_LOCATION}/etc/init.d/glite-jp-indexd start
 

diff --git a/org.glite.jp.primary/config/functions/config_glite_jpps b/org.glite.jp.primary/config/functions/config_glite_jpps
index af486ca..a0e174d 100644 (file)
--- a/org.glite.jp.primary/config/functions/config_glite_jpps
+++ b/org.glite.jp.primary/config/functions/config_glite_jpps
@@ -71,6 +71,7 @@ function config_glite_jpps() {
     yaimlog "Database jpps already exists"
   fi
 
+  . /opt/glite/etc/profile.d/grid-env.sh
   GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-/var/glite}
   mkdir -p $GLITE_LOCATION_VAR   # Needed to store PID of JPPS 
 
@@ -102,7 +103,6 @@ function config_glite_jpps() {
 
   touch ${GLITE_LOCATION}/etc/JPPS-peers
 
-  . /opt/glite/etc/profile.d/grid-env.sh
   ${GLITE_LOCATION}/etc/init.d/glite-jp-primary stop
   bash -x ${GLITE_LOCATION}/etc/init.d/glite-jp-primary start
 

diff --git a/org.glite.lb.state-machine/src/lb_plugin.c b/org.glite.lb.state-machine/src/lb_plugin.c
index b554452..dd0a634 100644 (file)
--- a/org.glite.lb.state-machine/src/lb_plugin.c
+++ b/org.glite.lb.state-machine/src/lb_plugin.c
@@ -16,7 +16,6 @@
 
 #include "glite/lb/jobstat.h"
 #include "glite/lb/events.h"
-#include "glite/lb/producer.h"
 #include "glite/lb/events_parse.h"