Test yaim configuration:

- JPPS: libtar in /opt too, propagate the error from startup script
- JPIS: fixed strange config file loading crash

diff --git a/org.glite.jp.index/src/conf.c b/org.glite.jp.index/src/conf.c
index e52b41f..6bd91e2 100644 (file)
--- a/org.glite.jp.index/src/conf.c
+++ b/org.glite.jp.index/src/conf.c
@@ -181,6 +181,7 @@ static int read_conf(glite_jp_is_conf *conf, char *conf_file)
                 return 1;
         }
 
+       memset(&soap, 0, sizeof(soap));
        soap_init(&soap);
        soap_set_namespaces(&soap, jp__namespaces);
 

diff --git a/org.glite.jp.primary/config/functions/config_glite_jpps b/org.glite.jp.primary/config/functions/config_glite_jpps
index fc57db3..811fef5 100644 (file)
--- a/org.glite.jp.primary/config/functions/config_glite_jpps
+++ b/org.glite.jp.primary/config/functions/config_glite_jpps
@@ -7,7 +7,6 @@ function config_glite_jpps_setenv(){
   yaimgridenv_set GLITE_LOCATION ${INSTALL_ROOT:-opt}/glite
   yaimgridenv_set GLITE_LOCATION_VAR ${GLITE_LOCATION_VAR:-/var/glite}
   yaimgridenv_set GLOBUS_LOCATION ${GLOBUS_LOCATION:-/opt/globus}
-  yaimgridenv_set CARES_LOCATION ${CARES_LOCATION:-/opt/c-ares}
   yaimgridenv_set GLITE_USER ${GLITE_USER:-glite}
   yaimgridenv_set GLITE_HOST_CERT ${GLITE_USER_HOME:-/home/glite}/.certs/hostcert.pem
   yaimgridenv_set GLITE_HOST_KEY ${GLITE_USER_HOME:-/home/glite}/.certs/hostkey.pem
@@ -24,6 +23,8 @@ function config_glite_jpps_setenv(){
   yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/glite/lib  
   yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/globus/lib  
   yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/c-ares/lib
+  yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/classads/lib
+  yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/libtar/lib
 }
 
 function config_glite_jpps() {
@@ -111,6 +112,7 @@ function config_glite_jpps() {
 
   touch ${GLITE_JP_PRIMARY_PEERS}
 
+  . /opt/glite/etc/profile.d/grid-env.sh
   ${GLITE_LOCATION}/etc/init.d/glite-jp-primary stop
   ${GLITE_LOCATION}/etc/init.d/glite-jp-primary start
 

diff --git a/org.glite.jp.primary/config/startup b/org.glite.jp.primary/config/startup
index bcbfc28..e901c96 100644 (file)
--- a/org.glite.jp.primary/config/startup
+++ b/org.glite.jp.primary/config/startup
@@ -67,21 +67,25 @@ start()
        fi
 
        echo -n Starting glite-jp-primarystoraged ...
-       su - $GLITE_USER -c "LD_LIBRARY_PATH=$GLOBUS_LOCATION/lib:$GLITE_LOCATION/lib:$CARES_LOCATION/lib \
+       su - $GLITE_USER -c "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLOBUS_LOCATION/lib:$GLITE_LOCATION/lib \
                $GLITE_LOCATION/bin/glite-jp-primarystoraged \
                $GLITE_JP_DEBUG \
                -P $GLITE_LOCATION/lib/glite_lb_plugin.so -P $GLITE_LOCATION/lib/glite-jp-sandbox.so \
                $creds -a '$GLITE_JP_PRIMARY_PEERS' \
                -i '$pidfile' -p $GLITE_JP_PRIMARY_PORT $GLITE_JP_PRIMARY_SPECIAL \
                -BI,'$GLITE_JP_PRIMARY_INTERNAL' -BE,'$GLITE_JP_PRIMARY_EXTERNAL' \
-               ${GLITE_JP_PRIMARY_DBCS_OPTION} " && echo " done" || echo " FAILED"
+               ${GLITE_JP_PRIMARY_DBCS_OPTION} " && echo " done"
+       if [ $? != 0 ]; then
+               echo " FAILED"
+               return 1
+       fi
 
        echo -n Starting JP gridftp server ...
        su - $GLITE_USER -c "X509_USER_CERT=\"$X509_USER_CERT\" \
                 X509_USER_KEY=\"$X509_USER_KEY\" \
                 GLITE_USER=\"$GLITE_USER\" \
                 FTPBE_INT_PREFIX=\"$GLITE_JP_PRIMARY_INTERNAL\" \
-                LD_LIBRARY_PATH=$GLOBUS_LOCATION/lib:$GLITE_LOCATION/lib \
+                LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GLOBUS_LOCATION/lib:$GLITE_LOCATION/lib \
                FTPBE_DB_CS=$GLITE_JP_PRIMARY_DBCS \
                GSI_AUTHZ_CONF=$GLITE_JP_GSI_AUTHZ \
                $GLOBUS_LOCATION/sbin/globus-gridftp-server -debug -s -p $GLITE_JP_PRIMARY_FTP_PORT & \