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/05/10 08:26:14 UTC
svn commit: r1480892 [2/2] - in
/db/derby/code/trunk/java/client/org/apache/derby: client/ client/am/
client/net/ jdbc/
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=1480892&r1=1480891&r2=1480892&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 Fri May 10 06:26:13 2013
@@ -38,9 +38,6 @@ import java.util.StringTokenizer;
import javax.sql.PooledConnection;
import javax.sql.XAConnection;
import org.apache.derby.client.am.ClientMessageId;
-import org.apache.derby.client.am.Configuration;
-import org.apache.derby.client.am.ClientConnection;
-import org.apache.derby.client.am.EncryptionManager;
import org.apache.derby.client.am.EncryptionManager;
import org.apache.derby.client.am.LogWriter;
import org.apache.derby.client.am.SqlException;
@@ -58,20 +55,8 @@ public abstract class ClientBaseDataSour
private static final long serialVersionUID = -7660172643035173693L;
- // Spec requires DH algorithm with 32bytes prime to be used
- // Not all JCE implementations have support for this. E.g.
- // Sun JCE does not support DH(prime of 32bytes).
- // store information if client JVM has JCE loaded that
- // can support the necessary algorithms required for EUSRIDPWD
- // (encrypted userid and password) security mechanism
- // this information is needed to decide if security mechanism
- // can be upgraded to EUSRIDPWD or not
- // See getUpgradedSecurityMechanism()
- static final boolean SUPPORTS_EUSRIDPWD;
-
static
{
- boolean supports_eusridpwd = false;
try
{
// The EncryptionManager class will instantiate objects of the
@@ -79,15 +64,11 @@ public abstract class ClientBaseDataSour
// exception will be thrown if support is not available in the JCE
// implementation in the JVM in which the client is loaded.
new EncryptionManager(null);
- supports_eusridpwd = true;
}catch(Exception e)
{
// if an exception is thrown, ignore exception.
- // set SUPPORTS_EUSRIDPWD to false indicating that the client
- // does not support EUSRIDPWD security mechanism
}
- SUPPORTS_EUSRIDPWD = supports_eusridpwd;
}
// The loginTimeout jdbc 2 data source property is not supported as a jdbc
@@ -1000,7 +981,7 @@ public abstract class ClientBaseDataSour
* @param properties jdbc url properties
* @return value of traceLevel property
*/
- public static int getTraceLevel(Properties properties) {
+ static int getTraceLevel(Properties properties) {
String traceLevelString;
traceLevelString =
readSystemProperty(Attribute.CLIENT_JVM_PROPERTY_PREFIX +
Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java?rev=1480892&r1=1480891&r2=1480892&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientConnectionPoolDataSource.java Fri May 10 06:26:13 2013
@@ -24,10 +24,7 @@ package org.apache.derby.jdbc;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.sql.SQLException;
-import javax.sql.ConnectionPoolDataSource;
import javax.sql.PooledConnection;
-import org.apache.derby.client.am.LogWriter;
-import org.apache.derby.client.am.SqlException;
import org.apache.derby.shared.common.i18n.MessageUtil;
import org.apache.derby.shared.common.reference.MessageId;
Modified: db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java?rev=1480892&r1=1480891&r2=1480892&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientXADataSource.java Fri May 10 06:26:13 2013
@@ -23,9 +23,6 @@ package org.apache.derby.jdbc;
import java.sql.SQLException;
import javax.sql.XAConnection;
-import org.apache.derby.client.am.LogWriter;
-import org.apache.derby.client.am.SqlException;
-import org.apache.derby.client.net.NetLogWriter;
/**
* This datasource is suitable for a client/server use of Derby,