db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r509863 - in /db/derby/code/trunk/java: demo/ drda/org/apache/derby/impl/drda/ engine/org/apache/derby/iapi/store/ engine/org/apache/derby/iapi/types/ engine/org/apache/derby/impl/services/ engine/org/apache/derby/impl/store/ engine/org/apa...
Date Wed, 21 Feb 2007 01:45:53 GMT
Author: djd
Date: Tue Feb 20 17:45:52 2007
New Revision: 509863

URL: http://svn.apache.org/viewvc?view=rev&rev=509863
Log:
DERBY-1983 Remove some uses of java13compile.classpath that do not require code changes.

Modified:
    db/derby/code/trunk/java/demo/build.xml
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/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/impl/services/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/osgi/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml

Modified: db/derby/code/trunk/java/demo/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/build.xml?view=diff&rev=509863&r1=509862&r2=509863
==============================================================================
--- db/derby/code/trunk/java/demo/build.xml (original)
+++ db/derby/code/trunk/java/demo/build.xml Tue Feb 20 17:45:52 2007
@@ -36,8 +36,8 @@
 
   <target name="compile">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -50,13 +50,13 @@
       destdir="${out.dir}"
       includes="Simple*">
       <classpath>
-        <pathelement path="${java13compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
         <pathelement location="${jcc}"/>
       </classpath>
     </javac>
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -70,13 +70,13 @@
       includes="nserverdemo/**"
       excludes="nserverdemo/Simple*">
       <classpath>
-        <pathelement path="${java13compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
         <pathelement location="${jcc}"/>
       </classpath>
     </javac>
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -88,13 +88,13 @@
       srcdir="${derby.demo.src.dir}/simple"
       destdir="${out.dir}">
       <classpath>
-        <pathelement location="${javasrc.dir};${jcc};${jta1_2}"/>
-        <pathelement path="${java13compile.classpath};${jcc};${jta1_2}"/>
+        <pathelement location="${javasrc.dir};${jcc}"/>
+        <pathelement path="${java14compile.classpath};${jcc}"/>
       </classpath>
     </javac>
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -106,8 +106,8 @@
       srcdir="${derby.demo.src.dir}/workingwithderby"
       destdir="${out.dir}">
       <classpath>
-        <pathelement location="${javasrc.dir};${jcc};${jta1_2}"/>
-        <pathelement path="${java13compile.classpath};${jcc};${jta1_2}"/>
+        <pathelement location="${javasrc.dir};${jcc};"/>
+        <pathelement path="${java14compile.classpath};${jcc};"/>
       </classpath>
     </javac>
     <ant target="compile" dir="toursdb"/>

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml?view=diff&rev=509863&r1=509862&r2=509863
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/build.xml Tue Feb 20 17:45:52
2007
@@ -68,7 +68,6 @@
       srcdir="${derby.drda.src.dir}"
       destdir="${out.dir}">
       <classpath>
-      <pathelement location="${jta1_2}"/>
         <pathelement path="${java14compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/drda/DRDAXAProtocol.java"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/build.xml?view=diff&rev=509863&r1=509862&r2=509863
==============================================================================
--- 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 Tue Feb 20 17:45:52
2007
@@ -60,8 +60,8 @@
 
   <target name="compile_iapi_store_jdk13" depends="compile_iapi_store_jsr169">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -73,8 +73,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-		<pathelement location="${jta1_2}"/>
-        <pathelement path="${java13compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/store/access/xa/*.java"/>
     </javac>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/build.xml?view=diff&rev=509863&r1=509862&r2=509863
==============================================================================
--- 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 Tue Feb 20 17:45:52
2007
@@ -78,8 +78,8 @@
       <exclude name="${derby.dir}/iapi/types/SqlXmlUtil.java"/>
     </javac>
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -91,7 +91,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java13compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/iapi/types/SQLDecimal.java"/>
       <include name="${derby.dir}/iapi/types/J2SEDataValueFactory.java"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml?view=diff&rev=509863&r1=509862&r2=509863
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/build.xml Tue Feb 20 17:45:52
2007
@@ -58,8 +58,8 @@
  
  <target name="compile_impl_services" depends="compile_impl_services_169">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -71,8 +71,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement location="${jce1_2_1}"/>
-        <pathelement path="${java13compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/services/jce/**"/>
     </javac>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml?view=diff&rev=509863&r1=509862&r2=509863
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/build.xml Tue Feb 20 17:45:52
2007
@@ -36,8 +36,8 @@
 
   <target name="compile_impl_store">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -49,8 +49,7 @@
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
-		<pathelement location="${jta1_2}"/>
-        <pathelement path="${java13compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/store/**"/>
       <exclude name="${derby.dir}/impl/store/raw/data/RAFContainer4.java"/>

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?view=diff&rev=509863&r1=509862&r2=509863
==============================================================================
--- 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 Tue Feb 20 17:45:52 2007
@@ -37,8 +37,8 @@
 
   <target name="compile_osgi" depends="checkosgijar" if="osgijar.available">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
@@ -51,7 +51,7 @@
       destdir="${out.dir}">
       <classpath>
 		<pathelement location="${osgi}"/>
-        <pathelement path="${java13compile.classpath}"/>
+        <pathelement path="${compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/osgi/*.java"/>
     </javac>

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?view=diff&rev=509863&r1=509862&r2=509863
==============================================================================
--- 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
Tue Feb 20 17:45:52 2007
@@ -163,8 +163,8 @@
 
   <target name="compilex">
     <javac
-      source="1.3"
-      target="1.3"
+      source="1.4"
+      target="1.4"
       bootclasspath="${empty}"
       nowarn="on"
       debug="true"
@@ -176,9 +176,8 @@
       srcdir="${derby.testing.src.dir}"
       destdir="${out.dir}">
       <classpath>
-        <pathelement path="${java13compile.classpath}"/>
+        <pathelement path="${java14compile.classpath}"/>
         <pathelement location="${oro}"/>
-        <pathelement location="${jta1_2}"/>
       </classpath>
       <!--exclude name=""/-->
       <include name="${this.dir}/checkDataSource.java"/>



Mime
View raw message