Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 46D144282 for ; Mon, 23 May 2011 14:27:09 +0000 (UTC) Received: (qmail 86610 invoked by uid 500); 23 May 2011 14:27:09 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 86588 invoked by uid 500); 23 May 2011 14:27:09 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 86578 invoked by uid 99); 23 May 2011 14:27:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 May 2011 14:27:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 May 2011 14:27:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1A6C023888FE; Mon, 23 May 2011 14:26:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Mon, 23 May 2011 14:26:48 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110523142648.1A6C023888FE@eris.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: {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