From 4d4cf9b0c21df6d831865bdf0f927d4ec16c5454 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 23 Oct 2007 08:25:11 +0000
Subject: [PATCH] Use data type for spring args

git-svn-id: https://svn.argeo.org/slc/trunk@631 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org/argeo/slc/ant/AbstractSpringArg.java  | 20 ++++++++++---------
 .../java/org/argeo/slc/ant/SlcTestTask.java   | 12 ++---------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/AbstractSpringArg.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/AbstractSpringArg.java
index 2e2f3dfef..aa633d92a 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/AbstractSpringArg.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/AbstractSpringArg.java
@@ -7,13 +7,14 @@ import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.context.ApplicationContext;
 
-import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Location;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.DataType;
 
-public abstract class AbstractSpringArg {
+public abstract class AbstractSpringArg extends DataType {
 	private List<OverrideArg> overrides = new Vector<OverrideArg>();
 
 	private String bean;
-	private ApplicationContext context;
 
 	public String getBean() {
 		return bean;
@@ -24,7 +25,7 @@ public abstract class AbstractSpringArg {
 	}
 
 	protected Object getBeanInstance() {
-		Object obj = context.getBean(bean);
+		Object obj = getContext().getBean(bean);
 
 		BeanWrapper wrapper = new BeanWrapperImpl(obj);
 		for (OverrideArg override : overrides) {
@@ -34,14 +35,15 @@ public abstract class AbstractSpringArg {
 		return obj;
 	}
 
-	public void setContext(ApplicationContext context) {
-		this.context = context;
-	}
-
 	public OverrideArg createOverride() {
 		OverrideArg propertyArg = new OverrideArg();
-		propertyArg.setContext(context);
 		overrides.add(propertyArg);
 		return propertyArg;
 	}
+
+	protected ApplicationContext getContext() {
+		return (ApplicationContext) getProject().getReference(
+				SlcProjectHelper.REF_ROOT_CONTEXT);
+	}
+
 }
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcTestTask.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcTestTask.java
index 983b5fa32..e082fe43c 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcTestTask.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcTestTask.java
@@ -20,31 +20,23 @@ public class SlcTestTask extends AbstractSpringTask {
 	}
 
 	public TestDefinitionArg createTestDefinition() {
-		testDefinitionArg = new TestDefinitionArg(getContext());
+		testDefinitionArg = new TestDefinitionArg();
 		return testDefinitionArg;
 	}
 
 	public TestDataArg createTestData() {
-		testDataArg = new TestDataArg(getContext());
+		testDataArg = new TestDataArg();
 		return testDataArg;
 	}
 }
 
 class TestDefinitionArg extends AbstractSpringArg {
-	public TestDefinitionArg(ApplicationContext context) {
-		setContext(context);
-	}
-	
 	public TestDefinition getTestDefinition(){
 		return (TestDefinition)getBeanInstance();
 	}
 }
 
 class TestDataArg extends AbstractSpringArg {
-	public TestDataArg(ApplicationContext context) {
-		setContext(context);
-	}
-	
 	public TestData getTestData(){
 		return (TestData)getBeanInstance();
 	}
-- 
2.39.5