Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Jetty9 - Reorganized new jetty-client classes.

This commit is contained in:
Simone Bordet 2012-09-06 08:55:29 +02:00
parent 1301686281
commit d74d7a7a09
13 changed files with 14 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
View File

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

1
jetty-client/src/main/java/org/eclipse/jetty/client/HttpContentResponse.java
View File

@ -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;

1
jetty-client/src/main/java/org/eclipse/jetty/client/HttpRequest.java
View File

@ -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;

4
jetty-client/src/main/java/org/eclipse/jetty/client/RedirectionListener.java → jetty-client/src/main/java/org/eclipse/jetty/client/RedirectionProtocolListener.java
View File

@ -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;
}

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

@ -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;
}
}

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

@ -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
{
}
}

2
jetty-client/src/main/java/org/eclipse/jetty/client/BufferingResponseListener.java → jetty-client/src/main/java/org/eclipse/jetty/client/util/BufferingResponseListener.java
View File

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

2
jetty-client/src/main/java/org/eclipse/jetty/client/ByteBufferContentProvider.java → jetty-client/src/main/java/org/eclipse/jetty/client/util/ByteBufferContentProvider.java
View File

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

2
jetty-client/src/main/java/org/eclipse/jetty/client/PathContentProvider.java → jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java
View File

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

2
jetty-client/src/main/java/org/eclipse/jetty/client/StreamingResponseListener.java → jetty-client/src/main/java/org/eclipse/jetty/client/util/StreamingResponseListener.java
View File

@ -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;

1
jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
View File

@ -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;

1
jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
View File

@ -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;

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

@ -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.StreamingResponseListener;
import org.eclipse.jetty.client.util.BufferingResponseListener;
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;