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

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

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/fcrepo-webapp/src/main/resources/config/activemq.xml b/fcrepo-webapp/src/main/resources/config/activemq.xml
@@ -2,9 +2,13 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:amq="http://activemq.apache.org/schema/core"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:context="http://www.springframework.org/schema/context"
     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/fcrepo-webapp/src/test/resources/spring-test/rest.xml b/fcrepo-webapp/src/test/resources/spring-test/rest.xml
@@ -2,17 +2,14 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="
     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-    http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
 
   <context:property-placeholder/>
 
-  <!-- Context that houses JAX-RS Resources that compose the API
-      as well as som utility gear. -->
+  <!-- Context that houses JAX-RS Resources that support the API. -->
 
   <context:annotation-config/>