Update LB and JP components due to merge and gsoap 2.7.10.

Fix >=2.7.9 compatibility in jpimporter.

diff --git a/org.glite.jp.client/Makefile b/org.glite.jp.client/Makefile
index 45d1a16..9961e83 100644 (file)
--- a/org.glite.jp.client/Makefile
+++ b/org.glite.jp.client/Makefile
@@ -67,7 +67,10 @@ 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 . }
-GSOAPLIB:=-lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour} 
+ifeq ($(shell test -f ${stagedir}/lib/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.so && echo ok),ok)
+       langflavour:=_c
+endif
+GSOAPLIB:=-lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour}
 
 LBMAILDIRLIB:=-lglite_lbu_maildir
 
@@ -118,7 +121,7 @@ ${OBJS}: ${wsprefix}H.h soap_version.h
 
 soap_version.h:
        ${gsoap_bin_prefix}/soapcpp2 /dev/null
-       perl -ne '$$. == 2 && /.*([0-9])\.([0-9])\.([0-9]).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n",$$1,$$2,$$3' soapH.h >$@
+       perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n",$$1,$$2,$$3' soapH.h >$@
        -rm soapC.cpp soapH.h soapStub.h soapClient.cpp soapServer.cpp soapClientLib.cpp soapServerLib.cpp
 
 

diff --git a/org.glite.jp.client/src/jpimporter.c b/org.glite.jp.client/src/jpimporter.c
index 18a3045..bdb60fd 100644 (file)
--- a/org.glite.jp.client/src/jpimporter.c
+++ b/org.glite.jp.client/src/jpimporter.c
@@ -614,8 +614,9 @@ static int dump_importer(void)
                                memset(&gja_in, 0, sizeof gja_in);
                                memset(&gja_out, 0, sizeof gja_out);
                                gja_in.jobid = su_in.job;
-                               GLITE_SECURITY_GSOAP_LIST_CREATE(soap, &gja_in, attributes, struct _jpelem__GetJobAttributes, 1);
-                               GLITE_SECURITY_GSOAP_LIST_GET(gja_in.attributes, 0) = GLITE_JP_ATTR_REGTIME;
+                               gja_in.attributes = soap_malloc(soap, sizeof(char *));
+                               gja_in.__sizeattributes = 1;
+                               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);
                                /* no error ==> some application fault from JP */
@@ -629,7 +630,6 @@ static int dump_importer(void)
                                        ret = check_soap_fault(soap, ret);
                                        break;
                                }
-                               GLITE_SECURITY_GSOAP_LIST_GET(gja_in.attributes, 0) = NULL;
                                /* "job not found" error ==> register job */
                                refresh_connection(soap);
                                rj_in.job = su_in.job;

diff --git a/org.glite.jp.index/Makefile b/org.glite.jp.index/Makefile
index 38c1821..ae71296 100644 (file)
--- a/org.glite.jp.index/Makefile
+++ b/org.glite.jp.index/Makefile
@@ -27,8 +27,11 @@ CPPFLAGS:=-DDEBUG -D_GNU_SOURCE -I. -I${top_srcdir}/interface -I${top_srcdir}/sr
 CFLAGS:=${DEBUG} ${CFLAGS}
 LDFLAGS:=-L${stagedir}/lib
 
-dotless_soap_ver:=${shell echo ${gsoap_version} | tr -d . }
-GSOAPLIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_soap_ver}_${nothrflavour}
+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)
+       langflavour:=_c
+endif
+GSOAPLIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour}
 
 gsoap_bin_prefix:=${shell if [ -x  ${gsoap_prefix}/bin/soapcpp2 ]; then echo ${gsoap_prefix}/bin; else echo ${gsoap_prefix}; fi }
 

diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile
index b0f0bf6..7ce8e87 100644 (file)
--- a/org.glite.jp.primary/Makefile
+++ b/org.glite.jp.primary/Makefile
@@ -84,11 +84,14 @@ OBJS:=${SRCS:.c=.o}
 TEST_OBJS:=${TEST_SRCS:.c=.o}
 DAG_OBJS:=${DAG_SRCS:.c=.o}
 
-dotless_soap_ver:=${shell echo ${gsoap_version} | tr -d . }
+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)
+       langflavour:=_c
+endif
 COMMONLIB:=-lglite_jp_common_${nothrflavour}
 SRVCOMMONLIB:=-lglite_jp_server_common
 BONESLIB:=-lglite_lbu_server_bones
-GSOAPLIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_soap_ver}_${nothrflavour} 
+GSOAPLIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour}
 TRIOLIB:=-lglite_lbu_trio
 LIBTARLIB:=-L${libtar_prefix}/lib -ltar
 GSSLIB:=-lglite_security_gss_${nothrflavour}

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 37cd1a3..15976af 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -166,7 +166,10 @@ BKSERVER_BASE_OBJS:= \
        notification.o il_notification.o notif_match.o stats.o db_calls.o db_supp.o
 
 dotless_gsoap_ver:=${shell echo ${gsoap_version} | tr -d . }
-GSOAP_LIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}
+ifeq ($(shell test -f ${stagedir}/lib/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.so && echo ok),ok)
+       langflavour:=_c
+endif
+GSOAP_LIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour}
 
 ifeq ($(GLITE_LB_SERVER_WITH_WS),yes)
        BKSERVER_OBJS:= \
@@ -374,7 +377,7 @@ ifdef LB_PERF
 endif
 
 clean:
-       rm -rvf *.c *.h *.ch *.xh *.xml *.nsmap *.o *.lo .libs glite-lb-* ${STATIC_LIB_BK} test* ${MAN_GZ}
+       rm -rvf *.c *.h *.ch *.xh *.xml *.nsmap *.o *.lo .libs glite-lb-* ${STATIC_LIB_BK} ${LCAS_PLUGIN_LIB} test* ${MAN_GZ}
        rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/
 
 %.c: %.c.T