Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DF6D898A5 for ; Wed, 22 Feb 2012 07:31:13 +0000 (UTC) Received: (qmail 17651 invoked by uid 500); 22 Feb 2012 07:31:13 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 17537 invoked by uid 500); 22 Feb 2012 07:31:12 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 17526 invoked by uid 99); 22 Feb 2012 07:31:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2012 07:31:12 +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; Wed, 22 Feb 2012 07:31:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 07B8123888E4; Wed, 22 Feb 2012 07:30:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1292160 - /geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties Date: Wed, 22 Feb 2012 07:30:51 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120222073052.07B8123888E4@eris.apache.org> Author: xiaming Date: Wed Feb 22 07:30:51 2012 New Revision: 1292160 URL: http://svn.apache.org/viewvc?rev=1292160&view=rev Log: GERONIMO-6281 set activemq.data property to a path impacted by server.dir property for multiple instances scenario, though this may not be necessary for app client module I guess Modified: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties Modified: geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties?rev=1292160&r1=1292159&r2=1292160&view=diff ============================================================================== --- geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties (original) +++ geronimo/server/trunk/framework/features/client/src/main/filtered-resources/resources/instances/client/var/config/config-substitutions.properties Wed Feb 22 07:30:51 2012 @@ -33,7 +33,7 @@ MulticastDiscoveryPort = 6142 MultipointServers = MultipointHost = 0.0.0.0 MultipointEnabled = false -activemq.data = var/activemq +activemq.data = ${org.apache.geronimo.server.dir}/var/activemq activemq.brokerName = DefaultActiveMQBroker ActiveMQPort = 61616 ActiveMQHostname = 0.0.0.0