You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ar...@apache.org on 2015/05/30 01:39:02 UTC
[1/2] activemq git commit: AMQ-5713 - making accessors public to
remove startup error.
Repository: activemq
Updated Branches:
refs/heads/master 8ca6341d4 -> 8095d8eab
AMQ-5713 - making accessors public to remove startup error.
Includes unit test DestinationBridgeAccessorsTest which replicated the problem and now passes.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/dcc7b113
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/dcc7b113
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/dcc7b113
Branch: refs/heads/master
Commit: dcc7b11347fbaa91e6e387fdb8b0dfd67f719287
Parents: 8ca6341
Author: mfrazier <mf...@savoirtech.com>
Authored: Fri May 29 16:13:41 2015 -0700
Committer: mfrazier <mf...@savoirtech.com>
Committed: Fri May 29 16:13:41 2015 -0700
----------------------------------------------------------------------
.../activemq/network/jms/DestinationBridge.java | 4 +--
.../xbean/DestinationBridgeAccessorsTest.java | 20 +++++++++++
.../test/resources/handleReplyToActivemq.xml | 38 ++++++++++++++++++++
3 files changed, 60 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/dcc7b113/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java b/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
index ff0f076..7fc42d1 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
@@ -154,14 +154,14 @@ public abstract class DestinationBridge implements Service, MessageListener {
/**
* @return Returns the doHandleReplyTo.
*/
- protected boolean isDoHandleReplyTo() {
+ public boolean isDoHandleReplyTo() {
return doHandleReplyTo;
}
/**
* @param doHandleReplyTo The doHandleReplyTo to set.
*/
- protected void setDoHandleReplyTo(boolean doHandleReplyTo) {
+ public void setDoHandleReplyTo(boolean doHandleReplyTo) {
this.doHandleReplyTo = doHandleReplyTo;
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/dcc7b113/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/DestinationBridgeAccessorsTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/DestinationBridgeAccessorsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/DestinationBridgeAccessorsTest.java
new file mode 100644
index 0000000..35725a3
--- /dev/null
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/DestinationBridgeAccessorsTest.java
@@ -0,0 +1,20 @@
+package org.apache.activemq.xbean;
+
+import java.net.URI;
+
+import org.apache.activemq.broker.BrokerService;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DestinationBridgeAccessorsTest extends Assert {
+
+ @Test
+ public void testCreateBroker() throws Exception {
+ XBeanBrokerFactory xBeanBrokerFactory = new XBeanBrokerFactory();
+
+ BrokerService broker = xBeanBrokerFactory.createBroker(new URI("handleReplyToActivemq.xml"));
+
+ assertNotNull(broker);
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq/blob/dcc7b113/activemq-unit-tests/src/test/resources/handleReplyToActivemq.xml
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/resources/handleReplyToActivemq.xml b/activemq-unit-tests/src/test/resources/handleReplyToActivemq.xml
new file mode 100644
index 0000000..5986fd6
--- /dev/null
+++ b/activemq-unit-tests/src/test/resources/handleReplyToActivemq.xml
@@ -0,0 +1,38 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+
+ <broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}">
+
+ <jmsBridgeConnectors>
+ <jmsQueueConnector>
+ <inboundQueueBridges>
+ <inboundQueueBridge inboundQueueName="QueueA" localQueueName = "localTestQ"
+doHandleReplyTo="false"/>
+ </inboundQueueBridges>
+ </jmsQueueConnector>
+ </jmsBridgeConnectors>
+
+ </broker>
+
+</beans>
+<!-- END SNIPPET: example -->
[2/2] activemq git commit: This closes #106
Posted by ar...@apache.org.
This closes #106
Thank you Mark Frazier.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/8095d8ea
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/8095d8ea
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/8095d8ea
Branch: refs/heads/master
Commit: 8095d8eab849c9227e89577a82ecf55ac7b7a67a
Parents: dcc7b11
Author: artnaseef <ar...@apache.org>
Authored: Fri May 29 16:38:27 2015 -0700
Committer: artnaseef <ar...@apache.org>
Committed: Fri May 29 16:38:27 2015 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------