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 2009/10/17 00:19:43 UTC
svn commit: r826113 - in
/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
component/ container/ context/ intercept/ lifecycle/
Author: gerdogdu
Date: Fri Oct 16 22:19:43 2009
New Revision: 826113
URL: http://svn.apache.org/viewvc?rev=826113&view=rev
Log:
Update while running TCK.
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.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/context/AbstractContext.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java?rev=826113&r1=826112&r2=826113&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractBean.java Fri Oct 16 22:19:43 2009
@@ -447,11 +447,6 @@
CreationalContextImpl<T> cc = (CreationalContextImpl<T>)this.creationalContext;
- if(cc == null)
- {
- System.out.println(this);
- }
-
//Put this into the dependent map
cc.addDependent(dependentComponent, object);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java?rev=826113&r1=826112&r2=826113&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java Fri Oct 16 22:19:43 2009
@@ -118,6 +118,12 @@
beforeConstructor();
T instance = createComponentInstance(creationalContext);
+
+ //Push instance into the creational context
+ if(WebBeansUtil.isScopeTypeNormal(getScope()))
+ {
+ this.creationalContext.push(instance);
+ }
afterConstructor(instance, creationalContext);
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=826113&r1=826112&r2=826113&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 Oct 16 22:19:43 2009
@@ -614,7 +614,8 @@
if(instance == null)
{
- instance = getReference(bean, injectionPoint.getType(), context);
+ //Creating a new creational context for target bean instance
+ instance = getReference(bean, injectionPoint.getType(), createCreationalContext(bean));
}
return instance;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=826113&r1=826112&r2=826113&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Fri Oct 16 22:19:43 2009
@@ -29,7 +29,6 @@
import javax.enterprise.context.spi.Context;
import javax.enterprise.context.spi.Contextual;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
import org.apache.webbeans.context.type.ContextTypes;
@@ -216,7 +215,7 @@
CreationalContext<Object> cc = (CreationalContext<Object>)this.creationalContextMap.get(component);
//Destroy instance
- destroyInstance((Bean<Object>) component, instance, cc);
+ destroyInstance((Contextual<Object>) component, instance, cc);
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java?rev=826113&r1=826112&r2=826113&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java Fri Oct 16 22:19:43 2009
@@ -221,6 +221,7 @@
currentMethod++;
Object t = intc.getInterceptorInstance();
+
if (t == null)
{
t = target;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java?rev=826113&r1=826112&r2=826113&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java Fri Oct 16 22:19:43 2009
@@ -131,6 +131,10 @@
public void applicationStarted(ServletContextEvent event)
{
+ // Initalize Application Context
+ logger.info("Initializing of the application context");
+ ContextFactory.initApplicationContext(event.getServletContext());
+
this.discovery = ServiceLoader.getService(MetaDataDiscoveryService.class);
this.discovery.init(event.getServletContext());
@@ -158,13 +162,6 @@
logger.info("Deploying is ended");
- long end = System.currentTimeMillis();
- logger.info("Dependency injection container configuration is ended, takes " + Long.toString(end - begin) + " ms.");
-
- // Initalize Application Context
- logger.info("Initializing of the application context");
- ContextFactory.initApplicationContext(event.getServletContext());
-
ServletContext context = event.getServletContext();
try
@@ -186,7 +183,8 @@
throw new WebBeansException(e);
}
- logger.info("Dependency injection container is started for context path : " + event.getServletContext().getContextPath());
+ long end = System.currentTimeMillis();
+ logger.info("Dependency injection container configuration is ended, takes " + Long.toString(end - begin) + " ms.");
}
public void applicationEnded(ServletContextEvent event)
@@ -206,12 +204,12 @@
//Clear extensions
ExtensionLoader.getInstance().clear();
- //Clear singleton list
- WebBeansFinder.clearInstances();
-
//Clear CreationalContext
CreationalContextFactory.getInstance().clear();
-
+
+ //Clear singleton list
+ WebBeansFinder.clearInstances();
+
logger.info("Dependency injection container is stopped for context path : " + event.getServletContext().getContextPath());
}