Combine JP from HEAD with LB from branch.

diff --git a/org.glite.jp.client/Makefile b/org.glite.jp.client/Makefile
index 9961e83..14a952f 100644 (file)
--- a/org.glite.jp.client/Makefile
+++ b/org.glite.jp.client/Makefile
@@ -67,10 +67,11 @@ OBJS:=${SRCS:.c=.o}
 
 gsoap_bin_prefix:=${shell if [ -x  ${gsoap_prefix}/bin/soapcpp2 ]; then echo ${gsoap_prefix}/bin; else echo ${gsoap_prefix}; fi }
 dotless_gsoap_ver:=${shell echo ${gsoap_version} | tr -d . }
-ifeq ($(shell test -f ${stagedir}/lib/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.so && echo ok),ok)
+ifeq ($(shell test -f ${stagedir}/lib/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.la && echo ok),ok)
        langflavour:=_c
 endif
-GSOAPLIB:=-lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour}
+# static linking for LB/JP compatibility from different glite releases
+GSOAPLIB:=-lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour} -static
 
 LBMAILDIRLIB:=-lglite_lbu_maildir
 

diff --git a/org.glite.jp.client/config/startup b/org.glite.jp.client/config/startup
index d4b3405..036fbd8 100755 (executable)
--- a/org.glite.jp.client/config/startup
+++ b/org.glite.jp.client/config/startup
@@ -38,7 +38,7 @@ start()
 
        [ -z "$GLITE_LB_EXPORT_JPREG_MAILDIR" ] && GLITE_LB_EXPORT_JPREG_MAILDIR=$GLITE_LOCATION_VAR/jpreg
        jpreg_maildir="--reg-mdir $GLITE_LB_EXPORT_JPREG_MAILDIR "
-       [ -d "$GLITE_LB_EXPORT_JPREG_MAILDIR" ] || mkdir -p "$GLITE_LB_EXPORT_JPREG_MAILDIR" && chown $GLITE_USER:$GLITE_GROUP "$GLITE_LB_EXPORT_JPREG_MAILDIR"
+       [ -d "$GLITE_LB_EXPORT_JPREG_MAILDIR" ] || mkdir -p "$GLITE_LB_EXPORT_JPREG_MAILDIR" && chown $GLITE_USER:$GLITE_GROUP -R "$GLITE_LB_EXPORT_JPREG_MAILDIR"
        [ -z "$GLITE_LB_EXPORT_JPDUMP_MAILDIR" ] && GLITE_LB_EXPORT_JPDUMP_MAILDIR=$GLITE_LOCATION_VAR/jpdump
        jpdump_maildir="--dump-mdir $GLITE_LB_EXPORT_JPDUMP_MAILDIR "
        [ -d "$GLITE_LB_EXPORT_JPDUMP_MAILDIR" ] || mkdir -p "$GLITE_LB_EXPORT_JPDUMP_MAILDIR" && chown $GLITE_USER:$GLITE_GROUP "$GLITE_LB_EXPORT_JPDUMP_MAILDIR"

diff --git a/org.glite.jp.client/src/jpimporter.c b/org.glite.jp.client/src/jpimporter.c
index bdb60fd..8018aea 100644 (file)
--- a/org.glite.jp.client/src/jpimporter.c
+++ b/org.glite.jp.client/src/jpimporter.c
@@ -619,6 +619,7 @@ static int dump_importer(void)
                                gja_in.attributes[0] = GLITE_JP_ATTR_REGTIME;
                                ret = soap_call___jpsrv__GetJobAttributes(soap, jpps, "", &gja_in, &gja_out);
                                jperrno = glite_jp_clientGetErrno(soap, ret);
+                               gja_in.attributes[0] = NULL;
                                /* no error ==> some application fault from JP */
                                if (jperrno == 0) {
                                        dprintf("[%s] Dump failed when job %s exists\n", name, su_in.job);