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 da...@apache.org on 2014/06/17 01:00:35 UTC
svn commit: r1603019 [3/3] - in /db/derby/code/trunk: ./
java/client/org/apache/derby/client/ java/client/org/apache/derby/client/am/
java/client/org/apache/derby/client/net/ java/client/org/apache/derby/jdbc/
java/engine/org/apache/derby/jdbc/ java/te...
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientXADataSource40-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientXADataSource40-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientXADataSource40-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientXADataSource40-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedConnectionPoolDataSource40-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedConnectionPoolDataSource40-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedConnectionPoolDataSource40-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedConnectionPoolDataSource40-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedDataSource40-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedDataSource40-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedDataSource40-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedDataSource40-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedXADataSource40-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedXADataSource40-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedXADataSource40-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedXADataSource40-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientConnectionPoolDataSource-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientConnectionPoolDataSource-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientConnectionPoolDataSource-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientConnectionPoolDataSource-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientConnectionPoolDataSource40-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientConnectionPoolDataSource40-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientConnectionPoolDataSource40-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientConnectionPoolDataSource40-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientDataSource-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientDataSource-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientDataSource-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientDataSource-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientDataSource40-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientDataSource40-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientDataSource40-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientDataSource40-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientXADataSource-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientXADataSource-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientXADataSource-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientXADataSource-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientXADataSource40-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientXADataSource40-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientXADataSource40-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientXADataSource40-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedConnectionPoolDataSource-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedConnectionPoolDataSource-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedConnectionPoolDataSource-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedConnectionPoolDataSource-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedConnectionPoolDataSource40-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedConnectionPoolDataSource40-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedConnectionPoolDataSource40-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedConnectionPoolDataSource40-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedDataSource-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedDataSource-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedDataSource-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedDataSource-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedDataSource40-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedDataSource40-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedDataSource40-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedDataSource40-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedXADataSource-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedXADataSource-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedXADataSource-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedXADataSource-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedXADataSource40-10_11_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedXADataSource40-10_11_1_0.ser?rev=1603019&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedXADataSource40-10_11_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedXADataSource40-10_11_1_0.ser Mon Jun 16 23:00:34 2014 differ
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java?rev=1603019&r1=1603018&r2=1603019&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java Mon Jun 16 23:00:34 2014
@@ -68,6 +68,8 @@ public class DataSourceSerializationTest
private static final String VERSION_10_3_2_1 = "10_3_2_1";
/** Constant for Derby version 10.10.1.0. */
private static final String VERSION_10_10_1_0 = "10_10_1_0";
+ /** Constant for Derby version 10.11.1.0. */
+ private static final String VERSION_10_11_1_0 = "10_11_1_0";
private final String _40Suffix = "40";
public DataSourceSerializationTest(String name) {
@@ -402,6 +404,28 @@ public class DataSourceSerializationTest
filePrefix +
"BasicClientConnectionPoolDataSource40-10_10_1_0.ser",
filePrefix + "BasicClientXADataSource40-10_10_1_0.ser",
+
+ // 10.11 resources
+ filePrefix + "EmbeddedDataSource-10_11_1_0.ser",
+ filePrefix + "EmbeddedDataSource40-10_11_1_0.ser",
+ filePrefix + "EmbeddedConnectionPoolDataSource-10_11_1_0.ser",
+ filePrefix + "EmbeddedConnectionPoolDataSource40-10_11_1_0.ser",
+ filePrefix + "EmbeddedXADataSource-10_11_1_0.ser",
+ filePrefix + "EmbeddedXADataSource40-10_11_1_0.ser",
+ filePrefix + "ClientDataSource-10_11_1_0.ser",
+ filePrefix + "ClientDataSource40-10_11_1_0.ser",
+ filePrefix + "ClientConnectionPoolDataSource-10_11_1_0.ser",
+ filePrefix + "ClientConnectionPoolDataSource40-10_11_1_0.ser",
+ filePrefix + "ClientXADataSource-10_11_1_0.ser",
+ filePrefix + "ClientXADataSource40-10_11_1_0.ser",
+ filePrefix + "BasicEmbeddedDataSource40-10_11_1_0.ser",
+ filePrefix +
+ "BasicEmbeddedConnectionPoolDataSource40-10_11_1_0.ser",
+ filePrefix + "BasicEmbeddedXADataSource40-10_11_1_0.ser",
+ filePrefix + "BasicClientDataSource40-10_11_1_0.ser",
+ filePrefix +
+ "BasicClientConnectionPoolDataSource40-10_11_1_0.ser",
+ filePrefix + "BasicClientXADataSource40-10_11_1_0.ser",
});
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java?rev=1603019&r1=1603018&r2=1603019&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java Mon Jun 16 23:00:34 2014
@@ -54,6 +54,7 @@ import javax.transaction.xa.Xid;
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.derby.jdbc.BasicClientDataSource40;
import org.apache.derby.jdbc.ClientConnectionPoolDataSourceInterface;
import org.apache.derby.jdbc.ClientDataSourceInterface;
@@ -2338,7 +2339,7 @@ public class J2EEDataSourceTest extends
PrivilegedFileOpsForTests.getAbsolutePath(traceFile));
J2EEDataSource.setBeanProperty(ds, "traceFileAppend", Boolean.FALSE);
J2EEDataSource.setBeanProperty( ds, "traceLevel",
- new Integer(ClientDataSourceInterface.TRACE_ALL));
+ new Integer(BasicClientDataSource40.TRACE_ALL));
// Obtain connection.
PooledConnection physicalCon = null;