You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2011/09/03 14:49:41 UTC
svn commit: r1164859 - in /httpcomponents/httpcore/trunk/httpcore-nio/src:
main/java/org/apache/http/impl/nio/ main/java/org/apache/http/impl/nio/pool/
main/java/org/apache/http/impl/nio/reactor/
main/java/org/apache/http/impl/nio/ssl/ main/java/org/ap...
Author: olegk
Date: Sat Sep 3 12:49:40 2011
New Revision: 1164859
URL: http://svn.apache.org/viewvc?rev=1164859&view=rev
Log:
Removed references to the deprecated SSLIOSession class
Modified:
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/AbstractIODispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/IOSession.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLServer.java
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/AbstractIODispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/AbstractIODispatch.java?rev=1164859&r1=1164858&r2=1164859&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/AbstractIODispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/AbstractIODispatch.java Sat Sep 3 12:49:40 2011
@@ -30,10 +30,10 @@ package org.apache.http.impl.nio;
import java.io.IOException;
import org.apache.http.annotation.Immutable;
-import org.apache.http.impl.nio.reactor.SSLIOSession;
import org.apache.http.nio.NHttpConnection;
import org.apache.http.nio.reactor.IOEventDispatch;
import org.apache.http.nio.reactor.IOSession;
+import org.apache.http.nio.reactor.ssl.SSLIOSession;
import org.apache.http.protocol.ExecutionContext;
/**
@@ -94,7 +94,7 @@ public abstract class AbstractIODispatch
try {
ensureNotNull(conn);
SSLIOSession ssliosession = (SSLIOSession) session.getAttribute(
- IOSession.SSL_SESSION_KEY);
+ SSLIOSession.SESSION_KEY);
if (ssliosession == null) {
onInputReady(conn);
} else {
@@ -120,7 +120,7 @@ public abstract class AbstractIODispatch
try {
ensureNotNull(conn);
SSLIOSession ssliosession = (SSLIOSession) session.getAttribute(
- IOSession.SSL_SESSION_KEY);
+ SSLIOSession.SESSION_KEY);
if (ssliosession == null) {
onOutputReady(conn);
} else {
@@ -145,7 +145,7 @@ public abstract class AbstractIODispatch
T conn = (T) session.getAttribute(ExecutionContext.HTTP_CONNECTION);
try {
SSLIOSession ssliosession = (SSLIOSession) session.getAttribute(
- IOSession.SSL_SESSION_KEY);
+ SSLIOSession.SESSION_KEY);
ensureNotNull(conn);
if (ssliosession == null) {
onTimeout(conn);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java?rev=1164859&r1=1164858&r2=1164859&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java Sat Sep 3 12:49:40 2011
@@ -33,12 +33,12 @@ import javax.net.ssl.SSLContext;
import org.apache.http.HttpResponseFactory;
import org.apache.http.annotation.Immutable;
import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.impl.nio.reactor.SSLIOSession;
-import org.apache.http.impl.nio.reactor.SSLMode;
-import org.apache.http.impl.nio.reactor.SSLSetupHandler;
import org.apache.http.nio.NHttpClientConnection;
import org.apache.http.nio.NHttpConnectionFactory;
import org.apache.http.nio.reactor.IOSession;
+import org.apache.http.nio.reactor.ssl.SSLIOSession;
+import org.apache.http.nio.reactor.ssl.SSLMode;
+import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
import org.apache.http.nio.util.ByteBufferAllocator;
import org.apache.http.nio.util.HeapByteBufferAllocator;
import org.apache.http.params.HttpParams;
@@ -121,9 +121,9 @@ public class SSLNHttpClientConnectionFac
public NHttpClientConnection createConnection(final IOSession session) throws IOException {
SSLContext sslcontext = this.sslcontext != null ? this.sslcontext : getDefaultSSLContext();
- SSLIOSession ssliosession = new SSLIOSession(session, sslcontext, this.sslHandler);
- ssliosession.bind(SSLMode.CLIENT, this.params);
- session.setAttribute(IOSession.SSL_SESSION_KEY, ssliosession);
+ SSLIOSession ssliosession = new SSLIOSession(session, SSLMode.CLIENT, sslcontext, this.sslHandler);
+ ssliosession.initialize();
+ session.setAttribute(SSLIOSession.SESSION_KEY, ssliosession);
return createConnection(ssliosession, this.responseFactory, this.allocator, this.params);
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java?rev=1164859&r1=1164858&r2=1164859&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java Sat Sep 3 12:49:40 2011
@@ -33,12 +33,12 @@ import javax.net.ssl.SSLContext;
import org.apache.http.HttpRequestFactory;
import org.apache.http.annotation.Immutable;
import org.apache.http.impl.DefaultHttpRequestFactory;
-import org.apache.http.impl.nio.reactor.SSLIOSession;
-import org.apache.http.impl.nio.reactor.SSLMode;
-import org.apache.http.impl.nio.reactor.SSLSetupHandler;
import org.apache.http.nio.NHttpConnectionFactory;
import org.apache.http.nio.NHttpServerConnection;
import org.apache.http.nio.reactor.IOSession;
+import org.apache.http.nio.reactor.ssl.SSLIOSession;
+import org.apache.http.nio.reactor.ssl.SSLMode;
+import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
import org.apache.http.nio.util.ByteBufferAllocator;
import org.apache.http.nio.util.HeapByteBufferAllocator;
import org.apache.http.params.HttpParams;
@@ -121,9 +121,9 @@ public class SSLNHttpServerConnectionFac
public NHttpServerConnection createConnection(final IOSession session) throws IOException {
SSLContext sslcontext = this.sslcontext != null ? this.sslcontext : getDefaultSSLContext();
- SSLIOSession ssliosession = new SSLIOSession(session, sslcontext, this.sslHandler);
- ssliosession.bind(SSLMode.CLIENT, this.params);
- session.setAttribute(IOSession.SSL_SESSION_KEY, ssliosession);
+ SSLIOSession ssliosession = new SSLIOSession(session, SSLMode.CLIENT, sslcontext, this.sslHandler);
+ ssliosession.initialize();
+ session.setAttribute(SSLIOSession.SESSION_KEY, ssliosession);
return createConnection(ssliosession, this.requestFactory, this.allocator, this.params);
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java?rev=1164859&r1=1164858&r2=1164859&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java Sat Sep 3 12:49:40 2011
@@ -36,11 +36,11 @@ import org.apache.http.annotation.Immuta
import org.apache.http.impl.DefaultHttpResponseFactory;
import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory;
import org.apache.http.impl.nio.SSLNHttpClientConnectionFactory;
-import org.apache.http.impl.nio.reactor.SSLSetupHandler;
import org.apache.http.nio.NHttpClientConnection;
import org.apache.http.nio.NHttpConnectionFactory;
import org.apache.http.nio.pool.NIOConnFactory;
import org.apache.http.nio.reactor.IOSession;
+import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
import org.apache.http.nio.util.ByteBufferAllocator;
import org.apache.http.nio.util.HeapByteBufferAllocator;
import org.apache.http.params.HttpParams;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java?rev=1164859&r1=1164858&r2=1164859&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SSLMode.java Sat Sep 3 12:49:40 2011
@@ -30,6 +30,7 @@ package org.apache.http.impl.nio.reactor
/**
* @since 4.0
*/
+@Deprecated
public enum SSLMode {
CLIENT,
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java?rev=1164859&r1=1164858&r2=1164859&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java Sat Sep 3 12:49:40 2011
@@ -32,13 +32,13 @@ import javax.net.ssl.SSLException;
import org.apache.http.annotation.Immutable;
import org.apache.http.impl.nio.DefaultClientIOEventDispatch;
-import org.apache.http.impl.nio.reactor.SSLIOSession;
-import org.apache.http.impl.nio.reactor.SSLMode;
-import org.apache.http.impl.nio.reactor.SSLSetupHandler;
import org.apache.http.nio.NHttpClientHandler;
import org.apache.http.nio.NHttpClientIOTarget;
import org.apache.http.nio.reactor.IOEventDispatch;
import org.apache.http.nio.reactor.IOSession;
+import org.apache.http.nio.reactor.ssl.SSLIOSession;
+import org.apache.http.nio.reactor.ssl.SSLMode;
+import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
@@ -124,7 +124,7 @@ public class SSLClientIOEventDispatch ex
final IOSession session,
final SSLContext sslcontext,
final SSLSetupHandler sslHandler) {
- return new SSLIOSession(session, sslcontext, sslHandler);
+ return new SSLIOSession(session, SSLMode.CLIENT, sslcontext, sslHandler);
}
protected NHttpClientIOTarget createSSLConnection(final SSLIOSession ssliosession) {
@@ -134,10 +134,10 @@ public class SSLClientIOEventDispatch ex
@Override
protected NHttpClientIOTarget createConnection(final IOSession session) {
SSLIOSession ssliosession = createSSLIOSession(session, this.sslcontext, this.sslHandler);
- session.setAttribute(IOSession.SSL_SESSION_KEY, ssliosession);
+ session.setAttribute(SSLIOSession.SESSION_KEY, ssliosession);
NHttpClientIOTarget conn = createSSLConnection(ssliosession);
try {
- ssliosession.bind(SSLMode.CLIENT, this.params);
+ ssliosession.initialize();
} catch (SSLException ex) {
this.handler.exception(conn, ex);
ssliosession.shutdown();
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java?rev=1164859&r1=1164858&r2=1164859&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java Sat Sep 3 12:49:40 2011
@@ -32,13 +32,13 @@ import javax.net.ssl.SSLException;
import org.apache.http.annotation.Immutable;
import org.apache.http.impl.nio.DefaultServerIOEventDispatch;
-import org.apache.http.impl.nio.reactor.SSLIOSession;
-import org.apache.http.impl.nio.reactor.SSLMode;
-import org.apache.http.impl.nio.reactor.SSLSetupHandler;
import org.apache.http.nio.NHttpServerIOTarget;
import org.apache.http.nio.NHttpServiceHandler;
import org.apache.http.nio.reactor.IOEventDispatch;
import org.apache.http.nio.reactor.IOSession;
+import org.apache.http.nio.reactor.ssl.SSLIOSession;
+import org.apache.http.nio.reactor.ssl.SSLMode;
+import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
@@ -124,7 +124,7 @@ public class SSLServerIOEventDispatch ex
final IOSession session,
final SSLContext sslcontext,
final SSLSetupHandler sslHandler) {
- return new SSLIOSession(session, sslcontext, sslHandler);
+ return new SSLIOSession(session, SSLMode.SERVER, sslcontext, sslHandler);
}
protected NHttpServerIOTarget createSSLConnection(final SSLIOSession ssliosession) {
@@ -134,10 +134,10 @@ public class SSLServerIOEventDispatch ex
@Override
protected NHttpServerIOTarget createConnection(final IOSession session) {
SSLIOSession ssliosession = createSSLIOSession(session, this.sslcontext, this.sslHandler);
- session.setAttribute(IOSession.SSL_SESSION_KEY, ssliosession);
+ session.setAttribute(SSLIOSession.SESSION_KEY, ssliosession);
NHttpServerIOTarget conn = createSSLConnection(ssliosession);
try {
- ssliosession.bind(SSLMode.SERVER, this.params);
+ ssliosession.initialize();
} catch (SSLException ex) {
this.handler.exception(conn, ex);
ssliosession.shutdown();
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/IOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/IOSession.java?rev=1164859&r1=1164858&r2=1164859&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/IOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/IOSession.java Sat Sep 3 12:49:40 2011
@@ -54,12 +54,6 @@ public interface IOSession {
*/
public static final String ATTACHMENT_KEY = "http.session.attachment";
- /**
- * Name of the context attribute key, which can be used to obtain the
- * SSL session.
- */
- public static final String SSL_SESSION_KEY = "http.session.ssl";
-
public static final int ACTIVE = 0;
public static final int CLOSING = 1;
public static final int CLOSED = Integer.MAX_VALUE;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java?rev=1164859&r1=1164858&r2=1164859&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java Sat Sep 3 12:49:40 2011
@@ -55,6 +55,12 @@ import java.nio.channels.SelectionKey;
@ThreadSafe
public class SSLIOSession implements IOSession, SessionBufferStatus {
+ /**
+ * Name of the context attribute key, which can be used to obtain the
+ * SSL session.
+ */
+ public static final String SESSION_KEY = "http.session.ssl";
+
private final IOSession session;
private final SSLMode defaultMode;
private final SSLEngine sslEngine;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLServer.java?rev=1164859&r1=1164858&r2=1164859&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpSSLServer.java Sat Sep 3 12:49:40 2011
@@ -40,7 +40,6 @@ import javax.net.ssl.SSLContext;
import org.apache.http.impl.nio.reactor.DefaultListeningIOReactor;
import org.apache.http.impl.nio.reactor.ExceptionEvent;
-import org.apache.http.impl.nio.reactor.SSLIOSession;
import org.apache.http.impl.nio.ssl.SSLServerIOEventDispatch;
import org.apache.http.nio.NHttpServerIOTarget;
import org.apache.http.nio.NHttpServiceHandler;
@@ -48,6 +47,7 @@ import org.apache.http.nio.reactor.IOEve
import org.apache.http.nio.reactor.IOReactorExceptionHandler;
import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.ListenerEndpoint;
+import org.apache.http.nio.reactor.ssl.SSLIOSession;
import org.apache.http.params.HttpParams;
/**