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 dj...@apache.org on 2006/02/28 18:06:25 UTC
svn commit: r381706 - in
/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests:
master/ suites/ tests/jdbcapi/ util/
Author: djd
Date: Tue Feb 28 09:06:21 2006
New Revision: 381706
URL: http://svn.apache.org/viewcvs?rev=381706&view=rev
Log:
DERBY-434 Add new jdbcapi/XATest.java to 10.1 branch.
Integrate of 378755, 378758, 378796 from trunk.
Added:
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/XATest.out (props changed)
- copied unchanged from r378755, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/XATest.out
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java (props changed)
- copied unchanged from r378755, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest_app.properties (props changed)
- copied unchanged from r378758, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest_app.properties
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/util/XATestUtil.java (contents, props changed)
- copied, changed from r378755, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/XATestUtil.java
Modified:
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/util/build.xml
Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/XATest.out
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall?rev=381706&r1=381705&r2=381706&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall Tue Feb 28 09:06:21 2006
@@ -4,6 +4,7 @@
jdbcapi/xaSimplePositive.sql
jdbcapi/xaSimpleNegative.sql
jdbcapi/xaStateTran.sql
+jdbcapi/XATest.java
jdbcapi/xaMorph.sql
store/xaOffline1.sql
store/xab2354.sql
Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest_app.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml?rev=381706&r1=381705&r2=381706&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml Tue Feb 28 09:06:21 2006
@@ -76,6 +76,7 @@
<exclude name="${this.dir}/statementJdbc30.java"/>
<exclude name="${this.dir}/savepointJdbc30.java"/>
<exclude name="${this.dir}/xaJNDI.java"/>
+ <exclude name="${this.dir}/XATest.java"/>
</javac>
</target>
@@ -103,6 +104,7 @@
<include name="${this.dir}/parameterMetaDataJdbc30.java"/>
<include name="${this.dir}/resultsetJdbc30.java"/>
<include name="${this.dir}/statementJdbc30.java"/>
+ <include name="${this.dir}/XATest.java"/>
</javac>
</target>
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant?rev=381706&r1=381705&r2=381706&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant Tue Feb 28 09:06:21 2006
@@ -74,3 +74,4 @@
xaSimplePositive_sed.properties
xaSimplePositive_derby.properties
xaStateTran.sql
+XATest_app.properties
Copied: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/util/XATestUtil.java (from r378755, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/XATestUtil.java)
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/util/XATestUtil.java?p2=db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/util/XATestUtil.java&p1=db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/XATestUtil.java&r1=378755&r2=381706&rev=381706&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/XATestUtil.java (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/util/XATestUtil.java Tue Feb 28 09:06:21 2006
@@ -65,7 +65,7 @@
" status, " +
" case when first_instant is NULL then 'NULL' else 'false' end as readOnly, " +
" cast (username as char(10)) as username, type " +
- " from syscs_diag.transaction_table");
+ " from new org.apache.derby.diag.TransactionTable() As transaction_table");
s.close();
}
Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/util/XATestUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/util/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/util/build.xml?rev=381706&r1=381705&r2=381706&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/util/build.xml (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/util/build.xml Tue Feb 28 09:06:21 2006
@@ -61,6 +61,7 @@
<include name="${this.dir}/StaticInitializers/*.java"/>
<include name="${this.dir}/VTIClasses/*.java"/>
<exclude name="${this.dir}/TestUtil.java"/>
+ <exclude name="${this.dir}/XATestUtil.java"/>
</javac>
<javac
bootclasspath="${empty}"
@@ -78,6 +79,7 @@
</classpath>
<!--exclude name=""/-->
<include name="${this.dir}/TestUtil.java"/>
+ <include name="${this.dir}/XATestUtil.java"/>
</javac>
</target>