From c83f790f038bb97b79cdd40a2d01ca5a300f77fb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= <mulac@civ.zcu.cz>
Date: Thu, 15 Sep 2005 12:25:40 +0000
Subject: [PATCH] several IS admin operations added

---
 org.glite.jp.ws-interface/Makefile                 |  1 -
 org.glite.jp.ws-interface/src/JobProvenanceIS.xml  | 30 +++++++++++++++++++++-
 .../src/JobProvenanceTypes.xml                     |  9 +++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/org.glite.jp.ws-interface/Makefile b/org.glite.jp.ws-interface/Makefile
index d15da33..4bed4d2 100644
--- a/org.glite.jp.ws-interface/Makefile
+++ b/org.glite.jp.ws-interface/Makefile
@@ -19,7 +19,6 @@ XMLLINT:=xmllint
 docbookxls:=http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
 
 WSDL=JobProvenancePS.wsdl JobProvenanceIS.wsdl JobProvenanceTypes.wsdl 
-#WSDL=JobProvenancePS.wsdl JobProvenanceTypes.wsdl 
 
 all compile: ${WSDL}
 
diff --git a/org.glite.jp.ws-interface/src/JobProvenanceIS.xml b/org.glite.jp.ws-interface/src/JobProvenanceIS.xml
index 0d93e3e..5f52089 100644
--- a/org.glite.jp.ws-interface/src/JobProvenanceIS.xml
+++ b/org.glite.jp.ws-interface/src/JobProvenanceIS.xml
@@ -14,6 +14,8 @@
 	<fault name="genericFault"/>
 
 	<operations>
+
+		<!-- System operations -->
 		<op name="UpdateJobs">
 			Called by JP primary storage as a response to FeedIndex request.
 			Updates information on jobs in index server, according to what JPPS
@@ -24,7 +26,8 @@
 
 			<fault name="genericFault" type="genericFault">Any error.</fault>
 		</op>
-	
+
+		<!-- User operations -->	
 		<op name="QueryJobs">
 			User query to index server.
 			<input name="conditions" type="indexQuery" list="yes">
@@ -38,5 +41,30 @@
 			</output>
 			<fault name="genericFault" type="genericFault">Any error.</fault>
 		</op>
+
+		<!-- Admin operations -->
+		<op name="AddFeed">
+                        Called by JP index serve admin tool to ask new  primary storage server to feed it.
+                        Updates information on PS in index server, according to what JPPS
+                        currently knows.
+                        <input name="feed" type="feedSession">
+				New feed IS URL, filter and query type.
+			</input>
+                        <fault name="genericFault" type="genericFault">Any error.</fault>
+                </op>
+		<op name="GetFeedIDs">
+			Called by JP index serve admin tool to find out IS open feeds
+			<input name="feeds" type="feedSession" list="yes">
+                                List of active feeds on IS.
+                        </input>
+			<fault name="genericFault" type="genericFault">Any error.</fault>	
+		</op>
+		<op name="DeleteFeed">
+			Called by JP index serve admin tool to remove one feed session.
+			<input name="feedId" type="xsd:string">
+				ID of feed to be removed.
+			</input>
+			<fault name="genericFault" type="genericFault">Any error.</fault>
+                </op>
 	</operations>
 </service>
diff --git a/org.glite.jp.ws-interface/src/JobProvenanceTypes.xml b/org.glite.jp.ws-interface/src/JobProvenanceTypes.xml
index b396200..8e4a356 100644
--- a/org.glite.jp.ws-interface/src/JobProvenanceTypes.xml
+++ b/org.glite.jp.ws-interface/src/JobProvenanceTypes.xml
@@ -41,6 +41,15 @@
 			<elem name="value2" type="stringOrBlob" optional="yes">Another value (for op = WITHIN).</elem>
 		</struct>
 
+		<struct name="feedSession">
+			One session between IS and PS (aka feed) charactetristics.
+			<elem name="primaryServer" type="xsd:string">URL of primary server.</elem>
+			<elem name="condition" type="primaryQuery" list="yes">Filter conditions.</elem>
+			<elem name="history" type="xsd:int">Query type.</elem>
+			<elem name="continuous" type="xsd:int">Query type</elem>
+			<elem name="feedId" type="xsd:string" optional="yes">Unique ID of the feed session.</elem>
+		</struct>
+
 		<struct name="jppsFile">
 			JP primary storage file identification.
 			<elem name="class" type="xsd:string">Type of the file (as set on StartUpload).</elem>
-- 
1.8.2.3