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/20 19:07:42 UTC
svn commit: r395643 - in /db/derby/code/trunk: ./ java/demo/
java/demo/toursdb/ java/drda/org/apache/derby/drda/
java/engine/org/apache/derby/authentication/
java/engine/org/apache/derby/catalog/
java/engine/org/apache/derby/database/ java/engine/org/a...
Author: fuzzylogic
Date: Thu Apr 20 10:07:39 2006
New Revision: 395643
URL: http://svn.apache.org/viewcvs?rev=395643&view=rev
Log:
DERBY-1078: Move more files to 1.3 source/target tags. Add xml-api jars to
compile XML classes with 1.3. Break shared hierarchy up into 1.3 and 1.4 parts.
JDK 1.3 now passes basic tests when compiled with 1.5.
Added:
db/derby/code/trunk/tools/java/xercesImpl.jar (with props)
db/derby/code/trunk/tools/java/xml-apis.jar (with props)
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/demo/build.xml
db/derby/code/trunk/java/demo/toursdb/build.xml
db/derby/code/trunk/java/drda/org/apache/derby/drda/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/load/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml
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/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/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/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/tests/upgradeTests/build.xml
db/derby/code/trunk/tools/ant/properties/extrapath.properties
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Thu Apr 20 10:07:39 2006
@@ -462,8 +462,8 @@
</java>
<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=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/build.xml (original)
+++ db/derby/code/trunk/java/demo/build.xml Thu Apr 20 10:07:39 2006
@@ -59,8 +59,8 @@
</classpath>
</javac>
<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/toursdb/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/demo/toursdb/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/toursdb/build.xml (original)
+++ db/derby/code/trunk/java/demo/toursdb/build.xml Thu Apr 20 10:07:39 2006
@@ -22,8 +22,8 @@
<target name="compile">
<javac
- source="1.4"
- target="1.4"
+ source="1.3"
+ target="1.3"
bootclasspath="${empty}"
debug="${debug}"
depend="${depend}"
Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/build.xml Thu Apr 20 10:07:39 2006
@@ -21,8 +21,8 @@
<target name="compile">
<javac
- source="1.4"
- target="1.4"
+ source="1.3"
+ target="1.3"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -43,8 +43,8 @@
<target name="servlet" depends="checkservletjar" if="servletjar.available">
<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/engine/org/apache/derby/authentication/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/authentication/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- 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 Thu Apr 20 10:07:39 2006
@@ -21,8 +21,8 @@
<target name="compile_authentication">
<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/engine/org/apache/derby/catalog/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/catalog/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- 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 Thu Apr 20 10:07:39 2006
@@ -21,8 +21,8 @@
<target name="compile_catalog">
<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/engine/org/apache/derby/database/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/database/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- 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 Thu Apr 20 10:07:39 2006
@@ -21,8 +21,8 @@
<target name="compile_database">
<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/engine/org/apache/derby/diag/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/diag/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- 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 Thu Apr 20 10:07:39 2006
@@ -21,8 +21,8 @@
<target name="compile_diag">
<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/engine/org/apache/derby/iapi/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -28,8 +28,8 @@
<target name="compile_iapi_error_jsr169">
<ant dir="${derby.engine.dir}/iapi/reference"/>
<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/engine/org/apache/derby/iapi/db/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/db/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -20,8 +20,8 @@
<target name="compile_iapi_db">
<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/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=395643&r1=395642&r2=395643&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 10:07:39 2006
@@ -52,8 +52,6 @@
<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}/JDBCBoot.java"/>
- <exclude name="${derby.dir}/${cur.dir}/ResourceAdapter.java"/>
</javac>
</target>
@@ -121,7 +119,7 @@
<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}/ResourceAdapter.java"/> -->
</javac>
</target>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -20,8 +20,8 @@
<target name="compile_reference">
<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/engine/org/apache/derby/iapi/services/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- 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 Thu Apr 20 10:07:39 2006
@@ -22,8 +22,8 @@
<target name="compile_iapi_services_jsr169">
<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/engine/org/apache/derby/iapi/services/io/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -23,8 +23,8 @@
<target name="compile_iapi_services_io">
<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/engine/org/apache/derby/iapi/sql/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- 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 Thu Apr 20 10:07:39 2006
@@ -22,8 +22,8 @@
<target name="compile_iapi_sql_jsr169">
<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/engine/org/apache/derby/iapi/store/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -22,8 +22,8 @@
<target name="compile_iapi_store_jsr169">
<javac
- source="1.4"
- target="1.4"
+ source="1.3"
+ target="1.3"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -44,8 +44,8 @@
<target name="compile_iapi_store_jdk13" depends="compile_iapi_store_jsr169">
<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/engine/org/apache/derby/iapi/types/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- 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 Thu Apr 20 10:07:39 2006
@@ -22,8 +22,8 @@
<!-- We only compile XML against JDK 1.4 because it relies on -->
<!-- several XML classes that are part of 1.4 but aren't in 1.3 -->
<javac
- source="1.4"
- target="1.4"
+ source="1.3"
+ target="1.3"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -35,7 +35,7 @@
srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${java14compile.classpath}"/>
+ <pathelement path="${java14compile.classpath};${xercesImpl};${xml-apis}"/>
</classpath>
<include name="${derby.dir}/iapi/types/XML.java"/>
</javac>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -20,8 +20,8 @@
<target name="compile_util">
<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/engine/org/apache/derby/impl/db/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/db/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 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}"
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/io/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/io/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -20,8 +20,8 @@
<target name="compile_impl_io_169">
<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/engine/org/apache/derby/impl/load/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/load/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 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}"
Modified: db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/io/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- 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 Thu Apr 20 10:07:39 2006
@@ -21,8 +21,8 @@
<target name="compile_io">
<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/engine/org/apache/derby/osgi/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -21,8 +21,8 @@
<target name="compile_osgi" depends="checkosgijar" if="osgijar.available">
<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/engine/org/apache/derby/vti/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/vti/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- 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 Thu Apr 20 10:07:39 2006
@@ -22,8 +22,8 @@
<target name="compile_vti">
<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/shared/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/shared/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/build.xml (original)
+++ db/derby/code/trunk/java/shared/build.xml Thu Apr 20 10:07:39 2006
@@ -36,6 +36,28 @@
<!-- 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}"
@@ -50,9 +72,9 @@
includes="org/apache/derby/shared/**"
destdir="${out.dir}">
<classpath>
- <pathelement path="${jce1_2_1}"/>
<pathelement path="${java14compile.classpath}"/>
</classpath>
+ <include name="org/apache/derby/shared/common/reference/JDBC30Translation.java"/>
</javac>
</target>
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/demo/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- 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 Thu Apr 20 10:07:39 2006
@@ -51,8 +51,8 @@
<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/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -51,8 +51,8 @@
<target name="compilet1" depends="compilet2">
<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/testing/org/apache/derbyTesting/functionTests/tests/i18n/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -51,8 +51,8 @@
<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/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- 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 Thu Apr 20 10:07:39 2006
@@ -52,8 +52,8 @@
<target name="compilet1">
<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/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -51,8 +51,8 @@
<target name="compilet1" depends="compilet2">
<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/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- 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 Thu Apr 20 10:07:39 2006
@@ -51,8 +51,8 @@
<target name="compilet1">
<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/testing/org/apache/derbyTesting/functionTests/tests/store/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -50,8 +50,8 @@
</target>
<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/testing/org/apache/derbyTesting/functionTests/tests/storetests/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/build.xml?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- 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 Thu Apr 20 10:07:39 2006
@@ -51,8 +51,8 @@
<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/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -51,8 +51,8 @@
<target name="compilet1">
<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/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/build.xml?rev=395643&r1=395642&r2=395643&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 Thu Apr 20 10:07:39 2006
@@ -51,8 +51,8 @@
<target name="compilet1">
<javac
- source="1.4"
- target="1.4"
+ source="1.3"
+ target="1.3"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
Modified: db/derby/code/trunk/tools/ant/properties/extrapath.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/tools/ant/properties/extrapath.properties?rev=395643&r1=395642&r2=395643&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/extrapath.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/extrapath.properties Thu Apr 20 10:07:39 2006
@@ -7,8 +7,8 @@
jcc=${javatools.dir}/db2jcc.jar
jcc_l=${javatools.dir}/db2jcc_license_c.jar
osgi=${javatools.dir}/osgi.jar
-xercesImpl=${javatools.dir}/xslt4j-2_5_0/xercesImpl.jar
-xml-apis=${javatools.dir}/xslt4j-2_5_0/xml-apis.jar
+xercesImpl=${javatools.dir}/xercesImpl.jar
+xml-apis=${javatools.dir}/xml-apis.jar
xalan=${javatools.dir}/xslt4j-2_5_0/xalan.jar
javacc=${javatools.dir}/javacc.jar
junit=${javatools.dir}/junit.jar
Added: db/derby/code/trunk/tools/java/xercesImpl.jar
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/tools/java/xercesImpl.jar?rev=395643&view=auto
==============================================================================
Binary file - no diff available.
Propchange: db/derby/code/trunk/tools/java/xercesImpl.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: db/derby/code/trunk/tools/java/xml-apis.jar
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/tools/java/xml-apis.jar?rev=395643&view=auto
==============================================================================
Binary file - no diff available.
Propchange: db/derby/code/trunk/tools/java/xml-apis.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream