Author: struberg
Date: Mon Jul 26 12:58:01 2010
New Revision: 979264
URL: http://svn.apache.org/viewvc?rev=979264&view=rev
Log:
OWB-426 partially revert the old 'fix' + fix checkstyle issues
Modified:
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/EjbPlugin.java
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
Modified:
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/EjbPlugin.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/EjbPlugin.java?rev=979264&r1=979263&r2=979264&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/EjbPlugin.java
(original)
+++
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/EjbPlugin.java
Mon Jul 26 12:58:01 2010
@@ -101,10 +101,6 @@ public class EjbPlugin extends AbstractO
private static final SecurityService SECURITY_SERVICE = new
OpenEJBSecurityService();
private final Map<String, JndiNameStrategy> nameStrategies = new
TreeMap<String, JndiNameStrategy>();
-
- //This is here for standalone tests are correctly run
- //Not used in anywhere
- public static boolean CONFIGURED_FOR_USED_IN_TEST = false;
public EjbPlugin()
{
@@ -300,12 +296,9 @@ public class EjbPlugin extends AbstractO
public boolean isSessionBean(Class<?> clazz)
{
- //This is used in tests, because in reality containerSystem is not null
- if (this.containerSystem == null || CONFIGURED_FOR_USED_IN_TEST)
+ //This is used in tests, because in reality containerSystem is not null
+ if (this.containerSystem == null)
{
- //Used for tests
- CONFIGURED_FOR_USED_IN_TEST = false;
-
this.containerSystem =
SystemInstance.get().getComponent(ContainerSystem.class);
Container[] containers = this.containerSystem.containers();
for (Container container : containers)
Modified:
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java?rev=979264&r1=979263&r2=979264&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
(original)
+++
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
Mon Jul 26 12:58:01 2010
@@ -47,7 +47,6 @@ import org.apache.openejb.jee.StatefulBe
import org.apache.openejb.jee.StatelessBean;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.corespi.ServiceLoader;
-import org.apache.webbeans.ejb.EjbPlugin;
import org.apache.webbeans.lifecycle.StandaloneLifeCycle;
import org.apache.webbeans.spi.ScannerService;
import org.apache.webbeans.test.tck.mock.TCKMetaDataDiscoveryImpl;
@@ -153,7 +152,7 @@ public class StandaloneContainersImpl im
this.lifeCycle.stopApplication(null);
this.lifeCycle = null;
- EjbPlugin.CONFIGURED_FOR_USED_IN_TEST = false;
+ //X TODO solve in a different way!
EjbPlugin.CONFIGURED_FOR_USED_IN_TEST = false;
}
finally
{
@@ -212,7 +211,7 @@ public class StandaloneContainersImpl im
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY,
InitContextFactory.class.getName());
new InitialContext(properties);
- EjbPlugin.CONFIGURED_FOR_USED_IN_TEST = true;
+ //X TODO solve in a different way!
EjbPlugin.CONFIGURED_FOR_USED_IN_TEST = true;
}
catch(Exception e)
{
