Return-Path: 
 <derby-commits-return-11048-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 50252 invoked from network); 5 Jan 2009 15:44:33 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 5 Jan 2009 15:44:33 -0000
Received: (qmail 47825 invoked by uid 500); 5 Jan 2009 15:44:33 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 47803 invoked by uid 500); 5 Jan 2009 15:44:33 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 47793 invoked by uid 99); 5 Jan 2009 15:44:33 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2009 07:44:33 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2009 15:44:30 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1DDDC238899B; Mon,  5 Jan 2009 07:44:09 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r731603 - in /db/derby/code/trunk: ./ java/demo/toursdb/
 java/engine/org/apache/derby/iapi/jdbc/ java/engine/org/apache/derby/osgi/
 java/stubs/jsr169/javax/sql/
 java/testing/org/apache/derbyTesting/functionTests/harness/
 java/testing/org/ap...
Date: Mon, 05 Jan 2009 15:44:08 -0000
To: derby-commits@db.apache.org
From: rhillegas@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090105154409.1DDDC238899B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rhillegas
Date: Mon Jan  5 07:44:07 2009
New Revision: 731603

URL: http://svn.apache.org/viewvc?rev=731603&view=rev
Log:
DERBY-3984: Re-commit patch which defaults most of the build to using the small device libraries if they are present. Ole has adjusted the tinderbox build to use CDC/FP 1.1 libraries (rather than 1.0 libraries) so hopefully this patch will play nicely in the tinderbox.

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/demo/toursdb/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml
    db/derby/code/trunk/java/stubs/jsr169/javax/sql/RowSet.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/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/lang/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/perf/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/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/tools/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/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/impl/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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Mon Jan  5 07:44:07 2009
@@ -223,6 +223,12 @@
     -->
     <property name="jsr169compile.classpath" value="${out.jsr169.dir}:${java14compile.classpath}"/>
 
+    <!-- 
+            The lowest common denominator compile path for Derby. We expect that
+            the bulk of the Derby product will run on small device platforms (CDC/FP 1.1).
+    -->
+    <property name="compile.classpath" value="${jsr169compile.classpath}"/>
+
     <antcall target="printCompilerProperties"> <param name="checkEvent" value="After setting properties: "/> </antcall>
 
   </target>
@@ -647,7 +653,7 @@
       srcdir="${derby.jdbc3.src.dir}"
       destdir="${out.jdbc3.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
       </classpath>
      </javac>
 
@@ -674,7 +680,7 @@
       srcdir="${derby.jdbc4.src.dir}"
       destdir="${out.jdbc4.dir}">
       <classpath>
-        <pathelement path="${java15compile.classpath}"/>
+        <pathelement path="${java16compile.classpath}"/>
       </classpath>
      </javac>
 

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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/toursdb/build.xml (original)
+++ db/derby/code/trunk/java/demo/toursdb/build.xml Mon Jan  5 07:44:07 2009
@@ -50,7 +50,7 @@
       srcdir="${derby.demo.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
       </classpath>
       <include name="toursdb/insertMaps.java"/>
     </javac>

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?rev=731603&r1=731602&r2=731603&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 Mon Jan  5 07:44:07 2009
@@ -67,8 +67,9 @@
 	  <exclude name="${derby.dir}/${cur.dir}/BrokeredCallableStatement30.java"/>
 	  <exclude name="${derby.dir}/${cur.dir}/BrokeredCallableStatement40.java"/>
 	  <exclude name="${derby.dir}/${cur.dir}/BrokeredStatement.java"/>
-          <exclude name="${derby.dir}/${cur.dir}/BrokeredStatement40.java"/>
-          <exclude name="${derby.dir}/${cur.dir}/FailedProperties40.java"/>
+      <exclude name="${derby.dir}/${cur.dir}/BrokeredStatement40.java"/>
+      <exclude name="${derby.dir}/${cur.dir}/FailedProperties40.java"/>
+      <exclude name="${derby.dir}/${cur.dir}/ResourceAdapter.java"/>
     </javac>
   </target>
 
@@ -136,7 +137,8 @@
 	  <include name="${derby.dir}/${cur.dir}/BrokeredConnection30.java"/>
 	  <include name="${derby.dir}/${cur.dir}/BrokeredPreparedStatement30.java"/>
 	  <include name="${derby.dir}/${cur.dir}/BrokeredCallableStatement30.java"/>
-	  <!-- <include name="${derby.dir}/${cur.dir}/ResourceAdapter.java"/> -->
+      <include name="${derby.dir}/${cur.dir}/XAResourceAdapter.java"/>
+	  <include name="${derby.dir}/${cur.dir}/ResourceAdapter.java"/>
     </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=731603&r1=731602&r2=731603&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 Mon Jan  5 07:44:07 2009
@@ -51,7 +51,7 @@
       destdir="${out.dir}">
       <classpath>
 		<pathelement location="${osgi}"/>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/osgi/*.java"/>
     </javac>

Modified: db/derby/code/trunk/java/stubs/jsr169/javax/sql/RowSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/stubs/jsr169/javax/sql/RowSet.java?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- db/derby/code/trunk/java/stubs/jsr169/javax/sql/RowSet.java (original)
+++ db/derby/code/trunk/java/stubs/jsr169/javax/sql/RowSet.java Mon Jan  5 07:44:07 2009
@@ -19,18 +19,15 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Array;
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.Date;
-import java.sql.Ref;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Map;
 import java.io.InputStream;
 import java.io.Reader;
 import java.util.Calendar;
-import java.math.BigDecimal;
 
 /**
  * A RowSet is an interface which provides access to data being sent from/to a

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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- 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 Mon Jan  5 07:44:07 2009
@@ -80,7 +80,7 @@
       destdir="${out.dir}">
       <classpath>
         <pathelement location="${oro}"/>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
         <include name="${this.dir}/*.java"/> 

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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- 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 Mon Jan  5 07:44:07 2009
@@ -80,7 +80,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
 	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- 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 Mon Jan  5 07:44:07 2009
@@ -81,7 +81,7 @@
       destdir="${out.dir}">
       <classpath>
         <!--pathelement location="${oro}"/-->
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- 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 Mon Jan  5 07:44:07 2009
@@ -104,7 +104,7 @@
       destdir="${out.dir}">
       <classpath>
         <!--pathelement location="${oro}"/-->
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
 		<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- 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 Mon Jan  5 07:44:07 2009
@@ -81,7 +81,7 @@
       destdir="${out.dir}">
       <classpath>
         <!--pathelement location="${oro}"/-->
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
       	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/build.xml?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/build.xml Mon Jan  5 07:44:07 2009
@@ -54,7 +54,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${derby.testing.functest.dir}/tests/memory/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/perf/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/perf/build.xml?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/perf/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/perf/build.xml Mon Jan  5 07:44:07 2009
@@ -81,7 +81,7 @@
       destdir="${out.dir}">
       <classpath>
         <!--pathelement location="${oro}"/-->
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/build.xml?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/build.xml Mon Jan  5 07:44:07 2009
@@ -80,7 +80,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
 	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- 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 Mon Jan  5 07:44:07 2009
@@ -80,7 +80,7 @@
       destdir="${out.dir}">
       <classpath>
         <!--pathelement location="${oro}"/-->
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- 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 Mon Jan  5 07:44:07 2009
@@ -81,7 +81,7 @@
       destdir="${out.dir}">
       <classpath>
         <!--pathelement location="${oro}"/-->
-        <pathelement path="${compile.classpath};${junit}"/>
+        <pathelement path="${java14compile.classpath};${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
       <!--exclude name=""/-->

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml Mon Jan  5 07:44:07 2009
@@ -80,7 +80,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
 	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>

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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- 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 Mon Jan  5 07:44:07 2009
@@ -57,7 +57,7 @@
       destdir="${out.dir}">
       <classpath>
         <pathelement location="${oro}"/>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
 		<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/> 

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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- 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 Mon Jan  5 07:44:07 2009
@@ -58,6 +58,7 @@
     <!-- We only compile junit/JAXPFinder.java against JDK 1.4   -->
     <!-- because it relies on a JAXP class that is part of 1.4   -->
     <!-- but it is not part of 1.3.                              -->
+    <!-- This needs to be revisited. The second javac invocation fails against the jsr169 classpath -->
     <javac
       source="1.4"
       target="1.4"
@@ -91,7 +92,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${derby.testing.junit.dir}/**/*.java"/>

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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- 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 Mon Jan  5 07:44:07 2009
@@ -88,7 +88,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <exclude name="${derby.testing.perf.dir}/basic/jdbc/ValuesTest.java"/>

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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- 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 Mon Jan  5 07:44:07 2009
@@ -69,7 +69,7 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${derby.testing.unittest.dir}/**/*.java"/>

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=731603&r1=731602&r2=731603&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 Mon Jan  5 07:44:07 2009
@@ -70,7 +70,7 @@
       srcdir="${derby.tools.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/tools/**"/>
     </javac>

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?rev=731603&r1=731602&r2=731603&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/compilepath.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/compilepath.properties Mon Jan  5 07:44:07 2009
@@ -27,11 +27,5 @@
 #j14lib=${basedir}/jdk141/jre/lib
 java14compile.classpath=${j14lib}/rt.jar;${j14lib}/jce.jar;${j14lib}/jsse.jar
 
-# base compile path
-# The lowest common denominator compile path for Derby.
-# 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=${java14compile.classpath}
-
 j16lib=${jdk16}/jre/lib
 java16compile.classpath=${j16lib}/rt.jar