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 rh...@apache.org on 2013/05/28 21:01:13 UTC
svn commit: r1487040 - in /db/derby/code/trunk: ./
java/build/org/apache/derbyBuild/ java/build/org/apache/derbyPreBuild/
java/demo/ java/demo/toursdb/ java/storeless/ java/stubs/jdbc3/
java/stubs/jsr169/
Author: rhillegas
Date: Tue May 28 19:01:13 2013
New Revision: 1487040
URL: http://svn.apache.org/r1487040
Log:
DERBY-6213: Remove java15compile.classpath build variable and the JDBC 3 and JSR 169 stubs.
Removed:
db/derby/code/trunk/java/stubs/jdbc3/
db/derby/code/trunk/java/stubs/jsr169/
Modified:
db/derby/code/trunk/BUILDING.html
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml
db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java
db/derby/code/trunk/java/demo/build.xml
db/derby/code/trunk/java/demo/toursdb/build.xml
db/derby/code/trunk/java/storeless/build.xml
Modified: db/derby/code/trunk/BUILDING.html
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/BUILDING.html?rev=1487040&r1=1487039&r2=1487040&view=diff
==============================================================================
--- db/derby/code/trunk/BUILDING.html (original)
+++ db/derby/code/trunk/BUILDING.html Tue May 28 19:01:13 2013
@@ -84,7 +84,7 @@ If you are reading these instructions, c
<TR>
<TD><b><i>Java Development Kit</i></b></TD>
- <TD>You need to install a Java 5 or later JDK. Probably, your machine
+ <TD>You need to install a Java 6 or later JDK. Probably, your machine
already has this JDK. If not, Sun and IBM supply free JDKs for many machines.</TD>
</TR>
@@ -135,7 +135,7 @@ test harness also:
Before building Derby, cd
to the root of your Derby source distribution. That is the top level
directory which contains the LICENSE and NOTICE files. In addition,
-make sure that the version of Java which you are using is Java 5 or
+make sure that the version of Java which you are using is Java 6 or
later. You can verify this by checking the output of the following command:
</p>
@@ -420,6 +420,11 @@ Derby is supposed to run in all of the f
</TR>
<TR>
+ <TD><b><i>Java 8</i></b></TD>
+ <TD><b><i>JDBC 4.2</i></b></TD>
+ </TR>
+
+ <TR>
<TD><b><i>Java 7</i></b></TD>
<TD><b><i>JDBC 4.1</i></b></TD>
</TR>
@@ -429,16 +434,6 @@ Derby is supposed to run in all of the f
<TD><b><i>JDBC 4.0</i></b></TD>
</TR>
- <TR>
- <TD><b><i>Java 5</i></b></TD>
- <TD><b><i>JDBC 3</i></b></TD>
- </TR>
-
- <TR>
- <TD><b><i>Small Device (CDC/FP 1.1)</i></b></TD>
- <TD><b><i>JSR169</i></b></TD>
- </TR>
-
</TBODY>
</TABLE>
@@ -475,10 +470,20 @@ enforces compile-time contracts for the
</TR>
<TR>
+ <TD><b><i>Java 8</i></b></TD>
+ <TD><b><i>java18compile.classpath</i></b></TD>
+ <TD>The set of libraries in the Java 8 JDK. The build fails if
+ your environment isn't a Java 6, 7, or 8 JDK.</TD>
+ <TD>The set of system jars in your JDK if your environment is
+ JDK 8. Otherwise,
+ <i>${java17compile.classpath}</i></TD>
+ </TR>
+
+ <TR>
<TD><b><i>Java 7</i></b></TD>
<TD><b><i>java17compile.classpath</i></b></TD>
<TD>The set of libraries in the Java 7 JDK. The build fails if
- your environment isn't a Java 5, 6 or 7 JDK.</TD>
+ your environment isn't a Java 6, 7, or 8 JDK.</TD>
<TD>The set of system jars in your JDK if your environment is
JDK 7. Otherwise,
<i>${java16compile.classpath}</i></TD>
@@ -488,35 +493,13 @@ enforces compile-time contracts for the
<TD><b><i>Java 6</i></b></TD>
<TD><b><i>java16compile.classpath</i></b></TD>
<TD>The set of libraries in the Java 6 JDK. The build fails if
- your environment isn't a Java 5, 6 or 7 JDK.</TD>
+ your environment isn't a Java 6, 7, or 8 JDK.</TD>
<TD>The set of system jars in your JDK if your environment is
- JDK 6. Otherwise, <i>classes/stubs/jdbc4:${java15compile.classpath}</i> if your environment
- is JDK 5. Otherwise
+ JDK 6. Otherwise, <i>classes/stubs/jdbc4:${java18compile.classpath}</i> if your environment
+ is JDK 8. Otherwise
<i>${java17compile.classpath}</i></TD>
</TR>
- <TR>
- <TD><b><i>Java 5</i></b></TD>
- <TD><b><i>java15compile.classpath</i></b></TD>
- <TD>The set of libraries in the Java 5 JDK. The build fails if
- your environment isn't a Java 5, 6 or 7 JDK.</TD>
- <TD>The set of system jars in your JDK if your environment is
- JDK 5. Otherwise,
- <i>classes/stubs/jdbc3:${java16compile.classpath}</i></TD>
- </TR>
-
- <TR>
- <TD><b><i>Small Device (CDC/FP 1.1)</i></b></TD>
- <TD><b><i>jsr169compile.classpath</i></b></TD>
- <TD>This should be set to the list of small device libraries on
- your machine--if you have them. That is, the CDC/FP 1.1 jars and
- the jsr169 jar. To get a set of small device libraries, see
- <a href="http://blogs.sun.com/wittyman/entry/javadb_on_sun_javame_cdc">Oracle's instructions</a>
- or download IBM's WCTME 5.7.
- </TD>
- <TD><i>classes/stubs/jsr169:${java15compile.classpath}</i></TD>
- </TR>
-
</TBODY>
</TABLE>
@@ -537,15 +520,6 @@ library variables in <i>ant.properties</
</TR>
<TR>
- <TD><b><i>j15lib</i></b></TD>
- <TD>If you set this variable to be the directory which contains
- your Java 5 jars, then the Derby build will set
- <i>java15compile.classpath</i> to be the list of jars in that directory.
- </TD>
- <TD>Optional variable. No default value.</TD>
- </TR>
-
- <TR>
<TD><b><i>j16lib</i></b></TD>
<TD>If you set this variable to be the directory which contains
your Java 6 jars, then the Derby build will set
@@ -563,6 +537,15 @@ library variables in <i>ant.properties</
<TD>Optional variable. No default value.</TD>
</TR>
+ <TR>
+ <TD><b><i>j18lib</i></b></TD>
+ <TD>If you set this variable to be the directory which contains
+ your Java 8 jars, then the Derby build will set
+ <i>java18compile.classpath</i> to be the list of jars in that directory.
+ </TD>
+ <TD>Optional variable. No default value.</TD>
+ </TR>
+
</TBODY>
</TABLE>
@@ -585,10 +568,6 @@ java16compile.classpath=/System/Library/
/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Classes/laf.jar: \
/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Classes/management-agent: \
/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Classes/ui.jar
-
-jsr169compile.classpath=/Users/myself/sw/phoneME/phoneme_advanced_mr2/lib/btclasses.zip: \
- /Users/myself/sw/phoneME/phoneme_advanced_mr2/lib/basis.jar: \
- /Users/myself/sw/jsr169Support/jdbc.jar
</font></b></pre>
</blockquote>
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1487040&r1=1487039&r2=1487040&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Tue May 28 19:01:13 2013
@@ -49,7 +49,7 @@
<target
name="buildsource"
- depends="checkCompilerLevel,init,prebuild,setCompilerProperties,jsr169stubs,jdbc3stubs,jdbc4stubs,felixStubs,engine,storeless,tools,drda,client,build,versioninfo,localeinfo,binscripts"
+ depends="checkCompilerLevel,init,prebuild,setCompilerProperties,jdbc4stubs,felixStubs,engine,storeless,tools,drda,client,build,versioninfo,localeinfo,binscripts"
description="Compile the product source (does not build the tests)."
/>
<target
@@ -287,8 +287,9 @@
/>
<!--
- After setting the JDK properties, we expect that java15compile.classpath or
- java16compile.classpath will be set. If neither is set, PropertySetter aborts the build.
+ After setting the JDK properties, we expect that java16compile.classpath,
+ java17compile.classpath, or java18compile.classpath will be set.
+ If none of these are set, then PropertySetter aborts the build.
-->
<setJdkProperties/>
@@ -299,37 +300,28 @@
<!--
- If a Java 6 JDK isn't present, then use the Java 5 environment to build the JDBC 4 support.
- If a Java 5 JDK also isn't present then use the Java 7 environment to build the JDBC 4 support
+ If a Java 6 JDK isn't present, then use the Java 7 environment to build the JDBC 4 support
-->
<condition property="java17compile.classpath" value="${out.jdbc4.dir}:${java18compile.classpath}">
<isset property="java18compile.classpath"/>
</condition>
- <condition property="java16compile.classpath" value="${out.jdbc4.dir}:${java15compile.classpath}" else="${java17compile.classpath}">
- <isset property="java15compile.classpath"/>
- </condition>
+ <property name="java16compile.classpath" value="${java17compile.classpath}"/>
<!--
- If a Java 5 JDK isn't present, then use the Java 6 environment to build the Java 5 support
+ If a Java 7 JDK isn't present, then use the Java 6 environment.
-->
- <property name="java15compile.classpath" value="${out.jdbc3.dir}:${java16compile.classpath}"/>
+ <property name="java17compile.classpath" value="${java16compile.classpath}"/>
<!--
- If a Java 7 JDK isn't present, then use the Java 6 environment.
+ If a Java 8 JDK isn't present, then use the Java 7 environment.
-->
- <property name="java17compile.classpath" value="${java16compile.classpath}"/>
+ <property name="java18compile.classpath" value="${java17compile.classpath}"/>
<property file="${properties.dir}/compilepath.properties"/>
<!-- Release and version info -->
<property file="${properties.dir}/release.properties"/>
<!--
- If the user hasn't already set this property, point it at our stub
- implementation of JSR169.
- -->
- <property name="jsr169compile.classpath" value="${out.jsr169.dir}:${java15compile.classpath}"/>
-
- <!--
The lowest common denominator compile path for Derby. We expect that
the bulk of the Derby product will run on Java SE 6.
-->
@@ -359,13 +351,12 @@
<echo message="${checkEvent} compilerPropsAlreadySet = ${compilerPropsAlreadySet}"/>
<echo message="${checkEvent} compilerLevel16 = ${compilerLevel16}"/>
<echo message="${checkEvent} compile.classpath = ${compile.classpath}"/>
- <echo message="${checkEvent} jsr169compile.classpath = ${jsr169compile.classpath}"/>
- <echo message="${checkEvent} j15lib = ${j15lib}"/>
- <echo message="${checkEvent} java15compile.classpath = ${java15compile.classpath}"/>
<echo message="${checkEvent} j16lib = ${j16lib}"/>
<echo message="${checkEvent} java16compile.classpath = ${java16compile.classpath}"/>
<echo message="${checkEvent} j17lib = ${j17lib}"/>
<echo message="${checkEvent} java17compile.classpath = ${java17compile.classpath}"/>
+ <echo message="${checkEvent} j18lib = ${j18lib}"/>
+ <echo message="${checkEvent} java18compile.classpath = ${java18compile.classpath}"/>
</target>
@@ -797,59 +788,6 @@
</target>
<!-- =================================================================== -->
-<!-- Build the stub implementation of JSR169 -->
-<!-- =================================================================== -->
- <target name="jsr169stubs">
- <mkdir dir="${out.stubs.dir}"/>
- <mkdir dir="${out.jsr169.dir}"/>
- <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.jsr169.src.dir}"
- destdir="${out.jsr169.dir}">
- <classpath>
- <pathelement path="${compile.classpath}"/>
- </classpath>
- </javac>
-
- </target>
-
-<!-- =================================================================== -->
-<!-- Build the stub implementation of JDBC3 -->
-<!-- =================================================================== -->
- <target name="jdbc3stubs">
- <mkdir dir="${out.stubs.dir}"/>
- <mkdir dir="${out.jdbc3.dir}"/>
-
- <javac
- source="1.5"
- target="1.5"
- bootclasspath="${empty}"
- nowarn="on"
- debug="${debug}"
- depend="${depend}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- proceed="${proceed}"
- verbose="${verbose}"
- srcdir="${derby.jdbc3.src.dir}"
- destdir="${out.jdbc3.dir}">
- <classpath>
- <pathelement path="${java15compile.classpath}"/>
- </classpath>
- </javac>
-
- </target>
-
-<!-- =================================================================== -->
<!-- Build the stub implementation of JDBC4 -->
<!-- =================================================================== -->
<target name="jdbc4stubs">
@@ -884,8 +822,8 @@
<mkdir dir="${out.felix.dir}"/>
<javac
- source="1.4"
- target="1.4"
+ source="1.6"
+ target="1.6"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -897,7 +835,7 @@
srcdir="${derby.felix.src.dir}"
destdir="${out.felix.dir}">
<classpath>
- <pathelement path="${java15compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
</javac>
Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml?rev=1487040&r1=1487039&r2=1487040&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/build.xml Tue May 28 19:01:13 2013
@@ -52,7 +52,7 @@
srcdir="${derby.build.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${java15compile.classpath};${java.home}/../lib/tools.jar"/>
+ <pathelement path="${java16compile.classpath};${java.home}/../lib/tools.jar"/>
<pathelement path="${ant.core.lib}"/>
</classpath>
<include name="org/apache/derbyBuild/**"/>
Modified: db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java?rev=1487040&r1=1487039&r2=1487040&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyPreBuild/PropertySetter.java Tue May 28 19:01:13 2013
@@ -51,7 +51,6 @@ import org.apache.tools.ant.taskdefs.Pro
* </p>
*
* <ul>
- * <li>java15compile.classpath</li>
* <li>java16compile.classpath</li>
* <li>java17compile.classpath</li>
* <li>java18compile.classpath</li>
@@ -63,7 +62,6 @@ import org.apache.tools.ant.taskdefs.Pro
* </p>
*
* <ul>
- * <li>j15lib</li>
* <li>j16lib</li>
* <li>j17lib</li>
* <li>j18lib</li>
@@ -93,7 +91,6 @@ public class PropertySetter extends Task
// declared in ascending order
private static final VMLevel[] VM_LEVELS =
{
- new VMLevel( "15", "1.5" ),
new VMLevel( "16", "1.6" ),
new VMLevel( "17", "1.7" ),
new VMLevel( "18", "1.8" ),
Modified: db/derby/code/trunk/java/demo/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/build.xml?rev=1487040&r1=1487039&r2=1487040&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/build.xml (original)
+++ db/derby/code/trunk/java/demo/build.xml Tue May 28 19:01:13 2013
@@ -50,7 +50,7 @@
destdir="${out.dir}"
includes="Simple*">
<classpath>
- <pathelement path="${java15compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
</javac>
<javac
@@ -69,7 +69,7 @@
includes="nserverdemo/**"
excludes="nserverdemo/Simple*">
<classpath>
- <pathelement path="${java15compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
</javac>
<!-- "simple" demos under java/demo/ (SimpleApp, SimpleMobileApp) -->
@@ -88,7 +88,7 @@
destdir="${out.dir}">
<classpath>
<pathelement location="${javasrc.dir}"/>
- <pathelement path="${java15compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
</javac>
<javac
@@ -106,7 +106,7 @@
destdir="${out.dir}">
<classpath>
<pathelement location="${javasrc.dir}"/>
- <pathelement path="${java15compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
</javac>
<ant target="compile" dir="toursdb"/>
@@ -140,7 +140,7 @@
srcdir="${derby.demo.src.dir}/vtis/java"
destdir="${out.dir}">
<classpath>
- <pathelement path="${java15compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<!-- <compilerarg value="-Xlint:unchecked"/> -->
</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=1487040&r1=1487039&r2=1487040&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/toursdb/build.xml (original)
+++ db/derby/code/trunk/java/demo/toursdb/build.xml Tue May 28 19:01:13 2013
@@ -50,7 +50,7 @@
srcdir="${derby.demo.src.dir}"
destdir="${out.dir}">
<classpath>
- <pathelement path="${java15compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
<include name="toursdb/insertMaps.java"/>
</javac>
Modified: db/derby/code/trunk/java/storeless/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/storeless/build.xml?rev=1487040&r1=1487039&r2=1487040&view=diff
==============================================================================
--- db/derby/code/trunk/java/storeless/build.xml (original)
+++ db/derby/code/trunk/java/storeless/build.xml Tue May 28 19:01:13 2013
@@ -74,7 +74,7 @@
destdir="${out.storeless.dir}">
<classpath>
<pathelement path="${out.dir}"/>
- <pathelement path="${java15compile.classpath}"/>
+ <pathelement path="${java16compile.classpath}"/>
</classpath>
</javac>
</target>