Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java?rev=576647&r1=576646&r2=576647&view=diff ============================================================================== --- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java (original) +++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java Mon Sep 17 18:41:29 2007 @@ -29,10 +29,10 @@ import org.apache.mina.common.IoHandlerAdapter; import org.apache.mina.common.IoSession; import org.apache.mina.common.IoSessionLogger; -import org.apache.mina.common.RuntimeIOException; +import org.apache.mina.common.RuntimeIoException; import org.apache.mina.common.WriteFuture; -import org.apache.mina.example.echoserver.ssl.BogusSSLContextFactory; -import org.apache.mina.filter.ssl.SSLFilter; +import org.apache.mina.example.echoserver.ssl.BogusSslContextFactory; +import org.apache.mina.filter.ssl.SslFilter; import org.apache.mina.transport.socket.nio.DatagramConnector; import org.apache.mina.transport.socket.nio.SocketConnector; import org.apache.mina.util.AvailablePortFinder; @@ -50,7 +50,7 @@ private final int DATA_SIZE = 16; - private SSLFilter connectorSSLFilter; + private SslFilter connectorSSLFilter; public ConnectorTest() { } @@ -59,7 +59,7 @@ protected void setUp() throws Exception { super.setUp(); - connectorSSLFilter = new SSLFilter(BogusSSLContextFactory + connectorSSLFilter = new SslFilter(BogusSslContextFactory .getInstance(false)); connectorSSLFilter.setUseClientMode(true); // set client mode } @@ -116,7 +116,7 @@ future.awaitUninterruptibly(); session = future.getSession(); break; - } catch (RuntimeIOException e) { + } catch (RuntimeIoException e) { // Try again until we succeed to bind. } } @@ -131,7 +131,7 @@ // Send closeNotify to test TLS closure if it is TLS connection. if (useSSL) { - connectorSSLFilter.stopSSL(session).awaitUninterruptibly(); + connectorSSLFilter.stopSsl(session).awaitUninterruptibly(); System.out .println("-------------------------------------------------------------------------------"); @@ -157,7 +157,7 @@ Assert.assertEquals((byte) '.', handler.readBuf.get()); // Now start TLS connection - Assert.assertTrue(connectorSSLFilter.startSSL(session)); + Assert.assertTrue(connectorSSLFilter.startSsl(session)); testConnector0(session); }
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SSLFilterTest.java URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SSLFilterTest.java?rev=576647&r1=576646&r2=576647&view=diff ============================================================================== --- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SSLFilterTest.java (original) +++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SSLFilterTest.java Mon Sep 17 18:41:29 2007 @@ -19,7 +19,7 @@ import org.apache.mina.common.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; import org.apache.mina.filter.codec.textline.TextLineCodecFactory; -import org.apache.mina.filter.ssl.SSLFilter; +import org.apache.mina.filter.ssl.SslFilter; import org.apache.mina.transport.socket.nio.SocketAcceptor; public class SSLFilterTest extends TestCase { @@ -50,9 +50,9 @@ } private void testMessageSentIsCalled(boolean useSSL) throws Exception { - SSLFilter sslFilter = null; + SslFilter sslFilter = null; if (useSSL) { - sslFilter = new SSLFilter(BogusSSLContextFactory.getInstance(true)); + sslFilter = new SslFilter(BogusSslContextFactory.getInstance(true)); acceptor.getFilterChain().addLast("sslFilter", sslFilter); } acceptor.getFilterChain().addLast( Copied: mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ssl/SslContextFactoryBean.java (from r576641, mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ssl/SSLContextFactoryBean.java) URL: http://svn.apache.org/viewvc/mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ssl/SslContextFactoryBean.java?p2=mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ssl/SslContextFactoryBean.java&p1=mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ssl/SSLContextFactoryBean.java&r1=576641&r2=576647&rev=576647&view=diff ============================================================================== --- mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ssl/SSLContextFactoryBean.java (original) +++ mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ssl/SslContextFactoryBean.java Mon Sep 17 18:41:29 2007 @@ -57,7 +57,7 @@ * @author The Apache MINA Project ([EMAIL PROTECTED]) * @version $Rev$, $Date$ */ -public class SSLContextFactoryBean extends AbstractFactoryBean { +public class SslContextFactoryBean extends AbstractFactoryBean { private String protocol = "TLS"; private final String provider = null; Modified: mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java URL: http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java?rev=576647&r1=576646&r2=576647&view=diff ============================================================================== --- mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java (original) +++ mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java Mon Sep 17 18:41:29 2007 @@ -31,7 +31,7 @@ import org.apache.mina.filter.codec.ProtocolCodecFilter; import org.apache.mina.filter.codec.http.HttpProtocolCodecFactory; import org.apache.mina.filter.codec.http.HttpRequestMessage; -import org.apache.mina.filter.ssl.SSLFilter; +import org.apache.mina.filter.ssl.SslFilter; import org.apache.mina.transport.socket.nio.SocketConnector; public class AsyncHttpClient { @@ -65,7 +65,7 @@ String scheme = url.getProtocol(); int port = url.getPort(); if (scheme.toLowerCase().equals("https")) { - SSLFilter filter = new SSLFilter(createClientSSLContext()); + SslFilter filter = new SslFilter(createClientSSLContext()); filter.setUseClientMode(true); connector.getFilterChain().addLast("SSL", filter); if (port == -1) { Modified: mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialPortUnavailableException.java URL: http://svn.apache.org/viewvc/mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialPortUnavailableException.java?rev=576647&r1=576646&r2=576647&view=diff ============================================================================== --- mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialPortUnavailableException.java (original) +++ mina/trunk/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialPortUnavailableException.java Mon Sep 17 18:41:29 2007 @@ -19,7 +19,7 @@ */ package org.apache.mina.transport.serial; -import org.apache.mina.common.RuntimeIOException; +import org.apache.mina.common.RuntimeIoException; /** * Exception thrown when the serial port can't be open because @@ -27,7 +27,7 @@ * @author The Apache MINA Project ([EMAIL PROTECTED]) * @version $Rev: $, $Date: $ */ -public class SerialPortUnavailableException extends RuntimeIOException { +public class SerialPortUnavailableException extends RuntimeIoException { private static final long serialVersionUID = 1L;
