geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1174575 - in /geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint: pom.xml src/main/resources/OSGI-INF/blueprint/activemq.xml src/main/resources/etc/
Date Fri, 23 Sep 2011 07:57:39 GMT
Author: rwonly
Date: Fri Sep 23 07:57:38 2011
New Revision: 1174575

URL: http://svn.apache.org/viewvc?rev=1174575&view=rev
Log:
GERONIMO-5987 	The ActiveMQ working directory and port are not referenced correctly - multiple
instances not possible 

Removed:
    geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/resources/etc/
Modified:
    geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/resources/OSGI-INF/blueprint/activemq.xml

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml?rev=1174575&r1=1174574&r2=1174575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml Fri Sep 23 07:57:38
2011
@@ -106,7 +106,7 @@
                         <plugin-artifact>
                             <!--<copy-file relative-to="server" dest-dir="var/activemq/conf">activemq.xml</copy-file>-->
                             <!--<copy-file relative-to="server" dest-dir="var/activemq/template">activemq-template.xml</copy-file>-->
-                            <copy-file relative-to="geronimo" dest-dir="etc">etc/blueprint-activemq-placeholder.cfg</copy-file>
+                            <!--<copy-file relative-to="geronimo" dest-dir="etc">etc/org.apache.geronimo.activemq-broker.cfg</copy-file>-->
                             <!--
                             <config-xml-content>
                                 <gbean name="ActiveMQ.tcp.default">
@@ -117,10 +117,12 @@
                                     <attribute name="host">#{ServerHostname}</attribute>
                                     <attribute name="port">#{ActiveMQStompPort + PortOffset}</attribute>
                                 </gbean>
-                             </config-xml-content>
-                            <config-substitution key="ActiveMQPort">61616</config-substitution>
+                            </config-xml-content>
                             <config-substitution key="ActiveMQStompPort">61613</config-substitution>
                             -->
+                            <config-substitution key="ActiveMQPort">61616</config-substitution>
+                            <config-substitution key="activemq.brokerName">DefaultActiveMQBroker</config-substitution>
+                            <config-substitution key="activemq.data">var/activemq</config-substitution>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/resources/OSGI-INF/blueprint/activemq.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/resources/OSGI-INF/blueprint/activemq.xml?rev=1174575&r1=1174574&r2=1174575&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/resources/OSGI-INF/blueprint/activemq.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/resources/OSGI-INF/blueprint/activemq.xml
Fri Sep 23 07:57:38 2011
@@ -24,22 +24,21 @@
 
 <b:blueprint xmlns:b="http://www.osgi.org/xmlns/blueprint/v1.0.0"
              xmlns:amq="http://activemq.apache.org/schema/core"
-             xmlns:cm="http://xbean.apache.org/blueprint/xmlns/xbean-cm/v1.0.0"
              xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-    <ext:property-placeholder placeholder-prefix="$(" placeholder-suffix=")"/>
+    <ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]" />
 
-    <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="0.0.0.0"/>
-            <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>
+    <ext:property-placeholder id="property-placeholder" placeholder-prefix="${" placeholder-suffix="}"
ignore-missing-locations="true">
+        <ext:default-properties>
+            <ext:property name="activemq.brokerName" value="DefaultActiveMQBroker"/>
+            <ext:property name="activemq.data" value="var/activemq"/>
+            <ext:property name="ServerHostname" value="0.0.0.0"/>
+            <ext:property name="ActiveMQPort" value="61616"/>
+            <ext:property name="PortOffset" value="0"/>
+        </ext:default-properties>
+        <ext:location>file:$[karaf.base]/var/config/config-substitutions.properties</ext:location>
+    </ext:property-placeholder>
 
     <amq:brokerService brokerName="${activemq.brokerName}" tmpDataDirectory="${activemq.data}/tmp_storage"
schedulerSupport="false">
 
@@ -184,7 +183,7 @@
             http://activemq.apache.org/configuring-transports.html 
         -->
         <amq:transportConnectors>
-            <amq:transportConnector name="openwire" uri="tcp://${serverHostname}:${activemq.port
+ portOffset}"/>
+            <amq:transportConnector name="openwire" uri="tcp://${ServerHostname}:${ActiveMQPort
+ PortOffset}"/>
             <!--
             <transportConnector name="openwire2" uri="tcp://${ServerHostname}:${* + ${PortOffset}}"
discoveryUri="multicast://default"/>
             <transportConnector name="ssl" uri="ssl://${ServerHostname}:${61617 + ${PortOffset}}"/>



Mime
View raw message