You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/07/21 01:09:37 UTC
svn commit: r1148970 - in /myfaces/extensions/cdi/trunk/core: api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/ api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/ api/src/test/java/org/apache/myfaces/extensions/c...

Author: gpetracek
Date: Wed Jul 20 23:09:36 2011
New Revision: 1148970

URL: http://svn.apache.org/viewvc?rev=1148970&view=rev
Log:
EXTCDI-198 and EXTCDI-209 cleanup

Added:
    myfaces/extensions/cdi/trunk/core/impl/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/
      - copied from r1146737, myfaces/extensions/cdi/trunk/core/api/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/
    myfaces/extensions/cdi/trunk/core/impl/src/test/resources/META-INF/services/org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStageHolder
      - copied unchanged from r1146737, myfaces/extensions/cdi/trunk/core/api/src/test/resources/META-INF/services/org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStageHolder
Removed:
    myfaces/extensions/cdi/trunk/core/api/src/test/java/org/apache/myfaces/extensions/cdi/core/test/api/
    myfaces/extensions/cdi/trunk/core/api/src/test/resources/META-INF/services/org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStageHolder
Modified:
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/ServiceProviderContext.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/ServiceProvider.java
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/ServiceProviderContext.java

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/ServiceProviderContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/ServiceProviderContext.java?rev=1148970&r1=1148969&r2=1148970&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/ServiceProviderContext.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/provider/ServiceProviderContext.java Wed Jul 20 23:09:36 2011
@@ -28,7 +28,7 @@ public abstract class ServiceProviderCon
 {
     public abstract ClassLoader getClassLoader();
 
-    public abstract T postConstruct(T instance, boolean containerBootstrapped);
+    public abstract T postConstruct(T instance, boolean deploymentFinished);
 
     public abstract boolean filterService(Class<T> serviceClass);
 

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java?rev=1148970&r1=1148969&r2=1148970&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java Wed Jul 20 23:09:36 2011
@@ -86,7 +86,7 @@ public abstract class CodiStartupBroadca
 
                     @Override
                     public StartupEventBroadcaster postConstruct(
-                            StartupEventBroadcaster instance, boolean containerBootstrapped)
+                            StartupEventBroadcaster instance, boolean deploymentFinished)
                     {
                         //do nothing
                         return instance;

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/ServiceProvider.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/ServiceProvider.java?rev=1148970&r1=1148969&r2=1148970&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/ServiceProvider.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/ServiceProvider.java Wed Jul 20 23:09:36 2011
@@ -44,7 +44,7 @@ import java.util.logging.Logger;
 public class ServiceProvider<T> extends org.apache.myfaces.extensions.cdi.core.api.provider.ServiceProvider<T>
 {
     protected List<Class<?>> foundServiceClasses = new ArrayList<Class<?>>();
-    private static Map<ClassLoader, Boolean> allowInjection = new ConcurrentHashMap<ClassLoader, Boolean>();
+    private static Map<ClassLoader, Boolean> deploymentFinished = new ConcurrentHashMap<ClassLoader, Boolean>();
     private static Map<Class<?>, List<Class<?>>> serviceCache = new ConcurrentHashMap<Class<?>, List<Class<?>>>();
 
     protected ServiceProvider(Class<T> serviceType, ServiceProviderContext serviceProviderContext)
@@ -91,7 +91,7 @@ public class ServiceProvider<T> extends 
 
     protected void activateInjectionSupport(@Observes AfterDeploymentValidation afterDeploymentValidation)
     {
-        allowInjection.put(ClassUtils.getClassLoader(null), Boolean.TRUE);
+        deploymentFinished.put(ClassUtils.getClassLoader(null), Boolean.TRUE);
     }
 
     private List<URL> getConfigFileList()
@@ -254,7 +254,7 @@ public class ServiceProvider<T> extends 
             constructor.setAccessible(true);
             T instance = (T)constructor.newInstance();
 
-            this.serviceProviderContext.postConstruct(instance, isInjectionAllowed());
+            this.serviceProviderContext.postConstruct(instance, isDeploymentFinished());
 
             return instance;
         }
@@ -264,9 +264,9 @@ public class ServiceProvider<T> extends 
         }
     }
 
-    private boolean isInjectionAllowed()
+    private boolean isDeploymentFinished()
     {
-        return Boolean.TRUE.equals(allowInjection.get(ClassUtils.getClassLoader(null)));
+        return Boolean.TRUE.equals(deploymentFinished.get(ClassUtils.getClassLoader(null)));
     }
 
     protected void reset()

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/ServiceProviderContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/ServiceProviderContext.java?rev=1148970&r1=1148969&r2=1148970&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/ServiceProviderContext.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/ServiceProviderContext.java Wed Jul 20 23:09:36 2011
@@ -39,9 +39,9 @@ public class ServiceProviderContext<T>
     }
 
     @Override
-    public T postConstruct(T instance, boolean containerBootstrapped)
+    public T postConstruct(T instance, boolean deploymentFinished)
     {
-        if(containerBootstrapped)
+        if(deploymentFinished)
         {
             CodiUtils.injectFields(instance, true);
         }