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/20 20:08:49 UTC

svn commit: r395663 - in /db/derby/code/trunk/java: engine/org/apache/derby/iapi/jdbc/build.xml tools/org/apache/derby/impl/tools/build.xml

Author: fuzzylogic
Date: Thu Apr 20 11:08:48 2006
New Revision: 395663

URL: http://svn.apache.org/viewcvs?rev=395663&view=rev
Log:
DERBY-1078: Add JTA to classpath for compiles that should be under 1.3 but
need JTA in the classpath.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/build.xml

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml?rev=395663&r1=395662&r2=395663&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/build.xml Thu Apr 20 11:08:48 2006
@@ -39,6 +39,7 @@
       destdir="${out.dir}">
       <classpath>
         <pathelement path="${compile.classpath}"/>
+        <pathelement path="${jta1_2}"/>
       </classpath>
       <include name="${derby.dir}/${cur.dir}/*.java"/>
 	  <exclude name="${derby.dir}/${cur.dir}/BrokeredConnection.java"/>

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=395663&r1=395662&r2=395663&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 Thu Apr 20 11:08:48 2006
@@ -53,10 +53,10 @@
       destdir="${out.dir}">
       <classpath>
         <pathelement path="${compile.classpath}"/>
+        <pathelement path="${jta1_2}"/>
       </classpath>
       <include name="${derby.dir}/impl/tools/**"/>
       <exclude name="${derby.dir}/impl/tools/ij/mtGrammar.java"/>
-      <exclude name="${derby.dir}/impl/tools/ij/xaHelper.java"/>
       <exclude name="${derby.dir}/impl/tools/ij/Main14.java"/>
       <exclude name="${derby.dir}/impl/tools/ij/utilMain14.java"/>
     </javac>
@@ -79,7 +79,6 @@
         <pathelement path="${java14compile.classpath}"/>
       </classpath>
       <include name="${derby.dir}/impl/tools/ij/mtGrammar.java"/>
-      <include name="${derby.dir}/impl/tools/ij/xaHelper.java"/>
       <include name="${derby.dir}/impl/tools/ij/Main14.java"/>
       <include name="${derby.dir}/impl/tools/ij/utilMain14.java"/>
     </javac>