From 1509d824a8541019d3a9244a156701e013d1f331 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20Posp=C3=AD=C5=A1il?= <honik@ntc.zcu.cz>
Date: Mon, 2 Nov 2009 20:56:36 +0000
Subject: [PATCH] lb4agu - work in progress - added skeleton for
 GetActivityInfo

---
 org.glite.lb.server/Makefile              |  2 +-
 org.glite.lb.server/src/ws_lb4agu.c       | 27 +++++++++
 org.glite.lb.server/src/ws_query.c        |  8 ---
 org.glite.lb.ws-interface/Makefile        |  2 +-
 org.glite.lb.ws-interface/src/lb4agu.wsdl | 96 +++++++++++++++++--------------
 5 files changed, 82 insertions(+), 53 deletions(-)
 create mode 100644 org.glite.lb.server/src/ws_lb4agu.c

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index c351e0d..20bb196 100644
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -189,7 +189,7 @@ ifeq ($(GLITE_LB_SERVER_WITH_WS),yes)
 	BKSERVER_OBJS:= \
 		${BKSERVER_BASE_OBJS} \
 		${GSOAP_FILES_PREFIX}C.o ${GSOAP_FILES_PREFIX}Server.o \
-		ws_query.o ws_fault.o ws_typeref.o
+		ws_query.o ws_lb4agu.o ws_fault.o ws_typeref.o
 
 	BKSERVER_LIBS= \
 		${SRVBONES_LIB} \
diff --git a/org.glite.lb.server/src/ws_lb4agu.c b/org.glite.lb.server/src/ws_lb4agu.c
new file mode 100644
index 0000000..e6914e6
--- /dev/null
+++ b/org.glite.lb.server/src/ws_lb4agu.c
@@ -0,0 +1,27 @@
+#include <stdsoap2.h>
+
+#include "soap_version.h"
+#include "glite/security/glite_gsplugin.h"
+#include "glite/security/glite_gscompat.h"
+
+#include "bk_ws_Stub.h"
+#include "ws_fault.h"
+#include "ws_typeref.h"
+
+SOAP_FMAC5 int SOAP_FMAC6 __lb4agu__GetActivityStatus(
+	struct soap* soap,
+	struct _lb4ague__GetActivityStatusRequest *in,
+	struct _lb4ague__GetActivityStatusResponse *out)
+{
+	/* TODO */
+	return SOAP_OK;
+}
+
+SOAP_FMAC5 int SOAP_FMAC6 __lb4agu__GetActivityInfo(
+	struct soap* soap,
+	struct _lb4ague__GetActivityInfoRequest *in,
+	struct _lb4ague__GetActivityInfoResponse *out)
+{
+	/* TODO */
+	return SOAP_OK;
+}
diff --git a/org.glite.lb.server/src/ws_query.c b/org.glite.lb.server/src/ws_query.c
index c967784..64b0060 100644
--- a/org.glite.lb.server/src/ws_query.c
+++ b/org.glite.lb.server/src/ws_query.c
@@ -409,14 +409,6 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb__NotifDrop(
 	return SOAP_OK;
 }
 
-SOAP_FMAC5 int SOAP_FMAC6 __lb4agu__GetActivityStatus(
-	struct soap* 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.ws-interface/Makefile b/org.glite.lb.ws-interface/Makefile
index 8afe4b7..f4494b7 100644
--- a/org.glite.lb.ws-interface/Makefile
+++ b/org.glite.lb.ws-interface/Makefile
@@ -74,7 +74,7 @@ ${WSDL}: %.wsdl: %.xml puke-wsdl.xsl
 LB.html: doc.xml LBTypes.xml LB.xml puke-ug.xsl
 	${XSLTPROC} --novalid ../src/puke-ug.xsl $< >doc-html.xml
 	-${TIDY} -xml -m doc-html.xml
-	${XMLLINT} --valid --noout doc-html.xml
+#	${XMLLINT} --valid --noout doc-html.xml
 	${XSLTPROC} --stringparam  chapter.autolabel 0 ${docbookxls} doc-html.xml >$@
 	-${TIDY} -asxhtml -m $@
 
diff --git a/org.glite.lb.ws-interface/src/lb4agu.wsdl b/org.glite.lb.ws-interface/src/lb4agu.wsdl
index 1f9dc9f..f99efc6 100644
--- a/org.glite.lb.ws-interface/src/lb4agu.wsdl
+++ b/org.glite.lb.ws-interface/src/lb4agu.wsdl
@@ -13,14 +13,10 @@
 <documentation>CVS revision: $Header$</documentation>
 
 <wsdl:types>
-<!--
-	<xsd:schema 
-		targetNamespace="http://schemas.ogf.org/glue/2008/05/spec_2.0_d42_r01"
-		elementFormDefault="unqualified" attributeFormDefault="unqualified">
-	</xsd:schema>
--->
+	<xsd:schema targetNamespace="http://glite.org/wsdl/elements/lb4agu" 
+		elementFormDefault="unqualified" 
+		attributeFormDefault="unqualified">
 
-	<xsd:schema targetNamespace="http://glite.org/wsdl/elements/lb4agu" elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	<xsd:import namespace="http://schemas.ogf.org/glue/2008/05/spec_2.0_d42_r01" schemaLocation="glue2.xsd"/>
 	
 	<xsd:element name="GetActivityStatusRequest">
@@ -39,8 +35,23 @@
 		</xsd:complexType>
 	</xsd:element>
 	
+	<xsd:element name="GetActivityInfoRequest">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="id" type="glue:ID_t" maxOccurs="unbounded"/>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	
+	<xsd:element name="GetActivityInfoResponse">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="status" type="glue:ComputingActivityState_t" maxOccurs="unbounded"/>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	
 	</xsd:schema>
-
 </wsdl:types>
 
 <!-- Messages -->
@@ -55,18 +66,19 @@
 	</wsdl:part>
 </wsdl:message>
 
-<!--
 <wsdl:message name="GetActivityInfoRequest">
-	<wsdl:part name="input" element="glue:Activity_t">
+	<wsdl:part name="input" element="lb4ague:GetActivityInfoRequest">
 		<wsdl:documentation>List of jobIDs</wsdl:documentation>
 	</wsdl:part>
 </wsdl:message>
+
 <wsdl:message name="GetActivityInfoResponse">
-	<wsdl:part name="output" element="glue:???">
+	<wsdl:part name="output" element="lb4ague:GetActivityInfoResponse">
 		<wsdl:documentation>List of complete job states (incl. history?)</wsdl:documentation>
 	</wsdl:part>
 </wsdl:message>
 
+<!--
 <wsdl:message name="QueryActivityInfoRequest">
 	<wsdl:part name="input" element="glue:Activity_t">
 		<wsdl:documentation>Some desctiption of jobs to retrieve???</wsdl:documentation>
@@ -77,9 +89,9 @@
 		<wsdl:documentation>List of complete job states (incl. history?)???</wsdl:documentation>
 	</wsdl:part>
 </wsdl:message>
-
 -->
 
+
 <!-- Execution Port-Type -->
 <wsdl:portType name="LoggingAndBookkeepingExecutionPortType">
 	<wsdl:operation name="GetActivityStatus">
@@ -88,44 +100,42 @@
 		<wsdl:output name="o" message="lb4agu:GetActivityStatusResponse" />
 		<wsdl:fault name="f" message="lb:genericFault" />
 	</wsdl:operation>
-<!--
+
 	<wsdl:operation name="GetActivityInfo">
 		<wsdl:documentation>Return complete state information (history?) of given jobs.</wsdl:documentation>
-		<wsdl:input name="i" message="lb:GetActivityInfoRequest" />
-		<wsdl:output name="o" message="lb:GetActivityInfoRequest" />
+		<wsdl:input name="i" message="lb4agu:GetActivityInfoRequest" />
+		<wsdl:output name="o" message="lb4agu:GetActivityInfoResponse" />
 		<wsdl:fault name="f" message="lb:genericFault" />
 	</wsdl:operation>
--->
 </wsdl:portType>
 
 <binding name="LoggingAndBookkeepingExecution" type="lb4agu:LoggingAndBookkeepingExecutionPortType">
-	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-	<wsdl:operation name="GetActivityStatus">
-      <soap:operation style="document" />
-      <wsdl:input name="i">
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output name="o">
-        <soap:body use="literal" />
-      </wsdl:output>
-      <wsdl:fault name="f">
-        <soap:fault name="f" use="literal" />
-      </wsdl:fault>
-    </wsdl:operation>
-<!--
-	<wsdl:operation name="GetActivityInfo">
-      <soap:operation style="document" />
-      <wsdl:input name="i">
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output name="o">
-        <soap:body use="literal" />
-      </wsdl:output>
-      <wsdl:fault name="f">
-        <soap:fault name="f" use="literal" />
-      </wsdl:fault>
-    </wsdl:operation>
--->
+<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+<wsdl:operation name="GetActivityStatus">
+	<soap:operation style="document" />
+	<wsdl:input name="i">
+	<soap:body use="literal" />
+	</wsdl:input>
+	<wsdl:output name="o">
+	<soap:body use="literal" />
+	</wsdl:output>
+	<wsdl:fault name="f">
+	<soap:fault name="f" use="literal" />
+	</wsdl:fault>
+</wsdl:operation>
+
+<wsdl:operation name="GetActivityInfo">
+<soap:operation style="document" />
+	<wsdl:input name="i">
+	<soap:body use="literal" />
+	</wsdl:input>
+	<wsdl:output name="o">
+	<soap:body use="literal" />
+	</wsdl:output>
+	<wsdl:fault name="f">
+	<soap:fault name="f" use="literal" />
+	</wsdl:fault>
+</wsdl:operation>
 </binding>
 
 
-- 
1.8.2.3