Merge branch 'master' of github.com:grails/grails-core

grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.groovy

@@ -1,7 +1,6 @@
 package org.grails.gradle.plugin.core
 
 import org.gradle.api.Project
-import org.gradle.api.Task
 import org.gradle.api.tasks.Copy
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.bundling.Jar

grails-gsp/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    compile( project(":grails-web-taglib") )
+}

grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPage.java → grails-gsp/src/main/groovy/org/grails/gsp/GroovyPage.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages;
+package org.grails.gsp;
 
 import grails.core.GrailsApplication;
 import grails.util.CollectionUtils;
@@ -26,17 +26,14 @@
 import org.codehaus.groovy.runtime.InvokerHelper;
 import org.grails.buffer.GrailsPrintWriter;
 import org.grails.encoder.Encoder;
+import org.grails.exceptions.ExceptionUtils;
+import org.grails.gsp.jsp.JspTag;
+import org.grails.gsp.jsp.JspTagLib;
+import org.grails.gsp.jsp.TagLibraryResolver;
 import org.grails.web.encoder.OutputEncodingStack;
 import org.grails.web.encoder.OutputEncodingStackAttributes;
 import org.grails.web.encoder.WithCodecHelper;
-import org.grails.exceptions.ExceptionUtils;
-import org.grails.web.pages.exceptions.GroovyPagesException;
-import org.grails.web.pages.ext.jsp.JspTag;
-import org.grails.web.pages.ext.jsp.JspTagLib;
-import org.grails.web.pages.ext.jsp.TagLibraryResolver;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
-import org.grails.web.sitemesh.GSPSitemeshPage;
-import org.grails.web.sitemesh.GrailsLayoutView;
 import org.grails.web.taglib.*;
 import org.grails.web.taglib.exceptions.GrailsTagException;
 
@@ -530,6 +527,9 @@ public final HttpServletRequest getRequest() {
     }
 
     public final void registerSitemeshPreprocessMode() {
+        /*
+        TODO: grails-gsp refactoring
+
         if (request == null) {
             return;
         }
@@ -538,6 +538,7 @@ public final void registerSitemeshPreprocessMode() {
         if (page != null) {
             page.setUsed(true);
         }
+        */
     }
 
     public final void createTagBody(int bodyClosureIndex, Closure<?> bodyClosure) {

grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPageBinding.java → grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageBinding.java

@@ -13,17 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages;
+package org.grails.gsp;
 
+import grails.plugins.GrailsPlugin;
 import groovy.lang.Binding;
-
-import java.util.Map;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import grails.plugins.GrailsPlugin;
 import org.grails.web.taglib.TemplateVariableBinding;
 
+import java.util.Map;
+
 /**
  * Script Binding that is used in GSP evaluation.
  *

grails-web-gsp/src/main/groovy/org/grails/compiler/web/pages/GroovyPageClassLoader.java → grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageClassLoader.java

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.compiler.web.pages;
+package org.grails.gsp;
 
 import groovy.lang.GroovyClassLoader;
 import org.codehaus.groovy.control.CompilationUnit;
 import org.codehaus.groovy.control.CompilerConfiguration;
 import org.codehaus.groovy.control.Phases;
+import org.grails.gsp.compiler.transform.GroovyPageInjectionOperation;
 
 import java.security.CodeSource;
 

grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPageMetaInfo.java → grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageMetaInfo.java

@@ -13,43 +13,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages;
+package org.grails.gsp;
 
+import grails.core.GrailsApplication;
+import grails.core.support.GrailsApplicationAware;
 import grails.io.IOUtils;
+import grails.plugins.GrailsPlugin;
+import grails.plugins.GrailsPluginManager;
 import grails.util.CacheEntry;
 import groovy.lang.GroovySystem;
-
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Writer;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.PrivilegedAction;
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.Callable;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import grails.core.GrailsApplication;
-import grails.plugins.GrailsPlugin;
-import grails.plugins.GrailsPluginManager;
-import grails.core.support.GrailsApplicationAware;
-
 import org.grails.encoder.Encoder;
+import org.grails.gsp.compiler.GroovyPageParser;
+import org.grails.gsp.jsp.TagLibraryResolver;
 import org.grails.web.encoder.WithCodecHelper;
-import org.grails.web.pages.exceptions.GroovyPagesException;
-import org.grails.web.pages.ext.jsp.TagLibraryResolver;
 import org.grails.web.taglib.TagLibraryLookup;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.util.ReflectionUtils;
 
+import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.PrivilegedAction;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
 /**
  * Encapsulates the information necessary to describe a GSP.
  *

grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPageResourceLoader.java → grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageResourceLoader.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages;
+package org.grails.gsp;
 
 
 import org.apache.commons.logging.Log;

grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPageSourceDecorator.java → grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageSourceDecorator.java

@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages;
-
-import java.lang.StringBuilder;
+package org.grails.gsp;
 
 public interface GroovyPageSourceDecorator {
 	StringBuilder decorate(StringBuilder source);

grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPageTemplate.java → grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageTemplate.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages;
+package org.grails.gsp;
 
 import groovy.lang.Writable;
 import groovy.text.Template;

grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPageWritable.java → grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageWritable.java

@@ -13,19 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages;
+package org.grails.gsp;
 
 import grails.util.Environment;
-import org.grails.web.util.GrailsApplicationAttributes;
 import groovy.lang.Binding;
 import groovy.lang.Writable;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.grails.web.pages.exceptions.GroovyPagesException;
 import org.grails.web.servlet.WrappedResponseHolder;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
 import org.grails.web.taglib.TemplateVariableBinding;
 import org.grails.web.taglib.WebRequestTemplateVariableBinding;
+import org.grails.web.util.GrailsApplicationAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 
 import javax.servlet.http.HttpServletRequest;

grails-web-gsp/src/main/groovy/org/grails/web/pages/exceptions/GroovyPagesException.java → grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages.exceptions;
+package org.grails.gsp;
 
 import org.grails.core.exceptions.GrailsException;
 import org.grails.exceptions.reporting.SourceCodeAware;

grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPagesMetaUtils.groovy → grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesMetaUtils.groovy

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages
+package org.grails.gsp
 
 import grails.util.Environment
-import groovy.transform.CompileStatic
 import grails.util.GrailsMetaClassUtils
-
-import org.grails.web.taglib.TagLibraryLookup;
+import groovy.transform.CompileStatic
+import org.grails.web.taglib.TagLibraryLookup
 import org.grails.web.taglib.util.TagLibraryMetaUtils
 
 @CompileStatic

grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPagesTemplateEngine.java → grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesTemplateEngine.java

@@ -13,80 +13,61 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages;
+package org.grails.gsp;
 
 import grails.config.Settings;
+import grails.core.GrailsApplication;
+import grails.core.GrailsClass;
 import grails.io.IOUtils;
 import grails.util.CacheEntry;
 import grails.util.Environment;
 import grails.util.GrailsUtil;
 import grails.util.Holders;
 import groovy.lang.GroovyClassLoader;
 import groovy.text.Template;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.control.CompilerConfiguration;
+import org.codehaus.groovy.runtime.IOGroovyMethods;
 import org.grails.core.artefact.DomainClassArtefactHandler;
-
-import grails.core.GrailsApplication;
-import grails.core.GrailsClass;
-
-import org.grails.compiler.web.pages.GroovyPageClassLoader;
 import org.grails.core.exceptions.DefaultErrorsPrinter;
-import org.grails.web.pages.exceptions.GroovyPagesException;
-import org.grails.web.support.ResourceAwareTemplateEngine;
 import org.grails.exceptions.ExceptionUtils;
-import org.grails.web.pages.discovery.DefaultGroovyPageLocator;
-import org.grails.web.pages.discovery.GroovyPageCompiledScriptSource;
-import org.grails.web.pages.discovery.GroovyPageLocator;
-import org.grails.web.pages.discovery.GroovyPageResourceScriptSource;
-import org.grails.web.pages.discovery.GroovyPageScriptSource;
-import org.grails.web.pages.ext.jsp.TagLibraryResolver;
-
-import org.grails.web.util.GrailsApplicationAttributes;
-
+import org.grails.gsp.compiler.GroovyPageParser;
+import org.grails.gsp.io.*;
+import org.grails.gsp.jsp.TagLibraryResolver;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
+import org.grails.web.support.ResourceAwareTemplateEngine;
 import org.grails.web.taglib.TagLibraryLookup;
-import org.codehaus.groovy.runtime.IOGroovyMethods;
+import org.grails.web.util.GrailsApplicationAttributes;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.io.UrlResource;
+import org.springframework.core.io.*;
 import org.springframework.scripting.ScriptSource;
 import org.springframework.scripting.support.ResourceScriptSource;
 import org.springframework.util.Assert;
 import org.springframework.web.context.ServletContextAware;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.support.ServletContextResource;
 
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.security.PrivilegedAction;
+import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
 /**
  * Based on (but not extending) the existing TemplateEngine implementations
  * within Groovy. It allows GSP pages to be re-used in different context using code like the below:
@@ -784,7 +765,7 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
      * @param request The HttpServletRequest instance
      * @return The page id
      */
-    protected String getCurrentRequestUri(HttpServletRequest request) {
+    public String getCurrentRequestUri(HttpServletRequest request) {
         Object includePath = request.getAttribute("javax.servlet.include.servlet_path");
         if (includePath != null) {
             return (String)includePath;

grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPagesTemplateRenderer.java → grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesTemplateRenderer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages;
+package org.grails.gsp;
 
 import grails.core.GrailsDomainClass;
 import grails.util.CacheEntry;
@@ -28,11 +28,11 @@
 import org.grails.encoder.Encoder;
 import org.grails.encoder.StreamingEncoder;
 import org.grails.encoder.StreamingEncoderWriter;
+import org.grails.gsp.io.GrailsConventionGroovyPageLocator;
+import org.grails.gsp.io.GroovyPageScriptSource;
 import org.grails.io.support.GrailsResourceUtils;
 import org.grails.web.encoder.OutputEncodingSettings;
 import org.grails.web.encoder.WithCodecHelper;
-import org.grails.web.pages.discovery.GrailsConventionGroovyPageLocator;
-import org.grails.web.pages.discovery.GroovyPageScriptSource;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
 import org.grails.web.taglib.TemplateVariableBinding;
 import org.grails.web.taglib.exceptions.GrailsTagException;

grails-web-gsp/src/main/groovy/org/grails/web/pages/GSPWriter.java → grails-gsp/src/main/groovy/org/grails/gsp/compiler/GSPWriter.java

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages;
+package org.grails.gsp.compiler;
 
 import grails.util.GrailsStringUtils;
+import org.grails.gsp.GroovyPage;
 
 import java.io.PrintWriter;
 import java.io.Writer;

grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPageCompiler.groovy → grails-gsp/src/main/groovy/org/grails/gsp/compiler/GroovyPageCompiler.groovy

@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.pages
-
+package org.grails.gsp.compiler
 import org.apache.commons.logging.LogFactory
 import org.codehaus.groovy.control.CompilationUnit
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.control.Phases
-import org.grails.compiler.web.pages.GroovyPageInjectionOperation
-
+import org.grails.gsp.GroovyPageMetaInfo
+import org.grails.gsp.compiler.transform.GroovyPageInjectionOperation
 /**
  * Used to compile GSP files into a specified target directory.
  *