You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2013/05/11 19:20:07 UTC
svn commit: r1481379 - in /db/derby/code/trunk/java:
drda/org/apache/derby/impl/drda/ engine/org/apache/derby/catalog/
engine/org/apache/derby/iapi/ engine/org/apache/derby/iapi/db/
engine/org/apache/derby/iapi/error/ engine/org/apache/derby/iapi/refer...
Author: rhillegas
Date: Sat May 11 17:20:06 2013
New Revision: 1481379
URL: http://svn.apache.org/r1481379
Log:
DERBY-6213: Convert remaining non-JDBC packages to Java 6 build.
Modified:
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/DoubleProperties.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/impl/db/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarDBFile.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/io/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportBlob.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportClob.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/load/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/security/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/vti/VTIMetaDataTemplate.java
db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml Sat May 11 17:20:06 2013
@@ -37,8 +37,8 @@
<target name="compile">
<javac
- source="1.5"
- target="1.5"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -50,9 +50,10 @@
srcdir="${derby.drda.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${java15compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/impl/drda/*.java"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java Sat May 11 17:20:06 2013
@@ -32,6 +32,7 @@ import org.apache.derby.iapi.types.DataT
import org.apache.derby.iapi.types.DataTypeUtilities;
import org.apache.derby.iapi.sql.ResultColumnDescriptor;
import org.apache.derby.impl.jdbc.EmbedResultSetMetaData;
+import org.apache.derby.impl.jdbc.EmbedResultSetMetaData40;
import org.apache.derby.catalog.types.RoutineAliasInfo;
import org.apache.derby.shared.common.reference.JDBC40Translation;
@@ -332,5 +333,5 @@ public class GetProcedureColumns extends
EmbedResultSetMetaData.getResultColumnDescriptor("METHOD_ID", Types.SMALLINT, false),
EmbedResultSetMetaData.getResultColumnDescriptor("PARAMETER_ID", Types.SMALLINT, false),
};
- private static final ResultSetMetaData metadata = new EmbedResultSetMetaData(columnInfo);
+ private static final ResultSetMetaData metadata = new EmbedResultSetMetaData40(columnInfo);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml Sat May 11 17:20:06 2013
@@ -33,57 +33,34 @@
<property file="${properties.dir}/compilepath.properties"/>
<!-- Targets -->
- <target name="iapi" depends="compile_iapi_error"/>
+ <target name="iapi">
- <target name="compile_iapi_error" depends="compile_iapi_error_jsr169" >
- <ant dir="${derby.engine.dir}/iapi/services"/>
- <ant dir="${derby.engine.dir}/iapi/store"/>
- <ant dir="${derby.engine.dir}/iapi/sql"/>
- </target>
-
- <target name="compile_iapi_error_jsr169">
- <ant dir="${derby.engine.dir}/iapi/reference"/>
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
depend="${depend}"
- deprecation="${deprecation}"
optimize="${optimize}"
proceed="${proceed}"
verbose="${verbose}"
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/iapi/error/**"/>
- <exclude name="${derby.dir}/iapi/error/ThreadDump.java"/>
+ <compilerarg value="-Xlint:unchecked"/>
</javac>
- <javac
- source="1.5"
- target="1.5"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.engine.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${java15compile.classpath}"/>
- </classpath>
- <include name="${derby.dir}/iapi/error/ThreadDump.java"/>
- </javac>
<ant dir="${derby.engine.dir}/iapi/types" />
<ant dir="${derby.engine.dir}/iapi/util"/>
<ant dir="${derby.engine.dir}/iapi/db"/>
<ant dir="${derby.engine.dir}/iapi/jdbc"/>
+ <ant dir="${derby.engine.dir}/iapi/services"/>
+ <ant dir="${derby.engine.dir}/iapi/store"/>
+ <ant dir="${derby.engine.dir}/iapi/sql"/>
</target>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/build.xml Sat May 11 17:20:06 2013
@@ -36,8 +36,8 @@
<target name="compile_iapi_db">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -49,9 +49,10 @@
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/iapi/db/*.java"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java Sat May 11 17:20:06 2013
@@ -150,13 +150,13 @@ public class ExceptionUtil
Thread.class.getMethod("getAllStackTraces", new Class[] {});
//Then get the thread dump.
- Class c = Class.forName("org.apache.derby.iapi.error.ThreadDump");
- final Method m = c.getMethod("getStackDumpString",new Class[] {});
+ Class<?> c = Class.forName("org.apache.derby.iapi.error.ThreadDump");
+ final Method m = c.getMethod("getStackDumpString",new Class<?>[] {});
String dump;
dump = (String) AccessController.doPrivileged
- (new PrivilegedExceptionAction(){
+ (new PrivilegedExceptionAction<Object>(){
public Object run() throws
IllegalArgumentException,
IllegalAccessException,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/build.xml Sat May 11 17:20:06 2013
@@ -36,8 +36,8 @@
<target name="compile_reference">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -49,30 +49,10 @@
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/iapi/reference/**"/>
- <exclude name="${derby.dir}/iapi/reference/JDBC20Translation.java"/>
- <exclude name="${derby.dir}/iapi/reference/JDBC30Translation.java"/>
- </javac>
- <javac
- source="1.4"
- target="1.4"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.engine.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${java15compile.classpath}"/>
- </classpath>
- <include name="${derby.dir}/iapi/reference/JDBC20Translation.java"/>
- <include name="${derby.dir}/iapi/reference/JDBC30Translation.java"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml Sat May 11 17:20:06 2013
@@ -35,8 +35,8 @@
<!-- Targets -->
<target name="compile_crypto">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -48,9 +48,10 @@
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${java15compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/iapi/services/crypto/*.java"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/build.xml Sat May 11 17:20:06 2013
@@ -39,8 +39,8 @@
<target name="compile_iapi_services_io">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -52,9 +52,10 @@
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/iapi/services/io/*.java"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/build.xml Sat May 11 17:20:06 2013
@@ -34,12 +34,11 @@
<!-- Targets -->
- <target name="compile" depends="compile_iapi_store_jdk13"/>
+ <target name="compile">
- <target name="compile_iapi_store_jsr169">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -51,33 +50,13 @@
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/iapi/store/**"/>
- <exclude name="${derby.dir}/iapi/store/access/xa/*.java"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
- <target name="compile_iapi_store_jdk13" depends="compile_iapi_store_jsr169">
- <javac
- source="1.4"
- target="1.4"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.engine.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${java15compile.classpath}"/>
- </classpath>
- <include name="${derby.dir}/iapi/store/access/xa/*.java"/>
- </javac>
- </target>
</project>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/DoubleProperties.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/DoubleProperties.java?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/DoubleProperties.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/DoubleProperties.java Sat May 11 17:20:06 2013
@@ -61,8 +61,8 @@ public final class DoubleProperties exte
}
- public Enumeration propertyNames() {
- HashSet names = new HashSet();
+ public Enumeration<Object> propertyNames() {
+ HashSet<Object> names = new HashSet<Object>();
addAllNames(write, names);
addAllNames(read, names);
return Collections.enumeration(names);
@@ -72,7 +72,7 @@ public final class DoubleProperties exte
* Add all property names in the Properties object {@code src} to the
* HashSet {@code dest}.
*/
- private static void addAllNames(Properties src, HashSet dest) {
+ private static void addAllNames(Properties src, HashSet<Object> dest) {
if (src != null) {
for (Enumeration e = src.propertyNames(); e.hasMoreElements(); ) {
dest.add(e.nextElement());
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/build.xml Sat May 11 17:20:06 2013
@@ -36,8 +36,8 @@
<target name="compile_util">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -49,9 +49,10 @@
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/iapi/util/*.java"/>
+ <compilerarg value="-Xlint:unchecked"/>
</javac>
</target>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/db/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/db/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/db/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/db/build.xml Sat May 11 17:20:06 2013
@@ -36,8 +36,8 @@
<target name="compile">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -49,9 +49,10 @@
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/impl/db/**"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java Sat May 11 17:20:06 2013
@@ -304,7 +304,7 @@ class DirFile extends File implements St
*/
public URL getURL() throws MalformedURLException {
- return toURL();
+ return toURI().toURL();
}
public void limitAccessToOwner() {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarDBFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarDBFile.java?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarDBFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarDBFile.java Sat May 11 17:20:06 2013
@@ -149,7 +149,7 @@ class JarDBFile extends InputStreamFile
public URL getURL() throws MalformedURLException {
File pathFile = new File(storageFactory.zipData.getName());
- String pathFileURL = pathFile.toURL().toString();
+ String pathFileURL = pathFile.toURI().toURL().toString();
return new URL("jar:" + pathFileURL + "!/" + path);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/io/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/io/build.xml Sat May 11 17:20:06 2013
@@ -34,10 +34,10 @@
<!-- Targets -->
- <target name="compile_impl_io_169">
+ <target name="compile_impl_io">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -49,33 +49,12 @@
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/impl/io/**"/>
- <exclude name="${derby.dir}/impl/io/DirFile4.java"/>
- <exclude name="${derby.dir}/impl/io/DirStorageFactory4.java"/>
- </javac>
- </target>
- <target name="compile_impl_io" depends="compile_impl_io_169">
- <javac
- source="1.4"
- target="1.4"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.engine.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${java15compile.classpath}"/>
- </classpath>
- <include name="${derby.dir}/impl/io/DirFile4.java"/>
- <include name="${derby.dir}/impl/io/DirStorageFactory4.java"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
+
</project>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportBlob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportBlob.java?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportBlob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportBlob.java Sat May 11 17:20:06 2013
@@ -120,10 +120,7 @@ class ImportBlob implements java.sql.Blo
*
* @see java.sql.Blob
*/
- public byte[] getBytes(long pos, int length) throws SQLException {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ public byte[] getBytes(long pos, int length) throws SQLException { throw methodNotImplemented(); }
/**
* This routine is not used by the VTI to read the data, so no
@@ -131,11 +128,7 @@ class ImportBlob implements java.sql.Blo
*
* @see java.sql.Blob
*/
- public long position(byte pattern[], long start) throws SQLException
- {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ public long position(byte pattern[], long start) throws SQLException { throw methodNotImplemented(); }
/**
* This routine is not used by the VTI to read the data, so no
@@ -143,10 +136,7 @@ class ImportBlob implements java.sql.Blo
*
* @see java.sql.Blob
*/
- public long position(Blob pattern, long start) throws SQLException {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ public long position(Blob pattern, long start) throws SQLException { throw methodNotImplemented(); }
/**
@@ -155,9 +145,7 @@ class ImportBlob implements java.sql.Blo
*
* @see java.sql.Blob
*/
- public int setBytes(long pos, byte[] bytes) throws SQLException {
- throw LoadError.unexpectedError(new Exception("Method not implemented"));
- }
+ public int setBytes(long pos, byte[] bytes) throws SQLException { throw methodNotImplemented(); }
/**
* This routine is not used by the VTI to read the data, so no
@@ -165,11 +153,7 @@ class ImportBlob implements java.sql.Blo
*
* @see java.sql.Blob
*/
- public int setBytes(long pos, byte[] bytes, int offset, int len) throws SQLException
- {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ public int setBytes(long pos, byte[] bytes, int offset, int len) throws SQLException { throw methodNotImplemented(); }
/**
* This routine is not used by the VTI to read the data, so no
@@ -177,11 +161,7 @@ class ImportBlob implements java.sql.Blo
*
* @see java.sql.Blob
*/
- public java.io.OutputStream setBinaryStream(long pos) throws SQLException
- {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ public java.io.OutputStream setBinaryStream(long pos) throws SQLException { throw methodNotImplemented(); }
/**
* This routine is not used by the VTI to read the data, so no
@@ -189,10 +169,19 @@ class ImportBlob implements java.sql.Blo
*
* @see java.sql.Blob
*/
- public void truncate(long len) throws SQLException {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ public void truncate(long len) throws SQLException { throw methodNotImplemented(); }
+
+ /** Raise error, not used by import */
+ public InputStream getBinaryStream(long pos, long length) throws SQLException { throw methodNotImplemented(); }
+
+ /** Raise error, not used by import */
+ public void free() throws SQLException { throw methodNotImplemented(); }
+
+ /** Return an unimplemented feature error */
+ private SQLException methodNotImplemented()
+ {
+ return LoadError.unexpectedError( new Exception("Method not implemented")) ;
+ }
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportClob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportClob.java?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportClob.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportClob.java Sat May 11 17:20:06 2013
@@ -124,10 +124,7 @@ class ImportClob implements java.sql.Clo
*
* @see java.sql.Clob
*/
- public String getSubString(long pos, int length) throws SQLException {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ public String getSubString(long pos, int length) throws SQLException { throw methodNotImplemented(); }
/**
@@ -136,10 +133,7 @@ class ImportClob implements java.sql.Clo
* called.
* @see java.sql.Clob
*/
- public java.io.InputStream getAsciiStream() throws SQLException {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ public java.io.InputStream getAsciiStream() throws SQLException { throw methodNotImplemented(); }
/**
@@ -148,10 +142,7 @@ class ImportClob implements java.sql.Clo
* called.
* @see java.sql.Clob
*/
- public long position(String searchstr, long start) throws SQLException {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ public long position(String searchstr, long start) throws SQLException { throw methodNotImplemented(); }
/**
* This routine is not used by the VTI to read the data, so no
@@ -159,10 +150,7 @@ class ImportClob implements java.sql.Clo
* called.
* @see java.sql.Clob
*/
- public long position(Clob searchstr, long start) throws SQLException {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ public long position(Clob searchstr, long start) throws SQLException { throw methodNotImplemented(); }
/**
* This routine is not used by the VTI to read the data, so no
@@ -170,10 +158,7 @@ class ImportClob implements java.sql.Clo
* called.
* @see java.sql.Clob
*/
- public int setString(long pos, String str) throws SQLException {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ public int setString(long pos, String str) throws SQLException { throw methodNotImplemented(); }
/**
* This routine is not used by the VTI to read the data, so no
@@ -182,11 +167,7 @@ class ImportClob implements java.sql.Clo
* @see java.sql.Clob
*/
public int setString(long pos, String str, int offset, int len)
- throws SQLException
- {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ throws SQLException { throw methodNotImplemented(); }
/**
* This routine is not used by the VTI to read the data, so no
@@ -194,11 +175,7 @@ class ImportClob implements java.sql.Clo
* called.
* @see java.sql.Clob
*/
- public java.io.OutputStream setAsciiStream(long pos) throws SQLException
- {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ public java.io.OutputStream setAsciiStream(long pos) throws SQLException { throw methodNotImplemented(); }
/**
* This routine is not used by the VTI to read the data, so no
@@ -206,11 +183,7 @@ class ImportClob implements java.sql.Clo
* called.
* @see java.sql.Clob
*/
- public java.io.Writer setCharacterStream(long pos) throws SQLException
- {
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
- }
+ public java.io.Writer setCharacterStream(long pos) throws SQLException { throw methodNotImplemented(); }
/**
* This routine is not used by the VTI to read the data, so no
@@ -218,10 +191,18 @@ class ImportClob implements java.sql.Clo
* called.
* @see java.sql.Clob
*/
- public void truncate(long len) throws SQLException
+ public void truncate(long len) throws SQLException { throw methodNotImplemented(); }
+
+ /** Raise error, not used by import */
+ public Reader getCharacterStream(long pos, long length) throws SQLException { throw methodNotImplemented(); }
+
+ /** Raise error, not used by import */
+ public void free() throws SQLException { throw methodNotImplemented(); }
+
+ /** Return an unimplemented feature error */
+ private SQLException methodNotImplemented()
{
- throw LoadError.unexpectedError(
- new Exception("Method not implemented"));
+ return LoadError.unexpectedError( new Exception("Method not implemented")) ;
}
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/load/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/load/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/load/build.xml Sat May 11 17:20:06 2013
@@ -36,8 +36,8 @@
<target name="compile">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -49,9 +49,10 @@
srcdir="${derby.engine.src.dir};${derby.tools.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/impl/load/**"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml Sat May 11 17:20:06 2013
@@ -34,10 +34,10 @@
<!-- Targets -->
- <target name="compile_impl_services_169">
+ <target name="compile_impl_services">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -49,68 +49,12 @@
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/impl/services/**"/>
- <exclude name="${derby.dir}/impl/services/reflect/Java5*"/>
- <exclude name="${derby.dir}/impl/services/jce/**"/>
- <exclude name="${derby.dir}/impl/services/locks/Concurrent*.java"/>
- <exclude name="${derby.dir}/impl/services/cache/Concurrent*.java"/>
- <exclude name="${derby.dir}/impl/services/cache/CacheEntry.java"/>
- <exclude name="${derby.dir}/impl/services/cache/*Policy.java"/>
- <exclude name="${derby.dir}/impl/services/cache/BackgroundCleaner.java"/>
- <exclude name="${derby.dir}/impl/services/jmx/**"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
- </target>
-
- <target name="compile_impl_services_jdk15"
- depends="compile_impl_services_169">
- <javac
- source="1.5"
- target="1.5"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.engine.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${java15compile.classpath}"/>
- </classpath>
- <include name="${derby.dir}/impl/services/reflect/Java5*"/>
- <include name="${derby.dir}/impl/services/locks/Concurrent*.java"/>
- <include name="${derby.dir}/impl/services/cache/Concurrent*.java"/>
- <include name="${derby.dir}/impl/services/cache/CacheEntry.java"/>
- <include name="${derby.dir}/impl/services/cache/*Policy.java"/>
- <include name="${derby.dir}/impl/services/cache/BackgroundCleaner.java"/>
- <include name="${derby.dir}/impl/services/jmx/**"/>
- </javac>
- </target>
-
- <target name="compile_impl_services" depends="compile_impl_services_jdk15">
- <javac
- source="1.4"
- target="1.4"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.engine.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${java15compile.classpath}"/>
- </classpath>
- <include name="${derby.dir}/impl/services/jce/**"/>
- </javac>
- </target>
+ </target>
</project>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/build.xml Sat May 11 17:20:06 2013
@@ -86,32 +86,8 @@
</target>
- <target name="compile" depends="compileCDC,compile6"/>
+ <target name="compile" depends="parser">
- <target name="compileCDC" depends="parser">
- <javac
- source="1.4"
- target="1.4"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.engine.src.dir}:${generated.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${compile.classpath}"/>
- </classpath>
- <include name="${derby.dir}/${cur.dir}/**"/>
- <exclude name="${derby.dir}/${cur.dir}/compile/OptimizerTracer.java"/>
- </javac>
- <copy file="${derby.engine.src.dir}/${derby.dir}/${cur.dir}/catalog/metadata_net.properties" tofile="${out.dir}/org/apache/derby/impl/sql/catalog/metadata_net.properties"/>
- </target>
-
- <target name="compile6" depends="compileCDC">
<javac
source="1.6"
target="1.6"
@@ -123,13 +99,15 @@
optimize="${optimize}"
proceed="${proceed}"
verbose="${verbose}"
- srcdir="${derby.engine.src.dir}"
+ srcdir="${derby.engine.src.dir}:${generated.src.dir}"
destdir="${out.dir}">
<classpath>
<pathelement path="${java16compile.classpath}"/>
</classpath>
- <include name="${derby.dir}/${cur.dir}/compile/OptimizerTracer.java"/>
+ <include name="${derby.dir}/${cur.dir}/**"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
+ <copy file="${derby.engine.src.dir}/${derby.dir}/${cur.dir}/catalog/metadata_net.properties" tofile="${out.dir}/org/apache/derby/impl/sql/catalog/metadata_net.properties"/>
</target>
</project>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml Sat May 11 17:20:06 2013
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<project default="compile_impl_store_15" basedir="../../../../../../..">
+<project default="compile_impl_store" basedir="../../../../../../..">
<!-- Set Properties -->
<!-- User settings -->
@@ -36,8 +36,8 @@
<target name="compile_impl_store">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -49,58 +49,12 @@
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${java15compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/impl/store/**"/>
- <exclude name="${derby.dir}/impl/store/raw/data/RAFContainer4.java"/>
- <exclude name="${derby.dir}/impl/store/raw/data/BaseDataFileFactoryJ4.java"/>
- <exclude name="${derby.dir}/impl/store/raw/xact/ConcurrentTransactionMapFactory.java"/>
- <exclude name="${derby.dir}/impl/store/raw/xact/ConcurrentXactFactory.java"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
- <target name="compile_impl_store_14" depends="compile_impl_store">
- <javac
- source="1.4"
- target="1.4"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.engine.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${java15compile.classpath}"/>
- </classpath>
- <include name="${derby.dir}/impl/store/raw/data/RAFContainer4.java"/>
- <include name="${derby.dir}/impl/store/raw/data/BaseDataFileFactoryJ4.java"/>
- </javac>
- </target>
-
- <target name="compile_impl_store_15" depends="compile_impl_store_14">
- <javac
- source="1.5"
- target="1.5"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.engine.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${java15compile.classpath}"/>
- </classpath>
- <include name="${derby.dir}/impl/store/raw/xact/ConcurrentTransactionMapFactory.java"/>
- <include name="${derby.dir}/impl/store/raw/xact/ConcurrentXactFactory.java"/>
- </javac>
- </target>
</project>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/mbeans/build.xml Sat May 11 17:20:06 2013
@@ -35,8 +35,8 @@
<!-- Targets -->
<target name="compile_mbeans">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -48,11 +48,12 @@
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<sourcepath>
</sourcepath>
<include name="${derby.dir}/mbeans/**"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml Sat May 11 17:20:06 2013
@@ -37,8 +37,8 @@
<target name="compile_osgi">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -51,9 +51,10 @@
destdir="${out.dir}">
<classpath>
<pathelement location="${osgi}"/>
- <pathelement path="${java15compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/osgi/*.java"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/security/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/security/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/security/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/security/build.xml Sat May 11 17:20:06 2013
@@ -37,8 +37,8 @@
<target name="compile_security">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -50,9 +50,10 @@
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/security/**"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/vti/VTIMetaDataTemplate.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/vti/VTIMetaDataTemplate.java?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/vti/VTIMetaDataTemplate.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/vti/VTIMetaDataTemplate.java Sat May 11 17:20:06 2013
@@ -22,6 +22,7 @@
package org.apache.derby.vti;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.sql.ResultSetMetaData;
/**
@@ -52,6 +53,9 @@ import java.sql.ResultSetMetaData;
public abstract class VTIMetaDataTemplate implements ResultSetMetaData {
+ public boolean isWrapperFor(Class<?> iface) throws SQLException { throw notImplemented( "isWrapperFor" ); }
+ public <T> T unwrap(Class<T> iface) throws SQLException { throw notImplemented( "unwrap" ); }
+
/**
* Is the column automatically numbered, and thus read-only?
*
@@ -282,4 +286,20 @@ public abstract class VTIMetaDataTemplat
public String getColumnClassName(int column) throws SQLException {
throw new SQLException("getColumnClassName");
}
+
+ /////////////////////////////////////////////////////////////////////////
+ //
+ // MINIONS
+ //
+ /////////////////////////////////////////////////////////////////////////
+
+ /**
+ * <p>
+ * Create a SQLException saying that the calling method is not implemented.
+ * </p>
+ */
+ protected SQLException notImplemented( String methodName )
+ {
+ return new SQLFeatureNotSupportedException( "Unimplemented method: " + methodName );
+ }
}
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml?rev=1481379&r1=1481378&r2=1481379&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml Sat May 11 17:20:06 2013
@@ -35,7 +35,6 @@
<property name="ijTokenManager.src" value="${generated.src.dir}/${derby.dir}/impl/tools/ij/ijTokenManager.java"/>
<!-- Targets -->
- <target name="compile" depends="compile_tools_impl,optional"/>
<target name="parser">
<ant antfile="${src.dir}/build.xml" target="genParser">
@@ -91,11 +90,11 @@
</target>
- <target name="compile_tools_impl" depends="parser">
+ <target name="compile" depends="parser">
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -107,33 +106,12 @@
srcdir="${derby.tools.src.dir}:${generated.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${java15compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="${derby.dir}/impl/tools/**"/>
- <exclude name="${derby.dir}/impl/tools/optional/**"/>
+ <!-- <compilerarg value="-Xlint:unchecked"/> -->
</javac>
</target>
- <target name="optional">
- <javac
- source="${compilerLevel16}"
- target="${compilerLevel16}"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.tools.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${java16compile.classpath}"/>
- </classpath>
- <include name="${derby.dir}/impl/tools/optional/**"/>
- </javac>
- </target>
-
</project>