Revert to Java 5 compatibility

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

diff --git a/org.argeo.slc.core/.classpath b/org.argeo.slc.core/.classpath
index 53b02f56c18a3715e927b707914a4780529740a3..372e5299edbec0d603ca69cccc6ae0c8894b433e 100644 (file)
--- a/org.argeo.slc.core/.classpath
+++ b/org.argeo.slc.core/.classpath
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" path="src/main/java"/>\r
-       <classpathentry kind="src" path="src/main/resources"/>\r
-       <classpathentry kind="src" path="src/test/java"/>\r
-       <classpathentry kind="src" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?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.core/.settings/org.eclipse.jdt.core.prefs b/org.argeo.slc.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..93d3174
--- /dev/null
+++ b/org.argeo.slc.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Fri Aug 29 11:10:18 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.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java
index 09da0753714b3cf076c0ab1ca699790b576dcdac..5f98940140037bd08ee22cd0e6788099a76adec3 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java
@@ -16,7 +16,6 @@ public class SimpleExecutables implements InstalledExecutables {
 
        private Distribution distribution;
 
-       @Override
        public String getExecutablePath(String key) {
                String path = paths.get(key);
                if (path == null) {
@@ -31,24 +30,20 @@ public class SimpleExecutables implements InstalledExecutables {
                return path;
        }
 
-       @Override
        public String getDeployedSystemId() {
                // TODO Auto-generated method stub
                return null;
        }
 
-       @Override
        public DeploymentData getDeploymentData() {
                // TODO Auto-generated method stub
                return null;
        }
 
-       @Override
        public Distribution getDistribution() {
                return distribution;
        }
 
-       @Override
        public TargetData getTargetData() {
                // TODO Auto-generated method stub
                return null;

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/logging/Log4jUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/logging/Log4jUtils.java
index 6249c6f21d64a0a5fd2d9dd00851de9729c681fe..6398e608e289b62d80bff3792bf8af943489affb 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/logging/Log4jUtils.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/logging/Log4jUtils.java
@@ -57,7 +57,8 @@ public class Log4jUtils {
 
        private static void overrideLog4jProperties(Properties target,
                        Properties additional) {
-               for (String key : additional.stringPropertyNames()) {
+               for (Object obj : additional.keySet()) {
+                       String key = obj.toString();
                        if (key.startsWith("log4j.")) {
                                if (!key.equals("log4j.configuration")) {
                                        String value = SystemPropertyUtils

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java
index a8ebcb59df6e2353d47dfaaa63c8c4086e155e4a..12036f5e2292c51a5bfa527505c1480ef2e6a3e9 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java
@@ -9,29 +9,24 @@ import org.argeo.slc.core.deploy.TargetData;
 public class HttpdServerDeployment implements Deployment {
        private HttpdServerTargetData targetData;
 
-       @Override
        public void execute() {
                // TODO Auto-generated method stub
 
        }
 
-       @Override
        public DeployedSystem getDeployedSystem() {
                // TODO Auto-generated method stub
                return null;
        }
 
-       @Override
        public void setDeploymentData(DeploymentData deploymentData) {
                // TODO Auto-generated method stub
 
        }
 
-       @Override
        public void setDistribution(Distribution distribution) {
        }
 
-       @Override
        public void setTargetData(TargetData targetData) {
                this.targetData = (HttpdServerTargetData) targetData;
        }

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java
index 80905bcf0a8da429e4f9b144088b6511e9cf26b3..570a7b5a7107568ec9cc910e70998cbc6777a673 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java
@@ -67,7 +67,6 @@ public class HttpdServerManager implements DeployedSystemManager<HttpdServer> {
                }
        }
 
-       @Override
        public void setDeployedSystem(HttpdServer httpdServer) {
                this.httpdServer = httpdServer;
        }