From 65daf90442f57ece1015865276474d713c5b900a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Fri, 27 May 2005 12:40:19 +0000 Subject: [PATCH] Disabled WS temporarily to fix build --- org.glite.lb.server/Makefile | 18 +++++++++++++++--- org.glite.lb.server/src/ws_query.c | 15 ++++++++++++--- org.glite.lb.server/src/ws_typemap.dat | 5 +++-- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index 1940be2..5613480 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -20,7 +20,7 @@ gsoap_prefix=/opt/gsoap -include Makefile.inc -GLITE_LB_SERVER_WITH_WS=yes +GLITE_LB_SERVER_WITH_WS=no ifeq ($(GLITE_LB_SERVER_WITH_WS),yes) gsoap_version=`${gsoap_prefix}/bin/soapcpp2 -version 2>&1 | cut -d' ' -f4 | perl -F\\\\. -nae '$$F[2] =~ s/\D*$$//; print $$F[2]+100*$$F[1]+10000*$$F[0]'` @@ -124,6 +124,8 @@ ifeq ($(GLITE_LB_SERVER_WITH_WS),yes) -lglite_security_gsoap_plugin_${nothrflavour} \ ${EXT_LIBS} else + BKSERVER_OBJS:= ${BKSERVER_BASE_OBJS} + BKSERVER_LIBS= \ ${SRVBONES_LIB} \ -lglite_lb_common_${nothrflavour} \ @@ -135,7 +137,7 @@ INDEX_OBJS:= index.o index_parse.o jobstat_supp.o lbs_db.o openserver.o \ jobstat.o query.o lock.o get_events.o write2rgma.o index_lex.o \ lb_authz.o store.o bkindex.o -INDEX_LIBS:= ${EXT_LIBS} ${SRVBONES_LIB} ${COMMON_LIBS} +INDEX_LIBS:= ${SRVBONES_LIB} ${COMMON_LIBS} ${EXT_LIBS} WS_CLIENT_OBJS:= $(GSOAP_FILES_PREFIX)C.o $(GSOAP_FILES_PREFIX)Client.o ws_fault.o ws_typeref.o WS_CLIENT_LIBS:= -L${stagedir}/lib \ @@ -185,8 +187,18 @@ lb_xml_parse.c: lb_xml_parse.c.T ${GSOAP_FILES_PREFIX}H.h ${GSOAP_FILES_PREFIX}C.c ${GSOAP_FILES_PREFIX}Server.c ${GSOAP_FILES_PREFIX}Client.c ${GSOAP_FILES_PREFIX}ServerLib.c ${GSOAP_FILES_PREFIX}ClientLib.c LoggingAndBookkeeping.nsmap: LB.xh ${gsoap_prefix}/bin/soapcpp2 -w -c -p ${GSOAP_FILES_PREFIX} LB.xh -LB.xh: ws_typemap.dat +# try several times -- LB.wsdl downloads BaseFault.xsd from www.ibm.com which may be failing +# not used right now but may be useful one day +# LB.xh: ws_typemap.dat +# ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}/interface/LB.wsdl || \ +# { sleep 1 ; ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}/interface/LB.wsdl; } || \ +# { sleep 4 ; ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}/interface/LB.wsdl; } || \ +# { sleep 16 ; ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}/interface/LB.wsdl; } + +LB.xh: ws_typemap.dat ${stagedir}/interface/LB.wsdl + cp ${stagedir}/interface/LBTypes.wsdl . ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}/interface/LB.wsdl + rm -f LBTypes.wsdl test.xml: test_xml ./test_xml diff --git a/org.glite.lb.server/src/ws_query.c b/org.glite.lb.server/src/ws_query.c index 8e2f4e7..1470d6a 100644 --- a/org.glite.lb.server/src/ws_query.c +++ b/org.glite.lb.server/src/ws_query.c @@ -13,6 +13,7 @@ #include "ws_typeref.h" +#if 0 int edgwll2__GetVersion( struct soap *soap, struct edgwll2__GetVersionResponse *out) @@ -21,21 +22,28 @@ int edgwll2__GetVersion( return SOAP_OK; } +#endif +/* int edgwll2__JobStatus( struct soap *soap, char *jobid, struct edgwll__JobStatFlags *flags, struct edgwll2__JobStatusResponse *out) +*/ +SOAP_FMAC5 int SOAP_FMAC6 __lb__JobStatus( + struct soap *soap, + struct _lbe__JobStatus *in, + struct _lbe__JobStatusResponse *out); { edg_wll_Context ctx = (edg_wll_Context) glite_gsplugin_get_udata(soap); edg_wlc_JobId j; edg_wll_JobStat s; - if ( edg_wlc_JobIdParse(jobid, &j) ) + if ( edg_wlc_JobIdParse(in->jobid, &j) ) { - edg_wll_SetError(ctx, EINVAL, jobid); + edg_wll_SetError(ctx, EINVAL, in->jobid); edg_wll_ErrToFault(ctx, soap); return SOAP_FAULT; } @@ -51,6 +59,7 @@ int edgwll2__JobStatus( return SOAP_OK; } +#if 0 int edgwll2__QueryJobs( struct soap *soap, struct edgwll__QueryConditions *conditions, @@ -117,7 +126,6 @@ int edgwll2__UserJobs( return SOAP_OK; } - /* int edgwll2__QueryEvents( struct soap *soap, @@ -186,3 +194,4 @@ cleanup: return ret; } */ +#endif diff --git a/org.glite.lb.server/src/ws_typemap.dat b/org.glite.lb.server/src/ws_typemap.dat index c79474a..0c3e085 100644 --- a/org.glite.lb.server/src/ws_typemap.dat +++ b/org.glite.lb.server/src/ws_typemap.dat @@ -1,2 +1,3 @@ -edgwll = http://glite.org/wsdl/types/lb -edgwll = http://glite.org/wsdl/services/lb +lb = http://glite.org/wsdl/services/lb +lbt = http://glite.org/wsdl/types/lb +lbe = http://glite.org/wsdl/elements/lb -- 1.8.2.3