Merge branch '3.0.x'

Author: graemerocher

build.gradle

@@ -1,5 +1,3 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
 buildscript {
     repositories {
         maven { url "https://repo.grails.org/grails/core" }
@@ -29,7 +27,7 @@ ext {
 
     antTraxVersion = "1.7.1"
     antVersion = "1.9.4"
-    aspectjVersion = "1.8.5"  // use same version as org.springframework:spring-aspects uses
+    aspectjVersion = "1.8.7"  // use same version as org.springframework:spring-aspects uses
     commonsCliVersion = "1.2"
     commonsCollectionsVersion = "3.2.1"
     commonsIOVersion = "2.2"

grails-core/src/main/groovy/org/grails/core/artefact/DomainClassArtefactHandler.java

@@ -15,6 +15,7 @@
  */
 package org.grails.core.artefact;
 
+import grails.artefact.Artefact;
 import grails.core.*;
 import grails.core.support.GrailsApplicationAware;
 import grails.persistence.Entity;
@@ -31,6 +32,7 @@
 import org.grails.validation.ConstraintEvalUtils;
 
 import java.io.IOException;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Modifier;
 import java.net.URL;
 import java.util.Map;
@@ -152,6 +154,11 @@ private static boolean doIsDomainClassCheck(Class<?> clazz) {
             return true;
         }
 
+        Artefact artefactAnn = clazz.getAnnotation(Artefact.class);
+        if(artefactAnn != null && artefactAnn.value().equals(DomainClassArtefactHandler.TYPE)) {
+            return true;
+        }
+
         Class<?> testClass = clazz;
         while (testClass != null && !testClass.equals(GroovyObject.class) && !testClass.equals(Object.class)) {
             try {

grails-core/src/main/groovy/org/grails/transaction/ChainedTransactionManager.java

@@ -47,6 +47,9 @@
  * 
  * @author Michael Hunger
  * @author Oliver Gierke
+ * @author Lari Hotari
+ * @author Graeme Rocher
+ *
  * @since  2.3.6
  */
 public class ChainedTransactionManager implements PlatformTransactionManager {
@@ -92,7 +95,7 @@ public MultiTransactionStatus getTransaction(TransactionDefinition definition) t
 
 		MultiTransactionStatus mts = new MultiTransactionStatus(transactionManagers.get(0));
 
-		if (!synchronizationManager.isSynchronizationActive()) {
+		if (!synchronizationManager.isSynchronizationActive() && canCreateTransaction(definition)) {
 			synchronizationManager.initSynchronization();
 			mts.setNewSynchonization();
 		}
@@ -127,6 +130,12 @@ public MultiTransactionStatus getTransaction(TransactionDefinition definition) t
 		return mts;
 	}
 
+	protected boolean canCreateTransaction(TransactionDefinition definition) {
+		return definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_REQUIRED ||
+				definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_REQUIRES_NEW ||
+				definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_NESTED;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.transaction.PlatformTransactionManager#commit(org.springframework.transaction.TransactionStatus)

grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/RequestForwarder.groovy

@@ -96,8 +96,6 @@ trait RequestForwarder implements WebAttributes {
         WebUtils.exposeRequestAttributes(request, (Map)model);
 
         request.setAttribute(GrailsApplicationAttributes.FORWARD_IN_PROGRESS, true)
-        request.setAttribute(GrailsApplicationAttributes.FORWARD_ISSUED, true)
-
         params.includeContext = false
         def fowardURI = lookupLinkGenerator().link(params)
 
@@ -108,6 +106,7 @@ trait RequestForwarder implements WebAttributes {
         webRequest.removeAttribute(UrlMappingsHandlerMapping.MATCHED_REQUEST, WebRequest.SCOPE_REQUEST);
         webRequest.removeAttribute("grailsWebRequestFilter" + OncePerRequestFilter.ALREADY_FILTERED_SUFFIX, WebRequest.SCOPE_REQUEST);
         dispatcher.forward(request, response);
+        request.setAttribute(GrailsApplicationAttributes.FORWARD_ISSUED, true)
         return fowardURI
     }
 

grails-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/GrailsDomainClassCleaner.groovy

@@ -43,13 +43,13 @@ class GrailsDomainClassCleaner implements ApplicationListener<ContextClosedEvent
             if(GormEntity.isAssignableFrom(clz)) {
                 try {
                     clz.initInternalApi null
-                } catch (e) {
-                    log.warn("Error clearing instance api property in ${clz.name}", e)
+                } catch (Throwable e) {
+                    // ignore, GORM 5 doesn't have these methods
                 }
                 try {
                     clz.initInternalStaticApi null
-                } catch (e) {
-                    log.warn("Error clearing static api property in ${clz.name}", e)
+                } catch (Throwable e) {
+                    // ignore, GORM 5 doesn't have these methods
                 }
             } else {
                 clearStaticApiInstances(clz)

grails-plugin-filters/src/main/groovy/org/grails/plugins/web/filters/CompositeInterceptor.java

@@ -16,6 +16,7 @@
 package org.grails.plugins.web.filters;
 
 import org.grails.web.util.GrailsApplicationAttributes;
+import org.grails.web.util.WebUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -52,7 +53,8 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
                 return false;
             }
             // if forward is called, bail out
-            if (request.getAttribute(GrailsApplicationAttributes.FORWARD_ISSUED) != null) {
+            if (request.getAttribute(GrailsApplicationAttributes.FORWARD_ISSUED) != null && !WebUtils.isForwardOrInclude(request)) {
+                request.removeAttribute(GrailsApplicationAttributes.FORWARD_ISSUED);
                 return false;
             }
         }
@@ -65,6 +67,12 @@ public void postHandle(HttpServletRequest request, HttpServletResponse response,
         for (HandlerInterceptor handler : handlersReversed) {
             handler.postHandle(request, response, o, modelAndView);
         }
+
+        // remove the FORWARD_ISSUED attribute just in case forward was called from an action
+        // this will ensure the subsequent action works since FORWARD_ISSUED is only used
+        // to know whether forward was called from within a filter
+        request.removeAttribute(GrailsApplicationAttributes.FORWARD_ISSUED);
+
     }
 
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object o, Exception e) throws Exception {

grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequest.java

@@ -68,7 +68,6 @@
  */
 public class GrailsWebRequest extends DispatcherServletWebRequest  {
 
-    private static final String FORWARD_CALLED = GrailsApplicationAttributes.FORWARD_ISSUED;
     private static final String REDIRECT_CALLED = GrailsApplicationAttributes.REDIRECT_ISSUED;
 
     private static final Class<? extends GrailsApplicationAttributes> grailsApplicationAttributesClass = GrailsFactoriesLoader.loadFactoryClasses(GrailsApplicationAttributes.class, GrailsWebRequest.class.getClassLoader()).get(0);

grails-web-common/src/main/groovy/org/grails/web/util/WebUtils.java

@@ -495,4 +495,14 @@ public static boolean isInclude(HttpServletRequest request) {
         return request.getAttribute(INCLUDE_REQUEST_URI_ATTRIBUTE) != null;
     }
 
+    /**
+     * Check whether the given request is an include or forward request
+     *
+     * @param request The request
+     * @return True if it is an include or forward request
+     */
+    public static boolean isForwardOrInclude(HttpServletRequest request) {
+        return isForward(request) || isInclude(request);
+    }
+
 }