graceframework · rainboyan · Dec 6, 2025 · Dec 6, 2025
diff --git a/grace-plugin-codecs/build.gradle b/grace-plugin-codecs/build.gradle
@@ -11,5 +11,5 @@ dependencies {
 
     testImplementation libs.jakarta.servlet
     testImplementation project(":grace-test")
-    testImplementation project(":grace-web-common")
+    testImplementation project(":grace-web")
 }
diff --git a/grace-plugin-controllers/build.gradle b/grace-plugin-controllers/build.gradle
@@ -6,6 +6,8 @@ dependencies {
     api project(":grace-plugin-databinding")
     api project(":grace-plugin-mimetypes")
     api project(":grace-plugin-validation")
+    api project(":grace-web-gsp")
+    api project(":grace-web-mvc")
     api project(":grace-util")
 
     compileOnly libs.jakarta.servlet

diff --git a/grace-plugin-converters/build.gradle b/grace-plugin-converters/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     api project(":grace-plugin-api")
     runtimeOnly project(":grace-plugin-controllers")
     api project(":grace-util")
-    api project(":grace-web-common")
+    api project(":grace-web")
 
     api libs.commons.lang3
     compileOnly libs.jakarta.servlet

diff --git a/grace-plugin-databinding/build.gradle b/grace-plugin-databinding/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(":grace-api")
     api project(":grace-plugin-api")
-    api project(":grace-web-common")
+    api project(":grace-web")
 
     compileOnly libs.jakarta.servlet
     api libs.spring.boot.autoconfigure

diff --git a/grace-plugin-fields/build.gradle b/grace-plugin-fields/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     api project(":grace-plugin-databinding")
     api project(":grace-plugin-validation")
     api project(":grace-scaffolding-core")
-    api project(":grace-web-common")
+    api project(":grace-web")
     api project(":grace-web-gsp")
     api project(":grace-web-taglib")
     implementation libs.grace.datastore.core

diff --git a/grace-plugin-i18n/build.gradle b/grace-plugin-i18n/build.gradle
@@ -3,7 +3,7 @@ dependencies {
     api project(":grace-bootstrap")
     api project(":grace-plugin-api")
     api project(":grace-util")
-    compileOnly project(":grace-web-common")
+    compileOnly project(":grace-web")
 
     api libs.groovy.ant
     api libs.spring.boot.autoconfigure

diff --git a/grace-plugin-validation/build.gradle b/grace-plugin-validation/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api libs.grace.datastore.gorm.validation
 
     testImplementation project(":grace-plugin-domain-class")
-    testImplementation project(":grace-web-common")
+    testImplementation project(":grace-web")
     testImplementation libs.jakarta.servlet
     testImplementation libs.spring.test
 }
diff --git a/grace-test-suite-web/build.gradle b/grace-test-suite-web/build.gradle
@@ -23,7 +23,6 @@ dependencies {
     testImplementation project(":grace-plugin-controllers")
     testImplementation project(":grace-plugin-rest")
     testImplementation project(":grace-web")
-    testImplementation project(":grace-web-common")
     testImplementation project(":grace-spring")
     testImplementation project(":grace-test-support")
 

diff --git a/grace-test/build.gradle b/grace-test/build.gradle
@@ -3,6 +3,9 @@ dependencies {
     api project(":grace-plugin-converters")
     api project(":grace-plugin-mimetypes")
     api project(":grace-web")
+    api project(":grace-web-gsp")
+    api project(":grace-web-mvc")
+    api project(":grace-web-taglib")
 
     api libs.ant
     api libs.ant.junit

diff --git a/grace-views-core/build.gradle b/grace-views-core/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api project(":grace-encoder")
     api project(":grace-plugin-domain-class")
     api project(":grace-plugin-rest")
-    api project(":grace-web-common")
+    api project(":grace-web")
     api project(":grace-web-url-mappings")
     api libs.grace.datastore.gorm.support
     api libs.caffeine

diff --git a/grace-web-common/src/main/resources/META-INF/grails.factories b/grace-web-common/src/main/resources/META-INF/grails.factories
diff --git a/grace-web-gsp/build.gradle b/grace-web-gsp/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     api project(":grace-gsp")
-    api project(":grace-web-common")
+    api project(":grace-web")
     api project(":grace-web-sitemesh")
 
     compileOnly libs.ant

diff --git a/grace-web-mvc/build.gradle b/grace-web-mvc/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     api project(":grace-gsp")
-    api project(":grace-web-common")
+    api project(":grace-web")
     api project(":grace-web-sitemesh")
     api project(":grace-web-url-mappings")
 

diff --git a/grace-web-sitemesh/build.gradle b/grace-web-sitemesh/build.gradle
@@ -3,7 +3,7 @@ dependencies {
     api libs.sitemesh, {
         exclude module: 'jakarta.servlet-api'
     }
-    api project(":grace-web-common")
+    api project(":grace-web")
 
     testImplementation libs.jakarta.servlet
     testImplementation libs.spring.test

diff --git a/grace-web-taglib/build.gradle b/grace-web-taglib/build.gradle
@@ -2,7 +2,7 @@ dependencies {
     compileOnly libs.jakarta.annotation.api
     compileOnlyApi libs.jakarta.servlet
     api project(":grace-taglib")
-    api project(":grace-web-common")
+    api project(":grace-web")
 
     testImplementation libs.jakarta.servlet
     testImplementation libs.spring.test

diff --git a/grace-web-url-mappings/build.gradle b/grace-web-url-mappings/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(":grace-api")
     api project(":grace-util")
-    api project(":grace-web-common")
+    api project(":grace-web")
 
     api(libs.grace.datastore.gorm.validation)
 

diff --git a/grace-web/build.gradle b/grace-web/build.gradle
@@ -1,16 +1,22 @@
 dependencies {
     api project(":grace-api")
+    api project(":grace-core")
+    api project(":grace-databinding")
+    api project(":grace-encoder")
     api project(":grace-plugin-api")
-    api project(":grace-web-common")
-    api project(":grace-web-gsp")
-    api project(":grace-web-mvc")
-    api project(":grace-web-sitemesh")
-    api project(":grace-web-taglib")
-    api project(":grace-web-url-mappings")
+    api project(":grace-util")
 
+    compileOnly libs.grace.datastore.core
+    compileOnly libs.jakarta.annotation.api
     compileOnlyApi libs.jakarta.servlet
-    compileOnly libs.grace.datastore.gorm.support
+    api libs.groovy.templates
+    api libs.spring.contextSupport
+    api libs.spring.web
+    api libs.spring.webmvc
+    compileOnly libs.jsr305
+    implementation libs.caffeine
 
     testImplementation libs.jakarta.servlet
+    testImplementation libs.spring.test
     testImplementation project(":grace-test")
 }
diff --git a/...rails/beans/util/LazyMetaPropertyMap.java → ...rails/beans/util/LazyMetaPropertyMap.java b/...rails/beans/util/LazyMetaPropertyMap.java → ...rails/beans/util/LazyMetaPropertyMap.java
diff --git a/...vy/grails/core/GrailsControllerClass.java → ...vy/grails/core/GrailsControllerClass.java b/...vy/grails/core/GrailsControllerClass.java → ...vy/grails/core/GrailsControllerClass.java
diff --git a/...y/grails/core/GrailsUrlMappingsClass.java → ...y/grails/core/GrailsUrlMappingsClass.java b/...y/grails/core/GrailsUrlMappingsClass.java → ...y/grails/core/GrailsUrlMappingsClass.java
diff --git a/...ain/groovy/grails/util/GrailsWebUtil.java → ...ain/groovy/grails/util/GrailsWebUtil.java b/...ain/groovy/grails/util/GrailsWebUtil.java → ...ain/groovy/grails/util/GrailsWebUtil.java
diff --git a/...on/src/main/groovy/grails/web/Action.java → ...eb/src/main/groovy/grails/web/Action.java b/...on/src/main/groovy/grails/web/Action.java → ...eb/src/main/groovy/grails/web/Action.java
diff --git a/...ovy/grails/web/CamelCaseUrlConverter.java → ...ovy/grails/web/CamelCaseUrlConverter.java b/...ovy/grails/web/CamelCaseUrlConverter.java → ...ovy/grails/web/CamelCaseUrlConverter.java
diff --git a/...vy/grails/web/HyphenatedUrlConverter.java → ...vy/grails/web/HyphenatedUrlConverter.java b/...vy/grails/web/HyphenatedUrlConverter.java → ...vy/grails/web/HyphenatedUrlConverter.java
diff --git a/...n/groovy/grails/web/RequestParameter.java → ...n/groovy/grails/web/RequestParameter.java b/...n/groovy/grails/web/RequestParameter.java → ...n/groovy/grails/web/RequestParameter.java
diff --git a/.../main/groovy/grails/web/UrlConverter.java → .../main/groovy/grails/web/UrlConverter.java b/.../main/groovy/grails/web/UrlConverter.java → .../main/groovy/grails/web/UrlConverter.java
diff --git a/...y/grails/web/api/ServletAttributes.groovy → ...y/grails/web/api/ServletAttributes.groovy b/...y/grails/web/api/ServletAttributes.groovy → ...y/grails/web/api/ServletAttributes.groovy
diff --git a/...roovy/grails/web/api/WebAttributes.groovy → ...roovy/grails/web/api/WebAttributes.groovy b/...roovy/grails/web/api/WebAttributes.groovy → ...roovy/grails/web/api/WebAttributes.groovy
diff --git a/...ils/web/context/ServletContextHolder.java → ...ils/web/context/ServletContextHolder.java b/...ils/web/context/ServletContextHolder.java → ...ils/web/context/ServletContextHolder.java
diff --git a/.../web/context/WebRequestServletHolder.java → .../web/context/WebRequestServletHolder.java b/.../web/context/WebRequestServletHolder.java → .../web/context/WebRequestServletHolder.java
diff --git a/...ils/web/controllers/ControllerMethod.java → ...ils/web/controllers/ControllerMethod.java b/...ils/web/controllers/ControllerMethod.java → ...ils/web/controllers/ControllerMethod.java
diff --git a/...ils/web/databinding/DataBindingUtils.java → ...ils/web/databinding/DataBindingUtils.java b/...ils/web/databinding/DataBindingUtils.java → ...ils/web/databinding/DataBindingUtils.java
diff --git a/...eb/databinding/GrailsWebDataBinder.groovy → ...eb/databinding/GrailsWebDataBinder.groovy b/...eb/databinding/GrailsWebDataBinder.groovy → ...eb/databinding/GrailsWebDataBinder.groovy
diff --git a/...n/groovy/grails/web/http/HttpHeaders.java → ...n/groovy/grails/web/http/HttpHeaders.java b/...n/groovy/grails/web/http/HttpHeaders.java → ...n/groovy/grails/web/http/HttpHeaders.java
diff --git a/...in/groovy/grails/web/mime/MimeType.groovy → ...in/groovy/grails/web/mime/MimeType.groovy b/...in/groovy/grails/web/mime/MimeType.groovy → ...in/groovy/grails/web/mime/MimeType.groovy
diff --git a/...y/grails/web/mime/MimeTypeProvider.groovy → ...y/grails/web/mime/MimeTypeProvider.groovy b/...y/grails/web/mime/MimeTypeProvider.groovy → ...y/grails/web/mime/MimeTypeProvider.groovy
diff --git a/...y/grails/web/mime/MimeTypeResolver.groovy → ...y/grails/web/mime/MimeTypeResolver.groovy b/...y/grails/web/mime/MimeTypeResolver.groovy → ...y/grails/web/mime/MimeTypeResolver.groovy
diff --git a/...oovy/grails/web/mime/MimeTypeUtils.groovy → ...oovy/grails/web/mime/MimeTypeUtils.groovy b/...oovy/grails/web/mime/MimeTypeUtils.groovy → ...oovy/grails/web/mime/MimeTypeUtils.groovy
diff --git a/...ain/groovy/grails/web/mvc/FlashScope.java → ...ain/groovy/grails/web/mvc/FlashScope.java b/...ain/groovy/grails/web/mvc/FlashScope.java → ...ain/groovy/grails/web/mvc/FlashScope.java
diff --git a/...ails/web/pages/GroovyPagesUriService.java → ...ails/web/pages/GroovyPagesUriService.java b/...ails/web/pages/GroovyPagesUriService.java → ...ails/web/pages/GroovyPagesUriService.java
diff --git a/...ls/web/servlet/mvc/GrailsHttpSession.java → ...ls/web/servlet/mvc/GrailsHttpSession.java b/...ls/web/servlet/mvc/GrailsHttpSession.java → ...ls/web/servlet/mvc/GrailsHttpSession.java
diff --git a/...s/web/servlet/mvc/GrailsParameterMap.java → ...s/web/servlet/mvc/GrailsParameterMap.java b/...s/web/servlet/mvc/GrailsParameterMap.java → ...s/web/servlet/mvc/GrailsParameterMap.java
diff --git a/...ls/core/DefaultGrailsControllerClass.java → ...ls/core/DefaultGrailsControllerClass.java b/...ls/core/DefaultGrailsControllerClass.java → ...ls/core/DefaultGrailsControllerClass.java
diff --git a/...s/core/DefaultGrailsUrlMappingsClass.java → ...s/core/DefaultGrailsUrlMappingsClass.java b/...s/core/DefaultGrailsUrlMappingsClass.java → ...s/core/DefaultGrailsUrlMappingsClass.java
diff --git a/...e/DataBindingSourceCreationException.java → ...e/DataBindingSourceCreationException.java b/...e/DataBindingSourceCreationException.java → ...e/DataBindingSourceCreationException.java
diff --git a/...ingsource/DataBindingSourceCreator.groovy → ...ingsource/DataBindingSourceCreator.groovy b/...ingsource/DataBindingSourceCreator.groovy → ...ingsource/DataBindingSourceCreator.groovy
diff --git a/.../beans/PropertyEditorRegistryUtils.groovy → .../beans/PropertyEditorRegistryUtils.groovy b/.../beans/PropertyEditorRegistryUtils.groovy → .../beans/PropertyEditorRegistryUtils.groovy
diff --git a/...g/grails/web/binding/CompositeEditor.java → ...g/grails/web/binding/CompositeEditor.java b/...g/grails/web/binding/CompositeEditor.java → ...g/grails/web/binding/CompositeEditor.java
diff --git a/...ils/web/binding/StructuredDateEditor.java → ...ils/web/binding/StructuredDateEditor.java b/...ils/web/binding/StructuredDateEditor.java → ...ils/web/binding/StructuredDateEditor.java
diff --git a/...web/binding/StructuredPropertyEditor.java → ...web/binding/StructuredPropertyEditor.java b/...web/binding/StructuredPropertyEditor.java → ...web/binding/StructuredPropertyEditor.java
diff --git a/...GrailsApplicationDiscoveryStrategy.groovy → ...GrailsApplicationDiscoveryStrategy.groovy b/...GrailsApplicationDiscoveryStrategy.groovy → ...GrailsApplicationDiscoveryStrategy.groovy
diff --git a/...web/databinding/ASTDatabindingHelper.java → ...web/databinding/ASTDatabindingHelper.java b/...web/databinding/ASTDatabindingHelper.java → ...web/databinding/ASTDatabindingHelper.java
diff --git a/.../DataBindingEventMulticastListener.groovy → .../DataBindingEventMulticastListener.groovy b/.../DataBindingEventMulticastListener.groovy → .../DataBindingEventMulticastListener.groovy
diff --git a/...nding/DataBindingLazyMetaPropertyMap.java → ...nding/DataBindingLazyMetaPropertyMap.java b/...nding/DataBindingLazyMetaPropertyMap.java → ...nding/DataBindingLazyMetaPropertyMap.java
diff --git a/...abinding/DefaultASTDatabindingHelper.java → ...abinding/DefaultASTDatabindingHelper.java b/...abinding/DefaultASTDatabindingHelper.java → ...abinding/DefaultASTDatabindingHelper.java
diff --git a/...nding/GrailsWebDataBindingListener.groovy → ...nding/GrailsWebDataBindingListener.groovy b/...nding/GrailsWebDataBindingListener.groovy → ...nding/GrailsWebDataBindingListener.groovy
diff --git a/...ing/SpringConversionServiceAdapter.groovy → ...ing/SpringConversionServiceAdapter.groovy b/...ing/SpringConversionServiceAdapter.groovy → ...ing/SpringConversionServiceAdapter.groovy
diff --git a/...equestBodyDataBindingSourceCreator.groovy → ...equestBodyDataBindingSourceCreator.groovy b/...equestBodyDataBindingSourceCreator.groovy → ...equestBodyDataBindingSourceCreator.groovy
diff --git a/...ngsource/DataBindingSourceRegistry.groovy → ...ngsource/DataBindingSourceRegistry.groovy b/...ngsource/DataBindingSourceRegistry.groovy → ...ngsource/DataBindingSourceRegistry.groovy
diff --git a/...ce/DefaultDataBindingSourceCreator.groovy → ...ce/DefaultDataBindingSourceCreator.groovy b/...ce/DefaultDataBindingSourceCreator.groovy → ...ce/DefaultDataBindingSourceCreator.groovy
diff --git a/...e/DefaultDataBindingSourceRegistry.groovy → ...e/DefaultDataBindingSourceRegistry.groovy b/...e/DefaultDataBindingSourceRegistry.groovy → ...e/DefaultDataBindingSourceRegistry.groovy
diff --git a/...ng/bindingsource/HalGPathResultMap.groovy → ...ng/bindingsource/HalGPathResultMap.groovy b/...ng/bindingsource/HalGPathResultMap.groovy → ...ng/bindingsource/HalGPathResultMap.groovy
diff --git a/...ce/HalJsonDataBindingSourceCreator.groovy → ...ce/HalJsonDataBindingSourceCreator.groovy b/...ce/HalJsonDataBindingSourceCreator.groovy → ...ce/HalJsonDataBindingSourceCreator.groovy
diff --git a/...rce/HalXmlDataBindingSourceCreator.groovy → ...rce/HalXmlDataBindingSourceCreator.groovy b/...rce/HalXmlDataBindingSourceCreator.groovy → ...rce/HalXmlDataBindingSourceCreator.groovy
diff --git a/...ngsource/InvalidRequestBodyException.java → ...ngsource/InvalidRequestBodyException.java b/...ngsource/InvalidRequestBodyException.java → ...ngsource/InvalidRequestBodyException.java
diff --git a/...ce/JsonApiDataBindingSourceCreator.groovy → ...ce/JsonApiDataBindingSourceCreator.groovy b/...ce/JsonApiDataBindingSourceCreator.groovy → ...ce/JsonApiDataBindingSourceCreator.groovy
diff --git a/...ource/JsonDataBindingSourceCreator.groovy → ...ource/JsonDataBindingSourceCreator.groovy b/...ource/JsonDataBindingSourceCreator.groovy → ...ource/JsonDataBindingSourceCreator.groovy
diff --git a/...source/XmlDataBindingSourceCreator.groovy → ...source/XmlDataBindingSourceCreator.groovy b/...source/XmlDataBindingSourceCreator.groovy → ...source/XmlDataBindingSourceCreator.groovy
diff --git a/...rs/AbstractStructuredBindingEditor.groovy → ...rs/AbstractStructuredBindingEditor.groovy b/...rs/AbstractStructuredBindingEditor.groovy → ...rs/AbstractStructuredBindingEditor.groovy
diff --git a/...teArrayMultipartFileValueConverter.groovy → ...teArrayMultipartFileValueConverter.groovy b/...teArrayMultipartFileValueConverter.groovy → ...teArrayMultipartFileValueConverter.groovy
diff --git a/...ParamsAwareLocaleChangeInterceptor.groovy → ...ParamsAwareLocaleChangeInterceptor.groovy b/...ParamsAwareLocaleChangeInterceptor.groovy → ...ParamsAwareLocaleChangeInterceptor.groovy
diff --git a/...groovy/org/grails/web/json/JSONArray.java → ...groovy/org/grails/web/json/JSONArray.java b/...groovy/org/grails/web/json/JSONArray.java → ...groovy/org/grails/web/json/JSONArray.java
diff --git a/...oovy/org/grails/web/json/JSONElement.java → ...oovy/org/grails/web/json/JSONElement.java b/...oovy/org/grails/web/json/JSONElement.java → ...oovy/org/grails/web/json/JSONElement.java
diff --git a/...vy/org/grails/web/json/JSONException.java → ...vy/org/grails/web/json/JSONException.java b/...vy/org/grails/web/json/JSONException.java → ...vy/org/grails/web/json/JSONException.java
diff --git a/...roovy/org/grails/web/json/JSONObject.java → ...roovy/org/grails/web/json/JSONObject.java b/...roovy/org/grails/web/json/JSONObject.java → ...roovy/org/grails/web/json/JSONObject.java
diff --git a/...oovy/org/grails/web/json/JSONTokener.java → ...oovy/org/grails/web/json/JSONTokener.java b/...oovy/org/grails/web/json/JSONTokener.java → ...oovy/org/grails/web/json/JSONTokener.java
diff --git a/...roovy/org/grails/web/json/JSONWriter.java → ...roovy/org/grails/web/json/JSONWriter.java b/...roovy/org/grails/web/json/JSONWriter.java → ...roovy/org/grails/web/json/JSONWriter.java
diff --git a/.../json/PathCapturingJSONWriterWrapper.java → .../json/PathCapturingJSONWriterWrapper.java b/.../json/PathCapturingJSONWriterWrapper.java → .../json/PathCapturingJSONWriterWrapper.java
diff --git a/...rails/web/json/PrettyPrintJSONWriter.java → ...rails/web/json/PrettyPrintJSONWriter.java b/...rails/web/json/PrettyPrintJSONWriter.java → ...rails/web/json/PrettyPrintJSONWriter.java
diff --git a/...rg/grails/web/json/parser/JSONParser.java → ...rg/grails/web/json/parser/JSONParser.java b/...rg/grails/web/json/parser/JSONParser.java → ...rg/grails/web/json/parser/JSONParser.java
diff --git a/.../web/json/parser/JsonParserConstants.java → .../web/json/parser/JsonParserConstants.java b/.../web/json/parser/JsonParserConstants.java → .../web/json/parser/JsonParserConstants.java
diff --git a/...b/json/parser/JsonParserTokenManager.java → ...b/json/parser/JsonParserTokenManager.java b/...b/json/parser/JsonParserTokenManager.java → ...b/json/parser/JsonParserTokenManager.java
diff --git a/...rails/web/json/parser/ParseException.java → ...rails/web/json/parser/ParseException.java b/...rails/web/json/parser/ParseException.java → ...rails/web/json/parser/ParseException.java
diff --git a/...ils/web/json/parser/SimpleCharStream.java → ...ils/web/json/parser/SimpleCharStream.java b/...ils/web/json/parser/SimpleCharStream.java → ...ils/web/json/parser/SimpleCharStream.java
diff --git a/...s/web/json/parser/StringUnmarshaller.java → ...s/web/json/parser/StringUnmarshaller.java b/...s/web/json/parser/StringUnmarshaller.java → ...s/web/json/parser/StringUnmarshaller.java
diff --git a/...ovy/org/grails/web/json/parser/Token.java → ...ovy/org/grails/web/json/parser/Token.java b/...ovy/org/grails/web/json/parser/Token.java → ...ovy/org/grails/web/json/parser/Token.java
diff --git a/...grails/web/json/parser/TokenMgrError.java → ...grails/web/json/parser/TokenMgrError.java b/...grails/web/json/parser/TokenMgrError.java → ...grails/web/json/parser/TokenMgrError.java
diff --git a/...b/pages/DefaultGroovyPagesUriService.java → ...b/pages/DefaultGroovyPagesUriService.java b/...b/pages/DefaultGroovyPagesUriService.java → ...b/pages/DefaultGroovyPagesUriService.java
diff --git a/...FilteringCodecsByContentTypeSettings.java → ...FilteringCodecsByContentTypeSettings.java b/...FilteringCodecsByContentTypeSettings.java → ...FilteringCodecsByContentTypeSettings.java
diff --git a/...ails/web/pages/GroovyPagesUriSupport.java → ...ails/web/pages/GroovyPagesUriSupport.java b/...ails/web/pages/GroovyPagesUriSupport.java → ...ails/web/pages/GroovyPagesUriSupport.java
diff --git a/...t/DefaultGrailsApplicationAttributes.java → ...t/DefaultGrailsApplicationAttributes.java b/...t/DefaultGrailsApplicationAttributes.java → ...t/DefaultGrailsApplicationAttributes.java
diff --git a/.../grails/web/servlet/GrailsFlashScope.java → .../grails/web/servlet/GrailsFlashScope.java b/.../grails/web/servlet/GrailsFlashScope.java → .../grails/web/servlet/GrailsFlashScope.java
diff --git a/...ils/web/servlet/GrailsRequestContext.java → ...ils/web/servlet/GrailsRequestContext.java b/...ils/web/servlet/GrailsRequestContext.java → ...ils/web/servlet/GrailsRequestContext.java
diff --git a/...t/WebRequestDelegatingRequestContext.java → ...t/WebRequestDelegatingRequestContext.java b/...t/WebRequestDelegatingRequestContext.java → ...t/WebRequestDelegatingRequestContext.java
diff --git a/...ls/web/servlet/WrappedResponseHolder.java → ...ls/web/servlet/WrappedResponseHolder.java b/...ls/web/servlet/WrappedResponseHolder.java → ...ls/web/servlet/WrappedResponseHolder.java
diff --git a/...ervlet/mvc/ActionResultTransformer.groovy → ...ervlet/mvc/ActionResultTransformer.groovy b/...ervlet/mvc/ActionResultTransformer.groovy → ...ervlet/mvc/ActionResultTransformer.groovy
diff --git a/...vc/DefaultRequestStateLookupStrategy.java → ...vc/DefaultRequestStateLookupStrategy.java b/...vc/DefaultRequestStateLookupStrategy.java → ...vc/DefaultRequestStateLookupStrategy.java
diff --git a/...mvc/GrailsRequestStateLookupStrategy.java → ...mvc/GrailsRequestStateLookupStrategy.java b/...mvc/GrailsRequestStateLookupStrategy.java → ...mvc/GrailsRequestStateLookupStrategy.java
diff --git a/...ils/web/servlet/mvc/GrailsWebRequest.java → ...ils/web/servlet/mvc/GrailsWebRequest.java b/...ils/web/servlet/mvc/GrailsWebRequest.java → ...ils/web/servlet/mvc/GrailsWebRequest.java
diff --git a/...mvc/OutputAwareHttpServletResponse.groovy → ...mvc/OutputAwareHttpServletResponse.groovy b/...mvc/OutputAwareHttpServletResponse.groovy → ...mvc/OutputAwareHttpServletResponse.groovy
diff --git a/...ervlet/mvc/ParameterCreationListener.java → ...ervlet/mvc/ParameterCreationListener.java b/...ervlet/mvc/ParameterCreationListener.java → ...ervlet/mvc/ParameterCreationListener.java
diff --git a/...eptions/ControllerExecutionException.java → ...eptions/ControllerExecutionException.java b/...eptions/ControllerExecutionException.java → ...eptions/ControllerExecutionException.java
diff --git a/...et/mvc/exceptions/GrailsMVCException.java → ...et/mvc/exceptions/GrailsMVCException.java b/...et/mvc/exceptions/GrailsMVCException.java → ...et/mvc/exceptions/GrailsMVCException.java
diff --git a/.../web/servlet/view/AbstractGrailsView.java → .../web/servlet/view/AbstractGrailsView.java b/.../web/servlet/view/AbstractGrailsView.java → .../web/servlet/view/AbstractGrailsView.java
diff --git a/...servlet/view/CompositeViewResolver.groovy → ...servlet/view/CompositeViewResolver.groovy b/...servlet/view/CompositeViewResolver.groovy → ...servlet/view/CompositeViewResolver.groovy
diff --git a/.../web/servlet/view/GrailsViewResolver.java → .../web/servlet/view/GrailsViewResolver.java b/.../web/servlet/view/GrailsViewResolver.java → .../web/servlet/view/GrailsViewResolver.java
diff --git a/.../web/servlet/view/LayoutViewResolver.java → .../web/servlet/view/LayoutViewResolver.java b/.../web/servlet/view/LayoutViewResolver.java → .../web/servlet/view/LayoutViewResolver.java
diff --git a/...il/BoundedCharsAsEncodedBytesCounter.java → ...il/BoundedCharsAsEncodedBytesCounter.java b/...il/BoundedCharsAsEncodedBytesCounter.java → ...il/BoundedCharsAsEncodedBytesCounter.java
diff --git a/.../web/util/ClassAndMimeTypeRegistry.groovy → .../web/util/ClassAndMimeTypeRegistry.groovy b/.../web/util/ClassAndMimeTypeRegistry.groovy → .../web/util/ClassAndMimeTypeRegistry.groovy
diff --git a/...web/util/GrailsApplicationAttributes.java → ...web/util/GrailsApplicationAttributes.java b/...web/util/GrailsApplicationAttributes.java → ...web/util/GrailsApplicationAttributes.java
diff --git a/...ails/web/util/IncludeResponseWrapper.java → ...ails/web/util/IncludeResponseWrapper.java b/...ails/web/util/IncludeResponseWrapper.java → ...ails/web/util/IncludeResponseWrapper.java
diff --git a/.../org/grails/web/util/IncludedContent.java → .../org/grails/web/util/IncludedContent.java b/.../org/grails/web/util/IncludedContent.java → .../org/grails/web/util/IncludedContent.java
diff --git a/.../groovy/org/grails/web/util/WebUtils.java → .../groovy/org/grails/web/util/WebUtils.java b/.../groovy/org/grails/web/util/WebUtils.java → .../groovy/org/grails/web/util/WebUtils.java
diff --git a/...s/web/xml/PrettyPrintXMLStreamWriter.java → ...s/web/xml/PrettyPrintXMLStreamWriter.java b/...s/web/xml/PrettyPrintXMLStreamWriter.java → ...s/web/xml/PrettyPrintXMLStreamWriter.java
diff --git a/...grails/web/xml/StreamingMarkupWriter.java → ...grails/web/xml/StreamingMarkupWriter.java b/...grails/web/xml/StreamingMarkupWriter.java → ...grails/web/xml/StreamingMarkupWriter.java
diff --git a/...y/org/grails/web/xml/XMLStreamWriter.java → ...y/org/grails/web/xml/XMLStreamWriter.java b/...y/org/grails/web/xml/XMLStreamWriter.java → ...y/org/grails/web/xml/XMLStreamWriter.java
diff --git a/grace-web/src/main/resources/META-INF/grails.factories b/grace-web/src/main/resources/META-INF/grails.factories
@@ -0,0 +1,2 @@
+org.grails.web.util.GrailsApplicationAttributes=\
+org.grails.web.servlet.DefaultGrailsApplicationAttributes
diff --git a/...sources/org/grails/web/json/jsonparser.jj → ...sources/org/grails/web/json/jsonparser.jj b/...sources/org/grails/web/json/jsonparser.jj → ...sources/org/grails/web/json/jsonparser.jj
diff --git a/.../bean/util/LazyMetaPropertyMapSpec.groovy → .../bean/util/LazyMetaPropertyMapSpec.groovy b/.../bean/util/LazyMetaPropertyMapSpec.groovy → .../bean/util/LazyMetaPropertyMapSpec.groovy
diff --git a/...bean/util/LazyMetaPropertyMapTests.groovy → ...bean/util/LazyMetaPropertyMapTests.groovy b/...bean/util/LazyMetaPropertyMapTests.groovy → ...bean/util/LazyMetaPropertyMapTests.groovy
diff --git a/...ails/web/CamelCaseUrlConverterSpec.groovy → ...ails/web/CamelCaseUrlConverterSpec.groovy b/...ails/web/CamelCaseUrlConverterSpec.groovy → ...ails/web/CamelCaseUrlConverterSpec.groovy
diff --git a/...ils/web/HyphenatedUrlConverterSpec.groovy → ...ils/web/HyphenatedUrlConverterSpec.groovy b/...ils/web/HyphenatedUrlConverterSpec.groovy → ...ils/web/HyphenatedUrlConverterSpec.groovy
diff --git a/...ervletAttributesTraitGeneratedSpec.groovy → ...ervletAttributesTraitGeneratedSpec.groovy b/...ervletAttributesTraitGeneratedSpec.groovy → ...ervletAttributesTraitGeneratedSpec.groovy
diff --git a/...pi/WebAttributesTraitGeneratedSpec.groovy → ...pi/WebAttributesTraitGeneratedSpec.groovy b/...pi/WebAttributesTraitGeneratedSpec.groovy → ...pi/WebAttributesTraitGeneratedSpec.groovy
diff --git a/...ervlet/mvc/GrailsParameterMapTests.groovy → ...ervlet/mvc/GrailsParameterMapTests.groovy b/...ervlet/mvc/GrailsParameterMapTests.groovy → ...ervlet/mvc/GrailsParameterMapTests.groovy
diff --git a/...ataBindingLazyMetaPropertyMapTests.groovy → ...ataBindingLazyMetaPropertyMapTests.groovy b/...ataBindingLazyMetaPropertyMapTests.groovy → ...ataBindingLazyMetaPropertyMapTests.groovy
diff --git a/...stBodyDataBindingSourceCreatorSpec.groovy → ...stBodyDataBindingSourceCreatorSpec.groovy b/...stBodyDataBindingSourceCreatorSpec.groovy → ...stBodyDataBindingSourceCreatorSpec.groovy
diff --git a/...indingsource/HalGPathResultMapSpec.groovy → ...indingsource/HalGPathResultMapSpec.groovy b/...indingsource/HalGPathResultMapSpec.groovy → ...indingsource/HalGPathResultMapSpec.groovy
diff --git a/...alJsonDataBindingSourceCreatorSpec.groovy → ...alJsonDataBindingSourceCreatorSpec.groovy b/...alJsonDataBindingSourceCreatorSpec.groovy → ...alJsonDataBindingSourceCreatorSpec.groovy
diff --git a/...n/JsonDataBindingSourceCreatorSpec.groovy → ...n/JsonDataBindingSourceCreatorSpec.groovy b/...n/JsonDataBindingSourceCreatorSpec.groovy → ...n/JsonDataBindingSourceCreatorSpec.groovy
diff --git a/...sonApiDataBindingSourceCreatorSpec.groovy → ...sonApiDataBindingSourceCreatorSpec.groovy b/...sonApiDataBindingSourceCreatorSpec.groovy → ...sonApiDataBindingSourceCreatorSpec.groovy
diff --git a/...ils/web/json/parser/JSONParserSpec.groovy → ...ils/web/json/parser/JSONParserSpec.groovy b/...ils/web/json/parser/JSONParserSpec.groovy → ...ils/web/json/parser/JSONParserSpec.groovy
diff --git a/...web/pages/GroovyPagesUriSupportTests.java → ...web/pages/GroovyPagesUriSupportTests.java b/...web/pages/GroovyPagesUriSupportTests.java → ...web/pages/GroovyPagesUriSupportTests.java
diff --git a/...y/org/grails/web/util/WebUtilsSpec.groovy → ...y/org/grails/web/util/WebUtilsSpec.groovy b/...y/org/grails/web/util/WebUtilsSpec.groovy → ...y/org/grails/web/util/WebUtilsSpec.groovy
diff --git a/settings.gradle b/settings.gradle
@@ -31,7 +31,7 @@ include (
         'grace-views-json',
         'grace-views-markup',
         'grace-web',
-        'grace-web-common',
+        // 'grace-web-common',
         'grace-web-gsp',
         'grace-web-mvc',
         'grace-web-sitemesh',
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		org.grails.web.util.GrailsApplicationAttributes=\
		org.grails.web.servlet.DefaultGrailsApplicationAttributes