From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Thu, 29 Sep 2005 17:14:38 +0000 (+0000)
Subject: static jpps specific gsoap functions
X-Git-Tag: gridsite-core_R_1_1_12~75
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=6e9997cf2245f7f5b6e0744b7b108ef343259c92;p=jra1mw.git

static jpps specific gsoap functions
---

diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile
index f9e6cd3..7a2fb0f 100644
--- a/org.glite.jp.primary/Makefile
+++ b/org.glite.jp.primary/Makefile
@@ -56,9 +56,10 @@ SRCS:= bones_server.c soap_ops.c \
 	new_ftp_backend.c mysql.c file_plugin.c \
 	feed.c authz.c attrs.c\
 	is_client.c \
-	${ps_prefix}ServerLib.c \
-	${is_prefix}ClientLib.c jpps_C.c
-#	env_C.c
+	env_C.c
+
+#	${ps_prefix}ServerLib.c \
+#	${is_prefix}ClientLib.c jpps_C.c
 
 EXA_SRCS:=jpps-test.c ${ps_prefix}C.c ${ps_prefix}Client.c
 
@@ -112,9 +113,6 @@ ${is_prefix}C.c ${is_prefix}H.h: JobProvenanceIS.xh
 
 env_C.c env_Server.c:
 	touch env.xh
-	cp  ${jpproject}/JobProvenanceTypes.wsdl .
-	${gsoap_prefix}/bin/wsdl2h  -t ${top_srcdir}/src/typemap.dat -c -o env.xh JobProvenanceTypes.wsdl
-	rm -f JobProvenanceTypes.wsdl
 	${gsoap_prefix}/bin/soapcpp2 -w -c -p env_ env.xh
 
 #$(SOAP_PREFIX)H.h $(SOAP_PREFIX)C.c: LB.xh
diff --git a/org.glite.jp.primary/src/soap_ops.c b/org.glite.jp.primary/src/soap_ops.c
index a2f7986..909b27f 100644
--- a/org.glite.jp.primary/src/soap_ops.c
+++ b/org.glite.jp.primary/src/soap_ops.c
@@ -10,15 +10,14 @@
 #include "feed.h"
 #include "attrs.h"
 
-#include "jpps_H.h"
-/* #include "JobProvenancePS.nsmap" */
-#include "jpps_.nsmap" 
-
 #include "jptype_map.h"
 
 #include "file_plugin.h"
 #include "builtin_plugins.h"
 
+#include "jpps_ServerLib.c"
+#include "jpps_.nsmap"
+
 static struct jptype__genericFault *jp2s_error(struct soap *soap,
 		const glite_jp_error_t *err)
 {