From 5aa18045bcdd46992b9417f7864fec455e9fc979 Mon Sep 17 00:00:00 2001
From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Tue, 10 Mar 2009 18:00:59 +0000
Subject: [PATCH] Change the generated XML for the execution message

git-svn-id: https://svn.argeo.org/slc/trunk@2245 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../class/org/argeo/slc/ria/NewLauncherApplet.js | 15 +++++++++++++--
 .../argeo/slc/ria/execution/BatchEntrySpec.js    | 16 ++++++++++++++++
 .../class/org/argeo/slc/ria/execution/Spec.js    |  2 +-
 .../class/org/argeo/slc/ria/execution/Value.js   | 15 ++++++++++++++-
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js
index 037e7b79a..e1297fcd4 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js
@@ -519,8 +519,19 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
 	 */
 	executeBatchOnAgent : function(agentUuid){
 		//var xmlString = agentUuid + this.currentBatchToXml();
-		var xmlString = "<slc:executionSpecs>"+this.currentBatchToXml()+"</slc:executionSpecs>";
-		alert(xmlString);
+		var xmlString = "<slc:execution-objects>"+this.currentBatchToXml()+"</slc:execution-objects>";
+		this._amqClient.sendMessage(
+			"topic://agent.newExecution", 
+			xmlString, 
+			{"slc-agentId":agentUuid}
+		);
+		// Force logs refresh right now!
+		qx.event.Timer.once(function(){
+			var command = org.argeo.ria.event.CommandsManager.getInstance().getCommandById("reloadlogs");
+			if(command){
+				command.execute();
+			}
+		}, this, 2000);		
 	},
 	
 	/**
diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/BatchEntrySpec.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/BatchEntrySpec.js
index 3511ac5a9..1102f44f2 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/BatchEntrySpec.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/BatchEntrySpec.js
@@ -45,6 +45,22 @@ qx.Class.define("org.argeo.slc.ria.execution.BatchEntrySpec", {
 			return label;
 		},
 				
+		toXml : function(){			
+			var valuesXml = '';
+			var values = this.getValues();
+			for(var key in values){
+				valuesXml += values[key].toValueXml();
+			}
+			var execFlowDescXML = '<slc:execution-flow-descriptor name="'+this.getFlow().getName()+'" executionSpec="'+this.getName()+'"><slc:values>'+valuesXml+'</slc:values></slc:execution-flow-descriptor>';
+			
+			var execSpecDescXML = this.getOriginalSpec().toXml();
+			
+			var moduleData = '<slc:moduleName>'+this.getModule().getName()+'</slc:moduleName><slc:moduleVersion>'+this.getModule().getVersion()+'</slc:moduleVersion>';
+			
+			return '<slc:execution-object>'+moduleData + execFlowDescXML + execSpecDescXML +'</slc:execution-object>';
+			
+		},
+		
 		/**
 		 * Fetch the Spec Values with the Flow Values to make the current instance value
 		 */
diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Spec.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Spec.js
index 2a7a3c039..29685eb0e 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Spec.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Spec.js
@@ -63,7 +63,7 @@ qx.Class.define("org.argeo.slc.ria.execution.Spec", {
 			var valuesXml = '';
 			var values = this.getValues();
 			for(var key in values){
-				valuesXml += values[key].toXml();
+				valuesXml += values[key].toAttributeXml();
 			}
 			return '<slc:default-execution-spec name="'+this.getName()+'"><slc:values>'+valuesXml+'</slc:values></slc:default-execution-spec>';
 		}
diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Value.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Value.js
index 29556d886..8895df8b9 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Value.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Value.js
@@ -113,7 +113,7 @@ qx.Class.define("org.argeo.slc.ria.execution.Value", {
 		 * Create an XML Representation of this value
 		 * @return {String} The XML String
 		 */
-		toXml : function(){
+		toAttributeXml : function(){
 			var valueTag = '<slc:value>'+this.getValue()+'</slc:value>';
 			var specAttribute = '';
 			if(this.getSpecType() == "primitive"){
@@ -122,6 +122,19 @@ qx.Class.define("org.argeo.slc.ria.execution.Value", {
 				specAttribute = '<slc:ref-spec-attribute isParameter="'+(this.getParameter()?"true":"false")+'" isFrozen="'+(this.getFrozen()?"true":"false")+'" isHidden="'+(this.getHidden()?"true":"false")+'" targetClassName="'+this.getSpecSubType()+'">'+valueTag+'</slc:ref-spec-attribute>';
 			}
 			return '<slc:value key="'+this.getKey()+'">'+specAttribute+'</slc:value>';
+		},
+		
+		toValueXml : function(){
+			var valueTag = '';
+			var specAttribute = '';
+			if(this.getSpecType() == "primitive"){
+				valueTag = '<slc:value>'+this.getValue()+'</slc:value>';
+				specAttribute = '<slc:primitive-value type="'+this.getSpecSubType()+'">'+valueTag+'</slc:primitive-value>';
+			}else if(this.getSpecType() == "ref"){
+				valueTag = '<slc:label>'+this.getValue()+'</slc:label>';
+				specAttribute = '<slc:ref-value >'+valueTag+'</slc:ref-value>';
+			}
+			return '<slc:value key="'+this.getKey()+'">'+specAttribute+'</slc:value>';			
 		}
 	}	
 	
-- 
2.39.2