Rename OverrideContextAware task

Ass other task to core.xml

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

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAware.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAware.java
new file mode 100644 (file)
index 0000000..e48cb81
--- /dev/null
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAware.java
@@ -0,0 +1,45 @@
+package org.argeo.slc.core.execution.tasks;\r
+\r
+import org.argeo.slc.SlcException;\r
+import org.argeo.slc.core.test.context.SimpleContextAware;\r
+import org.argeo.slc.core.test.context.SimpleParentContextAware;\r
+import org.argeo.slc.execution.Executable;\r
+import org.argeo.slc.test.context.ContextAware;\r
+\r
+public class OverrideContextAware implements Executable {\r
+\r
+       private ContextAware source;\r
+\r
+       private SimpleContextAware target;\r
+       \r
+\r
+       public void setSource(ContextAware source) {\r
+               this.source = source;\r
+       }\r
+\r
+\r
+       public void setTarget(SimpleContextAware target) {\r
+               this.target = target;\r
+       }\r
+\r
+\r
+       public void execute() {\r
+               // override values\r
+               if(source.getValues() != null)\r
+                       for(String key : source.getValues().keySet()) {\r
+                               if(!target.getValues().containsKey(key)) {\r
+                                       throw new SlcException("No entry in target values for key '" + key + "'");\r
+                               }\r
+                               target.getValues().put(key, source.getValues().get(key));\r
+                       }\r
+               \r
+               // override expected values\r
+               if(source.getExpectedValues() != null)\r
+                       for(String key : source.getExpectedValues().keySet()) {\r
+                               if(!target.getExpectedValues().containsKey(key)) {\r
+                                       throw new SlcException("No entry in target expected values for key '" + key + "'");\r
+                               }\r
+                               target.getExpectedValues().put(key, source.getExpectedValues().get(key));\r
+                       }               \r
+       }       \r
+}\r

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAwareTask.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAwareTask.java
deleted file mode 100644 (file)
index 45caa4b..0000000
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/OverrideContextAwareTask.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.argeo.slc.core.execution.tasks;\r
-\r
-import org.argeo.slc.SlcException;\r
-import org.argeo.slc.core.test.context.SimpleContextAware;\r
-import org.argeo.slc.core.test.context.SimpleParentContextAware;\r
-import org.argeo.slc.execution.Executable;\r
-import org.argeo.slc.test.context.ContextAware;\r
-\r
-public class OverrideContextAwareTask implements Executable {\r
-\r
-       private ContextAware source;\r
-\r
-       private SimpleContextAware target;\r
-       \r
-\r
-       public void setSource(ContextAware source) {\r
-               this.source = source;\r
-       }\r
-\r
-\r
-       public void setTarget(SimpleContextAware target) {\r
-               this.target = target;\r
-       }\r
-\r
-\r
-       public void execute() {\r
-               // override values\r
-               if(source.getValues() != null)\r
-                       for(String key : source.getValues().keySet()) {\r
-                               if(!target.getValues().containsKey(key)) {\r
-                                       throw new SlcException("No entry in target values for key '" + key + "'");\r
-                               }\r
-                               target.getValues().put(key, source.getValues().get(key));\r
-                       }\r
-               \r
-               // override expected values\r
-               if(source.getExpectedValues() != null)\r
-                       for(String key : source.getExpectedValues().keySet()) {\r
-                               if(!target.getExpectedValues().containsKey(key)) {\r
-                                       throw new SlcException("No entry in target expected values for key '" + key + "'");\r
-                               }\r
-                               target.getExpectedValues().put(key, source.getExpectedValues().get(key));\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 24e86c8cf0ac514a57b0b0d24004e519f8902659..7348b12a6b53658932d8542a12b666e4fb43b48b 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,4 +8,10 @@
                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"
+               abstract="true" />
+       <bean id="task.slcManager" class="org.argeo.slc.core.execution.tasks.SlcManagerTask"
+               abstract="true" />
+       <bean id="task.overrideContextAware" class="org.argeo.slc.core.execution.tasks.OverrideContextAware"
+               abstract="true" />
 </beans>
\ No newline at end of file