db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1363662 - in /db/derby/code/trunk/java/drda/org/apache/derby: drda/ impl/drda/
Date Fri, 20 Jul 2012 06:13:52 GMT
Author: kahatlen
Date: Fri Jul 20 06:13:51 2012
New Revision: 1363662

URL: http://svn.apache.org/viewvc?rev=1363662&view=rev
Log:
DERBY-436: Clean up imports and static field references in DRDA classes

Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java
    db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssTrace.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAReaderInputStream.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/FdocaConstants.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/LayerBStreamedEXTDTAReaderInputStream.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NaiveTrustManager.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/XADatabase.java

Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/NetServlet.java Fri Jul 20 06:13:51
2012
@@ -21,19 +21,22 @@
 
 package org.apache.derby.drda;
 
-import java.io.*;
-import java.util.*;
-
-import java.net.*;
-
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.InetAddress;
 import java.security.AccessController;
 import java.security.PrivilegedExceptionAction;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import org.apache.derby.iapi.tools.i18n.LocalizedResource;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.iapi.tools.i18n.LocalizedResource;
 
 /**
 	This servlet can be used to start Derby Network Server from a remote location.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java Fri Jul
20 06:13:51 2012
@@ -22,8 +22,8 @@
 package org.apache.derby.drda;
 
 import java.io.PrintWriter;
-import java.net.InetAddress;
 import java.net.Inet6Address;
+import java.net.InetAddress;
 import java.net.URL;
 import java.security.AccessController;
 import java.security.PrivilegedExceptionAction;
@@ -31,7 +31,6 @@ import java.util.Properties;
 import org.apache.derby.iapi.reference.Property;
 import org.apache.derby.iapi.services.info.JVMInfo;
 import org.apache.derby.iapi.services.property.PropertyUtil;
-
 import org.apache.derby.impl.drda.NetworkServerControlImpl;
 
 /** 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java Fri Jul 20
06:13:51 2012
@@ -20,9 +20,9 @@
  */
 
 package org.apache.derby.impl.drda;
-import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.reference.DRDAConstants;
 import org.apache.derby.iapi.reference.Limits;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 
 /**
 	AppRequester stores information about the application requester.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java Fri Jul 20
06:13:51 2012
@@ -21,9 +21,12 @@
 
 package org.apache.derby.impl.drda;
 
-import java.io.*;
-import java.net.*;
-import java.security.*;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
 
 final class ClientThread extends Thread {
 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java Fri Jul 20 06:13:51
2012
@@ -20,12 +20,13 @@
  */
 
 package org.apache.derby.impl.drda;
-import org.apache.derby.iapi.services.sanity.SanityManager;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
 import java.math.BigDecimal;
+import org.apache.derby.iapi.services.sanity.SanityManager;
 
 /**
 	The DDMReader is used to read DRDA protocol.   DRDA Protocol is divided into

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java Fri Jul 20 06:13:51
2012
@@ -35,12 +35,11 @@ import java.nio.charset.CodingErrorActio
 import java.sql.DataTruncation;
 import java.sql.SQLException;
 import java.util.Arrays;
-
 import org.apache.derby.iapi.reference.DRDAConstants;
 import org.apache.derby.iapi.reference.Property;
+import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
 import org.apache.derby.iapi.services.property.PropertyUtil;
 import org.apache.derby.iapi.services.sanity.SanityManager;
-import org.apache.derby.iapi.services.io.DynamicByteArrayOutputStream;
 
 /**
 	The DDMWriter is used to write DRDA protocol.   The DRDA Protocol is

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java Fri Jul 20
06:13:51 2012
@@ -26,7 +26,6 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.ArrayList;
-
 import org.apache.derby.iapi.jdbc.EngineResultSet;
 
 /**

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java Fri Jul 20
06:13:51 2012
@@ -22,12 +22,12 @@
 package org.apache.derby.impl.drda;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 import java.math.BigInteger;
 import java.sql.CallableStatement;
 import java.sql.Connection;
+import java.sql.DataTruncation;
 import java.sql.ParameterMetaData;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -35,13 +35,6 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Hashtable;
-import java.util.StringTokenizer;
-import java.util.Vector;
-import java.lang.reflect.Array;
-
-import java.sql.DataTruncation;
-import org.apache.derby.iapi.jdbc.BrokeredConnection;
-import org.apache.derby.iapi.jdbc.BrokeredPreparedStatement;
 import org.apache.derby.iapi.jdbc.EnginePreparedStatement;
 import org.apache.derby.iapi.jdbc.EngineResultSet;
 import org.apache.derby.iapi.reference.JDBC30Translation;

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java Fri Jul 20
06:13:51 2012
@@ -20,11 +20,14 @@
  */
 
 package org.apache.derby.impl.drda;
+
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
 import org.apache.derby.iapi.jdbc.ResourceAdapter;
 import org.apache.derby.iapi.services.monitor.Monitor;
 import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.store.access.xa.XAXactId;
-import javax.transaction.xa.*;
 import org.apache.derby.shared.common.reference.MessageId;
 
 /**
@@ -246,7 +249,7 @@ class DRDAXAProtocol {
 												throws DRDAProtocolException
 	{
 		XAResource xaResource = getXAResource();
-		int xaRetVal = xaResource.XA_OK;
+		int xaRetVal = XAResource.XA_OK;
 
 		try {
 			if (xid.getFormatId() == -1 && xaTimeout != -1) {
@@ -340,7 +343,7 @@ class DRDAXAProtocol {
 	private void commitXATransaction(Xid xid, int xaflags) throws DRDAProtocolException
 	{
 		XAResource xaResource = getXAResource();
-		int xaRetVal = xaResource.XA_OK;
+		int xaRetVal = XAResource.XA_OK;
 		// check this
 		boolean isOnePhase = (xaflags & XAResource.TMONEPHASE) != 0;
 		try {
@@ -412,7 +415,7 @@ class DRDAXAProtocol {
 	private void rollbackXATransaction(Xid xid, boolean sendSYNCCRD) throws DRDAProtocolException
 	{
 		XAResource xaResource = getXAResource();
-		int xaRetVal = xaResource.XA_OK;
+		int xaRetVal = XAResource.XA_OK;
 
 		try {
 			xaResource.rollback(xid);
@@ -440,7 +443,7 @@ class DRDAXAProtocol {
 	private void endXA(Xid xid, int xaflags) throws DRDAProtocolException
 	{
 		XAResource xaResource = getXAResource();		
-		int xaRetVal = xaResource.XA_OK;
+		int xaRetVal = XAResource.XA_OK;
 
 		try {
 			xaResource.end(xid,xaflags);
@@ -469,7 +472,7 @@ class DRDAXAProtocol {
 	private void prepareXATransaction(Xid xid) throws DRDAProtocolException
 	{
 		XAResource xaResource = getXAResource();
-		int xaRetVal = xaResource.XA_OK;
+		int xaRetVal;
 
 		try {
 			xaRetVal = xaResource.prepare(xid);
@@ -495,7 +498,7 @@ class DRDAXAProtocol {
 	private void forgetXATransaction(Xid xid) throws DRDAProtocolException
 	{
 		XAResource xaResource = getXAResource();
-		int xaRetVal = xaResource.XA_OK;
+		int xaRetVal = XAResource.XA_OK;
 
 		try {
 			xaResource.forget(xid);
@@ -526,7 +529,7 @@ class DRDAXAProtocol {
 	private void recoverXA(int xaflags) throws DRDAProtocolException
 	{
 		XAResource xaResource = getXAResource();
-		int xaRetVal = xaResource.XA_OK;
+		int xaRetVal = XAResource.XA_OK;
 		Xid[] indoubtXids = null;
 		try {
 			indoubtXids = xaResource.recover(xaflags);

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java Fri Jul 20 06:13:51
2012
@@ -21,20 +21,14 @@
 
 package org.apache.derby.impl.drda;
 
-import java.sql.Connection;
-import java.sql.Driver;
-import java.sql.PreparedStatement;
-import java.sql.Statement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Hashtable;
 import java.util.Enumeration;
+import java.util.Hashtable;
 import java.util.Properties;
-
 import org.apache.derby.iapi.jdbc.EngineConnection;
 import org.apache.derby.iapi.reference.Attribute;
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
-import org.apache.derby.iapi.services.sanity.SanityManager;
 
 /**
 	Database stores information about the current database

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java Fri Jul
20 06:13:51 2012
@@ -21,21 +21,20 @@
 
 package org.apache.derby.impl.drda;
 
-import java.security.KeyPairGenerator;
+import java.math.BigInteger;
+import java.security.KeyFactory;
 import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.PublicKey;
+import java.security.spec.AlgorithmParameterSpec;
+import java.sql.SQLException;
+import javax.crypto.Cipher;
 import javax.crypto.KeyAgreement;
-import javax.crypto.spec.DHParameterSpec;
 import javax.crypto.interfaces.DHPublicKey;
+import javax.crypto.spec.DHParameterSpec;
 import javax.crypto.spec.DHPublicKeySpec;
-import javax.crypto.spec.SecretKeySpec;
-import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.KeyFactory;
-import java.security.PublicKey;
-import java.sql.SQLException;
-import java.math.BigInteger;
-import org.apache.derby.shared.common.sanity.SanityManager;
+import javax.crypto.spec.SecretKeySpec;
 
 /**
  * This class is used to decrypt password and/or userid.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssTrace.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssTrace.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssTrace.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DssTrace.java Fri Jul 20 06:13:51
2012
@@ -24,7 +24,6 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.security.AccessControlException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java Fri Jul
20 06:13:51 2012
@@ -20,16 +20,15 @@
  */
 package org.apache.derby.impl.drda;
 
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.BufferedInputStream;
 import java.io.Reader;
-import java.sql.CallableStatement;
-import java.sql.ResultSet;
 import java.sql.Blob;
+import java.sql.CallableStatement;
 import java.sql.Clob;
+import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.derby.iapi.jdbc.EngineResultSet;
 import org.apache.derby.iapi.reference.DRDAConstants;
 import org.apache.derby.iapi.services.sanity.SanityManager;

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAReaderInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAReaderInputStream.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAReaderInputStream.java
(original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAReaderInputStream.java
Fri Jul 20 06:13:51 2012
@@ -23,7 +23,6 @@ package org.apache.derby.impl.drda;
 import java.io.IOException;
 import java.io.InputStream;
 import org.apache.derby.iapi.reference.DRDAConstants;
-
 import org.apache.derby.iapi.reference.SQLState;
 import org.apache.derby.iapi.services.i18n.MessageService;
 import org.apache.derby.iapi.services.io.DerbyIOException;

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/FdocaConstants.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/FdocaConstants.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/FdocaConstants.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/FdocaConstants.java Fri Jul 20
06:13:51 2012
@@ -20,9 +20,9 @@
  */
 package org.apache.derby.impl.drda;
 
+import java.sql.SQLException;
 import java.sql.Types;
 import org.apache.derby.iapi.reference.DRDAConstants;
-import java.sql.SQLException;
 import org.apache.derby.iapi.reference.Limits;
 
 class FdocaConstants

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/LayerBStreamedEXTDTAReaderInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/LayerBStreamedEXTDTAReaderInputStream.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/LayerBStreamedEXTDTAReaderInputStream.java
(original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/LayerBStreamedEXTDTAReaderInputStream.java
Fri Jul 20 06:13:51 2012
@@ -19,9 +19,10 @@
    under the License.
 */
 package org.apache.derby.impl.drda;
-import java.io.InputStream;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * Implementation of InputStream which get EXTDTA from the DDMReader.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NaiveTrustManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NaiveTrustManager.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NaiveTrustManager.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NaiveTrustManager.java Fri Jul
20 06:13:51 2012
@@ -22,14 +22,14 @@
 package org.apache.derby.impl.drda;
 
 import java.io.FileInputStream;
+import java.security.KeyStore;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
 import javax.net.SocketFactory;
+import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
-import javax.net.ssl.KeyManagerFactory;
-import java.security.KeyStore;
-import java.security.cert.X509Certificate;
-import java.security.cert.CertificateException;
 import org.apache.derby.iapi.services.property.PropertyUtil;
 
 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
(original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Fri Jul 20 06:13:51 2012
@@ -33,17 +33,11 @@ import java.io.PrintWriter;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
-import javax.net.SocketFactory;
-import javax.net.ServerSocketFactory;
-import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.SSLServerSocketFactory;
 import java.net.UnknownHostException;
 import java.nio.charset.Charset;
-import java.security.Permission;
-import java.security.AccessController;
 import java.security.AccessControlException;
+import java.security.AccessController;
+import java.security.Permission;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
@@ -58,13 +52,19 @@ import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.Vector;
 import java.util.concurrent.atomic.AtomicInteger;
-
+import javax.net.ServerSocketFactory;
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
 import org.apache.derby.drda.NetworkServerControl;
-import org.apache.derby.security.SystemPermission;
 import org.apache.derby.iapi.error.StandardException;
+import org.apache.derby.iapi.jdbc.AuthenticationService;
 import org.apache.derby.iapi.jdbc.DRDAServerStarter;
 import org.apache.derby.iapi.reference.Attribute;
 import org.apache.derby.iapi.reference.DRDAConstants;
+import org.apache.derby.iapi.reference.MessageId;
 import org.apache.derby.iapi.reference.Module;
 import org.apache.derby.iapi.reference.Property;
 import org.apache.derby.iapi.reference.SQLState;
@@ -81,10 +81,9 @@ import org.apache.derby.iapi.tools.i18n.
 import org.apache.derby.iapi.util.StringUtil;
 import org.apache.derby.impl.jdbc.EmbedSQLException;
 import org.apache.derby.impl.jdbc.Util;
-import org.apache.derby.iapi.jdbc.AuthenticationService;
-import org.apache.derby.iapi.reference.MessageId;
 import org.apache.derby.mbeans.VersionMBean;
 import org.apache.derby.mbeans.drda.NetworkServerMBean;
+import org.apache.derby.security.SystemPermission;
 
 /** 
 	

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java Fri
Jul 20 06:13:51 2012
@@ -23,13 +23,12 @@ package org.apache.derby.impl.drda;
 
 import java.security.AccessControlException;
 import java.security.AccessController;
-
-import org.apache.derby.mbeans.drda.NetworkServerMBean;
-import org.apache.derby.security.SystemPermission;
+import org.apache.derby.drda.NetworkServerControl;
 import org.apache.derby.iapi.reference.Property;
 import org.apache.derby.iapi.services.monitor.Monitor;
-import org.apache.derby.drda.NetworkServerControl;
 import org.apache.derby.iapi.services.property.PropertyUtil;
+import org.apache.derby.mbeans.drda.NetworkServerMBean;
+import org.apache.derby.security.SystemPermission;
 
 /**
  * <p>

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java Fri
Jul 20 06:13:51 2012
@@ -20,16 +20,12 @@ limitations under the License.
 */
 package org.apache.derby.impl.drda;
 
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.OutputStreamWriter;
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
-
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import org.apache.derby.iapi.services.sanity.SanityManager;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
 
 /**
  *

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/SQLTypes.java Fri Jul 20 06:13:51
2012
@@ -21,12 +21,10 @@
 
 package org.apache.derby.impl.drda;
 
-import java.sql.Types;
 import java.sql.SQLException;
+import java.sql.Types;
 import org.apache.derby.iapi.reference.DRDAConstants;
 
-
-
 class SQLTypes {
 
   // define final statics for the fdoca type codes here!!!

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java?rev=1363662&r1=1363661&r2=1363662&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Session.java Fri Jul 20 06:13:51
2012
@@ -25,10 +25,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
+import java.sql.SQLException;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
-import java.sql.SQLException;
 
 /**
 	Session stores information about the current session

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=1363662&r1=1363661&r2=1363662&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 Fri Jul 20 06:13:51
2012
@@ -21,22 +21,13 @@
 
 package org.apache.derby.impl.drda;
 
-import java.sql.Connection;
 import java.sql.SQLException;
-
-import javax.transaction.xa.XAResource;
-import javax.sql.XADataSource;
-import javax.sql.XAConnection;
-
-import java.util.Hashtable;
 import java.util.Properties;
-import java.util.Enumeration;
-
-
-import org.apache.derby.jdbc.EmbeddedXADataSource;
-import org.apache.derby.iapi.jdbc.BrokeredConnection;
+import javax.sql.XAConnection;
+import javax.transaction.xa.XAResource;
 import org.apache.derby.iapi.jdbc.EngineConnection;
 import org.apache.derby.iapi.jdbc.ResourceAdapter;
+import org.apache.derby.jdbc.EmbeddedXADataSource;
 
 /**
  * This class contains database state specific to XA,



Mime
View raw message