From 473a13164d7c5242e8573c4b0627b72aee64661f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 12 Apr 2011 19:34:53 +0000 Subject: [PATCH] Move the wsdl files. --- org.glite.lb.client-java/Makefile | 2 +- org.glite.lb.server/Makefile | 4 ++-- org.glite.lb.server/src/lb_proto.c | 11 ++++++----- org.glite.lb.ws-interface/Makefile | 2 +- org.glite.lb.ws-test/Makefile | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile index 8c43ae1..e595101 100644 --- a/org.glite.lb.client-java/Makefile +++ b/org.glite.lb.client-java/Makefile @@ -71,7 +71,7 @@ build/gen: genws: build/axis build/axis: - ${JAVA} -classpath ${axis_classpath} org.apache.axis.wsdl.WSDL2Java -o build/axis ${stagedir}${prefix}/interface/LB.wsdl + ${JAVA} -classpath ${axis_classpath} org.apache.axis.wsdl.WSDL2Java -o build/axis ${stagedir}${prefix}/share/wsdl/glite-lb/LB.wsdl check: @echo "No check" diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index 57c667d..b96d5bc 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -293,8 +293,8 @@ ${GSOAP_FILES_PREFIX}H.h ${GSOAP_FILES_PREFIX}C.c ${GSOAP_FILES_PREFIX}Server.c # { sleep 4 ; ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}${prefix}/interface/LB.wsdl; } || \ # { sleep 16 ; ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ ${stagedir}${prefix}/interface/LB.wsdl; } -LB.xh: ws_typemap.dat ${stagedir}${prefix}/interface/LB.wsdl - ${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -I${stagedir}${prefix}/interface -o $@ ${stagedir}${prefix}/interface/LB.wsdl +LB.xh: ws_typemap.dat ${stagedir}${prefix}/share/wsdl/glite-lb/LB.wsdl + ${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -I${stagedir}${prefix}/share/wsdl/glite-lb -o $@ ${stagedir}${prefix}/share/wsdl/glite-lb/LB.wsdl test.xml: test_xml LD_LIBRARY_PATH=${cares_prefix}/${libdir}:${classads_prefix}/${libdir}:${LD_LIBRARY_PATH} ./test_xml diff --git a/org.glite.lb.server/src/lb_proto.c b/org.glite.lb.server/src/lb_proto.c index 39e5bb2..d76edf4 100644 --- a/org.glite.lb.server/src/lb_proto.c +++ b/org.glite.lb.server/src/lb_proto.c @@ -69,6 +69,7 @@ limitations under the License. #define KEY_APP "application/x-dglb" #define KEY_AGENT "User-Agent" +#define WSDL_PATH "share/wsdl/glite-lb" static const char* const response_headers_dglb[] = { "Cache-Control: no-cache", @@ -404,10 +405,10 @@ static char *glite_location() { if (!(location = getenv("GLITE_LB_LOCATION"))) if (!(location = getenv("GLITE_LOCATION"))) { - if (stat("/opt/glite/interfaces", &info) == 0 && S_ISDIR(info.st_mode)) + if (stat("/opt/glite/" WSDL_PATH, &info) == 0 && S_ISDIR(info.st_mode)) location = "/opt/glite"; else - if (stat("/usr/interfaces", &info) == 0 && S_ISDIR(info.st_mode)) + if (stat("/usr/" WSDL_PATH, &info) == 0 && S_ISDIR(info.st_mode)) location = "/usr"; } @@ -820,21 +821,21 @@ edg_wll_ErrorCode edg_wll_Proto(edg_wll_Context ctx, #define WSDL_LB4AGU "lb4agu.wsdl" } else if (strncmp(requestPTR, "/?wsdl", strlen("/?wsdl")) == 0) { char *filename; - asprintf(&filename, "%s/interface/%s", glite_location(), WSDL_LB); + asprintf(&filename, "%s/" WSDL_PATH "/%s", glite_location(), WSDL_LB); if (edg_wll_WSDLOutput(ctx, &message, filename)) ret = HTTP_INTERNAL; free(filename); /* GET /?types */ } else if (strncmp(requestPTR, "/?types", strlen("/?types")) == 0) { char *filename; - asprintf(&filename, "%s/interface/%s", glite_location(), WSDL_LBTYPES); + asprintf(&filename, "%s/" WSDL_PATH "/%s", glite_location(), WSDL_LBTYPES); if (edg_wll_WSDLOutput(ctx, &message, filename)) ret = HTTP_INTERNAL; free(filename); /* GET /?agu */ } else if (strncmp(requestPTR, "/?agu", strlen("/?agu")) == 0) { char *filename; - asprintf(&filename, "%s/interface/%s", glite_location(), WSDL_LB4AGU); + asprintf(&filename, "%s/" WSDL_PATH "/%s", glite_location(), WSDL_LB4AGU); if (edg_wll_WSDLOutput(ctx, &message, filename)) ret = HTTP_INTERNAL; free(filename); diff --git a/org.glite.lb.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile index 4dd4539..dee026f 100644 --- a/org.glite.lb.ws-interface/Makefile +++ b/org.glite.lb.ws-interface/Makefile @@ -25,7 +25,7 @@ XMLLINT:=xmllint --nonet TIDY=tidy -i -q --show-warnings no --tidy-mark no --wrap 0 docbookxls:=http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl -STAGETO=interface +STAGETO=share/wsdl/glite-lb WSDL=LB.wsdl LBTypes.wsdl diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile index 689b39b..05596e4 100644 --- a/org.glite.lb.ws-test/Makefile +++ b/org.glite.lb.ws-test/Makefile @@ -87,8 +87,8 @@ clean: rm -rvf .libs LB.xh *.xml ${GSOAP_FILES_PREFIX}* *.o *.lo *.nsmap soap_version.h ${CEXAMPLES} ${TESTS} rm -rvf log.xml rpmbuild/ RPMS/ tgz/ debian/ -LB.xh: ws_typemap.dat ${stagedir}${prefix}/interface/LB.wsdl - ${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/examples/ws_typemap.dat -I${stagedir}${prefix}/interface -o $@ ${stagedir}${prefix}/interface/LB.wsdl +LB.xh: ws_typemap.dat ${stagedir}${prefix}/share/wsdl/glite-lb/LB.wsdl + ${gsoap_bin_prefix}/wsdl2h -c -t ${top_srcdir}/examples/ws_typemap.dat -I${stagedir}${prefix}/share/wsdl/glite-lb -o $@ ${stagedir}${prefix}/share/wsdl/glite-lb/LB.wsdl soap_version.h: ${gsoap_bin_prefix}/soapcpp2 /dev/null -- 1.8.2.3