geronimo-scm mailing list archives

Author: xuhaihong
Date: Tue Feb 15 03:22:57 2011
New Revision: 1070767

URL: http://svn.apache.org/viewvc?rev=1070767&view=rev
Log:
A little improvement to avoid duplicate parsing work for JSF configuration files

Modified:
    geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java

Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java?rev=1070767&r1=1070766&r2=1070767&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
Tue Feb 15 03:22:57 2011
@@ -383,6 +383,10 @@ public class MyFacesModuleBuilderExtensi
                         if (configfile.startsWith("/")) {
                             configfile = configfile.substring(1);
                         }
+                        //faces-config.xml is a center XML for JSF, we will read it separately.
+                        if (configfile.equals("WEB-INF/faces-config.xml")) {
+                            continue;
+                        }
                         URL url = webModule.getEarContext().getTargetURL(webModule.resolve(configfile));
                         if (url == null) {
                             throw new DeploymentException("Could not locate config file "
+ configfile + " configured with " + FacesServlet.CONFIG_FILES_ATTR + " in the web.xml");