Remove the Task suffix

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

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/CloseTestResult.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/CloseTestResult.java
new file mode 100644 (file)
index 0000000..76460d6
--- /dev/null
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/CloseTestResult.java
@@ -0,0 +1,16 @@
+package org.argeo.slc.core.execution.tasks;
+
+import org.argeo.slc.test.TestResult;
+
+public class CloseTestResult implements Runnable {
+       private TestResult testResult;
+
+       public void run() {
+               testResult.close();
+       }
+
+       public void setTestResult(TestResult testResult) {
+               this.testResult = testResult;
+       }
+
+}

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/CloseTestResultTask.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/CloseTestResultTask.java
deleted file mode 100644 (file)
index e117a69..0000000
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/CloseTestResultTask.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.argeo.slc.core.execution.tasks;
-
-import org.argeo.slc.test.TestResult;
-
-public class CloseTestResultTask implements Runnable {
-       private TestResult testResult;
-
-       public void run() {
-               testResult.close();
-       }
-
-       public void setTestResult(TestResult testResult) {
-               this.testResult = testResult;
-       }
-
-}

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SlcManager.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SlcManager.java
new file mode 100644 (file)
index 0000000..58397d3
--- /dev/null
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SlcManager.java
@@ -0,0 +1,78 @@
+package org.argeo.slc.core.execution.tasks;\r
+\r
+import java.lang.reflect.Method;\r
+import java.util.UUID;\r
+\r
+import org.argeo.slc.SlcException;\r
+import org.argeo.slc.deploy.DeployedSystem;\r
+import org.argeo.slc.deploy.DeployedSystemManager;\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.StructureRegistry;\r
+\r
+public class SlcManager implements Runnable, SlcExecutionRelated {\r
+       private String uuid;\r
+       private String slcExecutionUuid;\r
+       private String slcExecutionStepUuid;\r
+       \r
+       private String action;\r
+       private DeployedSystemManager<DeployedSystem> manager;\r
+\r
+       public final void run() {\r
+               uuid = UUID.randomUUID().toString();\r
+               executeActions(StructureRegistry.ALL);\r
+       }\r
+       \r
+       protected void executeActions(String mode) {\r
+               try {\r
+                       Method method = manager.getClass().getMethod(action, null);\r
+                       method.invoke(manager, null);\r
+               } catch (Exception e) {\r
+                       throw new SlcException("Cannot execute action " + action\r
+                                       + " for manager " + manager, e);\r
+               }\r
+       }\r
+       \r
+       public void setAction(String action) {\r
+               this.action = action;\r
+       }\r
+\r
+       public void setManager(DeployedSystemManager<DeployedSystem> manager) {\r
+               this.manager = manager;\r
+       }\r
+\r
+       public String getUuid() {\r
+               return uuid;\r
+       }\r
+\r
+       public void setUuid(String uuid) {\r
+               this.uuid = uuid;\r
+       }\r
+\r
+       public String getSlcExecutionUuid() {\r
+               return slcExecutionUuid;\r
+       }\r
+\r
+       public void setSlcExecutionUuid(String slcExecutionUuid) {\r
+               this.slcExecutionUuid = slcExecutionUuid;\r
+       }\r
+\r
+       public String getSlcExecutionStepUuid() {\r
+               return slcExecutionStepUuid;\r
+       }\r
+\r
+       public void setSlcExecutionStepUuid(String slcExecutionStepUuid) {\r
+               this.slcExecutionStepUuid = slcExecutionStepUuid;\r
+       }\r
+       \r
+       public void notifySlcExecution(SlcExecution slcExecution) {\r
+               if (slcExecution != null) {\r
+                       slcExecutionUuid = slcExecution.getUuid();\r
+                       SlcExecutionStep step = slcExecution.currentStep();\r
+                       if (step != null) {\r
+                               slcExecutionStepUuid = step.getUuid();\r
+                       }\r
+               }\r
+       }\r
+}\r

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SlcManagerTask.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SlcManagerTask.java
deleted file mode 100644 (file)
index 4da708c..0000000
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/SlcManagerTask.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.argeo.slc.core.execution.tasks;\r
-\r
-import java.lang.reflect.Method;\r
-import java.util.UUID;\r
-\r
-import org.argeo.slc.SlcException;\r
-import org.argeo.slc.deploy.DeployedSystem;\r
-import org.argeo.slc.deploy.DeployedSystemManager;\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.StructureRegistry;\r
-\r
-public class SlcManagerTask implements Runnable, SlcExecutionRelated {\r
-       private String uuid;\r
-       private String slcExecutionUuid;\r
-       private String slcExecutionStepUuid;\r
-       \r
-       private String action;\r
-       private DeployedSystemManager<DeployedSystem> manager;\r
-\r
-       public final void run() {\r
-               uuid = UUID.randomUUID().toString();\r
-               executeActions(StructureRegistry.ALL);\r
-       }\r
-       \r
-       protected void executeActions(String mode) {\r
-               try {\r
-                       Method method = manager.getClass().getMethod(action, null);\r
-                       method.invoke(manager, null);\r
-               } catch (Exception e) {\r
-                       throw new SlcException("Cannot execute action " + action\r
-                                       + " for manager " + manager, e);\r
-               }\r
-       }\r
-       \r
-       public void setAction(String action) {\r
-               this.action = action;\r
-       }\r
-\r
-       public void setManager(DeployedSystemManager<DeployedSystem> manager) {\r
-               this.manager = manager;\r
-       }\r
-\r
-       public String getUuid() {\r
-               return uuid;\r
-       }\r
-\r
-       public void setUuid(String uuid) {\r
-               this.uuid = uuid;\r
-       }\r
-\r
-       public String getSlcExecutionUuid() {\r
-               return slcExecutionUuid;\r
-       }\r
-\r
-       public void setSlcExecutionUuid(String slcExecutionUuid) {\r
-               this.slcExecutionUuid = slcExecutionUuid;\r
-       }\r
-\r
-       public String getSlcExecutionStepUuid() {\r
-               return slcExecutionStepUuid;\r
-       }\r
-\r
-       public void setSlcExecutionStepUuid(String slcExecutionStepUuid) {\r
-               this.slcExecutionStepUuid = slcExecutionStepUuid;\r
-       }\r
-       \r
-       public void notifySlcExecution(SlcExecution slcExecution) {\r
-               if (slcExecution != null) {\r
-                       slcExecutionUuid = slcExecution.getUuid();\r
-                       SlcExecutionStep step = slcExecution.currentStep();\r
-                       if (step != null) {\r
-                               slcExecutionStepUuid = step.getUuid();\r
-                       }\r
-               }\r
-       }\r
-}\r

diff --git a/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/tasks/core.xml b/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/tasks/core.xml
index 26fe27b141318b80cf7ec4e978bd0412b4184e04..88b38bcc2814b528bcd73f8b58a7fb89beef5bbd 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/tasks/core.xml
+++ b/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/tasks/core.xml
@@ -8,9 +8,9 @@
                abstract="true" />
        <bean id="task.systemCall" class="org.argeo.slc.core.execution.tasks.SystemCall"
                abstract="true" />
-       <bean id="task.closeTestResult" class="org.argeo.slc.core.execution.tasks.CloseTestResultTask"
+       <bean id="task.closeTestResult" class="org.argeo.slc.core.execution.tasks.CloseTestResult"
                abstract="true" />
-       <bean id="task.slcManager" class="org.argeo.slc.core.execution.tasks.SlcManagerTask"
+       <bean id="task.slcManager" class="org.argeo.slc.core.execution.tasks.SlcManager"
                abstract="true" />
        <bean id="task.overrideContextAware" class="org.argeo.slc.core.execution.tasks.OverrideContextAware"
                abstract="true" />