From 100056ba4579dd889776a6d666ec5b7323798050 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Wed, 13 Aug 2008 16:03:07 +0000
Subject: [PATCH] Update JPIS config file examples (queryable and multivalue
 elements are mandatory).

---
 org.glite.jp.index/config/glite-jpis-config.xml    | 501 ++++++++++++++++++---
 .../config/glite-jpis-test-config.xml              | 108 ++++-
 org.glite.lb.state-machine/Makefile                |   5 +-
 org.glite.lb.state-machine/src/jpis_config.xsl     |  15 +-
 4 files changed, 531 insertions(+), 98 deletions(-)

diff --git a/org.glite.jp.index/config/glite-jpis-config.xml b/org.glite.jp.index/config/glite-jpis-config.xml
index e5ed4af..4c679f5 100644
--- a/org.glite.jp.index/config/glite-jpis-config.xml
+++ b/org.glite.jp.index/config/glite-jpis-config.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated using org.glite.lb.state-machine module -->
+
 <jpelem:ServerConfiguration
 	xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
 	xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
@@ -13,145 +16,498 @@
 	<!--
 	<attrs><name>http://egee.cesnet.cz/en/Schema/JP/System:jobId</name></attrs>
 	<attrs><name>http://egee.cesnet.cz/en/Schema/JP/System:owner</name></attrs>
+	<attrs><name>http://egee.cesnet.cz/en/Schema/JP/System:regtime</name></attrs>
 	-->
 	<!-- Job status -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:status</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:status</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Id of the job -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:jobId</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:jobId</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Job owner -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:owner</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:owner</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Type of job -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:jobtype</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:jobtype</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- parent job of subjob -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:parentJob</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:parentJob</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- string used for generation of subjob IDs -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:seed</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:seed</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- number of subjobs -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:childrenNum</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:childrenNum</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- list of subjob IDs -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:children</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:children</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- summary (histogram) of children job states -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:childrenHist</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:childrenHist</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- full status information of the children -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:childrenStates</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:childrenStates</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Id within Condor-G -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorId</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorId</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Globus allocated Id -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:globusId</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:globusId</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Id within LRMS -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:localId</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:localId</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- User submitted job description -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:jdl</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:jdl</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Full job description after matchmaking -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:matchedJdl</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:matchedJdl</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- ID of CE where the job is being sent -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:destination</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:destination</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- ClassAd passed to Condor-G for last job execution -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorJdl</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorJdl</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Job RSL sent to Globus -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:rsl</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:rsl</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Reason of being in this status, if any -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:reason</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:reason</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Where the job is being processed -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:location</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:location</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Worker node where the job is executed -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:ceNode</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:ceNode</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Network server handling the job -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:networkServer</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:networkServer</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Subjob failed (the parent job will fail too) -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:subjobFailed</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:subjobFailed</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Return code -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:doneCode</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:doneCode</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Unix exit code -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:exitCode</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:exitCode</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- The job was resubmitted -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:resubmitted</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:resubmitted</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Cancellation request in progress -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:cancelling</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:cancelling</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Reason of cancel -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:cancelReason</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:cancelReason</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Consumed CPU time -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:cpuTime</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:cpuTime</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- List of pairs (user_tag, user_value) -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:userTags</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:userTags</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- When entered this status -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:stateEnterTime</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:stateEnterTime</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Last known event of the job -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:lastUpdateTime</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:lastUpdateTime</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- When all previous states were entered -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:stateEnterTimes</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:stateEnterTimes</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Some logged information has not arrived yet -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:expectUpdate</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:expectUpdate</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Sources of the missing information -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:expectFrom</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:expectFrom</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- ACL of the job -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:acl</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:acl</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- User payload started -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:payloadRunning</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:payloadRunning</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Possible job destinations -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:possibleDestinations</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:possibleDestinations</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- CE nodes matching to possible_destinations -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:possibleCeNodes</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:possibleCeNodes</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Job is suspended -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:suspended</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:suspended</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Reason for the suspend -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:suspendReason</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:suspendReason</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Concatenated job failure reasons, possibly from deeper middleware layers -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:failureReasons</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:failureReasons</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Job reached final status and may be removed from proxy -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:removeFromProxy</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:removeFromProxy</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Hostname or address of UI used to submit the job -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:uiHost</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:uiHost</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- FQAN used to register the job -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:userFqans</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:userFqans</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
+	<!-- Flag is set on incomming Clear event -->
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:sandboxRetrieved</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Job state which would probably return PBS qstat (Q/R/C/....) -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsState</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsState</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Name of queue in which is job queued -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsQueue</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsQueue</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Owner of job -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsOwner</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsOwner</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Name of job -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsName</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsName</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Glued reasons/errors leading to pending events -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsReason</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsReason</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Name of pbs scheduler -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsScheduler</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsScheduler</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Hostname of node where job is running -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsDestHost</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsDestHost</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- PID of running job -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsPid</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsPid</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Glued resource usage -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsResourceUsage</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsResourceUsage</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Job exit status -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsExitStatus</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsExitStatus</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Glued error descriptions from error events -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsErrorDesc</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:pbsErrorDesc</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Condor job status  -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorStatus</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorStatus</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Condor job Universe (in job ClassAds) -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorUniverse</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorUniverse</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Job owner -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorOwner</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorOwner</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Job preempting -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorPreempting</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorPreempting</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- PID of Shadow -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorShadowPid</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorShadowPid</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Condor shadow exit status (see h/exit.h) -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorShadowExitStatus</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorShadowExitStatus</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- PID of Starter -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorStarterPid</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorStarterPid</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Condor starter exit status -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorStarterExitStatus</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorStarterExitStatus</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- PID of running job -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorJobPid</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorJobPid</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Job exit status -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorJobExitStatus</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorJobExitStatus</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Hostname of node where job is running -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorDestHost</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorDestHost</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Glued reasons/errors leading to pending events -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorReason</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorReason</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 	<!-- Glued error descriptions from error events -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorErrorDesc</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:condorErrorDesc</name>
+		<multival>YES</multival>
+		<queryable>YES</queryable>
+	</attrs>
+
 
 
 <!-- List of attributes IS will index -->
@@ -159,10 +515,9 @@
 	<!--<indexedAttrs>http://egee.cesnet.cz/en/Schema/JP/System:owner</indexedAttrs>-->
 	<!-- internal attribute (index replacement) -->
 	<!--<indexedAttrs>http://egee.cesnet.cz/en/Schema/JP/System:jobId</indexedAttrs>-->
-	<indexedAttrs>http://egee.cesnet.cz/en/Schema/LB/Attributes:user</indexedAttrs>
-	<indexedAttrs>http://egee.cesnet.cz/en/Schema/LB/Attributes:CE</indexedAttrs>
-	<indexedAttrs>http://egee.cesnet.cz/en/Schema/LB/Attributes:VO</indexedAttrs>
-	<indexedAttrs>http://egee.cesnet.cz/en/Schema/LB/Attributes:finalStatus</indexedAttrs>
+	<indexedAttrs>http://egee.cesnet.cz/en/Schema/LB/Attributes:owner</indexedAttrs>
+	<indexedAttrs>http://egee.cesnet.cz/en/Schema/LB/Attributes:ceNode</indexedAttrs>
+	<indexedAttrs>http://egee.cesnet.cz/en/Schema/LB/Attributes:status</indexedAttrs>
 
 <!-- List of type plugins -->
 	<plugins></plugins>
diff --git a/org.glite.jp.index/config/glite-jpis-test-config.xml b/org.glite.jp.index/config/glite-jpis-test-config.xml
index c860037..c5a4d78 100644
--- a/org.glite.jp.index/config/glite-jpis-test-config.xml
+++ b/org.glite.jp.index/config/glite-jpis-test-config.xml
@@ -2,24 +2,96 @@
 <jpelem:ServerConfiguration xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jptype="http://glite.org/wsdl/types/jp" xmlns:jpsrv="http://glite.org/wsdl/services/jp" xmlns:jpelem="http://glite.org/wsdl/elements/jp">
 	
 	<!-- List of attributes IS want to receive from PS's -->
-	<attrs><name>http://egee.cesnet.cz/en/Schema/JP/System:owner</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/JP/System:jobId</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/JP/System:regtime</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:user</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:aTag</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:eNodes</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:RB</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:CE</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:UIHost</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:CPUTime</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:NProc</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:finalStatus</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:finalStatusDate</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:retryCount</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:jobType</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:nsubjobs</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:lastStatusHistory</name></attrs>
-	<attrs><name>http://egee.cesnet.cz/en/Schema/LB/Attributes:fullStatusHistory</name></attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/JP/System:owner</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/JP/System:jobId</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/JP/System:regtime</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:user</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:aTag</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:eNodes</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:RB</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:CE</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:UIHost</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:CPUTime</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:NProc</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:finalStatus</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:finalStatusDate</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:retryCount</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:jobType</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:nsubjobs</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:lastStatusHistory</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
+	<attrs>
+		<name>http://egee.cesnet.cz/en/Schema/LB/Attributes:fullStatusHistory</name>
+		<multival>NO</multival>
+		<queryable>YES</queryable>
+	</attrs>
 
 	<!-- List of attributes IS will index -->
 	<indexedAttrs>http://egee.cesnet.cz/en/Schema/JP/System:owner</indexedAttrs>
diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile
index cac5f1c..ef277cb 100644
--- a/org.glite.lb.state-machine/Makefile
+++ b/org.glite.lb.state-machine/Makefile
@@ -80,7 +80,8 @@ install:
 	install -m 644 job_attrs2.h ${PREFIX}/include/glite/lb
 
 clean:
-	rm -rvf .libs *.o *.lo ${PLUGIN_LIB} ${MACHINE_LIB} job_attrs.h job_attrs2.h lb-job-attrs2.xsd
+	rm -rvf .libs *.o *.lo ${PLUGIN_LIB} ${MACHINE_LIB}
+	rm -rfv job_attrs.h job_attrs2.h lb-job-attrs2.xsd glite-jpis-config.xml
 	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/
 
 %.c: %.c.T
@@ -113,5 +114,5 @@ job_attrs.h: lb-job-attrs.xsd job_attrs.xsl
 job_attrs2.h: lb-job-attrs2.xsd job_attrs2.xsl
 	${XSLTPROC} ../src/job_attrs2.xsl $< >$@
 
-jpis_config.xml: lb-job-attrs2.xsd jpis_config.xsl
+glite-jpis-config.xml: lb-job-attrs2.xsd jpis_config.xsl
 	${XSLTPROC} ../src/jpis_config.xsl lb-job-attrs2.xsd >$@
diff --git a/org.glite.lb.state-machine/src/jpis_config.xsl b/org.glite.lb.state-machine/src/jpis_config.xsl
index b9adaa3..a375e58 100644
--- a/org.glite.lb.state-machine/src/jpis_config.xsl
+++ b/org.glite.lb.state-machine/src/jpis_config.xsl
@@ -25,6 +25,7 @@
 	&lt;!--
 	&lt;attrs&gt;&lt;name&gt;http://egee.cesnet.cz/en/Schema/JP/System:jobId&lt;/name&gt;&lt;/attrs&gt;
 	&lt;attrs&gt;&lt;name&gt;http://egee.cesnet.cz/en/Schema/JP/System:owner&lt;/name&gt;&lt;/attrs&gt;
+	&lt;attrs&gt;&lt;name&gt;http://egee.cesnet.cz/en/Schema/JP/System:regtime&lt;/name&gt;&lt;/attrs&gt;
 	--&gt;
 <xsl:apply-templates select="xs:element" mode="define"/>
 
@@ -33,10 +34,9 @@
 	&lt;!--&lt;indexedAttrs&gt;http://egee.cesnet.cz/en/Schema/JP/System:owner&lt;/indexedAttrs&gt;--&gt;
 	&lt;!-- internal attribute (index replacement) --&gt;
 	&lt;!--&lt;indexedAttrs&gt;http://egee.cesnet.cz/en/Schema/JP/System:jobId&lt;/indexedAttrs&gt;--&gt;
-	&lt;indexedAttrs&gt;http://egee.cesnet.cz/en/Schema/LB/Attributes:user&lt;/indexedAttrs&gt;
-	&lt;indexedAttrs&gt;http://egee.cesnet.cz/en/Schema/LB/Attributes:CE&lt;/indexedAttrs&gt;
-	&lt;indexedAttrs&gt;http://egee.cesnet.cz/en/Schema/LB/Attributes:VO&lt;/indexedAttrs&gt;
-	&lt;indexedAttrs&gt;http://egee.cesnet.cz/en/Schema/LB/Attributes:finalStatus&lt;/indexedAttrs&gt;
+	&lt;indexedAttrs&gt;http://egee.cesnet.cz/en/Schema/LB/Attributes:owner&lt;/indexedAttrs&gt;
+	&lt;indexedAttrs&gt;http://egee.cesnet.cz/en/Schema/LB/Attributes:ceNode&lt;/indexedAttrs&gt;
+	&lt;indexedAttrs&gt;http://egee.cesnet.cz/en/Schema/LB/Attributes:status&lt;/indexedAttrs&gt;
 
 &lt;!-- List of type plugins --&gt;
 	&lt;plugins&gt;&lt;/plugins&gt;
@@ -61,7 +61,12 @@
 </xsl:template>
 
 <xsl:template match="xs:element" mode="define">	&lt;!-- <xsl:value-of select="xs:documentation/text()"/> --&gt;
-	&lt;attrs&gt;&lt;name&gt;http://egee.cesnet.cz/en/Schema/LB/Attributes:<xsl:value-of select="@name"/>&lt;/name&gt;&lt;/attrs&gt;
+	&lt;attrs&gt;
+		&lt;name&gt;http://egee.cesnet.cz/en/Schema/LB/Attributes:<xsl:value-of select="@name"/>&lt;/name&gt;
+		&lt;multival&gt;YES&lt;/multival&gt;
+		&lt;queryable&gt;YES&lt;/queryable&gt;
+	&lt;/attrs&gt;
+
 </xsl:template>
 
 </xsl:stylesheet>
-- 
1.8.2.3