Small enhancements

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

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/JvmProcess.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/JvmProcess.java
index 2be9e8ceaeaaba51b5981b015aa9cbe60d9d1878..edc7188b1a30d150e93c44ca228f201dcc50ccad 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/JvmProcess.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/tasks/JvmProcess.java
@@ -73,7 +73,7 @@ public class JvmProcess extends SystemCall {
                        cl.addArgument(arg);
                }
 
-               if (log.isDebugEnabled())
+               if (log.isTraceEnabled())
                        log.debug("Command line:\n" + cl.toString() + "\n");
 
                return cl;

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java
index 5b0a54fdd419fab6b1f11cf1e357bf87de5fc935..3bec9d38c40099e1b249faabff3ea41e8a31baea 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/structure/tree/TreeSRegistry.java
@@ -20,6 +20,7 @@ public class TreeSRegistry implements StructureRegistry<TreeSPath> {
 \r
        private List<TreeSPath> activePaths;\r
 \r
+       @SuppressWarnings("unchecked")\r
        public <T extends StructureElement> T getElement(TreeSPath path) {\r
                return (T) elements.get(path);\r
        }\r

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java
index 86b35323b2353e55572fec4469ec27fbc99ff2d2..ea71274b428041d02854a8ada55d5d7db95d60ae 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/SimpleTestRun.java
@@ -3,13 +3,11 @@ package org.argeo.slc.core.test;
 import java.util.UUID;\r
 \r
 import org.argeo.slc.core.structure.tree.TreeSPath;\r
-import org.argeo.slc.core.structure.tree.TreeSRegistry;\r
 import org.argeo.slc.deploy.DeployedSystem;\r
 import org.argeo.slc.process.SlcExecution;\r
 import org.argeo.slc.process.SlcExecutionRelated;\r
 import org.argeo.slc.process.SlcExecutionStep;\r
 import org.argeo.slc.structure.StructureAware;\r
-import org.argeo.slc.structure.StructureElement;\r
 import org.argeo.slc.structure.StructureRegistry;\r
 import org.argeo.slc.test.ExecutableTestRun;\r
 import org.argeo.slc.test.TestData;\r
@@ -37,6 +35,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun,
        private TestResult testResult;\r
 \r
        /** Executes the underlying test definition. */\r
+       @SuppressWarnings("unchecked")\r
        public void run() {\r
                uuid = UUID.randomUUID().toString();\r
                if (testResult != null)\r
@@ -55,6 +54,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun,
                testDefinition.execute(this);\r
        }\r
 \r
+       @SuppressWarnings("unchecked")\r
        public <T extends DeployedSystem> T getDeployedSystem() {\r
                return (T) deployedSystem;\r
        }\r
@@ -63,6 +63,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun,
                this.deployedSystem = deployedSystem;\r
        }\r
 \r
+       @SuppressWarnings("unchecked")\r
        public <T extends TestData> T getTestData() {\r
                return (T) testData;\r
        }\r
@@ -71,6 +72,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun,
                this.testData = testData;\r
        }\r
 \r
+       @SuppressWarnings("unchecked")\r
        public <T extends TestDefinition> T getTestDefinition() {\r
                return (T) testDefinition;\r
        }\r
@@ -79,6 +81,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun,
                this.testDefinition = testDefinition;\r
        }\r
 \r
+       @SuppressWarnings("unchecked")\r
        public <T extends TestResult> T getTestResult() {\r
                return (T) testResult;\r
        }\r

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestDataUtils.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestDataUtils.java
index c05a5a54454d2c9f9396915b1f7da1baeb97c17c..2721b06b7b37a878c27ffaaa156606940cf34764 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestDataUtils.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/TestDataUtils.java
@@ -30,6 +30,7 @@ public class TestDataUtils {
         * Returns it self after making the proper checks. Used for test data being\r
         * their own data providers.\r
         */\r
+       @SuppressWarnings("unchecked")\r
        public static <T extends TestData> T getItSelf(Class<T> clss,\r
                        TestData testDataObject) {\r
                if (clss.isAssignableFrom(testDataObject.getClass())) {\r

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ContextUtils.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ContextUtils.java
index ecaa7c3478746a762ce9fef2b1f092e6667eb4bf..8d795405c99946aa6fd9c82596ed722e8e97b7d9 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ContextUtils.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ContextUtils.java
@@ -63,6 +63,7 @@ public class ContextUtils {
                }\r
        }\r
 \r
+       @SuppressWarnings("unchecked")\r
        private static void registerInStructure(TestResult testResult,\r
                        TreeSRelated treeSRelated, String key) {\r
                if (treeSRelated != null) {\r
@@ -83,6 +84,7 @@ public class ContextUtils {
                }\r
        }\r
 \r
+       @SuppressWarnings("unchecked")\r
        private static void resetStructure(TestResult testResult,\r
                        TreeSRelated treeSRelated) {\r
                if (treeSRelated != null) {\r

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java
index 1f5e89342ed5f8dd7c028b38375e65847ad8a87c..00855829d95d6b9abad931810d31f80241f33213 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/CompositeTreeTestDefinition.java
@@ -28,6 +28,7 @@ public class CompositeTreeTestDefinition implements TestDefinition,
        private TreeSPath path;\r
        private StructureRegistry<TreeSPath> registry;\r
 \r
+       @SuppressWarnings("unchecked")\r
        public void execute(TestRun testRun) {\r
                if (log.isTraceEnabled())\r
                        log.trace("Execute sequence of test definitions...");\r
@@ -58,6 +59,7 @@ public class CompositeTreeTestDefinition implements TestDefinition,
                }\r
        }\r
 \r
+       @SuppressWarnings("unchecked")\r
        public void notifyCurrentPath(StructureRegistry<TreeSPath> registry,\r
                        TreeSPath path) {\r
                this.path = path;\r

diff --git a/runtime/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java b/runtime/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java
index 6fc98525488de51db1dda6453db0e1b8f359dda2..5dbd270f05fa22c541f82454caf18a0ddb58b0b4 100644 (file)
--- a/runtime/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java
+++ b/runtime/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java
@@ -77,7 +77,8 @@ public class FileDriver extends AbstractDriver implements DetachedClient,
                return answer;
        }
 
-       public synchronized void sendRequest(DetachedRequest request) throws Exception {
+       public synchronized void sendRequest(DetachedRequest request)
+                       throws Exception {
                sendFile(requestsDir, request);
                if (log.isTraceEnabled())
                        log.trace("Sent     detached request #" + request.getUuid()
@@ -242,7 +243,8 @@ public class FileDriver extends AbstractDriver implements DetachedClient,
                createIfNotExist(processedAnswersDir);
                createIfNotExist(cleanedRequestsDir);
                createIfNotExist(cleanedAnswersDir);
-               log.info("Detached File Driver initialized on " + baseDir);
+               if (log.isDebugEnabled())
+                       log.debug("Detached File Driver initialized on " + baseDir);
        }
 
        public void cleanPreviousRuns() throws Exception {

diff --git a/runtime/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/MemoryDriver.java b/runtime/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/MemoryDriver.java
index f8c03ae35b28489ab897723a43ab496a23f1f192..ffae5efda30b843cbec3f8203fbea59407154b16 100644 (file)
--- a/runtime/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/MemoryDriver.java
+++ b/runtime/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/MemoryDriver.java
@@ -1,13 +1,10 @@
 package org.argeo.slc.detached.drivers;
 
-import java.util.Stack;
-
 import org.argeo.slc.detached.DetachedAnswer;
 import org.argeo.slc.detached.DetachedClient;
 import org.argeo.slc.detached.DetachedRequest;
 
 public class MemoryDriver extends AbstractDriver implements DetachedClient {
-       private final static Stack stack = new Stack();
 
        // DRIVER
        public DetachedRequest receiveRequest() throws Exception {

diff --git a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Launcher.java b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Launcher.java
index 8116b71f34b9165a0d8e868dff216574ff352eb0..802577dcc07dba77b737f75e86a5efe88bfe57da 100644 (file)
--- a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Launcher.java
+++ b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Launcher.java
@@ -23,32 +23,15 @@ public class Launcher {
                OsgiBoot osgiBoot = new OsgiBoot(bundleContext);
                osgiBoot.bootstrap();
        }
-//
-//     protected static void startEquinox(Properties config) throws Exception {
-//             info("java.home=" + System.getProperty("java.home"));
-//             info("java.class.path=" + System.getProperty("java.class.path"));
-//
-//             File baseDir = new File(System.getProperty("user.dir"))
-//                             .getCanonicalFile();
-//             String equinoxConfigurationPath = baseDir.getPath() + File.separator
-//                             + "slc-detached" + File.separator + "equinoxConfiguration";
-//
-//             String equinoxArgsLineDefault = "-console -noExit -clean -debug -configuration "
-//                             + equinoxConfigurationPath;
-//             String equinoxArgsLine = config.getProperty(PROP_SLC_OSGI_EQUINOX_ARGS,
-//                             equinoxArgsLineDefault);
-//             // String[] equinoxArgs = { "-console", "-noExit", "-clean", "-debug",
-//             // "-configuration", equinoxConfigurationPath };
-//             String[] equinoxArgs = equinoxArgsLine.split(" ");
-//
-//             BundleContext context = EclipseStarter.startup(equinoxArgs, null);
-//     }
 
        protected static void startMainClass() {
                Properties config = System.getProperties();
-               String className = config.getProperty("slc.detached.appclass");
+               String className = config.getProperty("slc.osgiboot.appclass");
+               if (className == null)
+                       return;
+
                String[] uiArgs = readArgumentsFromLine(config.getProperty(
-                               "slc.detached.appargs", ""));
+                               "slc.osgiboot.appargs", ""));
                try {
                        // Launch main method using reflection
                        Class clss = Class.forName(className);