Author: jlmonteiro
Date: Thu Jul 21 08:06:40 2011
New Revision: 1149063
URL: http://svn.apache.org/viewvc?rev=1149063&view=rev
Log:
Also apply ActiveMQ and MDB changes to activemq4 module. We should remove the
duplicate code in that module.
Added:
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/util/
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/util/NetworkUtil.java
Modified:
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapterTest.java
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/resources/org/apache/openejb/core/mdb/activemq.xml
Modified:
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java?rev=1149063&r1=1149062&r2=1149063&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
(original)
+++
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
Thu Jul 21 08:06:40 2011
@@ -17,74 +17,12 @@
*/
package org.apache.openejb.core.mdb;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.MessageConsumer;
import javax.jms.Session;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.ResourceAdapterInternalException;
-import javax.resource.spi.work.WorkManager;
-
-import junit.framework.TestCase;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.geronimo.connector.GeronimoBootstrapContext;
-import org.apache.geronimo.connector.work.GeronimoWorkManager;
-import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.resource.activemq.ActiveMQResourceAdapter;
-
-public class JmsProxyTest extends TestCase {
- private static final String REQUEST_QUEUE_NAME = "request";
- private ConnectionFactory connectionFactory;
- private ActiveMQResourceAdapter ra;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- // create a transaction manager
- GeronimoTransactionManager transactionManager = new
GeronimoTransactionManager();
-
- // create the ActiveMQ resource adapter instance
- ra = new ActiveMQResourceAdapter();
-
- // initialize properties
- ra.setServerUrl("tcp://localhost:61616");
- ra.setBrokerXmlConfig(getBrokerXmlConfig());
-
- // create a thead pool for ActiveMQ
- Executor threadPool = Executors.newFixedThreadPool(30);
-
- // create a work manager which ActiveMQ uses to dispatch message
delivery jobs
- WorkManager workManager = new GeronimoWorkManager(threadPool,
threadPool, threadPool, transactionManager);
-
- // wrap the work mananger and transaction manager in a bootstrap
context (connector spec thing)
- BootstrapContext bootstrapContext = new
GeronimoBootstrapContext(workManager, transactionManager);
-
- // start the resource adapter
- try {
- ra.start(bootstrapContext);
- } catch (ResourceAdapterInternalException e) {
- throw new OpenEJBException(e);
- }
- // Create a ConnectionFactory
- connectionFactory = new
ActiveMQConnectionFactory("tcp://localhost:61616");
- }
-
- protected String getBrokerXmlConfig() {
- return "broker:(tcp://localhost:61616)?useJmx=false";
- }
- protected void tearDown() throws Exception {
- connectionFactory = null;
- if (ra != null) {
- ra.stop();
- ra = null;
- }
- super.tearDown();
- }
+public class JmsProxyTest extends JmsTest {
public void testProxy() throws Exception {
// create reciever object
Modified:
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsTest.java?rev=1149063&r1=1149062&r2=1149063&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
(original)
+++
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
Thu Jul 21 08:06:40 2011
@@ -17,11 +17,15 @@
*/
package org.apache.openejb.core.mdb;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
+import junit.framework.TestCase;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.geronimo.connector.GeronimoBootstrapContext;
+import org.apache.geronimo.connector.work.GeronimoWorkManager;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.resource.activemq.ActiveMQResourceAdapter;
+import org.apache.openejb.util.NetworkUtil;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
@@ -35,19 +39,18 @@ import javax.jms.Session;
import javax.resource.spi.BootstrapContext;
import javax.resource.spi.ResourceAdapterInternalException;
import javax.resource.spi.work.WorkManager;
-
-import junit.framework.TestCase;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.geronimo.connector.GeronimoBootstrapContext;
-import org.apache.geronimo.connector.work.GeronimoWorkManager;
-import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.resource.activemq.ActiveMQResourceAdapter;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
public class JmsTest extends TestCase {
- private ConnectionFactory connectionFactory;
- private static final String REQUEST_QUEUE_NAME = "request";
- private ActiveMQResourceAdapter ra;
+ protected static final String REQUEST_QUEUE_NAME = "request";
+ protected ConnectionFactory connectionFactory;
+ protected ActiveMQResourceAdapter ra;
+ protected String brokerAddress = NetworkUtil.getLocalAddress("tcp://", "");
+ protected String brokerXmlConfig = "broker:(" + brokerAddress +
")?useJmx=false";
protected void setUp() throws Exception {
super.setUp();
@@ -59,8 +62,8 @@ public class JmsTest extends TestCase {
ra = new ActiveMQResourceAdapter();
// initialize properties
- ra.setServerUrl("tcp://localhost:61616");
- ra.setBrokerXmlConfig("broker:(tcp://localhost:61616)?useJmx=false");
+ ra.setServerUrl(brokerAddress);
+ ra.setBrokerXmlConfig(brokerXmlConfig);
// create a thead pool for ActiveMQ
@@ -79,7 +82,7 @@ public class JmsTest extends TestCase {
throw new OpenEJBException(e);
}
// Create a ConnectionFactory
- connectionFactory = new
ActiveMQConnectionFactory("tcp://localhost:61616");
+ connectionFactory = new ActiveMQConnectionFactory(brokerAddress);
}
protected void tearDown() throws Exception {
@@ -151,7 +154,7 @@ public class JmsTest extends TestCase {
}
}
-
+
private Destination createListener(Connection connection) throws
JMSException {
final Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Modified:
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/MdbTest.java?rev=1149063&r1=1149062&r2=1149063&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
(original)
+++
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
Thu Jul 21 08:06:40 2011
@@ -17,12 +17,9 @@
*/
package org.apache.openejb.core.mdb;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ra.ActiveMQActivationSpec;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
@@ -34,68 +31,16 @@ import javax.jms.MessageProducer;
import javax.jms.ObjectMessage;
import javax.jms.Session;
import javax.resource.ResourceException;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.ResourceAdapterInternalException;
import javax.resource.spi.UnavailableException;
import javax.resource.spi.endpoint.MessageEndpoint;
import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.resource.spi.work.WorkManager;
import javax.transaction.xa.XAResource;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.TreeMap;
-import junit.framework.TestCase;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.ra.ActiveMQActivationSpec;
-import org.apache.geronimo.connector.GeronimoBootstrapContext;
-import org.apache.geronimo.connector.work.GeronimoWorkManager;
-import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.resource.activemq.ActiveMQResourceAdapter;
-
-public class MdbTest extends TestCase {
- private static final String REQUEST_QUEUE_NAME = "request";
- private ConnectionFactory connectionFactory;
- private ActiveMQResourceAdapter ra;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- // create a transaction manager
- GeronimoTransactionManager transactionManager = new
GeronimoTransactionManager();
-
- // create the ActiveMQ resource adapter instance
- ra = new ActiveMQResourceAdapter();
-
- // initialize properties
- ra.setServerUrl("tcp://localhost:61616");
- ra.setBrokerXmlConfig("broker:(tcp://localhost:61616)?useJmx=false");
-
- // create a thead pool for ActiveMQ
- Executor threadPool = Executors.newFixedThreadPool(30);
-
- // create a work manager which ActiveMQ uses to dispatch message
delivery jobs
- WorkManager workManager = new GeronimoWorkManager(threadPool,
threadPool, threadPool, transactionManager);
-
- // wrap the work mananger and transaction manager in a bootstrap
context (connector spec thing)
- BootstrapContext bootstrapContext = new
GeronimoBootstrapContext(workManager, transactionManager);
-
- // start the resource adapter
- try {
- ra.start(bootstrapContext);
- } catch (ResourceAdapterInternalException e) {
- throw new OpenEJBException(e);
- }
- // Create a ConnectionFactory
- connectionFactory = new
ActiveMQConnectionFactory("tcp://localhost:61616");
- }
-
- protected void tearDown() throws Exception {
- connectionFactory = null;
- if (ra != null) {
- ra.stop();
- ra = null;
- }
- super.tearDown();
- }
+public class MdbTest extends JmsTest {
public void testProxy() throws Exception {
createListener();
@@ -111,7 +56,7 @@ public class MdbTest extends TestCase {
connection = connectionFactory.createConnection();
connection.start();
- // create request
+ // create request
Map<String, Object> request = new TreeMap<String, Object>();
request.put("args", new Object[]{"cheese"});
@@ -139,7 +84,7 @@ public class MdbTest extends TestCase {
Serializable object = responseMessage.getObject();
assertNotNull("Response ObjectMessage contains a null object");
assertTrue("Response ObjectMessage does not contain an instance of
Map", object instanceof Map);
- Map response = (Map) object;
+ Map<String, String> response = (Map<String, String>) object;
// process results
String returnValue = (String) response.get("return");
@@ -171,8 +116,8 @@ public class MdbTest extends TestCase {
ra.endpointActivation(endpointFactory, activationSpec);
}
- public static class JmsEndpointFactory implements MessageEndpointFactory {
- private final ConnectionFactory connectionFactory = new
ActiveMQConnectionFactory("tcp://localhost:61616");
+ public class JmsEndpointFactory implements MessageEndpointFactory {
+ private final ConnectionFactory connectionFactory = new
ActiveMQConnectionFactory(brokerAddress);
public MessageEndpoint createEndpoint(XAResource xaResource) throws
UnavailableException {
try {
@@ -187,11 +132,11 @@ public class MdbTest extends TestCase {
return false;
}
- public MessageEndpoint createEndpoint(XAResource arg0, long
arg1)
- throws UnavailableException {
- //TODO: next openejb version
- throw new UnsupportedOperationException("Method not
implemented: MessageEndpoint createEndpoint(XAResource arg0, long arg1)");
- }
+ public MessageEndpoint createEndpoint(XAResource arg0, long arg1)
+ throws UnavailableException {
+ //TODO: next openejb version
+ throw new UnsupportedOperationException("Method not implemented:
MessageEndpoint createEndpoint(XAResource arg0, long arg1)");
+ }
}
public static class JmsEndpoint implements MessageEndpoint,
MessageListener {
@@ -212,7 +157,7 @@ public class MdbTest extends TestCase {
try {
// process request
ObjectMessage requestMessage = (ObjectMessage) message;
- Map request = (Map) requestMessage.getObject();
+ Map<String, Object[]> request = (Map<String, Object[]>)
requestMessage.getObject();
Object[] args = (Object[]) request.get("args");
String returnValue = "test-" + args[0];
Modified:
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java?rev=1149063&r1=1149062&r2=1149063&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java
(original)
+++
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java
Thu Jul 21 08:06:40 2011
@@ -17,70 +17,12 @@
*/
package org.apache.openejb.core.mdb;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.MessageConsumer;
import javax.jms.Session;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.ResourceAdapterInternalException;
-import javax.resource.spi.work.WorkManager;
-
-import junit.framework.TestCase;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.geronimo.connector.GeronimoBootstrapContext;
-import org.apache.geronimo.connector.work.GeronimoWorkManager;
-import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.resource.activemq.ActiveMQResourceAdapter;
-
-public class SimpleJmsTest extends TestCase {
- private static final String REQUEST_QUEUE_NAME = "request";
- private ConnectionFactory connectionFactory;
- private ActiveMQResourceAdapter ra;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- // create a transaction manager
- GeronimoTransactionManager transactionManager = new
GeronimoTransactionManager();
-
- // create the ActiveMQ resource adapter instance
- ra = new ActiveMQResourceAdapter();
-
- // initialize properties
- ra.setServerUrl("vm://localhost?async=true");
- ra.setBrokerXmlConfig("broker:(tcp://localhost:61616)?useJmx=false");
-
- // create a thead pool for ActiveMQ
- Executor threadPool = Executors.newFixedThreadPool(30);
-
- // create a work manager which ActiveMQ uses to dispatch message
delivery jobs
- WorkManager workManager = new GeronimoWorkManager(threadPool,
threadPool, threadPool, transactionManager);
-
- // wrap the work mananger and transaction manager in a bootstrap
context (connector spec thing)
- BootstrapContext bootstrapContext = new
GeronimoBootstrapContext(workManager, transactionManager);
-
- // start the resource adapter
- try {
- ra.start(bootstrapContext);
- } catch (ResourceAdapterInternalException e) {
- throw new OpenEJBException(e);
- }
- // Create a ConnectionFactory
- connectionFactory = new
ActiveMQConnectionFactory("tcp://localhost:61616");
- }
- protected void tearDown() throws Exception {
- connectionFactory = null;
- if (ra != null) {
- ra.stop();
- ra = null;
- }
- super.tearDown();
- }
+public class SimpleJmsTest extends JmsTest {
public void testProxy() throws Exception {
// create reciever object
Modified:
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapterTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapterTest.java?rev=1149063&r1=1149062&r2=1149063&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapterTest.java
(original)
+++
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapterTest.java
Thu Jul 21 08:06:40 2011
@@ -18,12 +18,15 @@
package org.apache.openejb.resource.activemq;
import junit.framework.TestCase;
+import org.apache.openejb.util.NetworkUtil;
public class ActiveMQResourceAdapterTest extends TestCase {
public void test() throws Exception {
ActiveMQResourceAdapter resourceAdapter = new
ActiveMQResourceAdapter();
resourceAdapter.setServerUrl("vm://localhost?async=true");
-
resourceAdapter.setBrokerXmlConfig("broker:(tcp://localhost:61616)?useJmx=false");
+
+ String brokerAddress = NetworkUtil.getLocalAddress("broker:(tcp://",
")?useJmx=false");
+ resourceAdapter.setBrokerXmlConfig(brokerAddress);
// DataSource Default Unmanaged JDBC Database
//
Modified:
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java?rev=1149063&r1=1149062&r2=1149063&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
(original)
+++
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/resource/activemq/OpenEjbBrokerFactoryTest.java
Thu Jul 21 08:06:40 2011
@@ -17,18 +17,6 @@
*/
package org.apache.openejb.resource.activemq;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Properties;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-import javax.sql.DataSource;
-
import junit.framework.TestCase;
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService;
@@ -37,25 +25,40 @@ 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.util.URISupport;
import org.apache.openejb.core.CoreContainerSystem;
import org.apache.openejb.core.ivm.naming.IvmJndiFactory;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
+import org.apache.openejb.util.NetworkUtil;
+import org.apache.openejb.util.URISupport;
import org.apache.xbean.naming.context.ImmutableContext;
import org.hsqldb.jdbc.jdbcDataSource;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+import javax.sql.DataSource;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Properties;
+
public class OpenEjbBrokerFactoryTest extends TestCase {
+ private int brokerPort = NetworkUtil.getNextAvailablePort(new int[]{61616,
0});
+
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"));
+ final String prefix = ActiveMQFactory.getBrokerMetaFile();
+ 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 +68,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 +100,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 +134,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();
Added:
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/util/NetworkUtil.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/util/NetworkUtil.java?rev=1149063&view=auto
==============================================================================
---
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/util/NetworkUtil.java
(added)
+++
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/java/org/apache/openejb/util/NetworkUtil.java
Thu Jul 21 08:06:40 2011
@@ -0,0 +1,64 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.util;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+
+/**
+ * @author Romain Manni-Bucau
+ */
+public final class NetworkUtil {
+ private NetworkUtil() {
+ // no-op
+ }
+
+ public static int getNextAvailablePort() {
+ return getNextAvailablePort(new int[]{0});
+ }
+
+ public static int getNextAvailablePort(int[] portList) {
+ int port;
+ ServerSocket s = null;
+ try {
+ s = create(portList);
+ port = s.getLocalPort();
+ s.close();
+ } catch (IOException ioe) {
+ port = -1;
+ }
+ return port;
+ }
+
+ private static ServerSocket create(int[] ports) throws IOException {
+ for (int port : ports) {
+ try {
+ return new ServerSocket(port);
+ } catch (IOException ex) {
+ continue; // try next port
+ }
+ }
+
+ // if the program gets here, no port in the range was found
+ throw new IOException("no free port found");
+ }
+
+ public static String getLocalAddress(String start, String end) {
+ return start + "localhost:" + getNextAvailablePort() + end;
+ }
+}
Modified:
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/resources/org/apache/openejb/core/mdb/activemq.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/resources/org/apache/openejb/core/mdb/activemq.xml?rev=1149063&r1=1149062&r2=1149063&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/resources/org/apache/openejb/core/mdb/activemq.xml
(original)
+++
openejb/branches/openejb-3.2.x/container/openejb-activemq4/src/test/resources/org/apache/openejb/core/mdb/activemq.xml
Thu Jul 21 08:06:40 2011
@@ -21,13 +21,20 @@
xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
+
+
+ <bean name="address" factory-bean="org.apache.openejb.util.NetworkUtil"
factory-method="getLocalAddress">
+ <constructor-arg value="tcp://"/>
+ <constructor-arg value=""/>
+ </bean>
+
<bean name="broker" class="org.apache.activemq.xbean.XBeanBrokerService">
<property name="persistent" value="false"/>
<property name="brokerName" value="localhost"/>
<property name="transportConnectors">
<list>
<bean name="openwire"
class="org.apache.activemq.broker.TransportConnector">
- <property name="uri" value="tcp://localhost:61616"/>
+ <property name="uri" ref="address"/>
</bean>
</list>
</property>
