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 2013/01/30 04:42:51 UTC
svn commit: r1440262 - in /db/derby/code/trunk:
java/client/org/apache/derby/jdbc/ java/drda/org/apache/derby/impl/drda/
java/engine/org/apache/derby/jdbc/
java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/
java/testing/...
Author: dag
Date: Wed Jan 30 03:42:50 2013
New Revision: 1440262
URL: http://svn.apache.org/viewvc?rev=1440262&view=rev
Log:
DERBY-5955 Prepare Derby to run with Compact Profiles (JEP 161)
Patch derby-5955-rename. Rename the new datasources from using prefix
"NonJNDI" to prefix "Basic".
Added:
db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java (contents, props changed)
- copied, changed from r1440129, db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientConnectionPoolDataSource40.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientDataSource40.java (contents, props changed)
- copied, changed from r1440129, db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientDataSource40.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java (contents, props changed)
- copied, changed from r1440129, db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientXADataSource40.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java (contents, props changed)
- copied, changed from r1440129, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedConnectionPoolDataSource40.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java (contents, props changed)
- copied, changed from r1440129, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedDataSource40.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java (contents, props changed)
- copied, changed from r1440129, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedXADataSource40.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientConnectionPoolDataSource40-10_10_1_0.ser (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientDataSource40-10_10_1_0.ser (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientXADataSource40-10_10_1_0.ser (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedConnectionPoolDataSource40-10_10_1_0.ser (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedDataSource40-10_10_1_0.ser (with props)
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedXADataSource40-10_10_1_0.ser (with props)
Removed:
db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientConnectionPoolDataSource40.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientDataSource40.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientXADataSource40.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedConnectionPoolDataSource40.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedDataSource40.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedXADataSource40.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/NonJNDIClientConnectionPoolDataSource40-10_10_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/NonJNDIClientDataSource40-10_10_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/NonJNDIClientXADataSource40-10_10_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/NonJNDIEmbeddedConnectionPoolDataSource40-10_10_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/NonJNDIEmbeddedDataSource40-10_10_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/NonJNDIEmbeddedXADataSource40-10_10_1_0.ser
Modified:
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41DataSource.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1Indexing.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Encrypted_1.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest_Verify.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Derby.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCClient.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java
db/derby/code/trunk/tools/jar/dnc.properties
db/derby/code/trunk/tools/jar/extraDBMSclasses.properties
db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant
Copied: db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java (from r1440129, db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientConnectionPoolDataSource40.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java?p2=db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java&p1=db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientConnectionPoolDataSource40.java&r1=1440129&r2=1440262&rev=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientConnectionPoolDataSource40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java Wed Jan 30 03:42:50 2013
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.NonJNDIClientConnectionPoolDataSource40
+ Derby - Class org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -29,14 +29,14 @@ import org.apache.derby.shared.common.i1
import org.apache.derby.shared.common.reference.MessageId;
/**
- * NonJNDIClientConnectionPoolDataSource40 is similar to
+ * BasicClientConnectionPoolDataSource40 is similar to
* ClientConnectionPoolDataSource40 except that it does not support JNDI,
* i.e. it does not implement {@code javax.naming.Referenceable}.
*
* @see ClientConnectionPoolDataSource40
*/
-public class NonJNDIClientConnectionPoolDataSource40
- extends NonJNDIClientDataSource40
+public class BasicClientConnectionPoolDataSource40
+ extends BasicClientDataSource40
implements javax.sql.ConnectionPoolDataSource,
ClientConnectionPoolDataSourceInterface {
@@ -47,7 +47,7 @@ public class NonJNDIClientConnectionPool
new MessageUtil("org.apache.derby.loc.clientmessages");
public static final String className__ =
- "org.apache.derby.jdbc.NonJNDIClientConnectionPoolDataSource40";
+ "org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40";
/**
* Specifies the maximum number of statements that can be cached per
@@ -60,7 +60,7 @@ public class NonJNDIClientConnectionPool
*/
private int maxStatements = 0;
- public NonJNDIClientConnectionPoolDataSource40() {
+ public BasicClientConnectionPoolDataSource40() {
super();
}
Propchange: db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientDataSource40.java (from r1440129, db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientDataSource40.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientDataSource40.java?p2=db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientDataSource40.java&p1=db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientDataSource40.java&r1=1440129&r2=1440262&rev=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientDataSource40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientDataSource40.java Wed Jan 30 03:42:50 2013
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.NonJNDIClientDataSource40
+ Derby - Class org.apache.derby.jdbc.BasicClientDataSource40
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -29,16 +29,16 @@ import org.apache.derby.client.am.SqlExc
import org.apache.derby.shared.common.reference.SQLState;
/**
- * NonJNDIClientDataSource40 is similar to ClientDataSource40 except it
+ * BasicClientDataSource40 is similar to ClientDataSource40 except it
* can not be used with JNDI, i.e. it does not implement
* {@code javax.naming.Referenceable}.
*/
-public class NonJNDIClientDataSource40
+public class BasicClientDataSource40
extends ClientBaseDataSourceRoot implements DataSource {
private final static long serialVersionUID = 1894299584216955554L;
public final static String className__ =
- "org.apache.derby.jdbc.NonJNDIClientDataSource40";
+ "org.apache.derby.jdbc.BasicClientDataSource40";
/**
* Creates a simple DERBY data source with default property values
@@ -50,7 +50,7 @@ public class NonJNDIClientDataSource40
* since many beanboxes attempt to instantiate a bean by invoking
* its no-argument constructor.
*/
- public NonJNDIClientDataSource40() {
+ public BasicClientDataSource40() {
super();
}
Propchange: db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientDataSource40.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java (from r1440129, db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientXADataSource40.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java?p2=db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java&p1=db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientXADataSource40.java&r1=1440129&r2=1440262&rev=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/NonJNDIClientXADataSource40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java Wed Jan 30 03:42:50 2013
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.NonJNDIClientXADataSource40
+ Derby - Class org.apache.derby.jdbc.BasicClientXADataSource40
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -29,19 +29,19 @@ import javax.sql.XADataSource;
* Similar to ClientXADataSource40 except it does not support JNDI,
* i.e. it does not implement {@code javax.naming.Referenceable}.
*/
-public class NonJNDIClientXADataSource40
- extends NonJNDIClientDataSource40
+public class BasicClientXADataSource40
+ extends BasicClientDataSource40
implements ClientXADataSourceInterface,
XADataSource /* compile-time check of 41 extensions */ {
public static final String className__ =
- "org.apache.derby.jdbc.NonJNDIClientXADataSource40";
+ "org.apache.derby.jdbc.BasicClientXADataSource40";
// following serialVersionUID was generated by the JDK's serialver program
// verify it everytime that ClientXADataSource is modified
private static final long serialVersionUID = 7057075094707674881L;
- public NonJNDIClientXADataSource40() {
+ public BasicClientXADataSource40() {
}
public XAConnection getXAConnection() throws SQLException {
Propchange: db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java Wed Jan 30 03:42:50 2013
@@ -72,7 +72,7 @@ class XADatabase extends Database {
} else {
xaDataSource =
(EmbeddedXADataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIEmbeddedXADataSource40").
+ "org.apache.derby.jdbc.BasicEmbeddedXADataSource40").
newInstance();
}
} catch (Exception e) {
Copied: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java (from r1440129, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedConnectionPoolDataSource40.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedConnectionPoolDataSource40.java&r1=1440129&r2=1440262&rev=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedConnectionPoolDataSource40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java Wed Jan 30 03:42:50 2013
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.NonJNDIEmbeddedConnectionPoolDataSource40
+ Derby - Class org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -24,14 +24,14 @@ import java.sql.SQLException;
import javax.sql.PooledConnection;
/**
- * NonJNDIEmbeddedConnectionPoolDataSource40 is similar to
+ * BasicEmbeddedConnectionPoolDataSource40 is similar to
* EmbeddedConnectionPoolDataSource40 except it does not support JNDI naming,
* i.e. it does not implement {@code javax.naming.Referenceable}.
*
* @see EmbeddedConnectionPoolDataSource40
*/
-public class NonJNDIEmbeddedConnectionPoolDataSource40
- extends NonJNDIEmbeddedDataSource40
+public class BasicEmbeddedConnectionPoolDataSource40
+ extends BasicEmbeddedDataSource40
implements javax.sql.ConnectionPoolDataSource,
EmbeddedConnectionPoolDataSourceInterface {
@@ -40,7 +40,7 @@ public class NonJNDIEmbeddedConnectionPo
/**
* No-argument constructor.
*/
- public NonJNDIEmbeddedConnectionPoolDataSource40() {
+ public BasicEmbeddedConnectionPoolDataSource40() {
super();
}
Propchange: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java (from r1440129, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedDataSource40.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedDataSource40.java&r1=1440129&r2=1440262&rev=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedDataSource40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java Wed Jan 30 03:42:50 2013
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.NonJNDIEmbeddedDataSource40
+ Derby - Class org.apache.derby.jdbc.BasicEmbeddedDataSource40
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -27,18 +27,18 @@ import org.apache.derby.impl.jdbc.Util;
/**
*
- * NonJNDIEmbeddedDataSource40 is similar to EmbeddedDataSource40, but does
+ * BasicEmbeddedDataSource40 is similar to EmbeddedDataSource40, but does
* not support JNDI naming, i.e. it does not implement
* {@code javax.naming.Referenceable}.
*
* @see EmbeddedDataSource40
*/
- public class NonJNDIEmbeddedDataSource40 extends EmbeddedBaseDataSource
+ public class BasicEmbeddedDataSource40 extends EmbeddedBaseDataSource
implements javax.sql.DataSource {
private static final long serialVersionUID = -4945135214995641182L;
- public NonJNDIEmbeddedDataSource40() {}
+ public BasicEmbeddedDataSource40() {}
////////////////////////////////////////////////////////////////////
//
Propchange: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java (from r1440129, db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedXADataSource40.java)
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java?p2=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java&p1=db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedXADataSource40.java&r1=1440129&r2=1440262&rev=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/NonJNDIEmbeddedXADataSource40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java Wed Jan 30 03:42:50 2013
@@ -1,6 +1,6 @@
/*
- Derby - Class org.apache.derby.jdbc.NonJNDIEmbeddedXADataSource40
+ Derby - Class org.apache.derby.jdbc.BasicEmbeddedXADataSource40
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -27,14 +27,14 @@ import org.apache.derby.iapi.jdbc.Resour
/**
*
- * NonJNDIEmbeddedXADataSource40 is similar to
+ * BasicEmbeddedXADataSource40 is similar to
* EmbeddedXADataSource40, except that it does not support JNDI
* naming, i.e. it does not implement {@code javax.naming.Referenceable}.
*
* @see EmbeddedXADataSource40
*/
-public class NonJNDIEmbeddedXADataSource40
- extends NonJNDIEmbeddedDataSource40
+public class BasicEmbeddedXADataSource40
+ extends BasicEmbeddedDataSource40
implements
EmbeddedXADataSourceInterface,
javax.sql.XADataSource /* compile time check of 41 extensions */
@@ -45,7 +45,7 @@ public class NonJNDIEmbeddedXADataSource
// link to the database
private transient ResourceAdapter ra;
- public NonJNDIEmbeddedXADataSource40() {
+ public BasicEmbeddedXADataSource40() {
super();
}
Propchange: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientConnectionPoolDataSource40-10_10_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientConnectionPoolDataSource40-10_10_1_0.ser?rev=1440262&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientConnectionPoolDataSource40-10_10_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientConnectionPoolDataSource40-10_10_1_0.ser Wed Jan 30 03:42:50 2013 differ
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientConnectionPoolDataSource40-10_10_1_0.ser
------------------------------------------------------------------------------
svn:executable = *
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientDataSource40-10_10_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientDataSource40-10_10_1_0.ser?rev=1440262&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientDataSource40-10_10_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientDataSource40-10_10_1_0.ser Wed Jan 30 03:42:50 2013 differ
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientDataSource40-10_10_1_0.ser
------------------------------------------------------------------------------
svn:executable = *
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientXADataSource40-10_10_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientXADataSource40-10_10_1_0.ser?rev=1440262&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientXADataSource40-10_10_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientXADataSource40-10_10_1_0.ser Wed Jan 30 03:42:50 2013 differ
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientXADataSource40-10_10_1_0.ser
------------------------------------------------------------------------------
svn:executable = *
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedConnectionPoolDataSource40-10_10_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedConnectionPoolDataSource40-10_10_1_0.ser?rev=1440262&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedConnectionPoolDataSource40-10_10_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedConnectionPoolDataSource40-10_10_1_0.ser Wed Jan 30 03:42:50 2013 differ
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedConnectionPoolDataSource40-10_10_1_0.ser
------------------------------------------------------------------------------
svn:executable = *
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedDataSource40-10_10_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedDataSource40-10_10_1_0.ser?rev=1440262&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedDataSource40-10_10_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedDataSource40-10_10_1_0.ser Wed Jan 30 03:42:50 2013 differ
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedDataSource40-10_10_1_0.ser
------------------------------------------------------------------------------
svn:executable = *
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedXADataSource40-10_10_1_0.ser
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedXADataSource40-10_10_1_0.ser?rev=1440262&view=auto
==============================================================================
Files db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedXADataSource40-10_10_1_0.ser (added) and db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedXADataSource40-10_10_1_0.ser Wed Jan 30 03:42:50 2013 differ
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedXADataSource40-10_10_1_0.ser
------------------------------------------------------------------------------
svn:executable = *
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/SerializeDataSources.java Wed Jan 30 03:42:50 2013
@@ -67,9 +67,9 @@ public class SerializeDataSources {
"org.apache.derby.jdbc.EmbeddedDataSource40",
"org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40",
"org.apache.derby.jdbc.EmbeddedXADataSource40",
- "org.apache.derby.jdbc.NonJNDIEmbeddedDataSource40",
- "org.apache.derby.jdbc.NonJNDIEmbeddedConnectionPoolDataSource40",
- "org.apache.derby.jdbc.NonJNDIEmbeddedXADataSource40"
+ "org.apache.derby.jdbc.BasicEmbeddedDataSource40",
+ "org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40",
+ "org.apache.derby.jdbc.BasicEmbeddedXADataSource40"
};
/** List of known data sources in the client driver. */
@@ -80,9 +80,9 @@ public class SerializeDataSources {
"org.apache.derby.jdbc.ClientDataSource40",
"org.apache.derby.jdbc.ClientConnectionPoolDataSource40",
"org.apache.derby.jdbc.ClientXADataSource40",
- "org.apache.derby.jdbc.NonJNDIClientDataSource40",
- "org.apache.derby.jdbc.NonJNDIClientConnectionPoolDataSource40",
- "org.apache.derby.jdbc.NonJNDIClientXADataSource40"
+ "org.apache.derby.jdbc.BasicClientDataSource40",
+ "org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40",
+ "org.apache.derby.jdbc.BasicClientXADataSource40"
};
/**
@@ -137,7 +137,7 @@ public class SerializeDataSources {
oos.writeUTF(versionString);
oos.writeUTF(buildNumber);
oos.writeObject(ds);
- if (!(dsClassName.contains("NonJNDI"))) {
+ if (!(dsClassName.contains("Basic"))) {
Method getRef = Class.forName("javax.naming.Referenceable").
getMethod("getReference");
Object dsRef = getRef.invoke(ds);
@@ -180,7 +180,7 @@ public class SerializeDataSources {
System.out.println("\tbuild : " + buildNr);
Object obj = ois.readObject();
System.out.println("\tobject : " + obj);
- if (!(obj.getClass().getName().indexOf("NonJNDI") > 0)) {
+ if (!(obj.getClass().getName().indexOf("Basic") > 0)) {
obj = ois.readObject();
System.out.println("\tobject : " + obj);
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41DataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41DataSource.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41DataSource.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/Wrapper41DataSource.java Wed Jan 30 03:42:50 2013
@@ -30,8 +30,8 @@ import org.apache.derby.jdbc.ClientXADat
import org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40;
import org.apache.derby.jdbc.EmbeddedDataSource40;
import org.apache.derby.jdbc.EmbeddedXADataSource40;
-import org.apache.derby.jdbc.NonJNDIClientDataSource40;
-import org.apache.derby.jdbc.NonJNDIEmbeddedDataSource40;
+import org.apache.derby.jdbc.BasicClientDataSource40;
+import org.apache.derby.jdbc.BasicEmbeddedDataSource40;
import org.apache.derbyTesting.junit.JDBC;
/**
@@ -50,12 +50,12 @@ public class Wrapper41DataSource
private EmbeddedDataSource40 _embedded;
private EmbeddedConnectionPoolDataSource40 _ecpds;
private EmbeddedXADataSource40 _exads;
- private NonJNDIEmbeddedDataSource40 _nonJNDIembedded;
+ private BasicEmbeddedDataSource40 _basicembedded;
private ClientDataSource40 _netclient;
private ClientConnectionPoolDataSource40 _ccpds;
private ClientXADataSource40 _cxads;
- private NonJNDIClientDataSource40 _nonJNDInetclient;
+ private BasicClientDataSource40 _basicnetclient;
///////////////////////////////////////////////////////////////////////
@@ -81,10 +81,10 @@ public class Wrapper41DataSource
_cxads = (ClientXADataSource40) wrapped; }
else { throw nothingWrapped(); }
} else {
- if ( wrapped instanceof NonJNDIEmbeddedDataSource40 ) {
- _nonJNDIembedded = (NonJNDIEmbeddedDataSource40 ) wrapped; }
- else if ( wrapped instanceof NonJNDIClientDataSource40 ) {
- _nonJNDInetclient = (NonJNDIClientDataSource40) wrapped; }
+ if ( wrapped instanceof BasicEmbeddedDataSource40 ) {
+ _basicembedded = (BasicEmbeddedDataSource40 ) wrapped; }
+ else if ( wrapped instanceof BasicClientDataSource40 ) {
+ _basicnetclient = (BasicClientDataSource40) wrapped; }
else { throw nothingWrapped(); }
}
}
@@ -106,10 +106,10 @@ public class Wrapper41DataSource
else if ( _cxads != null ) {return _cxads.getParentLogger(); }
else { throw nothingWrapped(); }
} else {
- if ( _nonJNDIembedded != null ) {
- return _nonJNDIembedded.getParentLogger(); }
- else if ( _nonJNDInetclient != null) {
- return _nonJNDInetclient.getParentLogger(); }
+ if ( _basicembedded != null ) {
+ return _basicembedded.getParentLogger(); }
+ else if ( _basicnetclient != null) {
+ return _basicnetclient.getParentLogger(); }
else { throw nothingWrapped(); }
}
}
@@ -131,8 +131,8 @@ public class Wrapper41DataSource
else if ( _cxads != null ) { return _cxads; }
else { throw nothingWrapped(); }
} else {
- if ( _nonJNDIembedded != null ) { return _nonJNDIembedded; }
- else if ( _nonJNDInetclient != null ) { return _nonJNDInetclient; }
+ if ( _basicembedded != null ) { return _basicembedded; }
+ else if ( _basicnetclient != null ) { return _basicnetclient; }
else { throw nothingWrapped(); }
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClientConnectionPoolDataSourceTest.java Wed Jan 30 03:42:50 2013
@@ -59,7 +59,7 @@ public class ClientConnectionPoolDataSou
.newInstance();
} else {
cDs = (ClientConnectionPoolDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientConnectionPoolDataSource40")
+ "org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40")
.newInstance();
}
// Check the default value.
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=1440262&r1=1440261&r2=1440262&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 Wed Jan 30 03:42:50 2013
@@ -91,7 +91,7 @@ public class DataSourceSerializationTest
deSerializeDs(EMBEDDED_CLASS + _40Suffix, VERSION_10_10_1_0, true);
}
- final String EMBEDDED_CLASS = "NonJNDIEmbeddedDataSource40";
+ final String EMBEDDED_CLASS = "BasicEmbeddedDataSource40";
deSerializeDs(EMBEDDED_CLASS, VERSION_10_10_1_0, false);
}
@@ -114,7 +114,7 @@ public class DataSourceSerializationTest
}
final String EMBEDDED_CLASS =
- "NonJNDIEmbeddedConnectionPoolDataSource40";
+ "BasicEmbeddedConnectionPoolDataSource40";
deSerializeDs(EMBEDDED_CLASS, VERSION_10_10_1_0, false);
}
@@ -135,7 +135,7 @@ public class DataSourceSerializationTest
deSerializeDs(EMBEDDED_CLASS + _40Suffix, VERSION_10_10_1_0, true);
}
- final String EMBEDDED_CLASS = "NonJNDIEmbeddedXADataSource40";
+ final String EMBEDDED_CLASS = "BasicEmbeddedXADataSource40";
deSerializeDs(EMBEDDED_CLASS, VERSION_10_10_1_0, false);
}
@@ -156,7 +156,7 @@ public class DataSourceSerializationTest
deSerializeDs(CLIENT_CLASS + _40Suffix, VERSION_10_10_1_0, true);
}
- final String CLIENT_CLASS = "NonJNDIClientDataSource40";
+ final String CLIENT_CLASS = "BasicClientDataSource40";
deSerializeDs(CLIENT_CLASS, VERSION_10_10_1_0, false);
}
@@ -177,7 +177,7 @@ public class DataSourceSerializationTest
deSerializeDs(CLIENT_CLASS + _40Suffix, VERSION_10_10_1_0, true);
}
- final String CLIENT_CLASS = "NonJNDIClientConnectionPoolDataSource40";
+ final String CLIENT_CLASS = "BasicClientConnectionPoolDataSource40";
deSerializeDs(CLIENT_CLASS, VERSION_10_10_1_0, false);
}
@@ -198,7 +198,7 @@ public class DataSourceSerializationTest
deSerializeDs(CLIENT_CLASS + _40Suffix, VERSION_10_10_1_0, true);
}
- final String CLIENT_CLASS = "NonJNDIClientXADataSource40";
+ final String CLIENT_CLASS = "BasicClientXADataSource40";
deSerializeDs(CLIENT_CLASS, VERSION_10_10_1_0, false);
}
@@ -393,14 +393,14 @@ public class DataSourceSerializationTest
filePrefix + "ClientConnectionPoolDataSource40-10_10_1_0.ser",
filePrefix + "ClientXADataSource-10_10_1_0.ser",
filePrefix + "ClientXADataSource40-10_10_1_0.ser",
- filePrefix + "NonJNDIEmbeddedDataSource40-10_10_1_0.ser",
+ filePrefix + "BasicEmbeddedDataSource40-10_10_1_0.ser",
filePrefix +
- "NonJNDIEmbeddedConnectionPoolDataSource40-10_10_1_0.ser",
- filePrefix + "NonJNDIEmbeddedXADataSource40-10_10_1_0.ser",
- filePrefix + "NonJNDIClientDataSource40-10_10_1_0.ser",
+ "BasicEmbeddedConnectionPoolDataSource40-10_10_1_0.ser",
+ filePrefix + "BasicEmbeddedXADataSource40-10_10_1_0.ser",
+ filePrefix + "BasicClientDataSource40-10_10_1_0.ser",
filePrefix +
- "NonJNDIClientConnectionPoolDataSource40-10_10_1_0.ser",
- filePrefix + "NonJNDIClientXADataSource40-10_10_1_0.ser",
+ "BasicClientConnectionPoolDataSource40-10_10_1_0.ser",
+ filePrefix + "BasicClientXADataSource40-10_10_1_0.ser",
});
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java Wed Jan 30 03:42:50 2013
@@ -34,7 +34,7 @@ import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.derby.jdbc.ClientDataSourceInterface;
import org.apache.derby.jdbc.EmbeddedSimpleDataSource;
-import org.apache.derby.jdbc.NonJNDIEmbeddedDataSource40;
+import org.apache.derby.jdbc.BasicEmbeddedDataSource40;
import org.apache.derbyTesting.functionTests.util.SecurityCheck;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
@@ -215,10 +215,10 @@ public class DataSourceTest extends Base
}
if (JDBC.vmSupportsJDBC4()) {
- NonJNDIEmbeddedDataSource40 nds = new NonJNDIEmbeddedDataSource40();
+ BasicEmbeddedDataSource40 nds = new BasicEmbeddedDataSource40();
nds.setDatabaseName(dbName);
assertConnectionOK(
- expectedValues, "NonJNDIDataSource", nds.getConnection());
+ expectedValues, "BasicDataSource", nds.getConnection());
}
}
@@ -275,7 +275,7 @@ public class DataSourceTest extends Base
"org.apache.derby.jdbc.ClientDataSource").newInstance();
} else {
ds = (ClientDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientDataSource40").
+ "org.apache.derby.jdbc.BasicClientDataSource40").
newInstance();
}
@@ -458,7 +458,7 @@ public class DataSourceTest extends Base
"org.apache.derby.jdbc.ClientDataSource").newInstance();
} else {
ds = (ClientDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientDataSource40").newInstance();
+ "org.apache.derby.jdbc.BasicClientDataSource40").newInstance();
}
ds.setPortNumber(TestConfiguration.getCurrent().getPort());
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=1440262&r1=1440261&r2=1440262&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 Wed Jan 30 03:42:50 2013
@@ -2738,7 +2738,7 @@ public class J2EEDataSourceTest extends
newInstance();
} else {
cpds = (ClientConnectionPoolDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientConnectionPoolDataSource40").
+ "org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40").
newInstance();
}
@@ -2780,7 +2780,7 @@ public class J2EEDataSourceTest extends
newInstance();
} else {
xads = (ClientXADataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientXADataSource40").
+ "org.apache.derby.jdbc.BasicClientXADataSource40").
newInstance();
}
@@ -3076,7 +3076,7 @@ public class J2EEDataSourceTest extends
newInstance();
} else {
cpds = (ClientConnectionPoolDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientConnectionPoolDataSource40").
+ "org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40").
newInstance();
}
@@ -3103,7 +3103,7 @@ public class J2EEDataSourceTest extends
newInstance();
} else {
xads = (ClientXADataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientXADataSource40").
+ "org.apache.derby.jdbc.BasicClientXADataSource40").
newInstance();
}
//XADataSource - retrieveMessageTextProperty
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java Wed Jan 30 03:42:50 2013
@@ -3051,7 +3051,7 @@ test.postStoppedSlaveServer.return=true
newInstance();
} else {
ds = (ClientDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientDataSource40").
+ "org.apache.derby.jdbc.BasicClientDataSource40").
newInstance();
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1Indexing.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1Indexing.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1Indexing.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_1Indexing.java Wed Jan 30 03:42:50 2013
@@ -132,7 +132,7 @@ public class ReplicationRun_Local_1Index
"org.apache.derby.jdbc.ClientDataSource").newInstance();
} else {
ds = (ClientDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientDataSource40").newInstance();
+ "org.apache.derby.jdbc.BasicClientDataSource40").newInstance();
}
ds.setDatabaseName(dbPath);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3.java Wed Jan 30 03:42:50 2013
@@ -68,7 +68,7 @@ public class ReplicationRun_Local_3 exte
"org.apache.derby.jdbc.ClientDataSource").newInstance();
} else {
ds = (ClientDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientDataSource40").newInstance();
+ "org.apache.derby.jdbc.BasicClientDataSource40").newInstance();
}
ds.setDatabaseName(dbPath);
@@ -101,7 +101,7 @@ public class ReplicationRun_Local_3 exte
"org.apache.derby.jdbc.ClientDataSource").newInstance();
} else {
ds = (ClientDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientDataSource40").newInstance();
+ "org.apache.derby.jdbc.BasicClientDataSource40").newInstance();
}
ds.setDatabaseName(dbPath);
@@ -129,7 +129,7 @@ public class ReplicationRun_Local_3 exte
"org.apache.derby.jdbc.ClientDataSource").newInstance();
} else {
ds = (ClientDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientDataSource40").newInstance();
+ "org.apache.derby.jdbc.BasicClientDataSource40").newInstance();
}
ds.setDatabaseName(dbPath);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p3.java Wed Jan 30 03:42:50 2013
@@ -200,7 +200,7 @@ public class ReplicationRun_Local_3_p3 e
"org.apache.derby.jdbc.ClientDataSource").newInstance();
} else {
ds = (ClientDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientDataSource40").
+ "org.apache.derby.jdbc.BasicClientDataSource40").
newInstance();
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p4.java Wed Jan 30 03:42:50 2013
@@ -182,7 +182,7 @@ public class ReplicationRun_Local_3_p4 e
"org.apache.derby.jdbc.ClientDataSource").newInstance();
} else {
ds = (ClientDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientDataSource40").newInstance();
+ "org.apache.derby.jdbc.BasicClientDataSource40").newInstance();
}
ds.setDatabaseName(dbPath);
@@ -210,7 +210,7 @@ public class ReplicationRun_Local_3_p4 e
"org.apache.derby.jdbc.ClientDataSource").newInstance();
} else {
ds = (ClientDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientDataSource40").newInstance();
+ "org.apache.derby.jdbc.BasicClientDataSource40").newInstance();
}
ds.setDatabaseName(dbPath);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_3_p6.java Wed Jan 30 03:42:50 2013
@@ -230,7 +230,7 @@ public class ReplicationRun_Local_3_p6 e
"org.apache.derby.jdbc.ClientDataSource").newInstance();
} else {
ds = (ClientDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientDataSource40").newInstance();
+ "org.apache.derby.jdbc.BasicClientDataSource40").newInstance();
}
ds.setDatabaseName(databasePath +FS+ dbSubPath +FS+ dbName);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Encrypted_1.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Encrypted_1.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Encrypted_1.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Encrypted_1.java Wed Jan 30 03:42:50 2013
@@ -229,7 +229,7 @@ public class ReplicationRun_Local_Encryp
"org.apache.derby.jdbc.ClientDataSource").newInstance();
} else {
ds = (ClientDataSourceInterface)Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientDataSource40").newInstance();
+ "org.apache.derby.jdbc.BasicClientDataSource40").newInstance();
}
ds.setDatabaseName(dbPath);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest.java Wed Jan 30 03:42:50 2013
@@ -30,7 +30,7 @@ import java.sql.Statement;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.derby.jdbc.ClientDataSourceInterface;
-import org.apache.derby.jdbc.NonJNDIClientDataSource40;
+import org.apache.derby.jdbc.BasicClientDataSource40;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
@@ -149,7 +149,7 @@ public class SimplePerfTest extends Base
ds = (ClientDataSourceInterface)Class.forName(
"org.apache.derby.jdbc.ClientDataSource").newInstance();
} else {
- ds = new NonJNDIClientDataSource40();
+ ds = new BasicClientDataSource40();
}
ds.setDatabaseName(dbPath);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest_Verify.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest_Verify.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest_Verify.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/SimplePerfTest_Verify.java Wed Jan 30 03:42:50 2013
@@ -29,7 +29,7 @@ import java.sql.Statement;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.derby.jdbc.ClientDataSourceInterface;
-import org.apache.derby.jdbc.NonJNDIClientDataSource40;
+import org.apache.derby.jdbc.BasicClientDataSource40;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.JDBC;
import org.apache.derbyTesting.junit.SecurityManagerSetup;
@@ -105,7 +105,7 @@ public class SimplePerfTest_Verify exten
ds = (ClientDataSourceInterface)Class.forName(
"org.apache.derby.jdbc.ClientDataSource").newInstance();
} else {
- ds = new NonJNDIClientDataSource40();
+ ds = new BasicClientDataSource40();
}
ds.setDatabaseName(dbPath);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Derby.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Derby.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Derby.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/Derby.java Wed Jan 30 03:42:50 2013
@@ -97,7 +97,7 @@ public class Derby {
return hasCorrectJar("/derbyclient.jar",
JDBC.vmSupportsJNDI() ?
"org.apache.derby.jdbc.ClientDataSource" :
- "org.apache.derby.jdbc.NonJNDIClientDataSource40");
+ "org.apache.derby.jdbc.BasicClientDataSource40");
}
private static boolean hasCorrectJar(String jarName, String className)
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCClient.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCClient.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCClient.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCClient.java Wed Jan 30 03:42:50 2013
@@ -48,15 +48,15 @@ public final class JDBCClient {
JDBC.vmSupportsJNDI() ?
"org.apache.derby.jdbc.EmbeddedDataSource40":
- "org.apache.derby.jdbc.NonJNDIEmbeddedDataSource40",
+ "org.apache.derby.jdbc.BasicEmbeddedDataSource40",
JDBC.vmSupportsJNDI() ?
"org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40":
- "org.apache.derby.jdbc.NonJNDIEmbeddedConnectionPoolDataSource40",
+ "org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40",
JDBC.vmSupportsJNDI() ?
"org.apache.derby.jdbc.EmbeddedXADataSource40":
- "org.apache.derby.jdbc.NonJNDIEmbeddedXADataSource40",
+ "org.apache.derby.jdbc.BasicEmbeddedXADataSource40",
"jdbc:derby:");
@@ -97,19 +97,19 @@ public final class JDBCClient {
JDBC.vmSupportsJDBC4() ?
(JDBC.vmSupportsJNDI() ?
"org.apache.derby.jdbc.ClientDataSource40" :
- "org.apache.derby.jdbc.NonJNDIClientDataSource40") :
+ "org.apache.derby.jdbc.BasicClientDataSource40") :
"org.apache.derby.jdbc.ClientDataSource",
JDBC.vmSupportsJDBC4() ?
(JDBC.vmSupportsJNDI() ?
"org.apache.derby.jdbc.ClientConnectionPoolDataSource40" :
- "org.apache.derby.jdbc.NonJNDIClientConnectionPoolDataSource40") :
+ "org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40") :
"org.apache.derby.jdbc.ClientConnectionPoolDataSource",
JDBC.vmSupportsJDBC4() ?
(JDBC.vmSupportsJNDI() ?
"org.apache.derby.jdbc.ClientXADataSource40" :
- "org.apache.derby.jdbc.NonJNDIClientXADataSource40") :
+ "org.apache.derby.jdbc.BasicClientXADataSource40") :
"org.apache.derby.jdbc.ClientXADataSource",
"jdbc:derby://");
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SecurityManagerSetup.java Wed Jan 30 03:42:50 2013
@@ -389,7 +389,7 @@ public final class SecurityManagerSetup
URL client = getURL(
JDBC.vmSupportsJNDI() ?
"org.apache.derby.jdbc.ClientDataSource" :
- "org.apache.derby.jdbc.NonJNDIClientDataSource40");
+ "org.apache.derby.jdbc.BasicClientDataSource40");
if(client != null)
classPathSet.setProperty("derbyTesting.clientjar", stripJar(client));
Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java Wed Jan 30 03:42:50 2013
@@ -541,7 +541,7 @@ class xaHelper implements xaAbstractHelp
).newInstance());
} else {
return (XADataSource)(Class.forName(
- "org.apache.derby.jdbc.NonJNDIClientXADataSource40").
+ "org.apache.derby.jdbc.BasicClientXADataSource40").
newInstance());
}
} else {
@@ -565,7 +565,7 @@ class xaHelper implements xaAbstractHelp
newInstance());
} else {
return (XADataSource)(Class.forName(
- "org.apache.derby.jdbc.NonJNDIEmbeddedXADataSource40").
+ "org.apache.derby.jdbc.BasicEmbeddedXADataSource40").
newInstance());
}
}
Modified: db/derby/code/trunk/tools/jar/dnc.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/dnc.properties?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/dnc.properties (original)
+++ db/derby/code/trunk/tools/jar/dnc.properties Wed Jan 30 03:42:50 2013
@@ -21,17 +21,17 @@ derby.module.client.dsfactory=org.apache
# Plain data sources
derby.module.client.40ds=org.apache.derby.jdbc.ClientDataSource40
-derby.module.client.40njds=org.apache.derby.jdbc.NonJNDIClientDataSource40
+derby.module.client.40njds=org.apache.derby.jdbc.BasicClientDataSource40
# Pooled data source
derby.module.client.cpds=org.apache.derby.jdbc.ClientConnectionPoolDataSource
derby.module.client.40cpds=org.apache.derby.jdbc.ClientConnectionPoolDataSource40
-derby.module.client.40njcpds=org.apache.derby.jdbc.NonJNDIClientConnectionPoolDataSource40
+derby.module.client.40njcpds=org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40
# XA data sources
derby.module.client.xads=org.apache.derby.jdbc.ClientXADataSource
derby.module.client.40xads=org.apache.derby.jdbc.ClientXADataSource40
-derby.module.client.40njxads=org.apache.derby.jdbc.NonJNDIClientXADataSource40
+derby.module.client.40njxads=org.apache.derby.jdbc.BasicClientXADataSource40
derby.module.client.40cp=org.apache.derby.client.ClientPooledConnection40
derby.module.client.40nc=org.apache.derby.client.net.NetConnection40
Modified: db/derby/code/trunk/tools/jar/extraDBMSclasses.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jar/extraDBMSclasses.properties?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/tools/jar/extraDBMSclasses.properties (original)
+++ db/derby/code/trunk/tools/jar/extraDBMSclasses.properties Wed Jan 30 03:42:50 2013
@@ -51,11 +51,11 @@ derby.module.core.cscpds=org.apache.derb
derby.module.core.csxad=org.apache.derby.jdbc.EmbeddedXADataSource
derby.module.core.csds_simple=org.apache.derby.jdbc.EmbeddedSimpleDataSource
derby.module.core.csds.jdk16=org.apache.derby.jdbc.EmbeddedDataSource40
-derby.module.core.csds.jdk16n=org.apache.derby.jdbc.NonJNDIEmbeddedDataSource40
+derby.module.core.csds.jdk16n=org.apache.derby.jdbc.BasicEmbeddedDataSource40
derby.module.core.csxads.jdk16=org.apache.derby.jdbc.EmbeddedXADataSource40
-derby.module.core.csxads.jdk16n=org.apache.derby.jdbc.NonJNDIEmbeddedXADataSource40
+derby.module.core.csxads.jdk16n=org.apache.derby.jdbc.BasicEmbeddedXADataSource40
derby.module.core.cscpds.jdk16=org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource40
-derby.module.core.cscpds.jdk16n=org.apache.derby.jdbc.NonJNDIEmbeddedConnectionPoolDataSource40
+derby.module.core.cscpds.jdk16n=org.apache.derby.jdbc.BasicEmbeddedConnectionPoolDataSource40
derby.module.core.ad.jdk16=org.apache.derby.jdbc.AutoloadedDriver40
derby.module.database.consistency.checker=org.apache.derby.iapi.db.ConsistencyChecker
Modified: db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant?rev=1440262&r1=1440261&r2=1440262&view=diff
==============================================================================
--- db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant (original)
+++ db/derby/code/trunk/tools/javadoc/publishedapi_jdbc4.ant Wed Jan 30 03:42:50 2013
@@ -41,11 +41,11 @@ org/apache/derby/jdbc/EmbeddedConnection
org/apache/derby/jdbc/EmbeddedDataSource40.java
org/apache/derby/jdbc/EmbeddedXADataSource40.java
-org/apache/derby/jdbc/NonJNDIClientConnectionPoolDataSource40.java
-org/apache/derby/jdbc/NonJNDIClientDataSource40.java
-org/apache/derby/jdbc/NonJNDIClientXADataSource40.java
+org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
+org/apache/derby/jdbc/BasicClientDataSource40.java
+org/apache/derby/jdbc/BasicClientXADataSource40.java
-org/apache/derby/jdbc/NonJNDIEmbeddedConnectionPoolDataSource40.java
-org/apache/derby/jdbc/NonJNDIEmbeddedDataSource40.java
-org/apache/derby/jdbc/NonJNDIEmbeddedXADataSource40.java
+org/apache/derby/jdbc/BasicEmbeddedConnectionPoolDataSource40.java
+org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
+org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java