Revert "Resolves JMS and Stomp port conflicts with existing fcrepo4 w…

…ebapp" This reverts commit 0bfe852. We are reverting because problems of indeterminate origin for Fedora's JMS publication machinery arose from this commit. We will determine their cause and re-implement the configuration functionality introduced here.
fcrepo · Nov 4, 2013 · 8a92413 · 8a92413
1 parent 0bfe852
commit 8a92413
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 25 deletions.
diff --git a/fcrepo-jms/pom.xml b/fcrepo-jms/pom.xml
@@ -21,12 +21,6 @@
       <artifactId>fcrepo-kernel</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.fcrepo</groupId>
-      <artifactId>fcrepo-http-commons</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>

diff --git a/fcrepo-jms/src/main/resources/config/activemq.xml b/fcrepo-jms/src/main/resources/config/activemq.xml
@@ -111,9 +111,9 @@
         <transportConnectors>
             <!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB -->
             <transportConnector name="openwire"
-                uri="tcp://0.0.0.0:${jms.port:61616}?maximumConnections=1000&amp;wireformat.maxFrameSize=104857600"
+                uri="tcp://0.0.0.0:${activemq.port:61616}?maximumConnections=1000&amp;wireformat.maxFrameSize=104857600"
             />
-            <transportConnector name="stomp" uri="stomp://0.0.0.0:${stomp.port:61613}"/>
+            <transportConnector name="stomp" uri="stomp://0.0.0.0:61613"/>
         </transportConnectors>
 
         <!-- destroy the spring context on shutdown to stop jetty -->

diff --git a/fcrepo-jms/src/main/resources/spring/jms.xml b/fcrepo-jms/src/main/resources/spring/jms.xml
@@ -15,7 +15,7 @@
 
     <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"
         depends-on="jmsBroker">
-        <property name="brokerURL" value="vm://localhost:${jms.port:61616}?create=false"/>
+        <property name="brokerURL" value="vm://localhost?create=false"/>
     </bean>
 
     <bean name="jmsBroker" class="org.apache.activemq.xbean.BrokerFactoryBean">

diff --git a/fcrepo-webapp/pom.xml b/fcrepo-webapp/pom.xml
@@ -115,8 +115,6 @@
           <systemPropertyVariables>
             <test.port>${test.port}</test.port>
             <test.context.path>${test.context.path}</test.context.path>
-            <jms.port>${jms.port}</jms.port>
-            <stomp.port>${stomp.port}</stomp.port>
             <integration-test>true</integration-test>
           </systemPropertyVariables>
         </configuration>
@@ -129,8 +127,6 @@
             <portName>test.port</portName>
             <!-- reserves the stop port for jetty-maven-plugin -->
             <portName>jetty.port.stop</portName>
-            <portName>jms.port</portName>
-            <portName>stomp.port</portName>
           </portNames>
         </configuration>
       </plugin>
@@ -169,16 +165,6 @@
               <value>${project.build.directory}/active-mq</value>
             </systemProperty>
 
-            <systemProperty>
-              <name>jms.port</name>
-              <value>${jms.port}</value>
-            </systemProperty>
-
-            <systemProperty>
-              <name>stomp.port</name>
-              <value>${stomp.port}</value>
-            </systemProperty>
-
             <systemProperty>
               <name>integration-test</name>
               <value>true</value>

diff --git a/fcrepo-webapp/src/main/resources/config/activemq.xml b/fcrepo-webapp/src/main/resources/config/activemq.xml
@@ -111,9 +111,9 @@
         <transportConnectors>
             <!-- DOS protection, limit concurrent connections to 1000 and frame size to 100MB -->
             <transportConnector name="openwire"
-                uri="tcp://0.0.0.0:${jms.port:61616}?maximumConnections=1000&amp;wireformat.maxFrameSize=104857600"
+                uri="${activemq.openwire.connector:tcp://0.0.0.0:61616?maximumConnections=1000&amp;wireformat.maxFrameSize=104857600}"
             />
-            <transportConnector name="stomp" uri="stomp://0.0.0.0:${stomp.port:61613}"/>
+            <transportConnector name="stomp" uri="stomp://0.0.0.0:61613"/>
         </transportConnectors>
 
         <!-- destroy the spring context on shutdown to stop jetty -->