Author: mwebb
Date: Sun Jul 20 18:25:08 2008
New Revision: 678335
URL: http://svn.apache.org/viewvc?rev=678335&view=rev
Log:
JIRA 611. The ExceptionMonitor belongs in util, not core. I brought this
issue up in the dev mailing list and many people have agreed to this. I am
just getting around to it now, as I forgot to make the change when it was
originally brought up on the mailing list.
Added:
mina/trunk/core/src/main/java/org/apache/mina/util/DefaultExceptionMonitor.java
(contents, props changed)
- copied, changed from r678330,
mina/trunk/core/src/main/java/org/apache/mina/core/DefaultExceptionMonitor.java
mina/trunk/core/src/main/java/org/apache/mina/util/ExceptionMonitor.java
(contents, props changed)
- copied, changed from r678330,
mina/trunk/core/src/main/java/org/apache/mina/core/ExceptionMonitor.java
Removed:
mina/trunk/core/src/main/java/org/apache/mina/core/DefaultExceptionMonitor.java
mina/trunk/core/src/main/java/org/apache/mina/core/ExceptionMonitor.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoService.java
mina/trunk/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java
mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java?rev=678335&r1=678334&r2=678335&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/future/DefaultIoFuture.java
Sun Jul 20 18:25:08 2008
@@ -23,10 +23,10 @@
import java.util.List;
import java.util.concurrent.TimeUnit;
-import org.apache.mina.core.ExceptionMonitor;
import org.apache.mina.core.polling.AbstractPollingIoProcessor;
import org.apache.mina.core.service.IoProcessor;
import org.apache.mina.core.session.IoSession;
+import org.apache.mina.util.ExceptionMonitor;
/**
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java?rev=678335&r1=678334&r2=678335&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingConnectionlessIoAcceptor.java
Sun Jul 20 18:25:08 2008
@@ -31,7 +31,6 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
-import org.apache.mina.core.ExceptionMonitor;
import org.apache.mina.core.RuntimeIoException;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.future.IoFuture;
@@ -46,6 +45,7 @@
import org.apache.mina.core.session.IoSessionRecycler;
import org.apache.mina.core.write.WriteRequest;
import org.apache.mina.core.write.WriteRequestQueue;
+import org.apache.mina.util.ExceptionMonitor;
/**
* TODO Add documentation
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java?rev=678335&r1=678334&r2=678335&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
Sun Jul 20 18:25:08 2008
@@ -32,7 +32,6 @@
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
-import org.apache.mina.core.ExceptionMonitor;
import org.apache.mina.core.RuntimeIoException;
import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.core.future.IoFuture;
@@ -45,6 +44,7 @@
import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.session.IoSessionConfig;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
+import org.apache.mina.util.ExceptionMonitor;
/**
* A base class for implementing transport using a polling strategy. The
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java?rev=678335&r1=678334&r2=678335&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
Sun Jul 20 18:25:08 2008
@@ -27,7 +27,6 @@
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
-import org.apache.mina.core.ExceptionMonitor;
import org.apache.mina.core.RuntimeIoException;
import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.core.future.ConnectFuture;
@@ -42,6 +41,7 @@
import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.session.IoSessionConfig;
import org.apache.mina.core.session.IoSessionInitializer;
+import org.apache.mina.util.ExceptionMonitor;
/**
* A base class for implementing client transport using a polling strategy. The
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java?rev=678335&r1=678334&r2=678335&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
Sun Jul 20 18:25:08 2008
@@ -31,7 +31,6 @@
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.mina.core.ExceptionMonitor;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.file.FileRegion;
import org.apache.mina.core.future.DefaultIoFuture;
@@ -44,6 +43,7 @@
import org.apache.mina.core.write.WriteRequest;
import org.apache.mina.core.write.WriteRequestQueue;
import org.apache.mina.core.write.WriteToClosedSessionException;
+import org.apache.mina.util.ExceptionMonitor;
import org.apache.mina.util.NamePreservingRunnable;
/**
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoService.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoService.java?rev=678335&r1=678334&r2=678335&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoService.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/service/AbstractIoService.java
Sun Jul 20 18:25:08 2008
@@ -31,7 +31,6 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.mina.core.ExceptionMonitor;
import org.apache.mina.core.IoUtil;
import org.apache.mina.core.filterchain.DefaultIoFilterChain;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
@@ -49,6 +48,7 @@
import org.apache.mina.core.session.IoSessionDataStructureFactory;
import org.apache.mina.core.session.IoSessionInitializationException;
import org.apache.mina.core.session.IoSessionInitializer;
+import org.apache.mina.util.ExceptionMonitor;
import org.apache.mina.util.NamePreservingRunnable;
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java?rev=678335&r1=678334&r2=678335&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/service/IoServiceListenerSupport.java
Sun Jul 20 18:25:08 2008
@@ -27,11 +27,11 @@
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.mina.core.ExceptionMonitor;
import org.apache.mina.core.future.IoFuture;
import org.apache.mina.core.future.IoFutureListener;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
+import org.apache.mina.util.ExceptionMonitor;
/**
* A helper which provides addition and removal of [EMAIL PROTECTED]
IoServiceListener}s and firing
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java?rev=678335&r1=678334&r2=678335&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
Sun Jul 20 18:25:08 2008
@@ -29,7 +29,6 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.mina.core.ExceptionMonitor;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.file.DefaultFileRegion;
import org.apache.mina.core.future.CloseFuture;
@@ -49,6 +48,7 @@
import org.apache.mina.core.write.WriteRequestQueue;
import org.apache.mina.core.write.WriteToClosedSessionException;
import org.apache.mina.util.CircularQueue;
+import org.apache.mina.util.ExceptionMonitor;
/**
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java?rev=678335&r1=678334&r2=678335&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java
Sun Jul 20 18:25:08 2008
@@ -22,7 +22,7 @@
import java.net.DatagramSocket;
import java.net.SocketException;
-import org.apache.mina.core.ExceptionMonitor;
+import org.apache.mina.util.ExceptionMonitor;
/**
* A default implementation of [EMAIL PROTECTED] DatagramSessionConfig}.
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java?rev=678335&r1=678334&r2=678335&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java
Sun Jul 20 18:25:08 2008
@@ -30,8 +30,8 @@
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.mina.core.ExceptionMonitor;
import org.apache.mina.core.service.IoService;
+import org.apache.mina.util.ExceptionMonitor;
/**
* A default implementation of [EMAIL PROTECTED] SocketSessionConfig}.
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java?rev=678335&r1=678334&r2=678335&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
Sun Jul 20 18:25:08 2008
@@ -25,7 +25,6 @@
import java.util.Set;
import java.util.concurrent.Executor;
-import org.apache.mina.core.ExceptionMonitor;
import org.apache.mina.core.filterchain.IoFilterChain;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.future.DefaultConnectFuture;
@@ -35,6 +34,7 @@
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.service.TransportMetadata;
import org.apache.mina.core.session.IoSessionInitializer;
+import org.apache.mina.util.ExceptionMonitor;
/**
* Connects to [EMAIL PROTECTED] IoHandler}s which is bound on the specified
Copied:
mina/trunk/core/src/main/java/org/apache/mina/util/DefaultExceptionMonitor.java
(from r678330,
mina/trunk/core/src/main/java/org/apache/mina/core/DefaultExceptionMonitor.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/util/DefaultExceptionMonitor.java?p2=mina/trunk/core/src/main/java/org/apache/mina/util/DefaultExceptionMonitor.java&p1=mina/trunk/core/src/main/java/org/apache/mina/core/DefaultExceptionMonitor.java&r1=678330&r2=678335&rev=678335&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/DefaultExceptionMonitor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/util/DefaultExceptionMonitor.java
Sun Jul 20 18:25:08 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.core;
+package org.apache.mina.util;
import org.apache.mina.core.service.IoService;
import org.slf4j.Logger;
Propchange:
mina/trunk/core/src/main/java/org/apache/mina/util/DefaultExceptionMonitor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
mina/trunk/core/src/main/java/org/apache/mina/util/DefaultExceptionMonitor.java
------------------------------------------------------------------------------
svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Propchange:
mina/trunk/core/src/main/java/org/apache/mina/util/DefaultExceptionMonitor.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
mina/trunk/core/src/main/java/org/apache/mina/util/ExceptionMonitor.java (from
r678330,
mina/trunk/core/src/main/java/org/apache/mina/core/ExceptionMonitor.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/util/ExceptionMonitor.java?p2=mina/trunk/core/src/main/java/org/apache/mina/util/ExceptionMonitor.java&p1=mina/trunk/core/src/main/java/org/apache/mina/core/ExceptionMonitor.java&r1=678330&r2=678335&rev=678335&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/ExceptionMonitor.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/util/ExceptionMonitor.java
Sun Jul 20 18:25:08 2008
@@ -17,7 +17,8 @@
* under the License.
*
*/
-package org.apache.mina.core;
+package org.apache.mina.util;
+
/**
Propchange:
mina/trunk/core/src/main/java/org/apache/mina/util/ExceptionMonitor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
mina/trunk/core/src/main/java/org/apache/mina/util/ExceptionMonitor.java
------------------------------------------------------------------------------
svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
Propchange:
mina/trunk/core/src/main/java/org/apache/mina/util/ExceptionMonitor.java
------------------------------------------------------------------------------
svn:mergeinfo =
