Author: dejanb
Date: Tue Apr 27 08:22:59 2010
New Revision: 938353
URL: http://svn.apache.org/viewvc?rev=938353&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2183 - composite destinations and
master/slave
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=938353&r1=938352&r2=938353&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
Tue Apr 27 08:22:59 2010
@@ -1828,11 +1828,11 @@ public class BrokerService implements Se
}
broker = sb;
}
- broker = new TransactionBroker(broker,
getPersistenceAdapter().createTransactionStore());
if (isAdvisorySupport()) {
broker = new AdvisoryBroker(broker);
}
broker = new CompositeDestinationBroker(broker);
+ broker = new TransactionBroker(broker,
getPersistenceAdapter().createTransactionStore());
if (isPopulateJMSXUserID()) {
broker = new UserIDBroker(broker);
}
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.java?rev=938353&view=auto
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.java
(added)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest.java
Tue Apr 27 08:22:59 2010
@@ -0,0 +1,45 @@
+/**
+ * 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.
+ */
+package org.apache.activemq.broker.ft;
+
+/**
+ * Let's test composite destinations
+ *
+ */
+public class QueueMasterSlaveUsingMasterConnectorElementCompositeQueueTest
extends QueueMasterSlaveUsingMasterConnectorElementTest {
+
+ /**
+ * Returns the consumer subject.
+ *
+ * @return String - consumer subject
+ * @see org.apache.activemq.test.TestSupport#getConsumerSubject()
+ */
+ protected String getConsumerSubject() {
+ return "FOO.BAR.HUMBUG2";
+ }
+
+ /**
+ * Returns the producer subject.
+ *
+ * @return String - producer subject
+ * @see org.apache.activemq.test.TestSupport#getProducerSubject()
+ */
+ protected String getProducerSubject() {
+ return "queue://FOO.BAR.HUMBUG,queue://FOO.BAR.HUMBUG2";
+ }
+
+}
\ No newline at end of file
