You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2007/03/17 12:43:30 UTC
svn commit: r519292 - in /jakarta/httpcomponents/httpclient/trunk/src:
java/org/apache/http/impl/client/ java/org/apache/http/impl/conn/
test/org/apache/http/client/ test/org/apache/http/conn/
test/org/apache/http/conn/ssl/ test/org/apache/http/cookie/...
Author: olegk
Date: Sat Mar 17 04:43:29 2007
New Revision: 519292
URL: http://svn.apache.org/viewvc?view=rev&rev=519292
Log:
Removed unused imports
Modified:
jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultHttpClient.java
jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/SingleClientConnManager.java
jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/client/TestAll.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestAllSSL.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestHostnameVerifier.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestSSLSocketFactory.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestAllCookie.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestCookiePolicy.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/client/TestAllHttpClientImpl.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/conn/TestAllConnImpl.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/conn/TestLocalServer.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestAbstractCookieSpec.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestAllCookieImpl.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestBasicCookieAttribHandlers.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestBrowserCompatSpec.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/EchoHandler.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/LocalTestServer.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/RandomHandler.java
jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/ServerTestBase.java
Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java Sat Mar 17 04:43:29 2007
@@ -33,25 +33,24 @@
import java.io.IOException;
-import org.apache.http.HttpVersion;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpException;
import org.apache.http.ConnectionReuseStrategy;
import org.apache.http.HttpEntity;
-import org.apache.http.entity.BasicHttpEntity;
+import org.apache.http.HttpException;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpVersion;
+import org.apache.http.client.ClientRequestDirector;
+import org.apache.http.client.RoutedRequest;
+import org.apache.http.conn.BasicManagedEntity;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.HttpRoute;
+import org.apache.http.conn.ManagedClientConnection;
+import org.apache.http.conn.RouteDirector;
import org.apache.http.message.BasicHttpRequest;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpRequestExecutor;
import org.apache.http.protocol.HttpExecutionContext;
-import org.apache.http.conn.HttpRoute;
-import org.apache.http.conn.RouteDirector;
-import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.conn.ManagedClientConnection;
-import org.apache.http.conn.BasicManagedEntity;
-import org.apache.http.client.RoutedRequest;
-import org.apache.http.client.ClientRequestDirector;
+import org.apache.http.protocol.HttpRequestExecutor;
Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultHttpClient.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultHttpClient.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultHttpClient.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/client/DefaultHttpClient.java Sat Mar 17 04:43:29 2007
@@ -33,24 +33,22 @@
import java.io.IOException;
+import org.apache.http.ConnectionReuseStrategy;
+import org.apache.http.HttpException;
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
-import org.apache.http.HttpException;
-import org.apache.http.ConnectionReuseStrategy;
+import org.apache.http.client.ClientRequestDirector;
+import org.apache.http.client.RoutedRequest;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.conn.HttpRoute;
+import org.apache.http.conn.Scheme;
+import org.apache.http.conn.SchemeRegistry;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.BasicHttpProcessor;
+import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestExecutor;
-import org.apache.http.conn.HttpRoute;
-import org.apache.http.conn.Scheme;
-import org.apache.http.conn.SchemeRegistry;
-import org.apache.http.conn.ClientConnectionManager;
-
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.RoutedRequest;
-import org.apache.http.client.ClientRequestDirector;
Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/SingleClientConnManager.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/SingleClientConnManager.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/SingleClientConnManager.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/SingleClientConnManager.java Sat Mar 17 04:43:29 2007
@@ -32,31 +32,17 @@
package org.apache.http.impl.conn;
import java.io.IOException;
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.WeakHashMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.http.HttpHost;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.ClientConnectionOperator;
-import org.apache.http.conn.ConnectionPoolTimeoutException;
-import org.apache.http.conn.SchemeRegistry;
import org.apache.http.conn.HttpRoute;
-import org.apache.http.conn.RouteTracker;
import org.apache.http.conn.ManagedClientConnection;
import org.apache.http.conn.OperatedClientConnection;
-import org.apache.http.conn.params.HttpConnectionManagerParams;
+import org.apache.http.conn.SchemeRegistry;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.HttpContext;
Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/ThreadSafeClientConnManager.java Sat Mar 17 04:43:29 2007
@@ -43,20 +43,17 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.http.HttpHost;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.ClientConnectionOperator;
import org.apache.http.conn.ConnectionPoolTimeoutException;
-import org.apache.http.conn.SchemeRegistry;
-import org.apache.http.conn.HttpRoute;
-import org.apache.http.conn.RouteTracker;
import org.apache.http.conn.HostConfiguration;
+import org.apache.http.conn.HttpRoute;
import org.apache.http.conn.ManagedClientConnection;
import org.apache.http.conn.OperatedClientConnection;
+import org.apache.http.conn.SchemeRegistry;
import org.apache.http.conn.params.HttpConnectionManagerParams;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
-import org.apache.http.protocol.HttpContext;
/**
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/client/TestAll.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/client/TestAll.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/client/TestAll.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/client/TestAll.java Sat Mar 17 04:43:29 2007
@@ -30,13 +30,15 @@
package org.apache.http.client;
-import org.apache.http.cookie.TestAllCookie;
-import org.apache.http.impl.cookie.TestAllCookieImpl;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
import org.apache.http.conn.ssl.TestAllSSL;
+import org.apache.http.cookie.TestAllCookie;
import org.apache.http.impl.client.TestAllHttpClientImpl;
import org.apache.http.impl.conn.TestAllConnImpl;
-
-import junit.framework.*;
+import org.apache.http.impl.cookie.TestAllCookieImpl;
public class TestAll extends TestCase {
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java Sat Mar 17 04:43:29 2007
@@ -33,12 +33,12 @@
import java.util.Iterator;
-import org.apache.http.HttpHost;
-import org.apache.http.conn.ssl.SSLSocketFactory;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+
+import org.apache.http.HttpHost;
+import org.apache.http.conn.ssl.SSLSocketFactory;
/**
* Unit tests for {@link Scheme} and {@link SchemeRegistry}.
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestAllSSL.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestAllSSL.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestAllSSL.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestAllSSL.java Sat Mar 17 04:43:29 2007
@@ -30,7 +30,9 @@
package org.apache.http.conn.ssl;
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
public class TestAllSSL extends TestCase {
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestHostnameVerifier.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestHostnameVerifier.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestHostnameVerifier.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestHostnameVerifier.java Sat Mar 17 04:43:29 2007
@@ -31,15 +31,16 @@
package org.apache.http.conn.ssl;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import javax.net.ssl.SSLException;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
+
+import javax.net.ssl.SSLException;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
/**
* Unit tests for {@link HostnameVerifier}.
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestSSLSocketFactory.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestSSLSocketFactory.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/ssl/TestSSLSocketFactory.java Sat Mar 17 04:43:29 2007
@@ -31,14 +31,6 @@
package org.apache.http.conn.ssl;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpParams;
-
-import javax.net.ServerSocketFactory;
-import javax.net.ssl.SSLServerSocketFactory;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
@@ -54,6 +46,16 @@
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.security.spec.RSAPrivateCrtKeySpec;
+
+import javax.net.ServerSocketFactory;
+import javax.net.ssl.SSLServerSocketFactory;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpParams;
/**
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestAllCookie.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestAllCookie.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestAllCookie.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestAllCookie.java Sat Mar 17 04:43:29 2007
@@ -30,7 +30,9 @@
package org.apache.http.cookie;
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
public class TestAllCookie extends TestCase {
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestCookiePolicy.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestCookiePolicy.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestCookiePolicy.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/cookie/TestCookiePolicy.java Sat Mar 17 04:43:29 2007
@@ -30,17 +30,17 @@
package org.apache.http.cookie;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.http.cookie.params.CookieSpecParams;
import org.apache.http.impl.cookie.BrowserCompatSpec;
import org.apache.http.impl.cookie.BrowserCompatSpecFactory;
import org.apache.http.impl.cookie.NetscapeDraftSpecFactory;
import org.apache.http.impl.cookie.RFC2109SpecFactory;
-import org.apache.http.cookie.params.CookieSpecParams;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test cases for {@link CookiePolicy}.
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/client/TestAllHttpClientImpl.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/client/TestAllHttpClientImpl.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/client/TestAllHttpClientImpl.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/client/TestAllHttpClientImpl.java Sat Mar 17 04:43:29 2007
@@ -30,7 +30,9 @@
package org.apache.http.impl.client;
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
public class TestAllHttpClientImpl extends TestCase {
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/conn/TestAllConnImpl.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/conn/TestAllConnImpl.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/conn/TestAllConnImpl.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/conn/TestAllConnImpl.java Sat Mar 17 04:43:29 2007
@@ -30,7 +30,9 @@
package org.apache.http.impl.conn;
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
public class TestAllConnImpl extends TestCase {
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/conn/TestLocalServer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/conn/TestLocalServer.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/conn/TestLocalServer.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/conn/TestLocalServer.java Sat Mar 17 04:43:29 2007
@@ -30,22 +30,19 @@
package org.apache.http.impl.conn;
-import java.net.Socket;
-
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.http.HttpClientConnection;
import org.apache.http.HttpHost;
-import org.apache.http.HttpStatus;
-import org.apache.http.HttpVersion;
-import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
-import org.apache.http.HttpClientConnection;
+import org.apache.http.HttpStatus;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.localserver.LocalTestServer;
+import org.apache.http.localserver.ServerTestBase;
import org.apache.http.message.HttpGet;
import org.apache.http.message.HttpPost;
-import org.apache.http.entity.StringEntity;
import org.apache.http.util.EntityUtils;
-
-import org.apache.http.localserver.ServerTestBase;
/**
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestAbstractCookieSpec.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestAbstractCookieSpec.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestAbstractCookieSpec.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestAbstractCookieSpec.java Sat Mar 17 04:43:29 2007
@@ -33,15 +33,15 @@
import java.io.IOException;
import java.util.Iterator;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
import org.apache.http.Header;
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieAttributeHandler;
import org.apache.http.cookie.CookieOrigin;
import org.apache.http.cookie.MalformedCookieException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class TestAbstractCookieSpec extends TestCase {
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestAllCookieImpl.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestAllCookieImpl.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestAllCookieImpl.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestAllCookieImpl.java Sat Mar 17 04:43:29 2007
@@ -30,7 +30,9 @@
package org.apache.http.impl.cookie;
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
public class TestAllCookieImpl extends TestCase {
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestBasicCookieAttribHandlers.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestBasicCookieAttribHandlers.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestBasicCookieAttribHandlers.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestBasicCookieAttribHandlers.java Sat Mar 17 04:43:29 2007
@@ -34,15 +34,15 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieAttributeHandler;
import org.apache.http.cookie.CookieOrigin;
import org.apache.http.cookie.MalformedCookieException;
import org.apache.http.util.DateUtils;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
public class TestBasicCookieAttribHandlers extends TestCase {
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestBrowserCompatSpec.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestBrowserCompatSpec.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestBrowserCompatSpec.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestBrowserCompatSpec.java Sat Mar 17 04:43:29 2007
@@ -32,6 +32,10 @@
import java.util.Date;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
import org.apache.http.Header;
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieOrigin;
@@ -39,10 +43,6 @@
import org.apache.http.cookie.MalformedCookieException;
import org.apache.http.message.BasicHeader;
import org.apache.http.util.DateUtils;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test cases for BrowserCompatSpec
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java Sat Mar 17 04:43:29 2007
@@ -30,16 +30,16 @@
package org.apache.http.impl.cookie;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
import org.apache.http.Header;
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieOrigin;
import org.apache.http.cookie.CookieSpec;
import org.apache.http.cookie.MalformedCookieException;
import org.apache.http.message.BasicHeader;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test cases for Netscape cookie draft
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java Sat Mar 17 04:43:29 2007
@@ -30,6 +30,10 @@
package org.apache.http.impl.cookie;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
import org.apache.http.Header;
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieOrigin;
@@ -37,10 +41,6 @@
import org.apache.http.cookie.MalformedCookieException;
import org.apache.http.message.BasicHeader;
import org.apache.http.util.DateUtils;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* Test cases for RFC2109 cookie spec
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/EchoHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/EchoHandler.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/EchoHandler.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/EchoHandler.java Sat Mar 17 04:43:29 2007
@@ -41,7 +41,6 @@
import org.apache.http.HttpStatus;
import org.apache.http.MethodNotSupportedException;
import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.entity.StringEntity;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestHandler;
import org.apache.http.util.EntityUtils;
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/LocalTestServer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/LocalTestServer.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/LocalTestServer.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/LocalTestServer.java Sat Mar 17 04:43:29 2007
@@ -31,31 +31,17 @@
package org.apache.http.localserver;
-import java.io.File;
import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.Socket;
-import java.net.ServerSocket;
import java.net.InetSocketAddress;
-import java.net.BindException;
-import java.util.Set;
-import java.util.HashSet;
+import java.net.ServerSocket;
+import java.net.Socket;
import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.http.ConnectionReuseStrategy;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpException;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
import org.apache.http.HttpServerConnection;
-import org.apache.http.HttpStatus;
-import org.apache.http.MethodNotSupportedException;
-import org.apache.http.entity.ContentProducer;
-import org.apache.http.entity.EntityTemplate;
-import org.apache.http.entity.FileEntity;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
import org.apache.http.impl.DefaultHttpServerConnection;
@@ -73,7 +59,6 @@
import org.apache.http.protocol.ResponseContent;
import org.apache.http.protocol.ResponseDate;
import org.apache.http.protocol.ResponseServer;
-import org.apache.http.util.EntityUtils;
/**
* Local HTTP server for tests that require one.
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/RandomHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/RandomHandler.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/RandomHandler.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/RandomHandler.java Sat Mar 17 04:43:29 2007
@@ -31,13 +31,11 @@
package org.apache.http.localserver;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
@@ -46,7 +44,6 @@
import org.apache.http.entity.AbstractHttpEntity;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.util.EntityUtils;
Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/ServerTestBase.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/ServerTestBase.java?view=diff&rev=519292&r1=519291&r2=519292
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/ServerTestBase.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/localserver/ServerTestBase.java Sat Mar 17 04:43:29 2007
@@ -32,25 +32,23 @@
import java.net.Socket;
-import junit.framework.*;
+import junit.framework.TestCase;
import org.apache.http.HttpHost;
import org.apache.http.HttpVersion;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
+import org.apache.http.conn.PlainSocketFactory;
+import org.apache.http.conn.Scheme;
+import org.apache.http.conn.SchemeRegistry;
+import org.apache.http.conn.SocketFactory;
+import org.apache.http.impl.DefaultHttpClientConnection;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
-import org.apache.http.params.BasicHttpParams;
import org.apache.http.protocol.BasicHttpProcessor;
+import org.apache.http.protocol.HttpExecutionContext;
+import org.apache.http.protocol.HttpRequestExecutor;
import org.apache.http.protocol.RequestConnControl;
import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.HttpRequestExecutor;
-import org.apache.http.protocol.HttpExecutionContext;
-import org.apache.http.impl.DefaultHttpClientConnection;
-import org.apache.http.conn.Scheme;
-import org.apache.http.conn.SchemeRegistry;
-import org.apache.http.conn.SocketFactory;
-import org.apache.http.conn.PlainSocketFactory;
/**