You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/15 12:22:41 UTC
svn commit: r1610636 [1/2] - in /tomee/tomee/branches/tomee-1.7.x/container:
openejb-core/
openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/
openejb-core/src/main/java/org/apache/openejb/util/
openejb-core/src/test/java/org/apache/...
Author: andygumbrecht
Date: Tue Jul 15 10:22:39 2014
New Revision: 1610636
URL: http://svn.apache.org/r1610636
Log:
Test tear downs
Modified:
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/pom.xml
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/BeanContextsInitializedEvent.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/AppFinder.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextOptionsTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextPropertiesTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/AccessTimeoutTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ConcurrentLockTypeTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ConcurrentMethodTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbSecurityRoleRefTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEJBXmlByModuleTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/RedeployTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ResourcesJsonTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/TransactionAttributesTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/bval/util/CustomValidatorProvider.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/cdi/SimpleCdiTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ApplicationPropertiesTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/BeanPropertiesTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/DefaultDataSourceTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/InjectionTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameFormatTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/MBeanDeployerTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/MappedNameTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ModuleNameInjectionTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ModulePropertiesTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/sys/NoServiceJarTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/sys/ServiceProviderInheritanceTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/EjbContextTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/asynch/AsynchInRoleTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/asynch/AsynchTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/managed/ManagedBeanTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/DependsOnTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonCircularTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonLazyInstantiationTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/CallbackOverridesTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/Compat3to2Test.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/EntityManagerPropogationTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulBeanManagedTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrencyTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConcurrentLookupTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulConstructorInjectionTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulContainerTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulInterceptorTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSecurityPermissionsTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionBeanTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulSessionSynchronizationTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTimeoutTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTransactionAttributesTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/StatefulTransactionLockingTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/CrossClassLoaderProxyTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessConstructorInjectionTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInstanceManagerPoolingTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInterceptorTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessInvocationStatsTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/StatelessPoolStatsTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/dyni/DynamicStatefulTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/dyni/DynamicSubclassTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/DynamicDataSourceTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/test/entity/cmr/onetoone/ExampleABean_ABean.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/timer/EJBCronTriggerTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/timer/ScheduleTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/timer/TimerContainerTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/tool/junit/OpenEJBJUnitDebugListener.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-jee-accessors/src/test/java/org/apache/openejb/sxc/EjbJarXmlTest.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-jee/src/main/java/org/apache/openejb/jee/ContainerTransaction.java
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/pom.xml?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/pom.xml Tue Jul 15 10:22:39 2014
@@ -687,7 +687,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <reuseForks>false</reuseForks>
+ <!--<reuseForks>false</reuseForks>-->
<argLine>"-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar" -Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/BeanContextsInitializedEvent.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/BeanContextsInitializedEvent.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/BeanContextsInitializedEvent.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/BeanContextsInitializedEvent.java Tue Jul 15 10:22:39 2014
@@ -48,6 +48,6 @@ public class BeanContextsInitializedEven
@Override
public String toString() {
- return "BeanContextsInitializedEvent{app=" + app.appId +"}";
+ return "BeanContextsInitializedEvent{app=" + app.appId + "}";
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/AppFinder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/AppFinder.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/AppFinder.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/AppFinder.java Tue Jul 15 10:22:39 2014
@@ -42,6 +42,7 @@ public final class AppFinder {
public interface Transformer<T> {
T from(AppContext appCtx);
+
T from(WebContext webCtx);
}
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java Tue Jul 15 10:22:39 2014
@@ -273,7 +273,7 @@ public class Logger {
public Logger(final LogCategory category, final LogStream logStream, final String baseName) {
this.category = category;
this.baseName = baseName;
- this.logStream = new LogStreamAsync(logStream);
+ this.logStream = ("true".equals(SystemInstance.get().getProperty("openejb.log.async", "false")) ? new LogStreamAsync(logStream) : logStream);
}
public static Logger getInstance(final LogCategory category, final Class clazz) {
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextOptionsTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextOptionsTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextOptionsTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextOptionsTest.java Tue Jul 15 10:22:39 2014
@@ -50,6 +50,11 @@ public class DeploymentContextOptionsTes
}
}
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void testBeanContextOptions() throws Exception {
final ConfigurationFactory config = new ConfigurationFactory();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextPropertiesTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextPropertiesTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextPropertiesTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/DeploymentContextPropertiesTest.java Tue Jul 15 10:22:39 2014
@@ -45,6 +45,11 @@ public class DeploymentContextProperties
Thread.currentThread().getContextClassLoader().loadClass("org.apache.bval.jsr303.ConfigurationImpl");
}
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void testBeanContextProperties() throws Exception {
final ConfigurationFactory config = new ConfigurationFactory();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/AccessTimeoutTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/AccessTimeoutTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/AccessTimeoutTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/AccessTimeoutTest.java Tue Jul 15 10:22:39 2014
@@ -18,11 +18,13 @@ package org.apache.openejb.assembler.cla
import junit.framework.TestCase;
import org.apache.openejb.BeanContext;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
+import org.junit.AfterClass;
import javax.ejb.AccessTimeout;
import javax.ejb.Local;
@@ -39,6 +41,16 @@ import java.util.concurrent.TimeUnit;
public class AccessTimeoutTest extends TestCase {
private Map<Method, MethodAttributeInfo> attributes;
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
final Assembler assembler = new Assembler();
final ConfigurationFactory config = new ConfigurationFactory();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ConcurrentLockTypeTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ConcurrentLockTypeTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ConcurrentLockTypeTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ConcurrentLockTypeTest.java Tue Jul 15 10:22:39 2014
@@ -18,6 +18,7 @@ package org.apache.openejb.assembler.cla
import junit.framework.TestCase;
import org.apache.openejb.BeanContext;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.jee.ConcurrentLockType;
import org.apache.openejb.jee.ContainerConcurrency;
@@ -25,6 +26,7 @@ import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
+import org.junit.AfterClass;
import javax.ejb.Local;
import javax.ejb.Lock;
@@ -41,8 +43,20 @@ import static javax.ejb.LockType.WRITE;
* @version $Rev$ $Date$
*/
public class ConcurrentLockTypeTest extends TestCase {
+
private Map<Method, MethodAttributeInfo> attributes;
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
+
public void test() throws Exception {
final Assembler assembler = new Assembler();
final ConfigurationFactory config = new ConfigurationFactory();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ConcurrentMethodTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ConcurrentMethodTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ConcurrentMethodTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ConcurrentMethodTest.java Tue Jul 15 10:22:39 2014
@@ -18,11 +18,13 @@ package org.apache.openejb.assembler.cla
import junit.framework.TestCase;
import org.apache.openejb.BeanContext;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
+import org.junit.AfterClass;
import javax.ejb.AccessTimeout;
import javax.ejb.Local;
@@ -44,6 +46,16 @@ public class ConcurrentMethodTest extend
private Map<Method, MethodAttributeInfo> lockAttributes;
private Map<Method, MethodAttributeInfo> accessTimeoutAttributes;
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
final Assembler assembler = new Assembler();
final ConfigurationFactory config = new ConfigurationFactory();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbRefTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.assembler.classic;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.config.AppModule;
import org.apache.openejb.config.ConfigurationFactory;
@@ -26,6 +27,7 @@ import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
+import org.junit.AfterClass;
import javax.ejb.EJB;
import javax.naming.InitialContext;
@@ -68,6 +70,11 @@ public class EjbRefTest extends TestCase
super.tearDown();
}
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void testInterfaceOnlyRefs() throws Exception {
ear(ejbjar(Apple.class, AmbiguousFruitRef.class));
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbSecurityRoleRefTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbSecurityRoleRefTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbSecurityRoleRefTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/EjbSecurityRoleRefTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.assembler.classic;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.config.AppModule;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.config.EjbModule;
@@ -26,6 +27,7 @@ import org.apache.openejb.jee.SecurityRo
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
+import org.junit.AfterClass;
import javax.annotation.Resource;
import javax.ejb.SessionContext;
@@ -66,6 +68,11 @@ public class EjbSecurityRoleRefTest exte
super.tearDown();
}
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void testShouldCheckUserRole() throws Exception {
final EjbJar ejbJar = new EjbJar();
final StatelessBean statelessBean = new StatelessBean(UserBean.class);
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEJBXmlByModuleTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEJBXmlByModuleTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEJBXmlByModuleTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/OpenEJBXmlByModuleTest.java Tue Jul 15 10:22:39 2014
@@ -77,8 +77,8 @@ public class OpenEJBXmlByModuleTest {
public void close() throws NamingException {
if (context != null) {
context.close();
- OpenEJB.destroy(); // has to be called manually since we start openejb in a custom way
}
+ OpenEJB.destroy();
}
@Test
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/RedeployTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/RedeployTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/RedeployTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/RedeployTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.assembler.classic;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.loader.JarLocation;
@@ -24,6 +25,7 @@ import org.apache.openejb.test.stateful.
import org.apache.openejb.test.stateful.EncStatefulHome;
import org.apache.openejb.test.stateful.EncStatefulObject;
import org.apache.openejb.test.stateless.BasicStatelessBean;
+import org.junit.AfterClass;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -35,6 +37,17 @@ import java.util.Properties;
* @version $Rev$ $Date$
*/
public class RedeployTest extends TestCase {
+
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
// create reference to openejb itests
final File file = JarLocation.jarLocation(BasicStatelessBean.class);
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ResourcesJsonTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ResourcesJsonTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ResourcesJsonTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ResourcesJsonTest.java Tue Jul 15 10:22:39 2014
@@ -77,8 +77,8 @@ public class ResourcesJsonTest {
public void close() throws NamingException {
if (context != null) {
context.close();
- OpenEJB.destroy(); // has to be called manually since we start openejb in a custom way
}
+ OpenEJB.destroy();
}
@Test
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/TransactionAttributesTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/TransactionAttributesTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/TransactionAttributesTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/TransactionAttributesTest.java Tue Jul 15 10:22:39 2014
@@ -18,6 +18,7 @@ package org.apache.openejb.assembler.cla
import junit.framework.TestCase;
import org.apache.openejb.BeanContext;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.core.ThreadContext;
import org.apache.openejb.jee.ContainerTransaction;
@@ -27,6 +28,7 @@ import org.apache.openejb.jee.StatelessB
import org.apache.openejb.jee.TransAttribute;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
+import org.junit.AfterClass;
import javax.ejb.EJBTransactionRequiredException;
import javax.ejb.Local;
@@ -54,6 +56,16 @@ public class TransactionAttributesTest e
private Map<Method, MethodAttributeInfo> attributes;
private Object bean;
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
final Assembler assembler = new Assembler();
final ConfigurationFactory config = new ConfigurationFactory();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/bval/util/CustomValidatorProvider.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/bval/util/CustomValidatorProvider.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/bval/util/CustomValidatorProvider.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/bval/util/CustomValidatorProvider.java Tue Jul 15 10:22:39 2014
@@ -194,7 +194,7 @@ public class CustomValidatorProvider imp
}
@Override
- public <T> Set<ConstraintViolation<T>> validateValue(final Class<T> beanType, final String propertyName, final Object value, Class<?>... groups) {
+ public <T> Set<ConstraintViolation<T>> validateValue(final Class<T> beanType, final String propertyName, final Object value, final Class<?>... groups) {
return null;
}
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/cdi/SimpleCdiTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/cdi/SimpleCdiTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/cdi/SimpleCdiTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/cdi/SimpleCdiTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.cdi;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
@@ -26,6 +27,7 @@ import org.apache.openejb.core.ivm.namin
import org.apache.openejb.jee.Beans;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
+import org.junit.AfterClass;
import org.junit.Before;
import javax.decorator.Decorator;
@@ -84,6 +86,16 @@ public class SimpleCdiTest extends TestC
ctx = new InitialContext(properties);
}
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void testSimple() {
try {
final EchoLocal echo = (EchoLocal) ctx.lookup("EchoLocal");
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/AnnotationDeployerTest.java Tue Jul 15 10:22:39 2014
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.config;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ClientInfo;
@@ -31,6 +32,7 @@ import org.apache.xbean.finder.Annotated
import org.apache.xbean.finder.AnnotationFinder;
import org.apache.xbean.finder.ClassFinder;
import org.apache.xbean.finder.archive.ClassesArchive;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Test;
@@ -88,6 +90,11 @@ import static org.junit.Assert.assertTru
*/
public class AnnotationDeployerTest {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
@Test
/**
* For http://issues.apache.org/jira/browse/OPENEJB-980
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ApplicationPropertiesTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ApplicationPropertiesTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ApplicationPropertiesTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ApplicationPropertiesTest.java Tue Jul 15 10:22:39 2014
@@ -20,6 +20,7 @@ import junit.framework.TestCase;
import org.apache.openejb.AppContext;
import org.apache.openejb.BeanContext;
import org.apache.openejb.ModuleContext;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -46,6 +47,11 @@ public class ApplicationPropertiesTest e
SystemInstance.reset();
}
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
final ConfigurationFactory config = new ConfigurationFactory();
final Assembler assembler = new Assembler();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/AutoConfigPersistenceUnitsTest.java Tue Jul 15 10:22:39 2014
@@ -18,6 +18,7 @@ package org.apache.openejb.config;
import junit.framework.TestCase;
import org.apache.openejb.Core;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
@@ -73,6 +74,7 @@ public class AutoConfigPersistenceUnitsT
@Override
public void tearDown() {
System.getProperties().remove(LocalMBeanServer.OPENEJB_JMX_ACTIVE);
+ OpenEJB.destroy();
}
/**
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/BeanPropertiesTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/BeanPropertiesTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/BeanPropertiesTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/BeanPropertiesTest.java Tue Jul 15 10:22:39 2014
@@ -20,6 +20,7 @@ import junit.framework.TestCase;
import org.apache.openejb.AppContext;
import org.apache.openejb.BeanContext;
import org.apache.openejb.ModuleContext;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
@@ -27,6 +28,7 @@ import org.apache.openejb.loader.Options
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.util.Archives;
+import org.junit.AfterClass;
import javax.ejb.Singleton;
import java.io.File;
@@ -39,6 +41,16 @@ import java.util.Properties;
*/
public class BeanPropertiesTest extends TestCase {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void testFile() throws Exception {
final ConfigurationFactory config = new ConfigurationFactory();
final Assembler assembler = new Assembler();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/DefaultDataSourceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/DefaultDataSourceTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/DefaultDataSourceTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/DefaultDataSourceTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.config;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
import org.apache.openejb.assembler.classic.ResourceInfo;
@@ -25,6 +26,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.loader.SystemInstance;
+import org.junit.AfterClass;
import javax.annotation.Resource;
import javax.sql.DataSource;
@@ -34,6 +36,11 @@ import javax.sql.DataSource;
*/
public class DefaultDataSourceTest extends TestCase {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
/**
* Default DataSource should be a JtaManaged DataSource
*
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/InjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/InjectionTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/InjectionTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/InjectionTest.java Tue Jul 15 10:22:39 2014
@@ -18,12 +18,13 @@
package org.apache.openejb.config;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
-import org.apache.openejb.core.ivm.naming.InitContextFactory;
+import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.EnvEntry;
import org.apache.openejb.jee.InjectionTarget;
@@ -73,7 +74,7 @@ public class InjectionTest extends TestC
protected void setUp() throws Exception {
super.setUp();
- System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName());
+ System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
final ConfigurationFactory config = new ConfigurationFactory();
final Assembler assembler = new Assembler();
@@ -121,6 +122,11 @@ public class InjectionTest extends TestC
assembler.createApplication(config.configureApplication(ejbJar));
}
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
private String name(final String name) {
return "java:comp/env/" + WidgetBean.class.getName() + "/" + name;
}
@@ -164,40 +170,40 @@ public class InjectionTest extends TestC
private SessionContext sessionContext;
@Resource
- private String myString = "1";
+ private final String myString = "1";
@Resource
- private Double myDouble = 1.0D;
+ private final Double myDouble = 1.0D;
@Resource
- private Long myLong = 1L;
+ private final Long myLong = 1L;
@Resource
- private Float myFloat = 1.0F;
+ private final Float myFloat = 1.0F;
@Resource
- private Integer myInteger = 1;
+ private final Integer myInteger = 1;
@Resource
- private Short myShort = (short) 1;
+ private final Short myShort = (short) 1;
@Resource
- private Boolean myBoolean = true;
+ private final Boolean myBoolean = true;
@Resource
- private Byte myByte = (byte) 1;
+ private final Byte myByte = (byte) 1;
@Resource
- private Character myCharacter = '1';
+ private final Character myCharacter = '1';
@Resource
- private Class myClass = Object.class;
+ private final Class myClass = Object.class;
@Resource
- private TimeUnit myTimeUnit = TimeUnit.DAYS;
+ private final TimeUnit myTimeUnit = TimeUnit.DAYS;
// injected via DD
- private boolean injectedBoolean = false;
+ private final boolean injectedBoolean = false;
// injected via DD
private EJBContext injectedContext;
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameFormatTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameFormatTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameFormatTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameFormatTest.java Tue Jul 15 10:22:39 2014
@@ -18,6 +18,7 @@
package org.apache.openejb.config;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -25,6 +26,7 @@ import org.apache.openejb.assembler.clas
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.loader.SystemInstance;
+import org.junit.AfterClass;
import javax.ejb.Remote;
import javax.ejb.Stateless;
@@ -36,6 +38,16 @@ import java.util.Properties;
public class JndiNameFormatTest extends TestCase {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
private Assembler assembler;
private void deploy(final String format) throws OpenEJBException, IOException, NamingException {
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.config;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -30,6 +31,7 @@ import org.apache.openejb.jee.oejb2.Sess
import org.apache.openejb.jee.oejb3.EjbDeployment;
import org.apache.openejb.jee.oejb3.Jndi;
import org.apache.openejb.jee.oejb3.OpenejbJar;
+import org.junit.AfterClass;
import javax.ejb.EJBHome;
import javax.ejb.EJBLocalHome;
@@ -47,6 +49,16 @@ import javax.naming.NamingException;
*/
public class JndiNameTest extends TestCase {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName());
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.config;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -66,6 +67,11 @@ public class LocalClientNoInjectionTest
assembler.createApplication(config.configureApplication(app));
}
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
final Properties properties = new Properties();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.config;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -107,6 +108,11 @@ public class LocalClientTest extends Tes
assembler.createApplication(config.configureApplication(app));
}
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
final Properties properties = new Properties();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/MBeanDeployerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/MBeanDeployerTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/MBeanDeployerTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/MBeanDeployerTest.java Tue Jul 15 10:22:39 2014
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.config;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
@@ -34,6 +35,7 @@ import org.apache.openejb.mbeans.ReaderD
import org.apache.openejb.mbeans.ReaderWriter;
import org.apache.openejb.monitoring.LocalMBeanServer;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
@@ -90,6 +92,11 @@ public class MBeanDeployerTest {
SystemInstance.reset();
}
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
@Test
public void mbeans() throws Exception {
final Set<String> parsed = new HashSet<String>();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/MappedNameTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/MappedNameTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/MappedNameTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/MappedNameTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.config;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.EjbJarInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -26,6 +27,7 @@ import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.jee.oejb3.EjbDeployment;
import org.apache.openejb.jee.oejb3.OpenejbJar;
+import org.junit.AfterClass;
import javax.ejb.EJB;
import javax.naming.InitialContext;
@@ -36,6 +38,11 @@ import javax.naming.NamingException;
*/
public class MappedNameTest extends TestCase {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ModuleNameInjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ModuleNameInjectionTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ModuleNameInjectionTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ModuleNameInjectionTest.java Tue Jul 15 10:22:39 2014
@@ -18,6 +18,7 @@
package org.apache.openejb.config;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -100,6 +101,11 @@ public class ModuleNameInjectionTest ext
assembler.createApplication(config.configureApplication(app));
}
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public static interface Widget {
String getModuleName();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ModulePropertiesTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ModulePropertiesTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ModulePropertiesTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/ModulePropertiesTest.java Tue Jul 15 10:22:39 2014
@@ -20,6 +20,7 @@ import junit.framework.TestCase;
import org.apache.openejb.AppContext;
import org.apache.openejb.BeanContext;
import org.apache.openejb.ModuleContext;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -46,6 +47,11 @@ public class ModulePropertiesTest extend
SystemInstance.reset();
}
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void testFile() throws Exception {
final ConfigurationFactory config = new ConfigurationFactory();
final Assembler assembler = new Assembler();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java Tue Jul 15 10:22:39 2014
@@ -18,6 +18,7 @@ package org.apache.openejb.config;
import junit.framework.TestCase;
import org.apache.openejb.BeanContext;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.EjbJarInfo;
import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
@@ -28,6 +29,7 @@ import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
+import org.junit.AfterClass;
import javax.ejb.Local;
import javax.ejb.Remote;
@@ -39,6 +41,11 @@ import static java.util.Arrays.asList;
public class UberInterfaceTest extends TestCase {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvokeMethod.java Tue Jul 15 10:22:39 2014
@@ -54,9 +54,9 @@ public class InvokeMethod extends Statem
// The test method
private final FrameworkMethod testMethod;
// The TestCase instance
- private Object target;
+ private final Object target;
// These are all the keys defined in org.apache.openejb.config.rules.Messages.properties
- private static Set<String> allKeys;
+ private static final Set<String> allKeys;
static {
final ResourceBundle bundle = ResourceBundle.getBundle("org.apache.openejb.config.rules.Messages");
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/sys/NoServiceJarTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/sys/NoServiceJarTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/sys/NoServiceJarTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/sys/NoServiceJarTest.java Tue Jul 15 10:22:39 2014
@@ -18,6 +18,7 @@ package org.apache.openejb.config.sys;
import junit.framework.TestCase;
import org.apache.openejb.AppContext;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ResourceInfo;
@@ -27,12 +28,18 @@ import org.apache.openejb.config.Configu
import org.apache.openejb.config.EjbModule;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
+import org.junit.AfterClass;
/**
* @version $Rev$ $Date$
*/
public class NoServiceJarTest extends TestCase {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
final ConfigurationFactory factory = new ConfigurationFactory();
final Assembler assembler = new Assembler();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/sys/ServiceProviderInheritanceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/sys/ServiceProviderInheritanceTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/sys/ServiceProviderInheritanceTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/config/sys/ServiceProviderInheritanceTest.java Tue Jul 15 10:22:39 2014
@@ -18,6 +18,7 @@ package org.apache.openejb.config.sys;
import junit.framework.TestCase;
import org.apache.openejb.AppContext;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ResourceInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -31,6 +32,7 @@ import org.apache.openejb.config.provide
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.loader.SystemInstance;
+import org.junit.AfterClass;
import java.util.List;
@@ -39,6 +41,11 @@ import java.util.List;
*/
public class ServiceProviderInheritanceTest extends TestCase {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
SystemInstance.get().setComponent(ProviderManager.class, new ProviderManager(new ProviderLoader() {
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/EjbContextTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/EjbContextTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/EjbContextTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/EjbContextTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.core;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
@@ -26,6 +27,7 @@ import org.apache.openejb.jee.SingletonB
import org.apache.openejb.jee.StatefulBean;
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.osgi.client.LocalInitialContextFactory;
+import org.junit.AfterClass;
import javax.ejb.CreateException;
import javax.ejb.EJBException;
@@ -46,6 +48,11 @@ import java.util.Properties;
*/
public class EjbContextTest extends TestCase {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
final Assembler assembler = new Assembler();
final ConfigurationFactory config = new ConfigurationFactory();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/LegacyInterfaceTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.core;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.TransactionServiceInfo;
@@ -33,6 +34,7 @@ import org.apache.openejb.jee.Query;
import org.apache.openejb.jee.QueryMethod;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.jee.TransAttribute;
+import org.junit.AfterClass;
import javax.ejb.CreateException;
import javax.ejb.EJBException;
@@ -50,6 +52,11 @@ import java.util.List;
*/
public class LegacyInterfaceTest extends TestCase {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName());
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/asynch/AsynchInRoleTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/asynch/AsynchInRoleTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/asynch/AsynchInRoleTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/asynch/AsynchInRoleTest.java Tue Jul 15 10:22:39 2014
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.core.asynch;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -28,6 +29,7 @@ import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.jee.StatelessBean;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -67,6 +69,11 @@ public class AsynchInRoleTest {
assembler.destroy();
}
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
@Test
public void testMethodScopeAsynch() throws Exception {
//Build the application
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/asynch/AsynchTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/asynch/AsynchTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/asynch/AsynchTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/asynch/AsynchTest.java Tue Jul 15 10:22:39 2014
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.core.asynch;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -28,6 +29,7 @@ import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.jee.StatelessBean;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -64,6 +66,11 @@ public class AsynchTest {
assembler.destroy();
}
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
@SuppressWarnings("UseOfSystemOutOrSystemErr")
@Test
public void testMethodScopeAsynch() throws Exception {
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/managed/ManagedBeanTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/managed/ManagedBeanTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/managed/ManagedBeanTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/managed/ManagedBeanTest.java Tue Jul 15 10:22:39 2014
@@ -17,11 +17,12 @@
package org.apache.openejb.core.managed;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
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.core.LocalInitialContextFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.ManagedBean;
import org.apache.openejb.loader.SystemInstance;
@@ -47,7 +48,7 @@ public class ManagedBeanTest extends Tes
@Override
protected void setUp() throws Exception {
- System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName());
+ System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
final ConfigurationFactory config = new ConfigurationFactory();
final Assembler assembler = new Assembler();
@@ -61,6 +62,11 @@ public class ManagedBeanTest extends Tes
assembler.createApplication(config.configureApplication(ejbJar));
}
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
MyBean.instances.set(0);
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsMdbContainerTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.core.mdb;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ResourceInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -26,6 +27,7 @@ import org.apache.openejb.core.ivm.namin
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.MessageDrivenBean;
import org.apache.openejb.util.NetworkUtil;
+import org.junit.AfterClass;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
@@ -54,6 +56,12 @@ import static org.apache.openejb.util.Jo
* @version $Rev$ $Date$
*/
public class JmsMdbContainerTest extends TestCase {
+
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName());
@@ -134,7 +142,7 @@ public class JmsMdbContainerTest extends
public static Lock lock = new ReentrantLock();
public static Condition messageRecieved = lock.newCondition();
- private static Stack<Lifecycle> lifecycle = new Stack<Lifecycle>();
+ private static final Stack<Lifecycle> lifecycle = new Stack<Lifecycle>();
@Resource
ConnectionFactory connectionFactory;
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.core.mdb;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -38,6 +39,7 @@ import org.apache.openejb.quartz.JobExec
import org.apache.openejb.quartz.JobExecutionException;
import org.apache.openejb.resource.quartz.JobSpec;
import org.apache.openejb.resource.quartz.QuartzResourceAdapter;
+import org.junit.AfterClass;
import org.junit.Assert;
import javax.annotation.PostConstruct;
@@ -55,6 +57,12 @@ import java.util.concurrent.TimeUnit;
* @version $Rev$ $Date$
*/
public class QuartzMdbContainerTest extends TestCase {
+
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName());
@@ -108,7 +116,7 @@ public class QuartzMdbContainerTest exte
public static CountDownLatch latch = new CountDownLatch(1);
- private static Stack<Lifecycle> lifecycle = new Stack<Lifecycle>();
+ private static final Stack<Lifecycle> lifecycle = new Stack<Lifecycle>();
public CronBean() {
lifecycle.push(Lifecycle.CONSTRUCTOR);
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/security/SecurityTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.core.security;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.EjbJarInfo;
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
@@ -27,6 +28,7 @@ import org.apache.openejb.config.Configu
import org.apache.openejb.core.LocalInitialContextFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
+import org.junit.AfterClass;
import javax.annotation.Resource;
import javax.annotation.security.DeclareRoles;
@@ -45,6 +47,11 @@ import java.util.Properties;
*/
public class SecurityTest extends TestCase {
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
private Assembler configureAssembler(final String defaultUser) throws Exception {
System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/DependsOnTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/DependsOnTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/DependsOnTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/DependsOnTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.core.singleton;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
@@ -31,6 +32,7 @@ import org.apache.openejb.core.ivm.namin
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.jee.StatelessBean;
+import org.junit.AfterClass;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -50,6 +52,16 @@ public class DependsOnTest extends TestC
private static final String three = "three";
private static final String four = "four";
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName());
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonCircularTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonCircularTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonCircularTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonCircularTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.core.singleton;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -26,6 +27,7 @@ import org.apache.openejb.config.Configu
import org.apache.openejb.core.ivm.naming.InitContextFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
+import org.junit.AfterClass;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -43,6 +45,11 @@ public class SingletonCircularTest exten
private static final String one = "one";
private static final String two = "two";
+ @AfterClass
+ public static void afterClass() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName());
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonContainerTest.java Tue Jul 15 10:22:39 2014
@@ -17,6 +17,7 @@
package org.apache.openejb.core.singleton;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -130,6 +131,11 @@ public class SingletonContainerTest exte
}
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
private static String join(final String delimeter, final List items) {
final StringBuilder sb = new StringBuilder();
for (final Object item : items) {
@@ -152,7 +158,7 @@ public class SingletonContainerTest exte
public static class WidgetBean implements Widget, RemoteWidget {
- private static Stack<Lifecycle> lifecycle = new Stack<Lifecycle>();
+ private static final Stack<Lifecycle> lifecycle = new Stack<Lifecycle>();
public WidgetBean() {
WidgetBean.lifecycle.push(Lifecycle.CONSTRUCTOR);
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonLazyInstantiationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonLazyInstantiationTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonLazyInstantiationTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonLazyInstantiationTest.java Tue Jul 15 10:22:39 2014
@@ -17,12 +17,13 @@
package org.apache.openejb.core.singleton;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
import org.apache.openejb.assembler.classic.SingletonSessionContainerInfo;
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.core.LocalInitialContextFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
@@ -49,7 +50,7 @@ public class SingletonLazyInstantiationT
exception.set(false);
MySingleton.instances.set(0);
- System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName());
+ System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
final ConfigurationFactory config = new ConfigurationFactory();
final Assembler assembler = new Assembler();
@@ -68,6 +69,11 @@ public class SingletonLazyInstantiationT
assembler.createApplication(config.configureApplication(ejbJar));
}
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void testSuccess() throws Exception {
final Context context = new InitialContext();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/CallbackOverridesTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/CallbackOverridesTest.java?rev=1610636&r1=1610635&r2=1610636&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/CallbackOverridesTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/test/java/org/apache/openejb/core/stateful/CallbackOverridesTest.java Tue Jul 15 10:22:39 2014
@@ -17,11 +17,12 @@
package org.apache.openejb.core.stateful;
import junit.framework.TestCase;
+import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
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.core.LocalInitialContextFactory;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatefulBean;
@@ -46,7 +47,7 @@ public class CallbackOverridesTest exten
@Override
protected void setUp() throws Exception {
- System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName());
+ System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY, LocalInitialContextFactory.class.getName());
final ConfigurationFactory config = new ConfigurationFactory();
final Assembler assembler = new Assembler();
@@ -60,6 +61,11 @@ public class CallbackOverridesTest exten
assembler.createApplication(config.configureApplication(ejbJar));
}
+ @Override
+ protected void tearDown() throws Exception {
+ OpenEJB.destroy();
+ }
+
public void test() throws Exception {
final InitialContext context = new InitialContext();