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 km...@apache.org on 2006/02/08 19:08:33 UTC

svn commit: r376016 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNet/ master/DerbyNetClient/ suites/ tests/jdbcapi/

Author: kmarsden
Date: Wed Feb  8 10:08:31 2006
New Revision: 376016

URL: http://svn.apache.org/viewcvs?rev=376016&view=rev
Log:
Reaname savepointJdbc30 to savepointJdbc30_JSR169 in preparation for additional test for XA connections with DERBY-898


Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/savepointJdbc30_JSR169.out
      - copied unchanged from r375793, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/savepointJdbc30.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/savepointJdbc30_JSR169.out
      - copied unchanged from r375793, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/savepointJdbc30.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/savepointJdbc30_JSR169.out
      - copied unchanged from r375793, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/savepointJdbc30.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_JSR169.java
      - copied, changed from r375793, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_JSR169_app.properties
      - copied unchanged from r375793, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_JSR169_derby.properties
      - copied unchanged from r375793, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_derby.properties
Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/savepointJdbc30.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/savepointJdbc30.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/savepointJdbc30.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_derby.properties
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdk14.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall?rev=376016&r1=376015&r2=376016&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall Wed Feb  8 10:08:31 2006
@@ -19,7 +19,7 @@
 jdbcapi/metadataMultiConn.java
 jdbcapi/odbc_metadata.java
 jdbcapi/parameterMetaDataJdbc30.java
-jdbcapi/savepointJdbc30.java
+jdbcapi/savepointJdbc30_JSR169.java
 lang/big.sql
 lang/bug5054.java
 lang/forupdate.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdk14.runall
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdk14.runall?rev=376016&r1=376015&r2=376016&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdk14.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdk14.runall Wed Feb  8 10:08:31 2006
@@ -6,5 +6,5 @@
 lang/procedureJdbc30.java
 jdbcapi/resultsetJdbc30.java
 jdbcapi/statementJdbc30.java
-jdbcapi/savepointJdbc30.java
+jdbcapi/savepointJdbc30_JSR169.java
 

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=376016&r1=376015&r2=376016&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 Wed Feb  8 10:08:31 2006
@@ -75,7 +75,7 @@
       <exclude name="${this.dir}/parameterMetaDataJdbc30.java"/>
       <exclude name="${this.dir}/resultsetJdbc30.java"/>
       <exclude name="${this.dir}/statementJdbc30.java"/>
-      <exclude name="${this.dir}/savepointJdbc30.java"/>
+      <exclude name="${this.dir}/savepointJdbc30_JSR169.java"/>
       <exclude name="${this.dir}/xaJNDI.java"/>
       <exclude name="${this.dir}/lobStreams.java"/>
     </javac>
@@ -100,7 +100,7 @@
       <include name="${this.dir}/autoGeneratedJdbc30.java"/>
       <include name="${this.dir}/dbMetaDataJdbc30.java"/>
       <include name="${this.dir}/checkDataSource30.java"/>
-      <include name="${this.dir}/savepointJdbc30.java"/>
+      <include name="${this.dir}/savepointJdbc30_JSR169.java"/>
       <include name="${this.dir}/dataSourcePermissions.java"/>
       <include name="${this.dir}/parameterMetaDataJdbc30.java"/>
       <include name="${this.dir}/resultsetJdbc30.java"/>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant?rev=376016&r1=376015&r2=376016&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/copyfiles.ant Wed Feb  8 10:08:31 2006
@@ -36,8 +36,8 @@
 resultsetJdbc30_sed.properties
 resultset_app.properties
 resultset_derby.properties
-savepointJdbc30_app.properties
-savepointJdbc30_derby.properties
+savepointJdbc30_JSR169_app.properties
+savepointJdbc30_JSR169_derby.properties
 secureUsers.sql
 secureUsers1.sql
 secureUsers1_app.properties

Copied: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_JSR169.java (from r375793, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30.java)
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_JSR169.java?p2=db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_JSR169.java&p1=db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30.java&r1=375793&r2=376016&rev=376016&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/savepointJdbc30_JSR169.java Wed Feb  8 10:08:31 2006
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derbyTesting.functionTests.tests.jdbcapi.savepointJdbc30
+   Derby - Class org.apache.derbyTesting.functionTests.tests.jdbcapi.savepointJdbc30_JSR169
 
    Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
 
@@ -36,11 +36,12 @@
  * Also, test some mix and match of defining savepoints through JDBC and sql
  * Testing both callable and prepared statements meta data
  *
+ * Do not put tests in this file that are not compatible with JSR169
  * @author mamta
  */
 
 
-public class savepointJdbc30 {
+public class savepointJdbc30_JSR169 {
 
 	static private boolean isDerbyNet = false;

Re: svn commit: r376016 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNet/ master/DerbyNetClient/ suites/ tests/jdbcapi/

Posted by Kathey Marsden <km...@sbcglobal.net>.

Sorry I made an error in checking this in. backing out now