From: Olivier Capillon <olivier.capillon@gmail.com>
Date: Sun, 7 Nov 2010 19:19:40 +0000 (+0000)
Subject: Change toString of RunnableCallFlow
X-Git-Tag: argeo-slc-2.1.7~1125
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=87447eb23267e5707c3d2cbff078fe45749821c5;p=gpl%2Fargeo-slc.git

Change toString of RunnableCallFlow

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

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/generator/RunnableCallFlow.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/generator/RunnableCallFlow.java
index a68c812f7..409c7168f 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/generator/RunnableCallFlow.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/generator/RunnableCallFlow.java
@@ -165,6 +165,11 @@ public class RunnableCallFlow implements ExecutionFlow, ApplicationContextAware
 		}
 	}
 
+	@Override
+	public String toString() {
+		return new StringBuffer("RunnableCallFlow ").append(name).toString();
+	}	
+	
 	public ExecutionSpec getExecutionSpec() {
 		return executionSpec;
 	}
diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java
index acaa7b5a1..e8feff020 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/TestManagerServiceImpl.java
@@ -43,6 +43,8 @@ public class TestManagerServiceImpl implements TestManagerService {
 	private final SlcExecutionDao slcExecutionDao;
 	private final TreeTestResultCollectionDao treeTestResultCollectionDao;
 
+	private String defaultCollectionId = "default";
+	
 	public TestManagerServiceImpl(TreeTestResultDao treeTestResultDao,
 			TestRunDescriptorDao testRunDescriptorDao,
 			SlcExecutionDao slcExecutionDao,
@@ -68,9 +70,10 @@ public class TestManagerServiceImpl implements TestManagerService {
 						.getSlcExecution(testRunDescriptor
 								.getSlcExecutionUuid());
 				if (slcExecution != null) {
-					String collectionId = slcExecution.getUser() != null ? slcExecution
-							.getUser()
-							: "default";
+					// Use Host as collection ID if host is available
+					String collectionId = slcExecution.getHost() != null ? slcExecution
+							.getHost()
+							: defaultCollectionId;
 					addResultToCollection(collectionId, testRunDescriptor
 							.getTestResultUuid());
 				}
@@ -78,7 +81,7 @@ public class TestManagerServiceImpl implements TestManagerService {
 				if (log.isTraceEnabled())
 					log.trace("ResultUUID="
 							+ testRunDescriptor.getTestResultUuid());
-				addResultToCollection("default", testRunDescriptor
+				addResultToCollection(defaultCollectionId, testRunDescriptor
 						.getTestResultUuid());
 			}
 		}
@@ -156,4 +159,8 @@ public class TestManagerServiceImpl implements TestManagerService {
 
 	}
 
+	public void setDefaultCollectionId(String defaultCollectionId) {
+		this.defaultCollectionId = defaultCollectionId;
+	}
+
 }