Use ProjectImpl2 in order to deal with import of Ant files

ASSIGNED - bug 45: imported ANT tasks are not found by SLC
https://www.argeo.org/bugzilla/show_bug.cgi?id=45

git-svn-id: https://svn.argeo.org/slc/branches/0.6@847 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 b773212cdadcf5c22f5f8ba1e63c55b77ec8142f..293d7c94422f81866f2ac3606030b46d5163d6c8 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml
@@ -1,6 +1,8 @@
 <project default="test" name="testProject">\r
        <description>A Test project</description>\r
 \r
+       <import file="complex.xml"/>\r
+       \r
        <target name="test" depends="testSimple,testComplex,testError">\r
                <slc.closeResult result="testResult" />\r
                <slc.closeResult result="testResult2" />\r
@@ -32,23 +34,6 @@
 \r
        </target>\r
 \r
-       <target name="testComplex" description="A complex test">\r
-               <slc.test description="Complex test">\r
-                       <testDefinition bean="complexExampleTestDef" />\r
-                       <testData bean="testData.un" />\r
-               </slc.test>\r
-               <slc.test description="Complex overridden">\r
-                       <testDefinition bean="complexExampleTestDef">\r
-                               <override name="tasks">\r
-                                       <list>\r
-                                               <override bean="dummyTask" />\r
-                                       </list>\r
-                               </override>\r
-                       </testDefinition>\r
-                       <testData bean="testData.un" />\r
-               </slc.test>\r
-       </target>\r
-\r
        <target name="testError" description="A crashing test">\r
                <slc.test description="UN crashing">\r
                        <testDefinition bean="simpleExampleTestDef" />\r

diff --git a/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/complex.xml b/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/complex.xml
new file mode 100644 (file)
index 0000000..57c39e5
--- /dev/null
+++ b/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/complex.xml
@@ -0,0 +1,23 @@
+<project>\r
+       <description>Complex targets</description>\r
+\r
+\r
+       <target name="testComplex" description="A complex test">\r
+               <slc.test description="Complex test">\r
+                       <testDefinition bean="complexExampleTestDef" />\r
+                       <testData bean="testData.un" />\r
+               </slc.test>\r
+               <slc.test description="Complex overridden">\r
+                       <testDefinition bean="complexExampleTestDef">\r
+                               <override name="tasks">\r
+                                       <list>\r
+                                               <override bean="dummyTask" />\r
+                                       </list>\r
+                               </override>\r
+                       </testDefinition>\r
+                       <testData bean="testData.un" />\r
+               </slc.test>\r
+       </target>\r
+\r
+\r
+</project>
\ No newline at end of file