Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@activemq.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1421317 - in /activemq/activemq-apollo/trunk:
 apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/
 apollo-amqp/src/test/scala/org/apache/activemq/apollo/amqp/joram/
 apollo-website/src/documentation/
Date: Thu, 13 Dec 2012 14:47:10 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
Message-Id: <20121213144710.86C6323889BF@eris.apache.org>

Author: chirino
Date: Thu Dec 13 14:47:09 2012
New Revision: 1421317

URL: http://svn.apache.org/viewvc?rev=1421317&view=rev
Log:
Update the destination prefixes used by Apollo to be more consistent with the settings used by ActiveMQ 5.x.

Modified:
    activemq/activemq-apollo/trunk/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala
    activemq/activemq-apollo/trunk/apollo-amqp/src/test/scala/org/apache/activemq/apollo/amqp/joram/ApolloAdmin.java
    activemq/activemq-apollo/trunk/apollo-website/src/documentation/amqp-manual.md

Modified: activemq/activemq-apollo/trunk/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala?rev=1421317&r1=1421316&r2=1421317&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-amqp/src/main/scala/org/apache/activemq/apollo/amqp/AmqpProtocolHandler.scala Thu Dec 13 14:47:09 2012
@@ -60,11 +60,11 @@ object AmqpProtocolHandler extends Log {
   val WAITING_ON_CLIENT_REQUEST = () => "client request"
 
   val DEFAULT_DESTINATION_PARSER = new DestinationParser
-  DEFAULT_DESTINATION_PARSER.queue_prefix = "/queue/"
-  DEFAULT_DESTINATION_PARSER.topic_prefix = "/topic/"
-  DEFAULT_DESTINATION_PARSER.dsub_prefix = "/dsub/"
-  DEFAULT_DESTINATION_PARSER.temp_queue_prefix = "/temp-queue/"
-  DEFAULT_DESTINATION_PARSER.temp_topic_prefix = "/temp-topic/"
+  DEFAULT_DESTINATION_PARSER.queue_prefix = "queue://"
+  DEFAULT_DESTINATION_PARSER.topic_prefix = "topic://"
+  DEFAULT_DESTINATION_PARSER.dsub_prefix = "dsub://"
+  DEFAULT_DESTINATION_PARSER.temp_queue_prefix = "temp-queue://"
+  DEFAULT_DESTINATION_PARSER.temp_topic_prefix = "temp-topic://"
   DEFAULT_DESTINATION_PARSER.destination_separator = ","
   DEFAULT_DESTINATION_PARSER.path_separator = "."
   DEFAULT_DESTINATION_PARSER.any_child_wildcard = "*"
@@ -169,7 +169,12 @@ class AmqpProtocolHandler extends Protoc
     throw new Break()
   }
 
-  def amqp_error(name: String = "", message: String = "") = new EndpointError(name, message)
+  def amqp_error(name: String = "", message: String = "") = {
+    if ( name==null || message == null ) {
+      println("crap")
+    }
+    new EndpointError(name, message)
+  }
 
   def suspend_read(reason: => String) = {
     waiting_on = reason _

Modified: activemq/activemq-apollo/trunk/apollo-amqp/src/test/scala/org/apache/activemq/apollo/amqp/joram/ApolloAdmin.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-amqp/src/test/scala/org/apache/activemq/apollo/amqp/joram/ApolloAdmin.java?rev=1421317&r1=1421316&r2=1421317&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-amqp/src/test/scala/org/apache/activemq/apollo/amqp/joram/ApolloAdmin.java (original)
+++ activemq/activemq-apollo/trunk/apollo-amqp/src/test/scala/org/apache/activemq/apollo/amqp/joram/ApolloAdmin.java Thu Dec 13 14:47:09 2012
@@ -123,7 +123,7 @@ public class ApolloAdmin implements Admi
 
     public void createQueue(String name) {
         try {
-            context.bind(name, new QueueImpl("/queue/"+name));
+            context.bind(name, new QueueImpl("queue://"+name));
         } catch (NamingException e) {
             throw new RuntimeException(e);
         }
@@ -131,7 +131,7 @@ public class ApolloAdmin implements Admi
 
     public void createTopic(String name) {
         try {
-            context.bind(name, new TopicImpl("/topic/"+name));
+            context.bind(name, new TopicImpl("topic://"+name));
         } catch (NamingException e) {
             throw new RuntimeException(e);
         }

Modified: activemq/activemq-apollo/trunk/apollo-website/src/documentation/amqp-manual.md
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/src/documentation/amqp-manual.md?rev=1421317&r1=1421316&r2=1421317&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/src/documentation/amqp-manual.md (original)
+++ activemq/activemq-apollo/trunk/apollo-website/src/documentation/amqp-manual.md Thu Dec 13 14:47:09 2012
@@ -45,8 +45,8 @@ following configuration attributes:
 The amqp configuration element can also be used to control how the destination 
 headers are parsed and interpreted.  The supported attributes are:
   
-* `queue_prefix` : Defaults to `/queue/`
-* `topic_prefix` : Defaults to `/topic/`
+* `queue_prefix` : Defaults to `queue://`
+* `topic_prefix` : Defaults to `topic://`
 * `path_separator` : Defaults to `.`
 * `destination_separator` : Defaults to `,`
 * `any_child_wildcard` : Defaults to `*`
@@ -93,8 +93,8 @@ can reconnect and consume the queued mes
 at a later time.
 
 If you want to send or subscribe to a queue, topic, or durable
-subscription the AMQP address should be prefixed with `/queue/`,
-`/topic/` or `/dsub/` respectively.
+subscription the AMQP address should be prefixed with `queue://`,
+`topic://` or `dsub://` respectively.
 
 <!-- TODO: not supported yet via AMQP protocol
 ### Topic Retained Messages
@@ -148,12 +148,12 @@ If you want the durable subscription to 
 source expiry policy to LINK_DETACH and then close the link.
 
 If the durable subscription already exists you can address it directly using
-`/dsub/` prefix on the `destination` header. For example, send a message to
+`dsub://` prefix on the `destination` header. For example, send a message to
 the previously created `mysub` durable subscription, you would message to
-the target address of `/dsub/mysub`.
+the target address of `dsub://mysub`.
 
 Similarly, you can also receive messages from the durable subscription by using 
-the source address of `/dsub/mysub`,
+the source address of `dsub://mysub`,
 
 Unlike typical AMQP link id's which are local to the AMQP client's
 connection, the durable subscription id's are global across a virtual host. If
@@ -345,8 +345,8 @@ information you're interested in.
 For example imagine you are sending price messages from a stock exchange feed.
 You might use some kind of destination naming conventions such as:
 
-* `/topic/PRICE.STOCK.NASDAQ.IBM` to publish IBM's price on NASDAQ and
-* `/topic/PRICE.STOCK.NYSE.SUNW` to publish Sun's price on the New York Stock Exchange
+* `topic://PRICE.STOCK.NASDAQ.IBM` to publish IBM's price on NASDAQ and
+* `topic://PRICE.STOCK.NYSE.SUNW` to publish Sun's price on the New York Stock Exchange
 
 A subscriber could then use exact destinations to subscribe to exactly the
 prices it requires. Or it could use wildcards to define hierarchical pattern
@@ -354,12 +354,12 @@ matches to the destinations to subscribe
 
 For example using the example above, these subscriptions are possible
 
-* `/topic/PRICE.**` : Any price for any product on any exchange
-* `/topic/PRICE.STOCK.**` : Any price for a stock on any exchange
-* `/topic/PRICE.STOCK.NASDAQ.*` : Any stock price on NASDAQ
-* `/topic/PRICE.STOCK.*.IBM` : Any IBM stock price on any exchange
-* `/topic/PRICE.STOCK.*.I*` : Any stock price starting with 'I' on any exchange
-* `/topic/PRICE.STOCK.*.*{[0-9]}` : Any stock price that ends in a digit on any exchange
+* `topic://PRICE.**` : Any price for any product on any exchange
+* `topic://PRICE.STOCK.**` : Any price for a stock on any exchange
+* `topic://PRICE.STOCK.NASDAQ.*` : Any stock price on NASDAQ
+* `topic://PRICE.STOCK.*.IBM` : Any IBM stock price on any exchange
+* `topic://PRICE.STOCK.*.I*` : Any stock price starting with 'I' on any exchange
+* `topic://PRICE.STOCK.*.*{[0-9]}` : Any stock price that ends in a digit on any exchange
 
 Destination wildcards can only be used in a SUBSCRIBE frame.
 
@@ -368,7 +368,7 @@ Destination wildcards can only be used i
 You can use composite destinations to send or subscribe to multiple
 destinations at one time. You use separator of `,` between destination
 names.  For example to send one message to 2 queues and 1 topic, you would
-use an address of '/queue/a,/queue/b,/topic/c'
+use an address of 'queue://a,queue://b,topic://c'
 
 ### Message Selectors