svn commit: r1395935 - in /openejb/trunk/openejb/container/openejb-core/src: main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java test/java/org/apache/openejb/core/mdb/JmsProxyTest.java test/java/org/apache/openejb/core/mdb/JmsTest.java

[rmannibucau]

Author: rmannibucau
Date: Tue Oct  9 09:52:13 2012
New Revision: 1395935

URL: http://svn.apache.org/viewvc?rev=1395935&view=rev
Log:
TOMEE-454 amq 5.7.0

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
    
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
    
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java?rev=1395935&r1=1395934&r2=1395935&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
 Tue Oct  9 09:52:13 2012
@@ -95,6 +95,7 @@ public class ActiveMQ5Factory implements
                     }
 
                     persistenceAdapter.setDataSource(dataSource);
+                    broker.setPersistent(true);
                     broker.setPersistenceAdapter(persistenceAdapter);
                 } else {
                     final MemoryPersistenceAdapter persistenceAdapter = new 
MemoryPersistenceAdapter();

Modified: 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java?rev=1395935&r1=1395934&r2=1395935&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
 Tue Oct  9 09:52:13 2012
@@ -17,27 +17,10 @@
  */
 package org.apache.openejb.core.mdb;
 
-import java.util.Collections;
-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.connector.work.TransactionContextHandler;
-import org.apache.geronimo.connector.work.WorkContextHandler;
-import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.resource.activemq.ActiveMQResourceAdapter;
 
 public class JmsProxyTest extends JmsTest {
 

Modified: 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java?rev=1395935&r1=1395934&r2=1395935&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
 Tue Oct  9 09:52:13 2012
@@ -44,8 +44,8 @@ public class JmsTest extends TestCase {
     protected static final String REQUEST_QUEUE_NAME = "request";
     protected ConnectionFactory connectionFactory;
     protected ActiveMQResourceAdapter ra;
-    protected String brokerAddress = 
"tcp://127.0.0.1:61616";//NetworkUtil.getLocalAddress("tcp://", "");
-    protected String brokerXmlConfig = "broker:(" + brokerAddress + 
")?useJmx=false";
+    protected String brokerAddress = NetworkUtil.getLocalAddress("tcp://", "");
+    protected String brokerXmlConfig = "broker:(" + brokerAddress + 
")?useJmx=false&persistent=false&cacheTempDestinations=true";
 
     @Override
     protected void setUp() throws Exception {