From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 29 Aug 2008 09:41:42 +0000 (+0000)
Subject: Revert to Java 5 compatibility
X-Git-Tag: argeo-slc-2.1.7~2610
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=4a8845940afb3a147f23dedbf75dea5e26103352;p=gpl%2Fargeo-slc.git

Revert to Java 5 compatibility

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

diff --git a/org.argeo.slc.agent/.classpath b/org.argeo.slc.agent/.classpath
index a0062939f..372e5299e 100644
--- a/org.argeo.slc.agent/.classpath
+++ b/org.argeo.slc.agent/.classpath
@@ -1,12 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.argeo.slc.agent/.settings/org.eclipse.jdt.core.prefs b/org.argeo.slc.agent/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..964778b0e
--- /dev/null
+++ b/org.argeo.slc.agent/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Fri Aug 29 11:31:46 CEST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java
index 51ff337e4..37bdff0dc 100644
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java
@@ -134,7 +134,8 @@ public class AntSlcApplication {
 						IOUtils.closeQuietly(in);
 					}
 
-					for (String key : slcProperties.stringPropertyNames()) {
+					for (Object obj : slcProperties.keySet()) {
+						String key = obj.toString();
 						if (!System.getProperties().containsKey(key)) {
 							String value = SystemPropertyUtils
 									.resolvePlaceholders(slcProperties
diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
index d2661792b..7447583ab 100644
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
@@ -180,11 +180,9 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
 		return logBeforeFirstTarget || firstTargetStarted;
 	}
 
-	@Override
 	public void close() {
 	}
 
-	@Override
 	public boolean requiresLayout() {
 		return false;
 	}
diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java
index 0267715c8..e46bc8434 100644
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/SlcMain.java
@@ -207,7 +207,8 @@ public class SlcMain {
 		System.setProperty("log4j.defaultInitOverride", "true");
 
 		// Add log4j user properties to System properties
-		for (String key : userProperties.stringPropertyNames()) {
+		for (Object obj : userProperties.keySet()) {
+			String key = obj.toString();
 			if (key.startsWith("log4j.")) {
 				System.setProperty(key, userProperties.getProperty(key));
 			}