From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 5 Jun 2012 13:02:55 +0000 (+0000)
Subject: Hacky build fix of java client (support for taglist from Torque branch).
X-Git-Tag: merge_32_head_dst~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=e728bbe2e0a7687913def61ebb82533d6d1a1674;p=jra1mw.git

Hacky build fix of java client (support for taglist from Torque branch).
---

diff --git a/org.glite.lb.client-java/src/org/glite/lb/EventConvertor.java b/org.glite.lb.client-java/src/org/glite/lb/EventConvertor.java
index 84da13d..0786062 100644
--- a/org.glite.lb.client-java/src/org/glite/lb/EventConvertor.java
+++ b/org.glite.lb.client-java/src/org/glite/lb/EventConvertor.java
@@ -709,15 +709,20 @@ public class EventConvertor {
         org.glite.wsdl.types.lb.EventPBSResourceUsage wsdlEvent = event.getPBSResourceUsage();
         EventPBSResourceUsage ev = new EventPBSResourceUsage();
 
-        if (wsdlEvent.getName() != null) ev.setName(wsdlEvent.getName());
-        if (wsdlEvent.getQuantity() != null) {
-            ev.setQuantity(wsdlEvent.getQuantity());
-        }
-        if (wsdlEvent.getUnit() != null) ev.setUnit(wsdlEvent.getUnit());
         if (wsdlEvent.getUsage() != null) {
             ev.setUsage(EventPBSResourceUsage.Usage.valueOf(wsdlEvent.getUsage().getValue()));
         } else ev.setUsage(EventPBSResourceUsage.Usage.UNDEFINED);
-
+	{
+		int i;
+		org.glite.wsdl.types.lb.TagValue[] resources = wsdlEvent.getResources();
+
+		if (resources != null) {
+			java.util.HashMap rm = new java.util.HashMap();
+			for (i = 0; i < resources.length; i++)
+				rm.put(resources[i].getTag(), resources[i].getValue());
+			ev.setResources(rm);
+		}
+	}
         setCommonAttributes(wsdlEvent.getTimestamp(), wsdlEvent.getArrived(),
            wsdlEvent.getHost(), wsdlEvent.getLevel(), wsdlEvent.getPriority(),
            wsdlEvent.getJobId(), wsdlEvent.getSeqcode(), wsdlEvent.getUser(),
diff --git a/org.glite.lb.types/types.T b/org.glite.lb.types/types.T
index eecdb3c..5c51ba6 100644
--- a/org.glite.lb.types/types.T
+++ b/org.glite.lb.types/types.T
@@ -63,6 +63,7 @@
 		double=>'"double"',
 		logsrc=>'"Sources"',
 		timeval=>'"Timeval"',
+		taglist=>'"java.util.HashMap"',
 	}
 );