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/25 15:24:44 UTC
svn commit: r1150693 - in /openejb/trunk/openejb3/container:
openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java
openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java
Author: jlmonteiro
Date: Mon Jul 25 13:24:43 2011
New Revision: 1150693
URL: http://svn.apache.org/viewvc?rev=1150693&view=rev
Log:
Last ActiveMQ related commit. Corssing my fingers ...
Modified:
openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java
Modified: openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java?rev=1150693&r1=1150692&r2=1150693&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-activemq4/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java Mon Jul 25 13:24:43 2011
@@ -18,12 +18,15 @@ package org.apache.openejb.core.mdb;
import junit.framework.TestCase;
import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.ResourceInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.core.ivm.naming.InitContextFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.MessageDrivenBean;
+import org.apache.openejb.util.NetworkUtil;
+
import static org.apache.openejb.util.Join.join;
import javax.annotation.PostConstruct;
@@ -41,6 +44,7 @@ import javax.jms.TextMessage;
import javax.naming.InitialContext;
import java.util.Arrays;
import java.util.List;
+import java.util.Properties;
import java.util.Stack;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
@@ -56,8 +60,18 @@ public class JmsMdbContainerTest extends
ConfigurationFactory config = new ConfigurationFactory();
Assembler assembler = new Assembler();
+ // define props for RA in order to change the default activeMQ port
+ Properties props = new Properties();
+ String brokerAddress = NetworkUtil.getLocalAddress("tcp://", "");
+ String brokerXmlConfig = "broker:(" + brokerAddress + ")?useJmx=false";
+ props.put("BrokerXmlConfig", brokerXmlConfig);
+
assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
+ assembler.createResource(config.configureService(ResourceInfo.class, "Default Unmanaged JDBC Database",
+ new Properties(), "Default Unmanaged JDBC Database", "DataSource"));
+ assembler.createResource(config.configureService(ResourceInfo.class, "Default JMS Resource Adapter",
+ props, "Default JMS Resource Adapter", "ActiveMQResourceAdapter"));
// Setup the descriptor information
Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java?rev=1150693&r1=1150692&r2=1150693&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java Mon Jul 25 13:24:43 2011
@@ -18,12 +18,15 @@ package org.apache.openejb.core.mdb;
import junit.framework.TestCase;
import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.ResourceInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.core.ivm.naming.InitContextFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.MessageDrivenBean;
+import org.apache.openejb.util.NetworkUtil;
+
import static org.apache.openejb.util.Join.join;
import javax.annotation.PostConstruct;
@@ -41,6 +44,7 @@ import javax.jms.TextMessage;
import javax.naming.InitialContext;
import java.util.Arrays;
import java.util.List;
+import java.util.Properties;
import java.util.Stack;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
@@ -56,8 +60,18 @@ public class JmsMdbContainerTest extends
ConfigurationFactory config = new ConfigurationFactory();
Assembler assembler = new Assembler();
+ // define props for RA in order to change the default activeMQ port
+ Properties props = new Properties();
+ String brokerAddress = NetworkUtil.getLocalAddress("tcp://", "");
+ String brokerXmlConfig = "broker:(" + brokerAddress + ")?useJmx=false";
+ props.put("BrokerXmlConfig", brokerXmlConfig);
+
assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
+ assembler.createResource(config.configureService(ResourceInfo.class, "Default Unmanaged JDBC Database",
+ new Properties(), "Default Unmanaged JDBC Database", "DataSource"));
+ assembler.createResource(config.configureService(ResourceInfo.class, "Default JMS Resource Adapter",
+ props, "Default JMS Resource Adapter", "ActiveMQResourceAdapter"));
// Setup the descriptor information