You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/08/27 18:37:09 UTC

svn commit: r990204 - in /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: config/annotation/ config/element/ config/impl/digester/ config/impl/digester/elements/ webapp/

Author: jakobk
Date: Fri Aug 27 16:37:09 2010
New Revision: 990204

URL: http://svn.apache.org/viewvc?rev=990204&view=rev
Log:
MYFACES-2894 Eager bean is not created at application startup

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java?rev=990204&r1=990203&r2=990204&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java Fri Aug 27 16:37:09 2010
@@ -271,6 +271,7 @@ public class AnnotationConfigurator
                     }
                     
                     mbc.setName(beanName);
+                    mbc.setEager(Boolean.toString(bean.eager()));
                     mbc.setBeanClass(clazz.getName());
                     
                     ApplicationScoped appScoped = (ApplicationScoped) clazz.getAnnotation(ApplicationScoped.class);

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java?rev=990204&r1=990203&r2=990204&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java Fri Aug 27 16:37:09 2010
@@ -69,4 +69,11 @@ public interface ManagedBean
      */
     public ValueExpression getManagedBeanScopeValueExpression(FacesContext facesContext);
     
+    /**
+     * Returns the value of the eager attribute. Default is false.
+     * @since 2.0
+     * @return
+     */
+    public String getEager();
+    
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java?rev=990204&r1=990203&r2=990204&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java Fri Aug 27 16:37:09 2010
@@ -158,6 +158,7 @@ public class DigesterFacesConfigUnmarsha
         digester.addCallMethod("faces-config/converter/property/property-extension", "addPropertyExtension", 0);
 
         digester.addObjectCreate("faces-config/managed-bean", ManagedBean.class);
+        digester.addSetProperties("faces-config/managed-bean", "eager", "eager");
         digester.addSetNext("faces-config/managed-bean", "addManagedBean");
         digester.addCallMethod("faces-config/managed-bean/description", "setDescription", 0);
         digester.addCallMethod("faces-config/managed-bean/managed-bean-name", "setName", 0);

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java?rev=990204&r1=990203&r2=990204&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java Fri Aug 27 16:37:09 2010
@@ -44,7 +44,7 @@ public class ManagedBean implements org.
     private MapEntries mapEntries;
     private ListEntries listEntries;
     private ValueExpression scopeValueExpression;
-
+    private String eager;
 
     public int getInitMode()
     {
@@ -178,5 +178,15 @@ public class ManagedBean implements org.
         }
         return scopeValueExpression;
     }
+
+    public String getEager()
+    {
+        return eager;
+    }
+    
+    public void setEager(String eager)
+    {
+        this.eager = eager;
+    }
     
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java?rev=990204&r1=990203&r2=990204&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java Fri Aug 27 16:37:09 2010
@@ -18,8 +18,10 @@
  */
 package org.apache.myfaces.webapp;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -39,8 +41,10 @@ import org.apache.myfaces.application.Ap
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
 import org.apache.myfaces.config.FacesConfigValidator;
 import org.apache.myfaces.config.FacesConfigurator;
+import org.apache.myfaces.config.ManagedBeanBuilder;
 import org.apache.myfaces.config.RuntimeConfig;
 import org.apache.myfaces.config.annotation.DefaultLifecycleProviderFactory;
+import org.apache.myfaces.config.element.ManagedBean;
 import org.apache.myfaces.context.ReleaseableExternalContext;
 import org.apache.myfaces.context.servlet.StartupFacesContextImpl;
 import org.apache.myfaces.context.servlet.StartupServletExternalContextImpl;
@@ -123,6 +127,9 @@ public abstract class AbstractFacesIniti
             if (log.isLoggable(Level.INFO)) {
                 log.info("ServletContext '" + servletContext.getRealPath("/") + "' initialized.");
             }
+            
+            // initialize eager managed beans
+            _createEagerBeans(facesContext);
 
             _dispatchApplicationEvent(servletContext, PostConstructApplicationEvent.class);
             
@@ -135,7 +142,7 @@ public abstract class AbstractFacesIniti
             // print out a very prominent log message if the project stage is != Production
             if (!facesContext.isProjectStage(ProjectStage.Production))
             {
-                ProjectStage projectStage = FacesContext.getCurrentInstance().getApplication().getProjectStage();
+                ProjectStage projectStage = facesContext.getApplication().getProjectStage();
                 StringBuilder message = new StringBuilder("\n\n");
                 message.append("*******************************************************************\n");
                 message.append("*** WARNING: Apache MyFaces-2 is running in ");
@@ -168,6 +175,57 @@ public abstract class AbstractFacesIniti
                       + ex.getMessage(), ex);
         }
     }
+    
+    /**
+     * Checks for application scoped managed-beans with eager=true,
+     * creates them and stores them in the application map.
+     * @param externalContext
+     */
+    private void _createEagerBeans(FacesContext facesContext)
+    {
+        ExternalContext externalContext = facesContext.getExternalContext();
+        RuntimeConfig runtimeConfig = RuntimeConfig.getCurrentInstance(externalContext);
+        List<ManagedBean> eagerBeans = new ArrayList<ManagedBean>();
+        
+        // check all registered managed-beans
+        for (ManagedBean bean : runtimeConfig.getManagedBeans().values())
+        {
+            String eager = bean.getEager();
+            if (eager != null && "true".equals(eager))
+            {
+                // eager beans are only allowed for application scope
+                if (ManagedBeanBuilder.APPLICATION.equals(bean.getManagedBeanScope()))
+                {
+                    // add to eager beans
+                    eagerBeans.add(bean);
+                }
+                else
+                {
+                    // log warning and continue (the bean will be lazy loaded)
+                    log.log(Level.WARNING, "The managed-bean with name "
+                            + bean.getManagedBeanName()
+                            + " must be application scoped to support eager=true.");
+                }
+            }
+        }
+        
+        // check if there are any eager beans
+        if (!eagerBeans.isEmpty())
+        {
+            ManagedBeanBuilder managedBeanBuilder = new ManagedBeanBuilder();
+            Map<String, Object> applicationMap = externalContext.getApplicationMap();
+            
+            for (ManagedBean bean : eagerBeans)
+            {
+                // create instance
+                Object beanInstance = managedBeanBuilder
+                        .buildManagedBean(facesContext, bean);
+                
+                // put in application scope
+                applicationMap.put(bean.getManagedBeanName(), beanInstance);
+            }
+        }
+    }
 
     /**
      * Eventually we can use our plugin infrastructure for this as well