Improve Spring/Ant bridge

Change close result task

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

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 f07f374e84fe96fb3241eabac9216d574e138fe8..924d906fc7e901b75c327d7457b3121d32fc36f7 100644 (file)
--- 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" />\r
 \r
        <target name="test" depends="testSimple,testComplex,testError">\r
-               <slc.closeResult result="testResult" />\r
-               <slc.closeResult result="testResult2" />\r
+               <slc.closeResult>
+                       <result bean="testResult" />
+               </slc.closeResult>
+               <slc.closeResult>
+                       <result bean="testResult2" />
+               </slc.closeResult>
                <slc.report report="report" />\r
        </target>\r
 \r

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 3a15d0e44de69b543f1c20fef457a1aed9242c59..3dfe4cfdfde4aa096a04607245531430208ec51e 100644 (file)
--- 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;\r
 import org.apache.tools.ant.Project;\r
 import org.argeo.slc.ant.AntRegistryUtil;\r
-import org.argeo.slc.ant.SlcProjectHelper;\r
+import org.argeo.slc.ant.SlcAntConstants;\r
 import org.argeo.slc.core.test.TestStatus;\r
 import org.argeo.slc.core.test.tree.TreeTestResult;\r
 import org.argeo.slc.dao.test.TestResultDao;\r
@@ -77,7 +77,7 @@ public class ContextIntegrationTest extends TestCase {
                Project p = AntRegistryUtil.runAll(antFile, target);\r
 \r
                ApplicationContext context = (ApplicationContext) p\r
-                               .getReference(SlcProjectHelper.REF_ROOT_CONTEXT);\r
+                               .getReference(SlcAntConstants.REF_ROOT_CONTEXT);\r
 \r
                TestResultDao<TreeTestResult> testResultDao = (TestResultDao<TreeTestResult>) context\r
                                .getBean("testResultDao");\r

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 c072a21be94ce6c7c4c721d61fe1c476aa549130..4d30e1a2338af9a426c6bc93173056896ff77ba5 100644 (file)
--- 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;\r
 import org.apache.tools.ant.Project;\r
 import org.argeo.slc.ant.AntRegistryUtil;\r
-import org.argeo.slc.ant.SlcProjectHelper;\r
+import org.argeo.slc.ant.SlcAntConstants;\r
 import org.argeo.slc.core.test.TestStatus;\r
 import org.argeo.slc.core.test.tree.TreeTestResult;\r
 import org.argeo.slc.dao.test.TestResultDao;\r
@@ -36,7 +36,7 @@ public class ExampleIntegrationTest extends TestCase {
                Project p = AntRegistryUtil.runAll(antFile);\r
 \r
                ApplicationContext context = (ApplicationContext) p\r
-                               .getReference(SlcProjectHelper.REF_ROOT_CONTEXT);\r
+                               .getReference(SlcAntConstants.REF_ROOT_CONTEXT);\r
 \r
                TestResultDao testResultDao = (TestResultDao) context\r
                                .getBean("testResultDao");\r