From e8c7f917991a5459436eb5edf7ccfb1f7611888f Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 11 Dec 2007 17:43:04 +0000
Subject: [PATCH] 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
---
 .../root/Category1/SubCategory2/build.xml     | 19 ++-------------
 .../root/Category1/SubCategory2/complex.xml   | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100644 org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/complex.xml

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 b773212cd..293d7c944 100644
--- 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">
 	<description>A Test project</description>
 
+	<import file="complex.xml"/>
+	
 	<target name="test" depends="testSimple,testComplex,testError">
 		<slc.closeResult result="testResult" />
 		<slc.closeResult result="testResult2" />
@@ -32,23 +34,6 @@
 
 	</target>
 
-	<target name="testComplex" description="A complex test">
-		<slc.test description="Complex test">
-			<testDefinition bean="complexExampleTestDef" />
-			<testData bean="testData.un" />
-		</slc.test>
-		<slc.test description="Complex overridden">
-			<testDefinition bean="complexExampleTestDef">
-				<override name="tasks">
-					<list>
-						<override bean="dummyTask" />
-					</list>
-				</override>
-			</testDefinition>
-			<testData bean="testData.un" />
-		</slc.test>
-	</target>
-
 	<target name="testError" description="A crashing test">
 		<slc.test description="UN crashing">
 			<testDefinition bean="simpleExampleTestDef" />
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
index 000000000..57c39e586
--- /dev/null
+++ b/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/complex.xml
@@ -0,0 +1,23 @@
+<project>
+	<description>Complex targets</description>
+
+
+	<target name="testComplex" description="A complex test">
+		<slc.test description="Complex test">
+			<testDefinition bean="complexExampleTestDef" />
+			<testData bean="testData.un" />
+		</slc.test>
+		<slc.test description="Complex overridden">
+			<testDefinition bean="complexExampleTestDef">
+				<override name="tasks">
+					<list>
+						<override bean="dummyTask" />
+					</list>
+				</override>
+			</testDefinition>
+			<testData bean="testData.un" />
+		</slc.test>
+	</target>
+
+
+</project>
\ No newline at end of file
-- 
2.39.2