diff --git a/grace-plugin-codecs/build.gradle b/grace-plugin-codecs/build.gradle index 9905f5930d..c9d2d877e0 100644 --- 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 index f907222c26..7dc9c94770 100644 --- 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 index 70f67af288..91d603ff5b 100644 --- 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 index d590de4120..3f1318a7af 100644 --- 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 index 4fa1f82c18..b915be2b17 100644 --- 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 index a5fb99682b..3d26853284 100644 --- 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 index 458a5451f8..a69095bca6 100644 --- 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 index b47302d05e..4e90caa1d4 100644 --- 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 index 890159ba55..e168792cca 100644 --- 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 index 82d3f1959e..ae9e1fc409 100644 --- 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 deleted file mode 100644 index 1c81663cad..0000000000 --- a/grace-web-common/src/main/resources/META-INF/grails.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.grails.web.util.GrailsApplicationAttributes=org.grails.web.servlet.DefaultGrailsApplicationAttributes - diff --git a/grace-web-gsp/build.gradle b/grace-web-gsp/build.gradle index d6a49c588a..ab2149a9ca 100644 --- 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 index fe4545b220..a1d1c4b56a 100644 --- 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 index f9b1f652c6..3c98223ffe 100644 --- 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 index f64d38a947..207b8c904e 100644 --- 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 index 4b39155ebf..886fe7c3e4 100644 --- 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 index 16b3dc3b9c..ab08956e86 100644 --- 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/grace-web-common/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java b/grace-web/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java rename to grace-web/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java diff --git a/grace-web-common/src/main/groovy/grails/core/GrailsControllerClass.java b/grace-web/src/main/groovy/grails/core/GrailsControllerClass.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/core/GrailsControllerClass.java rename to grace-web/src/main/groovy/grails/core/GrailsControllerClass.java diff --git a/grace-web-common/src/main/groovy/grails/core/GrailsUrlMappingsClass.java b/grace-web/src/main/groovy/grails/core/GrailsUrlMappingsClass.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/core/GrailsUrlMappingsClass.java rename to grace-web/src/main/groovy/grails/core/GrailsUrlMappingsClass.java diff --git a/grace-web-common/src/main/groovy/grails/util/GrailsWebUtil.java b/grace-web/src/main/groovy/grails/util/GrailsWebUtil.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/util/GrailsWebUtil.java rename to grace-web/src/main/groovy/grails/util/GrailsWebUtil.java diff --git a/grace-web-common/src/main/groovy/grails/web/Action.java b/grace-web/src/main/groovy/grails/web/Action.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/Action.java rename to grace-web/src/main/groovy/grails/web/Action.java diff --git a/grace-web-common/src/main/groovy/grails/web/CamelCaseUrlConverter.java b/grace-web/src/main/groovy/grails/web/CamelCaseUrlConverter.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/CamelCaseUrlConverter.java rename to grace-web/src/main/groovy/grails/web/CamelCaseUrlConverter.java diff --git a/grace-web-common/src/main/groovy/grails/web/HyphenatedUrlConverter.java b/grace-web/src/main/groovy/grails/web/HyphenatedUrlConverter.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/HyphenatedUrlConverter.java rename to grace-web/src/main/groovy/grails/web/HyphenatedUrlConverter.java diff --git a/grace-web-common/src/main/groovy/grails/web/RequestParameter.java b/grace-web/src/main/groovy/grails/web/RequestParameter.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/RequestParameter.java rename to grace-web/src/main/groovy/grails/web/RequestParameter.java diff --git a/grace-web-common/src/main/groovy/grails/web/UrlConverter.java b/grace-web/src/main/groovy/grails/web/UrlConverter.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/UrlConverter.java rename to grace-web/src/main/groovy/grails/web/UrlConverter.java diff --git a/grace-web-common/src/main/groovy/grails/web/api/ServletAttributes.groovy b/grace-web/src/main/groovy/grails/web/api/ServletAttributes.groovy similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/api/ServletAttributes.groovy rename to grace-web/src/main/groovy/grails/web/api/ServletAttributes.groovy diff --git a/grace-web-common/src/main/groovy/grails/web/api/WebAttributes.groovy b/grace-web/src/main/groovy/grails/web/api/WebAttributes.groovy similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/api/WebAttributes.groovy rename to grace-web/src/main/groovy/grails/web/api/WebAttributes.groovy diff --git a/grace-web-common/src/main/groovy/grails/web/context/ServletContextHolder.java b/grace-web/src/main/groovy/grails/web/context/ServletContextHolder.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/context/ServletContextHolder.java rename to grace-web/src/main/groovy/grails/web/context/ServletContextHolder.java diff --git a/grace-web-common/src/main/groovy/grails/web/context/WebRequestServletHolder.java b/grace-web/src/main/groovy/grails/web/context/WebRequestServletHolder.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/context/WebRequestServletHolder.java rename to grace-web/src/main/groovy/grails/web/context/WebRequestServletHolder.java diff --git a/grace-web-common/src/main/groovy/grails/web/controllers/ControllerMethod.java b/grace-web/src/main/groovy/grails/web/controllers/ControllerMethod.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/controllers/ControllerMethod.java rename to grace-web/src/main/groovy/grails/web/controllers/ControllerMethod.java diff --git a/grace-web-common/src/main/groovy/grails/web/databinding/DataBindingUtils.java b/grace-web/src/main/groovy/grails/web/databinding/DataBindingUtils.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/databinding/DataBindingUtils.java rename to grace-web/src/main/groovy/grails/web/databinding/DataBindingUtils.java diff --git a/grace-web-common/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy b/grace-web/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy rename to grace-web/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy diff --git a/grace-web-common/src/main/groovy/grails/web/http/HttpHeaders.java b/grace-web/src/main/groovy/grails/web/http/HttpHeaders.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/http/HttpHeaders.java rename to grace-web/src/main/groovy/grails/web/http/HttpHeaders.java diff --git a/grace-web-common/src/main/groovy/grails/web/mime/MimeType.groovy b/grace-web/src/main/groovy/grails/web/mime/MimeType.groovy similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/mime/MimeType.groovy rename to grace-web/src/main/groovy/grails/web/mime/MimeType.groovy diff --git a/grace-web-common/src/main/groovy/grails/web/mime/MimeTypeProvider.groovy b/grace-web/src/main/groovy/grails/web/mime/MimeTypeProvider.groovy similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/mime/MimeTypeProvider.groovy rename to grace-web/src/main/groovy/grails/web/mime/MimeTypeProvider.groovy diff --git a/grace-web-common/src/main/groovy/grails/web/mime/MimeTypeResolver.groovy b/grace-web/src/main/groovy/grails/web/mime/MimeTypeResolver.groovy similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/mime/MimeTypeResolver.groovy rename to grace-web/src/main/groovy/grails/web/mime/MimeTypeResolver.groovy diff --git a/grace-web-common/src/main/groovy/grails/web/mime/MimeTypeUtils.groovy b/grace-web/src/main/groovy/grails/web/mime/MimeTypeUtils.groovy similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/mime/MimeTypeUtils.groovy rename to grace-web/src/main/groovy/grails/web/mime/MimeTypeUtils.groovy diff --git a/grace-web-common/src/main/groovy/grails/web/mvc/FlashScope.java b/grace-web/src/main/groovy/grails/web/mvc/FlashScope.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/mvc/FlashScope.java rename to grace-web/src/main/groovy/grails/web/mvc/FlashScope.java diff --git a/grace-web-common/src/main/groovy/grails/web/pages/GroovyPagesUriService.java b/grace-web/src/main/groovy/grails/web/pages/GroovyPagesUriService.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/pages/GroovyPagesUriService.java rename to grace-web/src/main/groovy/grails/web/pages/GroovyPagesUriService.java diff --git a/grace-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsHttpSession.java b/grace-web/src/main/groovy/grails/web/servlet/mvc/GrailsHttpSession.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsHttpSession.java rename to grace-web/src/main/groovy/grails/web/servlet/mvc/GrailsHttpSession.java diff --git a/grace-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsParameterMap.java b/grace-web/src/main/groovy/grails/web/servlet/mvc/GrailsParameterMap.java similarity index 100% rename from grace-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsParameterMap.java rename to grace-web/src/main/groovy/grails/web/servlet/mvc/GrailsParameterMap.java diff --git a/grace-web-common/src/main/groovy/org/grails/core/DefaultGrailsControllerClass.java b/grace-web/src/main/groovy/org/grails/core/DefaultGrailsControllerClass.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/core/DefaultGrailsControllerClass.java rename to grace-web/src/main/groovy/org/grails/core/DefaultGrailsControllerClass.java diff --git a/grace-web-common/src/main/groovy/org/grails/core/DefaultGrailsUrlMappingsClass.java b/grace-web/src/main/groovy/org/grails/core/DefaultGrailsUrlMappingsClass.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/core/DefaultGrailsUrlMappingsClass.java rename to grace-web/src/main/groovy/org/grails/core/DefaultGrailsUrlMappingsClass.java diff --git a/grace-web-common/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreationException.java b/grace-web/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreationException.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreationException.java rename to grace-web/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreationException.java diff --git a/grace-web-common/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreator.groovy b/grace-web/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreator.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreator.groovy rename to grace-web/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreator.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/beans/PropertyEditorRegistryUtils.groovy b/grace-web/src/main/groovy/org/grails/web/beans/PropertyEditorRegistryUtils.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/beans/PropertyEditorRegistryUtils.groovy rename to grace-web/src/main/groovy/org/grails/web/beans/PropertyEditorRegistryUtils.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/binding/CompositeEditor.java b/grace-web/src/main/groovy/org/grails/web/binding/CompositeEditor.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/binding/CompositeEditor.java rename to grace-web/src/main/groovy/org/grails/web/binding/CompositeEditor.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/binding/StructuredDateEditor.java b/grace-web/src/main/groovy/org/grails/web/binding/StructuredDateEditor.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/binding/StructuredDateEditor.java rename to grace-web/src/main/groovy/org/grails/web/binding/StructuredDateEditor.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/binding/StructuredPropertyEditor.java b/grace-web/src/main/groovy/org/grails/web/binding/StructuredPropertyEditor.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/binding/StructuredPropertyEditor.java rename to grace-web/src/main/groovy/org/grails/web/binding/StructuredPropertyEditor.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/context/ServletEnvironmentGrailsApplicationDiscoveryStrategy.groovy b/grace-web/src/main/groovy/org/grails/web/context/ServletEnvironmentGrailsApplicationDiscoveryStrategy.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/context/ServletEnvironmentGrailsApplicationDiscoveryStrategy.groovy rename to grace-web/src/main/groovy/org/grails/web/context/ServletEnvironmentGrailsApplicationDiscoveryStrategy.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java b/grace-web/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java rename to grace-web/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java b/grace-web/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java rename to grace-web/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java b/grace-web/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java rename to grace-web/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DataBindingSourceRegistry.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/DataBindingSourceRegistry.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DataBindingSourceRegistry.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/DataBindingSourceRegistry.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalXmlDataBindingSourceCreator.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/HalXmlDataBindingSourceCreator.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/HalXmlDataBindingSourceCreator.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/HalXmlDataBindingSourceCreator.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java b/grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java rename to grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/XmlDataBindingSourceCreator.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/XmlDataBindingSourceCreator.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/XmlDataBindingSourceCreator.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/bindingsource/XmlDataBindingSourceCreator.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy b/grace-web/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy rename to grace-web/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptor.groovy b/grace-web/src/main/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptor.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptor.groovy rename to grace-web/src/main/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptor.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/JSONArray.java b/grace-web/src/main/groovy/org/grails/web/json/JSONArray.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/JSONArray.java rename to grace-web/src/main/groovy/org/grails/web/json/JSONArray.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/JSONElement.java b/grace-web/src/main/groovy/org/grails/web/json/JSONElement.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/JSONElement.java rename to grace-web/src/main/groovy/org/grails/web/json/JSONElement.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/JSONException.java b/grace-web/src/main/groovy/org/grails/web/json/JSONException.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/JSONException.java rename to grace-web/src/main/groovy/org/grails/web/json/JSONException.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/JSONObject.java b/grace-web/src/main/groovy/org/grails/web/json/JSONObject.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/JSONObject.java rename to grace-web/src/main/groovy/org/grails/web/json/JSONObject.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/JSONTokener.java b/grace-web/src/main/groovy/org/grails/web/json/JSONTokener.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/JSONTokener.java rename to grace-web/src/main/groovy/org/grails/web/json/JSONTokener.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/JSONWriter.java b/grace-web/src/main/groovy/org/grails/web/json/JSONWriter.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/JSONWriter.java rename to grace-web/src/main/groovy/org/grails/web/json/JSONWriter.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/PathCapturingJSONWriterWrapper.java b/grace-web/src/main/groovy/org/grails/web/json/PathCapturingJSONWriterWrapper.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/PathCapturingJSONWriterWrapper.java rename to grace-web/src/main/groovy/org/grails/web/json/PathCapturingJSONWriterWrapper.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/PrettyPrintJSONWriter.java b/grace-web/src/main/groovy/org/grails/web/json/PrettyPrintJSONWriter.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/PrettyPrintJSONWriter.java rename to grace-web/src/main/groovy/org/grails/web/json/PrettyPrintJSONWriter.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/parser/JSONParser.java b/grace-web/src/main/groovy/org/grails/web/json/parser/JSONParser.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/parser/JSONParser.java rename to grace-web/src/main/groovy/org/grails/web/json/parser/JSONParser.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/parser/JsonParserConstants.java b/grace-web/src/main/groovy/org/grails/web/json/parser/JsonParserConstants.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/parser/JsonParserConstants.java rename to grace-web/src/main/groovy/org/grails/web/json/parser/JsonParserConstants.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/parser/JsonParserTokenManager.java b/grace-web/src/main/groovy/org/grails/web/json/parser/JsonParserTokenManager.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/parser/JsonParserTokenManager.java rename to grace-web/src/main/groovy/org/grails/web/json/parser/JsonParserTokenManager.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/parser/ParseException.java b/grace-web/src/main/groovy/org/grails/web/json/parser/ParseException.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/parser/ParseException.java rename to grace-web/src/main/groovy/org/grails/web/json/parser/ParseException.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/parser/SimpleCharStream.java b/grace-web/src/main/groovy/org/grails/web/json/parser/SimpleCharStream.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/parser/SimpleCharStream.java rename to grace-web/src/main/groovy/org/grails/web/json/parser/SimpleCharStream.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/parser/StringUnmarshaller.java b/grace-web/src/main/groovy/org/grails/web/json/parser/StringUnmarshaller.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/parser/StringUnmarshaller.java rename to grace-web/src/main/groovy/org/grails/web/json/parser/StringUnmarshaller.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/parser/Token.java b/grace-web/src/main/groovy/org/grails/web/json/parser/Token.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/parser/Token.java rename to grace-web/src/main/groovy/org/grails/web/json/parser/Token.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/json/parser/TokenMgrError.java b/grace-web/src/main/groovy/org/grails/web/json/parser/TokenMgrError.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/json/parser/TokenMgrError.java rename to grace-web/src/main/groovy/org/grails/web/json/parser/TokenMgrError.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/pages/DefaultGroovyPagesUriService.java b/grace-web/src/main/groovy/org/grails/web/pages/DefaultGroovyPagesUriService.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/pages/DefaultGroovyPagesUriService.java rename to grace-web/src/main/groovy/org/grails/web/pages/DefaultGroovyPagesUriService.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/pages/FilteringCodecsByContentTypeSettings.java b/grace-web/src/main/groovy/org/grails/web/pages/FilteringCodecsByContentTypeSettings.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/pages/FilteringCodecsByContentTypeSettings.java rename to grace-web/src/main/groovy/org/grails/web/pages/FilteringCodecsByContentTypeSettings.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/pages/GroovyPagesUriSupport.java b/grace-web/src/main/groovy/org/grails/web/pages/GroovyPagesUriSupport.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/pages/GroovyPagesUriSupport.java rename to grace-web/src/main/groovy/org/grails/web/pages/GroovyPagesUriSupport.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributes.java b/grace-web/src/main/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributes.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributes.java rename to grace-web/src/main/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributes.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/GrailsFlashScope.java b/grace-web/src/main/groovy/org/grails/web/servlet/GrailsFlashScope.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/GrailsFlashScope.java rename to grace-web/src/main/groovy/org/grails/web/servlet/GrailsFlashScope.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/GrailsRequestContext.java b/grace-web/src/main/groovy/org/grails/web/servlet/GrailsRequestContext.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/GrailsRequestContext.java rename to grace-web/src/main/groovy/org/grails/web/servlet/GrailsRequestContext.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/WebRequestDelegatingRequestContext.java b/grace-web/src/main/groovy/org/grails/web/servlet/WebRequestDelegatingRequestContext.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/WebRequestDelegatingRequestContext.java rename to grace-web/src/main/groovy/org/grails/web/servlet/WebRequestDelegatingRequestContext.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/WrappedResponseHolder.java b/grace-web/src/main/groovy/org/grails/web/servlet/WrappedResponseHolder.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/WrappedResponseHolder.java rename to grace-web/src/main/groovy/org/grails/web/servlet/WrappedResponseHolder.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/ActionResultTransformer.groovy b/grace-web/src/main/groovy/org/grails/web/servlet/mvc/ActionResultTransformer.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/ActionResultTransformer.groovy rename to grace-web/src/main/groovy/org/grails/web/servlet/mvc/ActionResultTransformer.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/DefaultRequestStateLookupStrategy.java b/grace-web/src/main/groovy/org/grails/web/servlet/mvc/DefaultRequestStateLookupStrategy.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/DefaultRequestStateLookupStrategy.java rename to grace-web/src/main/groovy/org/grails/web/servlet/mvc/DefaultRequestStateLookupStrategy.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsRequestStateLookupStrategy.java b/grace-web/src/main/groovy/org/grails/web/servlet/mvc/GrailsRequestStateLookupStrategy.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsRequestStateLookupStrategy.java rename to grace-web/src/main/groovy/org/grails/web/servlet/mvc/GrailsRequestStateLookupStrategy.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequest.java b/grace-web/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequest.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequest.java rename to grace-web/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequest.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/OutputAwareHttpServletResponse.groovy b/grace-web/src/main/groovy/org/grails/web/servlet/mvc/OutputAwareHttpServletResponse.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/OutputAwareHttpServletResponse.groovy rename to grace-web/src/main/groovy/org/grails/web/servlet/mvc/OutputAwareHttpServletResponse.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/ParameterCreationListener.java b/grace-web/src/main/groovy/org/grails/web/servlet/mvc/ParameterCreationListener.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/ParameterCreationListener.java rename to grace-web/src/main/groovy/org/grails/web/servlet/mvc/ParameterCreationListener.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/exceptions/ControllerExecutionException.java b/grace-web/src/main/groovy/org/grails/web/servlet/mvc/exceptions/ControllerExecutionException.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/exceptions/ControllerExecutionException.java rename to grace-web/src/main/groovy/org/grails/web/servlet/mvc/exceptions/ControllerExecutionException.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/exceptions/GrailsMVCException.java b/grace-web/src/main/groovy/org/grails/web/servlet/mvc/exceptions/GrailsMVCException.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/exceptions/GrailsMVCException.java rename to grace-web/src/main/groovy/org/grails/web/servlet/mvc/exceptions/GrailsMVCException.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/view/AbstractGrailsView.java b/grace-web/src/main/groovy/org/grails/web/servlet/view/AbstractGrailsView.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/view/AbstractGrailsView.java rename to grace-web/src/main/groovy/org/grails/web/servlet/view/AbstractGrailsView.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/view/CompositeViewResolver.groovy b/grace-web/src/main/groovy/org/grails/web/servlet/view/CompositeViewResolver.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/view/CompositeViewResolver.groovy rename to grace-web/src/main/groovy/org/grails/web/servlet/view/CompositeViewResolver.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/view/GrailsViewResolver.java b/grace-web/src/main/groovy/org/grails/web/servlet/view/GrailsViewResolver.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/view/GrailsViewResolver.java rename to grace-web/src/main/groovy/org/grails/web/servlet/view/GrailsViewResolver.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/servlet/view/LayoutViewResolver.java b/grace-web/src/main/groovy/org/grails/web/servlet/view/LayoutViewResolver.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/servlet/view/LayoutViewResolver.java rename to grace-web/src/main/groovy/org/grails/web/servlet/view/LayoutViewResolver.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/util/BoundedCharsAsEncodedBytesCounter.java b/grace-web/src/main/groovy/org/grails/web/util/BoundedCharsAsEncodedBytesCounter.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/util/BoundedCharsAsEncodedBytesCounter.java rename to grace-web/src/main/groovy/org/grails/web/util/BoundedCharsAsEncodedBytesCounter.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/util/ClassAndMimeTypeRegistry.groovy b/grace-web/src/main/groovy/org/grails/web/util/ClassAndMimeTypeRegistry.groovy similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/util/ClassAndMimeTypeRegistry.groovy rename to grace-web/src/main/groovy/org/grails/web/util/ClassAndMimeTypeRegistry.groovy diff --git a/grace-web-common/src/main/groovy/org/grails/web/util/GrailsApplicationAttributes.java b/grace-web/src/main/groovy/org/grails/web/util/GrailsApplicationAttributes.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/util/GrailsApplicationAttributes.java rename to grace-web/src/main/groovy/org/grails/web/util/GrailsApplicationAttributes.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/util/IncludeResponseWrapper.java b/grace-web/src/main/groovy/org/grails/web/util/IncludeResponseWrapper.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/util/IncludeResponseWrapper.java rename to grace-web/src/main/groovy/org/grails/web/util/IncludeResponseWrapper.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/util/IncludedContent.java b/grace-web/src/main/groovy/org/grails/web/util/IncludedContent.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/util/IncludedContent.java rename to grace-web/src/main/groovy/org/grails/web/util/IncludedContent.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/util/WebUtils.java b/grace-web/src/main/groovy/org/grails/web/util/WebUtils.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/util/WebUtils.java rename to grace-web/src/main/groovy/org/grails/web/util/WebUtils.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/xml/PrettyPrintXMLStreamWriter.java b/grace-web/src/main/groovy/org/grails/web/xml/PrettyPrintXMLStreamWriter.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/xml/PrettyPrintXMLStreamWriter.java rename to grace-web/src/main/groovy/org/grails/web/xml/PrettyPrintXMLStreamWriter.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/xml/StreamingMarkupWriter.java b/grace-web/src/main/groovy/org/grails/web/xml/StreamingMarkupWriter.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/xml/StreamingMarkupWriter.java rename to grace-web/src/main/groovy/org/grails/web/xml/StreamingMarkupWriter.java diff --git a/grace-web-common/src/main/groovy/org/grails/web/xml/XMLStreamWriter.java b/grace-web/src/main/groovy/org/grails/web/xml/XMLStreamWriter.java similarity index 100% rename from grace-web-common/src/main/groovy/org/grails/web/xml/XMLStreamWriter.java rename to grace-web/src/main/groovy/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 new file mode 100644 index 0000000000..f6857e993a --- /dev/null +++ b/grace-web/src/main/resources/META-INF/grails.factories @@ -0,0 +1,2 @@ +org.grails.web.util.GrailsApplicationAttributes=\ +org.grails.web.servlet.DefaultGrailsApplicationAttributes \ No newline at end of file diff --git a/grace-web-common/src/main/resources/org/grails/web/json/jsonparser.jj b/grace-web/src/main/resources/org/grails/web/json/jsonparser.jj similarity index 100% rename from grace-web-common/src/main/resources/org/grails/web/json/jsonparser.jj rename to grace-web/src/main/resources/org/grails/web/json/jsonparser.jj diff --git a/grace-web-common/src/test/groovy/grails/bean/util/LazyMetaPropertyMapSpec.groovy b/grace-web/src/test/groovy/grails/bean/util/LazyMetaPropertyMapSpec.groovy similarity index 100% rename from grace-web-common/src/test/groovy/grails/bean/util/LazyMetaPropertyMapSpec.groovy rename to grace-web/src/test/groovy/grails/bean/util/LazyMetaPropertyMapSpec.groovy diff --git a/grace-web-common/src/test/groovy/grails/bean/util/LazyMetaPropertyMapTests.groovy b/grace-web/src/test/groovy/grails/bean/util/LazyMetaPropertyMapTests.groovy similarity index 100% rename from grace-web-common/src/test/groovy/grails/bean/util/LazyMetaPropertyMapTests.groovy rename to grace-web/src/test/groovy/grails/bean/util/LazyMetaPropertyMapTests.groovy diff --git a/grace-web-common/src/test/groovy/grails/web/CamelCaseUrlConverterSpec.groovy b/grace-web/src/test/groovy/grails/web/CamelCaseUrlConverterSpec.groovy similarity index 100% rename from grace-web-common/src/test/groovy/grails/web/CamelCaseUrlConverterSpec.groovy rename to grace-web/src/test/groovy/grails/web/CamelCaseUrlConverterSpec.groovy diff --git a/grace-web-common/src/test/groovy/grails/web/HyphenatedUrlConverterSpec.groovy b/grace-web/src/test/groovy/grails/web/HyphenatedUrlConverterSpec.groovy similarity index 100% rename from grace-web-common/src/test/groovy/grails/web/HyphenatedUrlConverterSpec.groovy rename to grace-web/src/test/groovy/grails/web/HyphenatedUrlConverterSpec.groovy diff --git a/grace-web-common/src/test/groovy/grails/web/api/ServletAttributesTraitGeneratedSpec.groovy b/grace-web/src/test/groovy/grails/web/api/ServletAttributesTraitGeneratedSpec.groovy similarity index 100% rename from grace-web-common/src/test/groovy/grails/web/api/ServletAttributesTraitGeneratedSpec.groovy rename to grace-web/src/test/groovy/grails/web/api/ServletAttributesTraitGeneratedSpec.groovy diff --git a/grace-web-common/src/test/groovy/grails/web/api/WebAttributesTraitGeneratedSpec.groovy b/grace-web/src/test/groovy/grails/web/api/WebAttributesTraitGeneratedSpec.groovy similarity index 100% rename from grace-web-common/src/test/groovy/grails/web/api/WebAttributesTraitGeneratedSpec.groovy rename to grace-web/src/test/groovy/grails/web/api/WebAttributesTraitGeneratedSpec.groovy diff --git a/grace-web-common/src/test/groovy/grails/web/servlet/mvc/GrailsParameterMapTests.groovy b/grace-web/src/test/groovy/grails/web/servlet/mvc/GrailsParameterMapTests.groovy similarity index 100% rename from grace-web-common/src/test/groovy/grails/web/servlet/mvc/GrailsParameterMapTests.groovy rename to grace-web/src/test/groovy/grails/web/servlet/mvc/GrailsParameterMapTests.groovy diff --git a/grace-web-common/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy b/grace-web/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy similarity index 100% rename from grace-web-common/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy rename to grace-web/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy diff --git a/grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreatorSpec.groovy b/grace-web/src/test/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreatorSpec.groovy similarity index 100% rename from grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreatorSpec.groovy rename to grace-web/src/test/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreatorSpec.groovy diff --git a/grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy b/grace-web/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy similarity index 100% rename from grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy rename to grace-web/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy diff --git a/grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/hal/json/HalJsonDataBindingSourceCreatorSpec.groovy b/grace-web/src/test/groovy/org/grails/web/databinding/bindingsource/hal/json/HalJsonDataBindingSourceCreatorSpec.groovy similarity index 100% rename from grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/hal/json/HalJsonDataBindingSourceCreatorSpec.groovy rename to grace-web/src/test/groovy/org/grails/web/databinding/bindingsource/hal/json/HalJsonDataBindingSourceCreatorSpec.groovy diff --git a/grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/json/JsonDataBindingSourceCreatorSpec.groovy b/grace-web/src/test/groovy/org/grails/web/databinding/bindingsource/json/JsonDataBindingSourceCreatorSpec.groovy similarity index 100% rename from grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/json/JsonDataBindingSourceCreatorSpec.groovy rename to grace-web/src/test/groovy/org/grails/web/databinding/bindingsource/json/JsonDataBindingSourceCreatorSpec.groovy diff --git a/grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/json/api/JsonApiDataBindingSourceCreatorSpec.groovy b/grace-web/src/test/groovy/org/grails/web/databinding/bindingsource/json/api/JsonApiDataBindingSourceCreatorSpec.groovy similarity index 100% rename from grace-web-common/src/test/groovy/org/grails/web/databinding/bindingsource/json/api/JsonApiDataBindingSourceCreatorSpec.groovy rename to grace-web/src/test/groovy/org/grails/web/databinding/bindingsource/json/api/JsonApiDataBindingSourceCreatorSpec.groovy diff --git a/grace-web-common/src/test/groovy/org/grails/web/json/parser/JSONParserSpec.groovy b/grace-web/src/test/groovy/org/grails/web/json/parser/JSONParserSpec.groovy similarity index 100% rename from grace-web-common/src/test/groovy/org/grails/web/json/parser/JSONParserSpec.groovy rename to grace-web/src/test/groovy/org/grails/web/json/parser/JSONParserSpec.groovy diff --git a/grace-web-common/src/test/groovy/org/grails/web/pages/GroovyPagesUriSupportTests.java b/grace-web/src/test/groovy/org/grails/web/pages/GroovyPagesUriSupportTests.java similarity index 100% rename from grace-web-common/src/test/groovy/org/grails/web/pages/GroovyPagesUriSupportTests.java rename to grace-web/src/test/groovy/org/grails/web/pages/GroovyPagesUriSupportTests.java diff --git a/grace-web-common/src/test/groovy/org/grails/web/util/WebUtilsSpec.groovy b/grace-web/src/test/groovy/org/grails/web/util/WebUtilsSpec.groovy similarity index 100% rename from grace-web-common/src/test/groovy/org/grails/web/util/WebUtilsSpec.groovy rename to grace-web/src/test/groovy/org/grails/web/util/WebUtilsSpec.groovy diff --git a/settings.gradle b/settings.gradle index 2cb75aee1f..0b2dfa832b 100644 --- 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',