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 fu...@apache.org on 2006/04/26 21:40:55 UTC
svn commit: r397278 - in /db/derby/code/trunk/java:
engine/org/apache/derby/iapi/services/crypto/build.xml
engine/org/apache/derby/jdbc/build.xml
testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
Author: fuzzylogic
Date: Wed Apr 26 12:40:53 2006
New Revision: 397278
URL: http://svn.apache.org/viewcvs?rev=397278&view=rev
Log:
DERBY-1078: Fix XA, encryption, and a couple more tests for jdk131-built-on-jdk15/16.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/build.xml
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml?rev=397278&r1=397277&r2=397278&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml Wed Apr 26 12:40:53 2006
@@ -19,8 +19,8 @@
<!-- Targets -->
<target name="compile_crypto">
<javac
- source="1.4"
- target="1.4"
+ source="1.3"
+ target="1.3"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -33,7 +33,7 @@
destdir="${out.dir}">
<classpath>
<pathelement location="${jce1_2_1}"/>
- <pathelement path="${java14compile.classpath}"/>
+ <pathelement path="${java13compile.classpath}"/>
</classpath>
<include name="${derby.dir}/iapi/services/crypto/*.java"/>
</javac>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml?rev=397278&r1=397277&r2=397278&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml Wed Apr 26 12:40:53 2006
@@ -129,10 +129,9 @@
</target>
<target name="compile_jdbc3">
-
<javac
- source="1.4"
- target="1.4"
+ source="1.3"
+ target="1.3"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
@@ -146,12 +145,12 @@
<classpath>
<pathelement path="${java14compile.classpath}"/>
</classpath>
- <include name="${derby.dir}/jdbc/Driver30.java"/>
+ <include name="${derby.dir}/jdbc/Driver30.java"/>
<include name="${derby.dir}/jdbc/EmbedXAConnection.java"/>
<include name="${derby.dir}/jdbc/EmbeddedXADataSource.java"/>
<include name="${derby.dir}/jdbc/XATransactionState.java"/>
<include name="${derby.dir}/jdbc/XAStatementControl.java"/>
- <include name="${derby.dir}/jdbc/ResourceAdapterImpl.java"/>
+ <include name="${derby.dir}/jdbc/ResourceAdapterImpl.java"/>
</javac>
</target>
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=397278&r1=397277&r2=397278&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 Wed Apr 26 12:40:53 2006
@@ -74,8 +74,8 @@
<target name="compilet2">
<javac
- source="1.4"
- target="1.4"
+ source="1.3"
+ target="1.3"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"