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 98266510e6734f3b5a98adda66938ae7f553a1e2..0bfe626ec967f89fb2381b503bb60eebc7e1a6a0 100644 (file)
--- 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 4df206815b5ed43a5288bf641ce9665fabc2d9af..8264796f62f46d3b4c23725776b26c560c8db877 100644 (file)
--- 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;\r
        }\r
 \r
-       public void setUser(String path) {\r
-               this.user = path;\r
+       public void setUser(String user) {\r
+               this.user = user;\r
        }\r
 \r
        public String getType() {\r

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 56b6ba020bb2bf410fde4355e0a1eacb3fbb7b1c..50032d8cd35c4a41538779d328638940f65c98bf 100644 (file)
--- 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;\r
 \r
 public class SlcExecutionStep {\r
+       public final static String TYPE_LOG = "LOG";\r
+\r
        private String uuid;\r
        private String type;\r
        private Date begin;\r
@@ -20,8 +22,8 @@ public class SlcExecutionStep {
        public SlcExecutionStep() {\r
        }\r
 \r
-       public SlcExecutionStep(String type, String log) {\r
-               this.type = type;\r
+       public SlcExecutionStep(String log) {\r
+               this.type = TYPE_LOG;\r
                this.begin = new Date();\r
                this.uuid = UUID.randomUUID().toString();\r
                addLog(log);\r
@@ -78,4 +80,9 @@ public class SlcExecutionStep {
                }\r
        }\r
 \r
+       @Override\r
+       public String toString() {\r
+               return getClass().getSimpleName() + "#" + uuid;\r
+       }\r
+\r
 }\r

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 bc084dd0b5e3a2880cfe8d957829cd514b5a9c84..e3d5853ac92893184fc9aa332b7ca8c71c2aef57 100644 (file)
--- 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;\r
 \r
 import org.argeo.slc.core.process.SlcExecution;\r
+import org.argeo.slc.core.process.SlcExecutionStep;\r
 \r
 public interface SlcExecutionDao {\r
        public void create(SlcExecution slcExecution);\r
@@ -12,4 +13,7 @@ public interface SlcExecutionDao {
        public SlcExecution getSlcExecution(String uuid);\r
 \r
        public List<SlcExecution> listSlcExecutions();\r
+\r
+       public void addSteps(String slcExecutionId,\r
+                       List<SlcExecutionStep> additionalSteps);\r
 }\r

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 02bc13488617e5b30a5a1f2e68b611ab41eeb3e1..f43689df97866938df1cc8a57732764402e0c3b9 100644 (file)
--- 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;
 \r
 import java.util.SortedSet;\r
 \r
+import org.argeo.slc.core.test.tree.TreeTestResult;\r
 import org.argeo.slc.core.test.tree.TreeTestResultCollection;\r
 \r
 public interface TreeTestResultCollectionDao {\r
@@ -12,4 +13,11 @@ public interface TreeTestResultCollectionDao {
        public TreeTestResultCollection getTestResultCollection(String id);\r
 \r
        public SortedSet<TreeTestResultCollection> listCollections();\r
+\r
+       public void addResultToCollection(TreeTestResultCollection ttrc,\r
+                       String resultUuid);\r
+\r
+       public void removeResultFromCollection(TreeTestResultCollection ttrc,\r
+                       String resultUuid);\r
+\r
 }\r

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 c66d3692156e66418a0467141fe1c727532c4fd3..49984e114f15897c418e0639fe519598e2001df8 100644 (file)
--- 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;\r
 \r
 import java.util.List;\r
+import java.util.Map;\r
 \r
+import org.argeo.slc.core.structure.StructureElement;\r
 import org.argeo.slc.core.structure.tree.TreeSPath;\r
+import org.argeo.slc.core.test.SimpleResultPart;\r
 import org.argeo.slc.core.test.tree.TreeTestResult;\r
 import org.argeo.slc.dao.test.TestResultDao;\r
 \r
 public interface TreeTestResultDao extends TestResultDao<TreeTestResult> {\r
        /** Lists results containing this path */\r
        public List<TreeTestResult> listResults(TreeSPath path);\r
+\r
+       public void addResultPart(String testResultId, TreeSPath path,\r
+                       SimpleResultPart resultPart,\r
+                       Map<TreeSPath, StructureElement> relatedElements);\r
 }\r

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 84d5826815f400dcd9838d9d7ac50ee401f5feeb..54b896cf33f50bfd7fe4b98b91a6bb5dedec5034 100644 (file)
--- 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 78afc830f4e1b88c8e8fba7dce2e518f7416987e..44a463b9e7e6e38290997e0cf10146b1254439eb 100644 (file)
--- 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) {\r
                this.newStatus = newStatus;\r
        }\r
+\r
+       @Override\r
+       public String toString() {\r
+               return getClass().getSimpleName() + "#" + slcExecutionUuid;\r
+       }\r
 }\r

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 237f05f871131fa3195e34c599ba22fe371da6ff..9c564aaae22e2e45370b2bf3a5ad5e62ae789e09 100644 (file)
--- 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;\r
        private List<SlcExecutionStep> steps = new Vector<SlcExecutionStep>();\r
 \r
+       public SlcExecutionStepsRequest() {\r
+\r
+       }\r
+\r
+       public SlcExecutionStepsRequest(String slcExecutionUuid,\r
+                       List<SlcExecutionStep> steps) {\r
+               this.slcExecutionUuid = slcExecutionUuid;\r
+               this.steps = steps;\r
+       }\r
+\r
        public String getSlcExecutionUuid() {\r
                return slcExecutionUuid;\r
        }\r
@@ -28,4 +38,10 @@ public class SlcExecutionStepsRequest {
        public void addStep(SlcExecutionStep step) {\r
                steps.add(step);\r
        }\r
+\r
+       @Override\r
+       public String toString() {\r
+               return getClass().getSimpleName() + "#" + slcExecutionUuid + " "\r
+                               + steps;\r
+       }\r
 }\r

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 c0b74e36e1866a7e75e1194778e33dceb8a93210..311269626415d54919874516e4749624d1191587 100644 (file)
--- 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;\r
        }\r
 \r
+       @Override\r
+       public String toString() {\r
+               return getClass().getSimpleName() + "#" + resultUuid;\r
+       }\r
+\r
 }\r

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 0a7af822b516d0232006707851f4896f3c865e80..281f44d9c2e83acf5df8064617ea0aac82bf0c76 100644 (file)
--- 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) {\r
                this.treeTestResult = treeTestResult;\r
        }\r
+       \r
+       @Override\r
+       public String toString() {\r
+               return getClass().getSimpleName() + "#" + treeTestResult.getUuid();\r
+       }\r
 }\r

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 a02375920b3a5c3f2e2b0998a8d52b50df7d0b75..04aa41462d1305b9f0603f61883e0efa969875ed 100644 (file)
--- 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;\r
        }\r
 \r
+       @Override\r
+       public String toString() {\r
+               return getClass().getSimpleName() + "#" + resultUuid + " " + path;\r
+       }\r
 }\r

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 c602c0b94bedfa3362ec79c40b2446fc05deff31..a9a2d8e1e692ddb6e0203f46d7880b1dcd78bb9a 100644 (file)
--- 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() {\r
                SlcExecution slcExecution = SlcExecutionTestUtils\r
                                .createSimpleSlcExecution();\r
-               SlcExecutionStep step = new SlcExecutionStep("LOG", "JUnit step");\r
+               SlcExecutionStep step = new SlcExecutionStep("JUnit step");\r
                slcExecution.getSteps().add(step);\r
 \r
                SimpleTestRun testRun = new SimpleTestRun();\r

diff --git a/org.argeo.slc.core/src/test/resources/log4j.properties b/org.argeo.slc.core/src/test/resources/log4j.properties
index 0133bab8851a98402b6707e4ab98fd5f227edf39..41d85d15212dae790e8ce1e8f2ef457c6ccab8db 100644 (file)
--- 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
 \r
 ## Levels\r
 # Slc\r
-log4j.logger.org.argeo=DEBUG\r
+log4j.logger.org.argeo=TRACE\r
 \r
 # Castor\r
 log4j.logger.org.exolab.castor=WARN\r