svn commit: r1126510 - in /activemq/activemq-apollo/trunk: apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala apollo-website/src/documentation/user-manual.md

[ch...@apache.org]

Author: chirino
Date: Mon May 23 14:26:47 2011
New Revision: 1126510

URL: http://svn.apache.org/viewvc?rev=1126510&view=rev
Log:
Fixes https://issues.apache.org/jira/browse/APLO-6 : support alternative topic separators.

Modified:
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala
    activemq/activemq-apollo/trunk/apollo-website/src/documentation/user-manual.md

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala?rev=1126510&r1=1126509&r2=1126510&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompFrame.scala Mon May 23 14:26:47 2011
@@ -302,12 +302,14 @@ object Stomp {
   val DURABLE_PREFIX = ascii("durable:")
   val DURABLE_QUEUE_KIND = ascii("stomp:sub")
 
+
   val destination_parser = new DestinationParser
-  destination_parser.queue_prefix = ascii("/queue/")
-  destination_parser.topic_prefix = ascii("/topic/")
-  destination_parser.path_seperator = ascii(".")
-  destination_parser.any_child_wildcard = ascii("*")
-  destination_parser.any_descendant_wildcard = ascii("**")
+  destination_parser.queue_prefix = ascii(System.getProperty("apollo.stomp.queue_prefix", "/queue/"))
+  destination_parser.topic_prefix = ascii(System.getProperty("apollo.stomp.topic_prefix","/topic/"))
+  destination_parser.destination_separator = Some(System.getProperty("apollo.stomp.destination_separator",",").charAt(0).toByte)
+  destination_parser.path_seperator = ascii(System.getProperty("apollo.stomp.path_seperator","."))
+  destination_parser.any_child_wildcard = ascii(System.getProperty("apollo.stomp.any_child_wildcard","*"))
+  destination_parser.any_descendant_wildcard = ascii(System.getProperty("apollo.stomp.any_descendant_wildcard","**"))
 
   destination_parser.default_domain = LocalRouter.QUEUE_DOMAIN
 

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=1126510&r1=1126509&r2=1126510&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 Mon May 23 14:26:47 2011
@@ -883,6 +883,22 @@ Example:
 </connector>
 {pygmentize}
 
+You can also configure how the destinations are parsed to interpret the 
+logical destination setting System properties.  The supported system 
+properties are:
+  
+* `apollo.stomp.path_separator` : Defaults to `.`
+* `apollo.stomp.queue_prefix` : Defaults to `/queue/`
+* `apollo.stomp.topic_prefix` : Defaults to `/topic/`
+* `apollo.stomp.any_child_wildcard` : Defaults to `*`
+* `apollo.stomp.any_descendant_wildcard` : Defaults to `**`
+* `apollo.stomp.destination_separator` : Defaults to `,`
+
+The recommended way to set the system properties is by updating
+the `APOLLO_OPTS` shell script variable.  See more details
+in the [Adjusting JVM Settings](#Adjusting_JVM_Settings) section
+of this manual.
+
 ### Client Libraries
 
 There are many open source STOMP clients for different platforms and