Author: adc
Date: Tue Mar 16 23:04:49 2010
New Revision: 924039
URL: http://svn.apache.org/viewvc?rev=924039&view=rev
Log:
Renamed for clarity
Modified:
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/HttpRequest.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/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/test/java/com/acme/ahc/AcmeHttpClient.java
mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/AcmeHttpRequest.java
mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/api/ClientTest.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/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/nio/NioSocketConnector.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/SslConfig.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/org/apache/ahc/BenchMark.java
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/api/ClientTest.java
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/client/EquipmentStackTest.java
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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -35,11 +35,11 @@ public interface HttpBatch extends Provi
HttpBatchFuture submit();
- HttpBatch equipWith(HttpConfig config);
+ HttpBatch addConfig(HttpConfig config);
- HttpBatch equipWith(HttpListener listener);
+ HttpBatch addListener(HttpListener listener);
- HttpBatch equipWith(String key, Object value);
+ HttpBatch addPair(String key, Object value);
HttpBatch push();
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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -167,7 +167,7 @@ public abstract class HttpRequest implem
public abstract HttpRequest equipWith(HttpListener listener);
- public abstract Object getEquip(String key);
+ public abstract Object getValue(String key);
public abstract HttpRequest equipWith(String key, Object value);
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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -23,5 +23,5 @@ package org.apache.ahc.api;
*/
public interface Provisionable
{
- Object getEquip(String key);
+ Object getValue(String key);
}
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=924039&r1=924038&r2=924039&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 Tue
Mar 16 23:04:49 2010
@@ -38,7 +38,7 @@ import org.apache.ahc.api.MimeContent;
*/
public class AcmeHttpClient implements HttpClient
{
- public Object getEquip(String key)
+ public Object getValue(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/AcmeHttpRequest.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/test/java/com/acme/ahc/AcmeHttpRequest.java?rev=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -55,7 +55,7 @@ public class AcmeHttpRequest extends Htt
}
@Override
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return null; //Todo change body of implemented methods use File |
Settings | File Templates.
}
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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -60,8 +60,8 @@ public class ClientTest
.get("http://rest.acme.com/rest/student/324525?token=dFWEGV8ss63dmcs0245c";)
.push()
- .equipWith(new AcmeSslBenchmarkListener())
- .equipWith("OBJECT_HANDLE", new AcmeMockHandle())
+ .addListener(new AcmeSslBenchmarkListener())
+ .addPair("OBJECT_HANDLE", new AcmeMockHandle())
.get("https://rest.acme.com/rest/student/5246?token=dFWEGV8ss63dmcs0245c";)
.pop()
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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -80,26 +80,26 @@ public class AsyncHttpBatch implements H
return null; //Todo change body of implemented methods use File |
Settings | File Templates.
}
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return stack.get(key);
}
- public HttpBatch equipWith(HttpConfig config)
+ public HttpBatch addConfig(HttpConfig config)
{
stack.equipWith(config);
return this;
}
- public HttpBatch equipWith(HttpListener listener)
+ public HttpBatch addListener(HttpListener listener)
{
stack.equipWith(listener);
return this;
}
- public HttpBatch equipWith(String key, Object value)
+ public HttpBatch addPair(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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -106,7 +106,7 @@ public class AsyncHttpClient implements
return null; //Todo change body of implemented methods use File |
Settings | File Templates.
}
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return stack.get(key);
}
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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -59,7 +59,7 @@ public class AsyncHttpConnection impleme
return httpClient;
}
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return stack.get(key);
}
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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -38,7 +38,7 @@ public class AsyncHttpFactory implements
stack.equipWith(new SslSessionConfigListener());
}
- public Object getEquip(String key)
+ public Object getValue(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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -94,7 +94,7 @@ public class AsyncHttpRequest extends Ht
}
@Override
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return stack.get(key);
}
Modified:
mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/AcmeHttpClient.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/AcmeHttpClient.java?rev=924039&r1=924038&r2=924039&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/AcmeHttpClient.java
(original)
+++ mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/AcmeHttpClient.java
Tue Mar 16 23:04:49 2010
@@ -38,7 +38,7 @@ import org.apache.ahc.api.MimeContent;
*/
public class AcmeHttpClient implements HttpClient
{
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return null; //Todo change body of implemented methods use File |
Settings | File Templates.
}
Modified:
mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/AcmeHttpRequest.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/AcmeHttpRequest.java?rev=924039&r1=924038&r2=924039&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/AcmeHttpRequest.java
(original)
+++ mina/sandbox/adc/ahc/mina2/src/test/java/com/acme/ahc/AcmeHttpRequest.java
Tue Mar 16 23:04:49 2010
@@ -55,7 +55,7 @@ public class AcmeHttpRequest extends Htt
}
@Override
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return null; //Todo change body of implemented methods use File |
Settings | File Templates.
}
Modified:
mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/api/ClientTest.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/api/ClientTest.java?rev=924039&r1=924038&r2=924039&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/api/ClientTest.java
(original)
+++ mina/sandbox/adc/ahc/mina2/src/test/java/org/apache/ahc/api/ClientTest.java
Tue Mar 16 23:04:49 2010
@@ -60,8 +60,8 @@ public class ClientTest
.get("http://rest.acme.com/rest/student/324525?token=dFWEGV8ss63dmcs0245c";)
.push()
- .equipWith(new AcmeSslBenchmarkListener())
- .equipWith("OBJECT_HANDLE", new AcmeMockHandle())
+ .addListener(new AcmeSslBenchmarkListener())
+ .addPair("OBJECT_HANDLE", new AcmeMockHandle())
.get("https://rest.acme.com/rest/student/5246?token=dFWEGV8ss63dmcs0245c";)
.pop()
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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -120,28 +120,28 @@ public class AsyncHttpBatch implements H
return result; //Todo change body of implemented methods use File |
Settings | File Templates.
}
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return stack.get(key);
}
- public HttpBatch equipWith(HttpConfig config)
+ public HttpBatch addConfig(HttpConfig config)
{
- stack.equipWith(config);
+ stack.addConfig(config);
return this;
}
- public HttpBatch equipWith(HttpListener listener)
+ public HttpBatch addListener(HttpListener listener)
{
- stack.equipWith(listener);
+ stack.addListener(listener);
return this;
}
- public HttpBatch equipWith(String key, Object value)
+ public HttpBatch addPair(String key, Object value)
{
- stack.equipWith(key, value);
+ stack.addPair(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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.ahc.api.HttpBatch;
import org.apache.ahc.api.HttpClient;
import org.apache.ahc.api.HttpClientFuture;
-import org.apache.ahc.api.HttpClientFutureImpl;
import org.apache.ahc.api.HttpConfig;
import org.apache.ahc.api.HttpConnection;
import org.apache.ahc.api.HttpListener;
@@ -50,9 +49,9 @@ public class AsyncHttpClient implements
{
this(new EquipmentStack());
- stack.equipWith(new DefaultIoSessionCache());
- stack.equipWith(new DefaultSslConfig());
- stack.equipWith(new SslSessionConfigListener());
+ stack.addConfig(new DefaultIoSessionCache());
+ stack.addConfig(new DefaultSslConfig());
+ stack.addListener(new SslSessionConfigListener());
}
public AsyncHttpClient(EquipmentStack stack)
@@ -107,28 +106,28 @@ public class AsyncHttpClient implements
return null; //Todo change body of implemented methods use File |
Settings | File Templates.
}
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return stack.get(key);
}
public HttpClient equipWith(String key, Object value)
{
- stack.equipWith(key, value);
+ stack.addPair(key, value);
return this;
}
public HttpClient equipWith(HttpConfig config)
{
- stack.equipWith(config);
+ stack.addConfig(config);
return this;
}
public HttpClient equipWith(HttpListener listener)
{
- stack.equipWith(listener);
+ stack.addListener(listener);
return this;
}
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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -58,28 +58,28 @@ public class AsyncHttpConnection impleme
return httpClient;
}
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return stack.get(key);
}
public HttpConnection equipWith(HttpConfig config)
{
- stack.equipWith(config);
+ stack.addConfig(config);
return this;
}
public HttpConnection equipWith(HttpListener listener)
{
- stack.equipWith(listener);
+ stack.addListener(listener);
return this;
}
public HttpConnection equipWith(String key, Object value)
{
- stack.equipWith(key, value);
+ stack.addPair(key, value);
return this;
}
@@ -110,7 +110,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.getEquip(IoConnector.class.getName());
+ IoConnector connector =
(IoConnector)request.getValue(IoConnector.class.getName());
final AtomicReference<ChangeListener<HttpResponse>>
listenerReference = new AtomicReference<ChangeListener<HttpResponse>>();
IoSession session = cache.getIoSession(connector, address);
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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -33,12 +33,12 @@ public class AsyncHttpFactory implements
public AsyncHttpFactory()
{
- stack.equipWith(new DefaultIoSessionCache());
- stack.equipWith(new DefaultSslConfig());
- stack.equipWith(new SslSessionConfigListener());
+ stack.addConfig(new DefaultIoSessionCache());
+ stack.addConfig(new DefaultSslConfig());
+ stack.addListener(new SslSessionConfigListener());
}
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return stack.get(key);
}
@@ -50,21 +50,21 @@ public class AsyncHttpFactory implements
public HttpFactory equipWith(String key, Object value)
{
- stack.equipWith(key, value);
+ stack.addPair(key, value);
return this;
}
public HttpFactory equipWith(HttpConfig config)
{
- stack.equipWith(config);
+ stack.addConfig(config);
return this;
}
public HttpFactory equipWith(HttpListener listener)
{
- stack.equipWith(listener);
+ stack.addListener(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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -74,7 +74,7 @@ public class AsyncHttpRequest extends Ht
@Override
public HttpRequest equipWith(HttpConfig config)
{
- stack.equipWith(config);
+ stack.addConfig(config);
return this;
}
@@ -88,13 +88,13 @@ public class AsyncHttpRequest extends Ht
@Override
public HttpRequest equipWith(HttpListener listener)
{
- stack.equipWith(listener);
+ stack.addListener(listener);
return this;
}
@Override
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return stack.get(key);
}
@@ -102,7 +102,7 @@ public class AsyncHttpRequest extends Ht
@Override
public HttpRequest equipWith(String key, Object value)
{
- stack.equipWith(key, value);
+ stack.addPair(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=924039&r1=924038&r2=924039&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
Tue Mar 16 23:04:49 2010
@@ -66,7 +66,7 @@ public class EquipmentStack implements C
return value;
}
- public synchronized void equipWith(String key, Object value)
+ public synchronized void addPair(String key, Object value)
{
stack.peek().equipWith(key, value);
}
@@ -77,9 +77,9 @@ public class EquipmentStack implements C
return stack.peek().getConfig(clazz);
}
- public synchronized void equipWith(HttpConfig config)
+ public synchronized void addConfig(HttpConfig config)
{
- stack.peek().equipWith(config);
+ stack.peek().addConfig(config);
}
@SuppressWarnings({"unchecked"})
@@ -88,9 +88,9 @@ public class EquipmentStack implements C
return stack.peek().getListeners(clazz);
}
- public synchronized void equipWith(HttpListener listener)
+ public synchronized void addListener(HttpListener listener)
{
- stack.peek().equipWith(listener);
+ stack.peek().addListener(listener);
}
public synchronized void push()
@@ -180,7 +180,7 @@ public class EquipmentStack implements C
return (T)configMap.get(clazz);
}
- public void equipWith(HttpConfig config)
+ public void addConfig(HttpConfig config)
{
for (Class clazz : collectConfigurations(config.getClass()))
{
@@ -194,7 +194,7 @@ public class EquipmentStack implements C
return (Set<T>)listeners.get(clazz);
}
- public void equipWith(HttpListener listener)
+ public void addListener(HttpListener listener)
{
for (Class clazz : collectInterfaces(listener.getClass()))
{
Modified:
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoConfig.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoConfig.java?rev=924039&r1=924038&r2=924039&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoConfig.java
(original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoConfig.java
Tue Mar 16 23:04:49 2010
@@ -19,6 +19,8 @@
package org.apache.mina.core;
/**
+ * A simple tag interface that marks a class as a configuration object.
+ *
* @version $Revision: $ $Date: $
*/
public interface IoConfig
Modified:
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoConnector.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoConnector.java?rev=924039&r1=924038&r2=924039&view=diff
==============================================================================
---
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoConnector.java
(original)
+++
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoConnector.java
Tue Mar 16 23:04:49 2010
@@ -31,11 +31,11 @@ public interface IoConnector
IoFuture<IoSession> connect(InetSocketAddress address, SocketAddress
local);
- IoConnector equipWith(String key, Object value);
+ IoConnector addPair(String key, Object value);
- IoConnector equipWith(IoConfig config);
+ IoConnector addConfig(IoConfig config);
- IoConnector equipWith(IoListener listener);
+ IoConnector addPair(IoListener listener);
IoConnector push();
Modified:
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/nio/NioSocketConnector.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/nio/NioSocketConnector.java?rev=924039&r1=924038&r2=924039&view=diff
==============================================================================
---
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/nio/NioSocketConnector.java
(original)
+++
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/nio/NioSocketConnector.java
Tue Mar 16 23:04:49 2010
@@ -43,17 +43,17 @@ public class NioSocketConnector implemen
return null; //Todo change body of implemented methods use File |
Settings | File Templates.
}
- public IoConnector equipWith(String key, Object value)
+ public IoConnector addPair(String key, Object value)
{
return null; //Todo change body of implemented methods use File |
Settings | File Templates.
}
- public IoConnector equipWith(IoConfig config)
+ public IoConnector addConfig(IoConfig config)
{
return null; //Todo change body of implemented methods use File |
Settings | File Templates.
}
- public IoConnector equipWith(IoListener listener)
+ public IoConnector addPair(IoListener listener)
{
return null; //Todo change body of implemented methods use File |
Settings | File Templates.
}
Modified:
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/SslConfig.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/SslConfig.java?rev=924039&r1=924038&r2=924039&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/SslConfig.java
(original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/SslConfig.java
Tue Mar 16 23:04:49 2010
@@ -45,9 +45,10 @@ public class SslConfig implements IoConf
return lazyHandshake;
}
- public void setLazyHandshake(boolean lazyHandshake)
+ public SslConfig setLazyHandshake(boolean lazyHandshake)
{
this.lazyHandshake = lazyHandshake;
+ return this;
}
public boolean isClientMode()
@@ -55,9 +56,10 @@ public class SslConfig implements IoConf
return clientMode;
}
- public void setClientMode(boolean clientMode)
+ public SslConfig setClientMode(boolean clientMode)
{
this.clientMode = clientMode;
+ return this;
}
public SSLContext getSslContext()
@@ -65,9 +67,10 @@ public class SslConfig implements IoConf
return sslContext;
}
- public void setSslContext(SSLContext sslContext)
+ public SslConfig setSslContext(SSLContext sslContext)
{
this.sslContext = sslContext;
+ return this;
}
public String[] getSslProtocols()
@@ -75,10 +78,11 @@ public class SslConfig implements IoConf
return sslProtocols;
}
- public void setSslProtocols(String[] sslProtocols)
+ public SslConfig setSslProtocols(String[] sslProtocols)
{
this.sslProtocols = new String[sslProtocols.length];
System.arraycopy(sslProtocols, 0, this.sslProtocols, 0,
sslProtocols.length);
+ return this;
}
public KeyManager[] getKeyManagers()
@@ -86,10 +90,11 @@ public class SslConfig implements IoConf
return keyManagers;
}
- public void setKeyManagers(KeyManager[] keyManagers)
+ public SslConfig setKeyManagers(KeyManager[] keyManagers)
{
this.keyManagers = new KeyManager[keyManagers.length];
System.arraycopy(keyManagers, 0, this.keyManagers, 0,
keyManagers.length);
+ return this;
}
public TrustManager[] getTrustManagers()
@@ -97,10 +102,11 @@ public class SslConfig implements IoConf
return trustManagers;
}
- public void setTrustManagers(TrustManager[] trustManagers)
+ public SslConfig setTrustManagers(TrustManager[] trustManagers)
{
this.trustManagers = new TrustManager[trustManagers.length];
System.arraycopy(trustManagers, 0, this.trustManagers, 0,
trustManagers.length);
+ return this;
}
public SecureRandom getSecureRandom()
@@ -108,9 +114,10 @@ public class SslConfig implements IoConf
return secureRandom;
}
- public void setSecureRandom(SecureRandom secureRandom)
+ public SslConfig setSecureRandom(SecureRandom secureRandom)
{
this.secureRandom = secureRandom;
+ return this;
}
public String[] getEnabledCipherSuites()
@@ -118,9 +125,10 @@ public class SslConfig implements IoConf
return enabledCipherSuites;
}
- public void setEnabledCipherSuites(String[] enabledCipherSuites)
+ public SslConfig setEnabledCipherSuites(String[] enabledCipherSuites)
{
this.enabledCipherSuites = new String[enabledCipherSuites.length];
System.arraycopy(enabledCipherSuites, 0, this.enabledCipherSuites, 0,
enabledCipherSuites.length);
+ return this;
}
}
Modified:
mina/sandbox/adc/ahc/mina3/src/test/java/com/acme/ahc/AcmeHttpClient.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/test/java/com/acme/ahc/AcmeHttpClient.java?rev=924039&r1=924038&r2=924039&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/test/java/com/acme/ahc/AcmeHttpClient.java
(original)
+++ mina/sandbox/adc/ahc/mina3/src/test/java/com/acme/ahc/AcmeHttpClient.java
Tue Mar 16 23:04:49 2010
@@ -38,7 +38,7 @@ import org.apache.ahc.api.MimeContent;
*/
public class AcmeHttpClient implements HttpClient
{
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return null; //Todo change body of implemented methods use File |
Settings | File Templates.
}
Modified:
mina/sandbox/adc/ahc/mina3/src/test/java/com/acme/ahc/AcmeHttpRequest.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/test/java/com/acme/ahc/AcmeHttpRequest.java?rev=924039&r1=924038&r2=924039&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/test/java/com/acme/ahc/AcmeHttpRequest.java
(original)
+++ mina/sandbox/adc/ahc/mina3/src/test/java/com/acme/ahc/AcmeHttpRequest.java
Tue Mar 16 23:04:49 2010
@@ -55,7 +55,7 @@ public class AcmeHttpRequest extends Htt
}
@Override
- public Object getEquip(String key)
+ public Object getValue(String key)
{
return null; //Todo change body of implemented methods use File |
Settings | File Templates.
}
Modified: mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/BenchMark.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/BenchMark.java?rev=924039&r1=924038&r2=924039&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/BenchMark.java
(original)
+++ mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/BenchMark.java Tue
Mar 16 23:04:49 2010
@@ -38,7 +38,7 @@ public class BenchMark
{
EquipmentStack stack = new EquipmentStack();
- for (int i = 0; i < 1000; i++) stack.equipWith("" + i, new Object());
+ for (int i = 0; i < 1000; i++) stack.addPair("" + i, new Object());
long start = System.currentTimeMillis();
final int COUNT = 100000;
Modified:
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/api/ClientTest.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/api/ClientTest.java?rev=924039&r1=924038&r2=924039&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/api/ClientTest.java
(original)
+++ mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/api/ClientTest.java
Tue Mar 16 23:04:49 2010
@@ -32,8 +32,6 @@ import java.util.Map;
import java.util.Random;
import java.util.concurrent.TimeUnit;
-import com.acme.ahc.AcmeHttpClient;
-import com.acme.ahc.AcmeHttpRequest;
import com.acme.ahc.AcmeMockHandle;
import com.acme.ahc.listeners.AcmeSslBenchmarkListener;
import com.acme.ahc.listeners.AcmeSslCertificatManager;
@@ -62,8 +60,8 @@ public class ClientTest
.get("http://rest.acme.com/rest/student/324525?token=dFWEGV8ss63dmcs0245c";)
.push()
- .equipWith(new AcmeSslBenchmarkListener())
- .equipWith("OBJECT_HANDLE", new AcmeMockHandle())
+ .addListener(new AcmeSslBenchmarkListener())
+ .addPair("OBJECT_HANDLE", new AcmeMockHandle())
.get("https://rest.acme.com/rest/student/5246?token=dFWEGV8ss63dmcs0245c";)
.pop()
Modified:
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/client/EquipmentStackTest.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/client/EquipmentStackTest.java?rev=924039&r1=924038&r2=924039&view=diff
==============================================================================
---
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/client/EquipmentStackTest.java
(original)
+++
mina/sandbox/adc/ahc/mina3/src/test/java/org/apache/ahc/client/EquipmentStackTest.java
Tue Mar 16 23:04:49 2010
@@ -42,13 +42,13 @@ public class EquipmentStackTest
{
EquipmentStack stack = new EquipmentStack();
- stack.equipWith("FOO", "BAR");
+ stack.addPair("FOO", "BAR");
assertEquals("BAR", stack.get("FOO"));
stack.push();
- stack.equipWith("CDR", "CAR");
- stack.equipWith("FOO", "CAT");
+ stack.addPair("CDR", "CAR");
+ stack.addPair("FOO", "CAT");
assertEquals("CAR", stack.get("CDR"));
assertEquals("CAT", stack.get("FOO"));
@@ -84,7 +84,7 @@ public class EquipmentStackTest
{
EquipmentStack stack = new EquipmentStack();
- stack.equipWith(new A("A1"));
+ stack.addListener(new A("A1"));
Set set = stack.getListeners(AListener.class);
assertNotNull(set);
@@ -92,7 +92,7 @@ public class EquipmentStackTest
assertEquals("A1", ((A)set.iterator().next()).getS());
stack.push();
- stack.equipWith(new A("A2"));
+ stack.addListener(new A("A2"));
set = stack.getListeners(AListener.class);
assertNotNull(set);
@@ -113,7 +113,7 @@ public class EquipmentStackTest
assertEquals(1, set.size());
assertEquals("A1", ((A)set.iterator().next()).getS());
- stack.equipWith(new B("B1"));
+ stack.addListener(new B("B1"));
set = stack.getListeners(AListener.class);
assertNotNull(set);
@@ -127,7 +127,7 @@ public class EquipmentStackTest
assertTrue(a1);
assertTrue(b1);
- stack.equipWith(new C("C1"));
+ stack.addListener(new C("C1"));
set = stack.getListeners(AListener.class);
assertNotNull(set);
@@ -157,7 +157,7 @@ public class EquipmentStackTest
assertFalse(b1);
assertTrue(c1);
- stack.equipWith(new D("D1"));
+ stack.addListener(new D("D1"));
set = stack.getListeners(AListener.class);
assertNotNull(set);
@@ -197,14 +197,14 @@ public class EquipmentStackTest
{
EquipmentStack stack = new EquipmentStack();
- stack.equipWith(new X("X1"));
+ stack.addConfig(new X("X1"));
X x = stack.getConfig(X.class);
assertNotNull(x);
assertEquals("X1", x.getS());
stack.push();
- stack.equipWith(new X("X2"));
+ stack.addConfig(new X("X2"));
x = stack.getConfig(X.class);
assertNotNull(x);
@@ -222,7 +222,7 @@ public class EquipmentStackTest
assertNotNull(x);
assertEquals("X1", x.getS());
- stack.equipWith(new Y("Y1"));
+ stack.addConfig(new Y("Y1"));
x = stack.getConfig(X.class);
assertNotNull(x);
@@ -315,4 +315,4 @@ public class EquipmentStackTest
super(s);
}
}
-}
\ No newline at end of file
+}
