Return-Path: 
 <dev-return-90843-apmail-geronimo-dev-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-dev-archive@www.apache.org
Delivered-To: apmail-geronimo-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A26D46003
	for <apmail-geronimo-dev-archive@www.apache.org>;
 Fri,  3 Jun 2011 17:34:34 +0000 (UTC)
Received: (qmail 15538 invoked by uid 500); 3 Jun 2011 17:34:34 -0000
Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org
Received: (qmail 15493 invoked by uid 500); 3 Jun 2011 17:34:34 -0000
Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:dev-help@geronimo.apache.org>
list-unsubscribe: <mailto:dev-unsubscribe@geronimo.apache.org>
List-Post: <mailto:dev@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <dev.geronimo.apache.org>
Delivered-To: mailing list dev@geronimo.apache.org
Received: (qmail 15486 invoked by uid 99); 3 Jun 2011 17:34:34 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jun 2011 17:34:34 +0000
X-ASF-Spam-Status: No, hits=-0.0 required=5.0
	tests=SPF_PASS
X-Spam-Check-By: apache.org
Received-SPF: pass (athena.apache.org: local policy)
Received: from [209.174.123.75] (HELO samarium-v1.sys.ma.cait.org)
 (209.174.123.75)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jun 2011 17:34:26 +0000
Received: from samarium-v2.sys.ma.cait.org ([209.174.123.67]
 helo=vanadium.sys.ma.cait.org)
	by samarium-v1.sys.ma.cait.org with esmtp (Exim 4.63)
	(envelope-from <rglaue@cait.org>)
	id 1QSYG5-0007zV-No
	for dev@geronimo.apache.org; Fri, 03 Jun 2011 12:34:06 -0500
Received: from localhost (localhost.localdomain [127.0.0.1])
	by vanadium.sys.ma.cait.org (Postfix) with ESMTP id AF43A8694002
	for <dev@geronimo.apache.org>; Fri,  3 Jun 2011 12:34:05 -0500 (CDT)
X-Virus-Scanned: amavisd-new at vanadium.sys.ma.cait.org
Received: from vanadium.sys.ma.cait.org ([127.0.0.1])
	by localhost (vanadium.sys.ma.cait.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id m9tau2j9wpMw for <dev@geronimo.apache.org>;
	Fri,  3 Jun 2011 12:34:05 -0500 (CDT)
Received: from russ-linux.cait.org (unknown [10.0.0.18])
	by vanadium.sys.ma.cait.org (Postfix) with ESMTPSA id 8CC3F8694001
	for <dev@geronimo.apache.org>; Fri,  3 Jun 2011 12:34:05 -0500 (CDT)
Message-ID: <4DE91B0D.9060806@cait.org>
Date: Fri, 03 Jun 2011 12:34:05 -0500
From: Russell E Glaue <rglaue@cait.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
 rv:1.9.1.9) Gecko/20100317 Lightning/1.0b1 Thunderbird/3.0.4
MIME-Version: 1.0
To: dev@geronimo.apache.org
Subject: ActiveMQ config-substitution change G2.2 vs G3.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Spam-Score: -2.6 (--)

ActiveMQ is not utilizing the config-substitutions in G3.0
A patch was put in G2.2 do handle this, but the related code is removed in G3.0.
ActiveMQ is changed in the process of integrating blueprint. See GERONIMO-4475
for the G2.2 patches from Ivan.

Since the GeronimoPropertyPlaceholderConfigurer in G2.2 was to make ActiveMQ use
the config-substitution, and now is removed in G3.0, I do not see in the code
where the config-substitution is accounted for.


In G2.2.2-SNAPSHOT
The GBean Class:
~/branches/2.2/plugins/activemq/geronimo-activemq/src/main/java/org/apache/geronimo/activemq/GeronimoPropertyPlaceholderConfigurer.java
The GBean Configuration:
~/branches/2.2/plugins/activemq/activemq-broker/src/main/resources/activemq.xml
-
    <!-- Allows us to use system properties as variables in this configuration
file-->
    <bean
class="org.apache.geronimo.activemq.GeronimoPropertyPlaceholderConfigurer">
         <property name="locations">

<!--<value>file://${activemq.home}/conf/credentials.properties</value>-->

<value>${activemq.geronimo.home.url}/var/config/config-substitutions.properties</value>
         </property>
         <property name="systemPropertiesMode">
            <value>2</value>
         </property>
    </bean>
-

In G3.0-SNAPSHOT
~/trunk/plugins/activemq/activemq-broker-blueprint/src/main/resources/OSGI-INF/blueprint/activemq.xml
-
    <cm:property-placeholder id="property-placeholder"
persistent-id="blueprint-activemq-placeholder" placeholder-prefix="${"
placeholder-suffix="}" ignore-missing-locations="true">
        <cm:default-properties>
            <cm:property name="activemq.brokerName" value="DefaultActiveMQBroker"/>
            <cm:property name="activemq.data" value="var/activemq"/>
            <cm:property name="serverHostname" value="localhost"/>
            <cm:property name="activemq.port" value="61616"/>
            <cm:property name="portOffset" value="0"/>
        </cm:default-properties>

<cm:location>file:$(karaf.base)/etc/blueprint-activemq-placeholder.cfg</cm:location>
    </cm:property-placeholder>
-
As I mentioned in a previous thread on the user list, the
file:$(karaf.base)/etc/blueprint-activemq-placeholder.cfg is ignored. I tried to
change the ActiveMQ values there in
GERONIMO_HOME/etc/blueprint-activemq-placeholder.cfg, but ActiveMQ did not use
the new configuration I set.
(I am testing with G3.0-20110603-snapshot)

So the question is, what has to be done in G3.0-SNAPSHOT to make ActiveMQ apply
settings from the config-substitutions file?

-RG