From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Thu, 15 Jul 2010 09:23:23 +0000 (+0000)
Subject: QX 1.1 Migration
X-Git-Tag: argeo-slc-2.1.7~1229
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=6e162ed05016679a19bf4da38b835d15684cb232;p=gpl%2Fargeo-slc.git

QX 1.1 Migration

git-svn-id: https://svn.argeo.org/slc/trunk@3697 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/Applet.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/Applet.js
index c011d6159..01005b4d9 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/Applet.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/Applet.js
@@ -43,7 +43,7 @@ qx.Class.define("org.argeo.slc.ria.Applet",
   		init : {
   			"close" : {
   				label	 	: "Close Current", 
-  				icon 		: "org.argeo.slc.ria/window-close.png",
+  				icon 		: "org/argeo/slc/ria/window-close.png",
   				shortcut 	: "Control+w",
   				enabled  	: true,
   				menu	   	: "Test",
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/BatchView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/BatchView.js
index 848ed1611..d3dc3f8cb 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/BatchView.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/BatchView.js
@@ -30,7 +30,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 			init : {
 				"submitform" : {
 					label : "Execute Batch",
-					icon : "org.argeo.slc.ria/media-playback-start.png",
+					icon : "org/argeo/slc/ria/media-playback-start.png",
 					shortcut : null,
 					enabled : false,
 					menu : "Launcher",
@@ -54,7 +54,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 				},
 				"removefrombatch" : {
 					label : "Remove from batch",
-					icon : "org.argeo.slc.ria/edit-delete.png",
+					icon : "org/argeo/slc/ria/edit-delete.png",
 					shortcut : null,
 					enabled : false,
 					menu : "Launcher",
@@ -93,7 +93,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 				},
 				"clearbatch" : {
 					label : "Clear batch",
-					icon : "org.argeo.slc.ria/user-trash-full.png",
+					icon : "org/argeo/slc/ria/user-trash-full.png",
 					shortcut : null,
 					enabled : true,
 					menu : "Launcher",
@@ -259,7 +259,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 
 			this.dropDecorator = new qx.ui.decoration.Background();			
 			this.dropDecorator.set({
-				backgroundImage : "org.argeo.slc.ria/drophere.gif",
+				backgroundImage : "org/argeo/slc/ria/drophere.gif",
 				backgroundRepeat : "no-repeat"
 			});
 
@@ -341,7 +341,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 		
 		appendBatchEntrySpec: function(batchEntrySpec, icon, after){
 						
-			var item = new qx.ui.form.ListItem(batchEntrySpec.getLabel(), icon || "org.argeo.slc.ria/system.png");
+			var item = new qx.ui.form.ListItem(batchEntrySpec.getLabel(), icon || "org/argeo/slc/ria/system.png");
 			item.setUserData("batchEntrySpec", batchEntrySpec);
 			item.setPaddingTop(1);
 			item.setPaddingBottom(2);
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js
index 73789cfd5..755fc1d0e 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js
@@ -41,7 +41,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 			init : {
 				"addtobatch" : {
 					label : "Add to batch",
-					icon : "org.argeo.slc.ria/list-add.png",
+					icon : "org/argeo/slc/ria/list-add.png",
 					shortcut : null,
 					enabled : true,
 					menu : null,
@@ -133,7 +133,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 				},
 				"reloadfull" : {
 					label : "Reload Agents",
-					icon : "org.argeo.slc.ria/view-refresh.png",
+					icon : "org/argeo/slc/ria/view-refresh.png",
 					shortcut : "control+h",
 					enabled : true,
 					menu : "Launcher",
@@ -146,7 +146,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 				},				
 				"reloadtree" : {
 					label : "Reload Node",
-					icon : "org.argeo.slc.ria/view-refresh.png",
+					icon : "org/argeo/slc/ria/view-refresh.png",
 					shortcut : null,
 					enabled : false,
 					menu : null,
@@ -264,10 +264,10 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 					agentFolder.setUserData("agentUuid", uuid);
 					if(preferredHosts && preferredHosts instanceof Array && qx.lang.Array.contains(preferredHosts, host)){
 						folder.addAtBegin(agentFolder);
-						agentFolder.setIcon("org.argeo.slc.ria/computer_bookmarked.png");
+						agentFolder.setIcon("org/argeo/slc/ria/computer_bookmarked.png");
 					}else{
 						folder.add(agentFolder);
-						agentFolder.setIcon("org.argeo.slc.ria/computer.png");
+						agentFolder.setIcon("org/argeo/slc/ria/computer.png");
 					}
 				}
 				if(newAgents){
@@ -284,7 +284,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 				}
 				folder.setUserData("agentsMap", agents);
 				folder.setLoaded(true);
-				folder.getTree().fireEvent("changeSelection");				
+				folder.getTree().fireDataEvent("changeSelection", folder.getTree().getSelection());				
 			});
 			req.addListener("failed", function(response) {
 						folder.setLoaded(true);
@@ -332,7 +332,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 									name : key,
 									version : module.getVersion()
 								});
-						versionFolder.setIcon("org.argeo.slc.ria/archive.png");
+						versionFolder.setIcon("org/argeo/slc/ria/archive.png");
 						versionFolder.setUserData("agentUuid", agentId);
 						var sep = (module.getDescription()!=""?" - ":"");
 						org.argeo.slc.ria.FlowsSelectorView.attachToolTip(versionFolder, key + ' (' + module.getVersion() + ')'+sep+module.getDescription());
@@ -342,7 +342,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 					}
 				}
 				folder.setLoaded(true);
-				folder.getTree().fireEvent("changeSelection");
+				folder.getTree().fireDataEvent("changeSelection", folder.getTree().getSelection());
 			});
 			req.addListener("failed", function(response) {
 				folder.setLoaded(true);
@@ -392,7 +392,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 					if(execFlows[key].getDescription() != ""){
 						org.argeo.slc.ria.FlowsSelectorView.attachToolTip(file, execFlows[key].getDescription());
 					}
-					file.setIcon("org.argeo.slc.ria/system.png");
+					file.setIcon("org/argeo/slc/ria/system.png");
 					file.setUserData("executionModule",	executionModule);
 					file.setUserData("executionFlow", execFlows[key]);
 					file.setUserData("agentUuid", agentUuid);
@@ -402,7 +402,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 					folder.appendDragData(file);
 				}
 				folder.setLoaded(true);
-				folder.getTree().fireEvent("changeSelection");
+				folder.getTree().fireDataEvent("changeSelection", folder.getTree().getSelection());
 			});
 			req.addListener("failed", function(response) {
 				folder.setLoaded(true);
@@ -552,10 +552,10 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 			}
 			if(qx.lang.Array.contains(prefArray, hostName)){
 				qx.lang.Array.remove(prefArray, hostName);
-				agentNode.setIcon("org.argeo.slc.ria/computer.png");
+				agentNode.setIcon("org/argeo/slc/ria/computer.png");
 			}else{
 				prefArray.push(hostName);
-				agentNode.setIcon("org.argeo.slc.ria/computer_bookmarked.png");
+				agentNode.setIcon("org/argeo/slc/ria/computer_bookmarked.png");
 				var parent = agentNode.getParent();
 				parent.remove(agentNode);
 				parent.addAtBegin(agentNode);
@@ -587,7 +587,7 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
 					"Loading Agents", dragData);
 			this.tree.setRoot(this.rootNode);
 			this.tree.setHideRoot(true);
-			this.rootNode.setPersistentTreeID("org.argeo.slc.ria.FlowsSelector")
+			this.rootNode.setPersistentTreeID("org/argeo/slc/ria.FlowsSelector")
 			this.rootNode.setOpen(true);
 			this.tree.setContextMenu(org.argeo.ria.event.CommandsManager
 					.getInstance().createMenuFromIds(["addtobatch",
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcApi.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcApi.js
index b4b0e2df7..894411f35 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcApi.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcApi.js
@@ -29,6 +29,10 @@ qx.Class.define("org.argeo.slc.ria.SlcApi",
 	LIST_MODULES_SERVICE : "listModulesDescriptors.service",
 	GET_EXECUTION_DESC_SERVICE : "getExecutionDescriptor.service",
 	GET_SLC_EXECUTION_SERVICE : "getSlcExecution.service",
+	TAIL_SLCEXEC_STEP_COUNT : "tailSlcExecutionStepsCount.service",
+	TAIL_SLCEXEC_STEP_OFFSET : "tailSlcExecutionStepsOffset.service",
+	DOWNLOAD_SLCEXEC_STEPS : "downloadSlcExecution.service",
+		
 	RELOAD_BUNDLE_SERVICE : "reloadBundle.service",
   	AMQ_SERVICE : "amq",
   	
@@ -296,6 +300,21 @@ qx.Class.define("org.argeo.slc.ria.SlcApi",
   		return request;
   	},
   	
+  	getTailSlcExecutionStepService : function(executionUuid, stepCount, offset, fireReloadEventType, iLoadStatusables){  		
+  		var request = org.argeo.slc.ria.SlcApi.getServiceRequest(
+  			(offset?org.argeo.slc.ria.SlcApi.TAIL_SLCEXEC_STEP_OFFSET:org.argeo.slc.ria.SlcApi.TAIL_SLCEXEC_STEP_COUNT),
+  			fireReloadEventType,
+  			iLoadStatusables
+  		);
+  		request.setParameter("uuid", executionUuid);
+  		if(offset){
+  			request.setParameter("stepOffsetUuid", offset);
+  		}else{
+  			request.setParameter("stepCount", stepCount);
+  		}
+  		return request;
+  	},  	
+  	
   	/**
   	 * List currently available agents queues.
   	 * @param fireReloadEventType {String} Event type to trigger (optionnal)
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcExecLoggerApplet.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcExecLoggerApplet.js
index d928e4840..e886a89d3 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcExecLoggerApplet.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcExecLoggerApplet.js
@@ -33,7 +33,7 @@ qx.Class.define("org.argeo.slc.ria.SlcExecLoggerApplet",
   		init : {
   			"reloadlogs" : {
   				label	 	: "Reload Logs", 
-  				icon 		: "org.argeo.slc.ria/view-refresh.png",
+  				icon 		: "org/argeo/slc/ria/view-refresh.png",
   				shortcut 	: "Control+r",
   				enabled  	: true,
   				menu	   	: null,
@@ -45,7 +45,7 @@ qx.Class.define("org.argeo.slc.ria.SlcExecLoggerApplet",
   			},
   			"opendetail" : {
   				label		: "Logs Detail",
-  				icon		: "org.argeo.slc.ria/mime-xls.png",
+  				icon		: "org/argeo/slc/ria/mime-xls.png",
   				shortcut	: null,
   				enabled		: false,
   				menu		: null,
@@ -63,7 +63,7 @@ qx.Class.define("org.argeo.slc.ria.SlcExecLoggerApplet",
   			},
   			"reopenrealized" : {
   				label		: "Re-open",
-  				icon		: "org.argeo.slc.ria/document-open.png",
+  				icon		: "org/argeo/slc/ria/document-open.png",
   				shortcut	: "Control+o",
   				enabled		: false,
   				menu		: null,
@@ -180,7 +180,7 @@ qx.Class.define("org.argeo.slc.ria.SlcExecLoggerApplet",
 	openDetail : function(logData){
 				
 		var uuid = logData[2];
-		var window = new qx.ui.window.Window("Logs Detail", "org.argeo.slc.ria/mime-xls.png");
+		var window = new qx.ui.window.Window("Logs Detail", "org/argeo/slc/ria/mime-xls.png");
 		window.setLayout(new qx.ui.layout.VBox(0));
 		window.setContentPadding(0);		
 		window.open();
@@ -193,7 +193,7 @@ qx.Class.define("org.argeo.slc.ria.SlcExecLoggerApplet",
 		
 		var tBar = new qx.ui.toolbar.ToolBar();
 		window.add(tBar);
-		var menuButton = new qx.ui.toolbar.Button("Close", "org.argeo.slc.ria/window-close.png");
+		var menuButton = new qx.ui.toolbar.Button("Close", "org/argeo/slc/ria/window-close.png");
 		tBar.add(menuButton);
 		menuButton.addListener("execute", function(e){
 			window.close();
@@ -203,6 +203,7 @@ qx.Class.define("org.argeo.slc.ria.SlcExecLoggerApplet",
 		var table = new org.argeo.ria.components.ui.Table(tableModel, {
 			"date":{NAME : "Date", WIDTH:180}, 
 			"type":{NAME : "Type", WIDTH:90, ALIGN:"CENTER"}, 
+			"thread":{NAME : "Thread", WIDTH:90, ALIGN:"CENTER"}, 
 			"log":"Log"
 		});
 		table.setStatusBarVisible(true);
@@ -216,49 +217,19 @@ qx.Class.define("org.argeo.slc.ria.SlcExecLoggerApplet",
 			table.scrollCellVisible(0, dataMap.lastRow);
 		});
 		
-		
-		var tA = new qx.ui.container.Composite(new qx.ui.layout.Canvas());		
-		tA.setHeight(120);
-		
-		var textArea = new qx.ui.form.TextArea();		
-		tA.add(textArea, {left:0,top:0, right:0,bottom:0});
-		
-		var okButton = new qx.ui.form.Button("Done");
-		okButton.setZIndex(2000);
-		tA.add(okButton, {bottom:20,right:20});
-		okButton.addListener("execute", function(){
-			tA.setVisibility("excluded");
-		});
-		
-		textArea.setNativeContextMenu(true);
-		window.add(tA);
-		var cpButton = new qx.ui.toolbar.Button("Copy As Text", "org.argeo.slc.ria/edit-copy.png");
+		var cpButton = new qx.ui.toolbar.Button("Download", "org/argeo/slc/ria/document-save-as.png");
 		tBar.add(cpButton);
 		cpButton.addListener("execute", function(e){
-			var all = tableModel.getData();
-			var string = "";
-			for(var i=0;i<all.length;i++){
-				for(var j=0;j<all[i].length;j++){
-					string += all[i][j] + "\t";
-				}
-				string += "\n";
-			}
-			tA.setVisibility("visible");
-			textArea.setValue(string);
-			new qx.util.DeferredCall(function(){
-				textArea.setSelection(0, string.length);
-			}).schedule();			
+			var downloadUrl = org.argeo.slc.ria.SlcApi.DEFAULT_CONTEXT+"/"+org.argeo.slc.ria.SlcApi.DOWNLOAD_SLCEXEC_STEPS + "?ext=log&uuid=" + uuid;
+			org.argeo.ria.Application.INSTANCE.javascriptDownloadLocation(downloadUrl);
 		});
-		tA.setVisibility("excluded");
-		
-		
 		
 		// Call service to load execution message
-		this._loadSlcExecution(uuid, tableModel);
+		this._loadSlcExecutionSteps(uuid, tableModel, false);
 		
 		var poller = new qx.event.Timer(3000);
 		poller.addListener("interval", function(e){
-			this._loadSlcExecution(uuid, tableModel);
+			this._loadSlcExecutionSteps(uuid, tableModel, true);
 		}, this);
 		
 		window.addListener("close", function(){
@@ -267,29 +238,40 @@ qx.Class.define("org.argeo.slc.ria.SlcExecLoggerApplet",
 		poller.start();
 	},	
 
-	_loadSlcExecution : function(uuid, tableModel){
-		var req = org.argeo.slc.ria.SlcApi.getSlcExecutionService(uuid);
+	_loadSlcExecutionSteps : function(uuid, tableModel, poller){
+		var req;
+		var lastUuid = tableModel.getUserData("lastStepUuid");
+		if(!poller || !lastUuid){
+			req = org.argeo.slc.ria.SlcApi.getTailSlcExecutionStepService(uuid, 200, null);
+		}else{
+			req = org.argeo.slc.ria.SlcApi.getTailSlcExecutionStepService(uuid, null, lastUuid);
+		}
 		req.addListener("completed", function(response){			
 			var xmlDoc = response.getContent();
-			var tableLines = [];
+			var tableLines = (poller?tableModel.getData():[]);
 			var parser = org.argeo.ria.util.Element;
-			var slcSteps = parser.selectNodes(xmlDoc, "slc:slc-execution/slc:steps/slc:slc-execution-step");
+			var slcSteps = parser.selectNodes(xmlDoc, "slc:object-list/slc:slc-execution-step");
 			for(var i=0;i<slcSteps.length;i++){				
 				var step = slcSteps[i];
-				var date = parser.getSingleNodeText(step, "slc:begin");
+				var stepUuid = parser.getSingleNodeText(step, "@uuid");
+				var date = parser.getSingleNodeText(step, "slc:timestamp");
 				var type = parser.getSingleNodeText(step, "slc:type");
+				var thread = parser.getSingleNodeText(step, "slc:thread");
 				var logLines = parser.selectNodes(step, "slc:log-lines/slc:log-line");
 				if(logLines.length > 0){
-					tableLines.push([date, type, parser.getSingleNodeText(logLines[0], ".")]);
+					tableLines.push([date, type, thread, parser.getSingleNodeText(logLines[0], ".")]);
 					if(logLines.length>1){
 						for(var j=1;j<logLines.length;j++){
-							tableLines.push(["", "", parser.getSingleNodeText(logLines[j], ".")]);	
+							tableLines.push(["", "", "", parser.getSingleNodeText(logLines[j], ".")]);	
 						}
 					}
 				}else{
-					tableLines.push([date, type, ""]);
+					tableLines.push([date, type, thread, ""]);
 				}
 			}
+			if(slcSteps.length){
+				tableModel.setUserData("lastStepUuid", stepUuid);
+			}
 			tableModel.setData(tableLines);
 		});
 		req.send();
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcExecutionMessage.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcExecutionMessage.js
index 012ac4992..9d2f10673 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcExecutionMessage.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcExecutionMessage.js
@@ -122,7 +122,7 @@ qx.Class.define("org.argeo.slc.ria.SlcExecutionMessage", {
 			for(var i=0;i<attributes.length;i++){
 				this.addAttribute(attribute.getAttribute("name"), attribute.firstChild);
 			}
-			var stepsDates = org.argeo.ria.util.Element.selectNodes(slcExecXml, "slc:steps/slc:slc-execution-step/slc:begin", NSMap);
+			var stepsDates = org.argeo.ria.util.Element.selectNodes(slcExecXml, "slc:steps/slc:slc-execution-step/slc:timestamp", NSMap);
 			if(stepsDates.length){
 				this.setDate(org.argeo.ria.util.Element.getSingleNodeText(stepsDates[stepsDates.length-1], ".", NSMap));
 			}
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SpecsEditorView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SpecsEditorView.js
index dcc9a2660..ceadd94d7 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SpecsEditorView.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/SpecsEditorView.js
@@ -16,7 +16,7 @@ qx.Class.define("org.argeo.slc.ria.SpecsEditorView",
 			init : {
 				"updateData" : {
 					label : "Edit Execution Specs",
-					icon : "org.argeo.slc.riadocument-open.png",
+					icon : "org/argeo/slc/ria/document-open.png",
 					shortcut : null,
 					enabled : false,
 					menu : null,
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/CellEditorFactory.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/CellEditorFactory.js
index 7e31b7967..665181337 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/CellEditorFactory.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/CellEditorFactory.js
@@ -165,7 +165,7 @@ qx.Class.define("org.argeo.slc.ria.execution.CellEditorFactory",
 				value = cellEditor.getValue();
 			}else{
 				var sel = cellEditor.getModelSelection();
-				value = sel[0];
+				value = sel.getItem(0);
 			}
 			var validationFunc = cellEditor.getUserData("validationFunc");
 			
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/DistListView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/DistListView.js
index d537031ec..60aab82fd 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/DistListView.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/monitor/DistListView.js
@@ -11,7 +11,7 @@ qx.Class.define("org.argeo.slc.ria.monitor.DistListView", {
 			init : {
 				"reload" : {
 					label : "Reload",
-					icon : "org.argeo.slc.ria/view-refresh.png",
+					icon : "org/argeo/slc/ria/view-refresh.png",
 					shortcut : "control+h",
 					enabled : true,
 					menu : "Distributions",
@@ -23,7 +23,7 @@ qx.Class.define("org.argeo.slc.ria.monitor.DistListView", {
 				},
 				"uninstall" : {
 					label 	: "Uninstall",
-					icon	: "org.argeo.slc.ria/window-close.png",
+					icon	: "org/argeo/slc/ria/window-close.png",
 					shortcut: null,
 					enabled : false,
 					menu	: "Distributions",