From fc9e0db0b5c67758b70d1445358f7cd7f610384e Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Thu, 14 Jul 2011 13:02:43 +0000 Subject: QPID-2498: upgrade Mina to 1.1.7. Applied patch by Keith Wall git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1146677 13f79535-47bb-0310-9956-ffa450edef68 --- java/broker/etc/qpid-server.conf.jpp | 3 +-- java/build.deps | 8 +++----- .../org/apache/qpid/thread/QpidThreadExecutor.java | 2 +- java/lib/backport-util-concurrent-2.2.jar | Bin 326319 -> 0 bytes java/lib/mina-core-1.0.1.jar | Bin 313338 -> 0 bytes java/lib/mina-core-1.1.7.jar | Bin 0 -> 315582 bytes java/lib/mina-filter-ssl-1.0.1.jar | Bin 28950 -> 0 bytes java/lib/mina-filter-ssl-1.1.7.jar | Bin 0 -> 29188 bytes java/lib/poms/backport-util-concurrent-2.2.xml | 22 --------------------- java/lib/poms/mina-core-1.0.1.xml | 2 +- java/lib/poms/mina-filter-ssl-1.0.1.xml | 2 +- java/resources/NOTICE | 7 ------- .../org/apache/qpid/test/unit/ack/QuickAcking.java | 2 +- 13 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 java/lib/backport-util-concurrent-2.2.jar delete mode 100755 java/lib/mina-core-1.0.1.jar create mode 100644 java/lib/mina-core-1.1.7.jar delete mode 100755 java/lib/mina-filter-ssl-1.0.1.jar create mode 100644 java/lib/mina-filter-ssl-1.1.7.jar delete mode 100644 java/lib/poms/backport-util-concurrent-2.2.xml (limited to 'java') diff --git a/java/broker/etc/qpid-server.conf.jpp b/java/broker/etc/qpid-server.conf.jpp index 3ed2431ef3..0378c82fd9 100644 --- a/java/broker/etc/qpid-server.conf.jpp +++ b/java/broker/etc/qpid-server.conf.jpp @@ -17,8 +17,7 @@ # under the License. # -QPID_LIBS=$(build-classpath backport-util-concurrent \ - commons-beanutils \ +QPID_LIBS=$(build-classpath commons-beanutils \ commons-beanutils-core \ commons-cli \ commons-codec \ diff --git a/java/build.deps b/java/build.deps index 73c35940cb..cfbd122527 100644 --- a/java/build.deps +++ b/java/build.deps @@ -17,8 +17,6 @@ # under the License. # -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 @@ -36,8 +34,8 @@ junit=lib/junit-3.8.1.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.6.1.jar slf4j-log4j=lib/slf4j-log4j12-1.6.1.jar @@ -57,7 +55,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} ${log4j} broker.libs=${commons-cli} ${commons-logging} ${log4j} ${slf4j-log4j} \ diff --git a/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java b/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java index 38f60c04fe..30010a2d89 100644 --- a/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java +++ b/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java @@ -23,7 +23,7 @@ package org.apache.qpid.thread; import org.apache.qpid.thread.Threading; -import edu.emory.mathcs.backport.java.util.concurrent.Executor; +import java.util.concurrent.Executor; public class QpidThreadExecutor implements Executor { diff --git a/java/lib/backport-util-concurrent-2.2.jar b/java/lib/backport-util-concurrent-2.2.jar deleted file mode 100644 index 20a16877bd..0000000000 Binary files a/java/lib/backport-util-concurrent-2.2.jar and /dev/null differ diff --git a/java/lib/mina-core-1.0.1.jar b/java/lib/mina-core-1.0.1.jar deleted file mode 100755 index f12067aa90..0000000000 Binary files a/java/lib/mina-core-1.0.1.jar and /dev/null differ diff --git a/java/lib/mina-core-1.1.7.jar b/java/lib/mina-core-1.1.7.jar new file mode 100644 index 0000000000..a5fc451cc7 Binary files /dev/null and b/java/lib/mina-core-1.1.7.jar differ diff --git a/java/lib/mina-filter-ssl-1.0.1.jar b/java/lib/mina-filter-ssl-1.0.1.jar deleted file mode 100755 index 53738e6498..0000000000 Binary files a/java/lib/mina-filter-ssl-1.0.1.jar and /dev/null differ diff --git a/java/lib/mina-filter-ssl-1.1.7.jar b/java/lib/mina-filter-ssl-1.1.7.jar new file mode 100644 index 0000000000..40bdc919e1 Binary files /dev/null and b/java/lib/mina-filter-ssl-1.1.7.jar differ diff --git a/java/lib/poms/backport-util-concurrent-2.2.xml b/java/lib/poms/backport-util-concurrent-2.2.xml deleted file mode 100644 index 6df4cfca40..0000000000 --- a/java/lib/poms/backport-util-concurrent-2.2.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - backport-util-concurrent - backport-util-concurrent - 2.2 - diff --git a/java/lib/poms/mina-core-1.0.1.xml b/java/lib/poms/mina-core-1.0.1.xml index 87fb96999f..eee6108082 100644 --- a/java/lib/poms/mina-core-1.0.1.xml +++ b/java/lib/poms/mina-core-1.0.1.xml @@ -18,5 +18,5 @@ org.apache.mina mina-core - 1.0.1 + 1.1.7 diff --git a/java/lib/poms/mina-filter-ssl-1.0.1.xml b/java/lib/poms/mina-filter-ssl-1.0.1.xml index ae41d7ed63..52daba7eed 100644 --- a/java/lib/poms/mina-filter-ssl-1.0.1.xml +++ b/java/lib/poms/mina-filter-ssl-1.0.1.xml @@ -18,5 +18,5 @@ org.apache.mina mina-filter-ssl - 1.0.1 + 1.1.7 diff --git a/java/resources/NOTICE b/java/resources/NOTICE index 607c1c1580..add7753a4b 100644 --- a/java/resources/NOTICE +++ b/java/resources/NOTICE @@ -10,13 +10,6 @@ available from http://www.slf4j.org/ -Concurrency utlitity classes are provided by the backport-util-concurrent -library package, which is open source software, written by -Dawid Kurzyniec, and copyright by Distributed Computing Laboratory, -Emory University. The original software is available from - - http://dcl.mathcs.emory.edu/util/backport-util-concurrent/ - Data compression support is provided by the JZLib library package, which is open source software, written by JCraft, and copyright by JCraft. The original software is available from diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java b/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java index 6c83136511..13c78c1e14 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java +++ b/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java @@ -20,7 +20,7 @@ */ package org.apache.qpid.test.unit.ack; -import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch; +import java.util.concurrent.CountDownLatch; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.jms.ConnectionListener; import org.apache.qpid.test.utils.QpidBrokerTestCase; -- cgit v1.2.1