fix for GRAILS-2465

git-svn-id: https://svn.codehaus.org/grails/trunk@6712 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/groovy/org/codehaus/groovy/grails/plugins/web/ControllersGrailsPlugin.groovy

@@ -193,18 +193,14 @@ class ControllersGrailsPlugin {
 
         def lastFilter = filters[filters.size() - 1]
         def lastFilterMapping = filterMappings[filterMappings.size() - 1]
-        def charEncodingFilter = filterMappings.find {it.'filter-name'.text() == 'charEncodingFilter'}
+        def charEncodingFilterMapping = filterMappings.find {it.'filter-name'.text() == 'charEncodingFilter'}
 
         // add the Grails web request filter
         lastFilter + {
             filter {
                 'filter-name'('grailsWebRequest')
                 'filter-class'(org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequestFilter.getName())
             }
-            filter {
-                'filter-name'('urlMapping')
-                'filter-class'(org.codehaus.groovy.grails.web.mapping.filter.UrlMappingsFilter.getName())
-            }
             if (grailsEnv == "development") {
                 filter {
                     'filter-name'('reloadFilter')
@@ -224,21 +220,13 @@ class ControllersGrailsPlugin {
                 }
             }
         }
-        if (charEncodingFilter) {
-            charEncodingFilter + grailsWebRequestFilter
+        if (charEncodingFilterMapping) {
+            charEncodingFilterMapping + grailsWebRequestFilter
         }
         else {
             lastFilterMapping + grailsWebRequestFilter
         }
-        filterMappings = webXml.'filter-mapping'
-        lastFilterMapping = filterMappings[filterMappings.size() - 1]
 
-        lastFilterMapping + {
-            'filter-mapping' {
-                'filter-name'('urlMapping')
-                'url-pattern'("/*")
-            }
-        }
         // if we're in development environment first add a the reload filter
         // to the web.xml by finding the last filter and appending it after
         if (grailsEnv == "development") {

src/groovy/org/codehaus/groovy/grails/plugins/web/mapping/UrlMappingsGrailsPlugin.groovy

@@ -53,35 +53,66 @@ class UrlMappingsGrailsPlugin {
 	}
 
 	def doWithWebDescriptor = { webXml ->
-        // here we augment web.xml with all the error codes contained within the UrlMapping definitions
         def filters = webXml.filter
         def lastFilter = filters[filters.size()-1]
-
         lastFilter + {
+            filter {
+                'filter-name'('urlMapping')
+                'filter-class'(org.codehaus.groovy.grails.web.mapping.filter.UrlMappingsFilter.getName())
+            }            
+        }
+        // here we augment web.xml with all the error codes contained within the UrlMapping definitions
+        def servlets = webXml.servlet
+        def lastServlet = servlets[servlets.size()-1]
+
+        lastServlet + {
             'servlet' {
                 'servlet-name'("grails-errorhandler")
                 'servlet-class'(org.codehaus.groovy.grails.web.mapping.filter.ErrorHandlingServlet.getName())
             }
-             for(Resource r in watchedResources) {
-                    r.file.eachLine { line ->
-                       def matcher = line =~ /\s*"(\d+?)"\(.+?\)/
-                       if(matcher) {
-                          def errorCode = matcher[0][1]
-                           'error-page' {
-                               'error-code'(errorCode)
-                               'location'("/grails-errorhandler")
-                           }
+        }
 
-                       }
-                    }
-             }
+        def servletMappings = webXml.'servlet-mapping'
+        def lastMapping = servletMappings[servletMappings.size()-1]
+        lastMapping + {
             'servlet-mapping' {
                 'servlet-name'("grails-errorhandler")
                 'url-pattern'("/grails-errorhandler")
             }
         }
+        def welcomeFileList = webXml.'welcome-file-list'
+        def errorPages = {
+                 for(Resource r in watchedResources) {
+                        r.file.eachLine { line ->
+                           def matcher = line =~ /\s*"(\d+?)"\(.+?\)/
+                           if(matcher) {
+                              def errorCode = matcher[0][1]
+                               'error-page' {
+                                   'error-code'(errorCode)
+                                   'location'("/grails-errorhandler")
+                               }
 
+                           }
+                        }
+                 }
+            }
+        if(welcomeFileList.size() > 0) {
+            welcomeFileList = welcomeFileList[welcomeFileList.size()-1]
+            welcomeFileList + errorPages
+        }
+        else {
+            lastMapping +  errorPages
+        }
 
+        def filterMappings = webXml.'filter-mapping'
+        def lastFilterMapping = filterMappings[filterMappings.size() - 1]
+
+        lastFilterMapping + {
+            'filter-mapping' {
+                'filter-name'('urlMapping')
+                'url-pattern'("/*")
+            }
+        }
     }
 
 	def onChange = { event ->

test/groovy/org/codehaus/groovy/grails/plugins/web/mapping/UrlMappingsGrailsPluginTests.groovy

@@ -0,0 +1,70 @@
+package org.codehaus.groovy.grails.plugins.web.mapping
+
+import org.springframework.core.io.FileSystemResource
+import groovy.xml.StreamingMarkupBuilder
+
+/**
+* @author Graeme Rocher
+* @since 1.0
+*
+* Created: Feb 18, 2008
+*/
+class UrlMappingsGrailsPluginTests extends GroovyTestCase {
+
+    void testErrorPageWebXmlPositioning() {
+           def text = '''<?xml version="1.0"?>
+<web-app>
+    <filter>
+        <filter-name>sitemesh</filter-name>
+        <filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>sitemesh</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+	<listener>
+		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
+	</listener>
+	<listener>
+		<listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class>
+	</listener>
+	<servlet>
+		<servlet-name>grails</servlet-name>
+		<servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>grails</servlet-name>
+		<url-pattern>*.dispatch</url-pattern>
+	</servlet-mapping>
+	<welcome-file-list>
+		<welcome-file>index.html</welcome-file>
+		<welcome-file>index.jsp</welcome-file>
+		<welcome-file>index.gsp</welcome-file>
+	</welcome-file-list>
+</web-app>
+'''
+
+        FileSystemResource.metaClass.getFile = {->
+            [ eachLine:{ Closure c ->
+                c.call('"404"(controller:"foo")')
+            }]
+        }
+        UrlMappingsGrailsPlugin.metaClass.getWatchedResources ={->
+            new FileSystemResource("/dummy/path")
+        }
+        def plugin = new UrlMappingsGrailsPlugin()
+
+        def xml = new XmlSlurper().parseText(text)
+
+        plugin.doWithWebDescriptor(xml)
+
+        def sw = new StringWriter()
+        sw = new StreamingMarkupBuilder().bind{
+          out << xml
+        }
+                
+        assertEquals '<web-app><filter><filter-name>sitemesh</filter-name><filter-class>org.codehaus.groovy.grails.web.sitemesh.GrailsPageFilter</filter-class></filter><filter><filter-name>urlMapping</filter-name><filter-class>org.codehaus.groovy.grails.web.mapping.filter.UrlMappingsFilter</filter-class></filter><filter-mapping><filter-name>sitemesh</filter-name><url-pattern>/*</url-pattern></filter-mapping><filter-mapping><filter-name>urlMapping</filter-name><url-pattern>/*</url-pattern></filter-mapping><listener><listener-class>org.springframework.web.util.Log4jConfigListener</listener-class></listener><listener><listener-class>org.codehaus.groovy.grails.web.context.GrailsContextLoaderListener</listener-class></listener><servlet><servlet-name>grails</servlet-name><servlet-class>org.codehaus.groovy.grails.web.servlet.GrailsDispatcherServlet</servlet-class><load-on-startup>1</load-on-startup></servlet><servlet><servlet-name>grails-errorhandler</servlet-name><servlet-class>org.codehaus.groovy.grails.web.mapping.filter.ErrorHandlingServlet</servlet-class></servlet><servlet-mapping><servlet-name>grails</servlet-name><url-pattern>*.dispatch</url-pattern></servlet-mapping><servlet-mapping><servlet-name>grails-errorhandler</servlet-name><url-pattern>/grails-errorhandler</url-pattern></servlet-mapping><welcome-file-list><welcome-file>index.html</welcome-file><welcome-file>index.jsp</welcome-file><welcome-file>index.gsp</welcome-file></welcome-file-list><error-page><error-code>404</error-code><location>/grails-errorhandler</location></error-page></web-app>', sw.toString()
+    }
+
+}