You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2011/07/20 16:49:55 UTC
svn commit: r1148804 - in
/openejb/branches/openejb-3.2.x/container/openejb-core/src:
main/java/org/apache/openejb/util/NetworkUtil.java
test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
Author: jlmonteiro
Date: Wed Jul 20 14:49:54 2011
New Revision: 1148804
URL: http://svn.apache.org/viewvc?rev=1148804&view=rev
Log:
Seems like we have a lot of issues during our builds due to a port problem. Adding the ability to dynamically get one free
Added:
openejb/branches/openejb-3.2.x/container/openejb-core/src/main/java/org/apache/openejb/util/NetworkUtil.java
- copied unchanged from r1148797, openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/NetworkUtil.java
Modified:
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
Modified: openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java?rev=1148804&r1=1148803&r2=1148804&view=diff
==============================================================================
--- openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java (original)
+++ openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java Wed Jul 20 14:49:54 2011
@@ -37,6 +37,8 @@ import org.apache.activemq.network.jms.J
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
+import org.apache.openejb.core.timer.MemoryTimerStore;
+import org.apache.openejb.util.NetworkUtil;
import org.apache.openejb.util.URISupport;
import org.apache.openejb.core.CoreContainerSystem;
import org.apache.openejb.core.ivm.naming.IvmJndiFactory;
@@ -46,16 +48,27 @@ import org.apache.xbean.naming.context.I
import org.hsqldb.jdbc.jdbcDataSource;
public class OpenEjbBrokerFactoryTest extends TestCase {
+ private int brokerPort = 61616;
+
+ @Override
+ public void setUp() throws Exception {
+ int port = NetworkUtil.getNextAvailablePort();
+ if (port != -1) {
+ brokerPort = port;
+ System.out.println("Using the port " + brokerPort + " for ActiveMQ broker");
+ }
+ }
+
public void testBrokerUri() throws Exception {
final String prefix = ActiveMQFactory.getBrokerMetaFile();
- assertEquals(prefix + "broker:(tcp://localhost:61616)?persistent=false",
- getBrokerUri("broker:(tcp://localhost:61616)"));
- assertEquals(prefix + "broker:(tcp://localhost:61616)?useJmx=false&persistent=false",
- getBrokerUri("broker:(tcp://localhost:61616)?useJmx=false"));
- assertEquals(prefix + "broker:(tcp://localhost:61616)?useJmx=false&persistent=false",
- getBrokerUri("broker:(tcp://localhost:61616)?useJmx=false&persistent=true"));
- assertEquals(prefix + "broker:(tcp://localhost:61616)?useJmx=false&persistent=false",
- getBrokerUri("broker:(tcp://localhost:61616)?useJmx=false&persistent=false"));
+ assertEquals(prefix + "broker:(tcp://localhost:" + brokerPort + ")?persistent=false",
+ getBrokerUri("broker:(tcp://localhost:" + brokerPort + ")"));
+ assertEquals(prefix + "broker:(tcp://localhost:" + brokerPort + ")?useJmx=false&persistent=false",
+ getBrokerUri("broker:(tcp://localhost:" + brokerPort + ")?useJmx=false"));
+ assertEquals(prefix + "broker:(tcp://localhost:" + brokerPort + ")?useJmx=false&persistent=false",
+ getBrokerUri("broker:(tcp://localhost:" + brokerPort + ")?useJmx=false&persistent=true"));
+ assertEquals(prefix + "broker:(tcp://localhost:" + brokerPort + ")?useJmx=false&persistent=false",
+ getBrokerUri("broker:(tcp://localhost:" + brokerPort + ")?useJmx=false&persistent=false"));
}
private String getBrokerUri(String brokerUri) throws URISyntaxException {
@@ -65,17 +78,17 @@ public class OpenEjbBrokerFactoryTest ex
}
public void testBrokerDoubleCreate() throws Exception {
- BrokerService broker = BrokerFactory.createBroker(new URI(getBrokerUri( "broker:(tcp://localhost:61616)?useJmx=false")));
+ BrokerService broker = BrokerFactory.createBroker(new URI(getBrokerUri( "broker:(tcp://localhost:" + brokerPort + ")?useJmx=false")));
stopBroker(broker);
- broker = BrokerFactory.createBroker(new URI(getBrokerUri("broker:(tcp://localhost:61616)?useJmx=false")));
+ broker = BrokerFactory.createBroker(new URI(getBrokerUri("broker:(tcp://localhost:" + brokerPort + ")?useJmx=false")));
stopBroker(broker);
}
public void testNoDataSource() throws Exception {
BrokerService broker = BrokerFactory.createBroker(new URI(getBrokerUri(
- "broker:(tcp://localhost:61616)?useJmx=false")));
+ "broker:(tcp://localhost:" + brokerPort + ")?useJmx=false")));
assertNotNull("broker is null", broker);
PersistenceAdapter persistenceAdapter = broker.getPersistenceAdapter();
@@ -97,7 +110,7 @@ public class OpenEjbBrokerFactoryTest ex
BrokerService broker = null;
try {
broker = BrokerFactory.createBroker(new URI(getBrokerUri(
- "broker:(tcp://localhost:61616)?useJmx=false")));
+ "broker:(tcp://localhost:" + brokerPort + ")?useJmx=false")));
assertNotNull("broker is null", broker);
PersistenceAdapter persistenceAdapter = broker.getPersistenceAdapter();
@@ -131,7 +144,7 @@ public class OpenEjbBrokerFactoryTest ex
BrokerService broker = null;
try {
broker = BrokerFactory.createBroker(new URI(getBrokerUri(
- "broker:(tcp://localhost:61616)?useJmx=false")));
+ "broker:(tcp://localhost:" + brokerPort + ")?useJmx=false")));
assertNotNull("broker is null", broker);
PersistenceAdapter persistenceAdapter = broker.getPersistenceAdapter();