From 1eaa7af3827ddad125f713b696b3eb559c952c5a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= Date: Fri, 30 Oct 2009 15:13:06 +0000 Subject: [PATCH] WSDL massaging towards glue2 compatible interface - upto empty skeleton of GetActivityStatus --- org.glite.lb.server/src/ws_query.c | 9 + org.glite.lb.server/src/ws_typemap.dat | 4 + org.glite.lb.ws-interface/Makefile | 8 +- org.glite.lb.ws-interface/src/LB.xml | 1 + org.glite.lb.ws-interface/src/glue2.xsd | 1371 ++++++++++++++++++++++++++ org.glite.lb.ws-interface/src/lb4agu.wsdl | 60 +- org.glite.lb.ws-interface/src/puke-wsdl.xsl | 5 + org.glite.lb.ws-test/Makefile | 7 +- org.glite.lb.ws-test/examples/ws_typemap.dat | 4 + 9 files changed, 1456 insertions(+), 13 deletions(-) create mode 100644 org.glite.lb.ws-interface/src/glue2.xsd diff --git a/org.glite.lb.server/src/ws_query.c b/org.glite.lb.server/src/ws_query.c index 7a4066c..478f7b4 100644 --- a/org.glite.lb.server/src/ws_query.c +++ b/org.glite.lb.server/src/ws_query.c @@ -409,6 +409,15 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb__NotifDrop( return SOAP_OK; } +SOAP_FMAC5 int SOAP_FMAC6 __lb4agu__GetActivityStatus( + struct soap*, + struct _lb4ague__GetActivityStatusRequest *in, + struct _lb4ague__GetActivityStatusResponse *out) +{ + /* TODO */ + return SOAP_OK; +} + static void freeQueryRecsExt(edg_wll_QueryRec **qr) { int i, j; diff --git a/org.glite.lb.server/src/ws_typemap.dat b/org.glite.lb.server/src/ws_typemap.dat index 0c3e085..c0ce9338 100644 --- a/org.glite.lb.server/src/ws_typemap.dat +++ b/org.glite.lb.server/src/ws_typemap.dat @@ -1,3 +1,7 @@ lb = http://glite.org/wsdl/services/lb lbt = http://glite.org/wsdl/types/lb lbe = http://glite.org/wsdl/elements/lb +lb4ague = http://glite.org/wsdl/elements/lb4agu +lb4agu = http://glite.org/wsdl/services/lb4agu +glue = http://schemas.ogf.org/glue/2008/05/spec_2.0_d42_r01 + diff --git a/org.glite.lb.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile index 9515714..774ef90 100644 --- a/org.glite.lb.ws-interface/Makefile +++ b/org.glite.lb.ws-interface/Makefile @@ -27,7 +27,7 @@ STAGETO=interface WSDL=LB.wsdl LBTypes.wsdl -all compile: ${WSDL} ${doc} +all compile: ${WSDL} ${doc} glue2.xsd check: @echo No unit test required for interface-only module. @@ -35,6 +35,9 @@ check: stage: compile $(MAKE) install PREFIX=${stagedir} DOSTAGE=yes +glue2.xsd: + wget -O glue2.xsd http://schemas.ogf.org/glue/2008/05/spec_2.0_d42_r01 || cp ${top_srcdir}/src/glue2.xsd . + install: -mkdir -p ${PREFIX}/${STAGETO} -mkdir -p ${PREFIX}/share/doc/${package}-${version}/examples @@ -43,7 +46,8 @@ install: -test -f LB.html && install -m 644 LB.html ${PREFIX}/share/doc/${package}-${version} # install the generated stuff instead # cd ${top_srcdir}/interface && install -m 644 ${WSDL} ${PREFIX}/${STAGETO} - install -m 644 ${WSDL} ${PREFIX}/${STAGETO} + install -m 644 ${WSDL} glue2.xsd ${PREFIX}/${STAGETO} + install -m 644 ${top_srcdir}/src/lb4agu.wsdl ${PREFIX}/${STAGETO} # JP has its own version anyway # if [ x${DOSTAGE} = xyes ]; then \ diff --git a/org.glite.lb.ws-interface/src/LB.xml b/org.glite.lb.ws-interface/src/LB.xml index bb293db..780c687 100644 --- a/org.glite.lb.ws-interface/src/LB.xml +++ b/org.glite.lb.ws-interface/src/LB.xml @@ -30,6 +30,7 @@ + diff --git a/org.glite.lb.ws-interface/src/glue2.xsd b/org.glite.lb.ws-interface/src/glue2.xsd new file mode 100644 index 0000000..f6f50ee --- /dev/null +++ b/org.glite.lb.ws-interface/src/glue2.xsd @@ -0,0 +1,1371 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + general + usersupport + sysadmin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + basic + gacl + + + + + + + + + + + + webservice + jndi + legacy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.glite.lb.ws-interface/src/lb4agu.wsdl b/org.glite.lb.ws-interface/src/lb4agu.wsdl index ffb9c12..1f9dc9f 100644 --- a/org.glite.lb.ws-interface/src/lb4agu.wsdl +++ b/org.glite.lb.ws-interface/src/lb4agu.wsdl @@ -1,28 +1,61 @@ - + + name="LoggingAndBookkeeping" + targetNamespace="http://glite.org/wsdl/services/lb4agu"> CVS revision: $Header$ + + + + + + + + + + + + + + + + + + + + + + + + + - + List of jobIDs - + List of job states + Return states of given jobs. - - + + + - + + @@ -75,6 +112,7 @@ + + + diff --git a/org.glite.lb.ws-interface/src/puke-wsdl.xsl b/org.glite.lb.ws-interface/src/puke-wsdl.xsl index a36aa49..b6fb16f 100644 --- a/org.glite.lb.ws-interface/src/puke-wsdl.xsl +++ b/org.glite.lb.ws-interface/src/puke-wsdl.xsl @@ -8,6 +8,7 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:lb="http://glite.org/wsdl/services/lb" + xmlns:lb4agu="http://glite.org/wsdl/services/lb4agu" xmlns:lbe="http://glite.org/wsdl/elements/lb" xmlns:lbt="http://glite.org/wsdl/types/lb"> @@ -282,6 +283,10 @@ + + + + diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile index 3f70817..7b2b5a7 100644 --- a/org.glite.lb.ws-test/Makefile +++ b/org.glite.lb.ws-test/Makefile @@ -36,7 +36,10 @@ INSTALL:=libtool --mode=install install GSOAP_FILES_PREFIX:= bk_ws_ dotless_gsoap_ver:=${shell echo ${gsoap_default_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} WS_CLIENT_OBJS:= $(GSOAP_FILES_PREFIX)C.o $(GSOAP_FILES_PREFIX)Client.o ws_fault.o # ws_typeref.o @@ -76,6 +79,6 @@ LB.xh: ws_typemap.dat ${stagedir}/interface/LB.wsdl soap_version.h: ${gsoap_bin_prefix}/soapcpp2 /dev/null - perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+)([a-z]).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_VERSION_LETTER '\''$$4'\''\n",$$1,$$2,$$3' soapH.h >$@ + perl -ne '$$. == 2 && /.*([0-9]+)\.([0-9]+)\.([0-9]+)([a-z]?).*/ && printf "#define GSOAP_VERSION %d%02d%02d\n#define GSOAP_VERSION_LETTER '\''".($$4?$$4:"\\0")."'\''\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.lb.ws-test/examples/ws_typemap.dat b/org.glite.lb.ws-test/examples/ws_typemap.dat index 0c3e085..c0ce9338 100644 --- a/org.glite.lb.ws-test/examples/ws_typemap.dat +++ b/org.glite.lb.ws-test/examples/ws_typemap.dat @@ -1,3 +1,7 @@ lb = http://glite.org/wsdl/services/lb lbt = http://glite.org/wsdl/types/lb lbe = http://glite.org/wsdl/elements/lb +lb4ague = http://glite.org/wsdl/elements/lb4agu +lb4agu = http://glite.org/wsdl/services/lb4agu +glue = http://schemas.ogf.org/glue/2008/05/spec_2.0_d42_r01 + -- 1.8.2.3