Merge branch '1.2.x' of [email protected]:grails/grails into 1.2.x

Author: graemerocher

lib/groovy-all-1.6.7.jar

@@ -37,7 +37,7 @@ import org.springframework.beans.SimpleTypeConverter
 import org.springframework.mock.web.MockHttpSession
 import org.springframework.validation.Errors
 import org.springframework.web.context.request.RequestContextHolder
-import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.ModelAndView
 
 import grails.validation.ValidationException
 
@@ -197,7 +197,7 @@ class MockUtils {
             else if (map["view"] != null) {
                 assert map["text"] == null : "'text' cannot be used with 'view' in render"
 
-                modelAndView["view"] = map["view"]
+                modelAndView["viewName"] =  map["view"]
                 modelAndView["model"] = map["model"]
             }
             else if (map["text"] != null) {

src/java/grails/test/MockUtils.groovy

@@ -29,8 +29,6 @@ class HibernateNamedQueriesBuilder {
     private final domainClass
     private final dynamicMethods
 
-	private boolean initializationComplete = false
-
     /**
      * @param domainClass the GrailsDomainClass defining the named queries
      * @param grailsApplication a GrailsApplication instance
@@ -58,7 +56,6 @@ class HibernateNamedQueriesBuilder {
         closure.resolveStrategy = Closure.DELEGATE_ONLY
         closure.delegate = this
         closure.call()
-		initializationComplete = true
     }
 
     private handleMethodMissing = {String name, args ->
@@ -71,7 +68,7 @@ class HibernateNamedQueriesBuilder {
     }
 
     def methodMissing(String name, args) {
-        if (!initializationComplete && args && args[0] instanceof Closure) {
+        if (args && args[0] instanceof Closure) {
             return handleMethodMissing(name, args)
         }
         throw new MissingMethodException(name, HibernateNamedQueriesBuilder, args)
@@ -139,7 +136,7 @@ class NamedCriteriaProxy {
     }
 
     def findAllWhere(Map params, Boolean uniq = false) {
-        def closureClone = criteriaClosure.clone()
+        def closureClone = getPreparedCriteriaClosure()
         def queryClosure = {
             closureClone.delegate = delegate
             closureClone()
@@ -168,6 +165,7 @@ class NamedCriteriaProxy {
 
     private getPreparedCriteriaClosure() {
         def closureClone = criteriaClosure.clone()
+		closureClone.resolveStrategy = Closure.DELEGATE_FIRST
         if (namedCriteriaParams) {
             closureClone = closureClone.curry(namedCriteriaParams)
         }

src/java/org/codehaus/groovy/grails/orm/hibernate/cfg/HibernateNamedQueriesBuilder.groovy

@@ -121,10 +121,12 @@ private GroovyPageOutputStack(Writer topWriter, boolean autoSync) {
 
 	private Writer unwrapTargetWriter(Writer targetWriter) {
 		if(targetWriter instanceof GrailsPrintWriter) {
-			return ((GrailsPrintWriter)targetWriter).getOut();
-		} else {
-			return targetWriter;
+			GrailsPrintWriter gpw=((GrailsPrintWriter)targetWriter);
+			if(gpw.isAllowUnwrappingOut()) {
+				return ((GrailsPrintWriter)targetWriter).getOut();
+			}
 		}
+		return targetWriter;
 	}
 
 	public void push(final Writer newWriter) {

src/java/org/codehaus/groovy/grails/web/pages/GroovyPageOutputStack.java

@@ -20,7 +20,26 @@ public static interface DestinationFactory {
     public GrailsRoutablePrintWriter(DestinationFactory factory) {
         super(new NullWriter());
         this.factory = factory;
+        
     }
+    
+	/**
+	 * 
+	 * tell others if getOut() can be called to "unwrap" the actual target writer
+	 * 
+	 * if the destination hasn't been activated, don't allow it.
+	 *  
+	 * 
+	 * @see org.codehaus.groovy.grails.web.util.GrailsPrintWriter#isAllowUnwrappingOut()
+	 */
+	@Override
+	public boolean isAllowUnwrappingOut() {
+		if(destination==null) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 
 	public Writer getOut() {
 		return getDestination();
@@ -199,4 +218,5 @@ public void close() throws IOException {
 
     }
 
+
 }

src/java/org/codehaus/groovy/grails/web/sitemesh/GrailsRoutablePrintWriter.java

@@ -25,13 +25,18 @@ public class GrailsPrintWriter extends PrintWriter {
 	private static final char CRLF[] = { '\r', '\n' };
 	protected boolean trouble=false;
 	protected Writer out;
+	protected boolean allowUnwrappingOut=true;
 	private boolean finalTargetHere=false;
 	private boolean usageFlag=false;
 
 	public GrailsPrintWriter(Writer out) {
 		super(out);
 		this.out=out;
 	}
+	
+	public boolean isAllowUnwrappingOut() {
+		return allowUnwrappingOut;
+	}
 
 	public Writer getOut() {
 		return out;