You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2006/04/14 19:24:03 UTC

svn commit: r394146 - /myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java

Author: imario
Date: Fri Apr 14 10:23:58 2006
New Revision: 394146

URL: http://svn.apache.org/viewcvs?rev=394146&view=rev
Log:
fix for TOMAHAWK-257 - ignore servlet-name based mapping

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

Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java?rev=394146&r1=394145&r2=394146&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java Fri Apr 14 10:23:58 2006
@@ -338,6 +338,10 @@
                 {
                     urlPattern = org.apache.myfaces.shared.util.xml.XmlUtils.getElementText((Element)n).trim();
                 }
+                else if (n.getNodeName().equals("servlet-name"))
+                {
+                	// we are not interested in servlet-name based mapping - for now
+                }
                 else
                 {
                     if (log.isWarnEnabled()) log.warn("Ignored element '" + n.getNodeName() + "' as child of '" + filterMappingElem.getNodeName() + "'.");