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

[rmannibucau]

Author: rmannibucau
Date: Thu Oct 18 16:08:45 2012
New Revision: 1399716

URL: http://svn.apache.org/viewvc?rev=1399716&view=rev
Log:
quick try to fix AMQ issues

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.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/ActiveMQResourceAdapter.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java?rev=1399716&r1=1399715&r2=1399716&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQResourceAdapter.java
 Thu Oct 18 16:08:45 2012
@@ -165,11 +165,6 @@ public class ActiveMQResourceAdapter ext
                         compositeData.getParameters().put("persistent", 
"false");
                     }
 
-                    // compromise to avoid broker lock in some case + avoid 
failing tests
-                    if 
(!compositeData.getParameters().containsKey("jms.watchTopicAdvisories")) {
-                        
compositeData.getParameters().put("jms.watchTopicAdvisories", "false");
-                    }
-
                     if 
("false".equalsIgnoreCase(compositeData.getParameters().get("persistent").toString()))
 {
                         properties.remove("DataSource"); // no need
                     }

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=1399716&r1=1399715&r2=1399716&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
 Thu Oct 18 16:08:45 2012
@@ -52,7 +52,7 @@ public class JmsTest extends TestCase {
     protected static final String REQUEST_QUEUE_NAME = "request";
     protected ActiveMQConnectionFactory connectionFactory;
     protected ActiveMQResourceAdapter ra;
-    protected String brokerAddress = NetworkUtil.getLocalAddress("tcp://", "");
+    protected String brokerAddress = NetworkUtil.getLocalAddress("tcp://", 
"?jms.watchTopicAdvisories=false") ;
     protected String brokerXmlConfig = "broker:(" + brokerAddress + 
")?useJmx=false&persistent=false&cacheTempDestinations=true";
 
     @Override