From 6e03178a8e8819e016d7c8dd0b19a914a69bf2f6 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@pivotal.io>
Date: Fri, 2 Jan 2015 19:04:45 +0200
Subject: [PATCH] GRAILS-11837 Make GSP template engine independent of Servlet
 API

---
 grails-gsp/build.gradle                       |   6 +-
 .../groovy/org/grails/gsp/GroovyPage.java     |  50 ++----
 .../org/grails/gsp/GroovyPageBinding.java     |   2 +-
 .../org/grails/gsp/GroovyPageMetaInfo.java    |   2 +-
 .../org/grails/gsp/GroovyPageTemplate.java    |  13 +-
 .../org/grails/gsp/GroovyPageWritable.java    | 146 ++++++++----------
 .../grails/gsp/GroovyPagesMetaUtils.groovy    |   5 +-
 .../grails/gsp/GroovyPagesTemplateEngine.java |  78 +---------
 .../gsp}/ResourceAwareTemplateEngine.java     |  18 +--
 .../gsp/io/DefaultGroovyPageLocator.java      |  15 +-
 .../org/grails/gsp/io/GroovyPageLocator.java  |   2 +-
 .../io/GroovyPageStaticResourceLocator.java   |  17 +-
 .../controller/support/RenderHelper.groovy    |   2 +-
 .../web/GroovyPagesGrailsPlugin.groovy        |  10 +-
 .../web/taglib/UrlMappingTagLib.groovy        |   9 +-
 .../web/taglib/ValidationTagLib.groovy        |  11 +-
 .../util/AbstractLinkingRenderer.groovy       |   2 +-
 .../render/DefaultRendererRegistry.groovy     |   2 +-
 .../render/json/DefaultJsonRenderer.groovy    |   2 +-
 .../rest/render/xml/DefaultXmlRenderer.groovy |   2 +-
 .../mixin/support/LazyTagLibraryLookup.java   |  21 ++-
 .../mixin/web/GroovyPageUnitTestMixin.groovy  |  13 +-
 .../test/runtime/ControllerTestPlugin.groovy  |   4 +-
 .../AbstractTemplateVariableBinding.java      |  13 +-
 .../grails}/taglib/GroovyPageAttributes.java  |   6 +-
 .../grails}/taglib/GroovyPageTagWriter.java   |   2 +-
 .../taglib/NamespacedTagDispatcher.groovy     |   3 +-
 .../org/grails}/taglib/TagBodyClosure.java    |  28 ++--
 .../org/grails}/taglib/TagLibraryLookup.java  |   2 +-
 .../grails/taglib}/TagLibraryMetaUtils.groovy |  19 +--
 .../groovy/org/grails}/taglib/TagOutput.java  |  19 ++-
 .../TemplateNamespacedTagDispatcher.groovy    |  10 +-
 .../taglib/TemplateVariableBinding.java       |  39 ++---
 .../encoder/DefaultOutputContextLookup.java   | 128 +++++++++++++++
 .../grails/taglib/encoder/OutputContext.java  |  45 ++++++
 .../taglib/encoder/OutputContextLookup.java   |  24 +++
 .../encoder/OutputContextLookupHelper.java    |  33 ++++
 .../encoder/OutputEncodingSettings.groovy     |   8 +-
 .../taglib/encoder/OutputEncodingStack.java   |  67 ++++----
 .../OutputEncodingStackAttributes.java        |  21 ++-
 .../main/resources/META-INF/grails.factories  |   1 +
 .../taglib/GroovyPageAttributesTests.groovy   |   4 +-
 .../taglib/GroovyPageTagWriterSpec.groovy     |   3 +-
 .../web/taglib/AbstractGrailsTagTests.groovy  |  32 ++--
 .../GrailsLayoutDecoratorMapperTests.java     |  26 ++--
 .../groovy/grails/gsp/PageRendererSpec.groovy |   4 +-
 .../web/pages/GroovyPageServletSpec.groovy    |   2 +-
 grails-web-common/build.gradle                |   4 +-
 .../errors/GrailsWrappedRuntimeException.java |   2 +-
 .../DefaultGrailsApplicationAttributes.java   |  33 ++--
 .../web/util/GrailsApplicationAttributes.java |  15 +-
 .../plugins/web/taglib/RenderTagLib.groovy    |  13 +-
 .../plugins/web/taglib/SitemeshTagLib.groovy  |   2 +-
 .../web/pages/StandaloneTagLibraryLookup.java |   2 +-
 grails-web-gsp/build.gradle                   |   2 +-
 .../groovy/grails/gsp/PageRenderer.groovy     |   2 +-
 .../web}/gsp/GroovyPagesTemplateRenderer.java |  12 +-
 ...hingGrailsConventionGroovyPageLocator.java |   7 +-
 .../io/GrailsConventionGroovyPageLocator.java |   6 +-
 .../grails/web/pages/GroovyPagesServlet.java  |  10 +-
 .../servlet/view/GroovyPageViewResolver.java  |   2 +-
 ...ailsConventionGroovyPageLocatorSpec.groovy |   6 +-
 .../view/GroovyPageViewResolverSpec.groovy    |   2 +-
 .../groovy/grails/artefact/TagLibrary.groovy  |   8 +-
 .../artefact/gsp/TagLibraryInvoker.groovy     |   8 +-
 .../web/taglib/TagLibraryTransformer.java     |  13 +-
 .../WebRequestTemplateVariableBinding.java    |  27 +++-
 .../encoder/WebOutputContextLookup.java       | 121 +++++++++++++++
 .../encoder/WebRequestOutputContext.java      |  34 ++++
 .../main/resources/META-INF/grails.factories  |   1 +
 .../web/taglib/TagLibraryLookupSpec.groovy    |   2 +
 71 files changed, 798 insertions(+), 507 deletions(-)
 rename {grails-web-common/src/main/groovy/org/grails/web/support => grails-gsp/src/main/groovy/org/grails/gsp}/ResourceAwareTemplateEngine.java (93%)
 rename {grails-web-taglib/src/main/groovy/org/grails/web => grails-taglib/src/main/groovy/org/grails}/taglib/AbstractTemplateVariableBinding.java (95%)
 rename {grails-web-taglib/src/main/groovy/org/grails/web => grails-taglib/src/main/groovy/org/grails}/taglib/GroovyPageAttributes.java (95%)
 rename {grails-web-taglib/src/main/groovy/org/grails/web => grails-taglib/src/main/groovy/org/grails}/taglib/GroovyPageTagWriter.java (97%)
 rename {grails-web-taglib/src/main/groovy/org/grails/web => grails-taglib/src/main/groovy/org/grails}/taglib/NamespacedTagDispatcher.groovy (96%)
 rename {grails-web-taglib/src/main/groovy/org/grails/web => grails-taglib/src/main/groovy/org/grails}/taglib/TagBodyClosure.java (89%)
 rename {grails-web-taglib/src/main/groovy/org/grails/web => grails-taglib/src/main/groovy/org/grails}/taglib/TagLibraryLookup.java (99%)
 rename {grails-web-taglib/src/main/groovy/org/grails/web/taglib/util => grails-taglib/src/main/groovy/org/grails/taglib}/TagLibraryMetaUtils.groovy (93%)
 rename {grails-web-taglib/src/main/groovy/org/grails/web => grails-taglib/src/main/groovy/org/grails}/taglib/TagOutput.java (91%)
 rename {grails-web-taglib/src/main/groovy/org/grails/web => grails-taglib/src/main/groovy/org/grails}/taglib/TemplateNamespacedTagDispatcher.groovy (94%)
 rename {grails-web-taglib/src/main/groovy/org/grails/web => grails-taglib/src/main/groovy/org/grails}/taglib/TemplateVariableBinding.java (79%)
 create mode 100644 grails-taglib/src/main/groovy/org/grails/taglib/encoder/DefaultOutputContextLookup.java
 create mode 100644 grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContext.java
 create mode 100644 grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContextLookup.java
 create mode 100644 grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContextLookupHelper.java
 create mode 100644 grails-taglib/src/main/resources/META-INF/grails.factories
 rename {grails-test-suite-web/src/test/groovy/org/grails/web => grails-taglib/src/test/groovy/org/grails}/taglib/GroovyPageAttributesTests.groovy (97%)
 rename {grails-web-taglib/src/test/groovy/org/grails/web => grails-taglib/src/test/groovy/org/grails}/taglib/GroovyPageTagWriterSpec.groovy (85%)
 rename {grails-gsp/src/main/groovy/org/grails => grails-web-gsp/src/main/groovy/org/grails/web}/gsp/GroovyPagesTemplateRenderer.java (97%)
 rename {grails-gsp/src/main/groovy/org/grails => grails-web-gsp/src/main/groovy/org/grails/web}/gsp/io/CachingGrailsConventionGroovyPageLocator.java (97%)
 rename {grails-gsp/src/main/groovy/org/grails => grails-web-gsp/src/main/groovy/org/grails/web}/gsp/io/GrailsConventionGroovyPageLocator.java (98%)
 rename {grails-gsp/src/test/groovy/org/grails => grails-web-gsp/src/test/groovy/org/grails/web}/gsp/io/GrailsConventionGroovyPageLocatorSpec.groovy (98%)
 create mode 100644 grails-web-taglib/src/main/groovy/org/grails/web/taglib/encoder/WebOutputContextLookup.java
 create mode 100644 grails-web-taglib/src/main/groovy/org/grails/web/taglib/encoder/WebRequestOutputContext.java

diff --git a/grails-gsp/build.gradle b/grails-gsp/build.gradle
index 6ad28cc6707..ed86f9be87d 100644
--- a/grails-gsp/build.gradle
+++ b/grails-gsp/build.gradle
@@ -1,3 +1,7 @@
 dependencies {
-    compile( project(":grails-web-taglib") )
+    compile project(":grails-core"), {
+        exclude group:'org.grails', module:'grails-spring'
+    }
+    compile project(":grails-taglib")
+    compile "org.codehaus.groovy:groovy-templates:$groovyVersion"
 }
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPage.java b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPage.java
index f3fcabc4ed7..f63c784f6c6 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPage.java
+++ b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPage.java
@@ -30,14 +30,12 @@
 import org.grails.gsp.jsp.JspTag;
 import org.grails.gsp.jsp.JspTagLib;
 import org.grails.gsp.jsp.TagLibraryResolver;
+import org.grails.taglib.*;
+import org.grails.taglib.encoder.OutputContext;
 import org.grails.taglib.encoder.OutputEncodingStack;
 import org.grails.taglib.encoder.OutputEncodingStackAttributes;
 import org.grails.taglib.encoder.WithCodecHelper;
-import org.grails.web.servlet.mvc.GrailsWebRequest;
-import org.grails.web.taglib.*;
-import org.grails.taglib.GrailsTagException;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.Writer;
 import java.util.*;
 
@@ -58,42 +56,22 @@ public abstract class GroovyPage extends Script {
 
     private static final Log LOG = LogFactory.getLog(GroovyPage.class);
 
-    public static final String REQUEST = "request";
-    public static final String SERVLET_CONTEXT = "application";
-    public static final String RESPONSE = "response";
     public static final String OUT = "out";
     public static final String EXPRESSION_OUT = "expressionOut";
     public static final String EXPRESSION_OUT_STATEMENT = EXPRESSION_OUT; // "getCodecOut()";
     public static final String OUT_STATEMENT = OUT; // "getOut()";
     public static final String CODEC_VARNAME = "Codec";
-    public static final String ATTRIBUTES = "attributes";
-    public static final String APPLICATION_CONTEXT = "applicationContext";
-    public static final String SESSION = "session";
-    public static final String PARAMS = "params";
-    public static final String FLASH = "flash";
     public static final String PLUGIN_CONTEXT_PATH = "pluginContextPath";
     public static final String EXTENSION = ".gsp";
-    public static final String WEB_REQUEST = "webRequest";
     public static final String DEFAULT_NAMESPACE = "g";
     public static final String LINK_NAMESPACE = "link";
     public static final String TEMPLATE_NAMESPACE = "tmpl";
     public static final String PAGE_SCOPE = "pageScope";
-    public static final String CONTROLLER_NAME = "controllerName";
-    public static final String SUFFIX = ".gsp";
-    public static final String ACTION_NAME = "actionName";
 
     public static final Collection<String> RESERVED_NAMES = CollectionUtils.newSet(
-            REQUEST,
-            SERVLET_CONTEXT,
-            RESPONSE,
             OUT,
             EXPRESSION_OUT,
             CODEC_VARNAME,
-            ATTRIBUTES,
-            APPLICATION_CONTEXT,
-            SESSION,
-            PARAMS,
-            FLASH,
             PLUGIN_CONTEXT_PATH,
             PAGE_SCOPE);
 
@@ -109,9 +87,8 @@ public abstract class GroovyPage extends Script {
     private GrailsPrintWriter staticOut;
     private GrailsPrintWriter expressionOut;
     private OutputEncodingStack outputStack;
-    private GrailsWebRequest webRequest;
+    private OutputContext outputContext;
     private String pluginContextPath;
-    private HttpServletRequest request;
     private Encoder rawEncoder;
 
     private final List<Closure<?>> bodyClosures = new ArrayList<Closure<?>>(15);
@@ -136,7 +113,7 @@ public void setOut(Writer newWriter) {
         throw new IllegalStateException("Setting out in page isn't allowed.");
     }
 
-    public void initRun(Writer target, GrailsWebRequest grailsWebRequest, GroovyPageMetaInfo metaInfo) {
+    public void initRun(Writer target, OutputContext outputContext, GroovyPageMetaInfo metaInfo) {
         OutputEncodingStackAttributes.Builder attributesBuilder = new OutputEncodingStackAttributes.Builder();
         if (metaInfo != null) {
             setJspTags(metaInfo.getJspTags());
@@ -150,7 +127,7 @@ public void initRun(Writer target, GrailsWebRequest grailsWebRequest, GroovyPage
             attributesBuilder.defaultTaglibEncoder(metaInfo.getTaglibEncoder());
         }
         attributesBuilder.allowCreate(true).topWriter(target).autoSync(false).pushTop(true);
-        attributesBuilder.webRequest(grailsWebRequest);
+        attributesBuilder.outputContext(outputContext);
         attributesBuilder.inheritPreviousEncoders(false);
         outputStack = OutputEncodingStack.currentStack(attributesBuilder.build());
 
@@ -158,11 +135,10 @@ public void initRun(Writer target, GrailsWebRequest grailsWebRequest, GroovyPage
         staticOut = outputStack.getStaticWriter();
         expressionOut = outputStack.getExpressionWriter();
 
-        this.webRequest = grailsWebRequest;
-        if (grailsWebRequest != null) {
-            grailsWebRequest.setOut(out);
-            request = grailsWebRequest.getCurrentRequest();
-            GrailsApplication grailsApplication = grailsWebRequest.getAttributes().getGrailsApplication();
+        this.outputContext = outputContext;
+        if (outputContext != null) {
+            outputContext.setCurrentWriter(out);
+            GrailsApplication grailsApplication = outputContext.getGrailsApplication();
             if (grailsApplication != null) {
                 rawEncoder = WithCodecHelper.lookupEncoder(grailsApplication, "Raw");
             }
@@ -427,7 +403,7 @@ private void invokeTagLibClosure(String tagName, String tagNamespace, Closure<?>
         try {
             Map<String, Object> codecSettings = TagOutput.createCodecSettings(tagNamespace, tagName, attrs, defaultEncodeAs);
             if (codecSettings != null) {
-                outputStack.push(WithCodecHelper.createOutputStackAttributesBuilder(codecSettings, webRequest.getAttributes().getGrailsApplication()).build());
+                outputStack.push(WithCodecHelper.createOutputStackAttributesBuilder(codecSettings, outputContext.getGrailsApplication()).build());
                 encodeAsPushedToStack=true;
             }
             Object tagresult = null;
@@ -522,8 +498,8 @@ public final OutputEncodingStack getOutputStack() {
         return outputStack;
     }
 
-    public final HttpServletRequest getRequest() {
-        return request;
+    public OutputContext getOutputContext() {
+        return outputContext;
     }
 
     public final void registerSitemeshPreprocessMode() {
@@ -542,7 +518,7 @@ public final void registerSitemeshPreprocessMode() {
     }
 
     public final void createTagBody(int bodyClosureIndex, Closure<?> bodyClosure) {
-        TagBodyClosure tagBody = new TagBodyClosure(this, webRequest, bodyClosure, true);
+        TagBodyClosure tagBody = new TagBodyClosure(this, outputContext, bodyClosure, true);
         setBodyClosure(bodyClosureIndex, tagBody);
     }
 
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageBinding.java b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageBinding.java
index cea6f3577ef..9f9c9337b7a 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageBinding.java
+++ b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageBinding.java
@@ -19,7 +19,7 @@
 import groovy.lang.Binding;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.grails.web.taglib.TemplateVariableBinding;
+import org.grails.taglib.TemplateVariableBinding;
 
 import java.util.Map;
 
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageMetaInfo.java b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageMetaInfo.java
index f22313670ea..30f8a2e3353 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageMetaInfo.java
+++ b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageMetaInfo.java
@@ -27,8 +27,8 @@
 import org.grails.encoder.Encoder;
 import org.grails.gsp.compiler.GroovyPageParser;
 import org.grails.gsp.jsp.TagLibraryResolver;
+import org.grails.taglib.TagLibraryLookup;
 import org.grails.taglib.encoder.WithCodecHelper;
-import org.grails.web.taglib.TagLibraryLookup;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageTemplate.java b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageTemplate.java
index befa322c0c1..c6c5a34b46f 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageTemplate.java
+++ b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageTemplate.java
@@ -17,6 +17,8 @@
 
 import groovy.lang.Writable;
 import groovy.text.Template;
+import org.grails.taglib.encoder.OutputContextLookup;
+import org.grails.taglib.encoder.OutputContextLookupHelper;
 
 import java.util.Map;
 
@@ -27,21 +29,26 @@
  * @since 0.5
  */
 public class GroovyPageTemplate implements Template, Cloneable {
-
+    private final OutputContextLookup outputContextLookup;
     private GroovyPageMetaInfo metaInfo;
     private boolean allowSettingContentType = false;
 
     public GroovyPageTemplate(GroovyPageMetaInfo metaInfo) {
+        this(metaInfo, OutputContextLookupHelper.getOutputContextLookup());
+    }
+
+    public GroovyPageTemplate(GroovyPageMetaInfo metaInfo, OutputContextLookup outputContextLookup) {
         this.metaInfo = metaInfo;
+        this.outputContextLookup = outputContextLookup;
     }
 
     public Writable make() {
-        return new GroovyPageWritable(metaInfo, allowSettingContentType);
+        return new GroovyPageWritable(metaInfo, outputContextLookup, allowSettingContentType);
     }
 
     @SuppressWarnings("rawtypes")
     public Writable make(Map binding) {
-        GroovyPageWritable gptw = new GroovyPageWritable(metaInfo, allowSettingContentType);
+        GroovyPageWritable gptw = new GroovyPageWritable(metaInfo, outputContextLookup, allowSettingContentType);
         gptw.setBinding(binding);
         return gptw;
     }
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageWritable.java b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageWritable.java
index 0d7229341b9..edb189bd552 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageWritable.java
+++ b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPageWritable.java
@@ -20,21 +20,16 @@
 import groovy.lang.Writable;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-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;
-import javax.servlet.http.HttpServletResponse;
+import org.grails.taglib.AbstractTemplateVariableBinding;
+import org.grails.taglib.TemplateVariableBinding;
+import org.grails.taglib.encoder.OutputContext;
+import org.grails.taglib.encoder.OutputContextLookup;
+
 import java.io.*;
 import java.text.DateFormat;
 import java.util.Date;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Writes itself to the specified writer, typically the response writer.
@@ -45,31 +40,30 @@
  */
 class GroovyPageWritable implements Writable {
     private static final Log LOG = LogFactory.getLog(GroovyPageWritable.class);
-    private static final String ATTRIBUTE_NAME_DEBUG_TEMPLATES_ID_COUNTER = "org.codehaus.groovy.grails.web.pages.DEBUG_TEMPLATES_COUNTER";
     private static final String GSP_NONE_CODEC_NAME = "none";
-    private HttpServletResponse response;
-    private HttpServletRequest request;
     private GroovyPageMetaInfo metaInfo;
-    private boolean showSource;
-    private boolean debugTemplates;
-    private AtomicInteger debugTemplatesIdCounter;
-    private GrailsWebRequest webRequest;
+    private OutputContextLookup outputContextLookup;
     private boolean allowSettingContentType;
-
     @SuppressWarnings("rawtypes")
-    private Map additionalBinding = new HashMap();
-    private static final String GROOVY_SOURCE_CONTENT_TYPE = "text/plain";
+    private Map additionalBinding = new LinkedHashMap();
+    private boolean showSource;
 
-    public GroovyPageWritable(GroovyPageMetaInfo metaInfo, boolean allowSettingContentType) {
+    private static final String GROOVY_SOURCE_CONTENT_TYPE = "text/plain";
+    public GroovyPageWritable(GroovyPageMetaInfo metaInfo, OutputContextLookup outputContextLookup, boolean allowSettingContentType) {
         this.metaInfo = metaInfo;
+        this.outputContextLookup = outputContextLookup;
         this.allowSettingContentType = allowSettingContentType;
-        webRequest = (GrailsWebRequest) RequestContextHolder.getRequestAttributes();
-        if (webRequest != null) {
-            request = webRequest.getCurrentRequest();
-            HttpServletResponse wrapped = WrappedResponseHolder.getWrappedResponse();
-            response = wrapped != null ? wrapped : webRequest.getCurrentResponse();
-        }
-        showSource = shouldShowGroovySource();
+    }
+
+
+        /*
+    private static final String ATTRIBUTE_NAME_DEBUG_TEMPLATES_ID_COUNTER = "org.codehaus.groovy.grails.web.pages.DEBUG_TEMPLATES_COUNTER";
+
+        TODO: implement debugging GSPs at development time
+
+    private boolean debugTemplates;
+    private AtomicInteger debugTemplatesIdCounter;
+
         debugTemplates = shouldDebugTemplates();
         if (debugTemplates) {
             debugTemplatesIdCounter=(AtomicInteger)request.getAttribute(ATTRIBUTE_NAME_DEBUG_TEMPLATES_ID_COUNTER);
@@ -78,7 +72,6 @@ public GroovyPageWritable(GroovyPageMetaInfo metaInfo, boolean allowSettingConte
                 request.setAttribute(ATTRIBUTE_NAME_DEBUG_TEMPLATES_ID_COUNTER, debugTemplatesIdCounter);
             }
         }
-    }
 
     private boolean shouldDebugTemplates() {
         return request != null && request.getParameter("debugTemplates") != null && Environment.getCurrent() == Environment.DEVELOPMENT;
@@ -89,6 +82,7 @@ private boolean shouldShowGroovySource() {
             (Environment.getCurrent() == Environment.DEVELOPMENT) &&
             metaInfo.getGroovySource() != null;
     }
+    */
 
     /**
      * This sets any additional variables that need to be placed in the Binding of the GSP page.
@@ -102,14 +96,6 @@ public void setBinding(Map binding) {
         }
     }
 
-    /**
-     * Set to true if the generated source should be output instead
-     * @param showSource True if source output should be output
-     */
-    public void setShowSource(boolean showSource) {
-        this.showSource = showSource;
-    }
-
     /**
      * Writes the template to the specified Writer
      *
@@ -118,69 +104,63 @@ public void setShowSource(boolean showSource) {
      * @throws IOException
      */
     public Writer writeTo(Writer out) throws IOException {
+        OutputContext outputContext = outputContextLookup.lookupOutputContext();
         try {
-            return doWriteTo(out);
+            return doWriteTo(outputContext, out);
         } finally {
-            doCleanUp(out);
+            doCleanUp(outputContext, out);
         }
     }
 
-    protected void doCleanUp(Writer out) {
+    protected void doCleanUp(OutputContext outputContext, Writer out) {
         metaInfo.writeToFinished(out);
     }
 
-    protected Writer doWriteTo(Writer out) throws IOException {
-        if (showSource) {
+    protected Writer doWriteTo(OutputContext outputContext, Writer out) throws IOException {
+        if (shouldShowGroovySource(outputContext)) {
             // Set it to TEXT
-            response.setContentType(GROOVY_SOURCE_CONTENT_TYPE); // must come before response.getOutputStream()
+            outputContext.setContentType(GROOVY_SOURCE_CONTENT_TYPE); // must come before response.getOutputStream()
             writeGroovySourceToResponse(metaInfo, out);
         }
         else {
+            boolean debugTemplates = shouldDebugTemplates(outputContext);
+
             // Set it to HTML by default
             if (metaInfo.getCompilationException()!=null) {
                 throw metaInfo.getCompilationException();
             }
 
             // Set up the script context
-            TemplateVariableBinding parentBinding = null;
-            boolean hasRequest = request != null;
+            AbstractTemplateVariableBinding parentBinding = null;
+            boolean hasRequest = outputContext != null;
             boolean newParentCreated = false;
 
             if (hasRequest) {
-                parentBinding = (TemplateVariableBinding) request.getAttribute(GrailsApplicationAttributes.PAGE_SCOPE);
+                parentBinding = outputContext.getBinding();
                 if (parentBinding == null) {
-                    if (webRequest != null) {
-                        parentBinding = new TemplateVariableBinding(new WebRequestTemplateVariableBinding(webRequest));
-                        parentBinding.setRoot(true);
+                    if (outputContext != null) {
+                        parentBinding = outputContext.createAndRegisterRootBinding();
                         newParentCreated = true;
                     }
                 }
             }
 
-            if (allowSettingContentType && response != null) {
+            if (allowSettingContentType && hasRequest) {
                 // only try to set content type when evaluating top level GSP
-                boolean contentTypeAlreadySet = response.isCommitted() || response.getContentType() != null;
+                boolean contentTypeAlreadySet = outputContext.isContentTypeAlreadySet();
                 if (!contentTypeAlreadySet) {
                     if (LOG.isDebugEnabled()) {
-                        LOG.debug("Writing response to ["+response.getClass()+"] with content type: " + metaInfo.getContentType());
+                        LOG.debug("Writing output with content type: " + metaInfo.getContentType());
                     }
-                    response.setContentType(metaInfo.getContentType()); // must come before response.getWriter()
+                    outputContext.setContentType(metaInfo.getContentType()); // must come before response.getWriter()
                 }
             }
 
             GroovyPageBinding binding = createBinding(parentBinding);
-            String previousGspCode = GSP_NONE_CODEC_NAME;
             if (hasRequest) {
-                request.setAttribute(GrailsApplicationAttributes.PAGE_SCOPE, binding);
-                previousGspCode = (String)request.getAttribute(GrailsApplicationAttributes.GSP_CODEC);
+                outputContext.setBinding(binding);
             }
 
-            makeLegacyCodecVariablesAvailable(hasRequest, binding);
-
-            binding.setVariableDirectly(GroovyPage.RESPONSE, response);
-            binding.setVariableDirectly(GroovyPage.REQUEST, request);
-            // support development mode's evaluate (so that doesn't search for missing variable in parent bindings)
-
             GroovyPage page = null;
             try {
                 page = (GroovyPage)metaInfo.getPageClass().newInstance();
@@ -190,12 +170,12 @@ protected Writer doWriteTo(Writer out) throws IOException {
             page.setBinding(binding);
             binding.setOwner(page);
 
-            page.initRun(out, webRequest, metaInfo);
+            page.initRun(out, outputContext, metaInfo);
 
             int debugId = 0;
             long debugStartTimeMs = 0;
             if (debugTemplates) {
-                debugId = debugTemplatesIdCounter.incrementAndGet();
+                debugId = incrementAndGetDebugTemplatesIdCounter(outputContext);
                 out.write("<!-- GSP #");
                 out.write(String.valueOf(debugId));
                 out.write(" START template: ");
@@ -214,11 +194,10 @@ protected Writer doWriteTo(Writer out) throws IOException {
                 page.cleanup();
                 if (hasRequest) {
                     if (newParentCreated) {
-                        request.removeAttribute(GrailsApplicationAttributes.PAGE_SCOPE);
+                        outputContext.setBinding(null);
                     } else  {
-                        request.setAttribute(GrailsApplicationAttributes.PAGE_SCOPE, parentBinding);
+                        outputContext.setBinding(parentBinding);
                     }
-                    request.setAttribute(GrailsApplicationAttributes.GSP_CODEC, previousGspCode != null ? previousGspCode : GSP_NONE_CODEC_NAME);
                 }
             }
             if (debugTemplates) {
@@ -234,22 +213,29 @@ protected Writer doWriteTo(Writer out) throws IOException {
         return out;
     }
 
-    private void makeLegacyCodecVariablesAvailable(boolean hasRequest, TemplateVariableBinding binding) {
-        if (metaInfo.getExpressionEncoder() != null) {
-            if (hasRequest) {
-                request.setAttribute(GrailsApplicationAttributes.GSP_CODEC, metaInfo.getExpressionEncoder().getCodecIdentifier().getCodecName());
-            }
-            binding.setVariableDirectly(GroovyPage.CODEC_VARNAME, metaInfo.getExpressionEncoder());
-        } else {
-            if (hasRequest) {
-                request.setAttribute(GrailsApplicationAttributes.GSP_CODEC, GSP_NONE_CODEC_NAME);
-            }
-            binding.setVariableDirectly(GroovyPage.CODEC_VARNAME, gspNoneCodeInstance);
-        }
+    private int incrementAndGetDebugTemplatesIdCounter(OutputContext outputContext) {
+        //debugTemplatesIdCounter.incrementAndGet()
+        return 0;
+    }
+
+    private boolean shouldDebugTemplates(OutputContext outputContext) {
+        return false;
+    }
+
+    private boolean shouldShowGroovySource(OutputContext outputContext) {
+        return isShowSource() && Environment.getCurrent() == Environment.DEVELOPMENT && metaInfo.getGroovySource() != null;
     }
 
     private static final GspNoneCodec gspNoneCodeInstance = new GspNoneCodec();
 
+    public boolean isShowSource() {
+        return showSource;
+    }
+
+    public void setShowSource(boolean showSource) {
+        this.showSource = showSource;
+    }
+
     private static final class GspNoneCodec {
         @SuppressWarnings("unused")
         public final Object encode(Object object) {
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesMetaUtils.groovy b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesMetaUtils.groovy
index fdfd5576e30..c23380cd6b2 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesMetaUtils.groovy
+++ b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesMetaUtils.groovy
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 package org.grails.gsp
-
 import grails.util.Environment
 import grails.util.GrailsMetaClassUtils
 import groovy.transform.CompileStatic
-import org.grails.web.taglib.TagLibraryLookup
-import org.grails.web.taglib.util.TagLibraryMetaUtils
+import org.grails.taglib.TagLibraryLookup
+import org.grails.taglib.TagLibraryMetaUtils
 
 @CompileStatic
 class GroovyPagesMetaUtils {
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesTemplateEngine.java b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesTemplateEngine.java
index 37cca339271..38cc7df4811 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesTemplateEngine.java
+++ b/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesTemplateEngine.java
@@ -36,27 +36,18 @@
 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.grails.web.util.GrailsApplicationAttributes;
+import org.grails.taglib.TagLibraryLookup;
 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.context.ResourceLoaderAware;
 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;
@@ -84,7 +75,7 @@
  *
  * @since 0.1
  */
-public class GroovyPagesTemplateEngine extends ResourceAwareTemplateEngine implements ApplicationContextAware, ServletContextAware, InitializingBean, ApplicationListener<ContextRefreshedEvent>, BeanClassLoaderAware {
+public class GroovyPagesTemplateEngine extends ResourceAwareTemplateEngine implements ResourceLoaderAware, ApplicationContextAware, InitializingBean, BeanClassLoaderAware {
 
     public static final String CONFIG_PROPERTY_DISABLE_CACHING_RESOURCES = Settings.GSP_DISABLE_CACHING_RESOURCES;
     public static final String CONFIG_PROPERTY_GSP_ENABLE_RELOAD = Settings.GSP_ENABLE_RELOAD;
@@ -107,7 +98,6 @@ public class GroovyPagesTemplateEngine extends ResourceAwareTemplateEngine imple
 
     private GrailsApplication grailsApplication;
     private Map<String, Class<?>> cachedDomainsWithoutPackage;
-    private ServletContext servletContext;
 
     private List<GroovyPageSourceDecorator> groovyPageSourceDecorators = new ArrayList();
 
@@ -165,15 +155,6 @@ public GroovyPagesTemplateEngine() {
         // default
     }
 
-    /**
-     * @param servletContext The servlet context
-     * @deprecated here for compatibility
-     */
-    @Deprecated
-    public GroovyPagesTemplateEngine(ServletContext servletContext) {
-        this.servletContext = servletContext;
-    }
-
     public void setGroovyPageSourceDecorators(List<GroovyPageSourceDecorator> groovyPageSourceDecorators){
     	this.groovyPageSourceDecorators = groovyPageSourceDecorators;
     }
@@ -232,11 +213,10 @@ public void setClassLoader(ClassLoader classLoader) {
      * to retrieve the actual line number within the GSP page if the line number within the
      * compiled GSP is known
      *
-     * @param context The ServletContext instance
      * @param url The URL of the page
      * @return An array where the index is the line number witin the compiled GSP and the value is the line number within the source
      */
-    public int[] calculateLineNumbersForPage(ServletContext context, String url) {
+    public int[] calculateLineNumbersForPage(String url) {
         try {
             Template t = createTemplate(url);
             if (t instanceof GroovyPageTemplate) {
@@ -252,7 +232,7 @@ public int[] calculateLineNumbersForPage(ServletContext context, String url) {
     }
 
     public int mapStackLineNumber(String url, int lineNumber) {
-        int[] lineNumbers = calculateLineNumbersForPage(null, url);
+        int[] lineNumbers = calculateLineNumbersForPage(url);
         if (lineNumber < lineNumbers.length) {
             lineNumber = lineNumbers[lineNumber - 1];
         }
@@ -280,8 +260,7 @@ public Template createTemplate(Resource resource) {
     @Override
     public Template createTemplate(Resource resource, final boolean cacheable) {
         if (resource == null) {
-            GrailsWebRequest webRequest = getWebRequest();
-            throw new GroovyPagesException("No Groovy page found for URI: " + getCurrentRequestUri(webRequest.getCurrentRequest()));
+            throw new GroovyPagesException("Resource is null. No Groovy page found.");
         }
         //Yags: Because, "pageName" was sent as null originally, it is never go in pageCache, but will force to compile the String again and till the time this request
         // is getting executed, it will occupy space in PermGen space. So if there are 1000 request for the same resource at a particular instance, there will be 1000 instance
@@ -419,19 +398,6 @@ public Template createTemplate(String txt, String pageName) throws IOException {
         return createTemplate(new ByteArrayResource(txt.getBytes("UTF-8"), pageName), pageName, pageName != null);
     }
 
-    /**
-     * Creates a Template for the currently executing Request
-     *
-     * @return The Template for the currently executing request
-     * @throws java.io.IOException    Thrown when an exception occurs Reading the Template
-     * @throws ClassNotFoundException  Thrown when the class of the template was not found
-     */
-    public Template createTemplate() {
-        GrailsWebRequest webRequest = getWebRequest();
-        String uri = getCurrentRequestUri(webRequest.getCurrentRequest());
-        return createTemplate(uri);
-    }
-
     /**
      * Creates a Template for the given file
      *
@@ -534,7 +500,7 @@ public Resource getResourceForUri(String uri) {
         if (scriptSource != null && (scriptSource instanceof GroovyPageResourceScriptSource)) {
             return ((GroovyPageResourceScriptSource)scriptSource).getResource();
         }
-        return new ServletContextResource(servletContext, uri);
+        return null;
     }
 
     private GroovyPageScriptSource getResourceWithinContext(String uri) {
@@ -707,10 +673,6 @@ private GroovyPageMetaInfo createPageMetaInfo(GroovyPageParser parse, InputStrea
         return pageMeta;
     }
 
-    private GrailsWebRequest getWebRequest() {
-        return (GrailsWebRequest) RequestContextHolder.currentRequestAttributes();
-    }
-
     /**
      * Establishes the name to use for the given resource
      *
@@ -760,19 +722,6 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
         }
     }
 
-    /**
-     * Return the page identifier.
-     * @param request The HttpServletRequest instance
-     * @return The page id
-     */
-    public String getCurrentRequestUri(HttpServletRequest request) {
-        Object includePath = request.getAttribute("javax.servlet.include.servlet_path");
-        if (includePath != null) {
-            return (String)includePath;
-        }
-        return request.getServletPath();
-    }
-
     /**
      * Returns the path to the view of the relative URI within the Grails views directory
      *
@@ -793,7 +742,7 @@ protected String getUriWithinGrailsViews(String relativeUri) {
             tokens = new String[]{relativeUri};
         }
 
-        buf.append(GrailsApplicationAttributes.PATH_TO_VIEWS);
+        buf.append(DefaultGroovyPageLocator.PATH_TO_WEB_INF_VIEWS);
         for (String token : tokens) {
             buf.append('/').append(token);
         }
@@ -851,17 +800,6 @@ private Map<String, Class<?>> createDomainClassMap() {
         return domainsWithoutPackage;
     }
 
-    public void setServletContext(ServletContext servletContext) {
-        this.servletContext = servletContext;
-    }
-
-    @Override
-    public void onApplicationEvent(ContextRefreshedEvent event) {
-        if(servletContext != null && servletContext.getAttribute(GrailsApplicationAttributes.APPLICATION_CONTEXT)==null) {
-            servletContext.setAttribute(GrailsApplicationAttributes.APPLICATION_CONTEXT, event.getApplicationContext());
-        }
-    }
-
     @Override
     public void setBeanClassLoader(ClassLoader beanClassLoader) {
         // support passing BeanClassLoader as parent classloader for templates
diff --git a/grails-web-common/src/main/groovy/org/grails/web/support/ResourceAwareTemplateEngine.java b/grails-gsp/src/main/groovy/org/grails/gsp/ResourceAwareTemplateEngine.java
similarity index 93%
rename from grails-web-common/src/main/groovy/org/grails/web/support/ResourceAwareTemplateEngine.java
rename to grails-gsp/src/main/groovy/org/grails/gsp/ResourceAwareTemplateEngine.java
index bce82b0f650..13f2bc95ef2 100644
--- a/grails-web-common/src/main/groovy/org/grails/web/support/ResourceAwareTemplateEngine.java
+++ b/grails-gsp/src/main/groovy/org/grails/gsp/ResourceAwareTemplateEngine.java
@@ -13,27 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.support;
+package org.grails.gsp;
 
 import grails.io.IOUtils;
 import groovy.text.Template;
 import groovy.text.TemplateEngine;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.net.URL;
-
 import org.codehaus.groovy.control.CompilationFailedException;
-import org.grails.buffer.StreamByteBuffer;
 import org.codehaus.groovy.runtime.DefaultGroovyMethodsSupport;
+import org.grails.buffer.StreamByteBuffer;
 import org.springframework.core.io.Resource;
 
+import java.io.*;
+import java.net.URL;
+
 /**
  * An abstract TemplateEngine that extends the default Groovy TemplateEngine (@see groovy.text.TemplateEngine) and
  * provides the ability to create templates from the Spring Resource API
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/io/DefaultGroovyPageLocator.java b/grails-gsp/src/main/groovy/org/grails/gsp/io/DefaultGroovyPageLocator.java
index f9fc51c7154..b728dc82540 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/io/DefaultGroovyPageLocator.java
+++ b/grails-gsp/src/main/groovy/org/grails/gsp/io/DefaultGroovyPageLocator.java
@@ -26,17 +26,14 @@
 import org.grails.gsp.GroovyPageBinding;
 import org.grails.io.support.GrailsResourceUtils;
 import org.grails.plugins.BinaryGrailsPlugin;
-import org.grails.web.taglib.TemplateVariableBinding;
-import org.grails.web.util.GrailsApplicationAttributes;
+import org.grails.taglib.TemplateVariableBinding;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.web.context.ServletContextAware;
-import org.springframework.web.context.support.ServletContextResourceLoader;
 
-import javax.servlet.ServletContext;
 import java.security.PrivilegedAction;
 import java.util.Collection;
 import java.util.List;
@@ -54,10 +51,10 @@
  * @author Graeme Rocher
  * @since 2.0
  */
-public class DefaultGroovyPageLocator implements GroovyPageLocator, ServletContextAware, ApplicationContextAware, PluginManagerAware {
+public class DefaultGroovyPageLocator implements GroovyPageLocator, ResourceLoaderAware, ApplicationContextAware, PluginManagerAware {
 
     private static final Log LOG = LogFactory.getLog(DefaultGroovyPageLocator.class);
-    private static final String PATH_TO_WEB_INF_VIEWS = GrailsApplicationAttributes.PATH_TO_VIEWS;
+    public static final String PATH_TO_WEB_INF_VIEWS = "/WEB-INF/grails-app/views";
     private static final String SLASHED_VIEWS_DIR_PATH = "/" + GrailsResourceUtils.VIEWS_DIR_PATH;
     private static final String PLUGINS_PATH = "/plugins/";
     private static final String BLANK = "";
@@ -340,10 +337,6 @@ private boolean isPrecompiledAvailable() {
         return precompiledGspMap != null && precompiledGspMap.size() > 0 && warDeployed;
     }
 
-    public void setServletContext(ServletContext servletContext) {
-        addResourceLoader(new ServletContextResourceLoader(servletContext));
-    }
-
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         addResourceLoader(applicationContext);
     }
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/io/GroovyPageLocator.java b/grails-gsp/src/main/groovy/org/grails/gsp/io/GroovyPageLocator.java
index 44a16da1478..67ad5588fac 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/io/GroovyPageLocator.java
+++ b/grails-gsp/src/main/groovy/org/grails/gsp/io/GroovyPageLocator.java
@@ -15,7 +15,7 @@
  */
 package org.grails.gsp.io;
 
-import org.grails.web.taglib.TemplateVariableBinding;
+import org.grails.taglib.TemplateVariableBinding;
 import org.springframework.core.io.ResourceLoader;
 
 /**
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/io/GroovyPageStaticResourceLocator.java b/grails-gsp/src/main/groovy/org/grails/gsp/io/GroovyPageStaticResourceLocator.java
index 69c410caf4b..b932d8a7695 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/io/GroovyPageStaticResourceLocator.java
+++ b/grails-gsp/src/main/groovy/org/grails/gsp/io/GroovyPageStaticResourceLocator.java
@@ -19,11 +19,10 @@
 import org.grails.core.io.DefaultResourceLocator;
 import org.grails.gsp.GroovyPageBinding;
 import org.grails.io.support.GrailsResourceUtils;
-import org.grails.web.servlet.mvc.GrailsWebRequest;
-import org.grails.web.taglib.TemplateVariableBinding;
-import org.grails.web.util.GrailsApplicationAttributes;
+import org.grails.taglib.AbstractTemplateVariableBinding;
+import org.grails.taglib.encoder.OutputContext;
+import org.grails.taglib.encoder.OutputContextLookupHelper;
 import org.springframework.core.io.Resource;
-import org.springframework.web.context.request.RequestAttributes;
 
 /**
  * Extends the {@link DefaultResourceLocator} class with extra methods to evaluate static resources relative to the currently executing GSP page.
@@ -39,7 +38,7 @@ public class GroovyPageStaticResourceLocator extends DefaultResourceLocator {
     public Resource findResourceForURI(String uri) {
         Resource resource = super.findResourceForURI(uri);
         if (resource == null || !resource.exists()) {
-            TemplateVariableBinding binding = findBindingInWebRequest();
+            AbstractTemplateVariableBinding binding = findBindingInOutputContext();
             if (binding instanceof GroovyPageBinding) {
                 GrailsPlugin pagePlugin = ((GroovyPageBinding)binding).getPagePlugin();
                 if (pagePlugin != null && pluginManager != null) {
@@ -66,10 +65,10 @@ private Resource findResourceForPlugin(GrailsPlugin plugin, String uri) {
         return resource;
     }
 
-    private TemplateVariableBinding findBindingInWebRequest() {
-        GrailsWebRequest webRequest = GrailsWebRequest.lookup();
-        if (webRequest != null) {
-            return (TemplateVariableBinding) webRequest.getAttribute(GrailsApplicationAttributes.PAGE_SCOPE, RequestAttributes.SCOPE_REQUEST);
+    protected AbstractTemplateVariableBinding findBindingInOutputContext() {
+        OutputContext outputContext = OutputContextLookupHelper.lookupOutputContext();
+        if (outputContext != null) {
+            return outputContext.getBinding();
         }
         return null;
     }
diff --git a/grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/RenderHelper.groovy b/grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/RenderHelper.groovy
index 48326f98d81..fe9aae92895 100644
--- a/grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/RenderHelper.groovy
+++ b/grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/RenderHelper.groovy
@@ -42,7 +42,7 @@ import org.grails.web.servlet.view.GroovyPageView
 import org.grails.web.sitemesh.GrailsLayoutDecoratorMapper
 import org.grails.web.sitemesh.GrailsLayoutView
 import org.grails.web.sitemesh.GroovyPageLayoutFinder
-import org.grails.web.support.ResourceAwareTemplateEngine
+import org.grails.gsp.ResourceAwareTemplateEngine
 import org.grails.web.util.GrailsApplicationAttributes
 import org.springframework.beans.factory.NoSuchBeanDefinitionException
 import org.springframework.context.ApplicationContext
diff --git a/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesGrailsPlugin.groovy b/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesGrailsPlugin.groovy
index 0d0ee770e50..b505cfbaba5 100644
--- a/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesGrailsPlugin.groovy
+++ b/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesGrailsPlugin.groovy
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 package org.grails.plugins.web
-
 import grails.config.Config
 import grails.core.GrailsClass
 import grails.core.GrailsTagLibClass
@@ -30,27 +29,26 @@ import org.grails.buffer.StreamCharBufferMetaUtils
 import org.grails.core.artefact.TagLibArtefactHandler
 import org.grails.gsp.GroovyPageResourceLoader
 import org.grails.gsp.GroovyPagesTemplateEngine
-import org.grails.gsp.GroovyPagesTemplateRenderer
-import org.grails.gsp.io.CachingGrailsConventionGroovyPageLocator
 import org.grails.gsp.io.CachingGroovyPageStaticResourceLocator
 import org.grails.gsp.jsp.TagLibraryResolverImpl
 import org.grails.plugins.web.taglib.*
 import org.grails.spring.RuntimeSpringConfiguration
+import org.grails.taglib.TagLibraryLookup
+import org.grails.taglib.TagLibraryMetaUtils
 import org.grails.web.errors.ErrorsViewStackTracePrinter
 import org.grails.web.filters.JavascriptLibraryHandlerInterceptor
+import org.grails.web.gsp.GroovyPagesTemplateRenderer
+import org.grails.web.gsp.io.CachingGrailsConventionGroovyPageLocator
 import org.grails.web.pages.DefaultGroovyPagesUriService
 import org.grails.web.pages.FilteringCodecsByContentTypeSettings
 import org.grails.web.pages.GroovyPagesServlet
 import org.grails.web.servlet.view.GroovyPageViewResolver
 import org.grails.web.sitemesh.GroovyPageLayoutFinder
-import org.grails.web.taglib.TagLibraryLookup
-import org.grails.web.taglib.util.TagLibraryMetaUtils
 import org.grails.web.util.GrailsApplicationAttributes
 import org.springframework.beans.factory.config.PropertiesFactoryBean
 import org.springframework.boot.context.embedded.ServletRegistrationBean
 import org.springframework.util.ClassUtils
 import org.springframework.web.servlet.view.InternalResourceViewResolver
-
 /**
  * Sets up and configures the GSP and GSP tag library support in Grails.
  *
diff --git a/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/UrlMappingTagLib.groovy b/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/UrlMappingTagLib.groovy
index 682ccc8bc32..f59bab450a2 100644
--- a/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/UrlMappingTagLib.groovy
+++ b/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/UrlMappingTagLib.groovy
@@ -1,17 +1,20 @@
 package org.grails.plugins.web.taglib
+
 import grails.artefact.TagLibrary
 import grails.gsp.TagLib
-import grails.web.mapping.UrlMapping
 import grails.util.TypeConvertingMap
+import grails.web.mapping.UrlMapping
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.grails.web.metaclass.ControllerDynamicMethods
 import org.grails.encoder.CodecLookup
 import org.grails.encoder.Encoder
+import org.grails.taglib.TagOutput
+import org.grails.taglib.encoder.OutputContextLookupHelper
 import org.grails.web.mapping.ForwardUrlMappingInfo
 import org.grails.web.mapping.UrlMappingUtils
-import org.grails.web.taglib.TagOutput
 import org.grails.web.util.GrailsApplicationAttributes
 import org.springframework.web.servlet.support.RequestContextUtils
+
 /**
  * Tag library with tags that integration with the URL mappings API (paginate, include etc.)
  *
@@ -324,6 +327,6 @@ class UrlMappingTagLib implements TagLibrary{
     }
 
     private callLink(Map attrs, Object body) {
-        TagOutput.captureTagOutput(tagLibraryLookup, 'g', 'link', attrs, body, webRequest)
+        TagOutput.captureTagOutput(tagLibraryLookup, 'g', 'link', attrs, body, OutputContextLookupHelper.lookupOutputContext())
     }
 }
diff --git a/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/ValidationTagLib.groovy b/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/ValidationTagLib.groovy
index 582f2d8bb8a..0c2f0b6f665 100644
--- a/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/ValidationTagLib.groovy
+++ b/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/taglib/ValidationTagLib.groovy
@@ -19,16 +19,11 @@ import grails.artefact.TagLibrary
 import grails.gsp.TagLib
 import groovy.transform.CompileStatic
 import groovy.xml.MarkupBuilder
-
-import java.beans.PropertyEditor
-import java.text.DecimalFormat
-import java.text.DecimalFormatSymbols
-
 import org.apache.commons.lang.StringEscapeUtils
 import org.grails.encoder.CodecLookup
 import org.grails.encoder.Encoder
+import org.grails.taglib.GroovyPageAttributes
 import org.grails.web.servlet.mvc.GrailsWebRequest
-import org.grails.web.taglib.GroovyPageAttributes
 import org.springframework.beans.PropertyEditorRegistry
 import org.springframework.context.MessageSource
 import org.springframework.context.MessageSourceResolvable
@@ -36,6 +31,10 @@ import org.springframework.context.NoSuchMessageException
 import org.springframework.context.support.DefaultMessageSourceResolvable
 import org.springframework.validation.Errors
 
+import java.beans.PropertyEditor
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+
 /**
  * Tags to handle validation and errors.
  *
diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/util/AbstractLinkingRenderer.groovy b/grails-plugin-rest/src/main/groovy/grails/rest/render/util/AbstractLinkingRenderer.groovy
index 509f3d92ea6..9db1c563163 100644
--- a/grails-plugin-rest/src/main/groovy/grails/rest/render/util/AbstractLinkingRenderer.groovy
+++ b/grails-plugin-rest/src/main/groovy/grails/rest/render/util/AbstractLinkingRenderer.groovy
@@ -31,7 +31,7 @@ import grails.core.support.proxy.EntityProxyHandler
 import grails.core.support.proxy.ProxyHandler
 import grails.web.mapping.LinkGenerator
 import grails.web.mime.MimeType
-import org.grails.gsp.io.GrailsConventionGroovyPageLocator
+import org.grails.web.gsp.io.GrailsConventionGroovyPageLocator
 import org.grails.datastore.mapping.model.MappingContext
 import org.grails.datastore.mapping.model.PersistentEntity
 import org.grails.datastore.mapping.model.PersistentProperty
diff --git a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/DefaultRendererRegistry.groovy b/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/DefaultRendererRegistry.groovy
index 9f512ec3d0d..0219b17de86 100644
--- a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/DefaultRendererRegistry.groovy
+++ b/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/DefaultRendererRegistry.groovy
@@ -28,7 +28,7 @@ import javax.annotation.PostConstruct
 import grails.util.GrailsClassUtils
 import grails.core.support.proxy.ProxyHandler
 import grails.web.mime.MimeType
-import org.grails.gsp.io.GrailsConventionGroovyPageLocator
+import org.grails.web.gsp.io.GrailsConventionGroovyPageLocator
 import org.grails.web.util.ClassAndMimeTypeRegistry
 import org.grails.plugins.web.rest.render.html.DefaultHtmlRenderer
 import org.grails.plugins.web.rest.render.json.DefaultJsonRenderer
diff --git a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/json/DefaultJsonRenderer.groovy b/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/json/DefaultJsonRenderer.groovy
index 9a6620d8e01..c956d773ad1 100644
--- a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/json/DefaultJsonRenderer.groovy
+++ b/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/json/DefaultJsonRenderer.groovy
@@ -22,7 +22,7 @@ import grails.rest.render.RendererRegistry
 import grails.util.GrailsWebUtil
 import groovy.transform.CompileStatic
 import grails.web.mime.MimeType
-import org.grails.gsp.io.GrailsConventionGroovyPageLocator
+import org.grails.web.gsp.io.GrailsConventionGroovyPageLocator
 import org.grails.plugins.web.rest.render.html.DefaultHtmlRenderer
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpStatus
diff --git a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRenderer.groovy b/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRenderer.groovy
index e3471ede359..7c24d02d1b3 100644
--- a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRenderer.groovy
+++ b/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRenderer.groovy
@@ -22,7 +22,7 @@ import grails.rest.render.RendererRegistry
 import grails.util.GrailsWebUtil
 import groovy.transform.CompileStatic
 import grails.web.mime.MimeType
-import org.grails.gsp.io.GrailsConventionGroovyPageLocator
+import org.grails.web.gsp.io.GrailsConventionGroovyPageLocator
 import org.grails.plugins.web.rest.render.html.DefaultHtmlRenderer
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpStatus
diff --git a/grails-plugin-testing/src/main/groovy/grails/test/mixin/support/LazyTagLibraryLookup.java b/grails-plugin-testing/src/main/groovy/grails/test/mixin/support/LazyTagLibraryLookup.java
index 26b7b36f9ec..e435a154560 100644
--- a/grails-plugin-testing/src/main/groovy/grails/test/mixin/support/LazyTagLibraryLookup.java
+++ b/grails-plugin-testing/src/main/groovy/grails/test/mixin/support/LazyTagLibraryLookup.java
@@ -15,24 +15,23 @@
  */
 package grails.test.mixin.support;
 
-import groovy.lang.GroovyObject;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import grails.util.GrailsClassUtils;
 import grails.core.GrailsTagLibClass;
+import grails.util.GrailsClassUtils;
+import groovy.lang.GroovyObject;
 import org.grails.core.artefact.TagLibArtefactHandler;
-import org.grails.plugins.web.GroovyPagesGrailsPlugin;
 import org.grails.gsp.GroovyPage;
-import org.grails.web.taglib.TagLibraryLookup;
-import org.grails.web.taglib.NamespacedTagDispatcher;
+import org.grails.plugins.web.GroovyPagesGrailsPlugin;
+import org.grails.taglib.NamespacedTagDispatcher;
+import org.grails.taglib.TagLibraryLookup;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.context.support.GenericApplicationContext;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Lazy implementation of the tag library lookup class designed for testing purposes.
  *
diff --git a/grails-plugin-testing/src/main/groovy/grails/test/mixin/web/GroovyPageUnitTestMixin.groovy b/grails-plugin-testing/src/main/groovy/grails/test/mixin/web/GroovyPageUnitTestMixin.groovy
index e7a7ca8bf8d..10c31a8fe30 100644
--- a/grails-plugin-testing/src/main/groovy/grails/test/mixin/web/GroovyPageUnitTestMixin.groovy
+++ b/grails-plugin-testing/src/main/groovy/grails/test/mixin/web/GroovyPageUnitTestMixin.groovy
@@ -16,18 +16,13 @@
  */
 package grails.test.mixin.web
 
-import grails.artefact.Enhanced
 import grails.artefact.TagLibrary
-import groovy.text.Template
-
-import grails.util.GrailsMetaClassUtils
 import grails.core.GrailsTagLibClass
+import groovy.text.Template
+import org.grails.buffer.GrailsPrintWriter
 import org.grails.core.artefact.TagLibArtefactHandler
-import org.grails.core.metaclass.MetaClassEnhancer
 import org.grails.gsp.GroovyPagesTemplateEngine
-import org.grails.web.taglib.TagLibraryLookup
-import org.grails.buffer.GrailsPrintWriter
-import org.grails.web.taglib.util.TagLibraryMetaUtils
+import org.grails.taglib.TagLibraryLookup
 import org.junit.Assert
 
 /**
@@ -36,7 +31,7 @@ import org.junit.Assert
  * {@link grails.test.mixin.domain.DomainClassUnitTestMixin} to support the testing of
  * tag libraries and GSPs</p>
  *
- * <p>Views and templates can be mocked via the {@link ControllerUnitTestMixin#groovyPages}
+ * <p>Views and templates can be mocked via the {@link ControllerUnitTestMixin#getGroovyPages()}
  * map where the keys are the names of the pages and the values are the contents of the GSP page</p>
  *
  * <p>Alternatively, within a Grails project the unit test will fallback to loading views and templates
diff --git a/grails-plugin-testing/src/main/groovy/grails/test/runtime/ControllerTestPlugin.groovy b/grails-plugin-testing/src/main/groovy/grails/test/runtime/ControllerTestPlugin.groovy
index 8e6c81e8ba2..50c7e3b089c 100644
--- a/grails-plugin-testing/src/main/groovy/grails/test/runtime/ControllerTestPlugin.groovy
+++ b/grails-plugin-testing/src/main/groovy/grails/test/runtime/ControllerTestPlugin.groovy
@@ -41,8 +41,8 @@ import org.grails.web.mapping.DefaultLinkGenerator
 import org.grails.web.mapping.UrlMappingsHolderFactoryBean
 import org.grails.web.pages.FilteringCodecsByContentTypeSettings
 import org.grails.gsp.GroovyPagesTemplateEngine
-import org.grails.gsp.GroovyPagesTemplateRenderer
-import org.grails.gsp.io.GrailsConventionGroovyPageLocator
+import org.grails.web.gsp.GroovyPagesTemplateRenderer
+import org.grails.web.gsp.io.GrailsConventionGroovyPageLocator
 import org.grails.gsp.jsp.TagLibraryResolverImpl
 import org.grails.web.servlet.mvc.GrailsWebRequest
 import org.springframework.util.ClassUtils
diff --git a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/AbstractTemplateVariableBinding.java b/grails-taglib/src/main/groovy/org/grails/taglib/AbstractTemplateVariableBinding.java
similarity index 95%
rename from grails-web-taglib/src/main/groovy/org/grails/web/taglib/AbstractTemplateVariableBinding.java
rename to grails-taglib/src/main/groovy/org/grails/taglib/AbstractTemplateVariableBinding.java
index 032d00b551a..1096edc6da6 100644
--- a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/AbstractTemplateVariableBinding.java
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/AbstractTemplateVariableBinding.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.taglib;
+package org.grails.taglib;
 
 import groovy.lang.Binding;
 
@@ -68,6 +68,17 @@ protected void internalSetVariable(String name, Object value) {
         setVariableDirectly(name, value);
     }
 
+    public Binding findBindingForVariable(String name) {
+        if (getVariablesMap().containsKey(name)) {
+            return this;
+        }
+        return null;
+    }
+
+    public boolean isVariableCachingAllowed(String name) {
+        return true;
+    }
+
     protected static final class TemplateVariableBindingMap implements Map {
         AbstractTemplateVariableBinding binding;
 
diff --git a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/GroovyPageAttributes.java b/grails-taglib/src/main/groovy/org/grails/taglib/GroovyPageAttributes.java
similarity index 95%
rename from grails-web-taglib/src/main/groovy/org/grails/web/taglib/GroovyPageAttributes.java
rename to grails-taglib/src/main/groovy/org/grails/taglib/GroovyPageAttributes.java
index f6957e553e3..96e3d291d32 100644
--- a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/GroovyPageAttributes.java
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/GroovyPageAttributes.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.taglib;
+package org.grails.taglib;
+
+import grails.util.TypeConvertingMap;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import grails.web.util.TypeConvertingMap;
-
 /**
  * Defines attributes passed to a GSP tag. Mixes in TypeConvertingMap for ease of type conversion.
  *
diff --git a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/GroovyPageTagWriter.java b/grails-taglib/src/main/groovy/org/grails/taglib/GroovyPageTagWriter.java
similarity index 97%
rename from grails-web-taglib/src/main/groovy/org/grails/web/taglib/GroovyPageTagWriter.java
rename to grails-taglib/src/main/groovy/org/grails/taglib/GroovyPageTagWriter.java
index 2c9f80c0878..49e1d63c866 100644
--- a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/GroovyPageTagWriter.java
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/GroovyPageTagWriter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.taglib;
+package org.grails.taglib;
 
 import org.grails.buffer.FastStringWriter;
 
diff --git a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/NamespacedTagDispatcher.groovy b/grails-taglib/src/main/groovy/org/grails/taglib/NamespacedTagDispatcher.groovy
similarity index 96%
rename from grails-web-taglib/src/main/groovy/org/grails/web/taglib/NamespacedTagDispatcher.groovy
rename to grails-taglib/src/main/groovy/org/grails/taglib/NamespacedTagDispatcher.groovy
index e74177bdad8..6d58e37de7a 100644
--- a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/NamespacedTagDispatcher.groovy
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/NamespacedTagDispatcher.groovy
@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.taglib
+package org.grails.taglib
 
 import grails.core.GrailsApplication
 import grails.util.Environment
 import groovy.transform.CompileStatic
-import org.grails.web.taglib.util.TagLibraryMetaUtils
 
 /**
  * Allows dispatching to namespaced tag libraries and is used within controllers and tag libraries
diff --git a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/TagBodyClosure.java b/grails-taglib/src/main/groovy/org/grails/taglib/TagBodyClosure.java
similarity index 89%
rename from grails-web-taglib/src/main/groovy/org/grails/web/taglib/TagBodyClosure.java
rename to grails-taglib/src/main/groovy/org/grails/taglib/TagBodyClosure.java
index dc66d6f8f9a..bbcdb3e1b5f 100644
--- a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/TagBodyClosure.java
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/TagBodyClosure.java
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.taglib;
+package org.grails.taglib;
 
-import org.grails.web.util.GrailsApplicationAttributes;
 import groovy.lang.Binding;
 import groovy.lang.Closure;
+import org.grails.taglib.encoder.OutputContext;
 import org.grails.taglib.encoder.OutputEncodingStack;
-import org.grails.web.servlet.mvc.GrailsWebRequest;
 import org.springframework.util.Assert;
 
 import java.io.Writer;
@@ -39,18 +38,18 @@ public class TagBodyClosure extends Closure {
     private static final long serialVersionUID = 4396762064131558457L;
     private static final Class[] PARAMETER_TYPES = new Class[]{Map.class};
     private Closure<?> bodyClosure;
-    private GrailsWebRequest webRequest;
+    private OutputContext outputContext;
 
-    public TagBodyClosure(Object owner, GrailsWebRequest webRequest, Closure<?> bodyClosure) {
-        this(owner, webRequest, bodyClosure, false);
+    public TagBodyClosure(Object owner, OutputContext outputContext, Closure<?> bodyClosure) {
+        this(owner, outputContext, bodyClosure, false);
     }
 
-    public TagBodyClosure(Object owner, GrailsWebRequest webRequest,
+    public TagBodyClosure(Object owner, OutputContext outputContext,
                           Closure<?> bodyClosure, boolean changeBodyClosureOwner) {
         super(owner);
 
         Assert.notNull(bodyClosure, "Argument [bodyClosure] cannot be null!");
-        Assert.notNull(webRequest, "Argument [webRequest] cannot be null!");
+        Assert.notNull(outputContext, "Argument [outputContext] cannot be null!");
 
         if (changeBodyClosureOwner && bodyClosure != null && !(bodyClosure instanceof TagOutput.ConstantClosure)) {
             this.bodyClosure = bodyClosure.rehydrate(bodyClosure.getDelegate(), owner, bodyClosure.getThisObject());
@@ -58,13 +57,12 @@ public TagBodyClosure(Object owner, GrailsWebRequest webRequest,
         } else {
             this.bodyClosure = bodyClosure;
         }
-        this.webRequest = webRequest;
+        this.outputContext = outputContext;
     }
 
     private Object captureClosureOutput(Object args, boolean hasArgument) {
         final GroovyPageTagWriter capturedOut = new GroovyPageTagWriter();
-        Binding currentBinding = (Binding)webRequest.getCurrentRequest().getAttribute(
-                GrailsApplicationAttributes.PAGE_SCOPE);
+        Binding currentBinding = outputContext.getBinding();
         Map<String,Object> savedVariablesMap = null;
         Object originalIt = null;
         try {
@@ -178,8 +176,8 @@ private void restoreVariables(Binding binding, Map<String, Object> savedVariable
     }
 
     private void popCapturedOut() {
-        if (webRequest != null && webRequest.isActive()) {
-            OutputEncodingStack.currentStack(webRequest).pop();
+        if (outputContext != null) {
+            OutputEncodingStack.currentStack(outputContext).pop();
         }
         else {
             OutputEncodingStack.currentStack().pop();
@@ -187,8 +185,8 @@ private void popCapturedOut() {
     }
 
     private void pushCapturedOut(GroovyPageTagWriter capturedOut) {
-        if (webRequest != null && webRequest.isActive()) {
-            OutputEncodingStack.currentStack(webRequest).push(capturedOut);
+        if (outputContext != null) {
+            OutputEncodingStack.currentStack(outputContext).push(capturedOut);
         }
         else {
             OutputEncodingStack.currentStack().push(capturedOut);
diff --git a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/TagLibraryLookup.java b/grails-taglib/src/main/groovy/org/grails/taglib/TagLibraryLookup.java
similarity index 99%
rename from grails-web-taglib/src/main/groovy/org/grails/web/taglib/TagLibraryLookup.java
rename to grails-taglib/src/main/groovy/org/grails/taglib/TagLibraryLookup.java
index d2b4f35533c..9b7e3fefe8f 100644
--- a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/TagLibraryLookup.java
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/TagLibraryLookup.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.taglib;
+package org.grails.taglib;
 
 import grails.core.GrailsApplication;
 import grails.core.GrailsClass;
diff --git a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/util/TagLibraryMetaUtils.groovy b/grails-taglib/src/main/groovy/org/grails/taglib/TagLibraryMetaUtils.groovy
similarity index 93%
rename from grails-web-taglib/src/main/groovy/org/grails/web/taglib/util/TagLibraryMetaUtils.groovy
rename to grails-taglib/src/main/groovy/org/grails/taglib/TagLibraryMetaUtils.groovy
index 9da59b43d58..a2544648b80 100644
--- a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/util/TagLibraryMetaUtils.groovy
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/TagLibraryMetaUtils.groovy
@@ -1,14 +1,11 @@
-package org.grails.web.taglib.util
-
+package org.grails.taglib
 import grails.core.GrailsTagLibClass
 import grails.util.GrailsClassUtils
 import groovy.transform.CompileStatic
 import groovy.transform.TypeCheckingMode
 import org.codehaus.groovy.reflection.CachedMethod
 import org.codehaus.groovy.runtime.metaclass.MethodSelectionException
-import org.grails.web.servlet.mvc.GrailsWebRequest
-import org.grails.web.taglib.TagLibraryLookup
-import org.grails.web.taglib.TagOutput
+import org.grails.taglib.encoder.OutputContextLookupHelper
 import org.springframework.context.ApplicationContext
 
 class TagLibraryMetaUtils {
@@ -48,28 +45,28 @@ class TagLibraryMetaUtils {
         
         if(overrideMethods || !doesMethodExist(metaClass, name, [Map, Closure] as Class[])) {
             mc.setProperty(name) {Map attrs, Closure body ->
-                TagOutput.captureTagOutput(gspTagLibraryLookup, namespace, name, attrs, body, GrailsWebRequest.lookup())
+                TagOutput.captureTagOutput(gspTagLibraryLookup, namespace, name, attrs, body, OutputContextLookupHelper.lookupOutputContext())
             }
         }
         if(overrideMethods || !doesMethodExist(metaClass, name, [Map, CharSequence] as Class[])) {
             mc.setProperty(name) {Map attrs, CharSequence body ->
-                TagOutput.captureTagOutput(gspTagLibraryLookup, namespace, name, attrs, new TagOutput.ConstantClosure(body), GrailsWebRequest.lookup())
+                TagOutput.captureTagOutput(gspTagLibraryLookup, namespace, name, attrs, new TagOutput.ConstantClosure(body), OutputContextLookupHelper.lookupOutputContext())
             }
         }
         if(overrideMethods || !doesMethodExist(metaClass, name, [Map] as Class[])) {
             mc.setProperty(name) {Map attrs ->
-                TagOutput.captureTagOutput(gspTagLibraryLookup, namespace, name, attrs, null, GrailsWebRequest.lookup())
+                TagOutput.captureTagOutput(gspTagLibraryLookup, namespace, name, attrs, null, OutputContextLookupHelper.lookupOutputContext())
             }
         }
         if (addAll) {
             if(overrideMethods || !doesMethodExist(metaClass, name, [Closure] as Class[])) {
                 mc.setProperty(name) {Closure body ->
-                    TagOutput.captureTagOutput(gspTagLibraryLookup, namespace, name, [:], body, GrailsWebRequest.lookup())
+                    TagOutput.captureTagOutput(gspTagLibraryLookup, namespace, name, [:], body, OutputContextLookupHelper.lookupOutputContext())
                 }
             }
             if(overrideMethods || !doesMethodExist(metaClass, name, [] as Class[])) {
                 mc.setProperty(name) {->
-                    TagOutput.captureTagOutput(gspTagLibraryLookup, namespace, name, [:], null, GrailsWebRequest.lookup())
+                    TagOutput.captureTagOutput(gspTagLibraryLookup, namespace, name, [:], null, OutputContextLookupHelper.lookupOutputContext())
                 }
             }
         }
@@ -110,7 +107,7 @@ class TagLibraryMetaUtils {
         } catch (MethodSelectionException mse) {
             // the metamethod already exists with multiple signatures, must check if the exact method exists
             methodExists = mc.methods.contains { MetaMethod existingMethod ->
-                existingMethod.name == methodName && existingMethod.isStatic()==staticScope && (!onlyReal || isRealMethod(existingMethod)) && ((!parameterTypes && !existingMethod.parameterTypes) || parameterTypes==existingMethod.getNativeParameterTypes())
+                existingMethod.name == methodName && existingMethod.isStatic()==staticScope && (!onlyReal || isRealMethod(existingMethod)) && ((!parameterTypes && !existingMethod.parameterTypes) || Arrays.equals(parameterTypes, existingMethod.getNativeParameterTypes()))
             }
         }
     }
diff --git a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/TagOutput.java b/grails-taglib/src/main/groovy/org/grails/taglib/TagOutput.java
similarity index 91%
rename from grails-web-taglib/src/main/groovy/org/grails/web/taglib/TagOutput.java
rename to grails-taglib/src/main/groovy/org/grails/taglib/TagOutput.java
index c3ce075922a..c020aa8bc20 100644
--- a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/TagOutput.java
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/TagOutput.java
@@ -1,14 +1,13 @@
-package org.grails.web.taglib;
+package org.grails.taglib;
 
 import groovy.lang.Closure;
 import groovy.lang.GroovyObject;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
 import org.grails.encoder.Encoder;
+import org.grails.taglib.encoder.OutputContext;
 import org.grails.taglib.encoder.OutputEncodingStack;
 import org.grails.taglib.encoder.OutputEncodingStackAttributes;
 import org.grails.taglib.encoder.WithCodecHelper;
-import org.grails.web.servlet.mvc.GrailsWebRequest;
-import org.grails.taglib.GrailsTagException;
 
 import java.io.Writer;
 import java.util.Map;
@@ -24,7 +23,7 @@ public class TagOutput {
 
     @SuppressWarnings("rawtypes")
     public final static Object captureTagOutput(TagLibraryLookup gspTagLibraryLookup, String namespace,
-                                                String tagName, Map attrs, Object body, GrailsWebRequest webRequest) {
+                                                String tagName, Map attrs, Object body, OutputContext outputContext) {
 
         GroovyObject tagLib = lookupCachedTagLib(gspTagLibraryLookup, namespace, tagName);
 
@@ -36,19 +35,19 @@ public final static Object captureTagOutput(TagLibraryLookup gspTagLibraryLookup
             attrs = new GroovyPageAttributes(attrs, false);
         }
         ((GroovyPageAttributes)attrs).setGspTagSyntaxCall(false);
-        Closure actualBody = createOutputCapturingClosure(tagLib, body, webRequest);
+        Closure actualBody = createOutputCapturingClosure(tagLib, body, outputContext);
 
         final GroovyPageTagWriter tagOutput = new GroovyPageTagWriter();
         OutputEncodingStack outputStack = null;
         try {
-            outputStack = OutputEncodingStack.currentStack(webRequest, false);
+            outputStack = OutputEncodingStack.currentStack(outputContext, false);
             if (outputStack == null) {
-                outputStack = OutputEncodingStack.currentStack(webRequest, true, tagOutput, true, true);
+                outputStack = OutputEncodingStack.currentStack(outputContext, true, tagOutput, true, true);
             }
             Map<String, Object> defaultEncodeAs = gspTagLibraryLookup.getEncodeAsForTag(namespace, tagName);
             Map<String, Object> codecSettings = createCodecSettings(namespace, tagName, attrs, defaultEncodeAs);
 
-            OutputEncodingStackAttributes.Builder builder = WithCodecHelper.createOutputStackAttributesBuilder(codecSettings, webRequest.getAttributes().getGrailsApplication());
+            OutputEncodingStackAttributes.Builder builder = WithCodecHelper.createOutputStackAttributesBuilder(codecSettings, outputContext.getGrailsApplication());
             builder.topWriter(tagOutput);
             outputStack.push(builder.build());
 
@@ -115,7 +114,7 @@ public final static GroovyObject lookupCachedTagLib(TagLibraryLookup gspTagLibra
     }
 
     public final static Closure<?> createOutputCapturingClosure(Object wrappedInstance, final Object body1,
-                                                                final GrailsWebRequest webRequest) {
+                                                                final OutputContext outputContext) {
         if (body1 == null) {
             return EMPTY_BODY_CLOSURE;
         }
@@ -125,7 +124,7 @@ public final static Closure<?> createOutputCapturingClosure(Object wrappedInstan
         }
 
         if (body1 instanceof Closure) {
-            return new TagBodyClosure(wrappedInstance, webRequest, (Closure<?>) body1);
+            return new TagBodyClosure(wrappedInstance, outputContext, (Closure<?>) body1);
         }
 
         return new ConstantClosure(body1);
diff --git a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/TemplateNamespacedTagDispatcher.groovy b/grails-taglib/src/main/groovy/org/grails/taglib/TemplateNamespacedTagDispatcher.groovy
similarity index 94%
rename from grails-web-taglib/src/main/groovy/org/grails/web/taglib/TemplateNamespacedTagDispatcher.groovy
rename to grails-taglib/src/main/groovy/org/grails/taglib/TemplateNamespacedTagDispatcher.groovy
index 9d45f59acb9..900fe145d59 100644
--- a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/TemplateNamespacedTagDispatcher.groovy
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/TemplateNamespacedTagDispatcher.groovy
@@ -13,13 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.taglib
-
+package org.grails.taglib
+import grails.core.GrailsApplication
 import grails.util.Environment
 import groovy.transform.CompileStatic
-
-import grails.core.GrailsApplication
-import org.grails.web.servlet.mvc.GrailsWebRequest
+import org.grails.taglib.encoder.OutputContextLookupHelper
 
 @CompileStatic
 class TemplateNamespacedTagDispatcher extends NamespacedTagDispatcher {
@@ -43,7 +41,7 @@ class TemplateNamespacedTagDispatcher extends NamespacedTagDispatcher {
     }
 
     protected callRender(Map attrs, Object body) {
-        TagOutput.captureTagOutput(lookup, TagOutput.DEFAULT_NAMESPACE, 'render', attrs, body, GrailsWebRequest.lookup())
+        TagOutput.captureTagOutput(lookup, TagOutput.DEFAULT_NAMESPACE, 'render', attrs, body, OutputContextLookupHelper.lookupOutputContext() )
     }
 
     protected Map argsToAttrs(String name, Object args) {
diff --git a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/TemplateVariableBinding.java b/grails-taglib/src/main/groovy/org/grails/taglib/TemplateVariableBinding.java
similarity index 79%
rename from grails-web-taglib/src/main/groovy/org/grails/web/taglib/TemplateVariableBinding.java
rename to grails-taglib/src/main/groovy/org/grails/taglib/TemplateVariableBinding.java
index ed2b58448df..3f98ecd8171 100644
--- a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/TemplateVariableBinding.java
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/TemplateVariableBinding.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.web.taglib;
+package org.grails.taglib;
 
 import groovy.lang.Binding;
 import org.apache.commons.logging.Log;
@@ -34,8 +34,6 @@ public class TemplateVariableBinding extends AbstractTemplateVariableBinding {
     private Binding parent;
     private Object owner;
     private Set<String> cachedParentVariableNames=new HashSet<String>();
-    private WebRequestTemplateVariableBinding pageRequestBinding;
-    private boolean pageRequestBindingInitialized=false;
     private boolean root;
 
     public TemplateVariableBinding() {
@@ -60,24 +58,6 @@ public Object getProperty(String property) {
         return getVariable(property);
     }
 
-    private WebRequestTemplateVariableBinding findPageRequestBinding() {
-        if (!pageRequestBindingInitialized && parent != null) {
-            Binding nextParent = parent;
-            while(nextParent != null && pageRequestBinding==null) {
-                if (nextParent instanceof WebRequestTemplateVariableBinding) {
-                    pageRequestBinding = (WebRequestTemplateVariableBinding)nextParent;
-                }
-                if (nextParent instanceof TemplateVariableBinding) {
-                    nextParent = ((TemplateVariableBinding)nextParent).parent;
-                } else {
-                    nextParent = null;
-                }
-            }
-            pageRequestBindingInitialized=true;
-        }
-        return pageRequestBinding;
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public Object getVariable(String name) {
@@ -85,10 +65,11 @@ public Object getVariable(String name) {
         if (val == null && !getVariablesMap().containsKey(name)) {
             if ("variables".equals(name)) return getVariables();
             if ("metaClass".equals(name)) return getMetaClass();
-            if (parent != null) {
-                val = parent.getVariable(name);
+            Binding variableBinding = findBindingForVariable(name);
+            if (variableBinding != null) {
+                val = variableBinding.getVariable(name);
                 if (val != null) {
-                    if (findPageRequestBinding() == null || !findPageRequestBinding().isRequestAttributeVariable(name)) {
+                    if (!(variableBinding instanceof AbstractTemplateVariableBinding) || ((AbstractTemplateVariableBinding)variableBinding).isVariableCachingAllowed(name)) {
                         // cache variable in this context since parent context cannot change during usage of this context
                         getVariablesMap().put(name, val);
                         cachedParentVariableNames.add(name);
@@ -110,10 +91,10 @@ public void setProperty(String property, Object newValue) {
      * @param name
      * @return The binding
      */
-    private Binding findBindingForVariable(String name) {
+    public Binding findBindingForVariable(String name) {
         if (cachedParentVariableNames.contains(name)) {
-            if (parent instanceof TemplateVariableBinding) {
-                return ((TemplateVariableBinding)parent).findBindingForVariable(name);
+            if (parent instanceof AbstractTemplateVariableBinding) {
+                return ((AbstractTemplateVariableBinding)parent).findBindingForVariable(name);
             }
             return parent;
         }
@@ -122,8 +103,8 @@ private Binding findBindingForVariable(String name) {
             return this;
         }
 
-        if (parent instanceof TemplateVariableBinding) {
-            return ((TemplateVariableBinding)parent).findBindingForVariable(name);
+        if (parent instanceof AbstractTemplateVariableBinding) {
+            return ((AbstractTemplateVariableBinding)parent).findBindingForVariable(name);
         }
 
         if (parent != null && parent.getVariables().containsKey(name)) {
diff --git a/grails-taglib/src/main/groovy/org/grails/taglib/encoder/DefaultOutputContextLookup.java b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/DefaultOutputContextLookup.java
new file mode 100644
index 00000000000..5e05d12ae77
--- /dev/null
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/DefaultOutputContextLookup.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * 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.grails.taglib.encoder;
+
+import grails.core.GrailsApplication;
+import grails.util.Holders;
+import org.grails.encoder.DefaultEncodingStateRegistry;
+import org.grails.encoder.EncodingStateRegistry;
+import org.grails.encoder.EncodingStateRegistryLookup;
+import org.grails.encoder.EncodingStateRegistryLookupHolder;
+import org.grails.taglib.AbstractTemplateVariableBinding;
+import org.grails.taglib.TemplateVariableBinding;
+import org.springframework.core.Ordered;
+
+import java.io.Writer;
+
+public class DefaultOutputContextLookup implements OutputContextLookup, EncodingStateRegistryLookup, Ordered {
+    private ThreadLocal<OutputContext> outputContextThreadLocal = new ThreadLocal<OutputContext>(){
+        @Override
+        protected OutputContext initialValue() {
+            return new DefaultOutputContext();
+        }
+    };
+
+    @Override
+    public OutputContext lookupOutputContext() {
+        if(EncodingStateRegistryLookupHolder.getEncodingStateRegistryLookup()==null) {
+            // TODO: improve EncodingStateRegistry solution so that global state doesn't have to be used
+            EncodingStateRegistryLookupHolder.setEncodingStateRegistryLookup(this);
+        }
+        return outputContextThreadLocal.get();
+    }
+
+    @Override
+    public int getOrder() {
+        return Ordered.LOWEST_PRECEDENCE;
+    }
+
+    @Override
+    public EncodingStateRegistry lookup() {
+        return lookupOutputContext().getEncodingStateRegistry();
+    }
+
+    public DefaultOutputContextLookup() {
+
+    }
+
+    public static class DefaultOutputContext implements OutputContext {
+        private OutputEncodingStack outputEncodingStack;
+        private Writer currentWriter;
+        private AbstractTemplateVariableBinding binding;
+        private EncodingStateRegistry encodingStateRegistry = new DefaultEncodingStateRegistry();
+
+        public DefaultOutputContext() {
+
+        }
+
+        @Override
+        public EncodingStateRegistry getEncodingStateRegistry() {
+            return encodingStateRegistry;
+        }
+
+        @Override
+        public void setCurrentOutputEncodingStack(OutputEncodingStack outputEncodingStack) {
+            this.outputEncodingStack = outputEncodingStack;
+        }
+
+        @Override
+        public OutputEncodingStack getCurrentOutputEncodingStack() {
+            return outputEncodingStack;
+        }
+
+        @Override
+        public Writer getCurrentWriter() {
+            return currentWriter;
+        }
+
+        @Override
+        public void setCurrentWriter(Writer currentWriter) {
+            this.currentWriter = currentWriter;
+        }
+
+        @Override
+        public AbstractTemplateVariableBinding createAndRegisterRootBinding() {
+            binding = new TemplateVariableBinding();
+            return binding;
+        }
+
+        @Override
+        public AbstractTemplateVariableBinding getBinding() {
+            return binding;
+        }
+
+        @Override
+        public void setBinding(AbstractTemplateVariableBinding binding) {
+            this.binding = binding;
+        }
+
+        @Override
+        public GrailsApplication getGrailsApplication() {
+            return Holders.findApplication();
+        }
+
+        @Override
+        public void setContentType(String contentType) {
+            // no-op
+        }
+
+        @Override
+        public boolean isContentTypeAlreadySet() {
+            return true;
+        }
+    }
+}
diff --git a/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContext.java b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContext.java
new file mode 100644
index 00000000000..e8d14e945a4
--- /dev/null
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContext.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * 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.grails.taglib.encoder;
+
+import grails.core.GrailsApplication;
+import org.grails.encoder.EncodingStateRegistry;
+import org.grails.taglib.AbstractTemplateVariableBinding;
+
+import java.io.Writer;
+
+/**
+ * Created by lari on 02/01/15.
+ */
+public interface OutputContext {
+    EncodingStateRegistry getEncodingStateRegistry();
+
+    OutputEncodingStack getCurrentOutputEncodingStack();
+    void setCurrentOutputEncodingStack(OutputEncodingStack outputEncodingStack);
+
+    Writer getCurrentWriter();
+    void setCurrentWriter(Writer writer);
+
+    AbstractTemplateVariableBinding createAndRegisterRootBinding();
+    AbstractTemplateVariableBinding getBinding();
+    void setBinding(AbstractTemplateVariableBinding binding);
+
+    GrailsApplication getGrailsApplication();
+
+    void setContentType(String contentType);
+    boolean isContentTypeAlreadySet();
+}
diff --git a/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContextLookup.java b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContextLookup.java
new file mode 100644
index 00000000000..7d57a41cdea
--- /dev/null
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContextLookup.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * 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.grails.taglib.encoder;
+
+/**
+ * Created by lari on 02/01/15.
+ */
+public interface OutputContextLookup {
+    OutputContext lookupOutputContext();
+}
diff --git a/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContextLookupHelper.java b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContextLookupHelper.java
new file mode 100644
index 00000000000..5f3a5cd7dc9
--- /dev/null
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputContextLookupHelper.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * 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.grails.taglib.encoder;
+
+import org.grails.core.io.support.GrailsFactoriesLoader;
+
+/**
+ * Created by lari on 02/01/15.
+ */
+public class OutputContextLookupHelper {
+    private static OutputContextLookup outputContextLookup = GrailsFactoriesLoader.loadFactory(OutputContextLookup.class, OutputContextLookupHelper.class.getClassLoader());
+
+    public static OutputContext lookupOutputContext() {
+        return outputContextLookup.lookupOutputContext();
+    }
+    public static OutputContextLookup getOutputContextLookup() {
+        return outputContextLookup;
+    }
+}
diff --git a/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputEncodingSettings.groovy b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputEncodingSettings.groovy
index d8efdf15f99..e48783d1e2a 100644
--- a/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputEncodingSettings.groovy
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputEncodingSettings.groovy
@@ -106,11 +106,11 @@ class OutputEncodingSettings {
     }
 
     private Map getConfigForPrefix(String gspCodecsPrefix) {
-        Map codecSettings = (Map)flatConfig.inject([:]){ Map map, key, value ->
-            if(key instanceof CharSequence) {
-                String mapKey = key.toString()
+        Map codecSettings = (Map)flatConfig.inject([:]){ Map map, Map.Entry entry ->
+            if(entry.getKey() instanceof CharSequence) {
+                String mapKey = entry.getKey().toString()
                 if(mapKey.startsWith(gspCodecsPrefix)) {
-                    map.put(mapKey.substring(gspCodecsPrefix.length()), value)
+                    map.put(mapKey.substring(gspCodecsPrefix.length()), entry.getValue())
                 }
             }
             map
diff --git a/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputEncodingStack.java b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputEncodingStack.java
index 0e8c8107647..802dab18206 100644
--- a/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputEncodingStack.java
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputEncodingStack.java
@@ -22,50 +22,48 @@
 import org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory;
 import org.grails.buffer.GrailsWrappedWriter;
 import org.grails.encoder.*;
-import org.grails.web.servlet.mvc.GrailsWebRequest;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
 
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Stack;
 
 public final class OutputEncodingStack {
-
     public static final Log log = LogFactory.getLog(OutputEncodingStack.class);
 
     private static final String ATTRIBUTE_NAME_OUTPUT_STACK="org.grails.taglib.encoder.OUTPUT_ENCODING_STACK";
 
+    private final OutputContext outputContext;
+
     public static OutputEncodingStack currentStack() {
         return currentStack(true);
     }
 
-    public static OutputEncodingStack currentStack(GrailsWebRequest request) {
-        return currentStack(request, true);
+    public static OutputEncodingStack currentStack(OutputContext outputContext) {
+        return currentStack(outputContext, true);
     }
 
     public static OutputEncodingStack currentStack(boolean allowCreate) {
-        return currentStack(GrailsWebRequest.lookup(), allowCreate);
+        return currentStack(OutputContextLookupHelper.lookupOutputContext(), allowCreate);
     }
 
-    public static OutputEncodingStack currentStack(GrailsWebRequest request, boolean allowCreate) {
-        OutputEncodingStack outputStack = lookupStack(request);
+    public static OutputEncodingStack currentStack(OutputContext outputContext, boolean allowCreate) {
+        OutputEncodingStack outputStack = lookupStack(outputContext);
         if (outputStack == null && allowCreate) {
-            outputStack = currentStack(request, allowCreate, null, allowCreate, false);
+            outputStack = currentStack(outputContext, allowCreate, null, allowCreate, false);
         }
         return outputStack;
     }
 
     public static OutputEncodingStack currentStack(boolean allowCreate, Writer topWriter, boolean autoSync, boolean pushTop) {
-        return currentStack(GrailsWebRequest.lookup(), allowCreate, topWriter, autoSync, pushTop);
+        return currentStack(OutputContextLookupHelper.lookupOutputContext(), allowCreate, topWriter, autoSync, pushTop);
     }
 
-    public static OutputEncodingStack currentStack(GrailsWebRequest request, boolean allowCreate, Writer topWriter, boolean autoSync, boolean pushTop) {
-        return currentStack(new OutputEncodingStackAttributes.Builder().webRequest(request).allowCreate(allowCreate).topWriter(topWriter).autoSync(autoSync).pushTop(pushTop).build());
+    public static OutputEncodingStack currentStack(OutputContext outputContext, boolean allowCreate, Writer topWriter, boolean autoSync, boolean pushTop) {
+        return currentStack(new OutputEncodingStackAttributes.Builder().outputContext(outputContext).allowCreate(allowCreate).topWriter(topWriter).autoSync(autoSync).pushTop(pushTop).build());
     }
 
     public static OutputEncodingStack currentStack(OutputEncodingStackAttributes attributes) {
-        OutputEncodingStack outputStack = lookupStack(attributes.getWebRequest());
+        OutputEncodingStack outputStack = lookupStack(attributes.getOutputContext());
         if (outputStack != null) {
             if (attributes.isPushTop()) {
                 outputStack.push(attributes, false);
@@ -82,42 +80,35 @@ public static OutputEncodingStack currentStack(OutputEncodingStackAttributes att
 
     private static final OutputEncodingStack createNew(OutputEncodingStackAttributes attributes) {
         if (attributes.getTopWriter() == null) {
-            attributes=new OutputEncodingStackAttributes.Builder(attributes).topWriter(lookupRequestWriter(attributes.getWebRequest())).build();
+            attributes=new OutputEncodingStackAttributes.Builder(attributes).topWriter(lookupCurrentWriter(attributes.getOutputContext())).build();
         }
         OutputEncodingStack instance = new OutputEncodingStack(attributes);
-        attributes.getWebRequest().setAttribute(
-                ATTRIBUTE_NAME_OUTPUT_STACK, instance, RequestAttributes.SCOPE_REQUEST);
+        attributes.getOutputContext().setCurrentOutputEncodingStack(instance);
         return instance;
     }
 
-    private static OutputEncodingStack lookupStack(GrailsWebRequest webRequest) {
-        OutputEncodingStack outputStack = (OutputEncodingStack) webRequest.getAttribute(
-                ATTRIBUTE_NAME_OUTPUT_STACK, RequestAttributes.SCOPE_REQUEST);
+    private static OutputEncodingStack lookupStack(OutputContext outputContext) {
+        OutputEncodingStack outputStack = (OutputEncodingStack) outputContext.getCurrentOutputEncodingStack();
         return outputStack;
     }
 
-    public static final void removeCurrentInstance() {
-        RequestContextHolder.currentRequestAttributes().removeAttribute(
-                ATTRIBUTE_NAME_OUTPUT_STACK, RequestAttributes.SCOPE_REQUEST);
-    }
-
     public static final Writer currentWriter() {
         OutputEncodingStack outputStack=currentStack(false);
         if (outputStack != null) {
             return outputStack.getOutWriter();
         }
 
-        return lookupRequestWriter();
+        return lookupCurrentWriter();
     }
 
-    private static Writer lookupRequestWriter() {
-        GrailsWebRequest webRequest=GrailsWebRequest.lookup();
-        return lookupRequestWriter(webRequest);
+    private static Writer lookupCurrentWriter() {
+        OutputContext outputContext=OutputContextLookupHelper.lookupOutputContext();
+        return lookupCurrentWriter(outputContext);
     }
 
-    private static Writer lookupRequestWriter(GrailsWebRequest webRequest) {
-        if (webRequest != null) {
-            return webRequest.getOut();
+    private static Writer lookupCurrentWriter(OutputContext outputContext) {
+        if (outputContext != null) {
+            return outputContext.getCurrentWriter();
         }
         return null;
     }
@@ -251,7 +242,8 @@ public Writer activateDestination() throws IOException {
         if (!autoSync) {
             applyWriterThreadLocals(outWriter);
         }
-        this.encodingStateRegistry = attributes.getWebRequest().getEncodingStateRegistry();
+        this.encodingStateRegistry = attributes.getOutputContext().getEncodingStateRegistry();
+        this.outputContext = attributes.getOutputContext() != null ?  attributes.getOutputContext() : OutputContextLookupHelper.lookupOutputContext();
     }
 
     private Writer unwrapTargetWriter(Writer targetWriter) {
@@ -418,13 +410,16 @@ public void restoreThreadLocalsToOriginals() {
     }
 
     private void applyWriterThreadLocals(Writer writer) {
-        GrailsWebRequest webRequest = GrailsWebRequest.lookup();
-        if (webRequest != null) {
-            webRequest.setOut(writer);
+        if(outputContext != null) {
+            outputContext.setCurrentWriter(writer);
         }
     }
 
     public void flushActiveWriter() {
         writerGroup.flushActive();
     }
+
+    public OutputContext getOutputContext() {
+        return outputContext;
+    }
 }
diff --git a/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputEncodingStackAttributes.java b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputEncodingStackAttributes.java
index 7d49652f0cd..b4eb3883e02 100644
--- a/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputEncodingStackAttributes.java
+++ b/grails-taglib/src/main/groovy/org/grails/taglib/encoder/OutputEncodingStackAttributes.java
@@ -15,10 +15,9 @@
  */
 package org.grails.taglib.encoder;
 
-import java.io.Writer;
-
 import org.grails.encoder.Encoder;
-import org.grails.web.servlet.mvc.GrailsWebRequest;
+
+import java.io.Writer;
 
 public class OutputEncodingStackAttributes {
     private final Writer topWriter;
@@ -32,7 +31,7 @@ public class OutputEncodingStackAttributes {
     private final boolean autoSync;
     private final boolean inheritPreviousEncoders;
     private final boolean replaceOnly;
-    private final GrailsWebRequest webRequest;
+    private final OutputContext outputContext;
 
     public boolean isInheritPreviousEncoders() {
         return inheritPreviousEncoders;
@@ -78,8 +77,8 @@ public boolean isAutoSync() {
         return autoSync;
     }
 
-    public GrailsWebRequest getWebRequest() {
-        return webRequest;
+    public OutputContext getOutputContext() {
+        return outputContext;
     }
 
     public static class Builder {
@@ -92,7 +91,7 @@ public static class Builder {
         private boolean allowCreate=true;
         private boolean pushTop=true;
         private boolean autoSync=true;
-        private GrailsWebRequest webRequest;
+        private OutputContext outputContext;
         private boolean inheritPreviousEncoders=false;
         private boolean replaceOnly=false;
 
@@ -109,7 +108,7 @@ public Builder(OutputEncodingStackAttributes attributes) {
             this.allowCreate = attributes.allowCreate;
             this.pushTop = attributes.pushTop;
             this.autoSync = attributes.autoSync;
-            this.webRequest = attributes.webRequest;
+            this.outputContext = attributes.outputContext;
             this.inheritPreviousEncoders = attributes.inheritPreviousEncoders;
             this.replaceOnly = attributes.replaceOnly;
         }
@@ -169,8 +168,8 @@ public Builder replaceOnly(boolean replaceOnly) {
             return this;
         }
 
-        public Builder webRequest(GrailsWebRequest webRequest) {
-            this.webRequest = webRequest;
+        public Builder outputContext(OutputContext outputContext) {
+            this.outputContext = outputContext;
             return this;
         }
 
@@ -189,7 +188,7 @@ private OutputEncodingStackAttributes(Builder builder) {
         this.allowCreate = builder.allowCreate;
         this.pushTop = builder.pushTop;
         this.autoSync = builder.autoSync;
-        this.webRequest = builder.webRequest;
+        this.outputContext = builder.outputContext;
         this.inheritPreviousEncoders = builder.inheritPreviousEncoders;
         this.replaceOnly = builder.replaceOnly;
     }
diff --git a/grails-taglib/src/main/resources/META-INF/grails.factories b/grails-taglib/src/main/resources/META-INF/grails.factories
new file mode 100644
index 00000000000..9b10b6f773d
--- /dev/null
+++ b/grails-taglib/src/main/resources/META-INF/grails.factories
@@ -0,0 +1 @@
+org.grails.taglib.encoder.OutputContextLookup=org.grails.taglib.encoder.DefaultOutputContextLookup
diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/taglib/GroovyPageAttributesTests.groovy b/grails-taglib/src/test/groovy/org/grails/taglib/GroovyPageAttributesTests.groovy
similarity index 97%
rename from grails-test-suite-web/src/test/groovy/org/grails/web/taglib/GroovyPageAttributesTests.groovy
rename to grails-taglib/src/test/groovy/org/grails/taglib/GroovyPageAttributesTests.groovy
index 38eda0e100e..2caf1dc4c1b 100644
--- a/grails-test-suite-web/src/test/groovy/org/grails/web/taglib/GroovyPageAttributesTests.groovy
+++ b/grails-taglib/src/test/groovy/org/grails/taglib/GroovyPageAttributesTests.groovy
@@ -1,6 +1,4 @@
-package org.grails.web.taglib
-
-import org.grails.web.taglib.GroovyPageAttributes
+package org.grails.taglib
 
 class GroovyPageAttributesTests extends GroovyTestCase {
 
diff --git a/grails-web-taglib/src/test/groovy/org/grails/web/taglib/GroovyPageTagWriterSpec.groovy b/grails-taglib/src/test/groovy/org/grails/taglib/GroovyPageTagWriterSpec.groovy
similarity index 85%
rename from grails-web-taglib/src/test/groovy/org/grails/web/taglib/GroovyPageTagWriterSpec.groovy
rename to grails-taglib/src/test/groovy/org/grails/taglib/GroovyPageTagWriterSpec.groovy
index b8d5edd40f3..72fb2a29edb 100644
--- a/grails-web-taglib/src/test/groovy/org/grails/web/taglib/GroovyPageTagWriterSpec.groovy
+++ b/grails-taglib/src/test/groovy/org/grails/taglib/GroovyPageTagWriterSpec.groovy
@@ -1,5 +1,6 @@
-package org.grails.web.taglib
+package org.grails.taglib
 
+import org.grails.taglib.GroovyPageTagWriter
 import spock.lang.Issue
 import spock.lang.Specification
 
diff --git a/grails-test-suite-base/src/main/groovy/org/grails/web/taglib/AbstractGrailsTagTests.groovy b/grails-test-suite-base/src/main/groovy/org/grails/web/taglib/AbstractGrailsTagTests.groovy
index 689ca5de6db..17ffaffa7da 100644
--- a/grails-test-suite-base/src/main/groovy/org/grails/web/taglib/AbstractGrailsTagTests.groovy
+++ b/grails-test-suite-base/src/main/groovy/org/grails/web/taglib/AbstractGrailsTagTests.groovy
@@ -1,5 +1,6 @@
 package org.grails.web.taglib
 
+import com.opensymphony.module.sitemesh.RequestConstants
 import grails.build.support.MetaClassRegistryCleaner
 import grails.core.DefaultGrailsApplication
 import grails.core.GrailsApplication
@@ -8,38 +9,33 @@ import grails.util.GrailsWebMockUtil
 import grails.util.Holders
 import grails.util.Metadata
 import grails.web.pages.GroovyPagesUriService
-import org.grails.web.util.GrailsApplicationAttributes
-
-import javax.xml.parsers.DocumentBuilder
-import javax.xml.parsers.DocumentBuilderFactory
-import javax.xml.xpath.XPath
-import javax.xml.xpath.XPathConstants
-import javax.xml.xpath.XPathFactory
-
 import org.grails.buffer.FastStringWriter
 import org.grails.config.PropertySourcesConfig
 import org.grails.core.artefact.ControllerArtefactHandler
 import org.grails.core.artefact.TagLibArtefactHandler
 import org.grails.encoder.Encoder
+import org.grails.gsp.GroovyPage
+import org.grails.gsp.GroovyPageMetaInfo
+import org.grails.gsp.GroovyPageTemplate
+import org.grails.gsp.GroovyPagesTemplateEngine
+import org.grails.gsp.compiler.SitemeshPreprocessor
 import org.grails.plugins.DefaultGrailsPlugin
 import org.grails.plugins.MockGrailsPluginManager
 import org.grails.support.MockApplicationContext
-import org.grails.validation.GrailsDomainClassValidator
-import org.grails.web.context.ServletEnvironmentGrailsApplicationDiscoveryStrategy
+import org.grails.taglib.GroovyPageAttributes
+import org.grails.taglib.TagOutput
 import org.grails.taglib.encoder.OutputEncodingStack
 import org.grails.taglib.encoder.WithCodecHelper
+import org.grails.validation.GrailsDomainClassValidator
+import org.grails.web.context.ServletEnvironmentGrailsApplicationDiscoveryStrategy
 import org.grails.web.pages.DefaultGroovyPagesUriService
 import org.grails.web.pages.GSPResponseWriter
-import org.grails.gsp.GroovyPage
-import org.grails.gsp.GroovyPageMetaInfo
-import org.grails.gsp.GroovyPageTemplate
-import org.grails.gsp.GroovyPagesTemplateEngine
-import org.grails.gsp.compiler.SitemeshPreprocessor
 import org.grails.web.servlet.context.support.WebRuntimeSpringConfiguration
 import org.grails.web.servlet.mvc.GrailsWebRequest
 import org.grails.web.sitemesh.GSPSitemeshPage
 import org.grails.web.sitemesh.GrailsHTMLPageParser
 import org.grails.web.sitemesh.GrailsLayoutView
+import org.grails.web.util.GrailsApplicationAttributes
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory
 import org.springframework.context.ApplicationContext
 import org.springframework.context.MessageSource
@@ -61,7 +57,11 @@ import org.springframework.web.servlet.support.JstlUtils
 import org.springframework.web.servlet.theme.SessionThemeResolver
 import org.w3c.dom.Document
 
-import com.opensymphony.module.sitemesh.RequestConstants
+import javax.xml.parsers.DocumentBuilder
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.xpath.XPath
+import javax.xml.xpath.XPathConstants
+import javax.xml.xpath.XPathFactory
 
 abstract class AbstractGrailsTagTests extends GroovyTestCase {
     MockServletContext servletContext
diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapperTests.java b/grails-test-suite-uber/src/test/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapperTests.java
index 82b65c4df0c..d1d8c56b961 100644
--- a/grails-test-suite-uber/src/test/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapperTests.java
+++ b/grails-test-suite-uber/src/test/groovy/org/grails/web/sitemesh/GrailsLayoutDecoratorMapperTests.java
@@ -1,33 +1,28 @@
 package org.grails.web.sitemesh;
 
+import com.opensymphony.module.sitemesh.Decorator;
+import com.opensymphony.module.sitemesh.Page;
+import com.opensymphony.module.sitemesh.parser.HTMLPageParser;
 import grails.config.Config;
 import grails.core.DefaultGrailsApplication;
 import grails.core.GrailsApplication;
 import grails.util.GrailsWebMockUtil;
 import grails.util.Holders;
 import grails.web.pages.GroovyPagesUriService;
-import org.grails.web.util.GrailsApplicationAttributes;
 import groovy.lang.GroovyClassLoader;
 import groovy.lang.GroovyObject;
 import groovy.util.ConfigObject;
 import groovy.util.ConfigSlurper;
-
-import java.util.Collections;
-import java.util.Map;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-
 import junit.framework.TestCase;
-
 import org.grails.config.PropertySourcesConfig;
+import org.grails.gsp.GroovyPagesTemplateEngine;
 import org.grails.plugins.codecs.DefaultCodecLookup;
 import org.grails.support.MockApplicationContext;
+import org.grails.web.gsp.io.GrailsConventionGroovyPageLocator;
 import org.grails.web.pages.DefaultGroovyPagesUriService;
-import org.grails.gsp.GroovyPagesTemplateEngine;
-import org.grails.gsp.io.GrailsConventionGroovyPageLocator;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
 import org.grails.web.servlet.view.GroovyPageViewResolver;
+import org.grails.web.util.GrailsApplicationAttributes;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -37,9 +32,10 @@
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 
-import com.opensymphony.module.sitemesh.Decorator;
-import com.opensymphony.module.sitemesh.Page;
-import com.opensymphony.module.sitemesh.parser.HTMLPageParser;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import java.util.Collections;
+import java.util.Map;
 
 public class GrailsLayoutDecoratorMapperTests extends TestCase {
 
@@ -55,7 +51,7 @@ private GrailsWebRequest buildMockRequest(Config config) throws Exception {
         pageLocator.setApplicationContext(appCtx);
 
         GroovyPagesTemplateEngine gpte = new GroovyPagesTemplateEngine();
-        gpte.setServletContext(appCtx.getServletContext());
+        gpte.setResourceLoader(appCtx);
         gpte.setApplicationContext(appCtx);
         gpte.afterPropertiesSet();
 
diff --git a/grails-test-suite-web/src/test/groovy/grails/gsp/PageRendererSpec.groovy b/grails-test-suite-web/src/test/groovy/grails/gsp/PageRendererSpec.groovy
index b1fb57ffaf5..f0566c195eb 100644
--- a/grails-test-suite-web/src/test/groovy/grails/gsp/PageRendererSpec.groovy
+++ b/grails-test-suite-web/src/test/groovy/grails/gsp/PageRendererSpec.groovy
@@ -4,9 +4,9 @@ import grails.spring.BeanBuilder
 import org.grails.core.artefact.TagLibArtefactHandler
 import org.grails.core.io.SimpleMapResourceLoader
 import org.grails.gsp.GroovyPagesTemplateEngine
-import org.grails.gsp.io.CachingGrailsConventionGroovyPageLocator
 import org.grails.plugins.web.taglib.ApplicationTagLib
-import org.grails.web.taglib.TagLibraryLookup
+import org.grails.taglib.TagLibraryLookup
+import org.grails.web.gsp.io.CachingGrailsConventionGroovyPageLocator
 import org.springframework.core.io.ByteArrayResource
 import spock.lang.Specification
 
diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/pages/GroovyPageServletSpec.groovy b/grails-test-suite-web/src/test/groovy/org/grails/web/pages/GroovyPageServletSpec.groovy
index af6a2417d64..c1d4ebb3464 100644
--- a/grails-test-suite-web/src/test/groovy/org/grails/web/pages/GroovyPageServletSpec.groovy
+++ b/grails-test-suite-web/src/test/groovy/org/grails/web/pages/GroovyPageServletSpec.groovy
@@ -7,7 +7,7 @@ import javax.servlet.http.HttpServletResponse
 
 import org.grails.support.MockApplicationContext
 import org.grails.core.io.SimpleMapResourceLoader
-import org.grails.gsp.io.GrailsConventionGroovyPageLocator
+import org.grails.web.gsp.io.GrailsConventionGroovyPageLocator
 import org.grails.gsp.io.GroovyPageScriptSource
 import org.grails.web.servlet.mvc.GrailsWebRequest
 import org.springframework.core.io.ByteArrayResource
diff --git a/grails-web-common/build.gradle b/grails-web-common/build.gradle
index 6f9f46db92c..05d31c31d7c 100644
--- a/grails-web-common/build.gradle
+++ b/grails-web-common/build.gradle
@@ -2,7 +2,9 @@ dependencies {
     compile project(":grails-core"), {
         exclude group:'org.grails', module:'grails-spring'
     }
-    compile project(":grails-databinding"), project(":grails-encoder")
+    compile project(":grails-databinding")
+    compile project(":grails-encoder")
+    compile project(":grails-gsp")
 
     compile "org.codehaus.groovy:groovy-templates:$groovyVersion"
     compile 'javax.servlet:javax.servlet-api:3.0.1', provided
diff --git a/grails-web-common/src/main/groovy/org/grails/web/errors/GrailsWrappedRuntimeException.java b/grails-web-common/src/main/groovy/org/grails/web/errors/GrailsWrappedRuntimeException.java
index d0540bf5353..13e6bac0e1c 100644
--- a/grails-web-common/src/main/groovy/org/grails/web/errors/GrailsWrappedRuntimeException.java
+++ b/grails-web-common/src/main/groovy/org/grails/web/errors/GrailsWrappedRuntimeException.java
@@ -37,7 +37,7 @@
 import org.grails.core.io.support.GrailsFactoriesLoader;
 import org.grails.core.exceptions.GrailsException;
 import org.grails.exceptions.reporting.SourceCodeAware;
-import org.grails.web.support.ResourceAwareTemplateEngine;
+import org.grails.gsp.ResourceAwareTemplateEngine;
 import org.grails.buffer.FastStringPrintWriter;
 import org.grails.web.util.GrailsApplicationAttributes;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributes.java b/grails-web-common/src/main/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributes.java
index 78a61b4bf0f..f0f5778982c 100644
--- a/grails-web-common/src/main/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributes.java
+++ b/grails-web-common/src/main/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributes.java
@@ -15,26 +15,19 @@
  */
 package org.grails.web.servlet;
 
+import grails.core.GrailsApplication;
+import grails.core.GrailsControllerClass;
+import grails.plugins.GrailsPluginManager;
+import grails.util.Holders;
 import grails.web.mvc.FlashScope;
-import org.grails.web.util.GrailsApplicationAttributes;
+import grails.web.pages.GroovyPagesUriService;
 import groovy.lang.GroovyObject;
-
-import java.io.Writer;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import grails.core.GrailsApplication;
-import grails.core.GrailsControllerClass;
-import grails.plugins.GrailsPluginManager;
-import org.grails.web.support.ResourceAwareTemplateEngine;
 import org.codehaus.groovy.grails.web.metaclass.ControllerDynamicMethods;
+import org.grails.gsp.ResourceAwareTemplateEngine;
 import org.grails.web.pages.DefaultGroovyPagesUriService;
-import grails.web.pages.GroovyPagesUriService;
+import org.grails.web.util.GrailsApplicationAttributes;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.MessageSource;
@@ -42,6 +35,12 @@
 import org.springframework.validation.Errors;
 import org.springframework.web.util.UrlPathHelper;
 
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.io.Writer;
+
 /**
  * Holds knowledge about how to obtain certain attributes from either the ServletContext
  * or the HttpServletRequest instance.
@@ -72,6 +71,9 @@ public DefaultGrailsApplicationAttributes(ServletContext context) {
         this.context = context;
         if (context != null) {
             appContext = (ApplicationContext)context.getAttribute(APPLICATION_CONTEXT);
+            if(appContext == null) {
+                appContext = Holders.findApplicationContext();
+            }
         }
     }
 
@@ -217,6 +219,9 @@ public ResourceAwareTemplateEngine getPagesTemplateEngine() {
     public GrailsApplication getGrailsApplication() {
         if(grailsApplication==null) {
             grailsApplication = fetchBeanFromAppCtx(GrailsApplication.APPLICATION_ID);
+            if (grailsApplication == null) {
+                grailsApplication = Holders.findApplication();
+            }
         }
         return grailsApplication;
     }
diff --git a/grails-web-common/src/main/groovy/org/grails/web/util/GrailsApplicationAttributes.java b/grails-web-common/src/main/groovy/org/grails/web/util/GrailsApplicationAttributes.java
index 0461ff88f41..aacb0b81fe6 100644
--- a/grails-web-common/src/main/groovy/org/grails/web/util/GrailsApplicationAttributes.java
+++ b/grails-web-common/src/main/groovy/org/grails/web/util/GrailsApplicationAttributes.java
@@ -15,21 +15,18 @@
  */
 package org.grails.web.util;
 
+import grails.core.ApplicationAttributes;
 import grails.web.mvc.FlashScope;
+import grails.web.pages.GroovyPagesUriService;
 import groovy.lang.GroovyObject;
-
-import java.io.Writer;
+import org.grails.gsp.ResourceAwareTemplateEngine;
+import org.springframework.context.MessageSource;
+import org.springframework.validation.Errors;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import grails.core.ApplicationAttributes;
-import org.grails.web.support.ResourceAwareTemplateEngine;
-import grails.web.pages.GroovyPagesUriService;
-import org.springframework.context.MessageSource;
-import org.springframework.validation.Errors;
+import java.io.Writer;
 
 /**
  * Defines the names of and methods to retrieve Grails specific request and servlet attributes.
diff --git a/grails-web-gsp-taglib/src/main/groovy/org/grails/plugins/web/taglib/RenderTagLib.groovy b/grails-web-gsp-taglib/src/main/groovy/org/grails/plugins/web/taglib/RenderTagLib.groovy
index 527d31cf96e..ad8cbcc5e25 100644
--- a/grails-web-gsp-taglib/src/main/groovy/org/grails/plugins/web/taglib/RenderTagLib.groovy
+++ b/grails-web-gsp-taglib/src/main/groovy/org/grails/plugins/web/taglib/RenderTagLib.groovy
@@ -29,12 +29,13 @@ import org.grails.encoder.Encoder
 import org.grails.exceptions.ExceptionUtils
 import org.grails.gsp.GroovyPageTemplate
 import org.grails.gsp.GroovyPagesTemplateEngine
-import org.grails.gsp.GroovyPagesTemplateRenderer
 import org.grails.gsp.compiler.GroovyPageParser
+import org.grails.taglib.TagLibraryLookup
+import org.grails.taglib.TagOutput
+import org.grails.taglib.encoder.OutputContextLookupHelper
 import org.grails.web.errors.ErrorsViewStackTracePrinter
+import org.grails.web.gsp.GroovyPagesTemplateRenderer
 import org.grails.web.sitemesh.*
-import org.grails.web.taglib.TagLibraryLookup
-import org.grails.web.taglib.TagOutput
 import org.grails.web.util.WebUtils
 import org.springframework.http.HttpStatus
 import org.springframework.util.StringUtils
@@ -98,7 +99,7 @@ class RenderTagLib implements RequestConstants, TagLibrary {
         }
         else if (attrs.action && attrs.controller) {
             def includeAttrs = [action: attrs.action, controller: attrs.controller, params: pageParams, model: viewModel]
-            content = TagOutput.captureTagOutput(gspTagLibraryLookup, 'g', 'include', includeAttrs, null, webRequest)
+            content = TagOutput.captureTagOutput(gspTagLibraryLookup, 'g', 'include', includeAttrs, null, OutputContextLookupHelper.lookupOutputContext())
         }
         else {
             def oldGspSiteMeshPage = request.getAttribute(GrailsLayoutView.GSP_SITEMESH_PAGE)
@@ -106,10 +107,10 @@ class RenderTagLib implements RequestConstants, TagLibrary {
                 gspSiteMeshPage = new GSPSitemeshPage()
                 request.setAttribute(GrailsLayoutView.GSP_SITEMESH_PAGE, gspSiteMeshPage)
                 if (attrs.view || attrs.template) {
-                    content = TagOutput.captureTagOutput(gspTagLibraryLookup, 'g', 'render', attrs, null, webRequest)
+                    content = TagOutput.captureTagOutput(gspTagLibraryLookup, 'g', 'render', attrs, null, OutputContextLookupHelper.lookupOutputContext())
                 }
                 else {
-                    def bodyClosure = TagOutput.createOutputCapturingClosure(this, body, webRequest)
+                    def bodyClosure = TagOutput.createOutputCapturingClosure(this, body, OutputContextLookupHelper.lookupOutputContext())
                     content = bodyClosure()
                 }
                 if (content instanceof StreamCharBuffer) {
diff --git a/grails-web-gsp-taglib/src/main/groovy/org/grails/plugins/web/taglib/SitemeshTagLib.groovy b/grails-web-gsp-taglib/src/main/groovy/org/grails/plugins/web/taglib/SitemeshTagLib.groovy
index fa4b6096175..1b535a14eaf 100644
--- a/grails-web-gsp-taglib/src/main/groovy/org/grails/plugins/web/taglib/SitemeshTagLib.groovy
+++ b/grails-web-gsp-taglib/src/main/groovy/org/grails/plugins/web/taglib/SitemeshTagLib.groovy
@@ -15,9 +15,9 @@
  */
 package org.grails.plugins.web.taglib
 
+import com.opensymphony.module.sitemesh.RequestConstants
 import grails.artefact.TagLibrary
 import grails.gsp.TagLib
-import com.opensymphony.module.sitemesh.RequestConstants
 import groovy.transform.CompileStatic
 import org.grails.buffer.FastStringWriter
 import org.grails.buffer.GrailsPrintWriter
diff --git a/grails-web-gsp-taglib/src/main/groovy/org/grails/web/pages/StandaloneTagLibraryLookup.java b/grails-web-gsp-taglib/src/main/groovy/org/grails/web/pages/StandaloneTagLibraryLookup.java
index 5af4c7f6448..292d24b4186 100644
--- a/grails-web-gsp-taglib/src/main/groovy/org/grails/web/pages/StandaloneTagLibraryLookup.java
+++ b/grails-web-gsp-taglib/src/main/groovy/org/grails/web/pages/StandaloneTagLibraryLookup.java
@@ -3,7 +3,7 @@
 import grails.core.GrailsTagLibClass;
 import grails.gsp.TagLib;
 import org.grails.core.DefaultGrailsTagLibClass;
-import org.grails.web.taglib.TagLibraryLookup;
+import org.grails.taglib.TagLibraryLookup;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 
diff --git a/grails-web-gsp/build.gradle b/grails-web-gsp/build.gradle
index 4c659224c37..df2d10fa677 100644
--- a/grails-web-gsp/build.gradle
+++ b/grails-web-gsp/build.gradle
@@ -6,7 +6,7 @@ configurations {
 dependencies {
     compile( project(":grails-gsp") )
     compile( project(":grails-web-common") )
-    compile( project(":grails-gsp") )
+    compile( project(":grails-web-taglib") )
 
     compile( project(":grails-web-sitemesh") ) {
         exclude group:'org.grails', module:'grails-web-common'
diff --git a/grails-web-gsp/src/main/groovy/grails/gsp/PageRenderer.groovy b/grails-web-gsp/src/main/groovy/grails/gsp/PageRenderer.groovy
index 4cd5a1d94f5..53d437e76c7 100644
--- a/grails-web-gsp/src/main/groovy/grails/gsp/PageRenderer.groovy
+++ b/grails-web-gsp/src/main/groovy/grails/gsp/PageRenderer.groovy
@@ -16,7 +16,7 @@
 package grails.gsp
 import org.grails.buffer.FastStringWriter
 import org.grails.gsp.GroovyPagesTemplateEngine
-import org.grails.gsp.io.GrailsConventionGroovyPageLocator
+import org.grails.web.gsp.io.GrailsConventionGroovyPageLocator
 import org.grails.gsp.io.GroovyPageScriptSource
 import org.grails.web.servlet.mvc.GrailsWebRequest
 import org.springframework.context.ApplicationContext
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesTemplateRenderer.java b/grails-web-gsp/src/main/groovy/org/grails/web/gsp/GroovyPagesTemplateRenderer.java
similarity index 97%
rename from grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesTemplateRenderer.java
rename to grails-web-gsp/src/main/groovy/org/grails/web/gsp/GroovyPagesTemplateRenderer.java
index db901b732e5..ad18c4a0960 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/GroovyPagesTemplateRenderer.java
+++ b/grails-web-gsp/src/main/groovy/org/grails/web/gsp/GroovyPagesTemplateRenderer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.gsp;
+package org.grails.web.gsp;
 
 import grails.core.GrailsDomainClass;
 import grails.util.CacheEntry;
@@ -28,14 +28,18 @@
 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.GroovyPage;
+import org.grails.gsp.GroovyPageBinding;
+import org.grails.gsp.GroovyPageMetaInfo;
+import org.grails.gsp.GroovyPagesTemplateEngine;
 import org.grails.gsp.io.GroovyPageScriptSource;
 import org.grails.io.support.GrailsResourceUtils;
+import org.grails.taglib.GrailsTagException;
+import org.grails.taglib.TemplateVariableBinding;
 import org.grails.taglib.encoder.OutputEncodingSettings;
 import org.grails.taglib.encoder.WithCodecHelper;
+import org.grails.web.gsp.io.GrailsConventionGroovyPageLocator;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
-import org.grails.web.taglib.TemplateVariableBinding;
-import org.grails.taglib.GrailsTagException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.util.Assert;
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/io/CachingGrailsConventionGroovyPageLocator.java b/grails-web-gsp/src/main/groovy/org/grails/web/gsp/io/CachingGrailsConventionGroovyPageLocator.java
similarity index 97%
rename from grails-gsp/src/main/groovy/org/grails/gsp/io/CachingGrailsConventionGroovyPageLocator.java
rename to grails-web-gsp/src/main/groovy/org/grails/web/gsp/io/CachingGrailsConventionGroovyPageLocator.java
index 722ee3ca114..26e95f78106 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/io/CachingGrailsConventionGroovyPageLocator.java
+++ b/grails-web-gsp/src/main/groovy/org/grails/web/gsp/io/CachingGrailsConventionGroovyPageLocator.java
@@ -13,11 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.gsp.io;
+package org.grails.web.gsp.io;
 
 import grails.util.CacheEntry;
 import org.grails.gsp.GroovyPageBinding;
-import org.grails.web.taglib.TemplateVariableBinding;
+import org.grails.gsp.io.GroovyPageCompiledScriptSource;
+import org.grails.gsp.io.GroovyPageResourceScriptSource;
+import org.grails.gsp.io.GroovyPageScriptSource;
+import org.grails.taglib.TemplateVariableBinding;
 import org.springframework.core.io.ByteArrayResource;
 
 import java.util.HashSet;
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/io/GrailsConventionGroovyPageLocator.java b/grails-web-gsp/src/main/groovy/org/grails/web/gsp/io/GrailsConventionGroovyPageLocator.java
similarity index 98%
rename from grails-gsp/src/main/groovy/org/grails/gsp/io/GrailsConventionGroovyPageLocator.java
rename to grails-web-gsp/src/main/groovy/org/grails/web/gsp/io/GrailsConventionGroovyPageLocator.java
index 0d40622a438..e3d29ab5cf3 100644
--- a/grails-gsp/src/main/groovy/org/grails/gsp/io/GrailsConventionGroovyPageLocator.java
+++ b/grails-web-gsp/src/main/groovy/org/grails/web/gsp/io/GrailsConventionGroovyPageLocator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.gsp.io;
+package org.grails.web.gsp.io;
 
 import grails.core.GrailsApplication;
 import grails.core.GrailsControllerClass;
@@ -23,10 +23,12 @@
 import grails.web.mime.MimeTypeResolver;
 import grails.web.pages.GroovyPagesUriService;
 import org.grails.core.artefact.ControllerArtefactHandler;
+import org.grails.gsp.io.DefaultGroovyPageLocator;
+import org.grails.gsp.io.GroovyPageScriptSource;
 import org.grails.io.support.GrailsResourceUtils;
+import org.grails.taglib.TemplateVariableBinding;
 import org.grails.web.pages.DefaultGroovyPagesUriService;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
-import org.grails.web.taglib.TemplateVariableBinding;
 import org.grails.web.util.GrailsApplicationAttributes;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPagesServlet.java b/grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPagesServlet.java
index 750b4bc4405..4fd7bcc4607 100644
--- a/grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPagesServlet.java
+++ b/grails-web-gsp/src/main/groovy/org/grails/web/pages/GroovyPagesServlet.java
@@ -127,7 +127,7 @@ protected void doService(HttpServletRequest request, HttpServletResponse respons
 
         String pageName = (String)request.getAttribute(GrailsApplicationAttributes.GSP_TO_RENDER);
         if (GrailsStringUtils.isBlank(pageName)) {
-            pageName = groovyPagesTemplateEngine.getCurrentRequestUri(request);
+            pageName = getCurrentRequestUri(request);
         }
 
         boolean isNotInclude = !WebUtils.isIncludeRequest(request) ;
@@ -151,6 +151,14 @@ protected void doService(HttpServletRequest request, HttpServletResponse respons
         }
     }
 
+    protected String getCurrentRequestUri(HttpServletRequest request) {
+        Object includePath = request.getAttribute("javax.servlet.include.servlet_path");
+        if (includePath != null) {
+            return (String) includePath;
+        }
+        return request.getServletPath();
+    }
+
     public GroovyPagesTemplateEngine getGroovyPagesTemplateEngine() {
         return groovyPagesTemplateEngine;
     }
diff --git a/grails-web-gsp/src/main/groovy/org/grails/web/servlet/view/GroovyPageViewResolver.java b/grails-web-gsp/src/main/groovy/org/grails/web/servlet/view/GroovyPageViewResolver.java
index a14edebbe63..2f3741886ae 100644
--- a/grails-web-gsp/src/main/groovy/org/grails/web/servlet/view/GroovyPageViewResolver.java
+++ b/grails-web-gsp/src/main/groovy/org/grails/web/servlet/view/GroovyPageViewResolver.java
@@ -29,7 +29,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.grails.gsp.GroovyPagesTemplateEngine;
-import org.grails.gsp.io.GrailsConventionGroovyPageLocator;
+import org.grails.web.gsp.io.GrailsConventionGroovyPageLocator;
 import org.grails.gsp.io.GroovyPageScriptSource;
 import org.grails.web.servlet.mvc.GrailsWebRequest;
 import org.grails.web.util.WebUtils;
diff --git a/grails-gsp/src/test/groovy/org/grails/gsp/io/GrailsConventionGroovyPageLocatorSpec.groovy b/grails-web-gsp/src/test/groovy/org/grails/web/gsp/io/GrailsConventionGroovyPageLocatorSpec.groovy
similarity index 98%
rename from grails-gsp/src/test/groovy/org/grails/gsp/io/GrailsConventionGroovyPageLocatorSpec.groovy
rename to grails-web-gsp/src/test/groovy/org/grails/web/gsp/io/GrailsConventionGroovyPageLocatorSpec.groovy
index d36a1a4c6c9..2b815c94403 100644
--- a/grails-gsp/src/test/groovy/org/grails/gsp/io/GrailsConventionGroovyPageLocatorSpec.groovy
+++ b/grails-web-gsp/src/test/groovy/org/grails/web/gsp/io/GrailsConventionGroovyPageLocatorSpec.groovy
@@ -1,4 +1,4 @@
-package org.grails.gsp.io
+package org.grails.web.gsp.io
 
 import grails.core.DefaultGrailsApplication
 import grails.plugins.DefaultGrailsPluginManager
@@ -7,6 +7,8 @@ import grails.util.GrailsUtil
 import grails.util.GrailsWebMockUtil
 import org.grails.core.io.SimpleMapResourceLoader
 import org.grails.gsp.compiler.GroovyPageParser
+import org.grails.gsp.io.GroovyPageCompiledScriptSource
+import org.grails.gsp.io.GroovyPageResourceScriptSource
 import org.grails.plugins.BinaryGrailsPlugin
 import org.grails.plugins.BinaryGrailsPluginDescriptor
 import org.grails.plugins.CoreGrailsPlugin
@@ -203,7 +205,7 @@ class GrailsConventionGroovyPageLocatorSpec extends Specification {
 <plugin name='testBinary'>
   <class>TestBinaryGrailsPlugin</class>
   <resources>
-         <resource>org.grails.gsp.io.TestBinaryResource</resource>
+         <resource>org.grails.web.gsp.io.TestBinaryResource</resource>
   </resources>
 </plugin>
 '''
diff --git a/grails-web-gsp/src/test/groovy/org/grails/web/servlet/view/GroovyPageViewResolverSpec.groovy b/grails-web-gsp/src/test/groovy/org/grails/web/servlet/view/GroovyPageViewResolverSpec.groovy
index b862379f5a9..eaaf4305891 100644
--- a/grails-web-gsp/src/test/groovy/org/grails/web/servlet/view/GroovyPageViewResolverSpec.groovy
+++ b/grails-web-gsp/src/test/groovy/org/grails/web/servlet/view/GroovyPageViewResolverSpec.groovy
@@ -2,7 +2,7 @@ package org.grails.web.servlet.view
 
 import grails.util.GrailsWebMockUtil
 import org.grails.gsp.GroovyPagesTemplateEngine
-import org.grails.gsp.io.GrailsConventionGroovyPageLocator
+import org.grails.web.gsp.io.GrailsConventionGroovyPageLocator
 import org.grails.web.util.GrailsApplicationAttributes
 import org.springframework.web.context.request.RequestContextHolder
 import org.springframework.web.servlet.View
diff --git a/grails-web-taglib/src/main/groovy/grails/artefact/TagLibrary.groovy b/grails-web-taglib/src/main/groovy/grails/artefact/TagLibrary.groovy
index a6996b7f296..2213dadac2a 100644
--- a/grails-web-taglib/src/main/groovy/grails/artefact/TagLibrary.groovy
+++ b/grails-web-taglib/src/main/groovy/grails/artefact/TagLibrary.groovy
@@ -28,12 +28,12 @@ import org.grails.encoder.Encoder
 import org.grails.taglib.encoder.OutputEncodingStack
 import org.grails.taglib.encoder.WithCodecHelper
 import org.grails.web.servlet.mvc.GrailsWebRequest
-import org.grails.web.taglib.TagLibraryLookup
-import org.grails.web.taglib.TagOutput
-import org.grails.web.taglib.TemplateVariableBinding
+import org.grails.taglib.TagLibraryLookup
+import org.grails.taglib.TagOutput
+import org.grails.taglib.TemplateVariableBinding
 import org.grails.web.taglib.WebRequestTemplateVariableBinding
 import org.grails.taglib.GrailsTagException
-import org.grails.web.taglib.util.TagLibraryMetaUtils
+import org.grails.taglib.TagLibraryMetaUtils
 import org.grails.web.util.GrailsApplicationAttributes
 import org.springframework.web.context.request.RequestAttributes
 
diff --git a/grails-web-taglib/src/main/groovy/grails/artefact/gsp/TagLibraryInvoker.groovy b/grails-web-taglib/src/main/groovy/grails/artefact/gsp/TagLibraryInvoker.groovy
index a4632a5fd0d..bc0534d7ace 100644
--- a/grails-web-taglib/src/main/groovy/grails/artefact/gsp/TagLibraryInvoker.groovy
+++ b/grails-web-taglib/src/main/groovy/grails/artefact/gsp/TagLibraryInvoker.groovy
@@ -20,10 +20,10 @@ import grails.util.GrailsMetaClassUtils
 import grails.web.api.WebAttributes
 import groovy.transform.CompileStatic
 import org.grails.taglib.encoder.WithCodecHelper
-import org.grails.web.taglib.NamespacedTagDispatcher
-import org.grails.web.taglib.TagLibraryLookup
-import org.grails.web.taglib.TagOutput
-import org.grails.web.taglib.util.TagLibraryMetaUtils
+import org.grails.taglib.NamespacedTagDispatcher
+import org.grails.taglib.TagLibraryLookup
+import org.grails.taglib.TagOutput
+import org.grails.taglib.TagLibraryMetaUtils
 import org.springframework.beans.factory.annotation.Autowired
 
 /**
diff --git a/grails-web-taglib/src/main/groovy/org/grails/compiler/web/taglib/TagLibraryTransformer.java b/grails-web-taglib/src/main/groovy/org/grails/compiler/web/taglib/TagLibraryTransformer.java
index 67466919f8b..f8f2ddd36c3 100644
--- a/grails-web-taglib/src/main/groovy/org/grails/compiler/web/taglib/TagLibraryTransformer.java
+++ b/grails-web-taglib/src/main/groovy/org/grails/compiler/web/taglib/TagLibraryTransformer.java
@@ -31,9 +31,8 @@
 import org.grails.compiler.injection.GrailsASTUtils;
 import org.grails.core.artefact.TagLibArtefactHandler;
 import org.grails.io.support.GrailsResourceUtils;
-import org.grails.web.servlet.mvc.GrailsWebRequest;
-import org.grails.web.taglib.TagOutput;
-import org.springframework.web.context.request.RequestContextHolder;
+import org.grails.taglib.TagOutput;
+import org.grails.taglib.encoder.OutputContextLookupHelper;
 
 import java.lang.reflect.Modifier;
 import java.net.URL;
@@ -71,9 +70,9 @@ public class TagLibraryTransformer implements GrailsArtefactClassInjector, Annot
     private static final ClassNode TAG_OUTPUT_CLASS_NODE = new ClassNode(TagOutput.class);
     private static final VariableExpression ATTRS_EXPRESSION = new VariableExpression(ATTRS_ARGUMENT);
     private static final VariableExpression BODY_EXPRESSION = new VariableExpression(BODY_ARGUMENT);
-    private static final MethodCallExpression CURRENT_REQUEST_ATTRIBUTES_METHOD_CALL =
-        new MethodCallExpression(new ClassExpression(new ClassNode(RequestContextHolder.class)),
-                "currentRequestAttributes", ZERO_ARGS);
+    private static final MethodCallExpression CURRENT_OUTPUT_CONTEXT_METHOD_CALL =
+        new MethodCallExpression(new ClassExpression(new ClassNode(OutputContextLookupHelper.class)),
+                "lookupOutputContext", ZERO_ARGS);
     private static final Expression NULL_EXPRESSION = new ConstantExpression(null);
     private static final String NAMESPACE_PROPERTY = "namespace";
     private static final ClassNode CLOSURE_CLASS_NODE = new ClassNode(Closure.class);
@@ -164,7 +163,7 @@ private void addAttributesAndBodyMethod(ClassNode classNode, MethodCallExpressio
                  .addExpression(new ConstantExpression(tagName))
                  .addExpression(includeAttrs ? new CastExpression(ClassHelper.make(Map.class), ATTRS_EXPRESSION) : new MapExpression())
                  .addExpression(includeBody ? BODY_EXPRESSION : NULL_EXPRESSION)
-                 .addExpression(new CastExpression(ClassHelper.make(GrailsWebRequest.class), CURRENT_REQUEST_ATTRIBUTES_METHOD_CALL));
+                 .addExpression(CURRENT_OUTPUT_CONTEXT_METHOD_CALL);
 
         methodBody.addStatement(new ExpressionStatement(new MethodCallExpression(new ClassExpression(TAG_OUTPUT_CLASS_NODE),"captureTagOutput", arguments)));
 
diff --git a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/WebRequestTemplateVariableBinding.java b/grails-web-taglib/src/main/groovy/org/grails/web/taglib/WebRequestTemplateVariableBinding.java
index 97f5d0b84f2..8744b70bf48 100644
--- a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/WebRequestTemplateVariableBinding.java
+++ b/grails-web-taglib/src/main/groovy/org/grails/web/taglib/WebRequestTemplateVariableBinding.java
@@ -16,16 +16,17 @@
 package org.grails.web.taglib;
 
 import grails.util.Environment;
+import groovy.lang.Binding;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.grails.taglib.AbstractTemplateVariableBinding;
+import org.grails.web.servlet.mvc.GrailsWebRequest;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.grails.web.servlet.mvc.GrailsWebRequest;
-
 /**
  * Script binding to be used as the top-level binding in GSP evaluation.
  *
@@ -101,10 +102,28 @@ public WebRequestTemplateVariableBinding(GrailsWebRequest webRequest) {
         this.webRequest = webRequest;
     }
 
+    public Binding findBindingForVariable(String name) {
+        Binding binding = super.findBindingForVariable(name);
+        if(binding == null) {
+            if(webRequest.getCurrentRequest().getAttribute(name) != null) {
+                requestAttributeVariables.add(name);
+                binding = this;
+            }
+        }
+        if(binding == null && lazyRequestBasedValuesMap.containsKey(name)) {
+            binding = this;
+        }
+        return binding;
+    }
+
     public boolean isRequestAttributeVariable(String name) {
         return requestAttributeVariables.contains(name);
     }
 
+    public boolean isVariableCachingAllowed(String name) {
+        return !isRequestAttributeVariable(name);
+    }
+
     @Override
     public Object getVariable(String name) {
         Object val = getVariablesMap().get(name);
diff --git a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/encoder/WebOutputContextLookup.java b/grails-web-taglib/src/main/groovy/org/grails/web/taglib/encoder/WebOutputContextLookup.java
new file mode 100644
index 00000000000..c77bcbfe1b3
--- /dev/null
+++ b/grails-web-taglib/src/main/groovy/org/grails/web/taglib/encoder/WebOutputContextLookup.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * 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.grails.web.taglib.encoder;
+
+import grails.core.GrailsApplication;
+import org.grails.encoder.EncodingStateRegistry;
+import org.grails.taglib.AbstractTemplateVariableBinding;
+import org.grails.taglib.encoder.OutputContext;
+import org.grails.taglib.encoder.OutputContextLookup;
+import org.grails.taglib.encoder.OutputEncodingStack;
+import org.grails.web.servlet.WrappedResponseHolder;
+import org.grails.web.servlet.mvc.GrailsWebRequest;
+import org.grails.web.taglib.WebRequestTemplateVariableBinding;
+import org.grails.web.util.GrailsApplicationAttributes;
+import org.springframework.core.Ordered;
+import org.springframework.web.context.request.RequestAttributes;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.Writer;
+
+public class WebOutputContextLookup implements OutputContextLookup, Ordered {
+    private static final WebOutputContext webOutputContext = new WebOutputContext();
+    static final String ATTRIBUTE_NAME_OUTPUT_STACK="org.grails.web.encoder.OUTPUT_ENCODING_STACK";
+
+    @Override
+    public OutputContext lookupOutputContext() {
+        return webOutputContext;
+    }
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    static class WebOutputContext implements OutputContext {
+        WebOutputContext() {
+
+        }
+
+        @Override
+        public EncodingStateRegistry getEncodingStateRegistry() {
+            return lookupWebRequest().getEncodingStateRegistry();
+        }
+
+        @Override
+        public void setCurrentOutputEncodingStack(OutputEncodingStack outputEncodingStack) {
+            lookupWebRequest().setAttribute(ATTRIBUTE_NAME_OUTPUT_STACK, outputEncodingStack, RequestAttributes.SCOPE_REQUEST);
+        }
+
+        @Override
+        public OutputEncodingStack getCurrentOutputEncodingStack() {
+            return (OutputEncodingStack) lookupWebRequest().getAttribute(ATTRIBUTE_NAME_OUTPUT_STACK, RequestAttributes.SCOPE_REQUEST);
+        }
+
+        @Override
+        public Writer getCurrentWriter() {
+            return lookupWebRequest().getOut();
+        }
+
+        @Override
+        public void setCurrentWriter(Writer currentWriter) {
+            lookupWebRequest().setOut(currentWriter);
+        }
+
+        @Override
+        public AbstractTemplateVariableBinding createAndRegisterRootBinding() {
+            AbstractTemplateVariableBinding binding = new WebRequestTemplateVariableBinding(lookupWebRequest());
+            setBinding(binding);
+            return binding;
+        }
+
+        @Override
+        public AbstractTemplateVariableBinding getBinding() {
+            return (AbstractTemplateVariableBinding)lookupWebRequest().getAttribute(GrailsApplicationAttributes.PAGE_SCOPE, RequestAttributes.SCOPE_REQUEST);
+        }
+
+        @Override
+        public void setBinding(AbstractTemplateVariableBinding binding) {
+            lookupWebRequest().setAttribute(GrailsApplicationAttributes.PAGE_SCOPE, binding, RequestAttributes.SCOPE_REQUEST);
+        }
+
+        @Override
+        public GrailsApplication getGrailsApplication() {
+            return lookupWebRequest().getAttributes().getGrailsApplication();
+        }
+
+        @Override
+        public void setContentType(String contentType) {
+            lookupResponse().setContentType(contentType);
+        }
+
+        @Override
+        public boolean isContentTypeAlreadySet() {
+            HttpServletResponse response = lookupResponse();
+            return response.isCommitted() || response.getContentType() != null;
+        }
+
+        protected GrailsWebRequest lookupWebRequest() {
+            return GrailsWebRequest.lookup();
+        }
+
+        protected HttpServletResponse lookupResponse() {
+            HttpServletResponse wrapped = WrappedResponseHolder.getWrappedResponse();
+            return wrapped != null ? wrapped : lookupWebRequest().getCurrentResponse();
+        }
+    }
+}
diff --git a/grails-web-taglib/src/main/groovy/org/grails/web/taglib/encoder/WebRequestOutputContext.java b/grails-web-taglib/src/main/groovy/org/grails/web/taglib/encoder/WebRequestOutputContext.java
new file mode 100644
index 00000000000..5362e4b2d58
--- /dev/null
+++ b/grails-web-taglib/src/main/groovy/org/grails/web/taglib/encoder/WebRequestOutputContext.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * 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.grails.web.taglib.encoder;
+
+import org.grails.web.servlet.mvc.GrailsWebRequest;
+
+/**
+ * Created by lari on 02/01/15.
+ */
+public class WebRequestOutputContext extends WebOutputContextLookup.WebOutputContext {
+    private final GrailsWebRequest webRequest;
+
+    public WebRequestOutputContext(GrailsWebRequest webRequest) {
+        this.webRequest = webRequest;
+    }
+
+    protected GrailsWebRequest lookupWebRequest() {
+        return webRequest;
+    }
+}
diff --git a/grails-web-taglib/src/main/resources/META-INF/grails.factories b/grails-web-taglib/src/main/resources/META-INF/grails.factories
index 541f64ca225..47f90cd4608 100644
--- a/grails-web-taglib/src/main/resources/META-INF/grails.factories
+++ b/grails-web-taglib/src/main/resources/META-INF/grails.factories
@@ -1 +1,2 @@
 grails.compiler.traits.TraitInjector=grails.compiler.traits.TagLibraryTraitInjector
+org.grails.taglib.encoder.OutputContextLookup=org.grails.web.taglib.encoder.WebOutputContextLookup
diff --git a/grails-web-taglib/src/test/groovy/org/grails/web/taglib/TagLibraryLookupSpec.groovy b/grails-web-taglib/src/test/groovy/org/grails/web/taglib/TagLibraryLookupSpec.groovy
index b6ff8354a85..79c517d85ca 100644
--- a/grails-web-taglib/src/test/groovy/org/grails/web/taglib/TagLibraryLookupSpec.groovy
+++ b/grails-web-taglib/src/test/groovy/org/grails/web/taglib/TagLibraryLookupSpec.groovy
@@ -2,6 +2,8 @@ package org.grails.web.taglib
 
 import grails.core.DefaultGrailsApplication
 import grails.gsp.TagLib
+import org.grails.taglib.NamespacedTagDispatcher
+import org.grails.taglib.TagLibraryLookup
 import org.grails.web.servlet.mvc.GrailsWebRequest
 import org.springframework.mock.web.MockHttpServletRequest
 import org.springframework.mock.web.MockHttpServletResponse