db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r399164 - in /db/derby/code/trunk/java: testing/org/apache/derbyTesting/functionTests/tests/derbynet/ testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ tools/org/apache/derby/impl/tools/
Date Wed, 03 May 2006 06:19:52 GMT
Author: fuzzylogic
Date: Tue May  2 23:19:49 2006
New Revision: 399164

URL: http://svn.apache.org/viewcvs?rev=399164&view=rev
Log:
DERBY-1078: Fix stress and dataSourcePermissions related tests on jdk131

Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant
Modified:
    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/jdbcapi/build.xml
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml

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=399164&r1=399163&r2=399164&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
Tue May  2 23:19:49 2006
@@ -98,7 +98,7 @@
   <target name="copyfiles">
     <copy todir="${out.dir}/${derby.testing.functest.dir}/tests/derbynet">
       <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/derbynet"

-        includesfile="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/derbynet/copyfiles.ant"/>
 
+        includes="*.inc,*.properties,*.sql,*.tests"/>
     </copy>
   </target> 
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml?rev=399164&r1=399163&r2=399164&view=diff
==============================================================================
--- 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 May  2 23:19:49 2006
@@ -108,7 +108,6 @@
       <include name="${this.dir}/checkDataSource30.java"/>
       <include name="${this.dir}/savepointJdbc30_JSR169.java"/>
       <include name="${this.dir}/savepointJdbc30_XA.java"/>
-      <include name="${this.dir}/dataSourcePermissions.java"/>
       <include name="${this.dir}/parameterMetaDataJdbc30.java"/>
       <include name="${this.dir}/resultsetJdbc30.java"/>
       <include name="${this.dir}/statementJdbc30.java"/>
@@ -138,6 +137,7 @@
       </classpath>
       <!--exclude name=""/-->
       <include name="${this.dir}/checkDataSource.java"/>
+      <include name="${this.dir}/dataSourcePermissions.java"/>
       <include name="${this.dir}/xaJNDI.java"/>
     </javac>
   </target>

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml?rev=399164&r1=399163&r2=399164&view=diff
==============================================================================
--- 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 Tue May  2 23:19:49
2006
@@ -61,7 +61,29 @@
       <exclude name="${derby.dir}/impl/tools/ij/utilMain14.java"/>
     </javac>
    </target>
-  <target name="compile_tools_impl_jdk14" depends="compile_tools_impl">
+
+  <target name="compile_tools_impl_mt" depends="compile_tools_impl">
+    <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.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">
     <javac
       source="1.4"
       target="1.4"



Mime
View raw message