You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2014/04/30 16:09:01 UTC
git commit: fix for: https://issues.apache.org/jira/browse/AMQ-5004
Repository: activemq
Updated Branches:
refs/heads/trunk 4eb5097f2 -> 8498136f5
fix for: https://issues.apache.org/jira/browse/AMQ-5004
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/8498136f
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/8498136f
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/8498136f
Branch: refs/heads/trunk
Commit: 8498136f5e96764ca598dfcacc554b17145af782
Parents: 4eb5097
Author: Timothy Bish <ta...@gmai.com>
Authored: Wed Apr 30 10:08:28 2014 -0400
Committer: Timothy Bish <ta...@gmai.com>
Committed: Wed Apr 30 10:08:28 2014 -0400
----------------------------------------------------------------------
.../activemq/transport/amqp/bugs/AMQ4914Test.java | 13 +++----------
assembly/pom.xml | 12 ++++++------
assembly/src/main/descriptors/common-bin.xml | 7 +++----
pom.xml | 4 ++--
4 files changed, 14 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/8498136f/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/bugs/AMQ4914Test.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/bugs/AMQ4914Test.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/bugs/AMQ4914Test.java
index d3439fe..704e3d1 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/bugs/AMQ4914Test.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/bugs/AMQ4914Test.java
@@ -26,13 +26,12 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
+import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
import org.apache.activemq.transport.amqp.AmqpTestSupport;
import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
-import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
@@ -40,17 +39,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AMQ4914Test extends AmqpTestSupport {
+
@Rule
public TestName testName = new TestName();
protected static final Logger LOG = LoggerFactory.getLogger(AMQ4914Test.class);
- private final static String QUEUE_NAME="queue://ENTMQ476TestQueue";
- /**
- *
- * @param sizeInBytes
- * @return
- */
private String createLargeString(int sizeInBytes) {
byte[] base = {1, 2, 3, 4, 5, 6, 7, 8, 9, 0};
StringBuilder builder = new StringBuilder();
@@ -76,7 +70,6 @@ public class AMQ4914Test extends AmqpTestSupport {
doTestSendLargeMessage(65536 * 4);
}
- @Ignore("AMQ-5102")
@Test(timeout = 5 * 60 * 1000)
public void testSendHugeMessage() throws JMSException {
doTestSendLargeMessage(1024 * 1024 * 10);
@@ -91,7 +84,7 @@ public class AMQ4914Test extends AmqpTestSupport {
long startTime = System.currentTimeMillis();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- QueueImpl queue = new QueueImpl(QUEUE_NAME);
+ Queue queue = session.createQueue(testName.getMethodName());
MessageProducer producer = session.createProducer(queue);
TextMessage message = session.createTextMessage();
message.setText(payload);
http://git-wip-us.apache.org/repos/asf/activemq/blob/8498136f/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 2303354..80ee9e5 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -70,7 +70,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>activemq-partition</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.fusesource.hawtdispatch</groupId>
<artifactId>hawtdispatch-transport</artifactId>
@@ -91,7 +91,7 @@
<artifactId>zookeeper</artifactId>
<version>${zookeeper-version}</version>
</dependency>
-
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -101,9 +101,9 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${org.osgi.core-version}</version>
- </dependency>
-
-
+ </dependency>
+
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-kahadb-store</artifactId>
@@ -426,7 +426,7 @@
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
- <artifactId>proton-j-impl</artifactId>
+ <artifactId>proton-j</artifactId>
<version>${qpid-proton-version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/activemq/blob/8498136f/assembly/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 3aa8960..862ddc4 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -28,7 +28,7 @@
<include>conf/*.ts</include>
<include>conf/*.ks</include>
<include>conf/*.cert</include>
- <include>webapps/*.ico</include>
+ <include>webapps/*.ico</include>
</includes>
</fileSet>
@@ -142,7 +142,7 @@
<include>${pom.groupId}:activemq-web</include>
<include>org.fusesource.hawtbuf:hawtbuf</include>
<include>org.fusesource.insight:insight-log-core</include>
- <!-- TODO: we use a patched insight-log4j AR from assembly/src/release/lib until a new release is out
+ <!-- TODO: we use a patched insight-log4j AR from assembly/src/release/lib until a new release is out
<include>org.fusesource.insight:insight-log4j</include>
-->
</includes>
@@ -205,9 +205,8 @@
<include>org.jasypt:jasypt-spring3</include>
<include>javax.jmdns:jmdns</include>
<include>org.apache.qpid:proton</include>
- <include>org.apache.qpid:proton-api</include>
<include>org.apache.qpid:proton-jms</include>
- <include>org.apache.qpid:proton-j-impl</include>
+ <include>org.apache.qpid:proton-j</include>
<include>${pom.groupId}:activemq-runtime-config</include>
<include>org.jvnet.jaxb2_commons:jaxb2-basics-runtime</include>
http://git-wip-us.apache.org/repos/asf/activemq/blob/8498136f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6acada5..4cd4649 100755
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
<paho-version>0.4.0</paho-version>
<linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
<zookeeper-version>3.4.5</zookeeper-version>
- <qpid-proton-version>0.6</qpid-proton-version>
+ <qpid-proton-version>0.7</qpid-proton-version>
<qpid-jms-version>0.26</qpid-jms-version>
<regexp-version>1.3</regexp-version>
<rome-version>1.0</rome-version>
@@ -676,7 +676,7 @@
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${openjpa-version}</version>
</dependency>
-
+
<!-- Optional Shiro Support -->
<dependency>
<groupId>org.apache.shiro</groupId>