svn commit: r892339 - in /mina/branches/3.0/core/src/main/java/org/apache/mina: service/ transport/socket/nio/

[jv...@apache.org]

Author: jvermillard
Date: Fri Dec 18 18:36:03 2009
New Revision: 892339

URL: http://svn.apache.org/viewvc?rev=892339&view=rev
Log:
moved SelectorStrategy to the correct package

Added:
    mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorStrategy.java   (contents, props changed)
      - copied, changed from r892338, mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/SelectorStrategy.java
Removed:
    mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/SelectorStrategy.java
Modified:
    mina/branches/3.0/core/src/main/java/org/apache/mina/service/OneThreadSelectorStrategy.java
    mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorFactory.java
    mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSelectorProcessor.java
    mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java

Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/service/OneThreadSelectorStrategy.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/service/OneThreadSelectorStrategy.java?rev=892339&r1=892338&r2=892339&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/service/OneThreadSelectorStrategy.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/service/OneThreadSelectorStrategy.java Fri Dec 18 18:36:03 2009
@@ -22,7 +22,6 @@
 import java.io.IOException;
 import java.net.SocketAddress;
 
-import org.apache.mina.transport.socket.nio.SelectorStrategy;
 
 /**
  * A strategy for using only one thread, for accepting and processing all

Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorFactory.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorFactory.java?rev=892339&r1=892338&r2=892339&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorFactory.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorFactory.java Fri Dec 18 18:36:03 2009
@@ -24,7 +24,6 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-import org.apache.mina.transport.socket.nio.SelectorStrategy;
 
 /**
  * A factory used by {@link SelectorStrategy} for instantiating selectors when needed.

Copied: mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorStrategy.java (from r892338, mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/SelectorStrategy.java)
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorStrategy.java?p2=mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorStrategy.java&p1=mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/SelectorStrategy.java&r1=892338&r2=892339&rev=892339&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/SelectorStrategy.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorStrategy.java Fri Dec 18 18:36:03 2009
@@ -17,12 +17,11 @@
  *  under the License.
  *
  */
-package org.apache.mina.transport.socket.nio;
+package org.apache.mina.service;
 
 import java.io.IOException;
 import java.net.SocketAddress;
 
-import org.apache.mina.service.SelectorProcessor;
 
 /**
  * Strategy for balancing server socket and client socket to different selecting/polling threads.

Propchange: mina/branches/3.0/core/src/main/java/org/apache/mina/service/SelectorStrategy.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSelectorProcessor.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSelectorProcessor.java?rev=892339&r1=892338&r2=892339&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSelectorProcessor.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSelectorProcessor.java Fri Dec 18 18:36:03 2009
@@ -34,6 +34,7 @@
 
 import org.apache.mina.IoSession;
 import org.apache.mina.service.SelectorProcessor;
+import org.apache.mina.service.SelectorStrategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java?rev=892339&r1=892338&r2=892339&view=diff
==============================================================================
--- mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java (original)
+++ mina/branches/3.0/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java Fri Dec 18 18:36:03 2009
@@ -26,6 +26,7 @@
 import java.util.Set;
 
 import org.apache.mina.service.AbstractIoAcceptor;
+import org.apache.mina.service.SelectorStrategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;