Parameterizing ActiveMQ port per: https://www.pivotaltracker.com/stor…

…y/show/48775327
fcrepo · Apr 26, 2013 · 263ba6c · 263ba6c
1 parent 43b6be0
commit 263ba6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...in/resources/META-INF/spring/activemq.xml → ...ms/src/main/resources/config/activemq.xml b/...in/resources/META-INF/spring/activemq.xml → ...ms/src/main/resources/config/activemq.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:amq="http://activemq.apache.org/schema/core"
+    xmlns:context="http://www.springframework.org/schema/context"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
     http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
 
+    <context:property-placeholder/>    
+
     <!--
         The <broker> element is used to configure the ActiveMQ broker.
     -->
@@ -107,7 +111,7 @@
         <transportConnectors>
             <!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB -->
             <transportConnector name="openwire"
-                uri="tcp://0.0.0.0:61616?maximumConnections=1000&amp;wireformat.maxFrameSize=104857600"
+                uri="tcp://0.0.0.0:${activemq.port:61616}?maximumConnections=1000&amp;wireformat.maxFrameSize=104857600"
             />
         </transportConnectors>
 

diff --git a/...rc/main/resources/META-INF/spring/jms.xml → fcrepo-jms/src/main/resources/spring/jms.xml b/...rc/main/resources/META-INF/spring/jms.xml → fcrepo-jms/src/main/resources/spring/jms.xml
@@ -19,7 +19,7 @@
     </bean>
 
     <bean name="jmsBroker" class="org.apache.activemq.xbean.BrokerFactoryBean">
-        <property name="config" value="classpath:/META-INF/spring/activemq.xml"/>
+        <property name="config" value="classpath:/config/activemq.xml"/>
         <property name="start" value="true"/>
     </bean>