Author: trustin
Date: Tue Dec 12 23:51:22 2006
New Revision: 486536
URL: http://svn.apache.org/viewvc?view=rev&rev=486536
Log:
Related issue: DIRMINA-322 (Remove ThreadModel)
* Removed ThreadModel and its related subtypes, properties, and integration
classes
Removed:
mina/trunk/core/src/main/java/org/apache/mina/common/ExecutorThreadModel.java
mina/trunk/core/src/main/java/org/apache/mina/common/ThreadModel.java
mina/trunk/integration-spring/src/main/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBean.java
mina/trunk/integration-spring/src/test/java/org/apache/mina/integration/spring/ExecutorThreadModelFactoryBeanTest.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java
mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
mina/trunk/core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeConnector.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java?view=diff&rev=486536&r1=486535&r2=486536
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoService.java Tue Dec
12 23:51:22 2006
@@ -109,24 +109,4 @@
* not a [EMAIL PROTECTED]
DefaultIoFilterChainBuilder}
*/
DefaultIoFilterChainBuilder getFilterChain();
-
- /**
- * Returns the default [EMAIL PROTECTED] ThreadModel} of the [EMAIL
PROTECTED] IoService}.
- * The default value is an [EMAIL PROTECTED] ExecutorThreadModel} whose
service name is
- * <tt>'AnonymousIoService'</tt> and which has 16 maximum active threads.
- * It is strongly recommended to set a new [EMAIL PROTECTED]
ExecutorThreadModel} by calling
- * [EMAIL PROTECTED] ExecutorThreadModel#getInstance(String)}.
- */
- ThreadModel getThreadModel();
-
- /**
- * Sets the default [EMAIL PROTECTED] ThreadModel} of the [EMAIL
PROTECTED] IoService}.
- * If you specify <tt>null</tt>, this property will be set to the
- * default value.
- * The default value is an [EMAIL PROTECTED] ExecutorThreadModel} whose
service name is
- * <tt>'AnonymousIoService'</tt> with 16 threads.
- * It is strongly recommended to set a new [EMAIL PROTECTED]
ExecutorThreadModel} by calling
- * [EMAIL PROTECTED] ExecutorThreadModel#getInstance(String)}.
- */
- void setThreadModel( ThreadModel threadModel );
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java?view=diff&rev=486536&r1=486535&r2=486536
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/support/BaseIoService.java
Tue Dec 12 23:51:22 2006
@@ -23,13 +23,11 @@
import java.util.Set;
import org.apache.mina.common.DefaultIoFilterChainBuilder;
-import org.apache.mina.common.ExecutorThreadModel;
import org.apache.mina.common.IoFilterChainBuilder;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoServiceListener;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.ThreadModel;
/**
* Base implementation of [EMAIL PROTECTED] IoService}s.
@@ -40,21 +38,11 @@
public abstract class BaseIoService implements IoService
{
/**
- * The default thread model.
- */
- private final ThreadModel defaultThreadModel =
ExecutorThreadModel.getInstance("AnonymousIoService");
-
- /**
* Current filter chain builder.
*/
private IoFilterChainBuilder filterChainBuilder = new
DefaultIoFilterChainBuilder();
/**
- * Current thread model.
- */
- private ThreadModel threadModel = defaultThreadModel;
-
- /**
* Current handler.
*/
private IoHandler handler;
@@ -112,22 +100,6 @@
}
}
- public ThreadModel getThreadModel()
- {
- return threadModel;
- }
-
- public void setThreadModel( ThreadModel threadModel )
- {
- if( threadModel == null )
- {
- // We reuse the previous default model to prevent too much
- // daemon threads are created.
- threadModel = defaultThreadModel;
- }
- this.threadModel = threadModel;
- }
-
public void addListener( IoServiceListener listener )
{
getListeners().add( listener );
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java?view=diff&rev=486536&r1=486535&r2=486536
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoAcceptor.java
Tue Dec 12 23:51:22 2006
@@ -30,7 +30,6 @@
import org.apache.mina.common.IoServiceListener;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.ThreadModel;
/**
* A delegated [EMAIL PROTECTED] IoAcceptor} that wraps the other [EMAIL
PROTECTED] IoAcceptor}.
@@ -138,19 +137,9 @@
delegate.setSessionConfig( config );
}
- public ThreadModel getThreadModel()
- {
- return delegate.getThreadModel();
- }
-
public void setHandler( IoHandler handler )
{
delegate.setHandler( handler );
- }
-
- public void setThreadModel( ThreadModel threadModel )
- {
- delegate.setThreadModel( threadModel );
}
public boolean isBound()
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java?view=diff&rev=486536&r1=486535&r2=486536
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/support/DelegatedIoConnector.java
Tue Dec 12 23:51:22 2006
@@ -29,7 +29,6 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoServiceListener;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.ThreadModel;
/**
* A delegated [EMAIL PROTECTED] IoConnector} that wraps the other [EMAIL
PROTECTED] IoConnector}.
@@ -127,18 +126,8 @@
delegate.setSessionConfig( config );
}
- public ThreadModel getThreadModel()
- {
- return delegate.getThreadModel();
- }
-
public void setHandler( IoHandler handler )
{
delegate.setHandler( handler );
- }
-
- public void setThreadModel( ThreadModel threadModel )
- {
- delegate.setThreadModel( threadModel );
}
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java?view=diff&rev=486536&r1=486535&r2=486536
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java
Tue Dec 12 23:51:22 2006
@@ -30,7 +30,6 @@
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.ThreadModel;
import org.apache.mina.util.ByteBufferUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,8 +38,6 @@
* A filter that forward events to [EMAIL PROTECTED] Executor} in
* <a
href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/";>backport-util-concurrent</a>.
* You can apply various thread model by inserting this filter to the [EMAIL
PROTECTED] IoFilterChain}.
- * This filter is usually inserted by [EMAIL PROTECTED] ThreadModel}
automatically, so you don't need
- * to add this filter in most cases.
* <p>
* Please note that this filter doesn't manage the life cycle of the underlying
* [EMAIL PROTECTED] Executor}. You have to destroy or stop it by yourself.
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?view=diff&rev=486536&r1=486535&r2=486536
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
Tue Dec 12 23:51:22 2006
@@ -384,7 +384,6 @@
SocketSessionImpl session = new SocketSessionImpl(
SocketAcceptor.this, nextProcessor(), ch );
getFilterChainBuilder().buildFilterChain(
session.getFilterChain() );
- getThreadModel().buildFilterChain(
session.getFilterChain() );
session.getIoProcessor().addNew( session );
success = true;
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?view=diff&rev=486536&r1=486535&r2=486536
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
Tue Dec 12 23:51:22 2006
@@ -331,7 +331,6 @@
try
{
getFilterChainBuilder().buildFilterChain( session.getFilterChain()
);
- getThreadModel().buildFilterChain( session.getFilterChain() );
}
catch( Throwable e )
{
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java?view=diff&rev=486536&r1=486535&r2=486536
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramAcceptorDelegate.java
Tue Dec 12 23:51:22 2006
@@ -261,7 +261,6 @@
private void buildFilterChain( IoSession session ) throws Exception
{
this.getFilterChainBuilder().buildFilterChain(
session.getFilterChain() );
- this.getThreadModel().buildFilterChain( session.getFilterChain() );
}
private synchronized void startupWorker()
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java?view=diff&rev=486536&r1=486535&r2=486536
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/support/DatagramConnectorDelegate.java
Tue Dec 12 23:51:22 2006
@@ -497,7 +497,6 @@
private void buildFilterChain( IoSession session ) throws Exception
{
getFilterChainBuilder().buildFilterChain( session.getFilterChain() );
- getThreadModel().buildFilterChain( session.getFilterChain() );
}
private void cancelKeys()
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?view=diff&rev=486536&r1=486535&r2=486536
==============================================================================
---
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
Tue Dec 12 23:51:22 2006
@@ -88,7 +88,6 @@
{
IoFilterChain filterChain = localSession.getFilterChain();
this.getFilterChainBuilder().buildFilterChain( filterChain );
- this.getThreadModel().buildFilterChain( filterChain );
// The following sentences don't throw any exceptions.
localSession.setAttribute( AbstractIoFilterChain.CONNECT_FUTURE,
future );
@@ -106,7 +105,6 @@
{
IoFilterChain filterChain = remoteSession.getFilterChain();
entry.getAcceptor().getFilterChainBuilder().buildFilterChain(
filterChain );
- entry.getAcceptor().getThreadModel().buildFilterChain( filterChain
);
// The following sentences don't throw any exceptions.
entry.getListeners().fireSessionCreated( remoteSession );
