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 [1/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...
Author: dag
Date: Mon Jun 16 23:00:34 2014
New Revision: 1603019
URL: http://svn.apache.org/r1603019
Log:
DERBY-6552 The public api includes methods inherited from superclasses which aren't in the public api and so have no javadoc comments
Patch derby-6552-restructure-more:
- adds wrappers so that the exposed classes have the expected methods
and constants.
- changes the doc build for publishedapi so that we have a
"sourcepath" for Javadoc which contains all the sources. This is
necessary to make the wrappers inherit the (common for Basic* and
regular data sources) javadoc from a class that is otherwise not in
the API.
- added reference "link"s to official Java Javadocs for ease of
reading (SE: 8, J2EE: 7)
- removed ClientBaseDataSourceRoot putting its contents into
BasicClientDataSource40
- removed ClientBaseDataSource moving its contents into ClientDataSource
- added new serialized data source tests for 10.11
Added:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientConnectionPoolDataSource40-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientDataSource40-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicClientXADataSource40-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedConnectionPoolDataSource40-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedDataSource40-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/BasicEmbeddedXADataSource40-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientConnectionPoolDataSource-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientConnectionPoolDataSource40-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientDataSource-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientDataSource40-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientXADataSource-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/ClientXADataSource40-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedConnectionPoolDataSource-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedConnectionPoolDataSource40-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedDataSource-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedDataSource40-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedXADataSource-10_11_1_0.ser
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/serializedDataSources/EmbeddedXADataSource40-10_11_1_0.ser
Removed:
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSourceRoot.java
Modified:
db/derby/code/trunk/build.xml
db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java
db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientConnection.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnection.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/OpenSocketAction.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientDataSource40.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientXADataSource40.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSourceInterface.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java
db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedDataSource40.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/BasicEmbeddedXADataSource40.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedBaseDataSource.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/ReferenceableDataSource.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/J2EEDataSourceTest.java
Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1603019&r1=1603018&r2=1603019&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Mon Jun 16 23:00:34 2014
@@ -1074,9 +1074,10 @@
<param name="more_inclusions" value="${extraApi}"/>
</antcall>
- <javadoc sourcepath="${out.javadoc.dir}/sourcedir"
- bootclasspath="${bootClasspath}"
+ <javadoc bootclasspath="${bootClasspath}"
classpath="${bootClasspath};${osgi};${servlet24};${out.dir};${jars.javadoc}"
+ sourcepath="${derby.engine.src.dir}:${derby.client.src.dir}:${derby.drda.src.dir}:${derby.shared.src.dir}:${derby.optional.src.dir}:${derby.tools.src.dir}"
+ excludepackagenames="org.apache.derby.*"
breakiterator="true"
destdir="${public.api.dir}"
Overview="${basedir}/published_api_overview.html"
@@ -1085,6 +1086,8 @@
Footer="${javadoc.Footer}"
bottom="Apache Derby ${major}.${minor} API Documentation - <i>Copyright &copy; 2004,${copyright.year} The Apache Software Foundation. All Rights Reserved.</i>">
<Doctitle> Apache Derby ${major}.${minor} API Documentation</Doctitle>
+ <link href="http://docs.oracle.com/javase/8/docs/api/"/>
+ <link href="http://docs.oracle.com/javaee/7/api/"/>
<fileset dir="${derby.engine.src.dir}"
includesfile="${javadoc.inclusions}"/>
<fileset dir="${derby.client.src.dir}"
@@ -1095,10 +1098,10 @@
includesfile="${javadoc.inclusions}"/>
<fileset dir="${derby.optional.src.dir}"
includesfile="${javadoc.inclusions}"/>
+ <link href="http://docs.oracle.com/javase/8/docs/api/"/>
<arg value="${xarg.doclint}"/>
</javadoc>
- <delete dir="${out.javadoc.dir}/sourcedir"/>
<delete dir="${javadoc.temp.dir}"/>
<!-- Copy the logo needed by the Doctitle attribute above -->
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java?rev=1603019&r1=1603018&r2=1603019&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/ClientPooledConnection.java Mon Jun 16 23:00:34 2014
@@ -39,7 +39,7 @@ import org.apache.derby.client.am.SqlExc
import org.apache.derby.client.am.stmtcache.JDBCStatementCache;
import org.apache.derby.client.net.NetXAConnection;
import org.apache.derby.iapi.error.ExceptionSeverity;
-import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
+import org.apache.derby.jdbc.BasicClientDataSource40;
import org.apache.derby.jdbc.ClientDriver;
import org.apache.derby.shared.common.reference.SQLState;
@@ -107,7 +107,7 @@ public class ClientPooledConnection impl
* @throws SQLException if creating the pooled connection fails due problems
* in the database, or problems communicating with the database
*/
- public ClientPooledConnection(ClientBaseDataSourceRoot ds,
+ public ClientPooledConnection(BasicClientDataSource40 ds,
LogWriter logWriter,
String user,
String password) throws SQLException {
@@ -156,7 +156,7 @@ public class ClientPooledConnection impl
* @throws SQLException if creating the pooled connection fails due problems
* in the database, or problems communicating with the database
*/
- public ClientPooledConnection(ClientBaseDataSourceRoot ds,
+ public ClientPooledConnection(BasicClientDataSource40 ds,
LogWriter logWriter,
String user,
String password,
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection.java?rev=1603019&r1=1603018&r2=1603019&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/ClientXAConnection.java Mon Jun 16 23:00:34 2014
@@ -30,7 +30,7 @@ import org.apache.derby.client.am.LogWri
import org.apache.derby.client.am.SqlException;
import org.apache.derby.client.net.NetXAConnection;
import org.apache.derby.client.net.NetXAResource;
-import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
+import org.apache.derby.jdbc.BasicClientDataSource40;
import org.apache.derby.shared.common.reference.SQLState;
public class ClientXAConnection extends ClientPooledConnection implements XAConnection {
@@ -46,7 +46,7 @@ public class ClientXAConnection extends
// This connection is used to access the indoubt table
private NetXAConnection controlCon_ = null;
- public ClientXAConnection(ClientBaseDataSourceRoot ds,
+ public ClientXAConnection(BasicClientDataSource40 ds,
LogWriter logWtr,
String userId,
String password) throws SQLException {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientConnection.java?rev=1603019&r1=1603018&r2=1603019&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientConnection.java Mon Jun 16 23:00:34 2014
@@ -43,7 +43,8 @@ import java.util.Set;
import java.util.WeakHashMap;
import java.util.concurrent.Executor;
import org.apache.derby.client.net.NetXAResource;
-import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
+import org.apache.derby.jdbc.BasicClientDataSource40;
+import org.apache.derby.jdbc.ClientDataSourceInterface;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.shared.common.sanity.SanityManager;
@@ -186,10 +187,10 @@ public abstract class ClientConnection
public int xaHostVersion_ = 0;
private int loginTimeout_;
- public ClientBaseDataSourceRoot dataSource_;
+ public BasicClientDataSource40 dataSource_;
public String serverNameIP_;
public int portNumber_;
- private int clientSSLMode_ = ClientBaseDataSourceRoot.SSL_OFF;
+ private int clientSSLMode_ = BasicClientDataSource40.SSL_OFF;
Hashtable<String, String> clientCursorNameCache_ =
new Hashtable<String, String>();
@@ -206,7 +207,7 @@ public abstract class ClientConnection
LogWriter logWriter,
String user,
String password,
- ClientBaseDataSourceRoot dataSource)
+ BasicClientDataSource40 dataSource)
throws SqlException {
this.user_ = user;
@@ -218,7 +219,7 @@ public abstract class ClientConnection
String user,
String password,
boolean isXAConn,
- ClientBaseDataSourceRoot dataSource)
+ BasicClientDataSource40 dataSource)
throws SqlException {
this.user_ = user;
@@ -229,7 +230,7 @@ public abstract class ClientConnection
// For jdbc 2 connections
private void initConnection(
LogWriter logWriter,
- ClientBaseDataSourceRoot dataSource)
+ BasicClientDataSource40 dataSource)
throws SqlException {
if (logWriter != null) {
@@ -269,7 +270,7 @@ public abstract class ClientConnection
portNumber_ = dataSource.getPortNumber();
clientSSLMode_ =
- ClientBaseDataSourceRoot.getSSLModeFromString(dataSource.getSsl());
+ BasicClientDataSource40.getSSLModeFromString(dataSource.getSsl());
agent_ = newAgent_(logWriter,
loginTimeout_,
@@ -282,7 +283,7 @@ public abstract class ClientConnection
protected ClientConnection(
LogWriter logWriter,
boolean isXAConn,
- ClientBaseDataSourceRoot dataSource)
+ BasicClientDataSource40 dataSource)
throws SqlException {
if (logWriter != null) {
@@ -291,7 +292,7 @@ public abstract class ClientConnection
isXAConnection_ = isXAConn;
- user_ = ClientBaseDataSourceRoot.propertyDefault_user;
+ user_ = ClientDataSourceInterface.propertyDefault_user;
// Extract common properties.
databaseName_ = dataSource.getDatabaseName();
@@ -304,7 +305,7 @@ public abstract class ClientConnection
portNumber_ = dataSource.getPortNumber();
clientSSLMode_ =
- ClientBaseDataSourceRoot.getSSLModeFromString(dataSource.getSsl());
+ BasicClientDataSource40.getSSLModeFromString(dataSource.getSsl());
agent_ = newAgent_(logWriter,
loginTimeout_,
@@ -348,14 +349,14 @@ public abstract class ClientConnection
databaseName_ = databaseName;
// Extract common properties.
- user_ = ClientBaseDataSourceRoot.getUser(properties);
+ user_ = BasicClientDataSource40.getUser(properties);
retrieveMessageText_ =
- ClientBaseDataSourceRoot.getRetrieveMessageText(properties);
+ BasicClientDataSource40.getRetrieveMessageText(properties);
loginTimeout_ = driverManagerLoginTimeout;
serverNameIP_ = serverName;
portNumber_ = portNumber;
- clientSSLMode_ = ClientBaseDataSourceRoot.getClientSSLMode(properties);
+ clientSSLMode_ = BasicClientDataSource40.getClientSSLMode(properties);
agent_ = newAgent_(logWriter,
loginTimeout_,
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java?rev=1603019&r1=1603018&r2=1603019&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java Mon Jun 16 23:00:34 2014
@@ -30,7 +30,7 @@ import org.apache.derby.client.ClientXAC
import java.util.Properties;
import org.apache.derby.client.am.stmtcache.JDBCStatementCache;
import org.apache.derby.client.am.stmtcache.StatementKey;
-import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
+import org.apache.derby.jdbc.BasicClientDataSource40;
/**
*
@@ -48,7 +48,7 @@ public interface ClientJDBCObjectFactory
* implements {@code javax.sql.PooledConnection}.
*/
ClientPooledConnection newClientPooledConnection(
- ClientBaseDataSourceRoot ds,
+ BasicClientDataSource40 ds,
LogWriter logWriter,
String user,
String password) throws SQLException;
@@ -58,7 +58,7 @@ public interface ClientJDBCObjectFactory
* ClientXAConnection (or ClientXAConnection40) class which
* implements {@code javax.sql.XAConnection}.
*/
- ClientXAConnection newClientXAConnection(ClientBaseDataSourceRoot ds,
+ ClientXAConnection newClientXAConnection(BasicClientDataSource40 ds,
LogWriter logWriter,String user,String password)
throws SQLException;
@@ -226,7 +226,7 @@ public interface ClientJDBCObjectFactory
LogWriter logWriter,
String user,
String password,
- ClientBaseDataSourceRoot dataSource,
+ BasicClientDataSource40 dataSource,
int rmId,
boolean isXAConn) throws SqlException;
@@ -254,7 +254,7 @@ public interface ClientJDBCObjectFactory
ClientConnection newNetConnection(
LogWriter logWriter,
String user,String password,
- ClientBaseDataSourceRoot dataSource,int rmId,
+ BasicClientDataSource40 dataSource,int rmId,
boolean isXAConn,ClientPooledConnection cpc) throws SqlException;
/**
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java?rev=1603019&r1=1603018&r2=1603019&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/LogWriter.java Mon Jun 16 23:00:34 2014
@@ -34,8 +34,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
import javax.transaction.xa.XAException;
-import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
-import org.apache.derby.jdbc.ClientDataSourceInterface;
+import org.apache.derby.jdbc.BasicClientDataSource40;
import org.apache.derby.shared.common.reference.Attribute;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.shared.common.sanity.SanityManager;
@@ -152,61 +151,61 @@ public class LogWriter {
{
return null;
} else if (instance instanceof ClientConnection && loggingEnabled(
- ClientDataSourceInterface.TRACE_CONNECTION_CALLS)) {
+ BasicClientDataSource40.TRACE_CONNECTION_CALLS)) {
return "ClientConnection";
} else if (instance instanceof ClientResultSet && loggingEnabled(
- ClientDataSourceInterface.TRACE_RESULT_SET_CALLS)) {
+ BasicClientDataSource40.TRACE_RESULT_SET_CALLS)) {
return "ClientResultSet";
} else if (instance instanceof ClientCallableStatement &&
loggingEnabled(
- ClientDataSourceInterface.TRACE_STATEMENT_CALLS)) {
+ BasicClientDataSource40.TRACE_STATEMENT_CALLS)) {
return "ClientCallableStatement";
} else if (instance instanceof ClientPreparedStatement &&
loggingEnabled(
- ClientDataSourceInterface.TRACE_STATEMENT_CALLS)) {
+ BasicClientDataSource40.TRACE_STATEMENT_CALLS)) {
return "ClientPreparedStatement";
} else if (instance instanceof ClientStatement && loggingEnabled(
- ClientDataSourceInterface.TRACE_STATEMENT_CALLS)) {
+ BasicClientDataSource40.TRACE_STATEMENT_CALLS)) {
return "ClientStatement";
}
// Not yet externalizing Blob tracing, except for trace_all
else if (instance instanceof ClientBlob && loggingEnabled(
- ClientDataSourceInterface.TRACE_ALL)) // add a trace level for
+ BasicClientDataSource40.TRACE_ALL)) // add a trace level for
// lobs !!
{
return "ClientBlob";
}
// Not yet externalizing ClientClob tracing, except for trace_all
else if (instance instanceof ClientClob && loggingEnabled(
- ClientDataSourceInterface.TRACE_ALL)) // add a trace level for
+ BasicClientDataSource40.TRACE_ALL)) // add a trace level for
// bobs !!
{
return "ClientClob";
}
// Not yet externalizing dbmd catalog call tracing, except for trace_all
else if (instance instanceof ClientDatabaseMetaData && loggingEnabled(
- ClientDataSourceInterface.TRACE_ALL)) // add a trace level for
+ BasicClientDataSource40.TRACE_ALL)) // add a trace level for
// dbmd ??
{
return "ClientDatabaseMetaData";
}
// we don't use instanceof javax.transaction.XAResource to avoid dependency on j2ee.jar
- else if (loggingEnabled(ClientDataSourceInterface.TRACE_XA_CALLS) &&
+ else if (loggingEnabled(BasicClientDataSource40.TRACE_XA_CALLS) &&
instance.getClass().getName().startsWith("org.apache.derby.client.net.NetXAResource")) {
return "NetXAResource";
- } else if (loggingEnabled(ClientDataSourceInterface.TRACE_ALL) &&
+ } else if (loggingEnabled(BasicClientDataSource40.TRACE_ALL) &&
instance.getClass().getName().equals("org.apache.derby.client.ClientPooledConnection")) {
return "ClientPooledConnection";
- } else if (loggingEnabled(ClientDataSourceInterface.TRACE_ALL) &&
+ } else if (loggingEnabled(BasicClientDataSource40.TRACE_ALL) &&
instance.getClass().getName().equals("org.apache.derby.jdbc.ClientConnectionPoolDataSource")) {
return "ClientConnectionPoolDataSource";
- } else if (loggingEnabled(ClientDataSourceInterface.TRACE_ALL) &&
+ } else if (loggingEnabled(BasicClientDataSource40.TRACE_ALL) &&
instance.getClass().getName().equals("org.apache.derby.client.ClientXAConnection")) {
return "ClientXAConnection";
- } else if (loggingEnabled(ClientDataSourceInterface.TRACE_ALL) &&
+ } else if (loggingEnabled(BasicClientDataSource40.TRACE_ALL) &&
instance.getClass().getName().equals("org.apache.derby.jdbc.ClientDataSource")) {
return "ClientDataSource";
- } else if (loggingEnabled(ClientDataSourceInterface.TRACE_ALL) &&
+ } else if (loggingEnabled(BasicClientDataSource40.TRACE_ALL) &&
instance.getClass().getName().equals("org.apache.derby.jdbc.ClientXADataSource")) {
return "ClientXADataSource";
} else {
@@ -349,7 +348,7 @@ public class LogWriter {
// ---------------------------tracing exceptions and warnings-----------------
void traceDiagnosable(SqlException e) {
- if (!loggingEnabled(ClientDataSourceInterface.TRACE_DIAGNOSTICS)) {
+ if (!loggingEnabled(BasicClientDataSource40.TRACE_DIAGNOSTICS)) {
return;
}
synchronized (printWriter_) {
@@ -359,7 +358,7 @@ public class LogWriter {
}
}
public void traceDiagnosable(SQLException e) {
- if (!loggingEnabled(ClientDataSourceInterface.TRACE_DIAGNOSTICS)) {
+ if (!loggingEnabled(BasicClientDataSource40.TRACE_DIAGNOSTICS)) {
return;
}
synchronized (printWriter_) {
@@ -370,7 +369,7 @@ public class LogWriter {
}
void traceDiagnosable(XAException e) {
- if (!loggingEnabled(ClientDataSourceInterface.TRACE_DIAGNOSTICS)) {
+ if (!loggingEnabled(BasicClientDataSource40.TRACE_DIAGNOSTICS)) {
return;
}
synchronized (printWriter_) {
@@ -386,7 +385,7 @@ public class LogWriter {
ColumnMetaData columnMetaData) {
if (!loggingEnabled(
- ClientDataSourceInterface.TRACE_PARAMETER_META_DATA) ||
+ BasicClientDataSource40.TRACE_PARAMETER_META_DATA) ||
columnMetaData == null) {
return;
}
@@ -410,7 +409,7 @@ public class LogWriter {
ColumnMetaData columnMetaData) {
if (!loggingEnabled(
- ClientDataSourceInterface.TRACE_RESULT_SET_META_DATA) ||
+ BasicClientDataSource40.TRACE_RESULT_SET_META_DATA) ||
columnMetaData == null) {
return;
}
@@ -489,12 +488,12 @@ public class LogWriter {
// Including protocol manager levels, and driver configuration
// Jdbc 2
- void traceConnectEntry(ClientBaseDataSourceRoot dataSource) {
+ void traceConnectEntry(BasicClientDataSource40 dataSource) {
if (loggingEnabled(
- ClientDataSourceInterface.TRACE_DRIVER_CONFIGURATION)) {
+ BasicClientDataSource40.TRACE_DRIVER_CONFIGURATION)) {
traceDriverConfigurationJdbc2();
}
- if (loggingEnabled(ClientDataSourceInterface.TRACE_CONNECTS)) {
+ if (loggingEnabled(BasicClientDataSource40.TRACE_CONNECTS)) {
traceConnectsEntry(dataSource);
}
}
@@ -505,32 +504,32 @@ public class LogWriter {
String database,
Properties properties) {
if (loggingEnabled(
- ClientDataSourceInterface.TRACE_DRIVER_CONFIGURATION)) {
+ BasicClientDataSource40.TRACE_DRIVER_CONFIGURATION)) {
traceDriverConfigurationJdbc1();
}
- if (loggingEnabled(ClientDataSourceInterface.TRACE_CONNECTS)) {
+ if (loggingEnabled(BasicClientDataSource40.TRACE_CONNECTS)) {
traceConnectsEntry(server, port, database, properties);
}
}
void traceConnectResetEntry(
Object instance, LogWriter logWriter,
- String user, ClientBaseDataSourceRoot ds) {
+ String user, BasicClientDataSource40 ds) {
traceEntry(instance, "reset", logWriter, user, "<escaped>", ds);
- if (loggingEnabled(ClientDataSourceInterface.TRACE_CONNECTS)) {
+ if (loggingEnabled(BasicClientDataSource40.TRACE_CONNECTS)) {
traceConnectsResetEntry(ds);
}
}
void traceConnectExit(ClientConnection connection) {
- if (loggingEnabled(ClientDataSourceInterface.TRACE_CONNECTS)) {
+ if (loggingEnabled(BasicClientDataSource40.TRACE_CONNECTS)) {
traceConnectsExit(connection);
}
}
public void traceConnectResetExit(ClientConnection connection) {
- if (loggingEnabled(ClientDataSourceInterface.TRACE_CONNECTS)) {
+ if (loggingEnabled(BasicClientDataSource40.TRACE_CONNECTS)) {
traceConnectsResetExit(connection);
}
}
@@ -538,7 +537,7 @@ public class LogWriter {
// ---------------------- tracing connects -----------------------------------
- private void traceConnectsResetEntry(ClientBaseDataSourceRoot dataSource) {
+ private void traceConnectsResetEntry(BasicClientDataSource40 dataSource) {
try {
traceConnectsResetEntry(dataSource.getServerName(),
dataSource.getPortNumber(),
@@ -549,7 +548,7 @@ public class LogWriter {
}
}
- private void traceConnectsEntry(ClientBaseDataSourceRoot dataSource) {
+ private void traceConnectsEntry(BasicClientDataSource40 dataSource) {
try {
traceConnectsEntry(dataSource.getServerName(),
dataSource.getPortNumber(),
@@ -715,10 +714,10 @@ public class LogWriter {
/**
* Obtain a set of Properties for the client data source.
*/
- private Properties getProperties(ClientBaseDataSourceRoot cds)
+ private Properties getProperties(BasicClientDataSource40 cds)
throws SqlException {
- Properties properties = ClientBaseDataSourceRoot.getProperties(cds);
+ Properties properties = BasicClientDataSource40.getProperties(cds);
if (properties.getProperty(Attribute.PASSWORD_ATTR) != null) {
properties.setProperty(Attribute.PASSWORD_ATTR, "********");
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java?rev=1603019&r1=1603018&r2=1603019&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java Mon Jun 16 23:00:34 2014
@@ -45,7 +45,6 @@ import org.apache.derby.client.am.SqlExc
import org.apache.derby.client.am.Cursor;
import org.apache.derby.client.am.stmtcache.JDBCStatementCache;
import org.apache.derby.client.am.stmtcache.StatementKey;
-import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
import org.apache.derby.client.am.ColumnMetaData;
import org.apache.derby.client.am.ClientConnection;
import org.apache.derby.client.am.ClientDatabaseMetaData;
@@ -53,6 +52,7 @@ import org.apache.derby.client.am.Materi
import org.apache.derby.client.am.ClientResultSet;
import org.apache.derby.client.am.StatementCacheInteractor;
import org.apache.derby.client.am.Utils;
+import org.apache.derby.jdbc.BasicClientDataSource40;
import org.apache.derby.shared.common.i18n.MessageUtil;
import org.apache.derby.shared.common.error.ExceptionUtil;
@@ -77,7 +77,7 @@ public class ClientJDBCObjectFactoryImpl
* org.apache.derby.client.ClientPooledConnection}
*/
public ClientPooledConnection newClientPooledConnection(
- ClientBaseDataSourceRoot ds,
+ BasicClientDataSource40 ds,
LogWriter logWriter,
String user,
String password) throws SQLException {
@@ -87,7 +87,7 @@ public class ClientJDBCObjectFactoryImpl
/**
* @return an instance of {@link org.apache.derby.client.ClientXAConnection}
*/
- public ClientXAConnection newClientXAConnection(ClientBaseDataSourceRoot ds,
+ public ClientXAConnection newClientXAConnection(BasicClientDataSource40 ds,
LogWriter logWriter,String user, String password) throws SQLException
{
return new ClientXAConnection(ds, logWriter, user, password);
@@ -288,7 +288,7 @@ public class ClientJDBCObjectFactoryImpl
*/
public ClientConnection newNetConnection(
LogWriter logWriter, String user, String password,
- ClientBaseDataSourceRoot dataSource,
+ BasicClientDataSource40 dataSource,
int rmId,
boolean isXAConn) throws SqlException {
@@ -320,7 +320,7 @@ public class ClientJDBCObjectFactoryImpl
public ClientConnection newNetConnection(
LogWriter logWriter,String user,
String password,
- ClientBaseDataSourceRoot dataSource,
+ BasicClientDataSource40 dataSource,
int rmId,boolean isXAConn,
ClientPooledConnection cpc) throws SqlException {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java?rev=1603019&r1=1603018&r2=1603019&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java Mon Jun 16 23:00:34 2014
@@ -48,7 +48,6 @@ import org.apache.derby.shared.common.re
import org.apache.derby.shared.common.i18n.MessageUtil;
import org.apache.derby.client.am.ClientStatement;
import org.apache.derby.iapi.reference.Attribute;
-import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
import org.apache.derby.jdbc.ClientDriver;
import org.apache.derby.client.ClientPooledConnection;
import org.apache.derby.client.am.Agent;
@@ -58,6 +57,7 @@ import org.apache.derby.client.am.LogWri
import org.apache.derby.client.am.SQLExceptionFactory;
import org.apache.derby.client.am.Section;
import org.apache.derby.client.am.SectionManager;
+import org.apache.derby.jdbc.BasicClientDataSource40;
import org.apache.derby.jdbc.ClientDataSourceInterface;
import org.apache.derby.shared.common.reference.SQLState;
@@ -204,9 +204,9 @@ public class NetConnection extends Clien
throw netAgent_.exceptionOpeningSocket_;
}
checkDatabaseName();
- String password = ClientBaseDataSourceRoot.getPassword(properties);
+ String password = BasicClientDataSource40.getPassword(properties);
securityMechanism_ =
- ClientBaseDataSourceRoot.getSecurityMechanism(properties);
+ BasicClientDataSource40.getSecurityMechanism(properties);
flowConnect(password, securityMechanism_);
if(!isConnectionNull())
completeConnect();
@@ -218,7 +218,7 @@ public class NetConnection extends Clien
NetConnection(LogWriter logWriter,
String user,
String password,
- ClientBaseDataSourceRoot dataSource,
+ BasicClientDataSource40 dataSource,
int rmId,
boolean isXAConn) throws SqlException {
super(logWriter, user, password, isXAConn, dataSource);
@@ -251,7 +251,7 @@ public class NetConnection extends Clien
NetConnection(LogWriter logWriter,
String user,
String password,
- ClientBaseDataSourceRoot dataSource,
+ BasicClientDataSource40 dataSource,
int rmId,
boolean isXAConn,
ClientPooledConnection cpc) throws SqlException {
@@ -263,7 +263,7 @@ public class NetConnection extends Clien
}
private void initialize(String password,
- ClientBaseDataSourceRoot dataSource,
+ BasicClientDataSource40 dataSource,
boolean isXAConn) throws SqlException {
securityMechanism_ = dataSource.getSecurityMechanism(password);
@@ -1380,7 +1380,7 @@ public class NetConnection extends Clien
// Define which userName takes precedence - If we have a dataSource
// available here, it is posible that the userName has been
// overriden by some defined as part of the connection attributes
- // (see ClientBaseDataSourceRoot.updateDataSourceValues().
+ // (see BasicClientDataSource40.updateDataSourceValues().
// We need to use the right userName as strong password
// substitution depends on the userName when the substitute
// password is generated; if we were not using the right userName
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnection.java?rev=1603019&r1=1603018&r2=1603019&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnection.java Mon Jun 16 23:00:34 2014
@@ -29,7 +29,7 @@ import org.apache.derby.client.am.Client
import org.apache.derby.client.ClientPooledConnection;
import org.apache.derby.client.am.ClientMessageId;
import org.apache.derby.client.am.LogWriter;
-import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
+import org.apache.derby.jdbc.BasicClientDataSource40;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.jdbc.ClientDriver;
@@ -65,7 +65,7 @@ public class NetXAConnection {
LogWriter logWriter,
String user,
String password,
- ClientBaseDataSourceRoot dataSource,
+ BasicClientDataSource40 dataSource,
int rmId,
boolean isXAConn,
ClientPooledConnection cpc) throws SqlException {
@@ -229,7 +229,7 @@ public class NetXAConnection {
LogWriter logWriter,
String user,
String password,
- ClientBaseDataSourceRoot dataSource,
+ BasicClientDataSource40 dataSource,
int rmId,
boolean isXAConn,
ClientPooledConnection cpc) throws SqlException {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/OpenSocketAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/OpenSocketAction.java?rev=1603019&r1=1603018&r2=1603019&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/OpenSocketAction.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/OpenSocketAction.java Mon Jun 16 23:00:34 2014
@@ -33,7 +33,7 @@ import java.security.UnrecoverableKeyExc
import java.security.cert.CertificateException;
import javax.net.SocketFactory;
import javax.net.ssl.SSLSocketFactory;
-import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
+import org.apache.derby.jdbc.BasicClientDataSource40;
class OpenSocketAction implements PrivilegedExceptionAction<Socket> {
private String server_;
@@ -60,14 +60,14 @@ class OpenSocketAction implements Privil
SocketFactory sf;
switch (clientSSLMode_) {
- case ClientBaseDataSourceRoot.SSL_BASIC:
+ case BasicClientDataSource40.SSL_BASIC:
sf = NaiveTrustManager.getSocketFactory();
break;
- case ClientBaseDataSourceRoot.
+ case BasicClientDataSource40.
SSL_PEER_AUTHENTICATION:
sf = (SocketFactory)SSLSocketFactory.getDefault();
break;
- case ClientBaseDataSourceRoot.SSL_OFF:
+ case BasicClientDataSource40.SSL_OFF:
sf = SocketFactory.getDefault();
break;
default:
Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java?rev=1603019&r1=1603018&r2=1603019&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/BasicClientConnectionPoolDataSource40.java Mon Jun 16 23:00:34 2014
@@ -120,7 +120,7 @@ public class BasicClientConnectionPoolDa
/**
* Internally used method.
*
- * @see ClientBaseDataSourceRoot#maxStatementsToPool
+ * @see BasicClientDataSource40#maxStatementsToPool
*/
public int maxStatementsToPool() {
return this.maxStatements;