Merge branch '2.1.x' into 2.2.x

Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
	grails-web/src/main/groovy/org/codehaus/groovy/grails/web/binding/DefaultASTDatabindingHelper.java
	grails-web/src/test/groovy/org/codehaus/groovy/grails/web/binding/DefaultASTDatabindingHelperSpec.groovy

Author: jeffscottbrown

grails-core/src/main/groovy/org/codehaus/groovy/grails/support/ParticipatingInterceptor.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 SpringSource
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.grails.support;
+
+public interface ParticipatingInterceptor extends PersistenceContextInterceptor {
+
+    void setParticipate(boolean participate);
+
+    boolean getParticipate();
+}

grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/support/AggregatePersistenceContextInterceptor.java

@@ -19,6 +19,7 @@
 import java.util.List;
 
 import org.codehaus.groovy.grails.commons.GrailsDomainClassProperty;
+import org.codehaus.groovy.grails.support.ParticipatingInterceptor;
 import org.codehaus.groovy.grails.support.PersistenceContextInterceptor;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.InitializingBean;
@@ -28,7 +29,7 @@
 /**
  * @author Burt Beckwith
  */
-public class AggregatePersistenceContextInterceptor implements PersistenceContextInterceptor, InitializingBean, ApplicationContextAware {
+public class AggregatePersistenceContextInterceptor implements ParticipatingInterceptor, InitializingBean, ApplicationContextAware {
 
     private List<PersistenceContextInterceptor> interceptors = new ArrayList<PersistenceContextInterceptor>();
     private List<String> dataSourceNames = new ArrayList<String>();
@@ -94,6 +95,26 @@ public void setReadWrite() {
         }
     }
 
+    public void setParticipate(boolean flag) {
+        for (PersistenceContextInterceptor interceptor : interceptors) {
+            if (interceptor instanceof ParticipatingInterceptor) {
+                ((ParticipatingInterceptor)interceptor).setParticipate(flag);
+            }
+        }
+    }
+
+    public boolean getParticipate() {
+        for (PersistenceContextInterceptor interceptor : interceptors) {
+            if (interceptor instanceof ParticipatingInterceptor) {
+                if (((ParticipatingInterceptor)interceptor).getParticipate()) {
+                    // true at least one is true
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * Dependency injection for the datasource names.
      * @param names  the names

grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/support/HibernatePersistenceContextInterceptor.java

@@ -21,7 +21,7 @@
 import org.codehaus.groovy.grails.lifecycle.ShutdownOperations;
 import org.codehaus.groovy.grails.orm.hibernate.cfg.GrailsHibernateUtil;
 import org.codehaus.groovy.grails.orm.hibernate.metaclass.AbstractSavePersistentMethod;
-import org.codehaus.groovy.grails.support.PersistenceContextInterceptor;
+import org.codehaus.groovy.grails.support.ParticipatingInterceptor;
 import org.hibernate.FlushMode;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -33,7 +33,7 @@
  * @author Graeme Rocher
  * @since 0.4
  */
-public class HibernatePersistenceContextInterceptor implements PersistenceContextInterceptor {
+public class HibernatePersistenceContextInterceptor implements ParticipatingInterceptor {
 
     private static final Log LOG = LogFactory.getLog(HibernatePersistenceContextInterceptor.class);
     private SessionFactory sessionFactory;
@@ -136,6 +136,15 @@ public void init() {
         }
     }
 
+    public void setParticipate(boolean flag) {
+        participate.set(flag);
+    }
+
+    public boolean getParticipate() {
+        Boolean ret = participate.get();
+        return (ret != null) ? ret : false;
+    }
+
     private Session getSession() {
         return getSession(true);
     }
@@ -174,13 +183,4 @@ private int decNestingCount() {
         nestingCount.set(value);
         return value;
     }
-
-    private void setParticipate(boolean flag) {
-        participate.set(flag);
-    }
-
-    private boolean getParticipate() {
-        Boolean ret = participate.get();
-        return (ret != null) ? ret : false;
-    }
 }

grails-plugin-tomcat/build.gradle

@@ -1,4 +1,4 @@
-def tomcatVersion = "7.0.30"
+def tomcatVersion = "7.0.39"
 dependencies {
     compile "org.apache.tomcat.embed:tomcat-embed-core:$tomcatVersion"
     compile "org.apache.tomcat.embed:tomcat-embed-logging-log4j:$tomcatVersion"

grails-web/src/main/groovy/org/codehaus/groovy/grails/web/binding/DefaultASTDatabindingHelper.java

@@ -30,6 +30,7 @@ public class DefaultASTDatabindingHelper implements ASTDatabindingHelper {
     public static final String BINDABLE_CONSTRAINT_NAME = "bindable";
 
     public static final String DEFAULT_DATABINDING_WHITELIST = "$defaultDatabindingWhiteList";
+    public static final String NO_BINDABLE_PROPERTIES = "$_NO_BINDABLE_PROPERTIES_$";
 
     private static Map<ClassNode, Set<String>> CLASS_NODE_TO_WHITE_LIST_PROPERTY_NAMES = new HashMap<ClassNode, Set<String>>();
 
@@ -84,21 +85,25 @@ private void addDefaultDatabindingWhitelistField(final SourceUnit sourceUnit, fi
         final Set<String> propertyNamesToIncludeInWhiteList = getPropertyNamesToIncludeInWhiteList(sourceUnit, classNode);
 
         final ListExpression listExpression = new ListExpression();
-        for (String propertyName : propertyNamesToIncludeInWhiteList) {
-            listExpression.addExpression(new ConstantExpression(propertyName));
+        if (propertyNamesToIncludeInWhiteList.size() > 0) {
+            for (String propertyName : propertyNamesToIncludeInWhiteList) {
+                listExpression.addExpression(new ConstantExpression(propertyName));
 
-            final FieldNode declaredField = getDeclaredFieldInInheritanceHierarchy(classNode, propertyName);
-            boolean isSimpleType = false;
-            if (declaredField != null) {
-                final ClassNode type = declaredField.getType();
-                if (type != null) {
-                    isSimpleType = SIMPLE_TYPES.contains(type);
+                final FieldNode declaredField = getDeclaredFieldInInheritanceHierarchy(classNode, propertyName);
+                boolean isSimpleType = false;
+                if (declaredField != null) {
+                    final ClassNode type = declaredField.getType();
+                    if (type != null) {
+                        isSimpleType = SIMPLE_TYPES.contains(type);
+                    }
+                }
+                if (!isSimpleType) {
+                    listExpression.addExpression(new ConstantExpression(propertyName + "_*"));
+                    listExpression.addExpression(new ConstantExpression(propertyName + ".*"));
                 }
             }
-            if (!isSimpleType) {
-                listExpression.addExpression(new ConstantExpression(propertyName + "_*"));
-                listExpression.addExpression(new ConstantExpression(propertyName + ".*"));
-            }
+        } else {
+            listExpression.addExpression(new ConstantExpression(NO_BINDABLE_PROPERTIES));
         }
 
         classNode.addField(DEFAULT_DATABINDING_WHITELIST,

grails-web/src/main/groovy/org/codehaus/groovy/grails/web/sitemesh/GrailsPageFilter.java

@@ -31,6 +31,7 @@
 
 import org.codehaus.groovy.grails.commons.GrailsApplication;
 import org.codehaus.groovy.grails.support.NullPersistentContextInterceptor;
+import org.codehaus.groovy.grails.support.ParticipatingInterceptor;
 import org.codehaus.groovy.grails.support.PersistenceContextInterceptor;
 import org.codehaus.groovy.grails.web.util.WebUtils;
 import org.springframework.web.context.WebApplicationContext;
@@ -176,6 +177,11 @@ public void doFilter(ServletRequest rq, ServletResponse rs, FilterChain chain)
                 request.setAttribute(ALREADY_APPLIED_KEY, null);
             }
             if (persistenceInterceptor.isOpen()) {
+                if (persistenceInterceptor instanceof ParticipatingInterceptor) {
+                    // to ensure that it will close the session in the destroy() call
+                    ((ParticipatingInterceptor)persistenceInterceptor).setParticipate(false);
+                }
+
                 persistenceInterceptor.destroy();
             }
         }

grails-web/src/test/groovy/org/codehaus/groovy/grails/web/binding/DefaultASTDatabindingHelperSpec.groovy

@@ -19,6 +19,7 @@ class DefaultASTDatabindingHelperSpec extends Specification {
     static setterGetterClass
     static dateBindingClass
     static classWithHasMany
+    static classWithNoBindableProperties
 
     def setupSpec() {
         final gcl = new GrailsAwareClassLoader()
@@ -111,11 +112,20 @@ class DefaultASTDatabindingHelperSpec extends Specification {
                     }
                 }
             ''')
+            classWithNoBindableProperties = gcl.parseClass('''
+                class ClassWithNoBindableProperties {
+                    String firstName
+                    String lastName
+                    static constraints = {
+                        firstName bindable: false
+                        lastName bindable: false
+                    }
+                }''')
 
             // there must be a request bound in order for the structured date editor to be registered
             GrailsWebUtil.bindMockWebRequest()
     }
-
+    
     void 'Test class with hasMany'() {
         when:
         final whiteListField = classWithHasMany.getDeclaredField(DefaultASTDatabindingHelper.DEFAULT_DATABINDING_WHITELIST)
@@ -191,6 +201,18 @@ class DefaultASTDatabindingHelperSpec extends Specification {
            'person.*' in whiteList
            'person_*' in whiteList
     }
+    
+    void 'Test binding to a class that has no bindable properties'() {
+        given:
+            def obj = classWithNoBindableProperties.newInstance()
+            
+        when:
+            obj.properties = [firstName: 'First Name', lastName: 'Last Name']
+            
+        then:
+            obj.firstName == null
+            obj.lastName == null
+    }
 
     void 'Test that binding respects the generated white list'() {
         given: