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/01/09 11:09:08 UTC
svn commit: r897409 - in
/servicemix/components/engines/servicemix-wsn2005/trunk: pom.xml
src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java
Author: gertv
Date: Sat Jan 9 10:09:08 2010
New Revision: 897409
URL: http://svn.apache.org/viewvc?rev=897409&view=rev
Log:
SMXCOMP-694: Setting environment variable for activemq.port1 doesn't work on AIX
Modified:
servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml
servicemix/components/engines/servicemix-wsn2005/trunk/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java
Modified: servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml?rev=897409&r1=897408&r2=897409&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml Sat Jan 9 10:09:08 2010
@@ -236,10 +236,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <environmentVariables>
- <activemq.port1>${port1}</activemq.port1>
- <activemq.port2>${port2}</activemq.port2>
- </environmentVariables>
+ <argLine>-Dactivemq.port1=${port1} -Dactivemq.port2=${port2} -Xmx196m</argLine>
</configuration>
</plugin>
<plugin>
Modified: servicemix/components/engines/servicemix-wsn2005/trunk/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-wsn2005/trunk/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java?rev=897409&r1=897408&r2=897409&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-wsn2005/trunk/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java (original)
+++ servicemix/components/engines/servicemix-wsn2005/trunk/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java Sat Jan 9 10:09:08 2010
@@ -64,6 +64,7 @@
public class WSNComponentTest extends TestCase {
+ private static final String BROKER_URL = "tcp://localhost:" + System.getProperty("activemq.port1", "61616");
public static final QName NOTIFICATION_BROKER =
new QName("http://servicemix.org/wsnotification", "NotificationBroker");
@@ -77,7 +78,7 @@
protected void setUp() throws Exception {
jmsBroker = new BrokerService();
jmsBroker.setPersistent(false);
- jmsBroker.addConnector("tcp://localhost:" + System.getenv("activemq.port1"));
+ jmsBroker.addConnector(BROKER_URL);
jmsBroker.start();
jbi = new JBIContainer();
@@ -89,7 +90,7 @@
client = new DefaultServiceMixClient(jbi);
wsnComponent = new WSNComponent();
- wsnComponent.setConnectionFactory(new ActiveMQConnectionFactory("tcp://localhost:" + System.getenv("activemq.port1")));
+ wsnComponent.setConnectionFactory(new ActiveMQConnectionFactory(BROKER_URL));
ActivationSpec as = new ActivationSpec();
as.setComponentName("servicemix-wsn2005");
as.setComponent(wsnComponent);