From 47a4d825ab43634c03f3e29bb4d664a404acdd90 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ji=C5=99=C3=AD=20Filipovi=C4=8D?= <fila@ics.muni.cz>
Date: Fri, 30 May 2008 09:21:26 +0000
Subject: [PATCH] New structure of JPIS configuration.

---
 org.glite.jp.ws-interface/src/JobProvenanceIS.xml    |  5 +----
 org.glite.jp.ws-interface/src/JobProvenanceTypes.xml | 12 ++++++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/org.glite.jp.ws-interface/src/JobProvenanceIS.xml b/org.glite.jp.ws-interface/src/JobProvenanceIS.xml
index 4ecae0e..90f61ab 100644
--- a/org.glite.jp.ws-interface/src/JobProvenanceIS.xml
+++ b/org.glite.jp.ws-interface/src/JobProvenanceIS.xml
@@ -85,15 +85,12 @@
 		<op name="ServerConfiguration">
 			Internal operation used for parsing XML config file.
 			Not called at all, only forcing gSoap to generate XML parsers.
-			<output name="attrs" type="xsd:string" list="yes">
+			<output name="attrs" type="attrType" list="yes">
                                 List of attributes which will JPPS send to JPIS.
                         </output>
                         <output name="indexedAttrs" type="xsd:string" list="yes">
                                 List of indexed attributes which will JPPS send to JPIS.
                         </output>
-			<output name="singlevalAttrs" type="xsd:string" list="yes">
-                                List of indexed single value attributes which will JPPS send to JPIS.
-                        </output>
                         <output name="plugins" type="xsd:string" optional="yes" list="yes">
                                 List of type plugins.
                         </output>
diff --git a/org.glite.jp.ws-interface/src/JobProvenanceTypes.xml b/org.glite.jp.ws-interface/src/JobProvenanceTypes.xml
index 9f4b364..c92b730 100644
--- a/org.glite.jp.ws-interface/src/JobProvenanceTypes.xml
+++ b/org.glite.jp.ws-interface/src/JobProvenanceTypes.xml
@@ -117,6 +117,18 @@
 			<elem name="value" type="stringOrBlob" optional="yes">Value to compare attribute with.</elem>
 			<elem name="value2" type="stringOrBlob" optional="yes">Value to compare attribute with.</elem>
 		</struct>
+
+		<enum name="yesNo">
+			<val name="YES" />
+			<val name="NO" />
+		</enum>
+
+		<struct name="attrType">
+			Single type of an attribute
+			<elem name="name" type="xsd:string">Name of the attribute</elem>
+			<elem name="multival" type="yesNo">Cardinality of the attribute</elem>
+			<elem name="queriable" type="yesNo">Quariable attribute (indexed)</elem>
+		</struct>
 	
 		<list name="string"/>
 	</types>
-- 
1.8.2.3