Revert to Java 5 compatibility

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

diff --git a/org.argeo.slc.server/.classpath b/org.argeo.slc.server/.classpath
index fe6837c7e23039ca809d9ee211133f059e5b9f3e..372e5299edbec0d603ca69cccc6ae0c8894b433e 100644 (file)
--- a/org.argeo.slc.server/.classpath
+++ b/org.argeo.slc.server/.classpath
@@ -5,6 +5,6 @@
        <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/JavaSE-1.6"/>
+       <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.server/.settings/org.eclipse.jdt.core.prefs b/org.argeo.slc.server/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..e71a107
--- /dev/null
+++ b/org.argeo.slc.server/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Fri Aug 29 11:25:17 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.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java
index 9acbc94cdfb6f53841592a2aac5280241fbda214..62af08ea653bdd675d770c2573af9117e43a99de 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java
@@ -41,7 +41,6 @@ public class XsltMarshallerViewResolver extends XsltViewResolver implements
                this.marshaller = marshaller;\r
        }\r
 \r
-       @Override\r
        public Source resolve(String href, String base) throws TransformerException {\r
                if (log.isTraceEnabled())\r
                        log.trace("Resolve URI for href=" + href + " base=" + base);\r