From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 16 Dec 2007 20:42:20 +0000 (+0000)
Subject: Modifications required for web
X-Git-Tag: argeo-slc-2.1.7~3101
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=6045cf4f30c0df343c0625bd4815584ff9a4b805;p=gpl%2Fargeo-slc.git

Modifications required for web

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

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
index 61ca74774..11fdd6431 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
@@ -153,7 +153,9 @@ public class SlcAntConfig {
 
 		// pass the project properties through the System properties
 		System.getProperties().putAll((Map<?, ?>) project.getUserProperties());
-		Properties all = prepareAllProperties(slcRootFile);
+		Properties all = new Properties();
+		all.putAll(System.getProperties());
+		prepareAllProperties(slcRootFile,all);
 
 		Log log = LogFactory.getLog(this.getClass());
 		for (Object o : all.keySet()) {
@@ -177,12 +179,10 @@ public class SlcAntConfig {
 	 * @return the prepared properties. Note that it also contains the System
 	 *         and Ant properties which had previously been set.
 	 */
-	protected Properties prepareAllProperties(File slcRootFile) {
+	public void prepareAllProperties(File slcRootFile, Properties all) {
 		try {
 			final String fileUrlPrefix = "";
 
-			Properties all = new Properties();
-			all.putAll(System.getProperties());
 			all.put(ROOT_FILE_PROPERTY, slcRootFile.getCanonicalPath());
 			// Remove basedir property in order to avoid conflict with Maven
 			if (all.containsKey("basedir"))
@@ -258,8 +258,6 @@ public class SlcAntConfig {
 				Log4jConfigurer.initLogging(confDir.getCanonicalPath()
 						+ File.separator + "log4j.properties");
 			}
-
-			return all;
 		} catch (Exception e) {
 			throw new SlcAntException("Unexpected exception while configuring",
 					e);