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 fu...@apache.org on 2006/04/21 03:20:55 UTC

svn commit: r395749 - in /db/derby/code/trunk: BUILDING.txt java/client/build.xml java/demo/build.xml java/engine/org/apache/derby/iapi/jdbc/build.xml

Author: fuzzylogic
Date: Thu Apr 20 18:20:54 2006
New Revision: 395749

URL: http://svn.apache.org/viewcvs?rev=395749&view=rev
Log:
DERBY-1078: Fix client and demo to work with JDK 1.3 when compiled with JDK 1.5
or higher. For client, ask the compiler to generate 1.3 classes, but then feed
it the 1.4 runtime classes. Client does the right things internally to work
properly on 1.3. Also, update BUILDING.txt to mention need for Ant 1.6.3 or
higher.

Modified:
    db/derby/code/trunk/BUILDING.txt
    db/derby/code/trunk/java/client/build.xml
    db/derby/code/trunk/java/demo/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml

Modified: db/derby/code/trunk/BUILDING.txt
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/BUILDING.txt?rev=395749&r1=395748&r2=395749&view=diff
==============================================================================
--- db/derby/code/trunk/BUILDING.txt (original)
+++ db/derby/code/trunk/BUILDING.txt Thu Apr 20 18:20:54 2006
@@ -11,7 +11,7 @@
 2     Downloads
 2.1   Download source code
 2.2   Download required software
-2.2.1 Download and install Apache Ant 1.6.x2
+2.2.1 Download and install Apache Ant 1.6.3 or higher
 2.2.2 Download and install Java Development Kit release 1.4.x
 2.2.3 Download and install Java Development Kit release 1.3.x
 2.2.4 Download extensions for Java Development Kit release 1.3.x
@@ -118,7 +118,7 @@
 
 
 
-2.2.1 Download and install Apache Ant 1.6.x
+2.2.1 Download and install Apache Ant 1.6.3 or higher
 
 (1) Download a binary distribution of Ant 1.6.x from:
          http://ant.apache.org/bindownload.cgi

Modified: db/derby/code/trunk/java/client/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/build.xml?rev=395749&r1=395748&r2=395749&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/build.xml (original)
+++ db/derby/code/trunk/java/client/build.xml Thu Apr 20 18:20:54 2006
@@ -34,8 +34,8 @@
 <!-- compile classes  -->
 <target name="compile">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.3"
+      target="1.3"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/demo/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/demo/build.xml?rev=395749&r1=395748&r2=395749&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/build.xml (original)
+++ db/derby/code/trunk/java/demo/build.xml Thu Apr 20 18:20:54 2006
@@ -20,8 +20,8 @@
 
   <target name="compile">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.3"
+      target="1.3"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -34,13 +34,13 @@
       destdir="${out.dir}"
       includes="Simple*">
       <classpath>
-        <pathelement path="${java14compile.classpath}"/>
+        <pathelement path="${java13compile.classpath}"/>
         <pathelement location="${jcc}"/>
       </classpath>
     </javac>
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.3"
+      target="1.3"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -54,7 +54,7 @@
       includes="nserverdemo/**"
       excludes="nserverdemo/Simple*">
       <classpath>
-        <pathelement path="${java14compile.classpath}"/>
+        <pathelement path="${java13compile.classpath}"/>
         <pathelement location="${jcc}"/>
       </classpath>
     </javac>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml?rev=395749&r1=395748&r2=395749&view=diff
==============================================================================
--- 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 Thu Apr 20 18:20:54 2006
@@ -81,8 +81,8 @@
 
   <target name="compile_iapi_jdbc_stmt">
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.3"
+      target="1.3"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"