svn commit: r1025956 - in /myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml: WebXml.java WebXmlImpl.java

[ja...@apache.org]

Author: jakobk
Date: Thu Oct 21 11:23:53 2010
New Revision: 1025956

URL: http://svn.apache.org/viewvc?rev=1025956&view=rev
Log:
MYFACES-2944 Make those add*** methods public in WebXml (provide isFacesServlet() and isFacesExtensionsFilter() methods in WebXml)

Modified:
    myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
    myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlImpl.java

Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java?rev=1025956&r1=1025955&r2=1025956&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java Thu Oct 21 11:23:53 2010
@@ -21,6 +21,7 @@ package org.apache.myfaces.shared.webapp
 import org.apache.myfaces.shared.spi.WebXmlProviderFactory;
 
 import javax.faces.context.ExternalContext;
+import javax.faces.webapp.FacesServlet;
 import java.util.List;
 import java.util.logging.Logger;
 
@@ -106,6 +107,34 @@ public abstract class WebXml
     public abstract boolean isErrorPagePresent();
 
     /**
+     * Returns true if the given servlet class is a valid FacesServlet.
+     * This is the FacesServlet itself or any DelegatedFacesServlet. 
+     *
+     * @param servletClass
+     * @return
+     */
+    protected boolean isFacesServlet(Class<?> servletClass)
+    {
+        return FacesServlet.class.isAssignableFrom(servletClass)
+                || DelegatedFacesServlet.class.isAssignableFrom(servletClass)
+                || servletClass.getName().equals(getDelegateFacesServlet());
+    }
+
+    /**
+     * Returns true if the given filter class is the MyFaces ExtensionsFilter.
+     * 
+     * @param filterClass
+     * @return
+     */
+    protected boolean isFacesExtensionsFilter(Class<?> filterClass)
+    {
+        String filterClassName = filterClass.getName();
+
+        return "org.apache.myfaces.component.html.util.ExtensionsFilter".equals(filterClassName)
+                || "org.apache.myfaces.webapp.filter.ExtensionsFilter".equals(filterClassName);
+    }
+
+    /**
      * Returns true if this WebXml instance is old, which means a new instance
      * should be created by the related provider.
      * May be overridden by custom WebXml implementations.

Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlImpl.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlImpl.java?rev=1025956&r1=1025955&r2=1025956&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlImpl.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlImpl.java Thu Oct 21 11:23:53 2010
@@ -18,7 +18,6 @@
  */
 package org.apache.myfaces.shared.webapp.webxml;
 
-import javax.faces.webapp.FacesServlet;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -68,9 +67,7 @@ public class WebXmlImpl extends WebXml
                 continue;
             }
             Class servletClass = org.apache.myfaces.shared.util.ClassUtils.simpleClassForName((String)entry.getValue());
-            if (FacesServlet.class.isAssignableFrom(servletClass) ||
-                    DelegatedFacesServlet.class.isAssignableFrom(servletClass) ||
-                    servletClass.getName().equals(getDelegateFacesServlet()))
+            if (isFacesServlet(servletClass))
             {
                 List urlPatterns = (List)_servletMappings.get(servletName);
                 if( urlPatterns != null )
@@ -113,15 +110,14 @@ public class WebXmlImpl extends WebXml
             Map.Entry entry = (Map.Entry)it.next();
             String filterName = (String)entry.getKey();
             String filterClassName = (String)entry.getValue();
+            Class filterClass = org.apache.myfaces.shared.util.ClassUtils.simpleClassForName(filterClassName);
 
-            if (!"org.apache.myfaces.component.html.util.ExtensionsFilter".equals(filterClassName) &&
-                !"org.apache.myfaces.webapp.filter.ExtensionsFilter".equals(filterClassName))
+            if (!isFacesExtensionsFilter(filterClass))
             {
                 // not an extensions filter
                 continue;
             }
 
-            Class filterClass = org.apache.myfaces.shared.util.ClassUtils.simpleClassForName(filterClassName);
             List urlPatterns = (List)_filterMappings.get(filterName);
             if( urlPatterns != null )
             {