svn commit: r1588676 - /tomee/tomee/trunk/container/openejb-junit/src/main/java/org/apache/openejb/junit/jee/EJBContainerRunner.java

[rmannibucau]

Author: rmannibucau
Date: Sat Apr 19 17:07:07 2014
New Revision: 1588676

URL: http://svn.apache.org/r1588676
Log:
some formatting + removing this ugly logging block which breaks logging

Modified:
    
tomee/tomee/trunk/container/openejb-junit/src/main/java/org/apache/openejb/junit/jee/EJBContainerRunner.java

Modified: 
tomee/tomee/trunk/container/openejb-junit/src/main/java/org/apache/openejb/junit/jee/EJBContainerRunner.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-junit/src/main/java/org/apache/openejb/junit/jee/EJBContainerRunner.java?rev=1588676&r1=1588675&r2=1588676&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-junit/src/main/java/org/apache/openejb/junit/jee/EJBContainerRunner.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-junit/src/main/java/org/apache/openejb/junit/jee/EJBContainerRunner.java
 Sat Apr 19 17:07:07 2014
@@ -16,18 +16,6 @@
  */
 package org.apache.openejb.junit.jee;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.ConsoleHandler;
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
 import org.apache.openejb.OpenEJB;
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.OpenEjbContainer;
@@ -36,9 +24,7 @@ import org.apache.openejb.junit.jee.conf
 import org.apache.openejb.junit.jee.config.PropertyFile;
 import org.apache.openejb.junit.jee.resources.TestResource;
 import org.apache.openejb.junit.jee.transaction.TransactionRule;
-import org.apache.openejb.log.SingleLineFormatter;
 import org.apache.openejb.osgi.client.LocalInitialContextFactory;
-import org.apache.openejb.util.JuliLogStreamFactory;
 import org.junit.Rule;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
@@ -47,17 +33,19 @@ import org.junit.runners.model.Framework
 import org.junit.runners.model.InitializationError;
 import org.junit.runners.model.Statement;
 
-public class EJBContainerRunner extends BlockJUnit4ClassRunner {
-    static { // logging conf
-        if (!System.getProperties().containsKey("java.util.logging.manager")) {
-            System.setProperty("java.util.logging.manager", 
JuliLogStreamFactory.OpenEJBLogManager.class.getName());
-            java.util.logging.Logger logger = 
java.util.logging.Logger.getLogger("net");
-            logger.setUseParentHandlers(false);
-            logger.addHandler(new ConsoleHandler());
-            logger.getHandlers()[0].setFormatter(new SingleLineFormatter());
-        }
-    }
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
 
+public class EJBContainerRunner extends BlockJUnit4ClassRunner {
     private java.util.Properties properties;
     private EJBContainer container;
 
@@ -66,15 +54,13 @@ public class EJBContainerRunner extends 
     }
 
     @Override
-    protected Statement withBeforeClasses(Statement statement) {
-        final Statement superStatement = super.withBeforeClasses(statement);
-        return new StartingStatement(superStatement);
+    protected Statement withBeforeClasses(final Statement statement) {
+        return new StartingStatement(super.withBeforeClasses(statement));
     }
 
     @Override
-    protected Statement withAfterClasses(Statement statement) {
-        final Statement superStatement = super.withAfterClasses(statement);
-        return new ShutingDownStatement(superStatement);
+    protected Statement withAfterClasses(final Statement statement) {
+        return new ShutingDownStatement(super.withAfterClasses(statement));
     }
 
     @Override
@@ -85,7 +71,7 @@ public class EJBContainerRunner extends 
     }
 
     @Override
-    protected List<TestRule> getTestRules(Object target) {
+    protected List<TestRule> getTestRules(final Object target) {
         final List<TestRule> rules = new ArrayList<TestRule>();
         rules.add(new InjectRule(target));
         rules.add(new TransactionRule());