Upgraded Mina to 1.1.7

ebourg · Oct 18, 2010 · 7c4f9e8 · 7c4f9e8
1 parent 8545887
commit 7c4f9e8
Show file tree

Hide file tree

Showing 27 changed files with 119 additions and 1,765 deletions.
diff --git a/qpid/java/build.deps b/qpid/java/build.deps
@@ -1,5 +1,3 @@
-backport-util-concurrent=lib/backport-util-concurrent-2.2.jar
-
 commons-beanutils-core=lib/commons-beanutils-core-1.8.0.jar
 commons-cli=lib/commons-cli-1.0.jar
 commons-codec=lib/commons-codec-1.3.jar
@@ -21,8 +19,8 @@ jline=lib/jline-0.9.94.jar
 
 log4j=lib/log4j-1.2.12.jar
 
-mina-core=lib/mina-core-1.0.1.jar
-mina-filter-ssl=lib/mina-filter-ssl-1.0.1.jar
+mina-core=lib/mina-core-1.1.7.jar
+mina-filter-ssl=lib/mina-filter-ssl-1.1.7.jar
 
 slf4j-api=lib/slf4j-api-1.4.0.jar
 slf4j-log4j=lib/slf4j-log4j12-1.4.0.jar
@@ -78,7 +76,7 @@ felix.libs=${osgi-core} ${felix-framework}
 commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
   ${commons-codec} ${commons-lang} ${commons-collections} ${commons-configuration}
 
-common.libs=${slf4j-api} ${backport-util-concurrent} ${mina-core} ${mina-filter-ssl} 
+common.libs=${slf4j-api} ${mina-core} ${mina-filter-ssl} 
 client.libs=${geronimo-jms}
 tools.libs=${commons-configuration.libs}
 broker.libs=${commons-cli} ${commons-logging} ${log4j} ${slf4j-log4j} \

diff --git a/qpid/java/client/example/bin/set_classpath.bat b/qpid/java/client/example/bin/set_classpath.bat
@@ -27,7 +27,6 @@ set QPIDLIB=%QPID_HOME%\lib
 
 if "%CLASSPATH%" == "" GOTO ERROR_CLASSPATH
 
-set CLASSPATH=%CLASSPATH%;%QPIDLIB%\backport-util-concurrent-2.2.jar
 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\geronimo-jms_1.1_spec-1.0.jar
 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\commons-collections-3.1.jar
 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\commons-configuration-1.2.jar
@@ -36,9 +35,8 @@ set CLASSPATH=%CLASSPATH%;%QPIDLIB%\commons-lang-2.1.jar
 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\commons-logging-api-1.0.4.jar
 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\commons-logging-1.0.jar
 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\log4j-1.2.12.jar
-set CLASSPATH=%CLASSPATH%;%QPIDLIB%\mina-core-1.0.0.jar
-set CLASSPATH=%CLASSPATH%;%QPIDLIB%\mina-filter-ssl-1.0.0.jar
-set CLASSPATH=%CLASSPATH%;%QPIDLIB%\mina-java5-1.0.0.jar
+set CLASSPATH=%CLASSPATH%;%QPIDLIB%\mina-core-1.1.7.jar
+set CLASSPATH=%CLASSPATH%;%QPIDLIB%\mina-filter-ssl-1.1.7.jar
 set CLASSPATH=%CLASSPATH%;%QPIDLIB%\slf4j-simple-1.0.jar
 
 GOTO END

diff --git a/qpid/java/client/example/bin/set_classpath.sh b/qpid/java/client/example/bin/set_classpath.sh
@@ -50,7 +50,6 @@ fi
 if $cygwin; then
     SEP=";"
     CLASSPATH=`cygpath -w $CLASSPATH`
-    CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/backport-util-concurrent-2.2.jar`
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/geronimo-jms_1.1_spec-1.0.jar`
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/commons-collections-3.1.jar`
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/commons-configuration-1.2.jar`
@@ -59,13 +58,11 @@ if $cygwin; then
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/commons-logging-api-1.0.4.jar`
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/commons-logging-1.0.jar`
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/log4j-1.2.12.jar`
-    CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/mina-core-1.0.0.jar`
-    CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/mina-filter-ssl-1.0.0.jar`
-    CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/mina-java5-1.0.0.jar`
+    CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/mina-core-1.1.7.jar`
+    CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/mina-filter-ssl-1.1.7.jar`
     CLASSPATH=$CLASSPATH$SEP`cygpath -w $QPIDLIB/slf4j-simple-1.0.jar`
     export CLASSPATH
 else
-    CLASSPATH=$CLASSPATH:$QPIDLIB/backport-util-concurrent-2.2.jar
     CLASSPATH=$CLASSPATH:$QPIDLIB/geronimo-jms_1.1_spec-1.0.jar
     CLASSPATH=$CLASSPATH:$QPIDLIB/commons-collections-3.1.jar
     CLASSPATH=$CLASSPATH:$QPIDLIB/commons-configuration-1.2.jar
@@ -74,9 +71,8 @@ else
     CLASSPATH=$CLASSPATH:$QPIDLIB/commons-logging-api-1.0.4.jar
     CLASSPATH=$CLASSPATH:$QPIDLIB/commons-logging-1.0.jar
     CLASSPATH=$CLASSPATH:$QPIDLIB/log4j-1.2.12.jar
-    CLASSPATH=$CLASSPATH:$QPIDLIB/mina-core-1.0.0.jar
-    CLASSPATH=$CLASSPATH:$QPIDLIB/mina-filter-ssl-1.0.0.jar
-    CLASSPATH=$CLASSPATH:$QPIDLIB/mina-java5-1.0.0.jar
+    CLASSPATH=$CLASSPATH:$QPIDLIB/mina-core-1.1.7.jar
+    CLASSPATH=$CLASSPATH:$QPIDLIB/mina-filter-ssl-1.1.7.jar
     CLASSPATH=$CLASSPATH:$QPIDLIB/slf4j-simple-1.0.jar
     export CLASSPATH
 fi

diff --git a/...va/client/src/main/java/org/apache/mina/transport/socket/nio/ExistingSocketConnector.java b/...va/client/src/main/java/org/apache/mina/transport/socket/nio/ExistingSocketConnector.java
@@ -19,7 +19,6 @@
  */
 package org.apache.mina.transport.socket.nio;
 
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
 import org.apache.mina.common.ConnectFuture;
 import org.apache.mina.common.ExceptionMonitor;
 import org.apache.mina.common.IoConnector;
@@ -30,7 +29,6 @@
 import org.apache.mina.common.support.DefaultConnectFuture;
 import org.apache.mina.util.NamePreservingRunnable;
 import org.apache.mina.util.NewThreadExecutor;
-import org.apache.mina.util.Queue;
 
 import java.io.IOException;
 import java.net.ConnectException;
@@ -40,7 +38,10 @@
 import java.nio.channels.Selector;
 import java.nio.channels.SocketChannel;
 import java.util.Iterator;
+import java.util.Queue;
 import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
 
 /**
  * {@link IoConnector} for socket transport (TCP/IP).
@@ -57,7 +58,7 @@ public class ExistingSocketConnector extends BaseIoConnector
     private final int id = nextId++;
     private final String threadName = "SocketConnector-" + id;
     private SocketConnectorConfig defaultConfig = new SocketConnectorConfig();
-    private final Queue connectQueue = new Queue();
+    private final Queue connectQueue = new ConcurrentLinkedQueue();
     private final SocketIoProcessor[] ioProcessors;
     private final int processorCount;
     private final Executor executor;
@@ -205,7 +206,7 @@ private synchronized void startupWorker() throws IOException
         {
             selector = Selector.open();
             worker = new Worker();
-            executor.execute(new NamePreservingRunnable(worker));
+            executor.execute(new NamePreservingRunnable(worker, null));
         }
     }
 
@@ -218,11 +219,7 @@ private void registerNew()
 
         for (; ;)
         {
-            ConnectionRequest req;
-            synchronized (connectQueue)
-            {
-                req = (ConnectionRequest) connectQueue.pop();
-            }
+            ConnectionRequest req = (ConnectionRequest) connectQueue.poll();
 
             if (req == null)
             {

diff --git a/...lient/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java b/...lient/src/test/java/org/apache/mina/transport/vmpipe/support/VmPipeIdleStatusChecker.java