Author: rmannibucau
Date: Wed Oct 10 10:01:41 2012
New Revision: 1396529
URL: http://svn.apache.org/viewvc?rev=1396529&view=rev
Log:
some cleanup on AMQ tests + in assembler prevent unbound of openejb/ (no luck
we call our internal app openejb too)
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/activemq/ActiveMQ5Factory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JndiTreeBrowser.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/assembler/classic/Assembler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1396529&r1=1396528&r2=1396529&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Wed Oct 10 10:01:41 2012
@@ -1222,18 +1222,9 @@ public class Assembler extends Assembler
unbind(globalContext, path.substring("java:global".length()));
}
- if (globalContext instanceof IvmContext) {
- try {
- ((IvmContext) globalContext).prune("java:global");
- } catch (NamingException e) {
- // no-op
- }
- }
-
- if (appInfo.appId != null && !appInfo.appId.isEmpty()) {
+ if (appInfo.appId != null && !appInfo.appId.isEmpty() &&
!"openejb".equals(appInfo.appId)) {
unbind(globalContext, "global/" + appInfo.appId);
unbind(globalContext, appInfo.appId);
- unbind(globalContext, "openejb/global/global/" +
appInfo.appId);
}
// dumpJndiTree(globalContext, "\n\nJndi Tree After
unbinds:\n======================\n\n");
@@ -1353,6 +1344,8 @@ public class Assembler extends Assembler
}
moduleIds.clear();
+ // dumpJndiTree(globalContext, "-->");
+
try {
if (globalContext instanceof IvmContext) {
IvmContext ivmContext = (IvmContext) globalContext;
@@ -1447,7 +1440,7 @@ public class Assembler extends Assembler
private void dumpJndiTree(final Context containerSystemContext, final
String message) {
System.out.println(message);
try {
- JndiTreeBrowser.log(containerSystemContext, "foo");
+ JndiTreeBrowser.log(containerSystemContext);
} catch (NamingException e) {
// no-op
}
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=1396529&r1=1396528&r2=1396529&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
Wed Oct 10 10:01:41 2012
@@ -209,15 +209,4 @@ public class ActiveMQ5Factory implements
public Collection<BrokerService> getBrokers() {
return brokers.values();
}
-
- public static synchronized void clear() {
- for (BrokerService bs : brokers.values()) {
- try {
- bs.stop();
- } catch (Exception e) {
- // no-op
- }
- }
- brokers.clear();
- }
}
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JndiTreeBrowser.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JndiTreeBrowser.java?rev=1396529&r1=1396528&r2=1396529&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JndiTreeBrowser.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JndiTreeBrowser.java
Wed Oct 10 10:01:41 2012
@@ -89,7 +89,7 @@ public class JndiTreeBrowser {
@Override
public void doWork(String path, String name, Object obj) {
final String complete = path + "/" + name;
- if (complete.contains(filter)) {
+ if (filter == null || complete.contains(filter)) {
System.out.println(complete);
}
}
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=1396529&r1=1396528&r2=1396529&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
Wed Oct 10 10:01:41 2012
@@ -19,20 +19,17 @@ package org.apache.openejb.core.mdb;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.ActiveMQSession;
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.ActiveMQ5Factory;
import org.apache.openejb.resource.activemq.ActiveMQResourceAdapter;
import org.apache.openejb.util.Duration;
import org.apache.openejb.util.NetworkUtil;
import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -53,7 +50,7 @@ import java.util.concurrent.TimeUnit;
public class JmsTest extends TestCase {
protected static final String REQUEST_QUEUE_NAME = "request";
- protected ConnectionFactory connectionFactory;
+ protected ActiveMQConnectionFactory connectionFactory;
protected ActiveMQResourceAdapter ra;
protected String brokerAddress = NetworkUtil.getLocalAddress("tcp://", "");
protected String brokerXmlConfig = "broker:(" + brokerAddress +
")?useJmx=false&persistent=false&cacheTempDestinations=true";
@@ -83,14 +80,16 @@ public class JmsTest extends TestCase {
// wrap the work mananger and transaction manager in a bootstrap
context (connector spec thing)
final BootstrapContext bootstrapContext = new
GeronimoBootstrapContext(workManager, transactionManager, transactionManager);
+ // Create a ConnectionFactory
+ connectionFactory = new ActiveMQConnectionFactory(brokerAddress);
+ ra.setConnectionFactory(connectionFactory);
+
// start the resource adapter
try {
ra.start(bootstrapContext);
} catch (ResourceAdapterInternalException e) {
throw new OpenEJBException(e);
}
- // Create a ConnectionFactory
- connectionFactory = new ActiveMQConnectionFactory(brokerAddress);
}
@Override
@@ -100,7 +99,6 @@ public class JmsTest extends TestCase {
ra.stop();
ra = null;
}
- ActiveMQ5Factory.clear();
super.tearDown();
}
