From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 27 Jun 2008 22:03:46 +0000 (+0000)
Subject: Adapt web services to lazy loading
X-Git-Tag: argeo-slc-2.1.7~2742
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=00bec32c992254bba99f21eee2dbb6323a2ca2f3;p=gpl%2Fargeo-slc.git

Adapt web services to lazy loading

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

diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml
index 98266510e..0bfe626ec 100644
--- a/org.argeo.slc.core/pom.xml
+++ b/org.argeo.slc.core/pom.xml
@@ -96,9 +96,5 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>xalan</groupId>
-			<artifactId>xalan</artifactId>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecution.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecution.java
index 4df206815..8264796f6 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecution.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecution.java
@@ -51,8 +51,8 @@ public class SlcExecution {
 		return user;
 	}
 
-	public void setUser(String path) {
-		this.user = path;
+	public void setUser(String user) {
+		this.user = user;
 	}
 
 	public String getType() {
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java
index 56b6ba020..50032d8cd 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/SlcExecutionStep.java
@@ -11,6 +11,8 @@ import java.util.Vector;
 import org.apache.commons.io.IOUtils;
 
 public class SlcExecutionStep {
+	public final static String TYPE_LOG = "LOG";
+
 	private String uuid;
 	private String type;
 	private Date begin;
@@ -20,8 +22,8 @@ public class SlcExecutionStep {
 	public SlcExecutionStep() {
 	}
 
-	public SlcExecutionStep(String type, String log) {
-		this.type = type;
+	public SlcExecutionStep(String log) {
+		this.type = TYPE_LOG;
 		this.begin = new Date();
 		this.uuid = UUID.randomUUID().toString();
 		addLog(log);
@@ -78,4 +80,9 @@ public class SlcExecutionStep {
 		}
 	}
 
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + "#" + uuid;
+	}
+
 }
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java
index bc084dd0b..e3d5853ac 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/process/SlcExecutionDao.java
@@ -3,6 +3,7 @@ package org.argeo.slc.dao.process;
 import java.util.List;
 
 import org.argeo.slc.core.process.SlcExecution;
+import org.argeo.slc.core.process.SlcExecutionStep;
 
 public interface SlcExecutionDao {
 	public void create(SlcExecution slcExecution);
@@ -12,4 +13,7 @@ public interface SlcExecutionDao {
 	public SlcExecution getSlcExecution(String uuid);
 
 	public List<SlcExecution> listSlcExecutions();
+
+	public void addSteps(String slcExecutionId,
+			List<SlcExecutionStep> additionalSteps);
 }
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultCollectionDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultCollectionDao.java
index 02bc13488..f43689df9 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultCollectionDao.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultCollectionDao.java
@@ -2,6 +2,7 @@ package org.argeo.slc.dao.test.tree;
 
 import java.util.SortedSet;
 
+import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.core.test.tree.TreeTestResultCollection;
 
 public interface TreeTestResultCollectionDao {
@@ -12,4 +13,11 @@ public interface TreeTestResultCollectionDao {
 	public TreeTestResultCollection getTestResultCollection(String id);
 
 	public SortedSet<TreeTestResultCollection> listCollections();
+
+	public void addResultToCollection(TreeTestResultCollection ttrc,
+			String resultUuid);
+
+	public void removeResultFromCollection(TreeTestResultCollection ttrc,
+			String resultUuid);
+
 }
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java
index c66d36921..49984e114 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/test/tree/TreeTestResultDao.java
@@ -1,12 +1,19 @@
 package org.argeo.slc.dao.test.tree;
 
 import java.util.List;
+import java.util.Map;
 
+import org.argeo.slc.core.structure.StructureElement;
 import org.argeo.slc.core.structure.tree.TreeSPath;
+import org.argeo.slc.core.test.SimpleResultPart;
 import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.dao.test.TestResultDao;
 
 public interface TreeTestResultDao extends TestResultDao<TreeTestResult> {
 	/** Lists results containing this path */
 	public List<TreeTestResult> listResults(TreeSPath path);
+
+	public void addResultPart(String testResultId, TreeSPath path,
+			SimpleResultPart resultPart,
+			Map<TreeSPath, StructureElement> relatedElements);
 }
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionRequest.java
index 84d582681..54b896cf3 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionRequest.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionRequest.java
@@ -5,6 +5,13 @@ import org.argeo.slc.core.process.SlcExecution;
 public class SlcExecutionRequest {
 	private SlcExecution slcExecution;
 
+	public SlcExecutionRequest() {
+	}
+
+	public SlcExecutionRequest(SlcExecution slcExecution) {
+		this.slcExecution = slcExecution;
+	}
+
 	public SlcExecution getSlcExecution() {
 		return slcExecution;
 	}
@@ -13,4 +20,8 @@ public class SlcExecutionRequest {
 		this.slcExecution = slcExecution;
 	}
 
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + "#" + slcExecution.getUuid();
+	}
 }
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionStatusRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionStatusRequest.java
index 78afc830f..44a463b9e 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionStatusRequest.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionStatusRequest.java
@@ -27,4 +27,9 @@ public class SlcExecutionStatusRequest {
 	public void setNewStatus(String newStatus) {
 		this.newStatus = newStatus;
 	}
+
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + "#" + slcExecutionUuid;
+	}
 }
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionStepsRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionStepsRequest.java
index 237f05f87..9c564aaae 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionStepsRequest.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/process/SlcExecutionStepsRequest.java
@@ -9,6 +9,16 @@ public class SlcExecutionStepsRequest {
 	private String slcExecutionUuid;
 	private List<SlcExecutionStep> steps = new Vector<SlcExecutionStep>();
 
+	public SlcExecutionStepsRequest() {
+
+	}
+
+	public SlcExecutionStepsRequest(String slcExecutionUuid,
+			List<SlcExecutionStep> steps) {
+		this.slcExecutionUuid = slcExecutionUuid;
+		this.steps = steps;
+	}
+
 	public String getSlcExecutionUuid() {
 		return slcExecutionUuid;
 	}
@@ -28,4 +38,10 @@ public class SlcExecutionStepsRequest {
 	public void addStep(SlcExecutionStep step) {
 		steps.add(step);
 	}
+
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + "#" + slcExecutionUuid + " "
+				+ steps;
+	}
 }
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CloseTreeTestResultRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CloseTreeTestResultRequest.java
index c0b74e36e..311269626 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CloseTreeTestResultRequest.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CloseTreeTestResultRequest.java
@@ -38,4 +38,9 @@ public class CloseTreeTestResultRequest {
 		this.closeDate = closeDate;
 	}
 
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + "#" + resultUuid;
+	}
+
 }
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java
index 0a7af822b..281f44d9c 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/CreateTreeTestResultRequest.java
@@ -20,4 +20,9 @@ public class CreateTreeTestResultRequest {
 	public void setTreeTestResult(TreeTestResult treeTestResult) {
 		this.treeTestResult = treeTestResult;
 	}
+	
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + "#" + treeTestResult.getUuid();
+	}
 }
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java
index a02375920..04aa41462 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/msg/test/tree/ResultPartRequest.java
@@ -89,4 +89,8 @@ public class ResultPartRequest {
 		this.relatedElements = relatedElements;
 	}
 
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + "#" + resultUuid + " " + path;
+	}
 }
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java
index c602c0b94..a9a2d8e1e 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/TreeTestResultTestUtils.java
@@ -30,7 +30,7 @@ public abstract class TreeTestResultTestUtils {
 	public static TreeTestResult createCompleteTreeTestResult() {
 		SlcExecution slcExecution = SlcExecutionTestUtils
 				.createSimpleSlcExecution();
-		SlcExecutionStep step = new SlcExecutionStep("LOG", "JUnit step");
+		SlcExecutionStep step = new SlcExecutionStep("JUnit step");
 		slcExecution.getSteps().add(step);
 
 		SimpleTestRun testRun = new SimpleTestRun();
diff --git a/org.argeo.slc.core/src/test/resources/log4j.properties b/org.argeo.slc.core/src/test/resources/log4j.properties
index 0133bab88..41d85d152 100644
--- a/org.argeo.slc.core/src/test/resources/log4j.properties
+++ b/org.argeo.slc.core/src/test/resources/log4j.properties
@@ -3,7 +3,7 @@ log4j.rootLogger=WARN, console
 
 ## Levels
 # Slc
-log4j.logger.org.argeo=DEBUG
+log4j.logger.org.argeo=TRACE
 
 # Castor
 log4j.logger.org.exolab.castor=WARN