myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmarinsc...@apache.org
Subject svn commit: r278954 - in /myfaces/share/trunk/src/java/org/apache/myfaces/webapp/webxml: DelegatedFacesServlet.java WebXml.java
Date Tue, 06 Sep 2005 09:20:55 GMT
Author: mmarinschek
Date: Tue Sep  6 02:20:50 2005
New Revision: 278954

URL: http://svn.apache.org/viewcvs?rev=278954&view=rev
Log:
MyFacesServlet not inheriting from FacesServlet anymore causes all kinds of problems - new
Interface DelegatedFacesServlet as a marker for Servlets "extending" from FacesServlet but
not able to do so.

Added:
    myfaces/share/trunk/src/java/org/apache/myfaces/webapp/webxml/DelegatedFacesServlet.java
Modified:
    myfaces/share/trunk/src/java/org/apache/myfaces/webapp/webxml/WebXml.java

Added: myfaces/share/trunk/src/java/org/apache/myfaces/webapp/webxml/DelegatedFacesServlet.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/webapp/webxml/DelegatedFacesServlet.java?rev=278954&view=auto
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/webapp/webxml/DelegatedFacesServlet.java
(added)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/webapp/webxml/DelegatedFacesServlet.java
Tue Sep  6 02:20:50 2005
@@ -0,0 +1,12 @@
+package org.apache.myfaces.webapp.webxml;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: Developer
+ * Date: 06.09.2005
+ * Time: 11:22:03
+ * To change this template use File | Settings | File Templates.
+ */
+public interface DelegatedFacesServlet
+{
+}

Modified: myfaces/share/trunk/src/java/org/apache/myfaces/webapp/webxml/WebXml.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/webapp/webxml/WebXml.java?rev=278954&r1=278953&r2=278954&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/webapp/webxml/WebXml.java (original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/webapp/webxml/WebXml.java Tue Sep  6 02:20:50
2005
@@ -15,10 +15,9 @@
  */
 package org.apache.myfaces.webapp.webxml;
 
-import org.apache.myfaces.util.ClassUtils;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.util.ClassUtils;
 
 import javax.faces.context.ExternalContext;
 import javax.faces.webapp.FacesServlet;
@@ -84,7 +83,8 @@
                 continue;
             }
             Class servletClass = ClassUtils.simpleClassForName((String)entry.getValue());
-            if (FacesServlet.class.isAssignableFrom(servletClass))
+            if (FacesServlet.class.isAssignableFrom(servletClass) ||
+                    DelegatedFacesServlet.class.isAssignableFrom(servletClass))
             {
                 List urlPatterns = (List)_servletMappings.get(servletName);
                 for (Iterator it2 = urlPatterns.iterator(); it2.hasNext(); )



Mime
View raw message