You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/02/15 04:27:13 UTC
svn commit: r1070768 -
/geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
Author: xuhaihong
Date: Tue Feb 15 03:27:12 2011
New Revision: 1070768
URL: http://svn.apache.org/viewvc?rev=1070768&view=rev
Log:
A little improvement to avoid duplicate parsing work for JSF configuration files
Modified:
geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
Modified: geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java?rev=1070768&r1=1070767&r2=1070768&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java Tue Feb 15 03:27:12 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");