Added JDK 7 support

georgengel · Aug 18, 2011 · d0cf319 · d0cf319
1 parent 7bcf78f
commit d0cf319
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/framework/build.xml b/framework/build.xml
@@ -64,7 +64,7 @@
 
     <target name="compile" description="compile without cleaning">
         <mkdir dir="classes"/>
-        <javac encoding="utf-8" srcdir="src" destdir="classes" debug="true" target="1.5">
+        <javac encoding="utf-8" srcdir="src" destdir="classes" debug="true" source="1.5" target="1.5">
             <classpath refid="project.classpath" />
         </javac>
         <copy todir="classes">

diff --git a/framework/lib/org.eclipse.jdt.core-3.6.0.jar b/framework/lib/org.eclipse.jdt.core-3.6.0.jar
diff --git a/framework/lib/org.eclipse.jdt.core_3.8.0.v_C03.jar b/framework/lib/org.eclipse.jdt.core_3.8.0.v_C03.jar
diff --git a/framework/src/play/db/DBConfig.java b/framework/src/play/db/DBConfig.java
@@ -399,6 +399,13 @@ public static class ProxyDriver implements Driver {
             this.driver = d;
         }
 
+        /*
+         * JDK 7 compatibility
+         */
+        public java.util.logging.Logger getParentLogger() {
+            return null;
+        }
+
         public boolean acceptsURL(String u) throws SQLException {
             return this.driver.acceptsURL(u);
         }

diff --git a/framework/src/play/db/DBPlugin.java b/framework/src/play/db/DBPlugin.java
@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -117,7 +118,7 @@ public void invocationFinally() {
     }
 
     /**
-     * Needed because DriverManager will not load a driver ouside of the system classloader
+     * Needed because DriverManager will not load a driver outside of the system classloader
      */
     public static class ProxyDriver implements Driver {
 
@@ -127,6 +128,13 @@ public static class ProxyDriver implements Driver {
             this.driver = d;
         }
 
+        /*
+         * JDK 7 compatibility
+         */
+        public Logger getParentLogger() {
+            return null;
+        }
+
         public boolean acceptsURL(String u) throws SQLException {
             return this.driver.acceptsURL(u);
         }