From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 20 Apr 2009 08:13:43 +0000 (+0000)
Subject: Rename OverrideContextAware task
X-Git-Tag: argeo-slc-2.1.7~1986
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=63b5eb0bd0b282844093950ba05d77b1fcd0f664;p=gpl%2Fargeo-slc.git

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
index 000000000..e48cb8141
--- /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;
+
+import org.argeo.slc.SlcException;
+import org.argeo.slc.core.test.context.SimpleContextAware;
+import org.argeo.slc.core.test.context.SimpleParentContextAware;
+import org.argeo.slc.execution.Executable;
+import org.argeo.slc.test.context.ContextAware;
+
+public class OverrideContextAware implements Executable {
+
+	private ContextAware source;
+
+	private SimpleContextAware target;
+	
+
+	public void setSource(ContextAware source) {
+		this.source = source;
+	}
+
+
+	public void setTarget(SimpleContextAware target) {
+		this.target = target;
+	}
+
+
+	public void execute() {
+		// override values
+		if(source.getValues() != null)
+			for(String key : source.getValues().keySet()) {
+				if(!target.getValues().containsKey(key)) {
+					throw new SlcException("No entry in target values for key '" + key + "'");
+				}
+				target.getValues().put(key, source.getValues().get(key));
+			}
+		
+		// override expected values
+		if(source.getExpectedValues() != null)
+			for(String key : source.getExpectedValues().keySet()) {
+				if(!target.getExpectedValues().containsKey(key)) {
+					throw new SlcException("No entry in target expected values for key '" + key + "'");
+				}
+				target.getExpectedValues().put(key, source.getExpectedValues().get(key));
+			}		
+	}	
+}
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
index 45caa4bec..000000000
--- 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;
-
-import org.argeo.slc.SlcException;
-import org.argeo.slc.core.test.context.SimpleContextAware;
-import org.argeo.slc.core.test.context.SimpleParentContextAware;
-import org.argeo.slc.execution.Executable;
-import org.argeo.slc.test.context.ContextAware;
-
-public class OverrideContextAwareTask implements Executable {
-
-	private ContextAware source;
-
-	private SimpleContextAware target;
-	
-
-	public void setSource(ContextAware source) {
-		this.source = source;
-	}
-
-
-	public void setTarget(SimpleContextAware target) {
-		this.target = target;
-	}
-
-
-	public void execute() {
-		// override values
-		if(source.getValues() != null)
-			for(String key : source.getValues().keySet()) {
-				if(!target.getValues().containsKey(key)) {
-					throw new SlcException("No entry in target values for key '" + key + "'");
-				}
-				target.getValues().put(key, source.getValues().get(key));
-			}
-		
-		// override expected values
-		if(source.getExpectedValues() != null)
-			for(String key : source.getExpectedValues().keySet()) {
-				if(!target.getExpectedValues().containsKey(key)) {
-					throw new SlcException("No entry in target expected values for key '" + key + "'");
-				}
-				target.getExpectedValues().put(key, source.getExpectedValues().get(key));
-			}		
-	}	
-}
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 24e86c8cf..7348b12a6 100644
--- 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