[jboss-cvs] JBossAS SVN: r106506 - in projects/jboss-jsf-int/trunk/jsf-deployer/src/main: resources/META-INF and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: stan.silvert at jboss.com
Date: 2010-07-08 09:58:27 -0400 (Thu, 08 Jul 2010)
New Revision: 106506

Modified:
   projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFImplManagementDeployer.java
   projects/jboss-jsf-int/trunk/jsf-deployer/src/main/resources/META-INF/jsf-integration-deployer-jboss-beans.xml
Log:
JBCTS-1012 Added option to alwaysAddJSF if you want to add JSF to every WAR no matter what.


Modified: projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFImplManagementDeployer.java
===================================================================
--- projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFImplManagementDeployer.java	2010-07-08 13:26:07 UTC (rev 106505)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/java/org/jboss/jsf/deployer/JSFImplManagementDeployer.java	2010-07-08 13:58:27 UTC (rev 106506)
@@ -67,6 +67,7 @@
     private String defaultJSFConfiguration;
     private Map<String,URL> jsfConfigurations;
     private boolean jsfDisabled = false;
+    private boolean alwaysAddJSF = false;
 
     private Map<String, JSFImplMetaData> jsfImplMetatData = new HashMap<String, JSFImplMetaData>();
 
@@ -110,6 +111,16 @@
     }
 
     /**
+     * Should we add JSF to every WAR no matter what?
+     * 
+     * @param alwaysAddJSF Tells if we should always add JSF to a WAR.
+     */
+    public void setAlwaysAddJSF(boolean alwaysAddJSF)
+    {
+       this.alwaysAddJSF = alwaysAddJSF;
+    }
+
+    /**
      * Set the collection of servlets that signal this deployer to add JSF to a
      * WAR.
      *
@@ -121,11 +132,23 @@
         this.facesServlets = Collections.unmodifiableCollection(facesServlets);
     }
 
+    /**
+     * Set the default JSF Configuration.
+     *
+     * @param defaultJSFConfig The name of the default JSF Configuration.
+     */
     public void setDefaultJSFConfig(String defaultJSFConfig)
     {
         this.defaultJSFConfiguration = defaultJSFConfig;
     }
 
+    /**
+     *  Set the Map<ConfigName, URL> of all JSF Configurations.
+     *
+     * @param jsfConfigs The Map of all JSF Configurations.
+     *
+     * @throws MalformedURLException
+     */
     public void setJsfConfigurations(Map<String, String> jsfConfigs) throws MalformedURLException
     {
         this.jsfConfigurations = new HashMap<String, URL>(jsfConfigs.size());
@@ -137,14 +160,23 @@
        }
     }
 
-    public JSFImplMetaData getJSFImpl(String implName)
+    /**
+     * Get JSF MetaData for a JSF Coniguration.
+     *
+     * @param configName
+     *
+     * @return The JSF MetaData
+     */
+    public JSFImplMetaData getJSFImpl(String configName)
     {
-       return jsfImplMetatData.get(implName);
+       return jsfImplMetatData.get(configName);
     }
 
     private boolean isJSFDeployment(VFSDeploymentUnit unit, WebMetaData metaData) throws DeploymentException
     {
        return
+          alwaysAddJSF ||
+
           (getContextParam(JSF_CONFIG_PARAM, metaData) != null) ||
 
           (getContextParam(JSF_CONFIG_FILES_PARAM, metaData) != null) ||

Modified: projects/jboss-jsf-int/trunk/jsf-deployer/src/main/resources/META-INF/jsf-integration-deployer-jboss-beans.xml
===================================================================
--- projects/jboss-jsf-int/trunk/jsf-deployer/src/main/resources/META-INF/jsf-integration-deployer-jboss-beans.xml	2010-07-08 13:26:07 UTC (rev 106505)
+++ projects/jboss-jsf-int/trunk/jsf-deployer/src/main/resources/META-INF/jsf-integration-deployer-jboss-beans.xml	2010-07-08 13:58:27 UTC (rev 106506)
@@ -8,6 +8,11 @@
   <bean name="JSFImplManagementDeployer" class="org.jboss.jsf.deployer.JSFImplManagementDeployer">
     
     <!--
+      * Specify if JSF should be automatically added to every WAR.
+    -->
+    <property name="alwaysAddJSF">false</property>
+
+    <!--
       * Specify the servlet classes that signal this deployer to add JSF to a WAR. 
     -->
     <property name="facesServlets">