You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2010/04/08 16:57:40 UTC
svn commit: r931963 - in /openwebbeans/trunk:
webbeans-impl/src/main/java/org/apache/webbeans/container/
webbeans-porting/src/main/java/org/apache/webbeans/test/tck/
Author: gerdogdu
Date: Thu Apr 8 14:57:39 2010
New Revision: 931963
URL: http://svn.apache.org/viewvc?rev=931963&view=rev
Log:
[OWB-347] Using InjectableBeanManager in TCK
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java?rev=931963&r1=931962&r2=931963&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java Thu Apr 8 14:57:39 2010
@@ -76,7 +76,7 @@ public class InjectableBeanManager imple
@Override
public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type)
{
- return createInjectionTarget(type);
+ return bm.createInjectionTarget(type);
}
@Override
Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java?rev=931963&r1=931962&r2=931963&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java (original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java Thu Apr 8 14:57:39 2010
@@ -15,19 +15,28 @@ package org.apache.webbeans.test.tck;
import javax.enterprise.inject.spi.BeanManager;
-import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.container.InjectableBeanManager;
import org.apache.webbeans.exception.inject.DefinitionException;
import org.jboss.jsr299.tck.spi.Managers;
import org.jboss.testharness.api.DeploymentException;
public class ManagersImpl implements Managers
{
-
+ private static InjectableBeanManager beanManager;
+
+ public static void cleanUp()
+ {
+ beanManager = null;
+ }
+
public BeanManager getManager()
{
- BeanManagerImpl impl = BeanManagerImpl.getManager();
+ if(beanManager == null)
+ {
+ beanManager = new InjectableBeanManager();
+ }
- return impl;
+ return beanManager;
}
public boolean isDefinitionError(DeploymentException deploymentException)
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=931963&r1=931962&r2=931963&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 Thu Apr 8 14:57:39 2010
@@ -141,8 +141,15 @@ public class StandaloneContainersImpl im
public void undeploy()
{
- this.lifeCycle.stopApplication(null);
- this.lifeCycle = null;
+ try
+ {
+ this.lifeCycle.stopApplication(null);
+ this.lifeCycle = null;
+ }
+ finally
+ {
+ ManagersImpl.cleanUp();
+ }
}
public DeploymentException getDeploymentException()
Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java?rev=931963&r1=931962&r2=931963&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java (original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java Thu Apr 8 14:57:39 2010
@@ -140,6 +140,7 @@ public class TomcatConnector extends Abs
finally
{
get.releaseConnection();
+ ManagersImpl.cleanUp();
}
}