db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r725044 - in /db/derby/code/trunk: build.xml java/stubs/jdbc3/java/sql/Timestamp.java tools/ant/properties/compilepath.properties tools/ant/properties/dirs.properties
Date Wed, 10 Dec 2008 09:54:04 GMT
Author: kahatlen
Date: Wed Dec 10 01:54:02 2008
New Revision: 725044

URL: http://svn.apache.org/viewvc?rev=725044&view=rev
Log:
DERBY-3966: Fixed build break

1) Moved the definition of the empty property from
compilepath.properties to dirs.properties, so that it's available from
the init target

2) Moved the creation of ${empty} from the engine target to the init
target, so that the directory exists when the stubs are compiled

3) Made the JDBC 3 stubs use StringBuffer instead of StringBuilder
since they are compiled against the Java 1.4 libraries

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/stubs/jdbc3/java/sql/Timestamp.java
    db/derby/code/trunk/tools/ant/properties/compilepath.properties
    db/derby/code/trunk/tools/ant/properties/dirs.properties

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=725044&r1=725043&r2=725044&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Dec 10 01:54:02 2008
@@ -42,6 +42,12 @@
 
     <tstamp/>
     <mkdir dir="${out.dir}"/>
+
+    <!-- Create the emtpy dir that we put in the boot classpath to
+         prevent the default Java runtime libraries from being loaded.
+      -->
+    <mkdir dir="${empty}"/>
+
     <!-- generate sanity state.properties if one does not exist -->
     <available property="state.available" file="${state.file}"/>
     <antcall target="ensuresanitystate"/>
@@ -409,12 +415,6 @@
 <!-- ==================================================================== -->
 
   <target name="engine" depends="shared,state,parsers">
-
-    <!-- Create the emtpy dir that we put in the boot classpath to
-         prevent the default Java runtime libraries from being loaded.
-      -->
-    <mkdir dir="${empty}"/>
-
     <ant dir="${derby.engine.src.dir}"/>
     <antcall target="build"/>
     <ant dir="${derby.engine.dir}/loc"/>

Modified: db/derby/code/trunk/java/stubs/jdbc3/java/sql/Timestamp.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/stubs/jdbc3/java/sql/Timestamp.java?rev=725044&r1=725043&r2=725044&view=diff
==============================================================================
--- db/derby/code/trunk/java/stubs/jdbc3/java/sql/Timestamp.java (original)
+++ db/derby/code/trunk/java/stubs/jdbc3/java/sql/Timestamp.java Wed Dec 10 01:54:02 2008
@@ -299,7 +299,7 @@
      * Private method to format the time
      */
     private String format(int date, int digits) {
-        StringBuilder dateStringBuffer = new StringBuilder(String.valueOf(date));
+        StringBuffer dateStringBuffer = new StringBuffer(String.valueOf(date));
         while (dateStringBuffer.length() < digits) {
             dateStringBuffer = dateStringBuffer.insert(0, '0');
         }

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=725044&r1=725043&r2=725044&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/compilepath.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/compilepath.properties Wed Dec 10 01:54:02 2008
@@ -13,10 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# An empty directory that we put in the boot classpath to prevent Ant
-# from using the default Java Runtime classes.
-empty=${out.dir}/empty
-
 # jsr169compile.classpath
 # Set for an individual code line to enable the build
 # of JSR 169 (JDBC subset for J2ME/CDC/Foundation) classes.

Modified: db/derby/code/trunk/tools/ant/properties/dirs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/dirs.properties?rev=725044&r1=725043&r2=725044&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/dirs.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/dirs.properties Wed Dec 10 01:54:02 2008
@@ -47,6 +47,10 @@
 out.jdbc3.dir=${out.stubs.dir}/jdbc3
 out.jdbc4.dir=${out.stubs.dir}/jdbc4
 
+# An empty directory that we put in the boot classpath to prevent Ant
+# from using the default Java Runtime classes.
+empty=${out.dir}/empty
+
 #
 # OpenSource dirs
 #



Mime
View raw message