From 7f642879a07b8bb8806b94662f98fd44abe04ca6 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 27 Nov 2008 07:05:20 +0000
Subject: [PATCH] Change default SLC root location

git-svn-id: https://svn.argeo.org/slc/trunk@1873 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org/argeo/slc/ant/unit/AntSlcApplicationTestCase.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/unit/AntSlcApplicationTestCase.java b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/unit/AntSlcApplicationTestCase.java
index b7f5a0cd6..df78a225a 100644
--- a/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/unit/AntSlcApplicationTestCase.java
+++ b/runtime/org.argeo.slc.support.ant/src/main/java/org/argeo/slc/ant/unit/AntSlcApplicationTestCase.java
@@ -1,5 +1,7 @@
 package org.argeo.slc.ant.unit;
 
+import java.io.File;
+
 import junit.framework.TestCase;
 
 import org.argeo.slc.ant.AntExecutionContext;
@@ -15,7 +17,10 @@ public abstract class AntSlcApplicationTestCase extends TestCase implements
 	}
 
 	protected String getRootDir() {
-		return System.getProperty("slc.rootDir", "src/main/slc/root");
+		String rootDirPath =  System.getProperty("slc.rootDir", "src/slc/root");
+		if(!new File(rootDirPath).exists())
+			rootDirPath = "src/main/slc/root";// try older convention
+		return rootDirPath;
 	}
 
 	protected String getAbsoluteScript(String relative) {
-- 
2.39.5