Prepare for release candidate

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

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java
index 0998b520d87e07ff00eeae3c5e787376f8f0d823..09da0753714b3cf076c0ab1ca699790b576dcdac 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java
@@ -6,7 +6,6 @@ import java.util.TreeMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.core.SlcException;
 import org.argeo.slc.core.build.Distribution;
 
 public class SimpleExecutables implements InstalledExecutables {

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java
index 748d14c0bd49b6e0ecb4e6967c2862b4ebaf783a..4dcc63bbf76b30f5ae015c6627f0a0f2de4dbfa2 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestResult.java
@@ -25,7 +25,7 @@ public class SimpleTestResult implements TestResult {
 \r
        private Date closeDate;\r
        private List<TestResultPart> parts = new Vector<TestResultPart>();\r
-       \r
+\r
        private Map<String, String> attributes = new TreeMap<String, String>();\r
 \r
        public void addResultPart(TestResultPart part) {\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java
index e9119a1de4afed46327a0022692202ec14077735..eccacdbbb72c1fd487eeab6416d4f637cd3c4cee 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java
@@ -1,13 +1,8 @@
 package org.argeo.slc.support.deploy;\r
 \r
-import java.io.BufferedReader;\r
 import java.io.IOException;\r
-import java.io.InputStream;\r
-import java.io.InputStreamReader;\r
 import java.net.URL;\r
 \r
-import org.apache.commons.logging.Log;\r
-import org.apache.commons.logging.LogFactory;\r
 import org.argeo.slc.core.SlcException;\r
 import org.argeo.slc.core.build.Distribution;\r
 \r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java
index 8b187c5b7660b844f13be5949e4c7a4c248ff3c5..8af51ece8fef52c9d5dc2b1dae2e5668699e0846 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java
@@ -2,7 +2,7 @@ package org.argeo.slc.support.deploy;
 
 import org.argeo.slc.core.deploy.DeploymentData;
 
-public class HttpdServerDeploymentData implements DeploymentData{
+public class HttpdServerDeploymentData implements DeploymentData {
        private String configFile;
 
        public String getConfigFile() {

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java
index 29b391477e32b39a0573f3d6570b2ab25da84c9c..80905bcf0a8da429e4f9b144088b6511e9cf26b3 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java
@@ -5,13 +5,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.core.SlcException;
-import org.argeo.slc.core.deploy.DeployedSystem;
 import org.argeo.slc.core.deploy.DeployedSystemManager;
 
 public class HttpdServerManager implements DeployedSystemManager<HttpdServer> {

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java
index 67402d042635175219e48f3e4014167560c34541..25f40c5f9642635cd241066ad54909a6f3c94b17 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java
@@ -29,7 +29,7 @@ public abstract class SlcExecutionTestUtils {
                assertEquals(expected.getUser(), reached.getUser());\r
                assertEquals(expected.getType(), reached.getType());\r
                assertEquals(expected.getStatus(), reached.getStatus());\r
-               \r
+\r
                // Attributes\r
                assertEquals(expected.getAttributes().size(), reached.getAttributes()\r
                                .size());\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
index 6d40120aa0447642d02670d4cdb57183ff1b9683..62b4f82263a53b37db5a48ea131e47c691da3e3b 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/test/tree/UnitTestTreeUtil.java
@@ -1,14 +1,13 @@
 package org.argeo.slc.unit.test.tree;\r
 \r
-import org.apache.commons.logging.Log;\r
-import org.apache.commons.logging.LogFactory;\r
-\r
 import static junit.framework.Assert.assertEquals;\r
 import static junit.framework.Assert.assertNotNull;\r
 import static junit.framework.Assert.assertNull;\r
 import static junit.framework.Assert.fail;\r
 import static org.argeo.slc.unit.UnitUtils.assertDateSec;\r
 \r
+import org.apache.commons.logging.Log;\r
+import org.apache.commons.logging.LogFactory;\r
 import org.argeo.slc.core.structure.SimpleSElement;\r
 import org.argeo.slc.core.structure.tree.TreeSPath;\r
 import org.argeo.slc.core.test.SimpleResultPart;\r
@@ -156,6 +155,31 @@ public class UnitTestTreeUtil {
 \r
        }\r
 \r
+       public static void describeTreeTestResult(TreeTestResult ttr) {\r
+               log.info("TreeTestResult #" + ttr.getUuid());\r
+               log.info(" Close date: " + ttr.getCloseDate());\r
+               log.info(" Attributes:");\r
+               for (String key : ttr.getAttributes().keySet())\r
+                       log.info("  " + key + "=" + ttr.getAttributes().get(key));\r
+\r
+               log.info(" Result parts: (size=" + ttr.getResultParts().size() + ")");\r
+               for (TreeSPath path : ttr.getResultParts().keySet()) {\r
+                       log.info(" Path: " + path);\r
+                       PartSubList lst = ttr.getResultParts().get(path);\r
+                       for (TestResultPart part : lst.getParts())\r
+                               log.info("  " + part);\r
+               }\r
+\r
+               log.info(" Elements: (size=" + ttr.getElements().size() + ")");\r
+               for (TreeSPath path : ttr.getElements().keySet()) {\r
+                       SimpleSElement elem = (SimpleSElement) ttr.getElements().get(path);\r
+                       log.info(" Path: " + path + ", Element: " + elem.getLabel());\r
+                       for (String tag : elem.getTags().keySet())\r
+                               log.info("  " + tag + "=" + elem.getTags().get(tag));\r
+               }\r
+\r
+       }\r
+\r
        /** Makes sure this is a singleton */\r
        private UnitTestTreeUtil() {\r
 \r