You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/01/25 03:18:21 UTC
svn commit: r1235595 - in /activemq/activemq-apollo/trunk:
apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/
apollo-broker/src/test/resources/org/apache/activemq/apollo/broker/
apollo-dto/src/main/java/org/apache/activemq/apollo/dto/ apol...
Author: chirino
Date: Wed Jan 25 02:18:20 2012
New Revision: 1235595
URL: http://svn.apache.org/viewvc?rev=1235595&view=rev
Log:
Renamed the 'Unified Destination' feature and config option to 'Mirrored Queues' since that better describes what the feature is doing. Updated documentation and listed it as feature in the release notes.
Modified:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Topic.scala
activemq/activemq-apollo/trunk/apollo-broker/src/test/resources/org/apache/activemq/apollo/broker/destination-config.xml
activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java
activemq/activemq-apollo/trunk/apollo-itests/src/test/resources/apollo-openwire.xml
activemq/activemq-apollo/trunk/apollo-itests/src/test/resources/apollo-stomp.xml
activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/apollo-openwire-bdb.xml
activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/apollo-openwire-custom-dest-delimiters.xml
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-custom-dest-delimiters.xml
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml
activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml
activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala
activemq/activemq-apollo/trunk/apollo-website/src/blog/releases/release-1.0.page
activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
activemq/activemq-apollo/trunk/apollo-website/src/index.page
Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/LocalRouter.scala Wed Jan 25 02:18:20 2012
@@ -738,7 +738,7 @@ class LocalRouter(val virtual_host:Virtu
add_destination(path, queue)
import OptionSupport._
- if( queue.config.unified.getOrElse(false) ) {
+ if( queue.config.mirrored.getOrElse(false) ) {
// hook up the queue to be a subscriber of the topic.
val topic = local_topic_domain.get_or_create_destination(path, new TopicDestinationDTO(queue.binding.binding_dto.path), null).success
@@ -751,7 +751,7 @@ class LocalRouter(val virtual_host:Virtu
remove_destination(path, queue)
import OptionSupport._
- if( queue.config.unified.getOrElse(false) ) {
+ if( queue.config.mirrored.getOrElse(false) ) {
// unhook the queue from the topic
val topic = local_topic_domain.get_or_create_destination(path, new TopicDestinationDTO(queue.binding.binding_dto.path), null).success
topic.unbind(queue, false)
Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala Wed Jan 25 02:18:20 2012
@@ -236,8 +236,8 @@ class Queue(val router: LocalRouter, val
auto_delete_after = config.auto_delete_after.getOrElse(30)
if( auto_delete_after!= 0 ) {
// we don't auto delete explicitly configured queues,
- // non destination queues, or unified queues.
- if( config.unified.getOrElse(false) || !binding.isInstanceOf[QueueDomainQueueBinding] || !LocalRouter.is_wildcard_config(config) ) {
+ // non destination queues, or mirrored queues.
+ if( config.mirrored.getOrElse(false) || !binding.isInstanceOf[QueueDomainQueueBinding] || !LocalRouter.is_wildcard_config(config) ) {
auto_delete_after = 0
}
}
@@ -1018,8 +1018,8 @@ class Queue(val router: LocalRouter, val
def connect (destination:DestinationDTO, producer:BindableDeliveryProducer) = {
import OptionSupport._
- if( config.unified.getOrElse(false) ) {
- // this is a unified queue.. actually have the produce bind to the topic, instead of the
+ if( config.mirrored.getOrElse(false) ) {
+ // this is a mirrored queue.. actually have the produce bind to the topic, instead of the
val topic_dto = new TopicDestinationDTO(binding.binding_dto.path)
val topic = router.local_topic_domain.get_or_create_destination(binding.destination, topic_dto, null).success
topic.connect(destination, producer)
@@ -1035,7 +1035,7 @@ class Queue(val router: LocalRouter, val
def disconnect (producer:BindableDeliveryProducer) = {
import OptionSupport._
- if( config.unified.getOrElse(false) ) {
+ if( config.mirrored.getOrElse(false) ) {
val topic_dto = new TopicDestinationDTO(binding.binding_dto.path)
val topic = router.local_topic_domain.get_or_create_destination(binding.destination, topic_dto, null).success
topic.disconnect(producer)
Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Topic.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Topic.scala?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Topic.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Topic.scala Wed Jan 25 02:18:20 2012
@@ -322,7 +322,7 @@ class Topic(val router:LocalRouter, val
val target = destination match {
case null=>
- // this is the unified queue case..
+ // this is the mirrored queue case..
consumer
case destination:TopicDestinationDTO=>
var target = consumer
Modified: activemq/activemq-apollo/trunk/apollo-broker/src/test/resources/org/apache/activemq/apollo/broker/destination-config.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/test/resources/org/apache/activemq/apollo/broker/destination-config.xml?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/test/resources/org/apache/activemq/apollo/broker/destination-config.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/test/resources/org/apache/activemq/apollo/broker/destination-config.xml Wed Jan 25 02:18:20 2012
@@ -20,11 +20,11 @@
<virtual_host id="default">
<host_name>test</host_name>
- <topic id="unified.*"/>
- <topic id="notunified.*"/>
+ <topic id="mirrored.*"/>
+ <topic id="notmirrored.*"/>
- <queue id="unified.a" kind="ptp" queue_buffer="333" unified="true"/>
- <queue id="unified.*" kind="ds" queue_buffer="444" unified="true"/>
+ <queue id="mirrored.a" kind="ptp" queue_buffer="333" mirrored="true"/>
+ <queue id="mirrored.*" kind="ds" queue_buffer="444" mirrored="true"/>
<queue queue_buffer="111"/>
</virtual_host>
Modified: activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/src/main/java/org/apache/activemq/apollo/dto/QueueDTO.java Wed Jan 25 02:18:20 2012
@@ -41,13 +41,14 @@ public class QueueDTO extends StringIdDT
public Integer auto_delete_after;
/**
- * If set to true, then routing then there is no difference between
- * sending to a queue or topic of the same name. The first time
- * a queue is created, it will act like if a durable
- * subscription was created on the topic.
+ * If set to true, then once the queue
+ * is created all messages sent to the queue
+ * will be mirrored to a topic of the same name
+ * and all messages sent to the topic will be mirror
+ * to the queue.
*/
@XmlAttribute
- public Boolean unified;
+ public Boolean mirrored;
/**
* The amount of memory buffer space to use per consumer.
@@ -143,7 +144,7 @@ public class QueueDTO extends StringIdDT
if (swap != null ? !swap.equals(queueDTO.swap) : queueDTO.swap != null) return false;
if (swap_range_size != null ? !swap_range_size.equals(queueDTO.swap_range_size) : queueDTO.swap_range_size != null)
return false;
- if (unified != null ? !unified.equals(queueDTO.unified) : queueDTO.unified != null) return false;
+ if (mirrored != null ? !mirrored.equals(queueDTO.mirrored) : queueDTO.mirrored != null) return false;
return true;
}
@@ -152,7 +153,7 @@ public class QueueDTO extends StringIdDT
public int hashCode() {
int result = super.hashCode();
result = 31 * result + (auto_delete_after != null ? auto_delete_after.hashCode() : 0);
- result = 31 * result + (unified != null ? unified.hashCode() : 0);
+ result = 31 * result + (mirrored != null ? mirrored.hashCode() : 0);
result = 31 * result + (consumer_buffer != null ? consumer_buffer.hashCode() : 0);
result = 31 * result + (persistent != null ? persistent.hashCode() : 0);
result = 31 * result + (swap != null ? swap.hashCode() : 0);
Modified: activemq/activemq-apollo/trunk/apollo-itests/src/test/resources/apollo-openwire.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/src/test/resources/apollo-openwire.xml?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-itests/src/test/resources/apollo-openwire.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-itests/src/test/resources/apollo-openwire.xml Wed Jan 25 02:18:20 2012
@@ -21,7 +21,7 @@
<virtual_host id="default" purge_on_startup="true" auto_create_queues="true">
<host_name>localhost</host_name>
- <queue name="unified.**" unified="true"/>
+ <queue name="mirrored.**" mirrored="true"/>
</virtual_host>
Modified: activemq/activemq-apollo/trunk/apollo-itests/src/test/resources/apollo-stomp.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-itests/src/test/resources/apollo-stomp.xml?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-itests/src/test/resources/apollo-stomp.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-itests/src/test/resources/apollo-stomp.xml Wed Jan 25 02:18:20 2012
@@ -21,7 +21,7 @@
<virtual_host id="default" purge_on_startup="true" auto_create_queues="true">
<host_name>localhost</host_name>
- <queue name="unified.**" unified="true"/>
+ <queue name="mirrored.**" mirrored="true"/>
</virtual_host>
Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/apollo-openwire-bdb.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/apollo-openwire-bdb.xml?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/apollo-openwire-bdb.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/apollo-openwire-bdb.xml Wed Jan 25 02:18:20 2012
@@ -21,7 +21,7 @@
<virtual_host id="default" purge_on_startup="true">
<host_name>localhost</host_name>
- <queue name="unified.**" unified="true"/>
+ <queue name="mirrored.**" mirrored="true"/>
<bdb_store directory="${basedir}/target/test-data"/>
</virtual_host>
Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/apollo-openwire-custom-dest-delimiters.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/apollo-openwire-custom-dest-delimiters.xml?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/apollo-openwire-custom-dest-delimiters.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/test/resources/apollo-openwire-custom-dest-delimiters.xml Wed Jan 25 02:18:20 2012
@@ -21,7 +21,7 @@
<virtual_host id="default" purge_on_startup="true" auto_create_queues="true">
<host_name>localhost</host_name>
- <queue name="unified.**" unified="true"/>
+ <queue name="mirrored.**" mirrored="true"/>
</virtual_host>
Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-bdb.xml Wed Jan 25 02:18:20 2012
@@ -21,7 +21,7 @@
<virtual_host id="default" purge_on_startup="true">
<host_name>localhost</host_name>
- <queue name="unified.**" unified="true"/>
+ <queue name="mirrored.**" mirrored="true"/>
<bdb_store directory="${basedir}/target/bdb-test-data"/>
</virtual_host>
Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-custom-dest-delimiters.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-custom-dest-delimiters.xml?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-custom-dest-delimiters.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-custom-dest-delimiters.xml Wed Jan 25 02:18:20 2012
@@ -21,7 +21,7 @@
<virtual_host id="default" purge_on_startup="true" auto_create_queues="true">
<host_name>localhost</host_name>
- <queue name="unified.**" unified="true"/>
+ <queue name="mirrored.**" mirrored="true"/>
</virtual_host>
Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp-leveldb.xml Wed Jan 25 02:18:20 2012
@@ -21,7 +21,7 @@
<virtual_host id="default" purge_on_startup="true">
<host_name>localhost</host_name>
- <queue name="unified.**" unified="true"/>
+ <queue name="mirrored.**" mirrored="true"/>
<leveldb_store directory="${basedir}/target/leveldb-test-data"/>
</virtual_host>
Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/resources/apollo-stomp.xml Wed Jan 25 02:18:20 2012
@@ -21,7 +21,7 @@
<virtual_host id="default" purge_on_startup="true" auto_create_queues="true">
<host_name>localhost</host_name>
- <queue name="unified.**" unified="true"/>
+ <queue name="mirrored.**" mirrored="true"/>
</virtual_host>
Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala Wed Jan 25 02:18:20 2012
@@ -1125,7 +1125,7 @@ class DurableSubscriptionOnBDBTest exten
override val broker_config_uri: String = "xml:classpath:apollo-stomp-bdb.xml"
}
-class StompUnifiedQueueTest extends StompTestSupport {
+class StompMirroredQueueTest extends StompTestSupport {
test("Topic gets copy of message sent to queue") {
connect("1.1")
@@ -1133,7 +1133,7 @@ class StompUnifiedQueueTest extends Stom
// Connect to subscribers
client.write(
"SUBSCRIBE\n" +
- "destination:/topic/unified.a\n" +
+ "destination:/topic/mirrored.a\n" +
"id:1\n" +
"receipt:0\n" +
"\n")
@@ -1142,7 +1142,7 @@ class StompUnifiedQueueTest extends Stom
def put(id:Int) = {
client.write(
"SEND\n" +
- "destination:/queue/unified.a\n" +
+ "destination:/queue/mirrored.a\n" +
"\n" +
"message:"+id+"\n")
}
@@ -1163,7 +1163,7 @@ class StompUnifiedQueueTest extends Stom
// Connect to subscribers
client.write(
"SUBSCRIBE\n" +
- "destination:/queue/unified.b\n" +
+ "destination:/queue/mirrored.b\n" +
"id:1\n" +
"receipt:0\n" +
"\n")
@@ -1172,7 +1172,7 @@ class StompUnifiedQueueTest extends Stom
def put(id:Int) = {
client.write(
"SEND\n" +
- "destination:/topic/unified.b\n" +
+ "destination:/topic/mirrored.b\n" +
"\n" +
"message:"+id+"\n")
}
@@ -1194,7 +1194,7 @@ class StompUnifiedQueueTest extends Stom
def put(id:Int) = {
client.write(
"SEND\n" +
- "destination:/topic/unified.c\n" +
+ "destination:/topic/mirrored.c\n" +
"\n" +
"message:"+id+"\n")
}
@@ -1204,7 +1204,7 @@ class StompUnifiedQueueTest extends Stom
// Connect to subscribers
client.write(
"SUBSCRIBE\n" +
- "destination:/queue/unified.c\n" +
+ "destination:/queue/mirrored.c\n" +
"id:1\n" +
"receipt:0\n" +
"\n")
Modified: activemq/activemq-apollo/trunk/apollo-website/src/blog/releases/release-1.0.page
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/blog/releases/release-1.0.page?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/blog/releases/release-1.0.page (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/blog/releases/release-1.0.page Wed Jan 25 02:18:20 2012
@@ -28,20 +28,20 @@ Apollo is the fastest and most robust ST
Apollo Features:
-* [Stomp 1.0](http://stomp.github.com/stomp-specification-1.0.html) Protocol
- Support
-* [Stomp 1.1](http://stomp.github.com/stomp-specification-1.1.html) Protocol
- Support
+* [Stomp 1.0](http://stomp.github.com/stomp-specification-1.0.html) Protocol Support
+* [Stomp 1.1](http://stomp.github.com/stomp-specification-1.1.html) Protocol Support
* [Topics and Queues](${website_base_url}/documentation/user-manual.html#Destination_Types)
* [Queue Browsers](${website_base_url}/documentation/user-manual.html#Browsing_Subscriptions)
* [Durable Subscriptions on Topics](${website_base_url}/documentation/user-manual.html#Topic_Durable_Subscriptions)
+* [Mirrored Queues](${website_base_url}/documentation/user-manual.html#Mirrored_Queues)
* [Reliable Messaging](${website_base_url}/documentation/user-manual.html#Reliable_Messaging)
-* Message swapping
+* [Message Expiration](${website_base_url}/documentation/user-manual.html#Message_Expiration)
+* [Message Swapping](${website_base_url}/documentation/architecture.html#Message_Swapping)
* [Message Selectors](${website_base_url}/documentation/user-manual.html#Message_Selectors)
* [JAAS Authentication](${website_base_url}/documentation/user-manual.html#Authentication)
-* [ACL Authorization](${website_base_url}/documentation/user-manual.html#Authorization)
-* [SSL/TLS Support](${website_base_url}/documentation/user-manual.html#Using_SSL_TLS)
-* [REST Based Management](${website_base_url}/documentation/architecture.html#REST_Based_Management)
+* [ACL based Authorization](${website_base_url}/documentation/user-manual.html#Authorization)
+* [SSL/TLS Support](${website_base_url}/documentation/user-manual.html#Using_SSL_TLS) and Certificate based Authentication
+* [REST Management API](${website_base_url}/documentation/management-api.html)
Noteworthy changes since the last beta include:
Modified: activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md Wed Jan 25 02:18:20 2012
@@ -240,9 +240,11 @@ queue will be created when the broker fi
A `queue` element may be configured with the following attributes:
-* `unified` : If set to true, then routing then there is no difference
- between sending to a queue or topic of the same name. See the
- [Unified Destinations](#Unified_Destinations) documentation for more
+* `mirrored` : If set to true, If set to true, then once the queue
+ is created all messages sent to the queue will be mirrored to a
+ topic of the same name and all messages sent to the topic will be mirror
+ to the queue. See the
+ [Mirrored Queues](Mirrored_Queues) documentation for more
details. Defaults to false.
* `consumer_buffer` : The amount of memory buffer space allocated to each
@@ -331,18 +333,27 @@ then you must set the `topic` attribute
A `dsub` element may be configured with all the
attributes available on the `queue` element.
-##### Unified Destinations
+##### Mirrored Queues
-Unified destinations can be used so that you can mix queue and topic
+A mirrored queue, once create will copy all messages sent
+to the queue to a topic of the same name and conversely
+the queue will receive a copy of all messages sent to the topic.
+
+Mirrored queues can be used to mix queue and topic
behavior on one logical destination. For example, lets assumed `foo`
-is configured as a unified destination and you have 2 subscribers
-on queue `foo` and 2 subscribers on topic `foo`, then when you publish to
-queue `foo` or topic `foo`, the 2 queue subscribers will load balance
-their messages and the 2 topic subscribers will each get a copy of the message.
-
-It is important to note that the unified subscription will not start
-retaining it's messages in a queue until a queue subscriber subscribes from
-it.
+is configured as a mirrored destination and you have 2 subscribers
+on queue `foo` and 2 subscribers on topic `foo`. On the producer side,
+publishers can send either the queue or topic and get the same results.
+On the consumer side, the 2 consumers the the queue foo will get queue
+semantics and message from the queue will be load balanced between
+the 2 consumers. The 2 consumers on the topic foo will each
+get a copy of every message sent. You can even create durable subscriptions
+on the topic which then effectively becomes a queue which mirrors the
+original queue.
+
+It is important to note that the mirroring will not start until the queue
+is created which typically happens you first send a message to the queue
+or subscribe to it.
##### Message Stores
Modified: activemq/activemq-apollo/trunk/apollo-website/src/index.page
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/index.page?rev=1235595&r1=1235594&r2=1235595&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/index.page (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/index.page Wed Jan 25 02:18:20 2012
@@ -42,6 +42,7 @@ ActiveMQ 5.x JMS clients.
* [Topics and Queues](documentation/user-manual.html#Destination_Types)
* [Queue Browsers](documentation/user-manual.html#Browsing_Subscriptions)
* [Durable Subscriptions on Topics](documentation/user-manual.html#Topic_Durable_Subscriptions)
+* [Mirrored Queues](documentation/user-manual.html#Mirrored_Queues)
* [Reliable Messaging](documentation/user-manual.html#Reliable_Messaging)
* [Message Expiration](documentation/user-manual.html#Message_Expiration)
* [Message Swapping](documentation/architecture.html#Message_Swapping)