From 27025438dafbc77a25f0b14d56e07bfc2e2f2c96 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 10 Jun 2008 11:17:32 +0000
Subject: [PATCH] Improve Spring/Ant bridge Change close result task

git-svn-id: https://svn.argeo.org/slc/trunk@1227 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../exampleSlcAppli/root/Category1/SubCategory2/build.xml | 8 ++++++--
 .../argeo/slc/example/junit/ContextIntegrationTest.java   | 4 ++--
 .../argeo/slc/example/junit/ExampleIntegrationTest.java   | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml b/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml
index f07f374e8..924d906fc 100644
--- a/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml
@@ -4,8 +4,12 @@
 	<import file="complex.xml" />
 
 	<target name="test" depends="testSimple,testComplex,testError">
-		<slc.closeResult result="testResult" />
-		<slc.closeResult result="testResult2" />
+		<slc.closeResult>
+			<result bean="testResult" />
+		</slc.closeResult>
+		<slc.closeResult>
+			<result bean="testResult2" />
+		</slc.closeResult>
 		<slc.report report="report" />
 	</target>
 
diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ContextIntegrationTest.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ContextIntegrationTest.java
index 3a15d0e44..3dfe4cfdf 100644
--- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ContextIntegrationTest.java
+++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ContextIntegrationTest.java
@@ -8,7 +8,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tools.ant.Project;
 import org.argeo.slc.ant.AntRegistryUtil;
-import org.argeo.slc.ant.SlcProjectHelper;
+import org.argeo.slc.ant.SlcAntConstants;
 import org.argeo.slc.core.test.TestStatus;
 import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.dao.test.TestResultDao;
@@ -77,7 +77,7 @@ public class ContextIntegrationTest extends TestCase {
 		Project p = AntRegistryUtil.runAll(antFile, target);
 
 		ApplicationContext context = (ApplicationContext) p
-				.getReference(SlcProjectHelper.REF_ROOT_CONTEXT);
+				.getReference(SlcAntConstants.REF_ROOT_CONTEXT);
 
 		TestResultDao<TreeTestResult> testResultDao = (TestResultDao<TreeTestResult>) context
 				.getBean("testResultDao");
diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java
index c072a21be..4d30e1a23 100644
--- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java
+++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/junit/ExampleIntegrationTest.java
@@ -8,7 +8,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tools.ant.Project;
 import org.argeo.slc.ant.AntRegistryUtil;
-import org.argeo.slc.ant.SlcProjectHelper;
+import org.argeo.slc.ant.SlcAntConstants;
 import org.argeo.slc.core.test.TestStatus;
 import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.dao.test.TestResultDao;
@@ -36,7 +36,7 @@ public class ExampleIntegrationTest extends TestCase {
 		Project p = AntRegistryUtil.runAll(antFile);
 
 		ApplicationContext context = (ApplicationContext) p
-				.getReference(SlcProjectHelper.REF_ROOT_CONTEXT);
+				.getReference(SlcAntConstants.REF_ROOT_CONTEXT);
 
 		TestResultDao testResultDao = (TestResultDao) context
 				.getBean("testResultDao");
-- 
2.39.5