fix for GRAILS-1061 and GRAILS-1060

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

Author: graeme

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

@@ -31,7 +31,13 @@ class UrlMappingsGrailsPlugin {
 	def version = GrailsUtil.getGrailsVersion()
 	def dependsOn = [core:version]
 
-
+                                
+	def doWithSpring = {
+		grailsUrlMappingsHolder(UrlMappingsHolderFactoryBean) {
+            grailsApplication = ref("grailsApplication", true)
+        }		
+	}   
+	
     def doWithApplicationContext = { ctx ->
         def beans = beans {
             grailsUrlMappingsHolder(UrlMappingsHolderFactoryBean) {

src/web/org/codehaus/groovy/grails/web/mapping/DefaultUrlMappingsHolder.java

@@ -36,6 +36,13 @@ public class DefaultUrlMappingsHolder implements UrlMappingsHolder {
     private List urlMappings = new ArrayList();
     private UrlMapping[] mappings;
     private Map mappingsLookup = new HashMap();
+    private UrlMappingKey DEFAULT_CONTROLLER_KEY = new UrlMappingKey(null, null, new HashSet() {{
+           add(UrlMapping.CONTROLLER);
+           add(UrlMapping.ACTION);
+    }});
+    private UrlMappingKey DEFAULT_ACTION_KEY = new UrlMappingKey(null, null, new HashSet() {{
+           add(UrlMapping.ACTION);
+    }});
 
 
     public DefaultUrlMappingsHolder(List mappings) {
@@ -92,18 +99,9 @@ public UrlMapping getReverseMapping(final String controller, final String action
         UrlMappingKey key = new UrlMappingKey(controller, action, params.keySet());
         UrlMapping mapping = (UrlMapping)mappingsLookup.get(key);
         if(mapping == null) {
-            Map lookup = new HashMap() {{
-                put(UrlMapping.CONTROLLER,controller);
-                put(UrlMapping.ACTION,action);
-            }};
-
-            key = new UrlMappingKey(null,null,lookup.keySet());
-            mapping = (UrlMapping)mappingsLookup.get(key);
-
+            mapping = (UrlMapping)mappingsLookup.get(DEFAULT_CONTROLLER_KEY);
             if(mapping == null) {
-                lookup.remove(UrlMapping.ACTION);
-                key = new UrlMappingKey(null,null,lookup.keySet());
-                return (UrlMapping)mappingsLookup.get(key);
+                return (UrlMapping)mappingsLookup.get(DEFAULT_ACTION_KEY);
             }
         }
         return mapping;

src/web/org/codehaus/groovy/grails/web/mapping/RegexUrlMapping.java

@@ -15,7 +15,8 @@
 package org.codehaus.groovy.grails.web.mapping;
 
 import groovy.lang.Closure;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.codehaus.groovy.grails.commons.GrailsControllerClass;
 import org.codehaus.groovy.grails.validation.ConstrainedProperty;
 import org.codehaus.groovy.grails.web.mapping.exceptions.UrlMappingException;
@@ -24,6 +25,7 @@
 import org.springframework.validation.MapBindingResult;
 import org.springframework.web.context.request.RequestContextHolder;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -63,6 +65,7 @@ public class RegexUrlMapping implements UrlMapping {
     private static final String WILDCARD = "*";
     private static final String CAPTURED_WILDCARD = "(*)";
     private static final String SLASH = "/";
+    private static final Log LOG = LogFactory.getLog(RegexUrlMapping.class);
 
 
     public ConstrainedProperty[] getConstraints() {
@@ -166,7 +169,8 @@ public UrlMappingInfo match(String uri) {
      * @see org.codehaus.groovy.grails.web.mapping.UrlMapping
      */
     public String createURL(Map parameterValues) {
-    StringBuffer uri = new StringBuffer();
+		if(parameterValues==null)parameterValues=Collections.EMPTY_MAP;
+    	StringBuffer uri = new StringBuffer();
 
         String[] tokens = urlData.getTokens();
         int paramIndex = 0;
@@ -187,6 +191,9 @@ else if(value == null)
             }
 
         }
+        if(LOG.isDebugEnabled()) {
+            LOG.debug("Created reverse URL mapping ["+uri.toString()+"] for parameters ["+parameterValues+"]");
+        }
         return uri.toString();
     }
 

src/web/org/codehaus/groovy/grails/web/metaclass/RedirectDynamicMethod.java

@@ -90,6 +90,7 @@ public Object invoke(Object target, String methodName, Object[] arguments) {
 
         Object actionRef = argMap.get(ARGUMENT_ACTION);
         String controllerName = argMap.containsKey(ARGUMENT_CONTROLLER) ? argMap.get(ARGUMENT_CONTROLLER).toString() : null;
+
         Object id = argMap.get(ARGUMENT_ID);
         Object uri = argMap.get(ARGUMENT_URI);
         String url = argMap.containsKey(ARGUMENT_URL) ? argMap.get(ARGUMENT_URL).toString() : null;
@@ -122,17 +123,32 @@ else if(url != null) {
         }
         else {            
             String actionName = establishActionName(actionRef, target, webRequest);
+            controllerName = controllerName != null ? controllerName : webRequest.getControllerName();
+
+            if(LOG.isDebugEnabled()) {
+                LOG.debug("Dynamic method [redirect] looking up URL mapping for controller ["+controllerName+"] and action ["+actionName+"] and params ["+params+"] with ["+urlMappingsHolder+"]");
+            }
 
             UrlMapping urlMapping = null;
             if(urlMappingsHolder!=null)
                 urlMapping = urlMappingsHolder.getReverseMapping(controllerName, actionName, params);
-            
+
+            if(LOG.isDebugEnabled() && urlMapping == null) {
+                LOG.debug("Dynamic method [redirect] no URL mapping found for params ["+params +"]");
+            }
+
+
             if(urlMapping != null) {
 
                try {
                    params.put(ARGUMENT_CONTROLLER, controllerName);
-                   params.put(ARGUMENT_ACTION, actionName);
+                   params.put(ARGUMENT_ACTION, actionName != null ? actionName : webRequest.getActionName());
                    String mappedUrl = urlMapping.createURL(params);
+
+                   if(LOG.isDebugEnabled()) {
+                       LOG.debug("Dynamic method [redirect] mapped to URL ["+mappedUrl +"]");
+                   }
+
                    actualUriBuf.append(mappedUrl);
                }
                finally {