You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2009/10/13 08:58:26 UTC
svn commit: r824609 - in
/servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms:
activemq.xml spring-jca.xml spring.xml
Author: ccustine
Date: Tue Oct 13 06:58:25 2009
New Revision: 824609
URL: http://svn.apache.org/viewvc?rev=824609&view=rev
Log:
SMXCOMP-647 - Use dynamic ports for tests
- servicemix-jms
Modified:
servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/activemq.xml
servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/spring-jca.xml
servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/spring.xml
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/activemq.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/activemq.xml?rev=824609&r1=824608&r2=824609&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/activemq.xml (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/activemq.xml Tue Oct 13 06:58:25 2009
@@ -21,11 +21,13 @@
<!-- START SNIPPET: xbean -->
<beans>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
+
<broker persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
<!--
<transportConnectors>
- <transportConnector uri="tcp://localhost:61216" />
+ <transportConnector uri="tcp://localhost:${activemq.port1}" />
</transportConnectors>
-->
</broker>
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/spring-jca.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/spring-jca.xml?rev=824609&r1=824608&r2=824609&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/spring-jca.xml (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/spring-jca.xml Tue Oct 13 06:58:25 2009
@@ -24,6 +24,8 @@
xmlns:jencks="http://jencks.org/2.0"
xmlns:test="http://test">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
+
<!-- the JBI container -->
<sm:container id="jbi"
embedded="true"
@@ -33,7 +35,7 @@
<sm:flows>
<sm:sedaFlow />
<sm:jcaFlow connectionManager="#connectionManager"
- jmsURL="tcp://localhost:61616?jms.asyncDispatch=true&jms.useAsyncSend=true" />
+ jmsURL="tcp://localhost:${activemq.port1}?jms.asyncDispatch=true&jms.useAsyncSend=true" />
</sm:flows>
<sm:activationSpecs>
@@ -116,7 +118,7 @@
<!-- A managed JMS ConnectionFactory for ActiveMQ -->
<amqra:managedConnectionFactory id="activemqMCF" resourceAdapter="#resourceAdapter" />
- <amqra:resourceAdapter id="resourceAdapter" serverUrl="tcp://localhost:61616?jms.asyncDispatch=true&jms.useAsyncSend=true"/>
+ <amqra:resourceAdapter id="resourceAdapter" serverUrl="tcp://localhost:${activemq.port1}?jms.asyncDispatch=true&jms.useAsyncSend=true"/>
<jencks:connectionFactory id="connectionFactory"
managedConnectionFactory="#activemqMCF"
connectionManager="#connectionManager" />
@@ -124,7 +126,7 @@
<amq:broker id="broker" persistent="false">
<amq:transportConnectors>
- <amq:transportConnector uri="tcp://localhost:61616" />
+ <amq:transportConnector uri="tcp://localhost:${activemq.port1}" />
</amq:transportConnectors>
</amq:broker>
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/spring.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/spring.xml?rev=824609&r1=824608&r2=824609&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/spring.xml (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/test/resources/org/apache/servicemix/jms/spring.xml Tue Oct 13 06:58:25 2009
@@ -22,6 +22,8 @@
xmlns:amq="http://activemq.org/config/1.0"
xmlns:test="http://test">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
+
<!-- the JBI container -->
<sm:container id="jbi" embedded="true" depends-on="jndi,broker">
<sm:activationSpecs>
@@ -72,13 +74,13 @@
</bean>
<bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="tcp://localhost:61216" />
+ <property name="brokerURL" value="tcp://localhost:${activemq.port1}" />
</bean>
<amq:broker id="broker" persistent="false" depends-on="jndi">
<amq:transportConnectors>
- <amq:transportConnector uri="tcp://localhost:61216" />
+ <amq:transportConnector uri="tcp://localhost:${activemq.port1}" />
</amq:transportConnectors>
</amq:broker>