qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject svn commit: r1146677 - in /qpid/trunk/qpid/java: ./ broker/etc/ common/src/main/java/org/apache/qpid/thread/ lib/ lib/poms/ resources/ systests/src/main/java/org/apache/qpid/test/unit/ack/
Date Thu, 14 Jul 2011 13:02:44 GMT
Author: robbie
Date: Thu Jul 14 13:02:43 2011
New Revision: 1146677

URL: http://svn.apache.org/viewvc?rev=1146677&view=rev
Log:
QPID-2498: upgrade Mina to 1.1.7.

Applied patch by Keith Wall <keith.wall@gmail.com>

Added:
    qpid/trunk/qpid/java/lib/mina-core-1.1.7.jar
    qpid/trunk/qpid/java/lib/mina-filter-ssl-1.1.7.jar
Removed:
    qpid/trunk/qpid/java/lib/backport-util-concurrent-2.2.jar
    qpid/trunk/qpid/java/lib/mina-core-1.0.1.jar
    qpid/trunk/qpid/java/lib/mina-filter-ssl-1.0.1.jar
    qpid/trunk/qpid/java/lib/poms/backport-util-concurrent-2.2.xml
Modified:
    qpid/trunk/qpid/java/broker/etc/qpid-server.conf.jpp
    qpid/trunk/qpid/java/build.deps
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java
    qpid/trunk/qpid/java/lib/poms/mina-core-1.0.1.xml
    qpid/trunk/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml
    qpid/trunk/qpid/java/resources/NOTICE
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java

Modified: qpid/trunk/qpid/java/broker/etc/qpid-server.conf.jpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/qpid-server.conf.jpp?rev=1146677&r1=1146676&r2=1146677&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/etc/qpid-server.conf.jpp (original)
+++ qpid/trunk/qpid/java/broker/etc/qpid-server.conf.jpp Thu Jul 14 13:02:43 2011
@@ -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 \

Modified: qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1146677&r1=1146676&r2=1146677&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Thu Jul 14 13:02:43 2011
@@ -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-framewor
 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} \

Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java?rev=1146677&r1=1146676&r2=1146677&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java
(original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java
Thu Jul 14 13:02:43 2011
@@ -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
 {

Added: qpid/trunk/qpid/java/lib/mina-core-1.1.7.jar
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/mina-core-1.1.7.jar?rev=1146677&view=auto
==============================================================================
Files qpid/trunk/qpid/java/lib/mina-core-1.1.7.jar (added) and qpid/trunk/qpid/java/lib/mina-core-1.1.7.jar
Thu Jul 14 13:02:43 2011 differ

Added: qpid/trunk/qpid/java/lib/mina-filter-ssl-1.1.7.jar
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/mina-filter-ssl-1.1.7.jar?rev=1146677&view=auto
==============================================================================
Files qpid/trunk/qpid/java/lib/mina-filter-ssl-1.1.7.jar (added) and qpid/trunk/qpid/java/lib/mina-filter-ssl-1.1.7.jar
Thu Jul 14 13:02:43 2011 differ

Modified: qpid/trunk/qpid/java/lib/poms/mina-core-1.0.1.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/mina-core-1.0.1.xml?rev=1146677&r1=1146676&r2=1146677&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/mina-core-1.0.1.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/mina-core-1.0.1.xml Thu Jul 14 13:02:43 2011
@@ -18,5 +18,5 @@
 <dep>
   <groupId>org.apache.mina</groupId>
   <artifactId>mina-core</artifactId>
-  <version>1.0.1</version>
+  <version>1.1.7</version>
 </dep>

Modified: qpid/trunk/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml?rev=1146677&r1=1146676&r2=1146677&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/mina-filter-ssl-1.0.1.xml Thu Jul 14 13:02:43 2011
@@ -18,5 +18,5 @@
 <dep>
   <groupId>org.apache.mina</groupId>
   <artifactId>mina-filter-ssl</artifactId>
-  <version>1.0.1</version>
+  <version>1.1.7</version>
 </dep>

Modified: qpid/trunk/qpid/java/resources/NOTICE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/resources/NOTICE?rev=1146677&r1=1146676&r2=1146677&view=diff
==============================================================================
--- qpid/trunk/qpid/java/resources/NOTICE (original)
+++ qpid/trunk/qpid/java/resources/NOTICE Thu Jul 14 13:02:43 2011
@@ -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

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java?rev=1146677&r1=1146676&r2=1146677&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java
(original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java
Thu Jul 14 13:02:43 2011
@@ -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;



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message