db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r516518 - in /db/derby/code/trunk: ./ java/client/ java/demo/toursdb/ java/engine/ java/engine/org/apache/derby/authentication/ java/engine/org/apache/derby/catalog/ java/engine/org/apache/derby/database/ java/engine/org/apache/derby/diag/ ...
Date Fri, 09 Mar 2007 19:34:38 GMT
Author: djd
Date: Fri Mar  9 11:34:35 2007
New Revision: 516518

URL: http://svn.apache.org/viewvc?view=rev&rev=516518
Log:
DERBY-1983 (partial) Change the default base compile level to JDK 1.4 including
changing the target/source flags for the compiler to be 1.4 instead of 1.3.

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/client/build.xml
    db/derby/code/trunk/java/demo/toursdb/build.xml
    db/derby/code/trunk/java/engine/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/authentication/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/catalog/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/database/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/diag/build.xml
    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/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/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/sql/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/types/build.xml
    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/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
    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/io/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java
    db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml
    db/derby/code/trunk/java/shared/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml
    db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml
    db/derby/code/trunk/java/tools/org/apache/derby/tools/build.xml
    db/derby/code/trunk/tools/ant/properties/compilepath.properties

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Fri Mar  9 11:34:35 2007
@@ -526,8 +526,8 @@
     </java>
 
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/client/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/client/build.xml (original)
+++ db/derby/code/trunk/java/client/build.xml Fri Mar  9 11:34:35 2007
@@ -50,8 +50,8 @@
 <!-- compile classes  -->
 <target name="compile">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -64,7 +64,6 @@
       excludes="**/*40.java" 
       destdir="${out.dir}">
       <classpath>
-          <pathelement path="${jce1_2_1}"/>
           <pathelement path="${java14compile.classpath}"/>
       </classpath>
     </javac>
@@ -88,7 +87,6 @@
       includes="**/*40.java" 
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${jce1_2_1}"/>
         <pathelement path="${java16compile.classpath}"/>
       </classpath>
       <compilerarg value="-Xlint"/>

Modified: db/derby/code/trunk/java/demo/toursdb/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/toursdb/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/demo/toursdb/build.xml (original)
+++ db/derby/code/trunk/java/demo/toursdb/build.xml Fri Mar  9 11:34:35 2007
@@ -38,8 +38,8 @@
 
   <target name="compile">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       debug="${debug}"
       depend="${depend}"

Modified: db/derby/code/trunk/java/engine/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/build.xml (original)
+++ db/derby/code/trunk/java/engine/build.xml Fri Mar  9 11:34:35 2007
@@ -56,12 +56,12 @@
     <target name="engine_j2se" depends="engine_169"
             description="Build Derby engine">
     <ant dir="${derby.engine.dir}/iapi"/>
+    <ant dir="${derby.engine.dir}/vti"/>
     <ant dir="${derby.engine.dir}/impl"/>
     <ant dir="${derby.engine.dir}/jdbc"/>
     <ant dir="${derby.engine.dir}/osgi"/>
     <ant dir="${derby.engine.dir}/catalog"/>
     <ant dir="${derby.engine.dir}/diag"/>
-    <ant dir="${derby.engine.dir}/vti"/>
       	<copy todir="${out.dir}/${derby.dir}">
           <fileset dir="${derby.engine.dir}">
             <include name="modules.properties"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/authentication/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/authentication/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/authentication/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/authentication/build.xml Fri Mar  9 11:34:35
2007
@@ -37,8 +37,8 @@
 
   <target name="compile_authentication">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/build.xml Fri Mar  9 11:34:35
2007
@@ -37,8 +37,8 @@
 
   <target name="compile_catalog">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/database/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/database/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/database/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/database/build.xml Fri Mar  9 11:34:35
2007
@@ -37,8 +37,8 @@
 
   <target name="compile_database">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/build.xml Fri Mar  9 11:34:35 2007
@@ -37,8 +37,8 @@
 
   <target name="compile_diag">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

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?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- 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 Fri Mar  9 11:34:35 2007
@@ -44,8 +44,8 @@
   <target name="compile_iapi_error_jsr169">
     <ant dir="${derby.engine.dir}/iapi/reference"/>
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

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?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- 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 Fri Mar  9 11:34:35
2007
@@ -36,8 +36,8 @@
 
   <target name="compile_iapi_db">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml Fri Mar  9 11:34:35
2007
@@ -41,8 +41,8 @@
 
   <target name="compile_iapi_jdbc_jsr169">
 	    <javac
-	      source="1.3"
-	      target="1.3"
+	      source="1.4"
+	      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -55,7 +55,6 @@
       destdir="${out.dir}">
       <classpath>
         <pathelement path="${compile.classpath}"/>
-        <pathelement path="${jta1_2}"/>
       </classpath>
       <include name="${derby.dir}/${cur.dir}/*.java"/>
 	  <exclude name="${derby.dir}/${cur.dir}/BrokeredConnection.java"/>

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?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- 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 Fri Mar  9 11:34:35
2007
@@ -36,8 +36,8 @@
 
   <target name="compile_reference">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml Fri Mar  9 11:34:35
2007
@@ -38,8 +38,8 @@
 
   <target name="compile_iapi_services_jsr169">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

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?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- 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 Fri Mar  9
11:34:35 2007
@@ -39,8 +39,8 @@
 
   <target name="compile_iapi_services_io">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml Fri Mar  9 11:34:35
2007
@@ -38,8 +38,8 @@
 
   <target name="compile_iapi_sql_jsr169">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

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?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- 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 Fri Mar  9 11:34:35
2007
@@ -38,8 +38,8 @@
 
   <target name="compile_iapi_store_jsr169">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml Fri Mar  9 11:34:35
2007
@@ -39,8 +39,8 @@
     <!-- relies on several XML classes that are part of 1.4 but  -->
     <!-- that aren't in 1.3.                                     -->
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -57,8 +57,8 @@
       <include name="${derby.dir}/iapi/types/SqlXmlUtil.java"/>
     </javac>
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

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?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- 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 Fri Mar  9 11:34:35
2007
@@ -36,8 +36,8 @@
 
   <target name="compile_util">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

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?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- 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 Fri Mar  9 11:34:35
2007
@@ -36,8 +36,8 @@
 
   <target name="compile">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

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?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- 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 Fri Mar  9 11:34:35
2007
@@ -36,8 +36,8 @@
 
   <target name="compile_impl_io_169">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/build.xml Fri Mar  9 11:34:35
2007
@@ -38,8 +38,8 @@
 
   <target name="compile_jsr169">
 	    <javac
-	      source="1.3"
-	      target="1.3"
+	      source="1.4"
+	      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -62,8 +62,8 @@
    </javac>
     <copy file="metadata.properties" tofile="${out.dir}/org/apache/derby/impl/jdbc/metadata.properties"/>
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -84,8 +84,8 @@
     </target>
   	<target name="compile_jsr169_opt">
   	    <javac
-  	      source="1.3"
-  	      target="1.3"
+  	      source="1.4"
+  	      target="1.4"
         bootclasspath="${empty}"
         nowarn="on"
         debug="${debug}"

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?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- 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 Fri Mar  9 11:34:35
2007
@@ -36,8 +36,8 @@
 
   <target name="compile">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

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?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- 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 Fri Mar  9 11:34:35
2007
@@ -36,8 +36,8 @@
 
   <target name="compile_impl_services_169">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

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?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- 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 Fri Mar  9 11:34:35
2007
@@ -48,8 +48,8 @@
 
   <target name="compile" depends="parser">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml Fri Mar  9 11:34:35 2007
@@ -37,8 +37,8 @@
 
   <target name="compile_io">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml Fri Mar  9 11:34:35 2007
@@ -39,8 +39,8 @@
 <!-- first build all non-special (non jdbc2.0) targets-->
   <target name="compile_jsr169">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -61,8 +61,8 @@
   </target>
 	  <target name="compile_jsr169_opt">
 	    <javac
-	      source="1.3"
-	      target="1.3"
+	      source="1.4"
+	      target="1.4"
 	      bootclasspath="${empty}"
 	      nowarn="on"
 	      debug="${debug}"

Modified: db/derby/code/trunk/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java Fri Mar
 9 11:34:35 2007
@@ -30,6 +30,7 @@
 import java.sql.Clob;
 import java.sql.Connection;
 import java.sql.Date;
+import java.sql.ParameterMetaData;
 import java.sql.PreparedStatement;
 import java.sql.Ref;
 import java.sql.ResultSet;
@@ -721,5 +722,9 @@
 
     public int getResultSetHoldability() throws SQLException {
         throw new SQLException("getResultSetHoldability");
+    }
+
+    public ParameterMetaData getParameterMetaData() throws SQLException {
+        throw new SQLException("getParameterMetaData");
     }
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml Fri Mar  9 11:34:35 2007
@@ -38,8 +38,8 @@
   <target name="compile_vti">
 
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -54,7 +54,26 @@
         <pathelement path="${compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/vti/*.java"/>
+      <exclude name="${derby.dir}/vti/*Template.java"/>
 
+    </javac>
+    <javac
+      source="1.4"
+      target="1.4"
+      bootclasspath="${empty}"
+      nowarn="on"
+      debug="true"
+      depend="${depend}"
+      deprecation="${deprecation}"
+      optimize="${optimize}"
+      proceed="${proceed}"
+      verbose="${verbose}" 
+      srcdir="${derby.engine.src.dir}"
+      destdir="${out.dir}">
+      <classpath>
+        <pathelement path="${java14compile.classpath}"/>
+      </classpath>
+    	<include name="${derby.dir}/vti/*Template.java"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/shared/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/shared/build.xml (original)
+++ db/derby/code/trunk/java/shared/build.xml Fri Mar  9 11:34:35 2007
@@ -52,28 +52,6 @@
 <!-- compile classes  -->
   <target name="compile">
     <javac
-      source="1.3"
-      target="1.3"
-      bootclasspath="${empty}"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.shared.src.dir}"
-      includes="org/apache/derby/shared/**"
-      destdir="${out.dir}">
-      <classpath>
-          <pathelement path="${jce1_2_1}"/>
-          <pathelement path="${jta1_2}"/>
-          <pathelement path="${compile.classpath}"/>
-      </classpath>
-      <include name="org/apache/derby/shared/**"/>
-      <exclude name="org/apache/derby/shared/common/reference/JDBC30Translation.java"/>
-    </javac>
-    <javac
       source="1.4"
       target="1.4"
       bootclasspath="${empty}"
@@ -88,9 +66,9 @@
       includes="org/apache/derby/shared/**"
       destdir="${out.dir}">
       <classpath>
-          <pathelement path="${java14compile.classpath}"/>
+          <pathelement path="${compile.classpath}"/>
       </classpath>
-      <include name="org/apache/derby/shared/common/reference/JDBC30Translation.java"/>
+      <include name="org/apache/derby/shared/**"/>
     </javac>
 </target>
   

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/build.xml
Fri Mar  9 11:34:35 2007
@@ -66,8 +66,8 @@
 
   <target name="compile">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/build.xml
Fri Mar  9 11:34:35 2007
@@ -46,8 +46,8 @@
 	  <target name="junitsuites" 
 	          description="Build Derby JUnit suites">
 	    <javac
-	      source="1.3"
-	      target="1.3"
+	      source="1.4"
+	      target="1.4"
 	      bootclasspath="${empty}"
 	      nowarn="on"
 	      debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml
Fri Mar  9 11:34:35 2007
@@ -67,8 +67,8 @@
 
   <target name="compile">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
Fri Mar  9 11:34:35 2007
@@ -67,8 +67,8 @@
 
   <target name="compilet1" depends="compilet2">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -91,8 +91,8 @@
 
   <target name="compilet2">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/build.xml
Fri Mar  9 11:34:35 2007
@@ -67,8 +67,8 @@
 
   <target name="compile">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
Fri Mar  9 11:34:35 2007
@@ -67,8 +67,8 @@
 
 	  <target name="compileSuite" depends="compilet2">
 	    <javac
-	      source="1.3"
-	      target="1.3"
+	      source="1.4"
+	      target="1.4"
 	      bootclasspath="${empty}"
 	      nowarn="on"
 	      debug="true"
@@ -90,8 +90,8 @@
 	
   <target name="compilet1">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml
Fri Mar  9 11:34:35 2007
@@ -68,8 +68,8 @@
   <target name="compilet1">
 
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
Fri Mar  9 11:34:35 2007
@@ -67,8 +67,8 @@
 
   <target name="compilet1" >
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -98,8 +98,8 @@
   </target>
   <target name="compilet2" depends="compilet1">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -148,8 +148,8 @@
 	base level -->
 	<target name="compilett4" depends="compilet3" >
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
Fri Mar  9 11:34:35 2007
@@ -67,8 +67,8 @@
 
   <target name="compilet1">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/nist/build.xml
Fri Mar  9 11:34:35 2007
@@ -75,8 +75,8 @@
 	  <target name="nistsuites" 
 	          description="Build Nist">
 	    <javac
-	      source="1.3"
-	      target="1.3"
+	      source="1.4"
+	      target="1.4"
 	      bootclasspath="${empty}"
 	      nowarn="on"
 	      debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/build.xml
Fri Mar  9 11:34:35 2007
@@ -66,8 +66,8 @@
   </target>
   <target name="compile">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/build.xml
Fri Mar  9 11:34:35 2007
@@ -67,8 +67,8 @@
 
   <target name="compile">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml
Fri Mar  9 11:34:35 2007
@@ -67,8 +67,8 @@
 
   <target name="compilet1">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/build.xml
Fri Mar  9 11:34:35 2007
@@ -43,8 +43,8 @@
 
   <target name="compile">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/build.xml Fri Mar  9 11:34:35
2007
@@ -79,8 +79,8 @@
 	  <include name="${derby.testing.junit.dir}/JAXPFinder.java"/>
     </javac>
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/perf/build.xml Fri Mar  9 11:34:35
2007
@@ -75,8 +75,8 @@
       <include name="${derby.testing.perf.dir}/basic/jdbc/ValuesTest.java"/>
     </javac>
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/build.xml Fri Mar 
9 11:34:35 2007
@@ -56,8 +56,8 @@
   <target name="unitTests" 
           description="Build Derby unit testing files">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"

Modified: db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/build.xml Fri Mar  9 11:34:35
2007
@@ -36,8 +36,8 @@
 
   <target name="compile_tools_iapi">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -58,8 +58,8 @@
 
   <target name="compile_tools_iapi_run">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

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?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- 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 Fri Mar  9 11:34:35
2007
@@ -57,8 +57,8 @@
   <target name="compile_tools_impl">
 
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -82,8 +82,8 @@
 
   <target name="compile_tools_impl_mt" depends="compile_tools_impl">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/tools/org/apache/derby/tools/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/tools/build.xml?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/tools/build.xml (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/tools/build.xml Fri Mar  9 11:34:35 2007
@@ -37,8 +37,8 @@
 
   <target name="compile">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/tools/ant/properties/compilepath.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/compilepath.properties?view=diff&rev=516518&r1=516517&r2=516518
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/compilepath.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/compilepath.properties Fri Mar  9 11:34:35 2007
@@ -11,17 +11,11 @@
 # or set to the same value as jsr169compile.classpath
 # to ensure that the classes in the base set are also
 # suitable for J2ME/CDC/Foundation and thus do not rely on
-# JDK 1.3 methods/classes not in J2ME.
+# JDK 1.4 methods/classes not in J2ME.
 
-# Java2 1.3 paths - for JDBC 2.0/JDK1.3
-# java13compile.classpath includes JDBC 2.0 and extensions.
-
-#j13lib=${basedir}/jdk131/jre/lib
-
-java13compile.classpath=${j13lib}/rt.jar;${javatools.dir}/jdbc2_0-stdext.jar
 
 jta1_2=${javatools.dir}/geronimo-spec-jta-1.0.1B-rc4.jar
-jce1_2_1=${javatools.dir}/jce1_2_2.jar
+
 
 # Java2 1.4 paths - for JDBC 3.0/JDK1.4
 
@@ -30,9 +24,9 @@
 
 # base compile path
 # The lowest common denominator compile path for Derby.
-# Set to JDK 1.3 here but can also be set to the value
+# Set to JDK 1.4 here but can also be set to the value
 # of jsr169compile.classpath for a code line (see above)
-compile.classpath=${java13compile.classpath}
+compile.classpath=${java14compile.classpath}
 
 j16lib=${jdk16}/jre/lib
 java16compile.classpath=${j16lib}/rt.jar



Mime
View raw message