svn commit: r897227 - in /servicemix/components/engines/servicemix-eip/trunk: ./ src/test/java/org/apache/servicemix/eip/

[gertv]

Author: gertv
Date: Fri Jan  8 15:18:16 2010
New Revision: 897227

URL: http://svn.apache.org/viewvc?rev=897227&view=rev
Log:
Build fails on AIX - activemq.port1 environment variable not available in tests

Modified:
    servicemix/components/engines/servicemix-eip/trunk/pom.xml
    
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTest.java
    
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
    
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/WireTapJmsFlowTest.java

Modified: servicemix/components/engines/servicemix-eip/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/pom.xml?rev=897227&r1=897226&r2=897227&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-eip/trunk/pom.xml Fri Jan  8 
15:18:16 2010
@@ -195,17 +195,7 @@
             <!-- exclude abstract test cases -->
             <exclude>**/Abstract*.*</exclude>
           </excludes>
-<!--
-          <systemProperties>
-            <property>
-                <name>activemq.port1</name>
-                <value>${port1}</value>
-            </property>
-          </systemProperties>
--->
-          <environmentVariables>
-            <activemq.port1>${port1}</activemq.port1>
-          </environmentVariables>
+          <argLine>-Dactivemq.port1=${port1}</argLine>
         </configuration>
       </plugin>
         <plugin>

Modified: 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTest.java?rev=897227&r1=897226&r2=897227&view=diff
==============================================================================
--- 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTest.java
 (original)
+++ 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTest.java
 Fri Jan  8 15:18:16 2010
@@ -48,6 +48,8 @@
 
 public abstract class AbstractEIPTest extends TestCase {
 
+    protected static final String BROKER_URI = "tcp://localhost:" + 
System.getProperty("activemq.port1", "61616");
+
     protected JBIContainer jbi;
     protected BrokerService broker;
     protected DefaultServiceMixClient client;
@@ -229,5 +231,4 @@
             }
         }
     }
-    
 }

Modified: 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java?rev=897227&r1=897226&r2=897227&view=diff
==============================================================================
--- 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
 (original)
+++ 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
 Fri Jan  8 15:18:16 2010
@@ -48,7 +48,7 @@
         broker = new BrokerService();
         broker.setUseJmx(false);
         broker.setPersistent(false);
-        broker.addConnector("tcp://localhost:" + 
System.getenv("activemq.port1"));
+        broker.addConnector(BROKER_URI);
         broker.start();
         
         tm = new GeronimoPlatformTransactionManager();
@@ -69,7 +69,7 @@
         
         jbi = new JBIContainer();
         jbi.setFlows(new Flow[] {new SedaFlow(),
-            new JCAFlow("tcp://localhost:" + System.getenv("activemq.port1")) 
});
+            new JCAFlow(BROKER_URI) });
         jbi.setEmbedded(true);
         jbi.setUseMBeanServer(false);
         jbi.setCreateMBeanServer(false);

Modified: 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/WireTapJmsFlowTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/WireTapJmsFlowTest.java?rev=897227&r1=897226&r2=897227&view=diff
==============================================================================
--- 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/WireTapJmsFlowTest.java
 (original)
+++ 
servicemix/components/engines/servicemix-eip/trunk/src/test/java/org/apache/servicemix/eip/WireTapJmsFlowTest.java
 Fri Jan  8 15:18:16 2010
@@ -26,7 +26,7 @@
     protected void setUp() throws Exception {
         broker = new BrokerService();
         broker.setPersistent(false);
-        broker.addConnector("tcp://localhost:" + 
System.getenv("activemq.port1"));
+        broker.addConnector(BROKER_URI);
         broker.start();
         
         super.setUp();
@@ -38,7 +38,7 @@
     }
     
     protected void configureContainer() throws Exception {
-        jbi.setFlowName("jms?jmsURL=tcp://localhost:" + 
System.getenv("activemq.port1"));
+        jbi.setFlowName("jms?jmsURL=" + BROKER_URI);
     }
     
 }