You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2010/07/23 16:50:41 UTC
svn commit: r967116 - in /servicemix/smx3/trunk/core/servicemix-core: ./
src/test/filtered-resources/ src/test/filtered-resources/org/
src/test/filtered-resources/org/apache/
src/test/filtered-resources/org/apache/servicemix/
src/test/filtered-resource...
Author: gertv
Date: Fri Jul 23 14:50:40 2010
New Revision: 967116
URL: http://svn.apache.org/viewvc?rev=967116&view=rev
Log:
SM-1968: Use dynamic ports for core/servicemix-core tests
Added:
servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/
servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/
servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/
servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/
servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/
servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/nmr/
servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/nmr/flow/
servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/nmr/flow/jca/
servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml
- copied, changed from r966711, servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml
servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/
servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/secure2.xml
- copied, changed from r966711, servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/security/secure2.xml
Removed:
servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jca/
servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/security/secure2.xml
Modified:
servicemix/smx3/trunk/core/servicemix-core/pom.xml
Modified: servicemix/smx3/trunk/core/servicemix-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/pom.xml?rev=967116&r1=967115&r2=967116&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/pom.xml (original)
+++ servicemix/smx3/trunk/core/servicemix-core/pom.xml Fri Jul 23 14:50:40 2010
@@ -299,6 +299,10 @@
<include>**/*.zip</include>
</includes>
</testResource>
+ <testResource>
+ <directory>src/test/filtered-resources</directory>
+ <filtering>true</filtering>
+ </testResource>
</testResources>
<plugins>
<plugin>
@@ -329,6 +333,25 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <portNames>
+ <portName>activemq.port</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Copied: servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml (from r966711, servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml?p2=servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml&p1=servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml&r1=966711&r2=967116&rev=967116&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/nmr/flow/jca/broker.xml Fri Jul 23 14:50:40 2010
@@ -24,7 +24,7 @@
<broker xmlns="http://activemq.apache.org/schema/core" persistent="false" useJmx="false">
<transportConnectors>
- <transportConnector uri="tcp://localhost:61216" />
+ <transportConnector uri="tcp://localhost:${activemq.port}" />
</transportConnectors>
</broker>
Copied: servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/secure2.xml (from r966711, servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/security/secure2.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/secure2.xml?p2=servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/secure2.xml&p1=servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/security/secure2.xml&r1=966711&r2=967116&rev=967116&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/jbi/security/secure2.xml (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/jbi/security/secure2.xml Fri Jul 23 14:50:40 2010
@@ -36,7 +36,7 @@
</sm:authorizationMap>
</sm:authorizationMap>
<sm:flows>
- <sm:jmsFlow jmsURL="tcp://localhost:61216" />
+ <sm:jmsFlow jmsURL="tcp://localhost:${activemq.port}" />
</sm:flows>
</sm:securedBroker>
</sm:broker>
@@ -73,7 +73,7 @@
</sm:authorizationMap>
</sm:authorizationMap>
<sm:flows>
- <sm:jmsFlow jmsURL="tcp://localhost:61216" />
+ <sm:jmsFlow jmsURL="tcp://localhost:${activemq.port}" />
</sm:flows>
</sm:securedBroker>
</sm:broker>