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 dj...@apache.org on 2007/03/09 22:18:52 UTC
svn commit: r516554 - in /db/derby/code/trunk: ./
java/engine/org/apache/derby/impl/jdbc/
java/testing/org/apache/derbyTesting/unitTests/
java/tools/org/apache/derby/impl/tools/ tools/ant/properties/ tools/java/
Author: djd
Date: Fri Mar 9 13:18:51 2007
New Revision: 516554
URL: http://svn.apache.org/viewvc?view=rev&rev=516554
Log:
DERBY-1983 (partial) Remove most references to jdk13 in the build and any requirement
to download it or the optional components from JDK 1.3.
Removed:
db/derby/code/trunk/tools/java/geronimo-spec-jta-1.0.1B-rc4.jar
Modified:
db/derby/code/trunk/BUILDING.txt
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/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
db/derby/code/trunk/tools/ant/properties/extrapath.properties
Modified: db/derby/code/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/BUILDING.txt?view=diff&rev=516554&r1=516553&r2=516554
==============================================================================
--- db/derby/code/trunk/BUILDING.txt (original)
+++ db/derby/code/trunk/BUILDING.txt Fri Mar 9 13:18:51 2007
@@ -28,8 +28,8 @@
2.2 Download required software
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
+2.2.3 section removed - no longer applies
+2.2.4 section removed - no longer applies
2.2.5 Download and install JUnit 3.8.*
2.2.6 Download Java Development Kit release 1.6.x (Optional)
2.2.7 Download OSGi Service Platform release 3 (osgi.jar) (Optional)
@@ -114,21 +114,18 @@
Notes:
-----
-(1) Derby build environment requires you to install two levels of
- Java Development Kit (JDK) - 1.3.x and 1.4.x as Derby is designed
- to work in JDK1.3.x (JDBC 2.0) and JDK 1.4.x (JDBC 3.0)
- environments. The Derby build is set up such that that most of
- the code is compiled against JDK 1.3.x libraries so that no
- dependencies on JDK 1.4.x classes exist, except for the code
- that only runs in JDK1.4.x. In addition Derby's JDBC 2.0
- implementation must compile against JDBC 2.0 class definitions
- and the JDBC 3.0 implementation against JDBC 3.0 class
- definitions.
-
-(2) The Derby build environment is tested with JDK 131 (Sun),
- JDK 141(Sun), and Ant 161. The Derby build environment should
- work with other versions and other sources of JDK 13 (1.3.x)
- and JDK 14 (1.4.x), and other versions of Ant 1.6 (1.6.x).
+(1) Derby build environment requires you to install one level of
+ Java Development Kit (JDK) - 1.4.x as Derby is designed
+ to work in JDK 1.4.x (JDBC 3.0) environments (or higher).
+ The Derby build is set up such that that most of
+ the code is compiled against JDK 1.4.x libraries so that no
+ dependencies on higher levels of JDKs exist, except for
+ that code designed to run on Java SE 6.
+
+(2) The Derby build environment is tested with
+ JDK 142(Sun) and Ant 161. The Derby build environment should
+ work with other versions and other sources of
+ JDK 14 (1.4.x), and other versions of Ant 1.6 (1.6.x).
@@ -162,49 +159,9 @@
-2.2.3 Download and install Java Development Kit (JDK) release 1.3.x
-
-Skip steps 1-2 of this section if you already have JDK 1.3.x
-installed on your system or if you are on MacOS X.
-
-(1) Download JDK 1.3.x.
- The reference implementation is available at:
- http://java.sun.com/j2se
-
-(2) Install JDK 1.3.x according to the instructions included
- with the release in any directory.
-
-(3) The directory where you have installed JDK 1.3.x will be
- referred to as ${jdk13.dir} in the rest of this document.
-
-
-
-2.2.4 Download extensions for Java Development Kit release 1.3.x
-
-(1) JDBC 2.0
-
- Download JDBC 2.0 (jdbc2_0-stdext.jar) from:
- http://java.sun.com/products/jdbc/download.html
- by selecting "JDBC 2.0 Optional Package Binary".
-
- Save jdbc2_0-stdext.jar file in directory
- ${derby.source}/tools/java
-
-
-(2) Java Cryptography Extension (JCE) version 1.2.2
-
- Download JCE 1.2.2 (jce-1_2_2.zip) from:
- http://java.sun.com/products/jce/index-122.html
-
- Note: You will need to register to download JCE 1.2.2.
-
- The downloaded file (jce-1_2_2.zip) for JCE contains
- documentation files and multiple jar files. After
- downloading the zip file, unzip the file and copy only
- jce1.2.2/lib/jce1_2_2.jar file to directory
- ${derby.source}/tools/java
-
+2.2.3 section removed - no longer applies
+2.2.4 section removed - no longer applies
2.2.5 Download and install JUnit 3.8.*
@@ -266,12 +223,9 @@
document, you should have the following:
${derby.source}/tools/java/empty.jar
-${derby.source}/tools/java/geronimo-spec-jta-1.0.1B-rc4.jar
${derby.source}/tools/java/geronimo-spec-servlet-2.4-rc4.jar
${derby.source}/tools/java/jakarta-oro-2.0.8.jar
${derby.source}/tools/java/javacc.jar
-${derby.source}/tools/java/jce1_2_2.jar
-${derby.source}/tools/java/jdbc2_0-stdext.jar
${derby.source}/tools/java/osgi.jar
@@ -373,11 +327,11 @@
For example, you should have:
- j13lib=c:/jdk1.3.1_15/jre/lib
+ j14lib=c:/jdk1.4.2/jre/lib
NOT
- j13lib=c:\jdk1.3.1_15\jre\lib
+ j14lib=c:\jdk1.4.2\jre\lib
- j14lib
@@ -389,16 +343,6 @@
where ${jdk14.dir} is the directory name where you have
installed JDK 1.4.x. Check out section 2.2.2 of this document.
-
- - j13lib
-
- This is a required variable which defines the location of
- JDK 1.3.x. Define the variable as follows:
-
- j13lib=${jdk13.dir}/jre/lib
-
- where ${jdk13.dir} is the directory name where you have
- installed JDK 1.3.x. Check out section 2.2.3 of this document.
- Optional - jdk16
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=516554&r1=516553&r2=516554
==============================================================================
--- 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 13:18:51 2007
@@ -59,28 +59,12 @@
<exclude name="${derby.dir}/impl/jdbc/*30.java"/>
<exclude name="${derby.dir}/impl/jdbc/*40.java"/>
<exclude name="${derby.dir}/impl/jdbc/LOBStoredProcedure.java"/>
+
+ <include name="${derby.dir}/impl/jdbc/authentication/**"/>
+ <exclude name="${derby.dir}/impl/jdbc/authentication/JNDI**"/>
+ <exclude name="${derby.dir}/impl/jdbc/authentication/LDAP**"/>
</javac>
<copy file="metadata.properties" tofile="${out.dir}/org/apache/derby/impl/jdbc/metadata.properties"/>
- <javac
- source="1.4"
- target="1.4"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.engine.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${compile.classpath}"/>
- </classpath>
- <include name="${derby.dir}/impl/jdbc/authentication/**"/>
- <exclude name="${derby.dir}/impl/jdbc/authentication/JNDI**"/>
- <exclude name="${derby.dir}/impl/jdbc/authentication/LDAP**"/>
- </javac>
</target>
<target name="compile_jsr169_opt">
<javac
@@ -102,7 +86,7 @@
<include name="${derby.dir}/impl/jdbc/*169.java"/>
</javac>
</target>
- <target name="compile_jdbc2" depends="compile_jsr169">
+ <target name="compile_jdbc3" depends="compile_jsr169">
<javac
source="1.4"
target="1.4"
@@ -120,51 +104,14 @@
<pathelement path="${java14compile.classpath}"/>
</classpath>
<include name="${derby.dir}/impl/jdbc/*20.java"/>
- </javac>
- <javac
- source="1.4"
- target="1.4"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.engine.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${java14compile.classpath}"/>
- </classpath>
+ <include name="${derby.dir}/impl/jdbc/*30.java"/>
+ <include name="${derby.dir}/impl/jdbc/LOBStoredProcedure.java"/>
<include name="${derby.dir}/impl/jdbc/authentication/JNDI**"/>
<include name="${derby.dir}/impl/jdbc/authentication/LDAP**"/>
- </javac>
- </target>
-
- <target name="compile_jdbc3" depends="compile_jdbc2">
- <javac
- source="1.4"
- target="1.4"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.engine.src.dir};${derby.engine.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${java14compile.classpath}"/>
- </classpath>
- <include name="${derby.dir}/impl/jdbc/*30.java"/>
- <include name="${derby.dir}/impl/jdbc/LOBStoredProcedure.java"/>
</javac>
</target>
-<target name="compile_jdbc4" if="jdk16">
+<target name="compile_jdbc4" depends="compile_jdbc3" if="jdk16">
<javac
source="1.6"
target="1.6"
@@ -178,7 +125,7 @@
optimize="${optimize}"
proceed="${proceed}"
verbose="${verbose}"
- srcdir="${derby.engine.src.dir};${derby.engine.src.dir}"
+ srcdir="${derby.engine.src.dir}"
destdir="${out.dir}">
<classpath>
<pathelement path="${java16compile.classpath}"/>
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=516554&r1=516553&r2=516554
==============================================================================
--- 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 13:18:51 2007
@@ -69,7 +69,6 @@
srcdir="${derby.testing.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${jta1_2}"/>
<pathelement path="${compile.classpath}"/>
<pathelement path="${junit}"/>
</classpath>
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=516554&r1=516553&r2=516554
==============================================================================
--- 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 13:18:51 2007
@@ -71,7 +71,6 @@
destdir="${out.dir}">
<classpath>
<pathelement path="${compile.classpath}"/>
- <pathelement path="${jta1_2}"/>
</classpath>
<include name="${derby.dir}/impl/tools/**"/>
<exclude name="${derby.dir}/impl/tools/ij/mtGrammar.java"/>
@@ -80,28 +79,7 @@
</javac>
</target>
- <target name="compile_tools_impl_mt" depends="compile_tools_impl">
- <javac
- source="1.4"
- target="1.4"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.tools.src.dir}"
- destdir="${out.dir}">
- <classpath>
- <pathelement path="${java14compile.classpath}"/>
- </classpath>
- <include name="${derby.dir}/impl/tools/ij/mtGrammar.java"/>
- </javac>
- </target>
-
- <target name="compile_tools_impl_jdk14" depends="compile_tools_impl_mt">
+ <target name="compile_tools_impl_jdk14" depends="compile_tools_impl">
<javac
source="1.4"
target="1.4"
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=516554&r1=516553&r2=516554
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/compilepath.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/compilepath.properties Fri Mar 9 13:18:51 2007
@@ -13,10 +13,6 @@
# suitable for J2ME/CDC/Foundation and thus do not rely on
# JDK 1.4 methods/classes not in J2ME.
-
-jta1_2=${javatools.dir}/geronimo-spec-jta-1.0.1B-rc4.jar
-
-
# Java2 1.4 paths - for JDBC 3.0/JDK1.4
#j14lib=${basedir}/jdk141/jre/lib
Modified: db/derby/code/trunk/tools/ant/properties/extrapath.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/extrapath.properties?view=diff&rev=516554&r1=516553&r2=516554
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/extrapath.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/extrapath.properties Fri Mar 9 13:18:51 2007
@@ -1,7 +1,6 @@
#
# Extra jars/zips/classes
#
-jndi=${javatools.dir}/jndi/jndi.jar;${javatools.dir}/jndi/providerutil.jar;${javatools.dir}/jndi/ldap.jar
oro=${javatools.dir}/jakarta-oro-2.0.8.jar
servlet24=${javatools.dir}/geronimo-spec-servlet-2.4-rc4.jar
jcc=${javatools.dir}/db2jcc.jar
@@ -20,4 +19,4 @@
#
# Run-time extras
#
-jars.extras=${jndi};${oro};${servlet24};${jcc};${jcc_l}
+jars.extras=${oro};${servlet24};${jcc};${jcc_l}