You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/01/25 01:27:22 UTC
svn commit: r1438278 - in /tomee/tomee/trunk/container/openejb-core/src:
main/java/org/apache/openejb/config/TldScanner.java
test/java/org/apache/openejb/config/ActivationConfigPropertyOverrideTest.java
Author: rmannibucau
Date: Fri Jan 25 00:27:22 2013
New Revision: 1438278
URL: http://svn.apache.org/viewvc?rev=1438278&view=rev
Log:
some cleanup in tests + setting a custom name to a temp thread pool
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/ActivationConfigPropertyOverrideTest.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java?rev=1438278&r1=1438277&r2=1438278&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/TldScanner.java Fri Jan 25 00:27:22 2013
@@ -17,6 +17,7 @@
package org.apache.openejb.config;
import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.util.DaemonThreadFactory;
import org.apache.openejb.util.URLs;
import org.apache.xbean.finder.UrlSet;
import org.apache.xbean.finder.filter.Filters;
@@ -98,7 +99,7 @@ public class TldScanner {
tldUrls.addAll(scan(classLoader.getParent()));
if (urls.size() > 0) {
- final ExecutorService es = Executors.newFixedThreadPool(2 * Runtime.getRuntime().availableProcessors() + 1);
+ final ExecutorService es = Executors.newFixedThreadPool(2 * Runtime.getRuntime().availableProcessors() + 1, new DaemonThreadFactory("OpenEJB-tld-server-scanning"));
final Collection<Future<Set<URL>>> futures = new ArrayList<Future<Set<URL>>>(urls.size());
for (URL url : urls) {
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/ActivationConfigPropertyOverrideTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/ActivationConfigPropertyOverrideTest.java?rev=1438278&r1=1438277&r2=1438278&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/ActivationConfigPropertyOverrideTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/ActivationConfigPropertyOverrideTest.java Fri Jan 25 00:27:22 2013
@@ -16,16 +16,10 @@
*/
package org.apache.openejb.config;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
import junit.framework.TestCase;
-
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.EjbJarInfo;
-import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
import org.apache.openejb.assembler.classic.MessageDrivenBeanInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
@@ -40,6 +34,7 @@ import org.apache.openejb.loader.SystemI
import javax.ejb.MessageDriven;
import javax.jms.Message;
import javax.jms.MessageListener;
+import java.util.Properties;
/*
1 -D<deploymentId>.activation.<property>=<value>
@@ -77,6 +72,7 @@ public class ActivationConfigPropertyOve
assertTrue(containsActivationKeyValuePair(mdb, "destinationType", "testString"));
assertTrue(mdb.getActivationConfig().getActivationConfigProperty().size() == 1);
+ System.clearProperty("ENTERPRISEBEAN.mdb.activation.destinationType");
}
/**
@@ -85,11 +81,11 @@ public class ActivationConfigPropertyOve
*
* @throws OpenEJBException
*/
-
public void testAddActivationConfigPropertyIfNotAlreadyPresent() throws OpenEJBException {
// set overrides
System.setProperty("ENTERPRISEBEAN.mdb.activation.destinationType", "testString");
+
// deploy with an mdb that has no "destinationType" activationConfigProp
MessageDrivenBean mdb = new MdbBuilder().anMdb().build();
AppModule appModule = new AppModuleBuilder().anAppModule().withAnMdb(mdb).build();
@@ -98,6 +94,8 @@ public class ActivationConfigPropertyOve
assertTrue(containsActivationKeyValuePair(mdb, "destinationType", "testString"));
assertTrue(mdb.getActivationConfig().getActivationConfigProperty().size() == 1);
+
+ System.clearProperty("ENTERPRISEBEAN.mdb.activation.destinationType");
}
private boolean containsActivationKeyValuePair(MessageDrivenBean mdbBeingInspected, String activationPropKey, String activationPropValue) {
@@ -155,11 +153,13 @@ public class ActivationConfigPropertyOve
public void testMdbOverrideSystem() throws Exception {
SystemInstance.reset();
- final Properties properties = SystemInstance.get().getProperties();
+ final Properties systProps = SystemInstance.get().getProperties();
+ final Properties properties = new Properties();
properties.setProperty("mdb.activation.maxSessions", "20");
properties.setProperty("mdb.activation.maxMessagesPerSessions", "100");
properties.setProperty("mdb.activation.destinationType", "javax.jms.Queue");
properties.setProperty("mdb.activation.destination", "OVERRIDDEN.QUEUE");
+ systProps.putAll(properties);
final Assembler assembler = new Assembler();
final ConfigurationFactory config = new ConfigurationFactory();
@@ -184,6 +184,10 @@ public class ActivationConfigPropertyOve
assertEquals("100", yellow.activationProperties.get("maxMessagesPerSessions"));
assertEquals("javax.jms.Queue", yellow.activationProperties.get("destinationType"));
assertEquals("OVERRIDDEN.QUEUE", yellow.activationProperties.get("destination"));
+
+ for (String n : properties.stringPropertyNames()) {
+ systProps.remove(n);
+ }
}
public void testMdbOverrideOpenejbJar() throws Exception {