Author: trustin
Date: Thu Jul 26 23:17:23 2007
New Revision: 560122
URL: http://svn.apache.org/viewvc?view=rev&rev=560122
Log:
Reorganized filter package. Moved SSLFilter to core.
Added:
mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/
mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
- copied, changed from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
- copied, changed from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/ConnectionThrottleFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java
- copied, changed from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/LoggingFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLByteBufferUtil.java
- copied, changed from r560105,
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLByteBufferUtil.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java
- copied, changed from r560105,
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java
- copied, changed from r560105,
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/package.html
- copied unchanged from r560105,
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/package.html
mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/
mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java
- copied, changed from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/ProfilerTimerFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/stream/
mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java
- copied, changed from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/StreamWriteFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/
mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilterBuilder.java
- copied, changed from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/ReadThrottleFilterBuilder.java
mina/trunk/core/src/main/java/org/apache/mina/filter/util/
mina/trunk/core/src/main/java/org/apache/mina/filter/util/ReferenceCountingIoFilter.java
- copied, changed from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/util/SessionAttributeInitializingFilter.java
- copied, changed from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/SessionAttributeInitializingFilter.java
mina/trunk/core/src/test/java/org/apache/mina/filter/stream/
mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java
- copied, changed from r560105,
mina/trunk/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
Removed:
mina/trunk/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ConnectionThrottleFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/LoggingFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ProfilerTimerFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ReadThrottleFilterBuilder.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/SessionAttributeInitializingFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/StreamWriteFilter.java
mina/trunk/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLByteBufferUtil.java
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/package.html
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/IoFilter.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/Server.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/Main.java
mina/trunk/example/src/main/java/org/apache/mina/example/reverser/Main.java
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Server.java
mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ssl/SSLFilterTest.java
mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionManager.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoFilter.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoFilter.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoFilter.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoFilter.java Thu Jul
26 23:17:23 2007
@@ -19,7 +19,7 @@
*/
package org.apache.mina.common;
-import org.apache.mina.filter.ReferenceCountingIoFilter;
+import org.apache.mina.filter.util.ReferenceCountingIoFilter;
/**
* A filter which intercepts [EMAIL PROTECTED] IoHandler} events like Servlet
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
(from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java?view=diff&rev=560122&p1=mina/trunk/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java&r1=560105&p2=mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java&r2=560122
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/BlacklistFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
Thu Jul 26 23:17:23 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.filter;
+package org.apache.mina.filter.firewall;
import java.net.InetAddress;
import java.net.InetSocketAddress;
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
(from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/ConnectionThrottleFilter.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java?view=diff&rev=560122&p1=mina/trunk/core/src/main/java/org/apache/mina/filter/ConnectionThrottleFilter.java&r1=560105&p2=mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java&r2=560122
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/ConnectionThrottleFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
Thu Jul 26 23:17:23 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.filter;
+package org.apache.mina.filter.firewall;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java
(from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/LoggingFilter.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java?view=diff&rev=560122&p1=mina/trunk/core/src/main/java/org/apache/mina/filter/LoggingFilter.java&r1=560105&p2=mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java&r2=560122
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/LoggingFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java
Thu Jul 26 23:17:23 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.filter;
+package org.apache.mina.filter.logging;
import java.util.Map;
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLByteBufferUtil.java
(from r560105,
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLByteBufferUtil.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLByteBufferUtil.java?view=diff&rev=560122&p1=mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLByteBufferUtil.java&r1=560105&p2=mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLByteBufferUtil.java&r2=560122
==============================================================================
---
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLByteBufferUtil.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLByteBufferUtil.java
Thu Jul 26 23:17:23 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.filter.support;
+package org.apache.mina.filter.ssl;
import java.nio.ByteBuffer;
@@ -123,5 +123,4 @@
}
}
}
-
}
Copied: mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java
(from r560105,
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java?view=diff&rev=560122&p1=mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java&r1=560105&p2=mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java&r2=560122
==============================================================================
--- mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/SSLFilter.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java Thu
Jul 26 23:17:23 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.filter;
+package org.apache.mina.filter.ssl;
import java.net.InetSocketAddress;
@@ -38,7 +38,6 @@
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.WriteRequestWrapper;
import org.apache.mina.common.support.DefaultWriteFuture;
-import org.apache.mina.filter.support.SSLHandler;
import org.apache.mina.util.SessionLog;
/**
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java (from
r560105,
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java?view=diff&rev=560122&p1=mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java&r1=560105&p2=mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java&r2=560122
==============================================================================
---
mina/trunk/filter-ssl/src/main/java/org/apache/mina/filter/support/SSLHandler.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java
Thu Jul 26 23:17:23 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.filter.support;
+package org.apache.mina.filter.ssl;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
@@ -40,7 +40,6 @@
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
import org.apache.mina.common.support.DefaultWriteFuture;
-import org.apache.mina.filter.SSLFilter;
import org.apache.mina.util.SessionLog;
/**
@@ -54,7 +53,7 @@
* @author The Apache Directory Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
-public class SSLHandler {
+class SSLHandler {
private final SSLFilter parent;
private final SSLContext ctx;
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java
(from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/ProfilerTimerFilter.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java?view=diff&rev=560122&p1=mina/trunk/core/src/main/java/org/apache/mina/filter/ProfilerTimerFilter.java&r1=560105&p2=mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java&r2=560122
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/ProfilerTimerFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/statistic/ProfilerTimerFilter.java
Thu Jul 26 23:17:23 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.filter;
+package org.apache.mina.filter.statistic;
import java.util.EnumSet;
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java
(from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/StreamWriteFilter.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java?view=diff&rev=560122&p1=mina/trunk/core/src/main/java/org/apache/mina/filter/StreamWriteFilter.java&r1=560105&p2=mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java&r2=560122
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/StreamWriteFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/stream/StreamWriteFilter.java
Thu Jul 26 23:17:23 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.filter;
+package org.apache.mina.filter.stream;
import java.io.IOException;
import java.io.InputStream;
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilterBuilder.java
(from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/ReadThrottleFilterBuilder.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilterBuilder.java?view=diff&rev=560122&p1=mina/trunk/core/src/main/java/org/apache/mina/filter/ReadThrottleFilterBuilder.java&r1=560105&p2=mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilterBuilder.java&r2=560122
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/ReadThrottleFilterBuilder.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilterBuilder.java
Thu Jul 26 23:17:23 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.filter;
+package org.apache.mina.filter.traffic;
import java.util.Iterator;
import java.util.List;
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/util/ReferenceCountingIoFilter.java
(from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/util/ReferenceCountingIoFilter.java?view=diff&rev=560122&p1=mina/trunk/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java&r1=560105&p2=mina/trunk/core/src/main/java/org/apache/mina/filter/util/ReferenceCountingIoFilter.java&r2=560122
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/ReferenceCountingIoFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/util/ReferenceCountingIoFilter.java
Thu Jul 26 23:17:23 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.filter;
+package org.apache.mina.filter.util;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.common.IoFilter;
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/util/SessionAttributeInitializingFilter.java
(from r560105,
mina/trunk/core/src/main/java/org/apache/mina/filter/SessionAttributeInitializingFilter.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/util/SessionAttributeInitializingFilter.java?view=diff&rev=560122&p1=mina/trunk/core/src/main/java/org/apache/mina/filter/SessionAttributeInitializingFilter.java&r1=560105&p2=mina/trunk/core/src/main/java/org/apache/mina/filter/util/SessionAttributeInitializingFilter.java&r2=560122
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/SessionAttributeInitializingFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/util/SessionAttributeInitializingFilter.java
Thu Jul 26 23:17:23 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.filter;
+package org.apache.mina.filter.util;
import java.util.HashMap;
import java.util.Map;
Copied:
mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java
(from r560105,
mina/trunk/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java?view=diff&rev=560122&p1=mina/trunk/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java&r1=560105&p2=mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java&r2=560122
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/filter/StreamWriteFilterTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/filter/stream/StreamWriteFilterTest.java
Thu Jul 26 23:17:23 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.filter;
+package org.apache.mina.filter.stream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -47,6 +47,7 @@
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
import org.apache.mina.common.support.BaseIoSession;
+import org.apache.mina.filter.stream.StreamWriteFilter;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
import org.apache.mina.transport.socket.nio.SocketConnector;
import org.apache.mina.util.AvailablePortFinder;
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java
(original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/Main.java Thu
Jul 26 23:17:23 2007
@@ -23,10 +23,10 @@
import org.apache.mina.common.DefaultIoFilterChainBuilder;
import org.apache.mina.example.echoserver.ssl.BogusSSLContextFactory;
-import org.apache.mina.filter.LoggingFilter;
-import org.apache.mina.filter.SSLFilter;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
+import org.apache.mina.filter.logging.LoggingFilter;
+import org.apache.mina.filter.ssl.SSLFilter;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
/**
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
---
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
(original)
+++
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
Thu Jul 26 23:17:23 2007
@@ -27,7 +27,7 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
import org.apache.mina.example.echoserver.ssl.BogusSSLContextFactory;
-import org.apache.mina.filter.SSLFilter;
+import org.apache.mina.filter.ssl.SSLFilter;
import org.apache.mina.transport.socket.nio.SocketConnector;
/**
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
---
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java
(original)
+++
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java
Thu Jul 26 23:17:23 2007
@@ -24,9 +24,9 @@
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
import org.apache.mina.example.chat.ChatCommand;
-import org.apache.mina.filter.LoggingFilter;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
+import org.apache.mina.filter.logging.LoggingFilter;
/**
* [EMAIL PROTECTED] IoHandler} implementation of the client side of the
simple chat protocol.
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
---
mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
(original)
+++
mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
Thu Jul 26 23:17:23 2007
@@ -25,7 +25,7 @@
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.TransportType;
-import org.apache.mina.filter.SSLFilter;
+import org.apache.mina.filter.ssl.SSLFilter;
import org.apache.mina.transport.socket.nio.SocketSessionConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
---
mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java
(original)
+++
mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/Main.java
Thu Jul 26 23:17:23 2007
@@ -24,8 +24,8 @@
import org.apache.mina.common.DefaultIoFilterChainBuilder;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.example.echoserver.ssl.BogusSSLContextFactory;
-import org.apache.mina.filter.LoggingFilter;
-import org.apache.mina.filter.SSLFilter;
+import org.apache.mina.filter.logging.LoggingFilter;
+import org.apache.mina.filter.ssl.SSLFilter;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
/**
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/Server.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/Server.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
---
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/Server.java
(original)
+++
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/Server.java
Thu Jul 26 23:17:23 2007
@@ -21,8 +21,8 @@
import java.net.InetSocketAddress;
-import org.apache.mina.filter.LoggingFilter;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
/**
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/Main.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/Main.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
---
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/Main.java
(original)
+++
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/Main.java
Thu Jul 26 23:17:23 2007
@@ -24,7 +24,7 @@
import org.apache.mina.common.DefaultIoFilterChainBuilder;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.example.echoserver.ssl.BogusSSLContextFactory;
-import org.apache.mina.filter.SSLFilter;
+import org.apache.mina.filter.ssl.SSLFilter;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
/**
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/reverser/Main.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/reverser/Main.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/reverser/Main.java
(original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/reverser/Main.java
Thu Jul 26 23:17:23 2007
@@ -22,9 +22,9 @@
import java.net.InetSocketAddress;
import java.nio.charset.Charset;
-import org.apache.mina.filter.LoggingFilter;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
+import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
/**
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java
(original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Client.java
Thu Jul 26 23:17:23 2007
@@ -25,9 +25,9 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.common.RuntimeIOException;
import org.apache.mina.example.sumup.codec.SumUpProtocolCodecFactory;
-import org.apache.mina.filter.LoggingFilter;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import
org.apache.mina.filter.codec.serialization.ObjectSerializationCodecFactory;
+import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.nio.SocketConnector;
/**
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Server.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Server.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Server.java
(original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/Server.java
Thu Jul 26 23:17:23 2007
@@ -22,9 +22,9 @@
import java.net.InetSocketAddress;
import org.apache.mina.example.sumup.codec.SumUpProtocolCodecFactory;
-import org.apache.mina.filter.LoggingFilter;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import
org.apache.mina.filter.codec.serialization.ObjectSerializationCodecFactory;
+import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
/**
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
---
mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
(original)
+++
mina/trunk/example/src/main/java/org/apache/mina/example/udp/MemoryMonitor.java
Thu Jul 26 23:17:23 2007
@@ -32,7 +32,7 @@
import javax.swing.JTabbedPane;
import org.apache.mina.common.DefaultIoFilterChainBuilder;
-import org.apache.mina.filter.LoggingFilter;
+import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.nio.DatagramAcceptor;
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
Modified:
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
---
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
(original)
+++
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
Thu Jul 26 23:17:23 2007
@@ -29,7 +29,7 @@
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoSession;
import org.apache.mina.example.echoserver.ssl.BogusSSLContextFactory;
-import org.apache.mina.filter.SSLFilter;
+import org.apache.mina.filter.ssl.SSLFilter;
import org.apache.mina.transport.socket.nio.DatagramAcceptor;
import org.apache.mina.transport.socket.nio.DatagramSessionConfig;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
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?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
---
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
Thu Jul 26 23:17:23 2007
@@ -31,7 +31,7 @@
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.SSLFilter;
+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;
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?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
---
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
Thu Jul 26 23:17:23 2007
@@ -5,9 +5,9 @@
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
import org.apache.mina.example.echoserver.ssl.BogusSSLContextFactory;
-import org.apache.mina.filter.SSLFilter;
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.transport.socket.nio.SocketAcceptor;
import javax.net.ssl.SSLContext;
Modified:
mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionManager.java
URL:
http://svn.apache.org/viewvc/mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionManager.java?view=diff&rev=560122&r1=560121&r2=560122
==============================================================================
---
mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionManager.java
(original)
+++
mina/trunk/integration-jmx/src/main/java/org/apache/mina/integration/jmx/IoSessionManager.java
Thu Jul 26 23:17:23 2007
@@ -26,7 +26,7 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.support.BaseIoSession;
-import org.apache.mina.filter.LoggingFilter;
+import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.management.IoSessionStat;
import org.apache.mina.management.StatCollector;
