Jetty9 - Reorganized new jetty-client classes.

jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java

@@ -374,7 +374,7 @@ public class HttpClient extends AggregateLifeCycle
         {
             case 302:
             case 303:
-                return new RedirectionListener(this);
+                return new RedirectionProtocolListener(this);
         }
 
         return null;

jetty-client/src/main/java/org/eclipse/jetty/client/HttpContentResponse.java

@@ -3,6 +3,7 @@ package org.eclipse.jetty.client;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
+import org.eclipse.jetty.client.util.BufferingResponseListener;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpVersion;
 

jetty-client/src/main/java/org/eclipse/jetty/client/HttpRequest.java

@@ -23,6 +23,7 @@ import org.eclipse.jetty.client.api.ContentProvider;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
+import org.eclipse.jetty.client.util.BufferingResponseListener;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpMethod;

jetty-client/src/main/java/org/eclipse/jetty/client/RedirectionProtocolListener.java

@@ -5,11 +5,11 @@ import java.net.URI;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
 
-public class RedirectionListener extends Response.Listener.Adapter
+public class RedirectionProtocolListener extends Response.Listener.Adapter
 {
     private final HttpClient client;
 
-    public RedirectionListener(HttpClient client)
+    public RedirectionProtocolListener(HttpClient client)
     {
         this.client = client;
     }

jetty-client/src/main/java/org/eclipse/jetty/client/api/Address.java

@@ -1,91 +0,0 @@
-// ========================================================================
-// Copyright (c) 2008-2012 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at
-// http://www.eclipse.org/legal/epl-v10.html
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses.
-// ========================================================================
-
-package org.eclipse.jetty.client.api;
-
-import java.net.InetSocketAddress;
-
-/**
- * @version $Revision: 4135 $ $Date: 2008-12-02 11:57:07 +0100 (Tue, 02 Dec 2008) $
- */
-public class Address
-{
-    private final String host;
-    private final int port;
-
-    public static Address from(String hostAndPort)
-    {
-        String host;
-        int port;
-        int colon = hostAndPort.indexOf(':');
-        if (colon >= 0)
-        {
-            host = hostAndPort.substring(0, colon);
-            port = Integer.parseInt(hostAndPort.substring(colon + 1));
-        }
-        else
-        {
-            host = hostAndPort;
-            port = 0;
-        }
-        return new Address(host, port);
-    }
-
-    public Address(String host, int port)
-    {
-        if (host == null)
-            throw new IllegalArgumentException("Host is null");
-
-        this.host = host.trim();
-        this.port = port;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj) return true;
-        if (obj == null || getClass() != obj.getClass()) return false;
-        Address that = (Address)obj;
-        if (!host.equals(that.host)) return false;
-        return port == that.port;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        int result = host.hashCode();
-        result = 31 * result + port;
-        return result;
-    }
-
-    public String getHost()
-    {
-        return host;
-    }
-
-    public int getPort()
-    {
-        return port;
-    }
-
-    public InetSocketAddress toSocketAddress()
-    {
-        return new InetSocketAddress(getHost(), getPort());
-    }
-
-    @Override
-    public String toString()
-    {
-        return host + ":" + port;
-    }
-}

jetty-client/src/main/java/org/eclipse/jetty/client/api/Authentication.java

@@ -1,21 +0,0 @@
-//========================================================================
-//Copyright 2012-2012 Mort Bay Consulting Pty. Ltd.
-//------------------------------------------------------------------------
-//All rights reserved. This program and the accompanying materials
-//are made available under the terms of the Eclipse Public License v1.0
-//and Apache License v2.0 which accompanies this distribution.
-//The Eclipse Public License is available at
-//http://www.eclipse.org/legal/epl-v10.html
-//The Apache License v2.0 is available at
-//http://www.opensource.org/licenses/apache2.0.php
-//You may elect to redistribute this code under either of these licenses.
-//========================================================================
-
-package org.eclipse.jetty.client.api;
-
-public interface Authentication
-{
-    public class Kerberos implements Authentication
-    {
-    }
-}

jetty-client/src/main/java/org/eclipse/jetty/client/util/BufferingResponseListener.java

@@ -1,4 +1,4 @@
-package org.eclipse.jetty.client;
+package org.eclipse.jetty.client.util;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;

jetty-client/src/main/java/org/eclipse/jetty/client/util/ByteBufferContentProvider.java

@@ -1,4 +1,4 @@
-package org.eclipse.jetty.client;
+package org.eclipse.jetty.client.util;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;

jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java

@@ -1,4 +1,4 @@
-package org.eclipse.jetty.client;
+package org.eclipse.jetty.client.util;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

jetty-client/src/main/java/org/eclipse/jetty/client/util/StreamingResponseListener.java

@@ -11,7 +11,7 @@
 //You may elect to redistribute this code under either of these licenses.
 //========================================================================
 
-package org.eclipse.jetty.client;
+package org.eclipse.jetty.client.util;
 
 import java.io.InputStream;
 import java.io.OutputStream;

jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java

@@ -8,6 +8,7 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.eclipse.jetty.client.api.Response;
+import org.eclipse.jetty.client.util.BufferingResponseListener;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpVersion;

jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java

@@ -7,6 +7,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
+import org.eclipse.jetty.client.util.ByteBufferContentProvider;
 import org.eclipse.jetty.io.ByteArrayEndPoint;
 import org.eclipse.jetty.toolchain.test.annotation.Slow;
 import org.junit.After;

jetty-client/src/test/java/org/eclipse/jetty/client/api/Usage.java

@@ -21,10 +21,10 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.eclipse.jetty.client.BufferingResponseListener;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.PathContentProvider;
+import org.eclipse.jetty.client.util.BufferingResponseListener;
-import org.eclipse.jetty.client.StreamingResponseListener;
+import org.eclipse.jetty.client.util.PathContentProvider;
+import org.eclipse.jetty.client.util.StreamingResponseListener;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpVersion;
 import org.junit.Assert;