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 23:04:45 UTC
svn commit: r967263 - in /servicemix/smx3/trunk: ./ core/servicemix-core/
core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/client/
core/servicemix-core/src/test/java/org/apache/servicemix/client/
core/servicemix-core/src/test/java...
Author: gertv
Date: Fri Jul 23 21:04:44 2010
New Revision: 967263
URL: http://svn.apache.org/viewvc?rev=967263&view=rev
Log:
SM-1968: Use dynamic ports for tests in core/servicemix-core and servicemix-itests
Added:
servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/client/
servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/client/remote.xml
- copied, changed from r966711, servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/client/remote.xml
servicemix/smx3/trunk/servicemix-itests/src/test/filtered-resources/
servicemix/smx3/trunk/servicemix-itests/src/test/filtered-resources/org/
servicemix/smx3/trunk/servicemix-itests/src/test/filtered-resources/org/apache/
servicemix/smx3/trunk/servicemix-itests/src/test/filtered-resources/org/apache/servicemix/
servicemix/smx3/trunk/servicemix-itests/src/test/filtered-resources/org/apache/servicemix/itests/
servicemix/smx3/trunk/servicemix-itests/src/test/filtered-resources/org/apache/servicemix/itests/deadlock/
servicemix/smx3/trunk/servicemix-itests/src/test/filtered-resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml
- copied, changed from r966711, servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml
Removed:
servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/client/remote.xml
servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml
Modified:
servicemix/smx3/trunk/core/servicemix-core/pom.xml
servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/RemoteServiceMixClientTest.java
servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java
servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JcaFlowWithTxLogTest.java
servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJcaFlowTest.java
servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJmsFlowTest.java
servicemix/smx3/trunk/pom.xml
servicemix/smx3/trunk/servicemix-itests/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=967263&r1=967262&r2=967263&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/pom.xml (original)
+++ servicemix/smx3/trunk/core/servicemix-core/pom.xml Fri Jul 23 21:04:44 2010
@@ -118,6 +118,7 @@
<artifactId>spring-context</artifactId>
<version>${spring-version}</version>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
@@ -357,6 +358,7 @@
<configuration>
<forkMode>always</forkMode>
<workingDirectory>${basedir}</workingDirectory>
+ <argLine>-Dactivemq.port=${activemq.port}</argLine>
<includes>
<include>**/*Test.*</include>
</includes>
Copied: servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/client/remote.xml (from r966711, servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/client/remote.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/client/remote.xml?p2=servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/client/remote.xml&p1=servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/client/remote.xml&r1=966711&r2=967263&rev=967263&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/resources/org/apache/servicemix/client/remote.xml (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/filtered-resources/org/apache/servicemix/client/remote.xml Fri Jul 23 21:04:44 2010
@@ -24,11 +24,11 @@
<amq:broker id="broker" singleton="true" useJmx="false" persistent="false">
<amq:transportConnectors>
- <amq:transportConnector uri="tcp://localhost:61616"/>
+ <amq:transportConnector uri="tcp://localhost:${activemq.port}"/>
</amq:transportConnectors>
</amq:broker>
- <sm:container id="jbi" flowName="jms?jmsURL=tcp://localhost:61616" embedded="true" useMBeanServer="false" createMBeanServer="false" depends-on="broker">
+ <sm:container id="jbi" flowName="jms?jmsURL=tcp://localhost:${activemq.port}" embedded="true" useMBeanServer="false" createMBeanServer="false" depends-on="broker">
<sm:activationSpecs>
<sm:activationSpec componentName="receiver" service="foo:receiver">
@@ -63,13 +63,13 @@
</sm:container>
<bean id="client" class="org.apache.servicemix.client.RemoteServiceMixClient" init-method="start" destroy-method="shutDown">
- <constructor-arg value="tcp://localhost:61616" />
+ <constructor-arg value="tcp://localhost:${activemq.port}" />
</bean>
<!-- lets hardwire this client to talk to instances of a service by default -->
<!-- START SNIPPET: clientroute -->
<bean id="clientWithRouting" class="org.apache.servicemix.client.RemoteServiceMixClient" init-method="start" destroy-method="shutDown">
- <constructor-arg value="tcp://localhost:61616" />
+ <constructor-arg value="tcp://localhost:${activemq.port}" />
<constructor-arg>
<sm:activationSpec destinationService="foo:receiver"/>
</constructor-arg>
@@ -78,7 +78,7 @@
<bean id="clientWithXStream" class="org.apache.servicemix.client.RemoteServiceMixClient" init-method="start" destroy-method="shutDown">
- <constructor-arg value="tcp://localhost:61616" />
+ <constructor-arg value="tcp://localhost:${activemq.port}" />
<constructor-arg>
<!-- lets hardwire this client to talk to instances of a service by default -->
<sm:activationSpec>
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/RemoteServiceMixClientTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/RemoteServiceMixClientTest.java?rev=967263&r1=967262&r2=967263&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/RemoteServiceMixClientTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/client/RemoteServiceMixClientTest.java Fri Jul 23 21:04:44 2010
@@ -35,11 +35,6 @@ public class RemoteServiceMixClientTest
}
protected ServiceMixClient getClient() throws Exception {
- /*
- RemoteServiceMixClient client = new RemoteServiceMixClient("tcp://localhost:61616");
- client.start();
- return client;
- */
return super.getClient();
}
@@ -47,12 +42,4 @@ public class RemoteServiceMixClientTest
return new ClassPathXmlApplicationContext("org/apache/servicemix/client/remote.xml");
}
- /*
- public void testSendUsingMapAndPOJOsUsingContainerRouting() throws Exception {
- }
-
- public void testRequestUsingPOJOWithXStreamMarshaling() throws Exception {
- }
- */
-
}
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java?rev=967263&r1=967262&r2=967263&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java Fri Jul 23 21:04:44 2010
@@ -57,7 +57,10 @@ import org.tranql.connector.jdbc.Abstrac
public class TransactionsTest extends TestCase {
public static final long TIMEOUT = 1000;
-
+
+ private static final int ACTIVEMQ_PORT = Integer.parseInt(System.getProperty("activemq.port"));
+ private static final String ACTIVEMQ_URL = "tcp://localhost:" + ACTIVEMQ_PORT;
+
private JBIContainer jbi;
private BrokerService broker;
private GeronimoPlatformTransactionManager tm;
@@ -73,7 +76,7 @@ public class TransactionsTest extends Te
broker = new BrokerService();
broker.setUseJmx(false);
broker.setPersistent(false);
- broker.addConnector("tcp://localhost:61616");
+ broker.addConnector(ACTIVEMQ_URL);
broker.start();
tm = new GeronimoPlatformTransactionManager();
@@ -95,7 +98,7 @@ public class TransactionsTest extends Te
store = storeFactory.open("store");
jbi = new JBIContainer();
- jbi.setFlows(new Flow[] {new SedaFlow(), new JCAFlow() });
+ jbi.setFlows(new Flow[] {new SedaFlow(), new JCAFlow(ACTIVEMQ_URL) });
jbi.setEmbedded(true);
jbi.setUseMBeanServer(false);
jbi.setCreateMBeanServer(false);
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JcaFlowWithTxLogTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JcaFlowWithTxLogTest.java?rev=967263&r1=967262&r2=967263&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JcaFlowWithTxLogTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JcaFlowWithTxLogTest.java Fri Jul 23 21:04:44 2010
@@ -44,6 +44,9 @@ import org.jencks.factory.TransactionMan
*/
public class JcaFlowWithTxLogTest extends TestCase {
+ private static final int ACTIVEMQ_PORT = Integer.parseInt(System.getProperty("activemq.port"));
+ private static final String ACTIVEMQ_URL = "tcp://localhost:" + ACTIVEMQ_PORT;
+
private JBIContainer senderContainer = new JBIContainer();
private JBIContainer receiverContainer = new JBIContainer();
@@ -82,11 +85,11 @@ public class JcaFlowWithTxLogTest extend
broker = new BrokerService();
broker.setPersistenceAdapter(new MemoryPersistenceAdapter());
- broker.addConnector("tcp://localhost:61616");
+ broker.addConnector(ACTIVEMQ_URL);
broker.start();
JCAFlow senderFlow = new JCAFlow();
- senderFlow.setJmsURL("tcp://localhost:61616");
+ senderFlow.setJmsURL(ACTIVEMQ_URL);
senderContainer.setTransactionManager(tm);
senderContainer.setEmbedded(true);
senderContainer.setName("senderContainer");
@@ -97,7 +100,7 @@ public class JcaFlowWithTxLogTest extend
senderContainer.start();
JCAFlow receiverFlow = new JCAFlow();
- receiverFlow.setJmsURL("tcp://localhost:61616");
+ receiverFlow.setJmsURL(ACTIVEMQ_URL);
receiverContainer.setTransactionManager(tm);
receiverContainer.setEmbedded(true);
receiverContainer.setName("receiverContainer");
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJcaFlowTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJcaFlowTest.java?rev=967263&r1=967262&r2=967263&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJcaFlowTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJcaFlowTest.java Fri Jul 23 21:04:44 2010
@@ -23,7 +23,7 @@ import org.apache.servicemix.jbi.nmr.flo
import org.jencks.GeronimoPlatformTransactionManager;
public class StatelessJcaFlowTest extends StatelessJmsFlowTest {
-
+
private TransactionManager tm;
protected void setUp() throws Exception {
@@ -34,7 +34,7 @@ public class StatelessJcaFlowTest extend
protected JBIContainer createContainer(String name) throws Exception {
JBIContainer container = new JBIContainer();
container.setName(name);
- JCAFlow flow = new JCAFlow("tcp://localhost:61616");
+ JCAFlow flow = new JCAFlow(ACTIVEMQ_URL);
container.setTransactionManager(tm);
container.setFlow(flow);
container.setUseMBeanServer(false);
Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJmsFlowTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJmsFlowTest.java?rev=967263&r1=967262&r2=967263&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJmsFlowTest.java (original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJmsFlowTest.java Fri Jul 23 21:04:44 2010
@@ -40,6 +40,9 @@ import org.apache.servicemix.jbi.jaxp.St
public class StatelessJmsFlowTest extends TestCase {
+ protected static final int ACTIVEMQ_PORT = Integer.parseInt(System.getProperty("activemq.port"));
+ protected static final String ACTIVEMQ_URL = "tcp://localhost:" + ACTIVEMQ_PORT;
+
protected JBIContainer jbi1;
protected JBIContainer jbi2;
protected BrokerService broker;
@@ -48,7 +51,7 @@ public class StatelessJmsFlowTest extend
broker = new BrokerService();
broker.setPersistent(false);
broker.setUseJmx(false);
- broker.addConnector("tcp://localhost:61616");
+ broker.addConnector(ACTIVEMQ_URL);
broker.start();
jbi1 = createContainer("jbi1");
@@ -64,7 +67,7 @@ public class StatelessJmsFlowTest extend
protected JBIContainer createContainer(String name) throws Exception {
JBIContainer container = new JBIContainer();
container.setName(name);
- container.setFlowName("jms?jmsURL=tcp://localhost:61616");
+ container.setFlowName("jms?jmsURL=" + ACTIVEMQ_URL);
container.setUseMBeanServer(false);
container.setEmbedded(true);
container.init();
Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=967263&r1=967262&r2=967263&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Fri Jul 23 21:04:44 2010
@@ -1404,12 +1404,45 @@
<artifactId>rome</artifactId>
<version>0.5</version>
</dependency>
+
+ <!-- Spring Framework -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>${spring-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring-version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+
+ <dependency>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<version>1.0-2</version>
Modified: servicemix/smx3/trunk/servicemix-itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/servicemix-itests/pom.xml?rev=967263&r1=967262&r2=967263&view=diff
==============================================================================
--- servicemix/smx3/trunk/servicemix-itests/pom.xml (original)
+++ servicemix/smx3/trunk/servicemix-itests/pom.xml Fri Jul 23 21:04:44 2010
@@ -92,6 +92,15 @@
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/test/filtered-resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -135,6 +144,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-checkstyle-plugin</artifactId>
<dependencies>
Copied: servicemix/smx3/trunk/servicemix-itests/src/test/filtered-resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml (from r966711, servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/servicemix-itests/src/test/filtered-resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml?p2=servicemix/smx3/trunk/servicemix-itests/src/test/filtered-resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml&p1=servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml&r1=966711&r2=967263&rev=967263&view=diff
==============================================================================
--- servicemix/smx3/trunk/servicemix-itests/src/test/resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml (original)
+++ servicemix/smx3/trunk/servicemix-itests/src/test/filtered-resources/org/apache/servicemix/itests/deadlock/servicemix-deadlock.xml Fri Jul 23 21:04:44 2010
@@ -31,12 +31,12 @@
</bean>
<bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="tcp://localhost:61616" />
+ <property name="brokerURL" value="tcp://localhost:${activemq.port}" />
</bean>
<amq:broker id="myBroker" persistent="false" depends-on="jndi" useJmx="true">
<amq:transportConnectors>
- <amq:transportConnector uri="tcp://localhost:61616" />
+ <amq:transportConnector uri="tcp://localhost:${activemq.port}" />
</amq:transportConnectors>
</amq:broker>