You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2009/11/21 00:44:55 UTC
svn commit: r882791 - in /incubator/openwebbeans/trunk:
webbeans-ejb/src/test/java/org/apache/webbeans/ejb/
webbeans-impl/src/main/java/org/apache/webbeans/container/
webbeans-impl/src/main/java/org/apache/webbeans/container/activity/
webbeans-impl/src...
Author: struberg
Date: Fri Nov 20 23:44:52 2009
New Revision: 882791
URL: http://svn.apache.org/viewvc?rev=882791&view=rev
Log:
OWB-150 remove ActivityManager from OWB
Activities got dropped a long time ago, so it's time to clean up the codebase.
I also fixed a few test issues with sometimes unititialised PluginLoader.
Added:
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/common/
- copied from r882508, incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/common/
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/util/
- copied from r882508, incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/util/
Removed:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/activity/ActivityManager.java
Modified:
incubator/openwebbeans/trunk/webbeans-ejb/src/test/java/org/apache/webbeans/ejb/EjbTestContext.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/common/AbstractUnitTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/common/TestContext.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/OpenWebBeansTestLifecycle.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ComponentTypeExceptionComponent.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeExceptionComponent.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/CallingBusinessInConstructorTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/util/OpenWebBeansTestLifecycle.java
incubator/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java
incubator/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
Modified: incubator/openwebbeans/trunk/webbeans-ejb/src/test/java/org/apache/webbeans/ejb/EjbTestContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-ejb/src/test/java/org/apache/webbeans/ejb/EjbTestContext.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-ejb/src/test/java/org/apache/webbeans/ejb/EjbTestContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-ejb/src/test/java/org/apache/webbeans/ejb/EjbTestContext.java Fri Nov 20 23:44:52 2009
@@ -18,7 +18,6 @@
import org.apache.openejb.OpenEJB;
import org.apache.webbeans.container.BeanManagerImpl;
-import org.apache.webbeans.container.activity.ActivityManager;
import org.apache.webbeans.ejb.component.EjbBean;
import org.apache.webbeans.plugins.PluginLoader;
@@ -27,7 +26,7 @@
protected EjbTestContext(String name)
{
- ActivityManager.getInstance().setRootActivity(new BeanManagerImpl());
+ BeanManagerImpl.getManager();
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Fri Nov 20 23:44:52 2009
@@ -66,7 +66,7 @@
import org.apache.webbeans.component.third.ThirdpartyBeanImpl;
import org.apache.webbeans.config.ManagedBeanConfigurator;
import org.apache.webbeans.config.OpenWebBeansConfiguration;
-import org.apache.webbeans.container.activity.ActivityManager;
+import org.apache.webbeans.config.WebBeansFinder;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.context.creational.CreationalContextFactory;
import org.apache.webbeans.context.creational.CreationalContextImpl;
@@ -183,9 +183,7 @@
*/
public static BeanManagerImpl getManager()
{
- ActivityManager activityManager = ActivityManager.getInstance();
-
- BeanManagerImpl currentManager = activityManager.getCurrentActivity();
+ BeanManagerImpl currentManager = (BeanManagerImpl) WebBeansFinder.getSingletonInstance(WebBeansFinder.SINGLETON_MANAGER);
return currentManager;
}
@@ -532,28 +530,7 @@
return this;
}
-
- /**
- * Set the activity for the given scope type.
- *
- * @param scopeType scope type for the context
- */
- public BeanManager setCurrent(Class<? extends Annotation> scopeType)
- {
- if(!WebBeansUtil.isScopeTypeNormal(scopeType))
- {
- throw new IllegalArgumentException("Scope type : " + scopeType.getSimpleName() + " must be normal scope type");
-
- }
-
- Context context = getContext(scopeType);
-
- ActivityManager.getInstance().addCurrentActivity(context, this);
-
- return this;
- }
-
/**
* {@inheritDoc}
*/
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Fri Nov 20 23:44:52 2009
@@ -31,7 +31,6 @@
import org.apache.webbeans.component.AbstractBean;
import org.apache.webbeans.config.OpenWebBeansConfiguration;
import org.apache.webbeans.config.WebBeansFinder;
-import org.apache.webbeans.container.activity.ActivityManager;
import org.apache.webbeans.deployment.DeploymentTypeManager;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.exception.inject.NullableDependencyException;
@@ -76,7 +75,7 @@
*/
public static InjectionResolver getInstance()
{
- InjectionResolver instance = ActivityManager.getInstance().getCurrentActivity().getInjectionResolver();
+ InjectionResolver instance = BeanManagerImpl.getManager().getInjectionResolver();
return instance;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java Fri Nov 20 23:44:52 2009
@@ -42,7 +42,6 @@
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.container.BeanManagerImpl;
-import org.apache.webbeans.container.activity.ActivityManager;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.logger.WebBeansLogger;
import org.apache.webbeans.spi.ServiceLoader;
@@ -68,7 +67,7 @@
public static NotificationManager getInstance()
{
- BeanManagerImpl manager = ActivityManager.getInstance().getCurrentActivity();
+ BeanManagerImpl manager = BeanManagerImpl.getManager();
return manager.getNotificationManager();
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Fri Nov 20 23:44:52 2009
@@ -41,7 +41,6 @@
import org.apache.webbeans.component.InjectionTargetBean;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.container.InjectionResolver;
-import org.apache.webbeans.container.activity.ActivityManager;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.logger.WebBeansLogger;
import org.apache.webbeans.util.AnnotationUtil;
@@ -161,7 +160,7 @@
try
{
- BeanManagerImpl manager = ActivityManager.getInstance().getCurrentActivity();
+ BeanManagerImpl manager = BeanManagerImpl.getManager();
specializedComponent = (AbstractBean<Object>)WebBeansUtil.getMostSpecializedBean(manager, baseComponent);
Context context = manager.getContext(specializedComponent.getScope());
@@ -233,7 +232,7 @@
List<Object> list = new ArrayList<Object>();
- BeanManagerImpl manager = ActivityManager.getInstance().getCurrentActivity();
+ BeanManagerImpl manager = BeanManagerImpl.getManager();
if (types.length > 0)
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/EnterpriseLifeCycle.java Fri Nov 20 23:44:52 2009
@@ -33,7 +33,6 @@
import org.apache.webbeans.config.BeansDeployer;
import org.apache.webbeans.config.WebBeansFinder;
import org.apache.webbeans.container.BeanManagerImpl;
-import org.apache.webbeans.container.activity.ActivityManager;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.conversation.ConversationManager;
import org.apache.webbeans.el.WebBeansELResolver;
@@ -91,7 +90,7 @@
*/
public EnterpriseLifeCycle()
{
- this.rootManager = new BeanManagerImpl();
+ this.rootManager = (BeanManagerImpl) WebBeansFinder.getSingletonInstance(WebBeansFinder.SINGLETON_MANAGER);
this.xmlDeployer = new WebBeansXMLConfigurator();
this.deployer = new BeansDeployer(xmlDeployer);
this.jndiService = ServiceLoader.getService(JNDIService.class);
@@ -102,7 +101,6 @@
public void init()
{
rootManager.setXMLConfigurator(this.xmlDeployer);
- ActivityManager.getInstance().setRootActivity(this.rootManager);
}
public void requestStarted(ServletRequestEvent event)
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java Fri Nov 20 23:44:52 2009
@@ -22,7 +22,6 @@
import org.apache.webbeans.config.BeansDeployer;
import org.apache.webbeans.config.WebBeansFinder;
import org.apache.webbeans.container.BeanManagerImpl;
-import org.apache.webbeans.container.activity.ActivityManager;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.logger.WebBeansLogger;
@@ -58,7 +57,7 @@
public StandaloneLifeCycle()
{
- this.beanManager = new BeanManagerImpl();
+ this.beanManager = BeanManagerImpl.getManager();
this.xmlConfig = new WebBeansXMLConfigurator();
this.beansDeployer = new BeansDeployer(this.xmlConfig);
@@ -85,7 +84,6 @@
}
beanManager.setXMLConfigurator(this.xmlConfig);
- ActivityManager.getInstance().setRootActivity(this.beanManager);
}
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java Fri Nov 20 23:44:52 2009
@@ -22,7 +22,6 @@
import javax.enterprise.inject.spi.ObserverMethod;
import org.apache.webbeans.container.BeanManagerImpl;
-import org.apache.webbeans.container.activity.ActivityManager;
/**
* Event that is fired by the container after it discovers beans.
@@ -38,7 +37,7 @@
public AfterBeanDiscoveryImpl()
{
- this.beanManager = ActivityManager.getInstance().getCurrentActivity();
+ this.beanManager = BeanManagerImpl.getManager();
}
/**
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/common/AbstractUnitTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/common/AbstractUnitTest.java?rev=882791&r1=882508&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/common/AbstractUnitTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/common/AbstractUnitTest.java Fri Nov 20 23:44:52 2009
@@ -13,11 +13,16 @@
*/
package org.apache.webbeans.common;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
import java.net.URL;
import java.util.Collection;
+import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
+import org.apache.webbeans.annotation.DefaultLiteral;
+import org.apache.webbeans.test.component.portable.events.MyExtension;
import org.apache.webbeans.util.OpenWebBeansTestLifecycle;
import org.apache.webbeans.util.OpenWebBeansTestMetaDataDiscoveryService;
@@ -90,4 +95,46 @@
return loader.getResource(prefix.toString());
}
+ /**
+ * Get an instance of the defined clazz
+ * @param <T>
+ * @param clazz
+ * @param qualifiers
+ * @return
+ */
+ @SuppressWarnings( "unchecked" )
+ protected <T> T getInstance(Type clazz, Annotation... qualifiers)
+ {
+ if (qualifiers.length == 0)
+ {
+ qualifiers = new Annotation[]{new DefaultLiteral()};
+ }
+
+ //X TODO improve range checks, etc
+ Bean<T> instanceBean = (Bean<T>) getBeanManager().getBeans(clazz, qualifiers).iterator().next();
+
+ T instance = (T) getBeanManager().getReference(instanceBean, clazz, getBeanManager().createCreationalContext(instanceBean));
+
+ return instance;
+ }
+
+ /**
+ * Get an instance of the defined clazz
+ * @param <T>
+ * @param clazz
+ * @param qualifiers
+ * @return
+ */
+ @SuppressWarnings( "unchecked" )
+ protected <T> T getInstanceByName(Class<T> clazz, String elName)
+ {
+ //X TODO improve range checks, etc
+ Bean<T> instanceBean = (Bean<T>) getBeanManager().getBeans(elName).iterator().next();
+
+ T instance = (T) getBeanManager().getReference(instanceBean, clazz, getBeanManager().createCreationalContext(instanceBean));
+
+ return instance;
+ }
+
+
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/common/TestContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/common/TestContext.java?rev=882791&r1=882508&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/common/TestContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/common/TestContext.java Fri Nov 20 23:44:52 2009
@@ -130,6 +130,8 @@
*/
public void init()
{
+ manager.clear();
+ PluginLoader.getInstance().startUp();
initDefaultDeploymentTypes();
initInterceptors();
initDecorators();
@@ -467,7 +469,7 @@
protected void clear()
{
this.manager.clear();
-
+ PluginLoader.getInstance().startUp();
}
/**
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/OpenWebBeansTestLifecycle.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/OpenWebBeansTestLifecycle.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/OpenWebBeansTestLifecycle.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/OpenWebBeansTestLifecycle.java Fri Nov 20 23:44:52 2009
@@ -13,7 +13,6 @@
*/
package org.apache.webbeans.test;
-import org.apache.webbeans.container.activity.ActivityManager;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.lifecycle.StandaloneLifeCycle;
@@ -50,8 +49,6 @@
this.discoveryService = new OpenWebBeansTestMetaDataDiscoveryService();
this.beanManager.setXMLConfigurator(this.xmlConfig);
- ActivityManager.getInstance().setRootActivity(this.beanManager);
-
}
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java Fri Nov 20 23:44:52 2009
@@ -130,6 +130,9 @@
*/
public void init()
{
+ manager.clear();
+ PluginLoader.getInstance().startUp();
+
initDefaultDeploymentTypes();
initInterceptors();
initDecorators();
@@ -467,7 +470,7 @@
protected void clear()
{
this.manager.clear();
-
+ PluginLoader.getInstance().startUp();
}
/**
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ComponentTypeExceptionComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ComponentTypeExceptionComponent.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ComponentTypeExceptionComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ComponentTypeExceptionComponent.java Fri Nov 20 23:44:52 2009
@@ -18,6 +18,8 @@
@Production
@Standard
+@Deprecated
+/** DeploymentTypes have been removed from the spec*/
public class ComponentTypeExceptionComponent
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeExceptionComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeExceptionComponent.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeExceptionComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/ProducerTypeExceptionComponent.java Fri Nov 20 23:44:52 2009
@@ -19,6 +19,7 @@
import org.apache.webbeans.annotation.deployment.Standard;
@Production
+@Deprecated //X DeploymentTypes got dropped from the spec!
public class ProducerTypeExceptionComponent
{
@Produces
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java Fri Nov 20 23:44:52 2009
@@ -37,8 +37,8 @@
import javax.enterprise.util.TypeLiteral;
import org.apache.webbeans.component.AbstractBean;
+import org.apache.webbeans.config.WebBeansFinder;
import org.apache.webbeans.container.BeanManagerImpl;
-import org.apache.webbeans.container.activity.ActivityManager;
import org.apache.webbeans.util.WebBeansUtil;
public class MockManager implements BeanManager
@@ -49,8 +49,8 @@
public MockManager()
{
- this.manager = new BeanManagerImpl();
- ActivityManager.getInstance().setRootActivity(this.manager);
+ WebBeansFinder.clearInstances();
+ this.manager = BeanManagerImpl.getManager();
manager.addBean(WebBeansUtil.getManagerBean());
}
@@ -59,9 +59,9 @@
{
componentList.clear();
- this.manager = new BeanManagerImpl();
-
- ActivityManager.getInstance().setRootActivity(this.manager);
+ WebBeansFinder.clearInstances();
+
+ this.manager = BeanManagerImpl.getManager();
}
public List<AbstractBean<?>> getComponents()
@@ -174,12 +174,6 @@
return manager;
}
- public BeanManager setCurrent(Class<? extends Annotation> scopeType)
- {
- return manager.setCurrent(scopeType);
- }
-
-
@Override
public <T> AnnotatedType<T> createAnnotatedType(Class<T> type)
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java Fri Nov 20 23:44:52 2009
@@ -73,7 +73,8 @@
}
- @Test
+ //X @Test DeploymentTypes have been removed from the spec
+ @Deprecated
public void testComponentTypeException()
{
try
@@ -94,7 +95,8 @@
Assert.fail("expecting an exception!");
}
- @Test
+ //X @Test
+ @Deprecated /** DeploymentTypes got dropped from the spec! */
public void testProducerMethodComponentTypeException()
{
WebBeansConfigurationException exc = null;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java Fri Nov 20 23:44:52 2009
@@ -28,6 +28,7 @@
import org.apache.webbeans.test.component.inject.alternative.NotAlternativeComponent;
import org.apache.webbeans.test.unittests.xml.XMLTest;
import org.apache.webbeans.xml.WebBeansXMLConfigurator;
+import org.junit.Before;
import org.junit.Test;
public class AlternativeTest extends TestContext
@@ -37,11 +38,15 @@
super(AlternativeTest.class.getName());
}
+ @Before
+ public void setUp()
+ {
+ super.init();
+ }
+
@Test
public void testInjectAlternative()
{
- PluginLoader.getInstance().startUp();
-
InputStream stream = XMLTest.class.getClassLoader().getResourceAsStream("org/apache/webbeans/test/xml/alternative/alternatives.xml");
Assert.assertNotNull(stream);
@@ -67,8 +72,6 @@
@Test
public void testInjectNotAlternative()
{
- PluginLoader.getInstance().startUp();
-
AlternativesManager.getInstance().clear();
defineManagedBean(AlternativeComponent.class);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/CallingBusinessInConstructorTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/CallingBusinessInConstructorTest.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/CallingBusinessInConstructorTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/CallingBusinessInConstructorTest.java Fri Nov 20 23:44:52 2009
@@ -13,34 +13,34 @@
*/
package org.apache.webbeans.test.unittests.intercept.webbeans;
+import java.util.ArrayList;
+import java.util.Collection;
+
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.spi.Bean;
import junit.framework.Assert;
+import org.apache.webbeans.common.AbstractUnitTest;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.context.RequestContext;
-import org.apache.webbeans.test.TestContext;
+import org.apache.webbeans.intercept.InterceptorsManager;
import org.apache.webbeans.test.component.intercept.webbeans.CallBusinessInConstructorBean;
import org.apache.webbeans.test.component.intercept.webbeans.SecureInterceptor;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-public class CallingBusinessInConstructorTest extends TestContext
+public class CallingBusinessInConstructorTest extends AbstractUnitTest
{
public CallingBusinessInConstructorTest()
{
- super(CallingBusinessInConstructorTest.class.getName());
+ super();
}
@Before
public void init()
{
- super.init();
-
SecureInterceptor.CALL = false;
- initializeInterceptorType(SecureInterceptor.class);
}
@After
@@ -54,11 +54,16 @@
{
ContextFactory.initRequestContext(null);
- clear();
-
- defineInterceptor(SecureInterceptor.class);
- Bean<CallBusinessInConstructorBean> bean = defineManagedBean(CallBusinessInConstructorBean.class);
- CallBusinessInConstructorBean instance = (CallBusinessInConstructorBean) getInstanceByName("callBusinessInConstructorBean");
+ // interceptors must be enabled via XML. We fake this by adding our interceptor manually.
+ InterceptorsManager.getInstance().addNewInterceptor(SecureInterceptor.class);
+
+ Collection<Class<?>> classes = new ArrayList<Class<?>>();
+ classes.add(SecureInterceptor.class);
+ classes.add(CallBusinessInConstructorBean.class);
+ startContainer(classes);
+
+ CallBusinessInConstructorBean instance = (CallBusinessInConstructorBean) getInstance(CallBusinessInConstructorBean.class);
+ //getingetInstanceByName("callBusinessInConstructorBean");
Assert.assertNotNull(instance);
@@ -72,9 +77,7 @@
RequestContext ctx = (RequestContext) ContextFactory.getStandardContext(RequestScoped.class);
- Assert.assertNull(ctx.get(bean));
-
- instance = (CallBusinessInConstructorBean) getInstanceByName("callBusinessInConstructorBean");
+ instance = getInstanceByName(CallBusinessInConstructorBean.class, "callBusinessInConstructorBean");
Assert.assertNotNull(instance);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java Fri Nov 20 23:44:52 2009
@@ -20,8 +20,9 @@
import junit.framework.Assert;
+import org.apache.webbeans.common.TestContext;
import org.apache.webbeans.context.ContextFactory;
-import org.apache.webbeans.test.TestContext;
+import org.apache.webbeans.intercept.InterceptorsManager;
import org.apache.webbeans.test.component.intercept.webbeans.ShoppingCard;
import org.apache.webbeans.test.component.intercept.webbeans.TransactionalInterceptor;
import org.apache.webbeans.test.mock.MockHttpSession;
@@ -50,6 +51,10 @@
public void testTransactionalInterceptor()
{
ContextFactory.initSessionContext(new MockHttpSession());
+
+ // Interceptors must explicitly get enabled via XML. We fake this:
+ InterceptorsManager.getInstance().addNewInterceptor(TransactionalInterceptor.class);
+
defineInterceptor(TransactionalInterceptor.class);
Bean<ShoppingCard> bean = defineManagedBean(ShoppingCard.class);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/util/OpenWebBeansTestLifecycle.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/util/OpenWebBeansTestLifecycle.java?rev=882791&r1=882508&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/util/OpenWebBeansTestLifecycle.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/util/OpenWebBeansTestLifecycle.java Fri Nov 20 23:44:52 2009
@@ -13,7 +13,6 @@
*/
package org.apache.webbeans.util;
-import org.apache.webbeans.container.activity.ActivityManager;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.exception.WebBeansException;
import org.apache.webbeans.lifecycle.StandaloneLifeCycle;
@@ -50,8 +49,6 @@
this.discoveryService = new OpenWebBeansTestMetaDataDiscoveryService();
this.beanManager.setXMLConfigurator(this.xmlConfig);
- ActivityManager.getInstance().setRootActivity(this.beanManager);
-
}
@Override
Modified: incubator/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ManagersImpl.java Fri Nov 20 23:44:52 2009
@@ -16,7 +16,6 @@
import javax.enterprise.inject.spi.BeanManager;
import org.apache.webbeans.container.BeanManagerImpl;
-import org.apache.webbeans.container.activity.ActivityManager;
import org.apache.webbeans.exception.inject.DefinitionException;
import org.jboss.jsr299.tck.spi.Managers;
import org.jboss.testharness.api.DeploymentException;
@@ -26,13 +25,7 @@
public BeanManager getManager()
{
- BeanManagerImpl impl = ActivityManager.getInstance().getRootActivity();
-
- if(impl == null)
- {
- impl = new BeanManagerImpl();
- ActivityManager.getInstance().setRootActivity(impl);
- }
+ BeanManagerImpl impl = BeanManagerImpl.getManager();
return impl;
}
Modified: incubator/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java?rev=882791&r1=882790&r2=882791&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java Fri Nov 20 23:44:52 2009
@@ -19,7 +19,7 @@
import javax.enterprise.inject.spi.BeanManager;
-import org.apache.webbeans.container.activity.ActivityManager;
+import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.lifecycle.EnterpriseLifeCycle;
import org.apache.webbeans.spi.ServiceLoader;
@@ -140,7 +140,7 @@
protected BeanManager getBeanManager()
{
- return ActivityManager.getInstance().getRootActivity();
+ return BeanManagerImpl.getManager();
}