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 2013/01/10 10:50:20 UTC
svn commit: r1431237 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
component/ component/creation/ util/
Author: struberg
Date: Thu Jan 10 09:50:20 2013
New Revision: 1431237
URL: http://svn.apache.org/viewvc?rev=1431237&view=rev
Log:
OWB-344 last part of the WebBeansContext cleanup in beans
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java?rev=1431237&r1=1431236&r2=1431237&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ExtensionBean.java Thu Jan 10 09:50:20 2013
@@ -39,7 +39,7 @@ public class ExtensionBean<T> extends Ab
* @param returnType return type
* @param webBeansContext
*/
- public ExtensionBean(Class<T> returnType, WebBeansContext webBeansContext)
+ public ExtensionBean(WebBeansContext webBeansContext, Class<T> returnType)
{
super(webBeansContext, WebBeansType.EXTENSION, returnType, webBeansContext.getAnnotatedElementFactory().newAnnotatedType(returnType));
setEnabled(true);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java?rev=1431237&r1=1431236&r2=1431237&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionPointBean.java Thu Jan 10 09:50:20 2013
@@ -30,6 +30,17 @@ public class InjectionPointBean extends
{
private static ThreadLocal<Stack<InjectionPoint>> localThreadlocalStack = new ThreadLocal<Stack<InjectionPoint>>();
+ public InjectionPointBean(WebBeansContext webBeansContext)
+ {
+ super(webBeansContext, WebBeansType.INJECTIONPOINT,InjectionPoint.class);
+
+ addQualifier(new DefaultLiteral());
+ setImplScopeType(Dependent.class);
+ addApiType(InjectionPoint.class);
+ addApiType(Object.class);
+ }
+
+
private static Stack<InjectionPoint> getStackOfInjectionPoints()
{
Stack<InjectionPoint> stackIP = localThreadlocalStack.get();
@@ -63,16 +74,6 @@ public class InjectionPointBean extends
localThreadlocalStack.remove();
}
- public InjectionPointBean(WebBeansContext webBeansContext)
- {
- super(webBeansContext, WebBeansType.INJECTIONPOINT,InjectionPoint.class);
-
- addQualifier(new DefaultLiteral());
- setImplScopeType(Dependent.class);
- addApiType(InjectionPoint.class);
- addApiType(Object.class);
- }
-
public static boolean isStackEmpty()
{
return getStackOfInjectionPoints().isEmpty();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java?rev=1431237&r1=1431236&r2=1431237&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java Thu Jan 10 09:50:20 2013
@@ -26,9 +26,9 @@ import org.apache.webbeans.config.WebBea
public class ExtensionBeanBuilder<T> extends AbstractInjectionTargetBeanBuilder<T>
{
- public ExtensionBeanBuilder(Class<T> type, WebBeansContext webBeansContext)
+ public ExtensionBeanBuilder(WebBeansContext webBeansContext, Class<T> type)
{
- super(new ExtensionBean<T>(type, webBeansContext), ApplicationScoped.class);
+ super(new ExtensionBean<T>(webBeansContext, type), ApplicationScoped.class);
}
/**
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java?rev=1431237&r1=1431236&r2=1431237&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/NewManagedBeanBuilder.java Thu Jan 10 09:50:20 2013
@@ -28,7 +28,7 @@ import org.apache.webbeans.config.WebBea
public class NewManagedBeanBuilder<T> extends ManagedBeanBuilder<T>
{
- public NewManagedBeanBuilder(AnnotatedType<T> annotatedType, WebBeansContext webBeansContext)
+ public NewManagedBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
{
super(new NewManagedBean<T>(webBeansContext, annotatedType.getJavaClass(), WebBeansType.MANAGED, annotatedType), Dependent.class);
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1431237&r1=1431236&r2=1431237&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Thu Jan 10 09:50:20 2013
@@ -591,7 +591,7 @@ public final class WebBeansUtil
if (webBeansContext.getWebBeansUtil().isManagedBean(clazz))
{
NewManagedBeanBuilder<T> newBeanCreator
- = new NewManagedBeanBuilder<T>(webBeansContext.getAnnotatedElementFactory().newAnnotatedType(clazz), webBeansContext);
+ = new NewManagedBeanBuilder<T>(webBeansContext, webBeansContext.getAnnotatedElementFactory().newAnnotatedType(clazz));
comp = newBeanCreator.getBean();
comp.setImplScopeType(Dependent.class);
comp.setConstructor(defineConstructor(clazz));
@@ -637,7 +637,7 @@ public final class WebBeansUtil
public <T> ExtensionBean<T> createExtensionComponent(Class<T> clazz)
{
Asserts.nullCheckForClass(clazz);
- ExtensionBeanBuilder<T> extensionBeanCreator = new ExtensionBeanBuilder<T>(clazz, webBeansContext);
+ ExtensionBeanBuilder<T> extensionBeanCreator = new ExtensionBeanBuilder<T>(webBeansContext, clazz);
extensionBeanCreator.defineObserverMethods();
return extensionBeanCreator.getBean();
}