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/04/14 06:17:08 UTC
svn commit: r1467726 [4/4] - in
/db/derby/code/trunk/java/client/org/apache/derby: client/ client/am/
client/am/stmtcache/ client/net/ jdbc/
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementRequest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementRequest.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementRequest.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementRequest.java Sun Apr 14 04:17:07 2013
@@ -29,6 +29,7 @@ import org.apache.derby.client.am.Blob;
import org.apache.derby.client.am.ClientMessageId;
import org.apache.derby.client.am.Clob;
import org.apache.derby.client.am.ColumnMetaData;
+import org.apache.derby.client.am.Configuration;
import org.apache.derby.client.am.DateTime;
import org.apache.derby.client.am.DateTimeValue;
import org.apache.derby.client.am.Lob;
@@ -166,7 +167,7 @@ public class NetStatementRequest extends
int fetchSize,
int resultSetType,
int numInputColumns,
- org.apache.derby.client.am.ColumnMetaData parameterMetaData,
+ ColumnMetaData parameterMetaData,
Object[] inputs) throws SqlException {
boolean sendQryrowset = checkSendQryrowset(fetchSize, resultSetType);
fetchSize = checkFetchsize(fetchSize, resultSetType);
@@ -269,7 +270,9 @@ public class NetStatementRequest extends
{
// always send QRYROWSET on EXCSQLSTT
boolean sendQryrowset = true;
- fetchSize = (fetchSize == 0) ? org.apache.derby.client.am.Configuration.defaultFetchSize : fetchSize;
+ fetchSize = (fetchSize == 0) ?
+ Configuration.defaultFetchSize :
+ fetchSize;
boolean sendPrcnam = (procedureName != null) ? true : false;
int numParameters = (parameterMetaData != null) ? parameterMetaData.columns_ : 0;
@@ -960,7 +963,7 @@ public class NetStatementRequest extends
|| parameterType == Types.LONGVARBINARY) {
Blob o = (Blob) retrievePromotedParameterIfExists(index);
java.sql.Blob b = (o == null) ? (java.sql.Blob) inputRow[index] : o;
- boolean isExternalBlob = !(b instanceof org.apache.derby.client.am.Blob);
+ boolean isExternalBlob = !(b instanceof Blob);
if (isExternalBlob) {
try {
writeScalarStream(chainFlag,
@@ -1016,7 +1019,7 @@ public class NetStatementRequest extends
|| parameterType == Types.LONGVARCHAR) {
Clob o = (Clob) retrievePromotedParameterIfExists(index);
java.sql.Clob c = (o == null) ? (java.sql.Clob) inputRow[index] : o;
- boolean isExternalClob = !(c instanceof org.apache.derby.client.am.Clob);
+ boolean isExternalClob = !(c instanceof Clob);
if (isExternalClob) {
try {
@@ -1439,7 +1442,7 @@ public class NetStatementRequest extends
{
// use columnMeta.singleMixedByteOrDouble_ to decide protocolType
java.sql.Clob c = (java.sql.Clob) inputRow[i];
- boolean isExternalClob = !(c instanceof org.apache.derby.client.am.Clob);
+ boolean isExternalClob = !(c instanceof Clob);
long lobLength = 0;
boolean doesLayerBStreaming = false;
@@ -1809,7 +1812,7 @@ public class NetStatementRequest extends
private int checkFetchsize(int fetchSize, int resultSetType) {
// if fetchSize is not set for scrollable cursors, set it to the default fetchSize
if (resultSetType != java.sql.ResultSet.TYPE_FORWARD_ONLY && fetchSize == 0) {
- fetchSize = org.apache.derby.client.am.Configuration.defaultFetchSize;
+ fetchSize = Configuration.defaultFetchSize;
}
return fetchSize;
}
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=1467726&r1=1467725&r2=1467726&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 Sun Apr 14 04:17:07 2013
@@ -32,6 +32,7 @@ import org.apache.derby.client.am.Statem
import org.apache.derby.client.ClientPooledConnection;
import org.apache.derby.client.am.ClientMessageId;
+import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.jdbc.ClientDriver;
@@ -67,7 +68,7 @@ public class NetXAConnection {
NetLogWriter netLogWriter,
String user,
String password,
- org.apache.derby.jdbc.ClientBaseDataSourceRoot dataSource,
+ ClientBaseDataSourceRoot dataSource,
int rmId,
boolean isXAConn,
ClientPooledConnection cpc) throws SqlException {
@@ -259,7 +260,7 @@ public class NetXAConnection {
NetLogWriter netLogWriter,
String user,
String password,
- org.apache.derby.jdbc.ClientBaseDataSourceRoot dataSource,
+ ClientBaseDataSourceRoot dataSource,
int rmId,
boolean isXAConn,
ClientPooledConnection cpc) throws SqlException {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnectionReply.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnectionReply.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnectionReply.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAConnectionReply.java Sun Apr 14 04:17:07 2013
@@ -24,6 +24,7 @@ package org.apache.derby.client.net;
import java.util.HashMap;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.apache.derby.client.ClientXid;
import org.apache.derby.client.am.ConnectionCallbackInterface;
import org.apache.derby.client.am.DisconnectException;
@@ -288,7 +289,7 @@ public class NetXAConnectionReply extend
byte[] gtrid = readBytes(gtridLen);
byte[] bqual = readBytes(bqualLen);
- return new org.apache.derby.client.ClientXid(formatId, gtrid, bqual);
+ return new ClientXid(formatId, gtrid, bqual);
}
protected HashMap<Xid, NetIndoubtTransaction> parseIndoubtList()
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAResource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAResource.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAResource.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetXAResource.java Sun Apr 14 04:17:07 2013
@@ -55,6 +55,9 @@ import org.apache.derby.client.ClientXid
import org.apache.derby.client.am.Connection;
import org.apache.derby.client.am.SqlException;
import org.apache.derby.client.am.ClientMessageId;
+import org.apache.derby.client.am.SqlCode;
+import org.apache.derby.client.am.Utils;
+import org.apache.derby.client.am.XaException;
import org.apache.derby.shared.common.reference.SQLState;
public class NetXAResource implements XAResource {
@@ -83,11 +86,11 @@ public class NetXAResource implements XA
public static final String XAFUNCSTR_ROLLBACK = "XAResource.rollback()";
public static final String XAFUNCSTR_START = "XAResource.start()";
- public org.apache.derby.client.am.SqlException exceptionsOnXA = null;
+ public SqlException exceptionsOnXA = null;
XAConnection xaconn_;
- org.apache.derby.client.net.NetXAConnection netXAConn_;
- org.apache.derby.client.net.NetConnection conn_;
+ NetXAConnection netXAConn_;
+ NetConnection conn_;
private boolean keepIsolationLevel;
int rmId_; // unique RmId generated by XAConnection
// TODO: change to a single callInfo field (not an array)
@@ -110,7 +113,7 @@ public class NetXAResource implements XA
public NetXAResource(XAConnection xaconn, int rmId,
String userId, String password,
- org.apache.derby.client.net.NetXAConnection conn) {
+ NetXAConnection conn) {
xaconn_ = xaconn;
rmId_ = rmId;
conn_ = conn.getNetConnection();
@@ -171,8 +174,7 @@ public class NetXAResource implements XA
netAgent.endReadChain();
} catch (SqlException sqle) {
rc = getSqlExceptionXAErrorCode(sqle);
- exceptionsOnXA = org.apache.derby.client.am.Utils.accumulateSQLException
- (sqle, exceptionsOnXA);
+ exceptionsOnXA = Utils.accumulateSQLException(sqle, exceptionsOnXA);
} finally {
conn_.pendingEndXACallinfoOffset_ = -1; // indicate no pending callinfo
}
@@ -251,8 +253,7 @@ public class NetXAResource implements XA
netAgent.endReadChain();
} catch (SqlException sqle) {
rc = getSqlExceptionXAErrorCode(sqle);
- exceptionsOnXA = org.apache.derby.client.am.Utils.accumulateSQLException
- (sqle, exceptionsOnXA);
+ exceptionsOnXA = Utils.accumulateSQLException(sqle, exceptionsOnXA);
} finally {
conn_.pendingEndXACallinfoOffset_ = -1; // indicate no pending callinfo
}
@@ -310,8 +311,7 @@ public class NetXAResource implements XA
callInfo.xaRetVal_ = XAResource.XA_OK; // re-initialize XARETVAL
}
} catch (SqlException sqle) {
- exceptionsOnXA = org.apache.derby.client.am.Utils.accumulateSQLException
- (sqle, exceptionsOnXA);
+ exceptionsOnXA = Utils.accumulateSQLException(sqle, exceptionsOnXA);
throwXAException(getSqlExceptionXAErrorCode(sqle));
} finally {
conn_.pendingEndXACallinfoOffset_ = -1; // indicate no pending callinfo
@@ -394,8 +394,7 @@ public class NetXAResource implements XA
netAgent.endReadChain();
} catch (SqlException sqle) {
rc = getSqlExceptionXAErrorCode(sqle);
- exceptionsOnXA = org.apache.derby.client.am.Utils.accumulateSQLException
- (sqle, exceptionsOnXA);
+ exceptionsOnXA = Utils.accumulateSQLException(sqle, exceptionsOnXA);
} finally {
conn_.pendingEndXACallinfoOffset_ = -1; // indicate no pending callinfo
}
@@ -457,8 +456,7 @@ public class NetXAResource implements XA
} catch (SqlException sqle) {
rc = getSqlExceptionXAErrorCode(sqle);
- exceptionsOnXA = org.apache.derby.client.am.Utils.accumulateSQLException
- (sqle, exceptionsOnXA);
+ exceptionsOnXA = Utils.accumulateSQLException(sqle, exceptionsOnXA);
} finally {
conn_.pendingEndXACallinfoOffset_ = -1; // indicate no pending callinfo
}
@@ -510,8 +508,7 @@ public class NetXAResource implements XA
}
} catch (SqlException sqle) {
rc = getSqlExceptionXAErrorCode(sqle);
- exceptionsOnXA = org.apache.derby.client.am.Utils.accumulateSQLException
- (sqle, exceptionsOnXA);
+ exceptionsOnXA = Utils.accumulateSQLException(sqle, exceptionsOnXA);
} finally {
conn_.pendingEndXACallinfoOffset_ = -1; // indicate no pending callinfo
}
@@ -592,8 +589,7 @@ public class NetXAResource implements XA
conn_.flowAutoCommit();
} catch (SqlException sqle) {
rc = getSqlExceptionXAErrorCode(sqle);
- exceptionsOnXA = org.apache.derby.client.am.Utils.accumulateSQLException
- (sqle, exceptionsOnXA);
+ exceptionsOnXA = Utils.accumulateSQLException(sqle, exceptionsOnXA);
}
// update the XACallInfo
@@ -641,8 +637,7 @@ public class NetXAResource implements XA
} catch (SqlException sqle) {
rc = getSqlExceptionXAErrorCode(sqle);
- exceptionsOnXA = org.apache.derby.client.am.Utils.accumulateSQLException
- (sqle, exceptionsOnXA);
+ exceptionsOnXA = Utils.accumulateSQLException(sqle, exceptionsOnXA);
} finally {
conn_.pendingEndXACallinfoOffset_ = -1; // indicate no pending callinfo
}
@@ -749,17 +744,19 @@ public class NetXAResource implements XA
xaExceptionText.append(getXAExceptionText(rc));
// save the SqlException chain to add it to the XAException
- org.apache.derby.client.am.SqlException sqlExceptions = exceptionsOnXA;
+ SqlException sqlExceptions = exceptionsOnXA;
while (exceptionsOnXA != null) { // one or more SqlExceptions received, format them
xaExceptionText.append(" : ").append(exceptionsOnXA.getMessage());
- exceptionsOnXA = (org.apache.derby.client.am.SqlException)
+ exceptionsOnXA = (SqlException)
exceptionsOnXA.getNextException();
}
- org.apache.derby.client.am.XaException xaException =
- new org.apache.derby.client.am.XaException(conn_.agent_.logWriter_,
- sqlExceptions,
- xaExceptionText.toString());
+
+ XaException xaException = new XaException(
+ conn_.agent_.logWriter_,
+ sqlExceptions,
+ xaExceptionText.toString());
+
xaException.errorCode = rc;
setXaStateForXAException(rc);
throw xaException;
@@ -822,7 +819,8 @@ public class NetXAResource implements XA
connectionClosedFailure();
}
- if (xares instanceof org.apache.derby.client.net.NetXAResource) { // both are NetXAResource so check to see if this is the same RM
+ if (xares instanceof NetXAResource) {
+ // Both are NetXAResource so check to see if this is the same RM
// remember, isSame is initialized to false
NetXAResource derbyxares = (NetXAResource) xares;
while (true) {
@@ -919,7 +917,7 @@ public class NetXAResource implements XA
}
private void connectionClosedFailure() throws XAException { // throw an XAException XAER_RMFAIL, with a chained SqlException - closed
- exceptionsOnXA = org.apache.derby.client.am.Utils.accumulateSQLException
+ exceptionsOnXA = Utils.accumulateSQLException
(new SqlException(null,
new ClientMessageId(SQLState.NO_CURRENT_CONNECTION)),
exceptionsOnXA);
@@ -958,8 +956,8 @@ public class NetXAResource implements XA
new ClientMessageId(SQLState.NET_XARETVAL_ERROR),
getXAFuncStr(callInfo.xaFunction_),
getXAExceptionText(rc),
- org.apache.derby.client.am.SqlCode.queuedXAError);
- exceptionsOnXA = org.apache.derby.client.am.Utils.accumulateSQLException
+ SqlCode.queuedXAError);
+ exceptionsOnXA = Utils.accumulateSQLException
(accumSql, exceptionsOnXA);
if (currentRC != XAResource.XA_OK) { // the rc passed into this function had an error also, prioritize error
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=1467726&r1=1467725&r2=1467726&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 Sun Apr 14 04:17:07 2013
@@ -25,6 +25,7 @@ import java.net.Socket;
import java.security.PrivilegedExceptionAction;
import javax.net.SocketFactory;
import javax.net.ssl.SSLSocketFactory;
+import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
public class OpenSocketAction implements PrivilegedExceptionAction<Socket> {
private String server_;
@@ -51,14 +52,14 @@ public class OpenSocketAction implements
SocketFactory sf;
switch (clientSSLMode_) {
- case org.apache.derby.jdbc.ClientBaseDataSourceRoot.SSL_BASIC:
+ case ClientBaseDataSourceRoot.SSL_BASIC:
sf = NaiveTrustManager.getSocketFactory();
break;
- case org.apache.derby.jdbc.ClientBaseDataSourceRoot.
+ case ClientBaseDataSourceRoot.
SSL_PEER_AUTHENTICATION:
sf = (SocketFactory)SSLSocketFactory.getDefault();
break;
- case org.apache.derby.jdbc.ClientBaseDataSourceRoot.SSL_OFF:
+ case ClientBaseDataSourceRoot.SSL_OFF:
sf = SocketFactory.getDefault();
break;
default:
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/Reply.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/Reply.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/Reply.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/Reply.java Sun Apr 14 04:17:07 2013
@@ -24,6 +24,7 @@ package org.apache.derby.client.net;
import java.io.ByteArrayOutputStream;
import java.util.Arrays;
+import org.apache.derby.client.am.Agent;
import org.apache.derby.client.am.SignedBinary;
import org.apache.derby.client.am.SqlException;
@@ -35,7 +36,7 @@ import org.apache.derby.shared.common.re
import org.apache.derby.shared.common.reference.MessageId;
public class Reply {
- protected org.apache.derby.client.am.Agent agent_;
+ protected Agent agent_;
protected NetAgent netAgent_; //cheat-link to (NetAgent) agent_
protected final static int DEFAULT_BUFFER_SIZE = 32767;
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetReplyInterface.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetReplyInterface.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetReplyInterface.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetReplyInterface.java Sun Apr 14 04:17:07 2013
@@ -21,14 +21,19 @@
package org.apache.derby.client.net;
+import org.apache.derby.client.am.DisconnectException;
import org.apache.derby.client.am.ResultSetCallbackInterface;
public interface ResultSetReplyInterface {
- public void readFetch(ResultSetCallbackInterface resultSet) throws org.apache.derby.client.am.DisconnectException;
+ public void readFetch(ResultSetCallbackInterface resultSet)
+ throws DisconnectException;
- public void readScrollableFetch(ResultSetCallbackInterface resultSet) throws org.apache.derby.client.am.DisconnectException;
+ public void readScrollableFetch(ResultSetCallbackInterface resultSet)
+ throws DisconnectException;
- public void readPositioningFetch(ResultSetCallbackInterface resultSet) throws org.apache.derby.client.am.DisconnectException;
+ public void readPositioningFetch(ResultSetCallbackInterface resultSet)
+ throws DisconnectException;
- public void readCursorClose(ResultSetCallbackInterface resultSet) throws org.apache.derby.client.am.DisconnectException;
+ public void readCursorClose(ResultSetCallbackInterface resultSet)
+ throws DisconnectException;
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetRequestInterface.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetRequestInterface.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetRequestInterface.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/ResultSetRequestInterface.java Sun Apr 14 04:17:07 2013
@@ -22,6 +22,7 @@
package org.apache.derby.client.net;
import org.apache.derby.client.am.Section;
+import org.apache.derby.client.am.SqlException;
// In general, required data is passed.
// In addition, ResultSet objects are passed for convenient access to any material result set caches.
@@ -31,21 +32,22 @@ import org.apache.derby.client.am.Sectio
public interface ResultSetRequestInterface {
public void writeFetch(NetResultSet resultSet,
Section section,
- int fetchSize) throws org.apache.derby.client.am.SqlException;
+ int fetchSize) throws SqlException;
- public void writeScrollableFetch(NetResultSet resultSet,
- Section section,
- int fetchSize,
- int orientation,
- long rowToFetch,
- boolean resetQueryBlocks) throws org.apache.derby.client.am.SqlException;
+ public void writeScrollableFetch(
+ NetResultSet resultSet,
+ Section section,
+ int fetchSize,
+ int orientation,
+ long rowToFetch,
+ boolean resetQueryBlocks) throws SqlException;
public void writePositioningFetch(NetResultSet resultSet,
Section section,
int orientation,
- long rowToFetch) throws org.apache.derby.client.am.SqlException;
+ long rowToFetch) throws SqlException;
public void writeCursorClose(NetResultSet resultSet,
- Section section) throws org.apache.derby.client.am.SqlException;
+ Section section) throws SqlException;
}
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/StatementRequestInterface.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/StatementRequestInterface.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/StatementRequestInterface.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/StatementRequestInterface.java Sun Apr 14 04:17:07 2013
@@ -50,7 +50,7 @@ public interface StatementRequestInterfa
public void writeExecute(NetPreparedStatement materialPreparedStatement,
Section section,
- org.apache.derby.client.am.ColumnMetaData parameterMetaData,
+ ColumnMetaData parameterMetaData,
Object[] inputs,
int numInputColumns,
boolean outputExpected,
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/Typdef.java Sun Apr 14 04:17:07 2013
@@ -27,6 +27,8 @@ import org.apache.derby.client.am.Cursor
import org.apache.derby.client.am.DisconnectException;
import org.apache.derby.client.am.SignedBinary;
import org.apache.derby.client.am.ClientMessageId;
+import org.apache.derby.client.am.Decimal;
+import org.apache.derby.client.am.FloatingPoint;
import org.apache.derby.shared.common.reference.SQLState;
//
@@ -209,7 +211,7 @@ public class Typdef implements java.lang
/* 0x2D */ 0,
/* 0x2E */ 0,
/* 0x2F */ 0,
- /* 0x30 */ org.apache.derby.client.am.Decimal.PACKED_DECIMAL, /* FDOCA_TYPE_DECIMAL */
+ /* 0x30 */ Decimal.PACKED_DECIMAL, /* FDOCA_TYPE_DECIMAL */
/* 0x31 */ 0,
/* 0x32 */ 0,
/* 0x33 */ 0,
@@ -233,7 +235,7 @@ public class Typdef implements java.lang
/* 0x45 */ 0,
/* 0x46 */ 0,
/* 0x47 */ 0,
- /* 0x48 */ org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT, /* FDOCA_TYPE_FLOAT_IEEE */
+ /* 0x48 */ FloatingPoint.IEEE_754_FLOATING_POINT, /* FDOCA_TYPE_FLOAT_IEEE */
/* 0x49 */ 0,
/* 0x4A */ 0,
/* 0x4B */ 0,
@@ -282,21 +284,21 @@ public class Typdef implements java.lang
/* 0x07 null 1-byte int */
new FdocaSimpleDataArray(0x07, FdocaConstants.FDOCA_TYPE_NINTEGER_BE, SignedBinary.BIG_ENDIAN, NOCCSID, 0, 0, 1, FIXEDLENGTH),
/* 0x08 16-byte bin float */
- new FdocaSimpleDataArray(0x08, FdocaConstants.FDOCA_TYPE_FLOAT_IEEE, org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 0, 16, FIXEDLENGTH),
+ new FdocaSimpleDataArray(0x08, FdocaConstants.FDOCA_TYPE_FLOAT_IEEE, FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 0, 16, FIXEDLENGTH),
/* 0x09 null 16-byte bin float */
- new FdocaSimpleDataArray(0x09, FdocaConstants.FDOCA_TYPE_NFLOAT_IEEE, org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 0, 16, FIXEDLENGTH),
+ new FdocaSimpleDataArray(0x09, FdocaConstants.FDOCA_TYPE_NFLOAT_IEEE, FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 0, 16, FIXEDLENGTH),
/* 0x0A 8-byte bin float */
- new FdocaSimpleDataArray(0x0A, FdocaConstants.FDOCA_TYPE_FLOAT_IEEE, org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 0, 8, FIXEDLENGTH),
+ new FdocaSimpleDataArray(0x0A, FdocaConstants.FDOCA_TYPE_FLOAT_IEEE, FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 0, 8, FIXEDLENGTH),
/* 0x0B null 8-byte bin float */
- new FdocaSimpleDataArray(0x0B, FdocaConstants.FDOCA_TYPE_NFLOAT_IEEE, org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 0, 8, FIXEDLENGTH),
+ new FdocaSimpleDataArray(0x0B, FdocaConstants.FDOCA_TYPE_NFLOAT_IEEE, FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 0, 8, FIXEDLENGTH),
/* 0x0C 4-byte bin float */
- new FdocaSimpleDataArray(0x0C, FdocaConstants.FDOCA_TYPE_FLOAT_IEEE, org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 0, 4, FIXEDLENGTH),
+ new FdocaSimpleDataArray(0x0C, FdocaConstants.FDOCA_TYPE_FLOAT_IEEE, FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 0, 4, FIXEDLENGTH),
/* 0x0D null 4-byte bin float */
- new FdocaSimpleDataArray(0x0D, FdocaConstants.FDOCA_TYPE_NFLOAT_IEEE, org.apache.derby.client.am.FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 0, 4, FIXEDLENGTH),
+ new FdocaSimpleDataArray(0x0D, FdocaConstants.FDOCA_TYPE_NFLOAT_IEEE, FloatingPoint.IEEE_754_FLOATING_POINT, NOCCSID, 0, 0, 4, FIXEDLENGTH),
/* 0x0E Fixed Decimal */
- new FdocaSimpleDataArray(0x0E, FdocaConstants.FDOCA_TYPE_DECIMAL, org.apache.derby.client.am.Decimal.PACKED_DECIMAL, NOCCSID, 0, 0, 31, DECIMALLENGTH),
+ new FdocaSimpleDataArray(0x0E, FdocaConstants.FDOCA_TYPE_DECIMAL, Decimal.PACKED_DECIMAL, NOCCSID, 0, 0, 31, DECIMALLENGTH),
/* 0x0F null Fixed Decimal */
- new FdocaSimpleDataArray(0x0F, FdocaConstants.FDOCA_TYPE_NDECIMAL, org.apache.derby.client.am.Decimal.PACKED_DECIMAL, NOCCSID, 0, 0, 31, DECIMALLENGTH),
+ new FdocaSimpleDataArray(0x0F, FdocaConstants.FDOCA_TYPE_NDECIMAL, Decimal.PACKED_DECIMAL, NOCCSID, 0, 0, 31, DECIMALLENGTH),
/* 0x10 empties */
null,
/* 0x11 empties */
Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSourceRoot.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSourceRoot.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSourceRoot.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSourceRoot.java Sun Apr 14 04:17:07 2013
@@ -38,6 +38,7 @@ import javax.sql.XAConnection;
import org.apache.derby.client.am.ClientMessageId;
import org.apache.derby.client.am.Configuration;
import org.apache.derby.client.am.Connection;
+import org.apache.derby.client.am.EncryptionManager;
import org.apache.derby.client.am.LogWriter;
import org.apache.derby.client.am.SqlException;
import org.apache.derby.client.net.NetConfiguration;
@@ -74,7 +75,7 @@ public abstract class ClientBaseDataSour
// required security algorithms that are needed for EUSRIDPWD An
// exception will be thrown if support is not available in the JCE
// implementation in the JVM in which the client is loaded.
- new org.apache.derby.client.am.EncryptionManager(null);
+ new EncryptionManager(null);
supports_eusridpwd = true;
}catch(Exception e)
{
Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDriver.java Sun Apr 14 04:17:07 2013
@@ -30,7 +30,10 @@ import org.apache.derby.client.am.Utils;
import org.apache.derby.client.am.Version;
import org.apache.derby.client.am.ClientJDBCObjectFactory;
import org.apache.derby.client.am.ClientMessageId;
+import org.apache.derby.client.am.LogWriter;
import org.apache.derby.client.net.ClientJDBCObjectFactoryImpl;
+import org.apache.derby.client.net.NetConnection;
+import org.apache.derby.client.net.NetLogWriter;
import org.apache.derby.shared.common.reference.Attribute;
import org.apache.derby.shared.common.reference.SQLState;
import org.apache.derby.shared.common.reference.MessageId;
@@ -93,7 +96,7 @@ public class ClientDriver implements jav
public java.sql.Connection connect(String url,
java.util.Properties properties) throws java.sql.SQLException {
- org.apache.derby.client.net.NetConnection conn;
+ NetConnection conn;
checkURLNotNull( url );
@@ -151,7 +154,7 @@ public class ClientDriver implements jav
// driver-wide basis using the jdbc 1 driver manager log writer.
// This log writer may be narrowed to the connection-level
// This log writer will be passed to the agent constructor.
- org.apache.derby.client.am.LogWriter dncLogWriter =
+ LogWriter dncLogWriter =
ClientBaseDataSourceRoot.computeDncLogWriterForNewConnection(
java.sql.DriverManager.getLogWriter(),
ClientBaseDataSourceRoot.getTraceDirectory(
@@ -165,8 +168,8 @@ public class ClientDriver implements jav
traceFileSuffixIndex_++);
- conn = (org.apache.derby.client.net.NetConnection)getFactory().
- newNetConnection((org.apache.derby.client.net.NetLogWriter)
+ conn = (NetConnection)getFactory().
+ newNetConnection((NetLogWriter)
dncLogWriter,
java.sql.DriverManager.getLoginTimeout(),
server,