Merge branch '2.3.x' into 2.4.x

Conflicts:
	grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/mapping/RegexUrlMappingTests.groovy

Author: jeffscottbrown

grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/mapping/RegexUrlMappingTests.groovy

@@ -69,9 +69,26 @@ mappings {
       controller = 'hyphenTests'
       action = 'view'
   }
+  "/plugins/grails-$plugin/tags/RELEASE_$version/$fullName(.$type)" {
+      controller = 'website'
+      action = 'displayPlugin'
+  }
 }
 '''
-    
+
+    void testExtensionPrecededByTokenWhichMayContainDots() {
+        def holder = new DefaultUrlMappingsHolder(evaluator.evaluateMappings(new ByteArrayResource(mappingScript.bytes)))
+
+        def info = holder.match("/plugins/grails-csv/tags/RELEASE_0.3.1/csv-0.3.1.pom")
+        assertNotNull info
+        assertEquals 'website', info.controllerName
+        assertEquals 'displayPlugin', info.actionName
+        assertEquals '0.3.1', info.params.version
+        assertEquals 'csv', info.params.plugin
+        assertEquals 'csv-0.3.1', info.params.fullName
+        assertEquals 'pom', info.params.type
+    }
+
     void testHyphenDelimiters() {
         def holder = new DefaultUrlMappingsHolder(evaluator.evaluateMappings(new ByteArrayResource(mappingScript.bytes)))
 

grails-web-url-mappings/src/main/groovy/org/codehaus/groovy/grails/web/mapping/RegexUrlMapping.java

@@ -228,15 +228,21 @@ protected Pattern convertToRegex(String url) {
                                     .replaceAll("([^\\*])\\*$", "$1[^/]+")
                                     .replaceAll("\\*\\*", ".*");
 
-            pattern += urlEnd
+            if("/(*)(\\.(*))".equals(urlEnd)) {
+                // shortcut this common special case which will
+                // happen any time a URL mapping ends with a pattern like
+                // /$someVariable(.$someExtension)
+                pattern += "/([^/]+)\\.([^/.]+)?";
+            } else {
+                pattern += urlEnd
                                 .replace("(\\.(*))", "\\.?([^/]+)?")
                                 .replaceAll("([^\\*])\\*([^\\*])", "$1[^/]+$2")
                                 .replaceAll("([^\\*])\\*$", "$1[^/]+")
                                 .replaceAll("\\*\\*", ".*")
                                 .replaceAll("\\(\\[\\^\\/\\]\\+\\)\\\\\\.", "([^/.]+)\\\\.")
                                 .replaceAll("\\(\\[\\^\\/\\]\\+\\)\\?\\\\\\.", "([^/.]+)\\?\\\\.")
                                 ;
-
+            }
             pattern += "/??$";
             regex = Pattern.compile(pattern);
         }