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 2009/12/19 19:21:29 UTC
svn commit: r892493 - in /mina/sandbox/adc/ahc: api/ mina2/
mina2/src/main/java/org/apache/ahc/mina2/
mina2/src/main/java/org/apache/ahc/mina2/api/ mina3/
mina3/src/main/java/org/apache/ahc/mina3/api/
mina3/src/main/java/org/apache/mina/core/
Author: adc
Date: Sat Dec 19 18:21:28 2009
New Revision: 892493
URL: http://svn.apache.org/viewvc?rev=892493&view=rev
Log:
Code reformat
Modified:
mina/sandbox/adc/ahc/api/pom.xml
mina/sandbox/adc/ahc/mina2/pom.xml
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/DefaultIoSessionCache.java
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/HttpRequestEncoder.java
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/ProtocolCodecFilterSessionConfigListener.java
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/SslSessionConfigListener.java
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/api/IoSessionCache.java
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/api/SessionConfigListener.java
mina/sandbox/adc/ahc/mina3/pom.xml
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/api/IoSessionCache.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/AbstractIoChannel.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/IoConnector.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoSession.java
Modified: mina/sandbox/adc/ahc/api/pom.xml
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/pom.xml?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/pom.xml (original)
+++ mina/sandbox/adc/ahc/api/pom.xml Sat Dec 19 18:21:28 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.ahc</groupId>
<artifactId>project</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>api</artifactId>
Modified: mina/sandbox/adc/ahc/mina2/pom.xml
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/pom.xml?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/pom.xml (original)
+++ mina/sandbox/adc/ahc/mina2/pom.xml Sat Dec 19 18:21:28 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.ahc</groupId>
<artifactId>project</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>mina2</artifactId>
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=892493&r1=892492&r2=892493&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 Sat Dec 19 18:21:28 2009
@@ -25,8 +25,6 @@
import java.util.Queue;
import java.util.concurrent.TimeUnit;
-import org.apache.mina.core.session.IoSession;
-
import org.apache.ahc.api.HttpBatch;
import org.apache.ahc.api.HttpClient;
import org.apache.ahc.api.HttpClientFutureImpl;
@@ -36,6 +34,7 @@
import org.apache.ahc.api.HttpRequest;
import org.apache.ahc.api.HttpResponse;
import org.apache.ahc.api.MimeContent;
+import org.apache.mina.core.session.IoSession;
/**
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=892493&r1=892492&r2=892493&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 Sat Dec 19 18:21:28 2009
@@ -21,14 +21,6 @@
import java.net.InetSocketAddress;
import java.net.URL;
-import org.apache.mina.core.future.ConnectFuture;
-import org.apache.mina.core.future.DefaultConnectFuture;
-import org.apache.mina.core.future.IoFuture;
-import org.apache.mina.core.future.IoFutureListener;
-import org.apache.mina.core.service.IoConnector;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.transport.socket.nio.NioSocketConnector;
-
import org.apache.ahc.api.HttpClient;
import org.apache.ahc.api.HttpClientFutureImpl;
import org.apache.ahc.api.HttpConfig;
@@ -38,6 +30,13 @@
import org.apache.ahc.api.HttpResponse;
import org.apache.ahc.mina2.api.IoSessionCache;
import org.apache.ahc.mina2.api.SessionConfigListener;
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.future.DefaultConnectFuture;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.service.IoConnector;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
/**
Modified: mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/DefaultIoSessionCache.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/DefaultIoSessionCache.java?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/DefaultIoSessionCache.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/DefaultIoSessionCache.java Sat Dec 19 18:21:28 2009
@@ -20,12 +20,11 @@
import java.net.InetSocketAddress;
+import org.apache.ahc.mina2.api.IoSessionCache;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.service.IoConnector;
import org.apache.mina.core.session.IoSession;
-import org.apache.ahc.mina2.api.IoSessionCache;
-
/**
* @version $Revision$ $Date$
Modified: mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/HttpRequestEncoder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/HttpRequestEncoder.java?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/HttpRequestEncoder.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/HttpRequestEncoder.java Sat Dec 19 18:21:28 2009
@@ -18,12 +18,11 @@
*/
package org.apache.ahc.mina2;
+import org.apache.ahc.api.HttpRequest;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-import org.apache.ahc.api.HttpRequest;
-
/**
* @version $Revision$ $Date$
Modified: mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/ProtocolCodecFilterSessionConfigListener.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/ProtocolCodecFilterSessionConfigListener.java?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/ProtocolCodecFilterSessionConfigListener.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/ProtocolCodecFilterSessionConfigListener.java Sat Dec 19 18:21:28 2009
@@ -18,11 +18,10 @@
*/
package org.apache.ahc.mina2;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolCodecFilter;
-
import org.apache.ahc.api.HttpRequest;
import org.apache.ahc.mina2.api.SessionConfigListener;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFilter;
/**
Modified: mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/SslSessionConfigListener.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/SslSessionConfigListener.java?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/SslSessionConfigListener.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/SslSessionConfigListener.java Sat Dec 19 18:21:28 2009
@@ -21,11 +21,10 @@
import javax.net.ssl.SSLContext;
import java.security.GeneralSecurityException;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.ssl.SslFilter;
-
import org.apache.ahc.api.HttpRequest;
import org.apache.ahc.mina2.api.SessionConfigListener;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.ssl.SslFilter;
/**
Modified: mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/api/IoSessionCache.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/api/IoSessionCache.java?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/api/IoSessionCache.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/api/IoSessionCache.java Sat Dec 19 18:21:28 2009
@@ -20,11 +20,10 @@
import java.net.InetSocketAddress;
+import org.apache.ahc.api.HttpConfig;
import org.apache.mina.core.service.IoConnector;
import org.apache.mina.core.session.IoSession;
-import org.apache.ahc.api.HttpConfig;
-
/**
* @version $Revision$ $Date$
Modified: mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/api/SessionConfigListener.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/api/SessionConfigListener.java?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/api/SessionConfigListener.java (original)
+++ mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/api/SessionConfigListener.java Sat Dec 19 18:21:28 2009
@@ -18,10 +18,9 @@
*/
package org.apache.ahc.mina2.api;
-import org.apache.mina.core.session.IoSession;
-
import org.apache.ahc.api.HttpListener;
import org.apache.ahc.api.HttpRequest;
+import org.apache.mina.core.session.IoSession;
/**
Modified: mina/sandbox/adc/ahc/mina3/pom.xml
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/pom.xml?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/pom.xml (original)
+++ mina/sandbox/adc/ahc/mina3/pom.xml Sat Dec 19 18:21:28 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.ahc</groupId>
<artifactId>project</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>mina3</artifactId>
@@ -47,5 +47,5 @@
</dependency>
</dependencies>
-
+
</project>
Modified: mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/api/IoSessionCache.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/api/IoSessionCache.java?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/api/IoSessionCache.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/api/IoSessionCache.java Sat Dec 19 18:21:28 2009
@@ -20,11 +20,10 @@
import java.net.InetSocketAddress;
+import org.apache.ahc.api.HttpConfig;
import org.apache.mina.core.IoConnector;
import org.apache.mina.core.IoSession;
-import org.apache.ahc.api.HttpConfig;
-
/**
* @version $Revision$ $Date$
Modified: mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/api/SessionConfigListener.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/api/SessionConfigListener.java?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/api/SessionConfigListener.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/ahc/mina3/api/SessionConfigListener.java Sat Dec 19 18:21:28 2009
@@ -18,10 +18,9 @@
*/
package org.apache.ahc.mina3.api;
-import org.apache.mina.core.IoSession;
-
import org.apache.ahc.api.HttpListener;
import org.apache.ahc.api.HttpRequest;
+import org.apache.mina.core.IoSession;
/**
Modified: mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/AbstractIoChannel.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/AbstractIoChannel.java?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/AbstractIoChannel.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/AbstractIoChannel.java Sat Dec 19 18:21:28 2009
@@ -127,7 +127,7 @@
public boolean remove(Object o)
{
- if (IoUp.class.isInstance(AbstractIoChannel.this)) ((AbstractIoChannel)o).getParents().add((IoUp)AbstractIoChannel.this);
+ if (IoUp.class.isInstance(AbstractIoChannel.this)) ((AbstractIoChannel)o).getParents().add((IoUp)AbstractIoChannel.this);
return c.remove(o);
}
@@ -135,7 +135,7 @@
public boolean addAll(Collection<? extends IoDown> c)
{
- if (IoUp.class.isInstance(AbstractIoChannel.this)) for (IoDown parent : c) parent.getParents().add((IoUp)AbstractIoChannel.this);
+ if (IoUp.class.isInstance(AbstractIoChannel.this)) for (IoDown parent : c) parent.getParents().add((IoUp)AbstractIoChannel.this);
return this.c.addAll(c);
}
@@ -180,4 +180,11 @@
return this;
}
+
+ public IoChannel equipWith(IoConfig config)
+ {
+ stack.equipWith(config);
+
+ return this;
+ }
}
Modified: mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoChannel.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoChannel.java?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoChannel.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoChannel.java Sat Dec 19 18:21:28 2009
@@ -18,9 +18,6 @@
*/
package org.apache.mina.core;
-import java.util.Set;
-
-
/**
* @version $Revision: $ $Date: $
*/
@@ -33,4 +30,6 @@
IoChannel equipWith(String key, Object value);
IoChannel equipWith(IoListener listener);
+
+ IoChannel equipWith(IoConfig config);
}
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=892493&r1=892492&r2=892493&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 Sat Dec 19 18:21:28 2009
@@ -21,9 +21,6 @@
import java.net.InetSocketAddress;
import java.util.concurrent.Future;
-import org.apache.ahc.api.HttpConfig;
-import org.apache.ahc.api.HttpListener;
-
/**
* @version $Revision: $ $Date: $
Modified: mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoSession.java
URL: http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoSession.java?rev=892493&r1=892492&r2=892493&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoSession.java (original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoSession.java Sat Dec 19 18:21:28 2009
@@ -31,13 +31,13 @@
void exceptionCaught(GeneralSecurityException gse);
- AbstractIoChannel getRoot();
+ IoChannel getRoot();
- Set<AbstractIoChannel> getChannels();
+ Set<IoChannel> getChannels();
- AbstractIoChannel getChannel(String filterName);
+ IoChannel getChannel(String filterName);
- void mark(AbstractIoChannel channel, String filterName);
+ void mark(IoChannel channel, String filterName);
IoSession equipWith(String key, Object value);