You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ad...@apache.org on 2011/07/31 19:32:01 UTC
svn commit: r1152600 [1/3] - in /mina/sandbox/adc/ahc:
api/src/main/java/org/apache/ahc/ api/src/main/java/org/apache/ahc/api/
api/src/main/java/org/apache/ahc/api/listeners/
api/src/main/java/org/apache/ahc/api/mime/ api/src/test/java/com/acme/ahc/
ap...
Author: adc
Date: Sun Jul 31 17:31:47 2011
New Revision: 1152600
URL: http://svn.apache.org/viewvc?rev=1152600&view=rev
Log:
Intermediate checkin of a huge mess
Added:
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/AhcException.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/Provisioned.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeContent.java (contents, props changed)
- copied, changed from r1147682, mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeContent.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeContentListener.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeInputStream.java (contents, props changed)
- copied, changed from r1147682, mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeInputStream.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeListener.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeOutputStream.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeReadChannel.java (contents, props changed)
- copied, changed from r1147682, mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeReadChannel.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeWriteChannel.java (contents, props changed)
- copied, changed from r1147682, mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeWriteChannel.java
mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/ProvisioningListener.java
mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/mime/
mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/mime/ByteArrayBasedMimeContent.java
- copied, changed from r1147682, mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/ByteArrayBasedMimeContent.java
mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/mime/FileMimeOutputStream.java
mina/sandbox/adc/ahc/common/src/test/java/org/
mina/sandbox/adc/ahc/common/src/test/java/org/apache/
mina/sandbox/adc/ahc/common/src/test/java/org/apache/ahc/
mina/sandbox/adc/ahc/common/src/test/java/org/apache/ahc/common/
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/group/
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/group/AcceptMessage.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/group/CommitMessage.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/group/LocalDetectorListener.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/group/Member.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/group/Message.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/group/MessageByteBufferTransformer.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/group/ProposeMessage.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/group/RetryMessage.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/link/
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoAsyncTransformer.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoBufferFactory.java
- copied, changed from r1141810, mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoByteBufferFactory.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoDownMux.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoDownSet.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoTransformer.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoTransformerException.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoUpMux.java
- copied, changed from r1152489, mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoUp.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoUpSet.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/StateMachineContext.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/nio/IoByteBuffer.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/paxos/
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/mina/EchoServerTest.java
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/mina/echo/
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/mina/echo/EchoNioServer.java
Removed:
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeContent.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeInputStream.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeReadChannel.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeWriteChannel.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/listeners/MimeContentListener.java
mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/ByteArrayBasedMimeContent.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/SslSessionConfigListener.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/api/SessionConfigListener.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoByteBufferFactory.java
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/client/
Modified:
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/HttpException.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpBatch.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpBatchFutureImpl.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpClient.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpConnection.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpFactory.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpRequest.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpResponse.java
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/Provisionable.java
mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/AcmeHttpClient.java
mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/AcmeHttpRequest.java
mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/listeners/SslBenchmarkListener.java
mina/sandbox/adc/ahc/api/src/test/java/org/apache/ahc/api/ClientTest.java
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpBatch.java
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpClient.java
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpConnection.java
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpFactory.java
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpRequest.java
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/HttpClientFutureImpl.java
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/InputStreamBasedMimeContent.java
mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/listeners/SslBenchmarkListener.java
mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/client/EquipmentStackTest.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpBatch.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpClient.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpConnection.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpFactory.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpRequest.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/EquipmentStack.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/HttpClientFutureAdaptor.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/InputStreamBasedMimeContent.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/AbstractIoChannel.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/AbstractIoFuture.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/BaseChannelState.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/HeapByteBufferFactory.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoBuffer.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoChannel.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoChannelState.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoConfig.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoConnector.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoContext.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoDown.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoFuture.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoFutureListener.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoListener.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoProperty.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoPropertyScope.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoSession.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoUp.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/LimitedByteBufferFactory.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/StateMachineChannel.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/impl/EquipmentStack.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/impl/InjectorEjector.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/nio/NioSocketConnector.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/ClosedChannelState.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/ClosingChannelState.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/FinishedChannelState.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/HandshakeChannelState.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/SslChannel.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/SslConfig.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/SslStates.java
mina/sandbox/adc/ahc/mina3/src/test/java/com/acme/ahc/AcmeHttpClient.java
mina/sandbox/adc/ahc/mina3/src/test/java/com/acme/ahc/AcmeHttpRequest.java
mina/sandbox/adc/ahc/mina3/src/test/java/com/acme/ahc/listeners/SslBenchmarkListener.java
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/BenchMark.java
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/SSLEngineSimpleDemo.java
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/mina/core/AbstractIoFutureTest.java
Added: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/AhcException.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/AhcException.java?rev=1152600&view=auto
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/AhcException.java (added)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/AhcException.java Sun Jul 31 17:31:47 2011
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ahc;
+
+/**
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
+ */
+public class AhcException extends Exception
+{
+
+ public AhcException()
+ {
+ }
+
+ public AhcException(String message)
+ {
+ super(message);
+ }
+
+ public AhcException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public AhcException(Throwable cause)
+ {
+ super(cause);
+ }
+}
Modified: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/HttpException.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/HttpException.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/HttpException.java (original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/HttpException.java Sun Jul 31 17:31:47 2011
@@ -24,7 +24,7 @@ import org.apache.ahc.api.HttpConnection
/**
* @version $Revision$ $Date: $
*/
-public abstract class HttpException extends Exception
+public abstract class HttpException extends AhcException
{
private final HttpConnection connection;
private final short code;
Modified: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpBatch.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpBatch.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpBatch.java (original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpBatch.java Sun Jul 31 17:31:47 2011
@@ -18,30 +18,22 @@
*/
package org.apache.ahc.api;
-import java.net.MalformedURLException;
+import java.net.URL;
import java.util.Map;
+import org.apache.ahc.api.mime.MimeContent;
+
/**
* @version $Revision$ $Date: $
*/
-public interface HttpBatch extends Provisionable
+public interface HttpBatch extends Provisionable<HttpBatch>
{
HttpBatch send(HttpRequest request);
- HttpBatch get(String url) throws MalformedURLException;
+ HttpBatch get(URL url);
- HttpBatch post(String url, Map<String, String> map, MimeContent... content) throws MalformedURLException;
+ HttpBatch post(URL url, Map<String, String> map, MimeContent... content);
HttpBatchFuture submit();
-
- HttpBatch addConfig(HttpConfig config);
-
- HttpBatch addListener(HttpListener listener);
-
- HttpBatch addPair(String key, Object value);
-
- HttpBatch push();
-
- HttpBatch pop();
}
Modified: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpBatchFutureImpl.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpBatchFutureImpl.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpBatchFutureImpl.java (original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpBatchFutureImpl.java Sun Jul 31 17:31:47 2011
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.Atomi
/**
- * @version $Revision: $ $Date: $
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public class HttpBatchFutureImpl implements HttpBatchFuture
{
Modified: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpClient.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpClient.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpClient.java (original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpClient.java Sun Jul 31 17:31:47 2011
@@ -25,23 +25,24 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.ahc.HttpHeaders;
-import org.apache.ahc.api.listeners.MimeContentListener;
+import org.apache.ahc.api.mime.MimeContent;
+import org.apache.ahc.api.mime.MimeListener;
/**
* @version $Revision$ $Date: $
*/
-public interface HttpClient extends Provisionable
+public interface HttpClient extends Provisionable<HttpClient>
{
HttpClientFuture<HttpResponse> send(HttpRequest request);
- HttpClientFuture<HttpResponse> get(String url);
+ HttpClientFuture<HttpResponse> get(URL url);
- HttpClientFuture<HttpResponse> post(String url, Map<String, String> map, MimeContent... content);
+ HttpClientFuture<HttpResponse> post(URL url, Map<String, String> map, MimeContent... content);
- HttpClientFuture<HttpResponse> put(String url, Map<String, String> map, MimeContent... content);
+ HttpClientFuture<HttpResponse> put(URL url, Map<String, String> map, MimeContent... content);
- HttpClientFuture<HttpResponse> delete(String url);
+ HttpClientFuture<HttpResponse> delete(URL url);
HttpBatch batch();
@@ -49,19 +50,9 @@ public interface HttpClient extends Prov
HttpConnection open(InetAddress address, int port);
- HttpClient equipWith(String key, Object value);
-
- HttpClient equipWith(HttpConfig config);
-
- HttpClient equipWith(HttpListener listener);
-
- HttpClient push();
-
- HttpClient pop();
-
HttpRequest allocateHttpRequest();
- HttpRequest allocateHttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeContentListener> listeners, int timeout, TimeUnit timeUnit);
+ HttpRequest allocateHttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeListener> listeners, int timeout, TimeUnit timeUnit);
HttpRequest allocateHttpRequest(HttpRequest httpRequest);
Modified: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpConnection.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpConnection.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpConnection.java (original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpConnection.java Sun Jul 31 17:31:47 2011
@@ -19,21 +19,11 @@
package org.apache.ahc.api;
/**
- * @version $Revision$ $Date: $
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
-public interface HttpConnection extends Provisionable
+public interface HttpConnection extends Provisionable<HttpConnection>
{
HttpClient getClient();
- HttpConnection addConfig(HttpConfig config);
-
- HttpConnection addListener(HttpListener listener);
-
- HttpConnection addPair(String key, Object value);
-
- HttpConnection push();
-
- HttpConnection pop();
-
HttpClientFuture<HttpResponse> send(HttpRequest request);
}
Modified: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpFactory.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpFactory.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpFactory.java (original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpFactory.java Sun Jul 31 17:31:47 2011
@@ -21,17 +21,7 @@ package org.apache.ahc.api;
/**
* @version $Revision$ $Date: $
*/
-public interface HttpFactory extends Provisionable
+public interface HttpFactory extends Provisionable<HttpFactory>
{
HttpClient generateClient();
-
- HttpFactory equipWith(HttpConfig config);
-
- HttpFactory equipWith(String key, Object value);
-
- HttpFactory equipWith(HttpListener listener);
-
- HttpFactory push();
-
- HttpFactory pop();
}
Modified: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpRequest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpRequest.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpRequest.java (original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpRequest.java Sun Jul 31 17:31:47 2011
@@ -27,19 +27,20 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.apache.ahc.HttpHeaders;
-import org.apache.ahc.api.listeners.MimeContentListener;
+import org.apache.ahc.api.mime.MimeContent;
+import org.apache.ahc.api.mime.MimeListener;
/**
* @version $Revision$ $Date: $
*/
-public abstract class HttpRequest implements Provisionable
+public abstract class HttpRequest implements Provisionable<HttpRequest>
{
private URL url;
private HttpVerb verb;
private HttpHeaders headers;
private final List<MimeContent> mimeContent = new ArrayList<MimeContent>();
- private final List<MimeContentListener> listeners = new ArrayList<MimeContentListener>();
+ private final List<MimeListener> listeners = new ArrayList<MimeListener>();
private int timeout;
private TimeUnit timeUnit;
@@ -47,7 +48,7 @@ public abstract class HttpRequest implem
{
}
- public HttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeContentListener> listeners, int timeout, TimeUnit timeUnit)
+ public HttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeListener> listeners, int timeout, TimeUnit timeUnit)
{
try
{
@@ -147,12 +148,12 @@ public abstract class HttpRequest implem
return this;
}
- public List<MimeContentListener> getListeners()
+ public List<MimeListener> getListeners()
{
return listeners;
}
- public HttpRequest addMimeContentListener(MimeContentListener listener)
+ public HttpRequest addMimeContentListener(MimeListener listener)
{
listeners.add(listener);
@@ -161,16 +162,16 @@ public abstract class HttpRequest implem
public abstract <T extends HttpConfig> T getConfig(Class<T> clazz);
- public abstract HttpRequest equipWith(HttpConfig config);
-
public abstract <T extends HttpListener> Set<T> getListeners(Class<T> clazz);
- public abstract HttpRequest equipWith(HttpListener listener);
-
- public abstract Object getValue(String key);
+ public abstract Object getEquip(String key);
public abstract HttpRequest equipWith(String key, Object value);
+ public abstract HttpRequest equipWith(HttpConfig config);
+
+ public abstract HttpRequest equipWith(HttpListener listener);
+
public abstract HttpRequest push();
public abstract HttpRequest pop();
Modified: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpResponse.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpResponse.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpResponse.java (original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpResponse.java Sun Jul 31 17:31:47 2011
@@ -21,16 +21,16 @@ package org.apache.ahc.api;
import java.io.InputStream;
import java.util.List;
+import org.apache.ahc.api.mime.MimeContent;
+
/**
* @version $Revision$ $Date: $
*/
-public interface HttpResponse
+public interface HttpResponse extends Provisioned
{
HttpConnection getConnection();
- Object getEquip(String key);
-
InputStream getInputStream();
int getStatusCode();
Modified: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/Provisionable.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/Provisionable.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/Provisionable.java (original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/Provisionable.java Sun Jul 31 17:31:47 2011
@@ -19,9 +19,17 @@
package org.apache.ahc.api;
/**
- * @version $Revision$ $Date: $
+ *
*/
-public interface Provisionable
+public interface Provisionable<O> extends Provisioned
{
- Object getValue(String key);
+ O equipWith(HttpConfig config);
+
+ O equipWith(String key, Object value);
+
+ O equipWith(HttpListener listener);
+
+ O push();
+
+ O pop();
}
Added: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/Provisioned.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/Provisioned.java?rev=1152600&view=auto
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/Provisioned.java (added)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/Provisioned.java Sun Jul 31 17:31:47 2011
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ahc.api;
+
+/**
+ *
+ */
+public interface Provisioned
+{
+ <T> T getEquip(String key);
+}
Copied: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeContent.java (from r1147682, mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeContent.java)
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeContent.java?p2=mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeContent.java&p1=mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeContent.java&r1=1147682&r2=1152600&rev=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeContent.java (original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeContent.java Sun Jul 31 17:31:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ahc.api;
+package org.apache.ahc.api.mime;
/**
* @version $Revision$ $Date: $
Propchange: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeContent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeContent.java
------------------------------------------------------------------------------
svn:keywords = "Date Revision Id Author"
Propchange: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeContent.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeContentListener.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeContentListener.java?rev=1152600&view=auto
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeContentListener.java (added)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeContentListener.java Sun Jul 31 17:31:47 2011
@@ -0,0 +1,26 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ahc.api.mime;
+
+/**
+ *
+ */
+public interface MimeContentListener
+{
+}
Copied: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeInputStream.java (from r1147682, mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeInputStream.java)
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeInputStream.java?p2=mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeInputStream.java&p1=mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeInputStream.java&r1=1147682&r2=1152600&rev=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeInputStream.java (original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeInputStream.java Sun Jul 31 17:31:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ahc.api;
+package org.apache.ahc.api.mime;
import java.io.InputStream;
Propchange: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeInputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeInputStream.java
------------------------------------------------------------------------------
svn:keywords = "Date Revision Id Author"
Propchange: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeInputStream.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeListener.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeListener.java?rev=1152600&view=auto
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeListener.java (added)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeListener.java Sun Jul 31 17:31:47 2011
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ahc.api.mime;
+
+/**
+ *
+ */
+public interface MimeListener
+{
+ MimeContentListener content(String name, String fileName, String contentType, int contentSize) throws Exception;
+}
Added: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeOutputStream.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeOutputStream.java?rev=1152600&view=auto
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeOutputStream.java (added)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeOutputStream.java Sun Jul 31 17:31:47 2011
@@ -0,0 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ahc.api.mime;
+
+import java.io.OutputStream;
+
+
+/**
+ *
+ */
+public interface MimeOutputStream extends MimeContentListener
+{
+ OutputStream getOutputStream();
+}
Copied: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeReadChannel.java (from r1147682, mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeReadChannel.java)
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeReadChannel.java?p2=mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeReadChannel.java&p1=mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeReadChannel.java&r1=1147682&r2=1152600&rev=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeReadChannel.java (original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeReadChannel.java Sun Jul 31 17:31:47 2011
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ahc.api;
+package org.apache.ahc.api.mime;
import java.nio.channels.ScatteringByteChannel;
/**
- * @version $Revision$ $Date: $
+ *
*/
public interface MimeReadChannel extends MimeContent
{
- void readReady(Provisionable owner, ScatteringByteChannel channel);
+ void readReady(ScatteringByteChannel channel);
}
Propchange: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeReadChannel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeReadChannel.java
------------------------------------------------------------------------------
svn:keywords = "Date Revision Id Author"
Propchange: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeReadChannel.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeWriteChannel.java (from r1147682, mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeWriteChannel.java)
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeWriteChannel.java?p2=mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeWriteChannel.java&p1=mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeWriteChannel.java&r1=1147682&r2=1152600&rev=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/MimeWriteChannel.java (original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeWriteChannel.java Sun Jul 31 17:31:47 2011
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ahc.api;
+package org.apache.ahc.api.mime;
import java.io.IOException;
import java.nio.channels.GatheringByteChannel;
/**
- * @version $Revision$ $Date: $
+ *
*/
-public interface MimeWriteChannel extends MimeContent
+public interface MimeWriteChannel extends MimeContentListener
{
- boolean writeChannelReady(Provisionable owner, GatheringByteChannel channel) throws IOException;
+ boolean writeChannelReady(GatheringByteChannel channel) throws IOException;
}
Propchange: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeWriteChannel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeWriteChannel.java
------------------------------------------------------------------------------
svn:keywords = "Date Revision Id Author"
Propchange: mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/mime/MimeWriteChannel.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/AcmeHttpClient.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/AcmeHttpClient.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/AcmeHttpClient.java (original)
+++ mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/AcmeHttpClient.java Sun Jul 31 17:31:47 2011
@@ -34,16 +34,16 @@ import org.apache.ahc.api.HttpListener;
import org.apache.ahc.api.HttpRequest;
import org.apache.ahc.api.HttpResponse;
import org.apache.ahc.api.HttpVerb;
-import org.apache.ahc.api.MimeContent;
-import org.apache.ahc.api.listeners.MimeContentListener;
+import org.apache.ahc.api.mime.MimeContent;
+import org.apache.ahc.api.mime.MimeListener;
/**
- * @version $Revision$ $Date: $
+ *
*/
public class AcmeHttpClient implements HttpClient
{
- public Object getValue(String key)
+ public Object getEquip(String key)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
@@ -53,22 +53,22 @@ public class AcmeHttpClient implements H
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public HttpClientFuture<HttpResponse> get(String url)
+ public HttpClientFuture<HttpResponse> get(URL url)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public HttpClientFuture<HttpResponse> post(String url, Map<String, String> map, MimeContent... content)
+ public HttpClientFuture<HttpResponse> post(URL url, Map<String, String> map, MimeContent... content)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public HttpClientFuture<HttpResponse> put(String url, Map<String, String> map, MimeContent... content)
+ public HttpClientFuture<HttpResponse> put(URL url, Map<String, String> map, MimeContent... content)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public HttpClientFuture<HttpResponse> delete(String url)
+ public HttpClientFuture<HttpResponse> delete(URL url)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
@@ -118,7 +118,7 @@ public class AcmeHttpClient implements H
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public HttpRequest allocateHttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeContentListener> listeners, int timeout, TimeUnit timeUnit)
+ public HttpRequest allocateHttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeListener> listeners, int timeout, TimeUnit timeUnit)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
Modified: mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/AcmeHttpRequest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/AcmeHttpRequest.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/AcmeHttpRequest.java (original)
+++ mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/AcmeHttpRequest.java Sun Jul 31 17:31:47 2011
@@ -55,7 +55,7 @@ public class AcmeHttpRequest extends Htt
}
@Override
- public Object getValue(String key)
+ public Object getEquip(String key)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
Modified: mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/listeners/SslBenchmarkListener.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/listeners/SslBenchmarkListener.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/listeners/SslBenchmarkListener.java (original)
+++ mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/listeners/SslBenchmarkListener.java Sun Jul 31 17:31:47 2011
@@ -19,7 +19,7 @@
package com.acme.ahc.listeners;
/**
- * @version $Revision: $ $Date: $
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public interface SslBenchmarkListener extends BenchmarkListener
{
Modified: mina/sandbox/adc/ahc/api/src/test/java/org/apache/ahc/api/ClientTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/test/java/org/apache/ahc/api/ClientTest.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/test/java/org/apache/ahc/api/ClientTest.java (original)
+++ mina/sandbox/adc/ahc/api/src/test/java/org/apache/ahc/api/ClientTest.java Sun Jul 31 17:31:47 2011
@@ -45,11 +45,14 @@ import static org.mockito.Matchers.anySt
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.ahc.api.listeners.MimeContentListener;
+import org.apache.ahc.api.mime.MimeContent;
+import org.apache.ahc.api.mime.MimeContentListener;
+import org.apache.ahc.api.mime.MimeInputStream;
+import org.apache.ahc.api.mime.MimeListener;
/**
- * @version $Revision$ $Date: $
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public class ClientTest
{
@@ -60,21 +63,23 @@ public class ClientTest
/**
* Mock prep
*/
- AcmeMockHandle handle = new AcmeMockHandle();
+ AcmeMockHandle sharedHandle = new AcmeMockHandle();
+ AcmeMockHandle sslHandle = new AcmeMockHandle();
HttpClient client = mock(HttpClient.class);
HttpBatch batch = mock(HttpBatch.class);
HttpBatchFuture future = mock(HttpBatchFuture.class);
HttpResponse response = mock(HttpResponse.class);
+ when(client.equipWith(anyString(), anyObject())).thenReturn(client);
when(client.batch(50, TimeUnit.MILLISECONDS)).thenReturn(batch);
- when(batch.get(anyString())).thenReturn(batch);
- when(batch.post(anyString(), any(Map.class))).thenReturn(batch);
+ when(batch.get(any(URL.class))).thenReturn(batch);
+ when(batch.post(any(URL.class), any(Map.class))).thenReturn(batch);
when(batch.push()).thenReturn(batch);
when(batch.pop()).thenReturn(batch);
- when(batch.addListener(any(HttpListener.class))).thenReturn(batch);
- when(batch.addPair(anyString(), anyObject())).thenReturn(batch);
+ when(batch.equipWith(any(HttpListener.class))).thenReturn(batch);
+ when(batch.equipWith(anyString(), anyObject())).thenReturn(batch);
when(batch.submit()).thenReturn(future);
- when(response.getEquip("OBJECT_HANDLE")).thenReturn(handle);
+ when(response.getEquip("SHARED_HANDLE")).thenReturn(sharedHandle);
when(future.get()).thenReturn(Collections.<HttpResponse>singletonList(response));
@@ -87,28 +92,41 @@ public class ClientTest
Map<String, String> map = new HashMap<String, String>();
HttpBatchFuture batchFuture = client
- .batch(50, TimeUnit.MILLISECONDS)
+ .equipWith("SHARED_HANDLE", sharedHandle)
- .get("http://rest.acme.com/rest/student/324525?token=dFWEGV8ss63dmcs0245c")
+ .batch(50, TimeUnit.MILLISECONDS) // set batch timeout to 50 milliseconds
- .push()
- .addListener(new AcmeSslBenchmarkListener())
- .addPair("OBJECT_HANDLE", handle)
- .get("https://rest.acme.com/rest/student/5246?token=dFWEGV8ss63dmcs0245c")
- .pop()
+ // schedule simple GET
+ .get(new URL("http://rest.acme.com/rest/student/324525?token=dFWEGV8ss63dmcs0245c"))
- .get("http://rest.acme.com/rest/student/1245?token=dFWEGV8ss63dmcs0245c")
+ .push() // push equipment stack to add additional listeners and values
+ .equipWith(new AcmeSslBenchmarkListener())
+ .equipWith("SSL_HANDLE", sharedHandle)
+ .get(new URL("https://rest.acme.com/rest/student/5246?token=dFWEGV8ss63dmcs0245c")) // schedule simple GET that will use these additional listeners and values
+ .pop() // pop additional listeners and values off stack
- .post("http://rest.acme.com/rest/student/1245", map)
+ // schedule simple GET
+ .get(new URL("http://rest.acme.com/rest/student/1245?token=dFWEGV8ss63dmcs0245c"))
- .get("http://rest.acme.com/rest/student/41134?token=dFWEGV8ss63dmcs0245c")
+ // schedule simple POST
+ .post(new URL("http://rest.acme.com/rest/student/1245"), map)
+ // schedule simple GET
+ .get(new URL("http://rest.acme.com/rest/student/41134?token=dFWEGV8ss63dmcs0245c"))
+
+ // submit the batch of GETs and POSTs in parallel with a timeout of 50ms
.submit();
List<HttpResponse> responses = batchFuture.get();
for (HttpResponse hr : responses)
{
- assertSame(handle, hr.getEquip("OBJECT_HANDLE"));
+ assertSame(sharedHandle, hr.getEquip("SHARED_HANDLE"));
+
+ AcmeMockHandle handle = hr.getEquip("SSL_HANDLE");
+ if (handle != null)
+ {
+
+ }
}
}
@@ -116,15 +134,21 @@ public class ClientTest
@SuppressWarnings({"unchecked"})
public void testSend() throws Exception
{
+ /**
+ * Mock prep
+ */
HttpClient client = mock(HttpClient.class);
HttpClientFuture<HttpResponse> future = mock(HttpClientFuture.class);
HttpResponse response = mock(HttpResponse.class);
- when(client.get(anyString())).thenReturn(future);
+ when(client.get(any(URL.class))).thenReturn(future);
when(future.register(any(FutureListener.class))).thenReturn(future);
when(future.get()).thenReturn(response);
- HttpResponse hr = client.get("http://rest.acme.com/rest/student/41134?token=dFWEGV8ss63dmcs0245c")
+ /**
+ * Start of test
+ */
+ HttpResponse hr = client.get(new URL("http://rest.acme.com/rest/student/41134?token=dFWEGV8ss63dmcs0245c"))
.register(new FutureListener<HttpResponse>()
{
public void exception(Throwable t)
@@ -146,6 +170,9 @@ public class ClientTest
@SuppressWarnings({"unchecked"})
public void testSendMultipleAttachments() throws Exception
{
+ /**
+ * Mock prep
+ */
HttpRequest request = mock(HttpRequest.class);
HttpClient client = mock(HttpClient.class);
HttpClientFuture<HttpResponse> future = mock(HttpClientFuture.class);
@@ -157,6 +184,9 @@ public class ClientTest
when(client.send(any(HttpRequest.class))).thenReturn(future);
when(future.get()).thenReturn(response);
+ /**
+ * Start of test
+ */
request.setUrl(new URL("http://rest.acme.com/rest/student/41134?token=dFWEGV8ss63dmcs0245"))
.addMimeContent(generateXml())
.addMimeContent(generateDmg(), generateRandom());
@@ -175,16 +205,21 @@ public class ClientTest
HttpResponse response = mock(HttpResponse.class);
when(request.setUrl(any(URL.class))).thenReturn(request);
- when(request.addMimeContentListener(any(MimeContentListener.class))).thenReturn(request);
+ when(request.addMimeContentListener(any(MimeListener.class))).thenReturn(request);
when(client.send(any(HttpRequest.class))).thenReturn(future);
when(future.get()).thenReturn(response);
+ /**
+ * Start of test
+ */
request.setUrl(new URL("http://rest.acme.com/rest/student/41134?token=dFWEGV8ss63dmcs0245"))
- .addMimeContentListener(new MimeContentListener()
+ .addMimeContentListener(new MimeListener()
{
- public void found(HttpResponse response, MimeContent mimeContent)
+ public MimeContentListener content(String name, String fileName, String contentType, int contentSize)
{
- // asynchronous calls when content is found
+ return new MimeContentListener()
+ {
+ }; //Todo change body of implemented methods use File | Settings | File Templates.
}
});
@@ -196,22 +231,30 @@ public class ClientTest
@Test
public void testAsyncReceiveMultipleAttachments() throws Exception
{
+ /**
+ * Mock prep
+ */
HttpClient client = mock(HttpClient.class);
HttpRequest request = mock(HttpRequest.class);
HttpClientFuture<HttpResponse> future = mock(HttpClientFuture.class);
HttpResponse response = mock(HttpResponse.class);
when(request.setUrl(any(URL.class))).thenReturn(request);
- when(request.addMimeContentListener(any(MimeContentListener.class))).thenReturn(request);
+ when(request.addMimeContentListener(any(MimeListener.class))).thenReturn(request);
when(client.send(any(HttpRequest.class))).thenReturn(future);
when(future.get()).thenReturn(response);
+ /**
+ * Start of test
+ */
request.setUrl(new URL("http://rest.acme.com/rest/student/41134?token=dFWEGV8ss63dmcs0245"))
- .addMimeContentListener(new MimeContentListener()
+ .addMimeContentListener(new MimeListener()
{
- public void found(HttpResponse response, MimeContent mimeContent)
+ public MimeContentListener content(String name, String fileName, String contentType, int contentSize)
{
- // asynchronous calls when content is found
+ return new MimeContentListener()
+ {
+ }; //Todo change body of implemented methods use File | Settings | File Templates.
}
});
Added: mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/ProvisioningListener.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/ProvisioningListener.java?rev=1152600&view=auto
==============================================================================
--- mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/ProvisioningListener.java (added)
+++ mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/ProvisioningListener.java Sun Jul 31 17:31:47 2011
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ahc.common;
+
+import org.apache.ahc.api.HttpConfig;
+import org.apache.ahc.api.HttpListener;
+
+
+/**
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
+ */
+public interface ProvisioningListener
+{
+ void registered(HttpConfig config);
+
+ void registered(HttpListener listener);
+}
Copied: mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/mime/ByteArrayBasedMimeContent.java (from r1147682, mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/ByteArrayBasedMimeContent.java)
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/mime/ByteArrayBasedMimeContent.java?p2=mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/mime/ByteArrayBasedMimeContent.java&p1=mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/ByteArrayBasedMimeContent.java&r1=1147682&r2=1152600&rev=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/ByteArrayBasedMimeContent.java (original)
+++ mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/mime/ByteArrayBasedMimeContent.java Sun Jul 31 17:31:47 2011
@@ -16,18 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ahc.common;
+package org.apache.ahc.common.mime;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.GatheringByteChannel;
-import org.apache.ahc.api.MimeWriteChannel;
-import org.apache.ahc.api.Provisionable;
+import org.apache.ahc.api.mime.MimeWriteChannel;
/**
- * @version $Revision: 892157 $ $Date: $
+ *
*/
public class ByteArrayBasedMimeContent implements MimeWriteChannel
{
@@ -66,7 +65,7 @@ public class ByteArrayBasedMimeContent i
return byteBuffer.capacity();
}
- public boolean writeChannelReady(Provisionable owner, GatheringByteChannel channel) throws IOException
+ public boolean writeChannelReady(GatheringByteChannel channel) throws IOException
{
channel.write(byteBuffer);
Added: mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/mime/FileMimeOutputStream.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/mime/FileMimeOutputStream.java?rev=1152600&view=auto
==============================================================================
--- mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/mime/FileMimeOutputStream.java (added)
+++ mina/sandbox/adc/ahc/common/src/main/java/org/apache/ahc/common/mime/FileMimeOutputStream.java Sun Jul 31 17:31:47 2011
@@ -0,0 +1,96 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ahc.common.mime;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.util.Collections;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.ahc.api.mime.MimeContentListener;
+import org.apache.ahc.api.mime.MimeListener;
+import org.apache.ahc.api.mime.MimeOutputStream;
+
+
+/**
+ *
+ */
+public class FileMimeOutputStream implements MimeListener
+{
+ static final Logger LOG = LoggerFactory.getLogger(FileMimeOutputStream.class);
+ private final File file;
+ private final int maxSize;
+ private final Set<String> allowedTypes;
+
+ public FileMimeOutputStream(File file) throws FileNotFoundException
+ {
+ this(file, Integer.MAX_VALUE, Collections.<String>emptySet());
+ }
+
+ public FileMimeOutputStream(File file, int maxSize, Set<String> allowedTypes) throws FileNotFoundException
+ {
+ if (file == null) throw new IllegalArgumentException("File cannot be null");
+ this.file = file;
+
+ if (maxSize < 0) this.maxSize = Integer.MAX_VALUE;
+ else this.maxSize = maxSize;
+
+ if (allowedTypes == null) throw new IllegalArgumentException("Allowed types cannot be null");
+ this.allowedTypes = allowedTypes;
+
+ /**
+ * Test to make sure file is creatable
+ */
+ new FileOutputStream(file);
+
+ LOG.debug("File: {}", file);
+ LOG.debug("Max size: {}", maxSize);
+ LOG.debug("Allowed types: {}", allowedTypes);
+ }
+
+ public MimeContentListener content(String name, String fileName, String contentType, int contentSize)
+ {
+ if (contentSize > maxSize) throw new IllegalArgumentException("Content size " + contentSize + " greater than max " + maxSize);
+ if (!allowedTypes.isEmpty() && allowedTypes.contains(contentType)) throw new IllegalArgumentException("Content type " + contentType + " not in allowed set");
+
+ LOG.debug("name: {} fileName: {} contentType: {} contentSize: {}", new Object[]{name, fileName, contentType, contentSize});
+
+ return new MimeOutputStream()
+ {
+ public OutputStream getOutputStream()
+ {
+ try
+ {
+ LOG.trace("Allocating output stream");
+
+ return new FileOutputStream(file);
+ }
+ catch (FileNotFoundException fnfe)
+ {
+ throw new Error("Unable to create " + file, fnfe);
+ }
+ }
+ };
+ }
+}
Modified: mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpBatch.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpBatch.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpBatch.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpBatch.java Sun Jul 31 17:31:47 2011
@@ -18,7 +18,6 @@
*/
package org.apache.ahc.mina2;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -31,7 +30,7 @@ import org.apache.ahc.api.HttpConfig;
import org.apache.ahc.api.HttpListener;
import org.apache.ahc.api.HttpRequest;
import org.apache.ahc.api.HttpVerb;
-import org.apache.ahc.api.MimeContent;
+import org.apache.ahc.api.mime.MimeContent;
/**
@@ -58,11 +57,11 @@ public class AsyncHttpBatch implements H
return this;
}
- public HttpBatch get(String url) throws MalformedURLException
+ public HttpBatch get(URL url)
{
HttpRequest request = new AsyncHttpRequest();
- request.setUrl(new URL(url));
+ request.setUrl(url);
request.setVerb(HttpVerb.GET);
batch.add(request);
@@ -70,7 +69,7 @@ public class AsyncHttpBatch implements H
return this;
}
- public HttpBatch post(String url, Map<String, String> map, MimeContent... content)
+ public HttpBatch post(URL url, Map<String, String> map, MimeContent... content)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
@@ -80,26 +79,26 @@ public class AsyncHttpBatch implements H
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public Object getValue(String key)
+ public Object getEquip(String key)
{
return stack.get(key);
}
- public HttpBatch addConfig(HttpConfig config)
+ public HttpBatch equipWith(HttpConfig config)
{
stack.equipWith(config);
return this;
}
- public HttpBatch addListener(HttpListener listener)
+ public HttpBatch equipWith(HttpListener listener)
{
stack.equipWith(listener);
return this;
}
- public HttpBatch addPair(String key, Object value)
+ public HttpBatch equipWith(String key, Object value)
{
stack.equipWith(key, value);
Modified: mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpClient.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpClient.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpClient.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpClient.java Sun Jul 31 17:31:47 2011
@@ -39,8 +39,8 @@ import org.apache.ahc.api.HttpListener;
import org.apache.ahc.api.HttpRequest;
import org.apache.ahc.api.HttpResponse;
import org.apache.ahc.api.HttpVerb;
-import org.apache.ahc.api.MimeContent;
-import org.apache.ahc.api.listeners.MimeContentListener;
+import org.apache.ahc.api.mime.MimeContent;
+import org.apache.ahc.api.mime.MimeListener;
/**
@@ -77,22 +77,22 @@ public class AsyncHttpClient implements
}
}
- public HttpClientFuture<HttpResponse> get(String url)
+ public HttpClientFuture<HttpResponse> get(URL url)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public HttpClientFuture<HttpResponse> post(String url, Map<String, String> map, MimeContent... content)
+ public HttpClientFuture<HttpResponse> post(URL url, Map<String, String> map, MimeContent... content)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public HttpClientFuture<HttpResponse> put(String url, Map<String, String> map, MimeContent... content)
+ public HttpClientFuture<HttpResponse> put(URL url, Map<String, String> map, MimeContent... content)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public HttpClientFuture<HttpResponse> delete(String url)
+ public HttpClientFuture<HttpResponse> delete(URL url)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
@@ -112,7 +112,7 @@ public class AsyncHttpClient implements
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public Object getValue(String key)
+ public Object getEquip(String key)
{
return stack.get(key);
}
@@ -157,7 +157,7 @@ public class AsyncHttpClient implements
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public HttpRequest allocateHttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeContentListener> listeners, int timeout, TimeUnit timeUnit)
+ public HttpRequest allocateHttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeListener> listeners, int timeout, TimeUnit timeUnit)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
Modified: mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpConnection.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpConnection.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpConnection.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpConnection.java Sun Jul 31 17:31:47 2011
@@ -59,26 +59,26 @@ public class AsyncHttpConnection impleme
return httpClient;
}
- public Object getValue(String key)
+ public Object getEquip(String key)
{
return stack.get(key);
}
- public HttpConnection addConfig(HttpConfig config)
+ public HttpConnection equipWith(HttpConfig config)
{
stack.equipWith(config);
return this;
}
- public HttpConnection addListener(HttpListener listener)
+ public HttpConnection equipWith(HttpListener listener)
{
stack.equipWith(listener);
return this;
}
- public HttpConnection addPair(String key, Object value)
+ public HttpConnection equipWith(String key, Object value)
{
stack.equipWith(key, value);
Modified: mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpFactory.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpFactory.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpFactory.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpFactory.java Sun Jul 31 17:31:47 2011
@@ -38,7 +38,7 @@ public class AsyncHttpFactory implements
stack.equipWith(new SslSessionConfigListener());
}
- public Object getValue(String key)
+ public Object getEquip(String key)
{
return stack.get(key);
}
Modified: mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpRequest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpRequest.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpRequest.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpRequest.java Sun Jul 31 17:31:47 2011
@@ -28,12 +28,12 @@ import org.apache.ahc.api.HttpConfig;
import org.apache.ahc.api.HttpListener;
import org.apache.ahc.api.HttpRequest;
import org.apache.ahc.api.HttpVerb;
-import org.apache.ahc.api.MimeContent;
-import org.apache.ahc.api.listeners.MimeContentListener;
+import org.apache.ahc.api.mime.MimeContent;
+import org.apache.ahc.api.mime.MimeListener;
/**
- * @version $Revision: $ $Date: $
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public class AsyncHttpRequest extends HttpRequest
{
@@ -43,7 +43,7 @@ public class AsyncHttpRequest extends Ht
{
}
- public AsyncHttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeContentListener> listeners, int timeout, TimeUnit timeUnit)
+ public AsyncHttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeListener> listeners, int timeout, TimeUnit timeUnit)
{
super(url, verb, headers, mimeContent, listeners, timeout, timeUnit);
}
@@ -94,7 +94,7 @@ public class AsyncHttpRequest extends Ht
}
@Override
- public Object getValue(String key)
+ public Object getEquip(String key)
{
return stack.get(key);
}
Modified: mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/HttpClientFutureImpl.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/HttpClientFutureImpl.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/HttpClientFutureImpl.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/HttpClientFutureImpl.java Sun Jul 31 17:31:47 2011
@@ -31,7 +31,7 @@ import org.apache.ahc.api.HttpClientFutu
/**
- * @version $Revision: $ $Date: $
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
class HttpClientFutureImpl<V> implements HttpClientFuture<V>
{
Modified: mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/InputStreamBasedMimeContent.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/InputStreamBasedMimeContent.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/InputStreamBasedMimeContent.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/InputStreamBasedMimeContent.java Sun Jul 31 17:31:47 2011
@@ -20,7 +20,7 @@ package org.apache.ahc.mina2;
import java.io.InputStream;
-import org.apache.ahc.api.MimeInputStream;
+import org.apache.ahc.api.mime.MimeInputStream;
/**
Modified: mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/listeners/SslBenchmarkListener.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/listeners/SslBenchmarkListener.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/listeners/SslBenchmarkListener.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/listeners/SslBenchmarkListener.java Sun Jul 31 17:31:47 2011
@@ -19,7 +19,7 @@
package com.acme.ahc.listeners;
/**
- * @version $Revision: $ $Date: $
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public interface SslBenchmarkListener extends BenchmarkListener
{
Modified: mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/client/EquipmentStackTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/client/EquipmentStackTest.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/client/EquipmentStackTest.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/client/EquipmentStackTest.java Sun Jul 31 17:31:47 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ahc.mina2;
+package org.apache.ahc.client;
import java.util.EmptyStackException;
import java.util.Set;
@@ -30,6 +30,7 @@ import org.junit.Test;
import org.apache.ahc.api.HttpConfig;
import org.apache.ahc.api.HttpListener;
+import org.apache.ahc.mina2.EquipmentStack;
/**
Modified: mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpBatch.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpBatch.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpBatch.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpBatch.java Sun Jul 31 17:31:47 2011
@@ -18,7 +18,6 @@
*/
package org.apache.ahc.mina3;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -35,7 +34,7 @@ import org.apache.ahc.api.HttpListener;
import org.apache.ahc.api.HttpRequest;
import org.apache.ahc.api.HttpResponse;
import org.apache.ahc.api.HttpVerb;
-import org.apache.ahc.api.MimeContent;
+import org.apache.ahc.api.mime.MimeContent;
/**
@@ -62,11 +61,11 @@ public class AsyncHttpBatch implements H
return this;
}
- public HttpBatch get(String url) throws MalformedURLException
+ public HttpBatch get(URL url)
{
HttpRequest request = new AsyncHttpRequest();
- request.setUrl(new URL(url));
+ request.setUrl(url);
request.setVerb(HttpVerb.GET);
batch.add(request);
@@ -74,11 +73,11 @@ public class AsyncHttpBatch implements H
return this;
}
- public HttpBatch post(String url, Map<String, String> map, MimeContent... content) throws MalformedURLException
+ public HttpBatch post(URL url, Map<String, String> map, MimeContent... content)
{
HttpRequest request = new AsyncHttpRequest();
- request.setUrl(new URL(url));
+ request.setUrl(url);
request.setVerb(HttpVerb.POST);
request.addMimeContent(content);
@@ -120,28 +119,28 @@ public class AsyncHttpBatch implements H
return result; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public Object getValue(String key)
+ public Object getEquip(String key)
{
return stack.get(key);
}
- public HttpBatch addConfig(HttpConfig config)
+ public HttpBatch equipWith(HttpConfig config)
{
- stack.addConfig(config);
+ stack.equipWith(config);
return this;
}
- public HttpBatch addListener(HttpListener listener)
+ public HttpBatch equipWith(HttpListener listener)
{
- stack.addListener(listener);
+ stack.equipWith(listener);
return this;
}
- public HttpBatch addPair(String key, Object value)
+ public HttpBatch equipWith(String key, Object value)
{
- stack.addPair(key, value);
+ stack.equipWith(key, value);
return this;
}
Modified: mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpClient.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpClient.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpClient.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpClient.java Sun Jul 31 17:31:47 2011
@@ -39,8 +39,8 @@ import org.apache.ahc.api.HttpListener;
import org.apache.ahc.api.HttpRequest;
import org.apache.ahc.api.HttpResponse;
import org.apache.ahc.api.HttpVerb;
-import org.apache.ahc.api.MimeContent;
-import org.apache.ahc.api.listeners.MimeContentListener;
+import org.apache.ahc.api.mime.MimeContent;
+import org.apache.ahc.api.mime.MimeListener;
/**
@@ -55,9 +55,8 @@ public class AsyncHttpClient implements
{
this(new EquipmentStack());
- stack.addConfig(new DefaultIoSessionCache());
- stack.addConfig(new DefaultSslConfig());
- stack.addListener(new SslSessionConfigListener());
+ stack.equipWith(new DefaultIoSessionCache());
+ stack.equipWith(new DefaultSslConfig());
}
public AsyncHttpClient(EquipmentStack stack)
@@ -76,22 +75,22 @@ public class AsyncHttpClient implements
}
}
- public HttpClientFuture<HttpResponse> get(String url)
+ public HttpClientFuture<HttpResponse> get(URL url)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public HttpClientFuture<HttpResponse> post(String url, Map<String, String> map, MimeContent... content)
+ public HttpClientFuture<HttpResponse> post(URL url, Map<String, String> map, MimeContent... content)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public HttpClientFuture<HttpResponse> put(String url, Map<String, String> map, MimeContent... content)
+ public HttpClientFuture<HttpResponse> put(URL url, Map<String, String> map, MimeContent... content)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public HttpClientFuture<HttpResponse> delete(String url)
+ public HttpClientFuture<HttpResponse> delete(URL url)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
@@ -111,28 +110,28 @@ public class AsyncHttpClient implements
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public Object getValue(String key)
+ public Object getEquip(String key)
{
return stack.get(key);
}
public HttpClient equipWith(String key, Object value)
{
- stack.addPair(key, value);
+ stack.equipWith(key, value);
return this;
}
public HttpClient equipWith(HttpConfig config)
{
- stack.addConfig(config);
+ stack.equipWith(config);
return this;
}
public HttpClient equipWith(HttpListener listener)
{
- stack.addListener(listener);
+ stack.equipWith(listener);
return this;
}
@@ -156,7 +155,7 @@ public class AsyncHttpClient implements
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
- public HttpRequest allocateHttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeContentListener> listeners, int timeout, TimeUnit timeUnit)
+ public HttpRequest allocateHttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeListener> listeners, int timeout, TimeUnit timeUnit)
{
return null; //Todo change body of implemented methods use File | Settings | File Templates.
}
Modified: mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpConnection.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpConnection.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpConnection.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpConnection.java Sun Jul 31 17:31:47 2011
@@ -56,28 +56,28 @@ public class AsyncHttpConnection impleme
return httpClient;
}
- public Object getValue(String key)
+ public Object getEquip(String key)
{
return stack.get(key);
}
- public HttpConnection addConfig(HttpConfig config)
+ public HttpConnection equipWith(HttpConfig config)
{
- stack.addConfig(config);
+ stack.equipWith(config);
return this;
}
- public HttpConnection addListener(HttpListener listener)
+ public HttpConnection equipWith(HttpListener listener)
{
- stack.addListener(listener);
+ stack.equipWith(listener);
return this;
}
- public HttpConnection addPair(String key, Object value)
+ public HttpConnection equipWith(String key, Object value)
{
- stack.addPair(key, value);
+ stack.equipWith(key, value);
return this;
}
@@ -108,7 +108,7 @@ public class AsyncHttpConnection impleme
URL url = request.getUrl();
InetSocketAddress address = InetSocketAddress.createUnresolved(url.getHost(), url.getPort());
IoSessionCache cache = request.getConfig(IoSessionCache.class);
- IoConnector connector = (IoConnector)request.getValue(IoConnector.class.getName());
+ IoConnector connector = (IoConnector)request.getEquip(IoConnector.class.getName());
IoSession session = cache.getIoSession(connector, address);
final IoFuture<HttpResponse> ifhr = session.<HttpResponse>send(request);
Modified: mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpFactory.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpFactory.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpFactory.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpFactory.java Sun Jul 31 17:31:47 2011
@@ -33,12 +33,11 @@ public class AsyncHttpFactory implements
public AsyncHttpFactory()
{
- stack.addConfig(new DefaultIoSessionCache());
- stack.addConfig(new DefaultSslConfig());
- stack.addListener(new SslSessionConfigListener());
+ stack.equipWith(new DefaultIoSessionCache());
+ stack.equipWith(new DefaultSslConfig());
}
- public Object getValue(String key)
+ public Object getEquip(String key)
{
return stack.get(key);
}
@@ -50,21 +49,21 @@ public class AsyncHttpFactory implements
public HttpFactory equipWith(String key, Object value)
{
- stack.addPair(key, value);
+ stack.equipWith(key, value);
return this;
}
public HttpFactory equipWith(HttpConfig config)
{
- stack.addConfig(config);
+ stack.equipWith(config);
return this;
}
public HttpFactory equipWith(HttpListener listener)
{
- stack.addListener(listener);
+ stack.equipWith(listener);
return this;
}
Modified: mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpRequest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpRequest.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpRequest.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/AsyncHttpRequest.java Sun Jul 31 17:31:47 2011
@@ -28,12 +28,12 @@ import org.apache.ahc.api.HttpConfig;
import org.apache.ahc.api.HttpListener;
import org.apache.ahc.api.HttpRequest;
import org.apache.ahc.api.HttpVerb;
-import org.apache.ahc.api.MimeContent;
-import org.apache.ahc.api.listeners.MimeContentListener;
+import org.apache.ahc.api.mime.MimeContent;
+import org.apache.ahc.api.mime.MimeListener;
/**
- * @version $Revision: $ $Date: $
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public class AsyncHttpRequest extends HttpRequest
{
@@ -43,7 +43,7 @@ public class AsyncHttpRequest extends Ht
{
}
- public AsyncHttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeContentListener> listeners, int timeout, TimeUnit timeUnit)
+ public AsyncHttpRequest(URL url, HttpVerb verb, HttpHeaders headers, List<MimeContent> mimeContent, List<MimeListener> listeners, int timeout, TimeUnit timeUnit)
{
super(url, verb, headers, mimeContent, listeners, timeout, timeUnit);
}
@@ -74,7 +74,7 @@ public class AsyncHttpRequest extends Ht
@Override
public HttpRequest equipWith(HttpConfig config)
{
- stack.addConfig(config);
+ stack.equipWith(config);
return this;
}
@@ -88,13 +88,13 @@ public class AsyncHttpRequest extends Ht
@Override
public HttpRequest equipWith(HttpListener listener)
{
- stack.addListener(listener);
+ stack.equipWith(listener);
return this;
}
@Override
- public Object getValue(String key)
+ public Object getEquip(String key)
{
return stack.get(key);
}
@@ -102,7 +102,7 @@ public class AsyncHttpRequest extends Ht
@Override
public HttpRequest equipWith(String key, Object value)
{
- stack.addPair(key, value);
+ stack.equipWith(key, value);
return this;
}
Modified: mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/EquipmentStack.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/EquipmentStack.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/EquipmentStack.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/EquipmentStack.java Sun Jul 31 17:31:47 2011
@@ -66,7 +66,7 @@ public class EquipmentStack implements C
return value;
}
- public synchronized void addPair(String key, Object value)
+ public synchronized void equipWith(String key, Object value)
{
stack.peek().equipWith(key, value);
}
@@ -77,7 +77,7 @@ public class EquipmentStack implements C
return stack.peek().getConfig(clazz);
}
- public synchronized void addConfig(HttpConfig config)
+ public synchronized void equipWith(HttpConfig config)
{
stack.peek().addConfig(config);
}
@@ -88,7 +88,7 @@ public class EquipmentStack implements C
return stack.peek().getListeners(clazz);
}
- public synchronized void addListener(HttpListener listener)
+ public synchronized void equipWith(HttpListener listener)
{
stack.peek().addListener(listener);
}
Modified: mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/HttpClientFutureAdaptor.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/HttpClientFutureAdaptor.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/HttpClientFutureAdaptor.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/HttpClientFutureAdaptor.java Sun Jul 31 17:31:47 2011
@@ -34,7 +34,7 @@ import org.apache.ahc.api.HttpClientFutu
/**
- * @version $Revision: $ $Date: $
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public class HttpClientFutureAdaptor<V> implements HttpClientFuture<V>
{
Modified: mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/InputStreamBasedMimeContent.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/InputStreamBasedMimeContent.java?rev=1152600&r1=1152599&r2=1152600&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/InputStreamBasedMimeContent.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/InputStreamBasedMimeContent.java Sun Jul 31 17:31:47 2011
@@ -20,7 +20,7 @@ package org.apache.ahc.mina3;
import java.io.InputStream;
-import org.apache.ahc.api.MimeInputStream;
+import org.apache.ahc.api.mime.MimeInputStream;
/**