From fa98571e9fa36276c42bda9535e4352b2e83c933 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 24 Jul 2009 10:29:49 +0000 Subject: [PATCH] Small enhancements git-svn-id: https://svn.argeo.org/slc/trunk@2749 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../slc/core/execution/tasks/JvmProcess.java | 2 +- .../core/structure/tree/TreeSRegistry.java | 1 + .../argeo/slc/core/test/SimpleTestRun.java | 7 +++-- .../argeo/slc/core/test/TestDataUtils.java | 1 + .../slc/core/test/context/ContextUtils.java | 2 ++ .../tree/CompositeTreeTestDefinition.java | 2 ++ .../slc/detached/drivers/FileDriver.java | 6 +++-- .../slc/detached/drivers/MemoryDriver.java | 3 --- .../java/org/argeo/slc/osgiboot/Launcher.java | 27 ++++--------------- 9 files changed, 21 insertions(+), 30 deletions(-) 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 2be9e8cea..edc7188b1 100644 --- 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 5b0a54fdd..3bec9d38c 100644 --- 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 { private List activePaths; + @SuppressWarnings("unchecked") public T getElement(TreeSPath path) { return (T) elements.get(path); } 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 86b35323b..ea71274b4 100644 --- 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; import org.argeo.slc.core.structure.tree.TreeSPath; -import org.argeo.slc.core.structure.tree.TreeSRegistry; import org.argeo.slc.deploy.DeployedSystem; import org.argeo.slc.process.SlcExecution; import org.argeo.slc.process.SlcExecutionRelated; import org.argeo.slc.process.SlcExecutionStep; import org.argeo.slc.structure.StructureAware; -import org.argeo.slc.structure.StructureElement; import org.argeo.slc.structure.StructureRegistry; import org.argeo.slc.test.ExecutableTestRun; import org.argeo.slc.test.TestData; @@ -37,6 +35,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun, private TestResult testResult; /** Executes the underlying test definition. */ + @SuppressWarnings("unchecked") public void run() { uuid = UUID.randomUUID().toString(); if (testResult != null) @@ -55,6 +54,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun, testDefinition.execute(this); } + @SuppressWarnings("unchecked") public T getDeployedSystem() { return (T) deployedSystem; } @@ -63,6 +63,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun, this.deployedSystem = deployedSystem; } + @SuppressWarnings("unchecked") public T getTestData() { return (T) testData; } @@ -71,6 +72,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun, this.testData = testData; } + @SuppressWarnings("unchecked") public T getTestDefinition() { return (T) testDefinition; } @@ -79,6 +81,7 @@ public class SimpleTestRun implements WritableTestRun, ExecutableTestRun, this.testDefinition = testDefinition; } + @SuppressWarnings("unchecked") public T getTestResult() { return (T) testResult; } 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 c05a5a544..2721b06b7 100644 --- 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 * their own data providers. */ + @SuppressWarnings("unchecked") public static T getItSelf(Class clss, TestData testDataObject) { if (clss.isAssignableFrom(testDataObject.getClass())) { 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 ecaa7c347..8d795405c 100644 --- 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 { } } + @SuppressWarnings("unchecked") private static void registerInStructure(TestResult testResult, TreeSRelated treeSRelated, String key) { if (treeSRelated != null) { @@ -83,6 +84,7 @@ public class ContextUtils { } } + @SuppressWarnings("unchecked") private static void resetStructure(TestResult testResult, TreeSRelated treeSRelated) { if (treeSRelated != null) { 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 1f5e89342..00855829d 100644 --- 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; private StructureRegistry registry; + @SuppressWarnings("unchecked") public void execute(TestRun testRun) { if (log.isTraceEnabled()) log.trace("Execute sequence of test definitions..."); @@ -58,6 +59,7 @@ public class CompositeTreeTestDefinition implements TestDefinition, } } + @SuppressWarnings("unchecked") public void notifyCurrentPath(StructureRegistry registry, TreeSPath path) { this.path = path; 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 6fc985254..5dbd270f0 100644 --- 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 f8c03ae35..ffae5efda 100644 --- 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 8116b71f3..802577dcc 100644 --- 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); -- 2.39.2