diff --git a/README.md b/README.md index 3b9fc5dbaa..3ab7e75fee 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,24 @@ -[![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.grails.org/scans) - -#### Build Status -- ![Java CI](https://github.com/grails/grails-core/workflows/Java%20CI/badge.svg) -- ![Grails Joint Validation Build](https://github.com/grails/grails-core/workflows/Grails%20Joint%20Validation%20Build/badge.svg) - -#### Slack Signup -- [Slack Signup](https://slack.grails.org/) - -Grails +Grace Framework === -[Grails](https://grails.org/) is a framework used to build web applications with the [Groovy](https://groovy-lang.org/) programming language. The core framework is very extensible and there are numerous [plugins](https://plugins.grails.org/) available that provide easy integration of add-on features. - -Grails development is lead by the [Grails Foundation](https://grails.org/foundation/) and is sponsored by [Object Computing Inc.](https://objectcomputing.com/) in St. Louis Missouri. Please contact <2gm@objectcomputing.com> for support inquiries. +[Grace](https://graceframework.org/) is a framework used to build web applications with the [Groovy](https://groovy-lang.org/) programming language. The core framework is very extensible and there are numerous [plugins](https://plugins.graceframework.org/) available that provide easy integration of add-on features. Getting Started --- -You need a Java Development Kit (JDK) installed, but it is not necessary to install Groovy because it's bundled with the Grails distribution. +You need a Java Development Kit (JDK) installed, but it is not necessary to install Groovy because it's bundled with the Grace distribution. -To install Grails, visit https://grails.org/download.html and download the version you would like to use. Set a `GRAILS_HOME` environment variable to point to the root of the extracted download and add `GRAILS_HOME/bin` to your executable `PATH`. Then in a shell, type the following: +To install Grace, visit https://graceframework.org/download.html and download the version you would like to use. Set a `GRACE_HOME` environment variable to point to the root of the extracted download and add `GRACE_HOME/bin` to your executable `PATH`. Then in a shell, type the following: - grails create-app sampleapp + grace create-app sampleapp cd sampleapp - grails run-app + grace run-app -To build Grails, clone this GitHub repository and execute the install Gradle target: +To build Grace, clone this GitHub repository and execute the install Gradle target: - git clone https://github.com/grails/grails-core.git - cd grails-core - ./gradlew install + git clone https://github.com/graceframework/grace-framework.git + cd grace-framework + ./gradlew pTML zipDist If you encounter out of memory errors when trying to run the install target, try adjusting Gradle build settings. For example: @@ -43,20 +32,4 @@ See [RELEASE.md](RELEASE.md). License --- -Grails and Groovy are licensed under the terms of the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.html). - -*** - -YourKit is kindly supporting Grails open source projects with its full-featured Java Profiler. -YourKit, LLC is the creator of innovative and intelligent tools for profiling -Java and .NET applications. Take a look at YourKit's leading software products: -[YourKit Java Profiler](https://www.yourkit.com/java/profiler/features/) and -[YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/features/). - -Dependencies ---- - -**Gradle Plugins** - -* SDKMAN! Vendor Plugin [Github](https://github.com/sdkman/sdkman-vendor-gradle-plugin). -* Gradle Nexus Staging Plugin [Github](https://github.com/Codearte/gradle-nexus-staging-plugin) +Grace is licensed under the terms of the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.html). diff --git a/build.gradle b/build.gradle index fbac63dd39..b1fa286617 100644 --- a/build.gradle +++ b/build.gradle @@ -31,10 +31,6 @@ ext { homeSrcDir = file("src") } -ext."signing.keyId" = System.getenv("SIGNING_KEY") ?: project.hasProperty("signing.keyId") ? project.getProperty('signing.keyId') : null -ext."signing.password" = System.getenv("SIGNING_PASSPHRASE") ?: project.hasProperty("signing.password") ? project.getProperty('signing.password') : null -ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile") ? project.getProperty('signing.secretKeyRingFile') : null - // Groovy is added as a dependency to both the 'groovy' and 'compile' // configurations, so place the dependency in a shared variable. The // 'compile' is required so that Groovy appears as a dependency in the @@ -42,6 +38,10 @@ ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile ext.jointBuildGroovyJarProperty = System.getProperty('groovy.jar') ext.groovyDependency = null +ext."signing.keyId" = System.getenv("SIGNING_KEY") ?: project.hasProperty("signing.keyId") ? project.getProperty('signing.keyId') : null +ext."signing.password" = System.getenv("SIGNING_PASSPHRASE") ?: project.hasProperty("signing.password") ? project.getProperty('signing.password') : null +ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile") ? project.getProperty('signing.secretKeyRingFile') : null + if (jointBuildGroovyJarProperty) { def jointBuildGroovyJar = file(jointBuildGroovyJarProperty) if (jointBuildGroovyJar.exists()) { @@ -57,37 +57,34 @@ if (jointBuildGroovyJarProperty) { } version = grailsVersion -group = "org.grails" +group = "org.graceframework" apply plugin: 'idea' +apply plugin: 'maven-publish' +apply plugin: "io.github.gradle-nexus.publish-plugin" -if (isReleaseVersion) { - apply plugin: 'maven-publish' - apply plugin: "io.github.gradle-nexus.publish-plugin" - - nexusPublishing { - repositories { - sonatype { - def ossUser = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : '' - def ossPass = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : '' - def ossStagingProfileId = System.getenv("SONATYPE_STAGING_PROFILE_ID") ?: project.hasProperty("sonatypeOssStagingProfileId") ? project.sonatypeOssStagingProfileId : '' - nexusUrl = uri("https://s01.oss.sonatype.org/service/local/") - username = ossUser - password = ossPass - stagingProfileId = ossStagingProfileId - } +nexusPublishing { + repositories { + sonatype { + def ossUser = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : '' + def ossPass = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : '' + def ossStagingProfileId = System.getenv("SONATYPE_STAGING_PROFILE_ID") ?: project.hasProperty("sonatypeOssStagingProfileId") ? project.sonatypeOssStagingProfileId : '' + nexusUrl = uri("https://s01.oss.sonatype.org/service/local/") + snapshotRepositoryUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") + username = ossUser + password = ossPass + stagingProfileId = ossStagingProfileId } + } - transitionCheckOptions { - maxRetries.set(40) - delayBetween.set(java.time.Duration.ofMillis(2000)) - } + transitionCheckOptions { + maxRetries.set(40) + delayBetween.set(java.time.Duration.ofMillis(2000)) } } allprojects { repositories { - mavenLocal() mavenCentral() maven { url "https://plugins.gradle.org/m2/" } maven { url "https://repo.grails.org/grails/core" } @@ -132,18 +129,20 @@ apply from: "gradle/idea.gradle" subprojects { project -> version = grailsVersion - group = "org.grails" + group = "org.graceframework" configurations { documentation } - ext.isTestSuite = project.name.startsWith("grails-test-suite") + ext.isTestSuite = project.name.startsWith("grace-test-suite") ext.isCiBuild = project.hasProperty("isCiBuild") || System.getenv().get("CI") as Boolean ext.pomInfo = { - delegate.name 'Grails Framework' - delegate.description 'Grails Web Application Framework' - delegate.url 'https://grails.org/' + if (project.name != 'grace-gradle-plugin') { + delegate.name 'Grace' + delegate.description 'Grace Web Application Framework' + } + delegate.url 'https://github.com/graceframework/grace-framework' delegate.licenses { delegate.license { @@ -154,9 +153,9 @@ subprojects { project -> } delegate.scm { - delegate.url 'scm:git@github.com:rainboyan/grails-framework.git' - delegate.connection 'scm:git@github.com:rainboyan/grails-framework.git' - delegate.developerConnection 'scm:git@github.com:rainboyan/grails-framework.git' + delegate.url 'scm:git@github.com:graceframework/grace-framework.git' + delegate.connection 'scm:git@github.com:graceframework/grace-framework.git' + delegate.developerConnection 'scm:git@github.com:graceframework/grace-framework.git' } delegate.developers { @@ -204,40 +203,31 @@ subprojects { project -> } if (!isTestSuite) { - publishing { - if (isBuildSnapshot) { - repositories { - maven { - credentials { - def u = System.getenv("ARTIFACTORY_USERNAME") ?: project.hasProperty("artifactoryPublishUsername") ? project.artifactoryPublishUsername : '' - def p = System.getenv("ARTIFACTORY_PASSWORD") ?: project.hasProperty("artifactoryPublishPassword") ? project.artifactoryPublishPassword : '' - username = u - password = p - } - url "https://repo.grails.org/grails/libs-snapshots-local" - } - } - } - - if (project.name in ['grails-bom', 'grails-dependencies', 'grails-gradle-plugin']) return + publishing { publications { - mavenJava(MavenPublication) { + maven(MavenPublication) { from components.java - pom.withXml { - def xml = asNode() + if (project.name != 'grace-gradle-plugin') { + pom.withXml { + def xml = asNode() - xml.children().last() + pomInfo + xml.children().last() + pomInfo + } } } } } - // signing { - // required { isReleaseVersion && gradle.taskGraph.hasTask("publish") } - // sign publishing.publications.mavenJava - // } + afterEvaluate { + if (project.name != 'grace-gradle-plugin') { + signing { + required { isReleaseVersion && gradle.taskGraph.hasTask("publish") } + sign publishing.publications.maven + } + } + } tasks.withType(Sign) { onlyIf { isReleaseVersion } @@ -259,18 +249,36 @@ subprojects { project -> } - if (project.name in ['grails-bom', 'grails-dependencies']) return + if (project.name == 'grace-dependencies') return + if (project.name == 'grace-bom') return sourceCompatibility = 11 targetCompatibility = 11 - jar { + if (project.name =~ /^(grace-web|grace-plugin-|grace-test-suite|grace-test)/) { + dependencies { + api libs.javax.servlet + // MockHttpServletRequest/Response/Context used in many classes + api libs.spring.test, { + exclude group: 'commons-logging', module:'commons-logging' + } + } + } + + if (project.name =~ /^(grace-plugin-datasource|grace-test-suite)/) { + dependencies { + testImplementation libs.hsqldb + testImplementation libs.h2 + } + } + + jar{ manifest.mainAttributes( "Built-By": System.properties['user.name'], "Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")", - "Implementation-Title": "Grails Framework", + "Implementation-Title": "Grace", "Implementation-Version": grailsVersion, - "Implementation-Vendor": 'grails.org') + "Implementation-Vendor": 'graceframework.org') } checkstyle { @@ -298,14 +306,11 @@ subprojects { project -> groovyOptions.fork(memoryInitialSize: '128M', memoryMaximumSize: '1G') groovyOptions.encoding = "UTF-8" options.encoding = "UTF-8" - options.deprecation = true - options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" } configure([compileJava, compileTestJava]) { options.deprecation = true options.debug = true - options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" } configure([groovydoc]) { @@ -339,7 +344,7 @@ subprojects { project -> testImplementation libs.junit.platform.runner testRuntimeOnly libs.junit.jupiter.engine - if (project.name != "grails-docs") { + if (project.name != "grace-docs") { // Logging api libs.slf4j.api api libs.slf4j.jcl @@ -405,7 +410,11 @@ subprojects { project -> configurations { meta published.extendsFrom archives, meta - all*.exclude group:'commons-logging', module: 'commons-logging' + testRuntimeOnly { + exclude group: 'commons-logging', module: 'commons-logging' + exclude group: 'org.grails', module: 'grails-bootstrap' + exclude group: 'org.grails', module: 'grails-core' + } } if (!isTestSuite) { @@ -470,8 +479,8 @@ sdkman { api = "https://vendors.sdkman.io" consumerKey = System.getenv("GVM_SDKVENDOR_KEY") ?: project.hasProperty("gvmSdkvendorKey") ? project.gvmSdkvendorKey : '' consumerToken = System.getenv("GVM_SDKVENDOR_TOKEN") ?: project.hasProperty("gvmSdkvendorToken") ? project.gvmSdkvendorToken : '' - candidate = "grails" + candidate = "grace" version = project.version - url = "https://github.com/grails/grails-core/releases/download/v${project.version}/grails-${project.version}.zip" + url = "https://github.com/graceframework/grace-framework/releases/download/v${project.version}/grace-${project.version}.zip" hashtag = "#grailsfw" } diff --git a/grails-api/README.md b/grace-api/README.md similarity index 83% rename from grails-api/README.md rename to grace-api/README.md index 280f2bd746..478e7c6adf 100644 --- a/grails-api/README.md +++ b/grace-api/README.md @@ -1,3 +1,3 @@ -## grails-api +## grace-api This subproject contains much of the code for the Core API of Grails. diff --git a/grails-api/build.gradle b/grace-api/build.gradle similarity index 74% rename from grails-api/build.gradle rename to grace-api/build.gradle index a0caec6656..541e130ace 100644 --- a/grails-api/build.gradle +++ b/grace-api/build.gradle @@ -1,6 +1,6 @@ dependencies { - api project(":grails-bootstrap") - api project(":grails-util") + api project(":grace-bootstrap") + api project(":grace-util") api(libs.grails.datastore.core) { transitive = false diff --git a/grails-api/src/main/groovy/grails/artefact/ApiDelegate.java b/grace-api/src/main/groovy/grails/artefact/ApiDelegate.java similarity index 100% rename from grails-api/src/main/groovy/grails/artefact/ApiDelegate.java rename to grace-api/src/main/groovy/grails/artefact/ApiDelegate.java diff --git a/grails-api/src/main/groovy/grails/artefact/Artefact.java b/grace-api/src/main/groovy/grails/artefact/Artefact.java similarity index 100% rename from grails-api/src/main/groovy/grails/artefact/Artefact.java rename to grace-api/src/main/groovy/grails/artefact/Artefact.java diff --git a/grails-api/src/main/groovy/grails/artefact/Enhanced.java b/grace-api/src/main/groovy/grails/artefact/Enhanced.java similarity index 100% rename from grails-api/src/main/groovy/grails/artefact/Enhanced.java rename to grace-api/src/main/groovy/grails/artefact/Enhanced.java diff --git a/grails-api/src/main/groovy/grails/artefact/Enhances.java b/grace-api/src/main/groovy/grails/artefact/Enhances.java similarity index 100% rename from grails-api/src/main/groovy/grails/artefact/Enhances.java rename to grace-api/src/main/groovy/grails/artefact/Enhances.java diff --git a/grails-api/src/main/groovy/grails/config/Config.groovy b/grace-api/src/main/groovy/grails/config/Config.groovy similarity index 100% rename from grails-api/src/main/groovy/grails/config/Config.groovy rename to grace-api/src/main/groovy/grails/config/Config.groovy diff --git a/grails-api/src/main/groovy/grails/config/ConfigMap.groovy b/grace-api/src/main/groovy/grails/config/ConfigMap.groovy similarity index 100% rename from grails-api/src/main/groovy/grails/config/ConfigMap.groovy rename to grace-api/src/main/groovy/grails/config/ConfigMap.groovy diff --git a/grails-api/src/main/groovy/grails/config/ConfigProperties.groovy b/grace-api/src/main/groovy/grails/config/ConfigProperties.groovy similarity index 100% rename from grails-api/src/main/groovy/grails/config/ConfigProperties.groovy rename to grace-api/src/main/groovy/grails/config/ConfigProperties.groovy diff --git a/grails-api/src/main/groovy/grails/config/Settings.groovy b/grace-api/src/main/groovy/grails/config/Settings.groovy similarity index 100% rename from grails-api/src/main/groovy/grails/config/Settings.groovy rename to grace-api/src/main/groovy/grails/config/Settings.groovy diff --git a/grails-api/src/main/groovy/grails/core/ApplicationAttributes.java b/grace-api/src/main/groovy/grails/core/ApplicationAttributes.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/ApplicationAttributes.java rename to grace-api/src/main/groovy/grails/core/ApplicationAttributes.java diff --git a/grails-api/src/main/groovy/grails/core/ArtefactHandler.java b/grace-api/src/main/groovy/grails/core/ArtefactHandler.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/ArtefactHandler.java rename to grace-api/src/main/groovy/grails/core/ArtefactHandler.java diff --git a/grails-api/src/main/groovy/grails/core/ArtefactHandlerAdapter.java b/grace-api/src/main/groovy/grails/core/ArtefactHandlerAdapter.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/ArtefactHandlerAdapter.java rename to grace-api/src/main/groovy/grails/core/ArtefactHandlerAdapter.java diff --git a/grails-api/src/main/groovy/grails/core/ArtefactInfo.java b/grace-api/src/main/groovy/grails/core/ArtefactInfo.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/ArtefactInfo.java rename to grace-api/src/main/groovy/grails/core/ArtefactInfo.java diff --git a/grails-api/src/main/groovy/grails/core/DefaultArtefactInfo.java b/grace-api/src/main/groovy/grails/core/DefaultArtefactInfo.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/DefaultArtefactInfo.java rename to grace-api/src/main/groovy/grails/core/DefaultArtefactInfo.java diff --git a/grails-api/src/main/groovy/grails/core/GrailsApplication.java b/grace-api/src/main/groovy/grails/core/GrailsApplication.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/GrailsApplication.java rename to grace-api/src/main/groovy/grails/core/GrailsApplication.java diff --git a/grails-api/src/main/groovy/grails/core/GrailsApplicationClass.groovy b/grace-api/src/main/groovy/grails/core/GrailsApplicationClass.groovy similarity index 100% rename from grails-api/src/main/groovy/grails/core/GrailsApplicationClass.groovy rename to grace-api/src/main/groovy/grails/core/GrailsApplicationClass.groovy diff --git a/grails-api/src/main/groovy/grails/core/GrailsApplicationLifeCycle.groovy b/grace-api/src/main/groovy/grails/core/GrailsApplicationLifeCycle.groovy similarity index 100% rename from grails-api/src/main/groovy/grails/core/GrailsApplicationLifeCycle.groovy rename to grace-api/src/main/groovy/grails/core/GrailsApplicationLifeCycle.groovy diff --git a/grails-api/src/main/groovy/grails/core/GrailsApplicationLifeCycleAdapter.groovy b/grace-api/src/main/groovy/grails/core/GrailsApplicationLifeCycleAdapter.groovy similarity index 100% rename from grails-api/src/main/groovy/grails/core/GrailsApplicationLifeCycleAdapter.groovy rename to grace-api/src/main/groovy/grails/core/GrailsApplicationLifeCycleAdapter.groovy diff --git a/grails-api/src/main/groovy/grails/core/GrailsClass.java b/grace-api/src/main/groovy/grails/core/GrailsClass.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/GrailsClass.java rename to grace-api/src/main/groovy/grails/core/GrailsClass.java diff --git a/grails-api/src/main/groovy/grails/core/InjectableGrailsClass.java b/grace-api/src/main/groovy/grails/core/InjectableGrailsClass.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/InjectableGrailsClass.java rename to grace-api/src/main/groovy/grails/core/InjectableGrailsClass.java diff --git a/grails-api/src/main/groovy/grails/core/support/ClassLoaderAware.java b/grace-api/src/main/groovy/grails/core/support/ClassLoaderAware.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/support/ClassLoaderAware.java rename to grace-api/src/main/groovy/grails/core/support/ClassLoaderAware.java diff --git a/grails-api/src/main/groovy/grails/core/support/GrailsApplicationAware.java b/grace-api/src/main/groovy/grails/core/support/GrailsApplicationAware.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/support/GrailsApplicationAware.java rename to grace-api/src/main/groovy/grails/core/support/GrailsApplicationAware.java diff --git a/grails-api/src/main/groovy/grails/core/support/GrailsConfigurationAware.java b/grace-api/src/main/groovy/grails/core/support/GrailsConfigurationAware.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/support/GrailsConfigurationAware.java rename to grace-api/src/main/groovy/grails/core/support/GrailsConfigurationAware.java diff --git a/grails-api/src/main/groovy/grails/core/support/ParentApplicationContextAware.java b/grace-api/src/main/groovy/grails/core/support/ParentApplicationContextAware.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/support/ParentApplicationContextAware.java rename to grace-api/src/main/groovy/grails/core/support/ParentApplicationContextAware.java diff --git a/grails-api/src/main/groovy/grails/core/support/proxy/DefaultProxyHandler.java b/grace-api/src/main/groovy/grails/core/support/proxy/DefaultProxyHandler.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/support/proxy/DefaultProxyHandler.java rename to grace-api/src/main/groovy/grails/core/support/proxy/DefaultProxyHandler.java diff --git a/grails-api/src/main/groovy/grails/core/support/proxy/EntityProxyHandler.java b/grace-api/src/main/groovy/grails/core/support/proxy/EntityProxyHandler.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/support/proxy/EntityProxyHandler.java rename to grace-api/src/main/groovy/grails/core/support/proxy/EntityProxyHandler.java diff --git a/grails-api/src/main/groovy/grails/core/support/proxy/ProxyHandler.java b/grace-api/src/main/groovy/grails/core/support/proxy/ProxyHandler.java similarity index 100% rename from grails-api/src/main/groovy/grails/core/support/proxy/ProxyHandler.java rename to grace-api/src/main/groovy/grails/core/support/proxy/ProxyHandler.java diff --git a/grails-api/src/main/groovy/grails/plugins/InvalidVersionException.java b/grace-api/src/main/groovy/grails/plugins/InvalidVersionException.java similarity index 100% rename from grails-api/src/main/groovy/grails/plugins/InvalidVersionException.java rename to grace-api/src/main/groovy/grails/plugins/InvalidVersionException.java diff --git a/grails-api/src/main/groovy/grails/plugins/VersionComparator.groovy b/grace-api/src/main/groovy/grails/plugins/VersionComparator.groovy similarity index 100% rename from grails-api/src/main/groovy/grails/plugins/VersionComparator.groovy rename to grace-api/src/main/groovy/grails/plugins/VersionComparator.groovy diff --git a/grails-api/src/main/groovy/grails/plugins/metadata/GrailsPlugin.java b/grace-api/src/main/groovy/grails/plugins/metadata/GrailsPlugin.java similarity index 100% rename from grails-api/src/main/groovy/grails/plugins/metadata/GrailsPlugin.java rename to grace-api/src/main/groovy/grails/plugins/metadata/GrailsPlugin.java diff --git a/grails-api/src/main/groovy/grails/plugins/metadata/PluginSource.java b/grace-api/src/main/groovy/grails/plugins/metadata/PluginSource.java similarity index 100% rename from grails-api/src/main/groovy/grails/plugins/metadata/PluginSource.java rename to grace-api/src/main/groovy/grails/plugins/metadata/PluginSource.java diff --git a/grails-api/src/main/groovy/grails/util/AbstractTypeConvertingMap.java b/grace-api/src/main/groovy/grails/util/AbstractTypeConvertingMap.java similarity index 100% rename from grails-api/src/main/groovy/grails/util/AbstractTypeConvertingMap.java rename to grace-api/src/main/groovy/grails/util/AbstractTypeConvertingMap.java diff --git a/grails-api/src/main/groovy/grails/util/CacheEntry.java b/grace-api/src/main/groovy/grails/util/CacheEntry.java similarity index 100% rename from grails-api/src/main/groovy/grails/util/CacheEntry.java rename to grace-api/src/main/groovy/grails/util/CacheEntry.java diff --git a/grails-api/src/main/groovy/grails/util/Mixin.java b/grace-api/src/main/groovy/grails/util/Mixin.java similarity index 100% rename from grails-api/src/main/groovy/grails/util/Mixin.java rename to grace-api/src/main/groovy/grails/util/Mixin.java diff --git a/grails-api/src/main/groovy/grails/util/MixinTargetAware.groovy b/grace-api/src/main/groovy/grails/util/MixinTargetAware.groovy similarity index 100% rename from grails-api/src/main/groovy/grails/util/MixinTargetAware.groovy rename to grace-api/src/main/groovy/grails/util/MixinTargetAware.groovy diff --git a/grails-api/src/main/groovy/grails/util/Pair.java b/grace-api/src/main/groovy/grails/util/Pair.java similarity index 100% rename from grails-api/src/main/groovy/grails/util/Pair.java rename to grace-api/src/main/groovy/grails/util/Pair.java diff --git a/grails-api/src/main/groovy/grails/util/Triple.java b/grace-api/src/main/groovy/grails/util/Triple.java similarity index 100% rename from grails-api/src/main/groovy/grails/util/Triple.java rename to grace-api/src/main/groovy/grails/util/Triple.java diff --git a/grails-api/src/main/groovy/grails/util/TypeConvertingMap.groovy b/grace-api/src/main/groovy/grails/util/TypeConvertingMap.groovy similarity index 100% rename from grails-api/src/main/groovy/grails/util/TypeConvertingMap.groovy rename to grace-api/src/main/groovy/grails/util/TypeConvertingMap.groovy diff --git a/grails-api/src/main/groovy/org/grails/config/CodeGenConfig.groovy b/grace-api/src/main/groovy/org/grails/config/CodeGenConfig.groovy similarity index 100% rename from grails-api/src/main/groovy/org/grails/config/CodeGenConfig.groovy rename to grace-api/src/main/groovy/org/grails/config/CodeGenConfig.groovy diff --git a/grails-api/src/main/groovy/org/grails/config/CompositeConfig.java b/grace-api/src/main/groovy/org/grails/config/CompositeConfig.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/config/CompositeConfig.java rename to grace-api/src/main/groovy/org/grails/config/CompositeConfig.java diff --git a/grails-api/src/main/groovy/org/grails/config/EnvironmentAwarePropertySource.java b/grace-api/src/main/groovy/org/grails/config/EnvironmentAwarePropertySource.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/config/EnvironmentAwarePropertySource.java rename to grace-api/src/main/groovy/org/grails/config/EnvironmentAwarePropertySource.java diff --git a/grails-api/src/main/groovy/org/grails/config/NavigableMap.groovy b/grace-api/src/main/groovy/org/grails/config/NavigableMap.groovy similarity index 100% rename from grails-api/src/main/groovy/org/grails/config/NavigableMap.groovy rename to grace-api/src/main/groovy/org/grails/config/NavigableMap.groovy diff --git a/grails-api/src/main/groovy/org/grails/config/NavigableMapConfig.java b/grace-api/src/main/groovy/org/grails/config/NavigableMapConfig.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/config/NavigableMapConfig.java rename to grace-api/src/main/groovy/org/grails/config/NavigableMapConfig.java diff --git a/grails-api/src/main/groovy/org/grails/config/NavigableMapPropertySource.groovy b/grace-api/src/main/groovy/org/grails/config/NavigableMapPropertySource.groovy similarity index 100% rename from grails-api/src/main/groovy/org/grails/config/NavigableMapPropertySource.groovy rename to grace-api/src/main/groovy/org/grails/config/NavigableMapPropertySource.groovy diff --git a/grails-api/src/main/groovy/org/grails/config/PrefixedConfig.java b/grace-api/src/main/groovy/org/grails/config/PrefixedConfig.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/config/PrefixedConfig.java rename to grace-api/src/main/groovy/org/grails/config/PrefixedConfig.java diff --git a/grails-api/src/main/groovy/org/grails/config/PrefixedMapPropertySource.groovy b/grace-api/src/main/groovy/org/grails/config/PrefixedMapPropertySource.groovy similarity index 100% rename from grails-api/src/main/groovy/org/grails/config/PrefixedMapPropertySource.groovy rename to grace-api/src/main/groovy/org/grails/config/PrefixedMapPropertySource.groovy diff --git a/grails-api/src/main/groovy/org/grails/config/PropertySourcesConfig.java b/grace-api/src/main/groovy/org/grails/config/PropertySourcesConfig.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/config/PropertySourcesConfig.java rename to grace-api/src/main/groovy/org/grails/config/PropertySourcesConfig.java diff --git a/grails-api/src/main/groovy/org/grails/core/AbstractGrailsClass.java b/grace-api/src/main/groovy/org/grails/core/AbstractGrailsClass.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/AbstractGrailsClass.java rename to grace-api/src/main/groovy/org/grails/core/AbstractGrailsClass.java diff --git a/grails-api/src/main/groovy/org/grails/core/AbstractInjectableGrailsClass.java b/grace-api/src/main/groovy/org/grails/core/AbstractInjectableGrailsClass.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/AbstractInjectableGrailsClass.java rename to grace-api/src/main/groovy/org/grails/core/AbstractInjectableGrailsClass.java diff --git a/grails-api/src/main/groovy/org/grails/core/GrailsApplicationCustomizer.java b/grace-api/src/main/groovy/org/grails/core/GrailsApplicationCustomizer.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/GrailsApplicationCustomizer.java rename to grace-api/src/main/groovy/org/grails/core/GrailsApplicationCustomizer.java diff --git a/grails-api/src/main/groovy/org/grails/core/exceptions/DefaultErrorsPrinter.groovy b/grace-api/src/main/groovy/org/grails/core/exceptions/DefaultErrorsPrinter.groovy similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/exceptions/DefaultErrorsPrinter.groovy rename to grace-api/src/main/groovy/org/grails/core/exceptions/DefaultErrorsPrinter.groovy diff --git a/grails-api/src/main/groovy/org/grails/core/exceptions/GrailsConfigurationException.java b/grace-api/src/main/groovy/org/grails/core/exceptions/GrailsConfigurationException.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/exceptions/GrailsConfigurationException.java rename to grace-api/src/main/groovy/org/grails/core/exceptions/GrailsConfigurationException.java diff --git a/grails-api/src/main/groovy/org/grails/core/exceptions/GrailsDomainException.java b/grace-api/src/main/groovy/org/grails/core/exceptions/GrailsDomainException.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/exceptions/GrailsDomainException.java rename to grace-api/src/main/groovy/org/grails/core/exceptions/GrailsDomainException.java diff --git a/grails-api/src/main/groovy/org/grails/core/exceptions/GrailsException.java b/grace-api/src/main/groovy/org/grails/core/exceptions/GrailsException.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/exceptions/GrailsException.java rename to grace-api/src/main/groovy/org/grails/core/exceptions/GrailsException.java diff --git a/grails-api/src/main/groovy/org/grails/core/exceptions/GrailsRuntimeException.java b/grace-api/src/main/groovy/org/grails/core/exceptions/GrailsRuntimeException.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/exceptions/GrailsRuntimeException.java rename to grace-api/src/main/groovy/org/grails/core/exceptions/GrailsRuntimeException.java diff --git a/grails-api/src/main/groovy/org/grails/core/exceptions/InvalidPropertyException.java b/grace-api/src/main/groovy/org/grails/core/exceptions/InvalidPropertyException.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/exceptions/InvalidPropertyException.java rename to grace-api/src/main/groovy/org/grails/core/exceptions/InvalidPropertyException.java diff --git a/grails-api/src/main/groovy/org/grails/core/exceptions/NewInstanceCreationException.java b/grace-api/src/main/groovy/org/grails/core/exceptions/NewInstanceCreationException.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/exceptions/NewInstanceCreationException.java rename to grace-api/src/main/groovy/org/grails/core/exceptions/NewInstanceCreationException.java diff --git a/grails-api/src/main/groovy/org/grails/core/io/CachingPathMatchingResourcePatternResolver.groovy b/grace-api/src/main/groovy/org/grails/core/io/CachingPathMatchingResourcePatternResolver.groovy similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/io/CachingPathMatchingResourcePatternResolver.groovy rename to grace-api/src/main/groovy/org/grails/core/io/CachingPathMatchingResourcePatternResolver.groovy diff --git a/grails-api/src/main/groovy/org/grails/core/io/ResourceLocator.java b/grace-api/src/main/groovy/org/grails/core/io/ResourceLocator.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/io/ResourceLocator.java rename to grace-api/src/main/groovy/org/grails/core/io/ResourceLocator.java diff --git a/grails-api/src/main/groovy/org/grails/core/io/SpringResource.java b/grace-api/src/main/groovy/org/grails/core/io/SpringResource.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/io/SpringResource.java rename to grace-api/src/main/groovy/org/grails/core/io/SpringResource.java diff --git a/grails-api/src/main/groovy/org/grails/core/io/StaticResourceLoader.java b/grace-api/src/main/groovy/org/grails/core/io/StaticResourceLoader.java similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/io/StaticResourceLoader.java rename to grace-api/src/main/groovy/org/grails/core/io/StaticResourceLoader.java diff --git a/grails-api/src/main/groovy/org/grails/core/io/support/GrailsFactoriesLoader.groovy b/grace-api/src/main/groovy/org/grails/core/io/support/GrailsFactoriesLoader.groovy similarity index 100% rename from grails-api/src/main/groovy/org/grails/core/io/support/GrailsFactoriesLoader.groovy rename to grace-api/src/main/groovy/org/grails/core/io/support/GrailsFactoriesLoader.groovy diff --git a/grails-api/src/test/groovy/grails/config/CodeGenConfigSpec.groovy b/grace-api/src/test/groovy/grails/config/CodeGenConfigSpec.groovy similarity index 100% rename from grails-api/src/test/groovy/grails/config/CodeGenConfigSpec.groovy rename to grace-api/src/test/groovy/grails/config/CodeGenConfigSpec.groovy diff --git a/grails-api/src/test/groovy/grails/config/ConfigMapSpec.groovy b/grace-api/src/test/groovy/grails/config/ConfigMapSpec.groovy similarity index 100% rename from grails-api/src/test/groovy/grails/config/ConfigMapSpec.groovy rename to grace-api/src/test/groovy/grails/config/ConfigMapSpec.groovy diff --git a/grails-api/src/test/groovy/grails/config/ConfigPropertiesSpec.groovy b/grace-api/src/test/groovy/grails/config/ConfigPropertiesSpec.groovy similarity index 100% rename from grails-api/src/test/groovy/grails/config/ConfigPropertiesSpec.groovy rename to grace-api/src/test/groovy/grails/config/ConfigPropertiesSpec.groovy diff --git a/grails-api/src/test/groovy/grails/config/GrailsConfigSpec.groovy b/grace-api/src/test/groovy/grails/config/GrailsConfigSpec.groovy similarity index 100% rename from grails-api/src/test/groovy/grails/config/GrailsConfigSpec.groovy rename to grace-api/src/test/groovy/grails/config/GrailsConfigSpec.groovy diff --git a/grails-api/src/test/groovy/grails/util/TypeConvertingMapTests.groovy b/grace-api/src/test/groovy/grails/util/TypeConvertingMapTests.groovy similarity index 100% rename from grails-api/src/test/groovy/grails/util/TypeConvertingMapTests.groovy rename to grace-api/src/test/groovy/grails/util/TypeConvertingMapTests.groovy diff --git a/grails-api/src/test/groovy/org/grails/config/NavigableMapSpec.groovy b/grace-api/src/test/groovy/org/grails/config/NavigableMapSpec.groovy similarity index 100% rename from grails-api/src/test/groovy/org/grails/config/NavigableMapSpec.groovy rename to grace-api/src/test/groovy/org/grails/config/NavigableMapSpec.groovy diff --git a/grails-api/src/test/groovy/org/grails/config/PrefixedMapPropertySourceSpec.groovy b/grace-api/src/test/groovy/org/grails/config/PrefixedMapPropertySourceSpec.groovy similarity index 100% rename from grails-api/src/test/groovy/org/grails/config/PrefixedMapPropertySourceSpec.groovy rename to grace-api/src/test/groovy/org/grails/config/PrefixedMapPropertySourceSpec.groovy diff --git a/grails-api/src/test/resources/config/application.yml b/grace-api/src/test/resources/config/application.yml similarity index 100% rename from grails-api/src/test/resources/config/application.yml rename to grace-api/src/test/resources/config/application.yml diff --git a/grails-bom/README.md b/grace-bom/README.md similarity index 80% rename from grails-bom/README.md rename to grace-bom/README.md index ebdc399780..cbff421f58 100644 --- a/grails-bom/README.md +++ b/grace-bom/README.md @@ -1,3 +1,3 @@ -## grails-bom +## grace-bom Build support for generating the Maven bill of materials. diff --git a/grails-bom/build.gradle b/grace-bom/build.gradle similarity index 94% rename from grails-bom/build.gradle rename to grace-bom/build.gradle index 3893655bbd..16e80cbb4f 100644 --- a/grails-bom/build.gradle +++ b/grace-bom/build.gradle @@ -24,7 +24,6 @@ publishing { pom.withXml { def xml = asNode() - xml.children().last() + pomInfo xml.children().last() + { def mkp = delegate @@ -60,13 +59,13 @@ publishing { mkp.dependencyManagement { mkp.dependencies { for (sub in project.parent.subprojects) { - if (sub.name == 'grails-bom') continue + if (sub.name == 'grace-bom') continue mkp.dependency { mkp.groupId sub.group mkp.artifactId sub.name mkp.version sub.version - if (sub.name == 'grails-dependencies') { + if (sub.name == 'grace-dependencies') { mkp.type 'pom' mkp.scope 'import' } @@ -93,7 +92,7 @@ publishing { String artifactId = plugin.key String version = "\${grails-plugin-${plugin.key}.version}" mkp.dependency { - mkp.groupId 'org.grails.plugins' + mkp.groupId 'org.graceframework.plugins' mkp.artifactId artifactId String versionValue = plugin.value mkp.version version @@ -102,7 +101,7 @@ publishing { for (profile in grails.profiles) { mkp.dependency { - mkp.groupId 'org.grails.profiles' + mkp.groupId 'org.graceframework.profiles' mkp.artifactId profile.key String version = profile.value mkp.version("\${grails-profile-${profile.key}.version}") diff --git a/grails-boot/README.md b/grace-boot/README.md similarity index 85% rename from grails-boot/README.md rename to grace-boot/README.md index f72575887b..89dbc61a0d 100644 --- a/grails-boot/README.md +++ b/grace-boot/README.md @@ -1,3 +1,3 @@ -## grails-boot +## grace-boot This subproject contains much of the code for the core of Grails support Spring Boot. diff --git a/grails-boot/build.gradle b/grace-boot/build.gradle similarity index 57% rename from grails-boot/build.gradle rename to grace-boot/build.gradle index 86e55c0830..4082fc35de 100644 --- a/grails-boot/build.gradle +++ b/grace-boot/build.gradle @@ -1,11 +1,11 @@ dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-core") - api project(":grails-plugin-api") - api project(":grails-plugin-core") - api project(":grails-spring") - api project(":grails-spring-boot") + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-core") + api project(":grace-plugin-api") + api project(":grace-plugin-core") + api project(":grace-spring") + api project(":grace-spring-boot") api libs.javax.annotation api libs.javax.inject @@ -22,14 +22,14 @@ dependencies { compileOnly libs.micronaut.spring.context compileOnly libs.jsr305 - testImplementation project(":grails-plugin-controllers") - testImplementation project(":grails-test") + testImplementation project(":grace-plugin-controllers") + testImplementation project(":grace-test") testImplementation libs.assertj.core testImplementation libs.mockito.core testImplementation libs.mockito.junit testImplementation libs.spring.boot.test testImplementation libs.tomcat.embed.core - testRuntimeOnly project(":grails-plugin-i18n") - testRuntimeOnly project(":grails-plugin-url-mappings") + testRuntimeOnly project(":grace-plugin-i18n") + testRuntimeOnly project(":grace-plugin-url-mappings") } diff --git a/grails-boot/src/main/groovy/grails/boot/Grails.java b/grace-boot/src/main/groovy/grails/boot/Grails.java similarity index 100% rename from grails-boot/src/main/groovy/grails/boot/Grails.java rename to grace-boot/src/main/groovy/grails/boot/Grails.java diff --git a/grails-boot/src/main/groovy/grails/boot/GrailsBanner.java b/grace-boot/src/main/groovy/grails/boot/GrailsBanner.java similarity index 100% rename from grails-boot/src/main/groovy/grails/boot/GrailsBanner.java rename to grace-boot/src/main/groovy/grails/boot/GrailsBanner.java diff --git a/grails-boot/src/main/groovy/grails/boot/GrailsBuilder.java b/grace-boot/src/main/groovy/grails/boot/GrailsBuilder.java similarity index 100% rename from grails-boot/src/main/groovy/grails/boot/GrailsBuilder.java rename to grace-boot/src/main/groovy/grails/boot/GrailsBuilder.java diff --git a/grails-boot/src/main/groovy/grails/boot/GrailsPluginApplication.groovy b/grace-boot/src/main/groovy/grails/boot/GrailsPluginApplication.groovy similarity index 100% rename from grails-boot/src/main/groovy/grails/boot/GrailsPluginApplication.groovy rename to grace-boot/src/main/groovy/grails/boot/GrailsPluginApplication.groovy diff --git a/grails-boot/src/main/groovy/grails/boot/GrailsResourceBanner.java b/grace-boot/src/main/groovy/grails/boot/GrailsResourceBanner.java similarity index 100% rename from grails-boot/src/main/groovy/grails/boot/GrailsResourceBanner.java rename to grace-boot/src/main/groovy/grails/boot/GrailsResourceBanner.java diff --git a/grails-boot/src/main/groovy/grails/boot/annotation/GrailsComponentScan.java b/grace-boot/src/main/groovy/grails/boot/annotation/GrailsComponentScan.java similarity index 100% rename from grails-boot/src/main/groovy/grails/boot/annotation/GrailsComponentScan.java rename to grace-boot/src/main/groovy/grails/boot/annotation/GrailsComponentScan.java diff --git a/grails-boot/src/main/groovy/grails/boot/config/GrailsApplicationEventListener.java b/grace-boot/src/main/groovy/grails/boot/config/GrailsApplicationEventListener.java similarity index 100% rename from grails-boot/src/main/groovy/grails/boot/config/GrailsApplicationEventListener.java rename to grace-boot/src/main/groovy/grails/boot/config/GrailsApplicationEventListener.java diff --git a/grails-boot/src/main/groovy/grails/boot/config/GrailsApplicationPostProcessor.java b/grace-boot/src/main/groovy/grails/boot/config/GrailsApplicationPostProcessor.java similarity index 100% rename from grails-boot/src/main/groovy/grails/boot/config/GrailsApplicationPostProcessor.java rename to grace-boot/src/main/groovy/grails/boot/config/GrailsApplicationPostProcessor.java diff --git a/grails-boot/src/main/groovy/grails/boot/config/GrailsAutoConfiguration.java b/grace-boot/src/main/groovy/grails/boot/config/GrailsAutoConfiguration.java similarity index 100% rename from grails-boot/src/main/groovy/grails/boot/config/GrailsAutoConfiguration.java rename to grace-boot/src/main/groovy/grails/boot/config/GrailsAutoConfiguration.java diff --git a/grails-boot/src/main/groovy/grails/boot/config/GrailsComponentScanPackages.java b/grace-boot/src/main/groovy/grails/boot/config/GrailsComponentScanPackages.java similarity index 100% rename from grails-boot/src/main/groovy/grails/boot/config/GrailsComponentScanPackages.java rename to grace-boot/src/main/groovy/grails/boot/config/GrailsComponentScanPackages.java diff --git a/grails-boot/src/main/groovy/grails/boot/config/GrailsComponentScanner.java b/grace-boot/src/main/groovy/grails/boot/config/GrailsComponentScanner.java similarity index 100% rename from grails-boot/src/main/groovy/grails/boot/config/GrailsComponentScanner.java rename to grace-boot/src/main/groovy/grails/boot/config/GrailsComponentScanner.java diff --git a/grails-boot/src/main/groovy/org/grails/asm/AnnotationMetadataReader.java b/grace-boot/src/main/groovy/org/grails/asm/AnnotationMetadataReader.java similarity index 100% rename from grails-boot/src/main/groovy/org/grails/asm/AnnotationMetadataReader.java rename to grace-boot/src/main/groovy/org/grails/asm/AnnotationMetadataReader.java diff --git a/grails-boot/src/main/groovy/org/grails/asm/Attribute.java b/grace-boot/src/main/groovy/org/grails/asm/Attribute.java similarity index 100% rename from grails-boot/src/main/groovy/org/grails/asm/Attribute.java rename to grace-boot/src/main/groovy/org/grails/asm/Attribute.java diff --git a/grails-boot/src/main/groovy/org/grails/asm/ByteVector.java b/grace-boot/src/main/groovy/org/grails/asm/ByteVector.java similarity index 100% rename from grails-boot/src/main/groovy/org/grails/asm/ByteVector.java rename to grace-boot/src/main/groovy/org/grails/asm/ByteVector.java diff --git a/grails-boot/src/main/groovy/org/grails/asm/ClassReader.java b/grace-boot/src/main/groovy/org/grails/asm/ClassReader.java similarity index 100% rename from grails-boot/src/main/groovy/org/grails/asm/ClassReader.java rename to grace-boot/src/main/groovy/org/grails/asm/ClassReader.java diff --git a/grails-boot/src/main/groovy/org/grails/asm/Context.java b/grace-boot/src/main/groovy/org/grails/asm/Context.java similarity index 100% rename from grails-boot/src/main/groovy/org/grails/asm/Context.java rename to grace-boot/src/main/groovy/org/grails/asm/Context.java diff --git a/grails-boot/src/main/groovy/org/grails/asm/TypePath.java b/grace-boot/src/main/groovy/org/grails/asm/TypePath.java similarity index 100% rename from grails-boot/src/main/groovy/org/grails/asm/TypePath.java rename to grace-boot/src/main/groovy/org/grails/asm/TypePath.java diff --git a/grails-boot/src/main/groovy/org/grails/boot/context/GrailsApplicationPidFileWriter.java b/grace-boot/src/main/groovy/org/grails/boot/context/GrailsApplicationPidFileWriter.java similarity index 100% rename from grails-boot/src/main/groovy/org/grails/boot/context/GrailsApplicationPidFileWriter.java rename to grace-boot/src/main/groovy/org/grails/boot/context/GrailsApplicationPidFileWriter.java diff --git a/grails-boot/src/main/groovy/org/grails/boot/context/GrailsConfigurationWarningsApplicationContextInitializer.java b/grace-boot/src/main/groovy/org/grails/boot/context/GrailsConfigurationWarningsApplicationContextInitializer.java similarity index 100% rename from grails-boot/src/main/groovy/org/grails/boot/context/GrailsConfigurationWarningsApplicationContextInitializer.java rename to grace-boot/src/main/groovy/org/grails/boot/context/GrailsConfigurationWarningsApplicationContextInitializer.java diff --git a/grails-boot/src/main/groovy/org/grails/boot/context/web/GrailsServletInitializer.groovy b/grace-boot/src/main/groovy/org/grails/boot/context/web/GrailsServletInitializer.groovy similarity index 100% rename from grails-boot/src/main/groovy/org/grails/boot/context/web/GrailsServletInitializer.groovy rename to grace-boot/src/main/groovy/org/grails/boot/context/web/GrailsServletInitializer.groovy diff --git a/grails-boot/src/main/groovy/org/grails/boot/context/web/GrailsWebServerPortFileWriter.java b/grace-boot/src/main/groovy/org/grails/boot/context/web/GrailsWebServerPortFileWriter.java similarity index 100% rename from grails-boot/src/main/groovy/org/grails/boot/context/web/GrailsWebServerPortFileWriter.java rename to grace-boot/src/main/groovy/org/grails/boot/context/web/GrailsWebServerPortFileWriter.java diff --git a/grails-boot/src/main/groovy/org/grails/boot/extension/GrailsExtension.groovy b/grace-boot/src/main/groovy/org/grails/boot/extension/GrailsExtension.groovy similarity index 100% rename from grails-boot/src/main/groovy/org/grails/boot/extension/GrailsExtension.groovy rename to grace-boot/src/main/groovy/org/grails/boot/extension/GrailsExtension.groovy diff --git a/grails-boot/src/main/groovy/org/grails/boot/internal/EnableAutoConfiguration.java b/grace-boot/src/main/groovy/org/grails/boot/internal/EnableAutoConfiguration.java similarity index 100% rename from grails-boot/src/main/groovy/org/grails/boot/internal/EnableAutoConfiguration.java rename to grace-boot/src/main/groovy/org/grails/boot/internal/EnableAutoConfiguration.java diff --git a/grails-boot/src/main/groovy/org/grails/boot/internal/JavaCompiler.groovy b/grace-boot/src/main/groovy/org/grails/boot/internal/JavaCompiler.groovy similarity index 100% rename from grails-boot/src/main/groovy/org/grails/boot/internal/JavaCompiler.groovy rename to grace-boot/src/main/groovy/org/grails/boot/internal/JavaCompiler.groovy diff --git a/grails-boot/src/main/groovy/org/grails/compiler/boot/BootInitializerClassInjector.groovy b/grace-boot/src/main/groovy/org/grails/compiler/boot/BootInitializerClassInjector.groovy similarity index 100% rename from grails-boot/src/main/groovy/org/grails/compiler/boot/BootInitializerClassInjector.groovy rename to grace-boot/src/main/groovy/org/grails/compiler/boot/BootInitializerClassInjector.groovy diff --git a/grails-boot/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/grace-boot/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule similarity index 100% rename from grails-boot/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule rename to grace-boot/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule diff --git a/grails-boot/src/main/resources/META-INF/spring.factories b/grace-boot/src/main/resources/META-INF/spring.factories similarity index 100% rename from grails-boot/src/main/resources/META-INF/spring.factories rename to grace-boot/src/main/resources/META-INF/spring.factories diff --git a/grails-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/grace-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from grails-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to grace-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/grails-boot/src/test/groovy/grails/boot/DevelopmentModeWatchSpec.groovy b/grace-boot/src/test/groovy/grails/boot/DevelopmentModeWatchSpec.groovy similarity index 100% rename from grails-boot/src/test/groovy/grails/boot/DevelopmentModeWatchSpec.groovy rename to grace-boot/src/test/groovy/grails/boot/DevelopmentModeWatchSpec.groovy diff --git a/grails-boot/src/test/groovy/grails/boot/EmbeddedContainerWithGrailsSpec.groovy b/grace-boot/src/test/groovy/grails/boot/EmbeddedContainerWithGrailsSpec.groovy similarity index 100% rename from grails-boot/src/test/groovy/grails/boot/EmbeddedContainerWithGrailsSpec.groovy rename to grace-boot/src/test/groovy/grails/boot/EmbeddedContainerWithGrailsSpec.groovy diff --git a/grails-boot/src/test/groovy/grails/boot/GrailsSpringApplicationSpec.groovy b/grace-boot/src/test/groovy/grails/boot/GrailsSpringApplicationSpec.groovy similarity index 100% rename from grails-boot/src/test/groovy/grails/boot/GrailsSpringApplicationSpec.groovy rename to grace-boot/src/test/groovy/grails/boot/GrailsSpringApplicationSpec.groovy diff --git a/grails-boot/src/test/groovy/grails/boot/GrailsTests.java b/grace-boot/src/test/groovy/grails/boot/GrailsTests.java similarity index 100% rename from grails-boot/src/test/groovy/grails/boot/GrailsTests.java rename to grace-boot/src/test/groovy/grails/boot/GrailsTests.java diff --git a/grails-boot/src/test/groovy/grails/boot/WatchedResourcesGrailsPlugin.groovy b/grace-boot/src/test/groovy/grails/boot/WatchedResourcesGrailsPlugin.groovy similarity index 100% rename from grails-boot/src/test/groovy/grails/boot/WatchedResourcesGrailsPlugin.groovy rename to grace-boot/src/test/groovy/grails/boot/WatchedResourcesGrailsPlugin.groovy diff --git a/grails-boot/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerSpec.groovy b/grace-boot/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerSpec.groovy similarity index 100% rename from grails-boot/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerSpec.groovy rename to grace-boot/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerSpec.groovy diff --git a/grails-boot/src/test/groovy/org/grails/boot/context/GrailsConfigurationWarningsApplicationContextInitializerTests.java b/grace-boot/src/test/groovy/org/grails/boot/context/GrailsConfigurationWarningsApplicationContextInitializerTests.java similarity index 100% rename from grails-boot/src/test/groovy/org/grails/boot/context/GrailsConfigurationWarningsApplicationContextInitializerTests.java rename to grace-boot/src/test/groovy/org/grails/boot/context/GrailsConfigurationWarningsApplicationContextInitializerTests.java diff --git a/grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java b/grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java similarity index 100% rename from grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java rename to grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageConfiguration.java diff --git a/grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java b/grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java similarity index 100% rename from grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java rename to grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackageClassesConfiguration.java diff --git a/grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java b/grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java similarity index 100% rename from grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java rename to grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithBasePackagesConfiguration.java diff --git a/grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java b/grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java similarity index 100% rename from grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java rename to grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithValueConfiguration.java diff --git a/grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java b/grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java similarity index 100% rename from grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java rename to grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/dflt/InDefaultPackageWithoutScanConfiguration.java diff --git a/grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/orggrails/InOrgGrailsPackageConfiguration.java b/grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/orggrails/InOrgGrailsPackageConfiguration.java similarity index 100% rename from grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/orggrails/InOrgGrailsPackageConfiguration.java rename to grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/orggrails/InOrgGrailsPackageConfiguration.java diff --git a/grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/real/InRealButScanningProblemPackages.java b/grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/real/InRealButScanningProblemPackages.java similarity index 100% rename from grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/real/InRealButScanningProblemPackages.java rename to grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/real/InRealButScanningProblemPackages.java diff --git a/grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/real/InRealPackageConfiguration.java b/grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/real/InRealPackageConfiguration.java similarity index 100% rename from grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/real/InRealPackageConfiguration.java rename to grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/real/InRealPackageConfiguration.java diff --git a/grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/real/nested/ExampleBean.java b/grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/real/nested/ExampleBean.java similarity index 100% rename from grails-boot/src/test/groovy/org/grails/boot/context/configwarnings/real/nested/ExampleBean.java rename to grace-boot/src/test/groovy/org/grails/boot/context/configwarnings/real/nested/ExampleBean.java diff --git a/grails-boot/src/test/groovy/org/grails/compiler/boot/BootInitializerClassInjectorSpec.groovy b/grace-boot/src/test/groovy/org/grails/compiler/boot/BootInitializerClassInjectorSpec.groovy similarity index 100% rename from grails-boot/src/test/groovy/org/grails/compiler/boot/BootInitializerClassInjectorSpec.groovy rename to grace-boot/src/test/groovy/org/grails/compiler/boot/BootInitializerClassInjectorSpec.groovy diff --git a/grails-boot/src/test/groovy/org/springframework/boot/SpringApplicationShutdownHookInstance.java b/grace-boot/src/test/groovy/org/springframework/boot/SpringApplicationShutdownHookInstance.java similarity index 100% rename from grails-boot/src/test/groovy/org/springframework/boot/SpringApplicationShutdownHookInstance.java rename to grace-boot/src/test/groovy/org/springframework/boot/SpringApplicationShutdownHookInstance.java diff --git a/grails-bootstrap/README.md b/grace-bootstrap/README.md similarity index 82% rename from grails-bootstrap/README.md rename to grace-bootstrap/README.md index 197755604d..f68ebed4cb 100644 --- a/grails-bootstrap/README.md +++ b/grace-bootstrap/README.md @@ -1,3 +1,3 @@ -## grails-bootstrap +## grace-bootstrap This subproject contains much of the core code required to bootstrap the Grails environment. diff --git a/grails-bootstrap/build.gradle b/grace-bootstrap/build.gradle similarity index 96% rename from grails-bootstrap/build.gradle rename to grace-bootstrap/build.gradle index 5d5543b5e9..887a158441 100644 --- a/grails-bootstrap/build.gradle +++ b/grace-bootstrap/build.gradle @@ -6,7 +6,7 @@ plugins { } dependencies { - api project(":grails-util") + api project(":grace-util") api libs.groovy.templates api libs.groovy.xml diff --git a/grails-bootstrap/src/main/groovy/grails/binding/GroovyShellBindingCustomizer.java b/grace-bootstrap/src/main/groovy/grails/binding/GroovyShellBindingCustomizer.java similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/binding/GroovyShellBindingCustomizer.java rename to grace-bootstrap/src/main/groovy/grails/binding/GroovyShellBindingCustomizer.java diff --git a/grails-bootstrap/src/main/groovy/grails/build/logging/ConsoleLogger.java b/grace-bootstrap/src/main/groovy/grails/build/logging/ConsoleLogger.java similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/build/logging/ConsoleLogger.java rename to grace-bootstrap/src/main/groovy/grails/build/logging/ConsoleLogger.java diff --git a/grails-bootstrap/src/main/groovy/grails/build/logging/GrailsConsole.java b/grace-bootstrap/src/main/groovy/grails/build/logging/GrailsConsole.java similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/build/logging/GrailsConsole.java rename to grace-bootstrap/src/main/groovy/grails/build/logging/GrailsConsole.java diff --git a/grails-bootstrap/src/main/groovy/grails/build/logging/GrailsEclipseConsole.java b/grace-bootstrap/src/main/groovy/grails/build/logging/GrailsEclipseConsole.java similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/build/logging/GrailsEclipseConsole.java rename to grace-bootstrap/src/main/groovy/grails/build/logging/GrailsEclipseConsole.java diff --git a/grails-bootstrap/src/main/groovy/grails/build/proxy/SystemPropertiesAuthenticator.groovy b/grace-bootstrap/src/main/groovy/grails/build/proxy/SystemPropertiesAuthenticator.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/build/proxy/SystemPropertiesAuthenticator.groovy rename to grace-bootstrap/src/main/groovy/grails/build/proxy/SystemPropertiesAuthenticator.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/build/support/MetaClassRegistryCleaner.java b/grace-bootstrap/src/main/groovy/grails/build/support/MetaClassRegistryCleaner.java similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/build/support/MetaClassRegistryCleaner.java rename to grace-bootstrap/src/main/groovy/grails/build/support/MetaClassRegistryCleaner.java diff --git a/grails-bootstrap/src/main/groovy/grails/codegen/model/Model.groovy b/grace-bootstrap/src/main/groovy/grails/codegen/model/Model.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/codegen/model/Model.groovy rename to grace-bootstrap/src/main/groovy/grails/codegen/model/Model.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/codegen/model/ModelBuilder.groovy b/grace-bootstrap/src/main/groovy/grails/codegen/model/ModelBuilder.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/codegen/model/ModelBuilder.groovy rename to grace-bootstrap/src/main/groovy/grails/codegen/model/ModelBuilder.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/io/IOUtils.groovy b/grace-bootstrap/src/main/groovy/grails/io/IOUtils.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/io/IOUtils.groovy rename to grace-bootstrap/src/main/groovy/grails/io/IOUtils.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/io/ResourceUtils.groovy b/grace-bootstrap/src/main/groovy/grails/io/ResourceUtils.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/io/ResourceUtils.groovy rename to grace-bootstrap/src/main/groovy/grails/io/ResourceUtils.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/io/support/SystemOutErrCapturer.groovy b/grace-bootstrap/src/main/groovy/grails/io/support/SystemOutErrCapturer.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/io/support/SystemOutErrCapturer.groovy rename to grace-bootstrap/src/main/groovy/grails/io/support/SystemOutErrCapturer.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/io/support/SystemStreamsRedirector.groovy b/grace-bootstrap/src/main/groovy/grails/io/support/SystemStreamsRedirector.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/io/support/SystemStreamsRedirector.groovy rename to grace-bootstrap/src/main/groovy/grails/io/support/SystemStreamsRedirector.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy b/grace-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy rename to grace-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/util/CosineSimilarity.groovy b/grace-bootstrap/src/main/groovy/grails/util/CosineSimilarity.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/util/CosineSimilarity.groovy rename to grace-bootstrap/src/main/groovy/grails/util/CosineSimilarity.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/util/Described.groovy b/grace-bootstrap/src/main/groovy/grails/util/Described.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/util/Described.groovy rename to grace-bootstrap/src/main/groovy/grails/util/Described.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/util/Environment.groovy b/grace-bootstrap/src/main/groovy/grails/util/Environment.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/util/Environment.groovy rename to grace-bootstrap/src/main/groovy/grails/util/Environment.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/util/EnvironmentBlockEvaluator.groovy b/grace-bootstrap/src/main/groovy/grails/util/EnvironmentBlockEvaluator.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/util/EnvironmentBlockEvaluator.groovy rename to grace-bootstrap/src/main/groovy/grails/util/EnvironmentBlockEvaluator.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/util/GrailsUtil.java b/grace-bootstrap/src/main/groovy/grails/util/GrailsUtil.java similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/util/GrailsUtil.java rename to grace-bootstrap/src/main/groovy/grails/util/GrailsUtil.java diff --git a/grails-bootstrap/src/main/groovy/grails/util/GrailsVersion.java b/grace-bootstrap/src/main/groovy/grails/util/GrailsVersion.java similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/util/GrailsVersion.java rename to grace-bootstrap/src/main/groovy/grails/util/GrailsVersion.java diff --git a/grails-bootstrap/src/main/groovy/grails/util/Holder.java b/grace-bootstrap/src/main/groovy/grails/util/Holder.java similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/util/Holder.java rename to grace-bootstrap/src/main/groovy/grails/util/Holder.java diff --git a/grails-bootstrap/src/main/groovy/grails/util/Metadata.groovy b/grace-bootstrap/src/main/groovy/grails/util/Metadata.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/util/Metadata.groovy rename to grace-bootstrap/src/main/groovy/grails/util/Metadata.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/util/Named.groovy b/grace-bootstrap/src/main/groovy/grails/util/Named.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/util/Named.groovy rename to grace-bootstrap/src/main/groovy/grails/util/Named.groovy diff --git a/grails-bootstrap/src/main/groovy/grails/util/SupplierUtil.java b/grace-bootstrap/src/main/groovy/grails/util/SupplierUtil.java similarity index 100% rename from grails-bootstrap/src/main/groovy/grails/util/SupplierUtil.java rename to grace-bootstrap/src/main/groovy/grails/util/SupplierUtil.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/build/interactive/CandidateListCompletionHandler.java b/grace-bootstrap/src/main/groovy/org/grails/build/interactive/CandidateListCompletionHandler.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/build/interactive/CandidateListCompletionHandler.java rename to grace-bootstrap/src/main/groovy/org/grails/build/interactive/CandidateListCompletionHandler.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsoleAntBuilder.java b/grace-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsoleAntBuilder.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsoleAntBuilder.java rename to grace-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsoleAntBuilder.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsoleBuildListener.java b/grace-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsoleBuildListener.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsoleBuildListener.java rename to grace-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsoleBuildListener.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsoleErrorPrintStream.java b/grace-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsoleErrorPrintStream.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsoleErrorPrintStream.java rename to grace-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsoleErrorPrintStream.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsolePrintStream.java b/grace-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsolePrintStream.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsolePrintStream.java rename to grace-bootstrap/src/main/groovy/org/grails/build/logging/GrailsConsolePrintStream.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/build/parsing/CommandLine.java b/grace-bootstrap/src/main/groovy/org/grails/build/parsing/CommandLine.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/build/parsing/CommandLine.java rename to grace-bootstrap/src/main/groovy/org/grails/build/parsing/CommandLine.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/build/parsing/CommandLineParser.java b/grace-bootstrap/src/main/groovy/org/grails/build/parsing/CommandLineParser.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/build/parsing/CommandLineParser.java rename to grace-bootstrap/src/main/groovy/org/grails/build/parsing/CommandLineParser.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/build/parsing/DefaultCommandLine.java b/grace-bootstrap/src/main/groovy/org/grails/build/parsing/DefaultCommandLine.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/build/parsing/DefaultCommandLine.java rename to grace-bootstrap/src/main/groovy/org/grails/build/parsing/DefaultCommandLine.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/build/parsing/Option.java b/grace-bootstrap/src/main/groovy/org/grails/build/parsing/Option.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/build/parsing/Option.java rename to grace-bootstrap/src/main/groovy/org/grails/build/parsing/Option.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/build/parsing/ParseException.java b/grace-bootstrap/src/main/groovy/org/grails/build/parsing/ParseException.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/build/parsing/ParseException.java rename to grace-bootstrap/src/main/groovy/org/grails/build/parsing/ParseException.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/build/parsing/ScriptNameResolver.groovy b/grace-bootstrap/src/main/groovy/org/grails/build/parsing/ScriptNameResolver.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/build/parsing/ScriptNameResolver.groovy rename to grace-bootstrap/src/main/groovy/org/grails/build/parsing/ScriptNameResolver.groovy diff --git a/grails-bootstrap/src/main/groovy/org/grails/exceptions/ExceptionUtils.groovy b/grace-bootstrap/src/main/groovy/org/grails/exceptions/ExceptionUtils.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/exceptions/ExceptionUtils.groovy rename to grace-bootstrap/src/main/groovy/org/grails/exceptions/ExceptionUtils.groovy diff --git a/grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/CodeSnippetPrinter.groovy b/grace-bootstrap/src/main/groovy/org/grails/exceptions/reporting/CodeSnippetPrinter.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/CodeSnippetPrinter.groovy rename to grace-bootstrap/src/main/groovy/org/grails/exceptions/reporting/CodeSnippetPrinter.groovy diff --git a/grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/DefaultStackTraceFilterer.java b/grace-bootstrap/src/main/groovy/org/grails/exceptions/reporting/DefaultStackTraceFilterer.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/DefaultStackTraceFilterer.java rename to grace-bootstrap/src/main/groovy/org/grails/exceptions/reporting/DefaultStackTraceFilterer.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/DefaultStackTracePrinter.groovy b/grace-bootstrap/src/main/groovy/org/grails/exceptions/reporting/DefaultStackTracePrinter.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/DefaultStackTracePrinter.groovy rename to grace-bootstrap/src/main/groovy/org/grails/exceptions/reporting/DefaultStackTracePrinter.groovy diff --git a/grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/SourceCodeAware.java b/grace-bootstrap/src/main/groovy/org/grails/exceptions/reporting/SourceCodeAware.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/SourceCodeAware.java rename to grace-bootstrap/src/main/groovy/org/grails/exceptions/reporting/SourceCodeAware.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/StackTraceFilterer.java b/grace-bootstrap/src/main/groovy/org/grails/exceptions/reporting/StackTraceFilterer.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/StackTraceFilterer.java rename to grace-bootstrap/src/main/groovy/org/grails/exceptions/reporting/StackTraceFilterer.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/StackTracePrinter.groovy b/grace-bootstrap/src/main/groovy/org/grails/exceptions/reporting/StackTracePrinter.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/StackTracePrinter.groovy rename to grace-bootstrap/src/main/groovy/org/grails/exceptions/reporting/StackTracePrinter.groovy diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/AbstractFileResolvingResource.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/AbstractFileResolvingResource.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/AbstractFileResolvingResource.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/AbstractFileResolvingResource.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/AntPathMatcher.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/AntPathMatcher.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/AntPathMatcher.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/AntPathMatcher.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/ByteArrayResource.groovy b/grace-bootstrap/src/main/groovy/org/grails/io/support/ByteArrayResource.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/ByteArrayResource.groovy rename to grace-bootstrap/src/main/groovy/org/grails/io/support/ByteArrayResource.groovy diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/ClassPathResource.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/ClassPathResource.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/ClassPathResource.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/ClassPathResource.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/DefaultResourceLoader.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/DefaultResourceLoader.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/DefaultResourceLoader.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/DefaultResourceLoader.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/DevNullPrintStream.groovy b/grace-bootstrap/src/main/groovy/org/grails/io/support/DevNullPrintStream.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/DevNullPrintStream.groovy rename to grace-bootstrap/src/main/groovy/org/grails/io/support/DevNullPrintStream.groovy diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/FactoriesLoaderSupport.groovy b/grace-bootstrap/src/main/groovy/org/grails/io/support/FactoriesLoaderSupport.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/FactoriesLoaderSupport.groovy rename to grace-bootstrap/src/main/groovy/org/grails/io/support/FactoriesLoaderSupport.groovy diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/FileSystemResource.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/FileSystemResource.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/FileSystemResource.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/FileSystemResource.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/FileSystemResourceLoader.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/FileSystemResourceLoader.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/FileSystemResourceLoader.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/FileSystemResourceLoader.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/GrailsResourceUtils.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/GrailsResourceUtils.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/GrailsResourceUtils.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/GrailsResourceUtils.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/MainClassFinder.groovy b/grace-bootstrap/src/main/groovy/org/grails/io/support/MainClassFinder.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/MainClassFinder.groovy rename to grace-bootstrap/src/main/groovy/org/grails/io/support/MainClassFinder.groovy diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/PathMatchingResourcePatternResolver.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/PathMatchingResourcePatternResolver.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/PathMatchingResourcePatternResolver.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/PathMatchingResourcePatternResolver.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/Resource.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/Resource.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/Resource.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/Resource.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/ResourceLoader.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/ResourceLoader.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/ResourceLoader.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/ResourceLoader.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/ResourceLocator.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/ResourceLocator.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/ResourceLocator.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/ResourceLocator.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/SpringIOUtils.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/SpringIOUtils.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/SpringIOUtils.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/SpringIOUtils.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/StaticResourceLoader.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/StaticResourceLoader.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/StaticResourceLoader.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/StaticResourceLoader.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/UrlResource.java b/grace-bootstrap/src/main/groovy/org/grails/io/support/UrlResource.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/support/UrlResource.java rename to grace-bootstrap/src/main/groovy/org/grails/io/support/UrlResource.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/watch/AbstractDirectoryWatcher.java b/grace-bootstrap/src/main/groovy/org/grails/io/watch/AbstractDirectoryWatcher.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/watch/AbstractDirectoryWatcher.java rename to grace-bootstrap/src/main/groovy/org/grails/io/watch/AbstractDirectoryWatcher.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/watch/DirectoryWatcher.java b/grace-bootstrap/src/main/groovy/org/grails/io/watch/DirectoryWatcher.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/watch/DirectoryWatcher.java rename to grace-bootstrap/src/main/groovy/org/grails/io/watch/DirectoryWatcher.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/watch/FileExtensionFileChangeListener.groovy b/grace-bootstrap/src/main/groovy/org/grails/io/watch/FileExtensionFileChangeListener.groovy similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/watch/FileExtensionFileChangeListener.groovy rename to grace-bootstrap/src/main/groovy/org/grails/io/watch/FileExtensionFileChangeListener.groovy diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/watch/MacOsWatchServiceDirectoryWatcher.java b/grace-bootstrap/src/main/groovy/org/grails/io/watch/MacOsWatchServiceDirectoryWatcher.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/watch/MacOsWatchServiceDirectoryWatcher.java rename to grace-bootstrap/src/main/groovy/org/grails/io/watch/MacOsWatchServiceDirectoryWatcher.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/watch/PollingDirectoryWatcher.java b/grace-bootstrap/src/main/groovy/org/grails/io/watch/PollingDirectoryWatcher.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/watch/PollingDirectoryWatcher.java rename to grace-bootstrap/src/main/groovy/org/grails/io/watch/PollingDirectoryWatcher.java diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/watch/WatchServiceDirectoryWatcher.java b/grace-bootstrap/src/main/groovy/org/grails/io/watch/WatchServiceDirectoryWatcher.java similarity index 100% rename from grails-bootstrap/src/main/groovy/org/grails/io/watch/WatchServiceDirectoryWatcher.java rename to grace-bootstrap/src/main/groovy/org/grails/io/watch/WatchServiceDirectoryWatcher.java diff --git a/grails-bootstrap/src/test/groovy/grails/build/logging/GrailsConsoleSpec.groovy b/grace-bootstrap/src/test/groovy/grails/build/logging/GrailsConsoleSpec.groovy similarity index 100% rename from grails-bootstrap/src/test/groovy/grails/build/logging/GrailsConsoleSpec.groovy rename to grace-bootstrap/src/test/groovy/grails/build/logging/GrailsConsoleSpec.groovy diff --git a/grails-bootstrap/src/test/groovy/grails/io/IOUtilsSpec.groovy b/grace-bootstrap/src/test/groovy/grails/io/IOUtilsSpec.groovy similarity index 96% rename from grails-bootstrap/src/test/groovy/grails/io/IOUtilsSpec.groovy rename to grace-bootstrap/src/test/groovy/grails/io/IOUtilsSpec.groovy index eca28e4658..869bf71986 100644 --- a/grails-bootstrap/src/test/groovy/grails/io/IOUtilsSpec.groovy +++ b/grace-bootstrap/src/test/groovy/grails/io/IOUtilsSpec.groovy @@ -9,7 +9,7 @@ class IOUtilsSpec extends Specification{ void "Test findClassResource finds a class resource"() { expect: IOUtils.findClassResource(BuildSettings) - IOUtils.findClassResource(BuildSettings).path.contains('grails-bootstrap') + IOUtils.findClassResource(BuildSettings).path.contains('grace-bootstrap') } void "Test findJarResource finds a the JAR resource"() { diff --git a/grails-bootstrap/src/test/groovy/grails/util/EnvironmentTests.groovy b/grace-bootstrap/src/test/groovy/grails/util/EnvironmentTests.groovy similarity index 100% rename from grails-bootstrap/src/test/groovy/grails/util/EnvironmentTests.groovy rename to grace-bootstrap/src/test/groovy/grails/util/EnvironmentTests.groovy diff --git a/grails-bootstrap/src/test/groovy/grails/util/GrailsUtilTests.java b/grace-bootstrap/src/test/groovy/grails/util/GrailsUtilTests.java similarity index 100% rename from grails-bootstrap/src/test/groovy/grails/util/GrailsUtilTests.java rename to grace-bootstrap/src/test/groovy/grails/util/GrailsUtilTests.java diff --git a/grails-bootstrap/src/test/groovy/org/grails/build/parsing/CommandLineParserSpec.groovy b/grace-bootstrap/src/test/groovy/org/grails/build/parsing/CommandLineParserSpec.groovy similarity index 100% rename from grails-bootstrap/src/test/groovy/org/grails/build/parsing/CommandLineParserSpec.groovy rename to grace-bootstrap/src/test/groovy/org/grails/build/parsing/CommandLineParserSpec.groovy diff --git a/grails-bootstrap/src/test/groovy/org/grails/io/support/GrailsResourceUtilsSpec.groovy b/grace-bootstrap/src/test/groovy/org/grails/io/support/GrailsResourceUtilsSpec.groovy similarity index 100% rename from grails-bootstrap/src/test/groovy/org/grails/io/support/GrailsResourceUtilsSpec.groovy rename to grace-bootstrap/src/test/groovy/org/grails/io/support/GrailsResourceUtilsSpec.groovy diff --git a/grace-cli/README.md b/grace-cli/README.md new file mode 100644 index 0000000000..df46bd60da --- /dev/null +++ b/grace-cli/README.md @@ -0,0 +1 @@ +## grace-cli diff --git a/grace-cli/build.gradle b/grace-cli/build.gradle new file mode 100644 index 0000000000..ca90bfbc75 --- /dev/null +++ b/grace-cli/build.gradle @@ -0,0 +1,6 @@ +dependencies { + api project(":grace-api") + api project(":grace-bootstrap") + + api libs.groovy.templates +} diff --git a/grails-cli/src/main/groovy/grails/dev/commands/ApplicationCommand.groovy b/grace-cli/src/main/groovy/grails/dev/commands/ApplicationCommand.groovy similarity index 100% rename from grails-cli/src/main/groovy/grails/dev/commands/ApplicationCommand.groovy rename to grace-cli/src/main/groovy/grails/dev/commands/ApplicationCommand.groovy diff --git a/grails-cli/src/main/groovy/grails/dev/commands/ApplicationContextCommandRegistry.java b/grace-cli/src/main/groovy/grails/dev/commands/ApplicationContextCommandRegistry.java similarity index 100% rename from grails-cli/src/main/groovy/grails/dev/commands/ApplicationContextCommandRegistry.java rename to grace-cli/src/main/groovy/grails/dev/commands/ApplicationContextCommandRegistry.java diff --git a/grails-cli/src/main/groovy/grails/dev/commands/ExecutionContext.groovy b/grace-cli/src/main/groovy/grails/dev/commands/ExecutionContext.groovy similarity index 100% rename from grails-cli/src/main/groovy/grails/dev/commands/ExecutionContext.groovy rename to grace-cli/src/main/groovy/grails/dev/commands/ExecutionContext.groovy diff --git a/grails-cli/src/main/groovy/grails/dev/commands/GrailsApplicationCommand.groovy b/grace-cli/src/main/groovy/grails/dev/commands/GrailsApplicationCommand.groovy similarity index 100% rename from grails-cli/src/main/groovy/grails/dev/commands/GrailsApplicationCommand.groovy rename to grace-cli/src/main/groovy/grails/dev/commands/GrailsApplicationCommand.groovy diff --git a/grails-cli/src/main/groovy/grails/dev/commands/io/FileSystemInteraction.groovy b/grace-cli/src/main/groovy/grails/dev/commands/io/FileSystemInteraction.groovy similarity index 100% rename from grails-cli/src/main/groovy/grails/dev/commands/io/FileSystemInteraction.groovy rename to grace-cli/src/main/groovy/grails/dev/commands/io/FileSystemInteraction.groovy diff --git a/grails-cli/src/main/groovy/grails/dev/commands/io/FileSystemInteractionImpl.groovy b/grace-cli/src/main/groovy/grails/dev/commands/io/FileSystemInteractionImpl.groovy similarity index 100% rename from grails-cli/src/main/groovy/grails/dev/commands/io/FileSystemInteractionImpl.groovy rename to grace-cli/src/main/groovy/grails/dev/commands/io/FileSystemInteractionImpl.groovy diff --git a/grails-cli/src/main/groovy/grails/dev/commands/template/TemplateException.groovy b/grace-cli/src/main/groovy/grails/dev/commands/template/TemplateException.groovy similarity index 100% rename from grails-cli/src/main/groovy/grails/dev/commands/template/TemplateException.groovy rename to grace-cli/src/main/groovy/grails/dev/commands/template/TemplateException.groovy diff --git a/grails-cli/src/main/groovy/grails/dev/commands/template/TemplateRenderer.groovy b/grace-cli/src/main/groovy/grails/dev/commands/template/TemplateRenderer.groovy similarity index 100% rename from grails-cli/src/main/groovy/grails/dev/commands/template/TemplateRenderer.groovy rename to grace-cli/src/main/groovy/grails/dev/commands/template/TemplateRenderer.groovy diff --git a/grails-cli/src/main/groovy/grails/dev/commands/template/TemplateRendererImpl.groovy b/grace-cli/src/main/groovy/grails/dev/commands/template/TemplateRendererImpl.groovy similarity index 100% rename from grails-cli/src/main/groovy/grails/dev/commands/template/TemplateRendererImpl.groovy rename to grace-cli/src/main/groovy/grails/dev/commands/template/TemplateRendererImpl.groovy diff --git a/grails-cli/src/main/groovy/org/grails/dev/support/CommandLineResourceLoader.java b/grace-cli/src/main/groovy/org/grails/dev/support/CommandLineResourceLoader.java similarity index 100% rename from grails-cli/src/main/groovy/org/grails/dev/support/CommandLineResourceLoader.java rename to grace-cli/src/main/groovy/org/grails/dev/support/CommandLineResourceLoader.java diff --git a/grails-codecs/README.md b/grace-codecs/README.md similarity index 83% rename from grails-codecs/README.md rename to grace-codecs/README.md index 88d2aedeae..badba952ca 100644 --- a/grails-codecs/README.md +++ b/grace-codecs/README.md @@ -1,3 +1,3 @@ -## grails-codecs +## grace-codecs Code related to Grails codec methods (`.encodeAsHTML)`, `.encodeAsHex()`, etc...) diff --git a/grails-codecs/build.gradle b/grace-codecs/build.gradle similarity index 100% rename from grails-codecs/build.gradle rename to grace-codecs/build.gradle diff --git a/grails-codecs/src/main/groovy/org/grails/plugins/codecs/Base64CodecExtensionMethods.groovy b/grace-codecs/src/main/groovy/org/grails/plugins/codecs/Base64CodecExtensionMethods.groovy similarity index 100% rename from grails-codecs/src/main/groovy/org/grails/plugins/codecs/Base64CodecExtensionMethods.groovy rename to grace-codecs/src/main/groovy/org/grails/plugins/codecs/Base64CodecExtensionMethods.groovy diff --git a/grails-codecs/src/main/groovy/org/grails/plugins/codecs/DigestUtils.groovy b/grace-codecs/src/main/groovy/org/grails/plugins/codecs/DigestUtils.groovy similarity index 100% rename from grails-codecs/src/main/groovy/org/grails/plugins/codecs/DigestUtils.groovy rename to grace-codecs/src/main/groovy/org/grails/plugins/codecs/DigestUtils.groovy diff --git a/grails-codecs/src/main/groovy/org/grails/plugins/codecs/HexCodecExtensionMethods.groovy b/grace-codecs/src/main/groovy/org/grails/plugins/codecs/HexCodecExtensionMethods.groovy similarity index 100% rename from grails-codecs/src/main/groovy/org/grails/plugins/codecs/HexCodecExtensionMethods.groovy rename to grace-codecs/src/main/groovy/org/grails/plugins/codecs/HexCodecExtensionMethods.groovy diff --git a/grails-codecs/src/main/groovy/org/grails/plugins/codecs/MD5BytesCodecExtensionMethods.groovy b/grace-codecs/src/main/groovy/org/grails/plugins/codecs/MD5BytesCodecExtensionMethods.groovy similarity index 100% rename from grails-codecs/src/main/groovy/org/grails/plugins/codecs/MD5BytesCodecExtensionMethods.groovy rename to grace-codecs/src/main/groovy/org/grails/plugins/codecs/MD5BytesCodecExtensionMethods.groovy diff --git a/grails-codecs/src/main/groovy/org/grails/plugins/codecs/MD5CodecExtensionMethods.groovy b/grace-codecs/src/main/groovy/org/grails/plugins/codecs/MD5CodecExtensionMethods.groovy similarity index 100% rename from grails-codecs/src/main/groovy/org/grails/plugins/codecs/MD5CodecExtensionMethods.groovy rename to grace-codecs/src/main/groovy/org/grails/plugins/codecs/MD5CodecExtensionMethods.groovy diff --git a/grails-codecs/src/main/groovy/org/grails/plugins/codecs/SHA1BytesCodecExtensionMethods.groovy b/grace-codecs/src/main/groovy/org/grails/plugins/codecs/SHA1BytesCodecExtensionMethods.groovy similarity index 100% rename from grails-codecs/src/main/groovy/org/grails/plugins/codecs/SHA1BytesCodecExtensionMethods.groovy rename to grace-codecs/src/main/groovy/org/grails/plugins/codecs/SHA1BytesCodecExtensionMethods.groovy diff --git a/grails-codecs/src/main/groovy/org/grails/plugins/codecs/SHA1CodecExtensionMethods.groovy b/grace-codecs/src/main/groovy/org/grails/plugins/codecs/SHA1CodecExtensionMethods.groovy similarity index 100% rename from grails-codecs/src/main/groovy/org/grails/plugins/codecs/SHA1CodecExtensionMethods.groovy rename to grace-codecs/src/main/groovy/org/grails/plugins/codecs/SHA1CodecExtensionMethods.groovy diff --git a/grails-codecs/src/main/groovy/org/grails/plugins/codecs/SHA256BytesCodecExtensionMethods.groovy b/grace-codecs/src/main/groovy/org/grails/plugins/codecs/SHA256BytesCodecExtensionMethods.groovy similarity index 100% rename from grails-codecs/src/main/groovy/org/grails/plugins/codecs/SHA256BytesCodecExtensionMethods.groovy rename to grace-codecs/src/main/groovy/org/grails/plugins/codecs/SHA256BytesCodecExtensionMethods.groovy diff --git a/grails-codecs/src/main/groovy/org/grails/plugins/codecs/SHA256CodecExtensionMethods.groovy b/grace-codecs/src/main/groovy/org/grails/plugins/codecs/SHA256CodecExtensionMethods.groovy similarity index 100% rename from grails-codecs/src/main/groovy/org/grails/plugins/codecs/SHA256CodecExtensionMethods.groovy rename to grace-codecs/src/main/groovy/org/grails/plugins/codecs/SHA256CodecExtensionMethods.groovy diff --git a/grails-codecs/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/grace-codecs/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule similarity index 100% rename from grails-codecs/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule rename to grace-codecs/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule diff --git a/grails-codecs/src/test/groovy/org/grails/web/codecs/Base64CodecTests.groovy b/grace-codecs/src/test/groovy/org/grails/web/codecs/Base64CodecTests.groovy similarity index 100% rename from grails-codecs/src/test/groovy/org/grails/web/codecs/Base64CodecTests.groovy rename to grace-codecs/src/test/groovy/org/grails/web/codecs/Base64CodecTests.groovy diff --git a/grails-codecs/src/test/groovy/org/grails/web/codecs/HexCodecTests.groovy b/grace-codecs/src/test/groovy/org/grails/web/codecs/HexCodecTests.groovy similarity index 100% rename from grails-codecs/src/test/groovy/org/grails/web/codecs/HexCodecTests.groovy rename to grace-codecs/src/test/groovy/org/grails/web/codecs/HexCodecTests.groovy diff --git a/grails-codecs/src/test/groovy/org/grails/web/codecs/MD5BytesCodecTests.groovy b/grace-codecs/src/test/groovy/org/grails/web/codecs/MD5BytesCodecTests.groovy similarity index 100% rename from grails-codecs/src/test/groovy/org/grails/web/codecs/MD5BytesCodecTests.groovy rename to grace-codecs/src/test/groovy/org/grails/web/codecs/MD5BytesCodecTests.groovy diff --git a/grails-codecs/src/test/groovy/org/grails/web/codecs/MD5CodecTests.groovy b/grace-codecs/src/test/groovy/org/grails/web/codecs/MD5CodecTests.groovy similarity index 100% rename from grails-codecs/src/test/groovy/org/grails/web/codecs/MD5CodecTests.groovy rename to grace-codecs/src/test/groovy/org/grails/web/codecs/MD5CodecTests.groovy diff --git a/grails-codecs/src/test/groovy/org/grails/web/codecs/SHA1BytesCodecTests.groovy b/grace-codecs/src/test/groovy/org/grails/web/codecs/SHA1BytesCodecTests.groovy similarity index 100% rename from grails-codecs/src/test/groovy/org/grails/web/codecs/SHA1BytesCodecTests.groovy rename to grace-codecs/src/test/groovy/org/grails/web/codecs/SHA1BytesCodecTests.groovy diff --git a/grails-codecs/src/test/groovy/org/grails/web/codecs/SHA1CodecTests.groovy b/grace-codecs/src/test/groovy/org/grails/web/codecs/SHA1CodecTests.groovy similarity index 100% rename from grails-codecs/src/test/groovy/org/grails/web/codecs/SHA1CodecTests.groovy rename to grace-codecs/src/test/groovy/org/grails/web/codecs/SHA1CodecTests.groovy diff --git a/grails-codecs/src/test/groovy/org/grails/web/codecs/SHA256BytesCodec.groovy b/grace-codecs/src/test/groovy/org/grails/web/codecs/SHA256BytesCodec.groovy similarity index 100% rename from grails-codecs/src/test/groovy/org/grails/web/codecs/SHA256BytesCodec.groovy rename to grace-codecs/src/test/groovy/org/grails/web/codecs/SHA256BytesCodec.groovy diff --git a/grails-codecs/src/test/groovy/org/grails/web/codecs/SHA256CodecTests.groovy b/grace-codecs/src/test/groovy/org/grails/web/codecs/SHA256CodecTests.groovy similarity index 100% rename from grails-codecs/src/test/groovy/org/grails/web/codecs/SHA256CodecTests.groovy rename to grace-codecs/src/test/groovy/org/grails/web/codecs/SHA256CodecTests.groovy diff --git a/grails-console/README.md b/grace-console/README.md similarity index 84% rename from grails-console/README.md rename to grace-console/README.md index 80b17b9103..79dd4b2407 100644 --- a/grails-console/README.md +++ b/grace-console/README.md @@ -1,3 +1,3 @@ -## grails-console +## grace-console This subproject contains code to support the Grails console, Grails shell and Grails Swing console. diff --git a/grails-console/build.gradle b/grace-console/build.gradle similarity index 65% rename from grails-console/build.gradle rename to grace-console/build.gradle index fa44284387..14b04af62f 100644 --- a/grails-console/build.gradle +++ b/grace-console/build.gradle @@ -1,9 +1,9 @@ dependencies { - api project(":grails-api") - api project(":grails-boot") - api project(":grails-bootstrap") - api project(":grails-cli") - api project(":grails-core") + api project(":grace-api") + api project(":grace-boot") + api project(":grace-bootstrap") + api project(":grace-cli") + api project(":grace-core") api libs.javax.servlet, optional api libs.groovy.console diff --git a/grails-console/src/main/groovy/grails/ui/command/GrailsApplicationContextCommandRunner.groovy b/grace-console/src/main/groovy/grails/ui/command/GrailsApplicationContextCommandRunner.groovy similarity index 100% rename from grails-console/src/main/groovy/grails/ui/command/GrailsApplicationContextCommandRunner.groovy rename to grace-console/src/main/groovy/grails/ui/command/GrailsApplicationContextCommandRunner.groovy diff --git a/grails-console/src/main/groovy/grails/ui/console/GrailsSwingConsole.groovy b/grace-console/src/main/groovy/grails/ui/console/GrailsSwingConsole.groovy similarity index 100% rename from grails-console/src/main/groovy/grails/ui/console/GrailsSwingConsole.groovy rename to grace-console/src/main/groovy/grails/ui/console/GrailsSwingConsole.groovy diff --git a/grails-console/src/main/groovy/grails/ui/console/support/GroovyConsoleApplicationContext.groovy b/grace-console/src/main/groovy/grails/ui/console/support/GroovyConsoleApplicationContext.groovy similarity index 100% rename from grails-console/src/main/groovy/grails/ui/console/support/GroovyConsoleApplicationContext.groovy rename to grace-console/src/main/groovy/grails/ui/console/support/GroovyConsoleApplicationContext.groovy diff --git a/grails-console/src/main/groovy/grails/ui/console/support/GroovyConsoleWebApplicationContext.groovy b/grace-console/src/main/groovy/grails/ui/console/support/GroovyConsoleWebApplicationContext.groovy similarity index 100% rename from grails-console/src/main/groovy/grails/ui/console/support/GroovyConsoleWebApplicationContext.groovy rename to grace-console/src/main/groovy/grails/ui/console/support/GroovyConsoleWebApplicationContext.groovy diff --git a/grails-console/src/main/groovy/grails/ui/script/GrailsApplicationScriptRunner.groovy b/grace-console/src/main/groovy/grails/ui/script/GrailsApplicationScriptRunner.groovy similarity index 100% rename from grails-console/src/main/groovy/grails/ui/script/GrailsApplicationScriptRunner.groovy rename to grace-console/src/main/groovy/grails/ui/script/GrailsApplicationScriptRunner.groovy diff --git a/grails-console/src/main/groovy/grails/ui/shell/GrailsShell.groovy b/grace-console/src/main/groovy/grails/ui/shell/GrailsShell.groovy similarity index 100% rename from grails-console/src/main/groovy/grails/ui/shell/GrailsShell.groovy rename to grace-console/src/main/groovy/grails/ui/shell/GrailsShell.groovy diff --git a/grails-console/src/main/groovy/grails/ui/shell/support/GroovyshApplicationContext.groovy b/grace-console/src/main/groovy/grails/ui/shell/support/GroovyshApplicationContext.groovy similarity index 100% rename from grails-console/src/main/groovy/grails/ui/shell/support/GroovyshApplicationContext.groovy rename to grace-console/src/main/groovy/grails/ui/shell/support/GroovyshApplicationContext.groovy diff --git a/grails-console/src/main/groovy/grails/ui/shell/support/GroovyshWebApplicationContext.groovy b/grace-console/src/main/groovy/grails/ui/shell/support/GroovyshWebApplicationContext.groovy similarity index 100% rename from grails-console/src/main/groovy/grails/ui/shell/support/GroovyshWebApplicationContext.groovy rename to grace-console/src/main/groovy/grails/ui/shell/support/GroovyshWebApplicationContext.groovy diff --git a/grails-console/src/main/groovy/grails/ui/support/DevelopmentGrailsApplication.groovy b/grace-console/src/main/groovy/grails/ui/support/DevelopmentGrailsApplication.groovy similarity index 100% rename from grails-console/src/main/groovy/grails/ui/support/DevelopmentGrailsApplication.groovy rename to grace-console/src/main/groovy/grails/ui/support/DevelopmentGrailsApplication.groovy diff --git a/grails-console/src/main/groovy/grails/ui/support/DevelopmentWebApplicationContext.groovy b/grace-console/src/main/groovy/grails/ui/support/DevelopmentWebApplicationContext.groovy similarity index 100% rename from grails-console/src/main/groovy/grails/ui/support/DevelopmentWebApplicationContext.groovy rename to grace-console/src/main/groovy/grails/ui/support/DevelopmentWebApplicationContext.groovy diff --git a/grails-core/README.md b/grace-core/README.md similarity index 89% rename from grails-core/README.md rename to grace-core/README.md index 7bf8711806..c5488e4a42 100644 --- a/grails-core/README.md +++ b/grace-core/README.md @@ -1,3 +1,3 @@ -## grails-core +## grace-core This subproject contains much of the code for the core of Grails and common code referenced from many places in the project. diff --git a/grails-core/build.gradle b/grace-core/build.gradle similarity index 76% rename from grails-core/build.gradle rename to grace-core/build.gradle index 48e1c82a9a..d46a725430 100644 --- a/grails-core/build.gradle +++ b/grace-core/build.gradle @@ -1,9 +1,9 @@ dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-plugin-api") - api project(":grails-spring") - api project(":grails-util") + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-plugin-api") + api project(":grace-spring") + api project(":grace-util") api libs.grails.datastore.core api libs.spring.beans @@ -13,7 +13,7 @@ dependencies { api libs.spring.tx compileOnly libs.micronaut.spring.context - testImplementation project(":grails-test") + testImplementation project(":grace-test") testImplementation libs.spring.jdbc testImplementation libs.spring.test } diff --git a/grails-core/src/main/groovy/grails/compiler/DelegatingMethod.groovy b/grace-core/src/main/groovy/grails/compiler/DelegatingMethod.groovy similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/DelegatingMethod.groovy rename to grace-core/src/main/groovy/grails/compiler/DelegatingMethod.groovy diff --git a/grails-core/src/main/groovy/grails/compiler/GrailsCompileStatic.groovy b/grace-core/src/main/groovy/grails/compiler/GrailsCompileStatic.groovy similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/GrailsCompileStatic.groovy rename to grace-core/src/main/groovy/grails/compiler/GrailsCompileStatic.groovy diff --git a/grails-core/src/main/groovy/grails/compiler/GrailsTypeChecked.groovy b/grace-core/src/main/groovy/grails/compiler/GrailsTypeChecked.groovy similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/GrailsTypeChecked.groovy rename to grace-core/src/main/groovy/grails/compiler/GrailsTypeChecked.groovy diff --git a/grails-core/src/main/groovy/grails/compiler/ast/AllArtefactClassInjector.java b/grace-core/src/main/groovy/grails/compiler/ast/AllArtefactClassInjector.java similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/ast/AllArtefactClassInjector.java rename to grace-core/src/main/groovy/grails/compiler/ast/AllArtefactClassInjector.java diff --git a/grails-core/src/main/groovy/grails/compiler/ast/AnnotatedClassInjector.java b/grace-core/src/main/groovy/grails/compiler/ast/AnnotatedClassInjector.java similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/ast/AnnotatedClassInjector.java rename to grace-core/src/main/groovy/grails/compiler/ast/AnnotatedClassInjector.java diff --git a/grails-core/src/main/groovy/grails/compiler/ast/AstTransformer.java b/grace-core/src/main/groovy/grails/compiler/ast/AstTransformer.java similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/ast/AstTransformer.java rename to grace-core/src/main/groovy/grails/compiler/ast/AstTransformer.java diff --git a/grails-core/src/main/groovy/grails/compiler/ast/ClassInjector.java b/grace-core/src/main/groovy/grails/compiler/ast/ClassInjector.java similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/ast/ClassInjector.java rename to grace-core/src/main/groovy/grails/compiler/ast/ClassInjector.java diff --git a/grails-core/src/main/groovy/grails/compiler/ast/GlobalClassInjector.groovy b/grace-core/src/main/groovy/grails/compiler/ast/GlobalClassInjector.groovy similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/ast/GlobalClassInjector.groovy rename to grace-core/src/main/groovy/grails/compiler/ast/GlobalClassInjector.groovy diff --git a/grails-core/src/main/groovy/grails/compiler/ast/GlobalClassInjectorAdapter.groovy b/grace-core/src/main/groovy/grails/compiler/ast/GlobalClassInjectorAdapter.groovy similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/ast/GlobalClassInjectorAdapter.groovy rename to grace-core/src/main/groovy/grails/compiler/ast/GlobalClassInjectorAdapter.groovy diff --git a/grails-core/src/main/groovy/grails/compiler/ast/GrailsArtefactClassInjector.java b/grace-core/src/main/groovy/grails/compiler/ast/GrailsArtefactClassInjector.java similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/ast/GrailsArtefactClassInjector.java rename to grace-core/src/main/groovy/grails/compiler/ast/GrailsArtefactClassInjector.java diff --git a/grails-core/src/main/groovy/grails/compiler/ast/GrailsDomainClassInjector.java b/grace-core/src/main/groovy/grails/compiler/ast/GrailsDomainClassInjector.java similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/ast/GrailsDomainClassInjector.java rename to grace-core/src/main/groovy/grails/compiler/ast/GrailsDomainClassInjector.java diff --git a/grails-core/src/main/groovy/grails/compiler/ast/GroovyPageInjector.java b/grace-core/src/main/groovy/grails/compiler/ast/GroovyPageInjector.java similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/ast/GroovyPageInjector.java rename to grace-core/src/main/groovy/grails/compiler/ast/GroovyPageInjector.java diff --git a/grails-core/src/main/groovy/grails/compiler/ast/SupportsClassNode.java b/grace-core/src/main/groovy/grails/compiler/ast/SupportsClassNode.java similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/ast/SupportsClassNode.java rename to grace-core/src/main/groovy/grails/compiler/ast/SupportsClassNode.java diff --git a/grails-core/src/main/groovy/grails/compiler/traits/TraitInjector.java b/grace-core/src/main/groovy/grails/compiler/traits/TraitInjector.java similarity index 100% rename from grails-core/src/main/groovy/grails/compiler/traits/TraitInjector.java rename to grace-core/src/main/groovy/grails/compiler/traits/TraitInjector.java diff --git a/grails-core/src/main/groovy/grails/core/DefaultGrailsApplication.java b/grace-core/src/main/groovy/grails/core/DefaultGrailsApplication.java similarity index 100% rename from grails-core/src/main/groovy/grails/core/DefaultGrailsApplication.java rename to grace-core/src/main/groovy/grails/core/DefaultGrailsApplication.java diff --git a/grails-core/src/main/groovy/grails/core/DefaultGrailsClass.java b/grace-core/src/main/groovy/grails/core/DefaultGrailsClass.java similarity index 100% rename from grails-core/src/main/groovy/grails/core/DefaultGrailsClass.java rename to grace-core/src/main/groovy/grails/core/DefaultGrailsClass.java diff --git a/grails-core/src/main/groovy/grails/core/GrailsControllerClass.java b/grace-core/src/main/groovy/grails/core/GrailsControllerClass.java similarity index 100% rename from grails-core/src/main/groovy/grails/core/GrailsControllerClass.java rename to grace-core/src/main/groovy/grails/core/GrailsControllerClass.java diff --git a/grails-core/src/main/groovy/grails/core/GrailsDataSource.java b/grace-core/src/main/groovy/grails/core/GrailsDataSource.java similarity index 100% rename from grails-core/src/main/groovy/grails/core/GrailsDataSource.java rename to grace-core/src/main/groovy/grails/core/GrailsDataSource.java diff --git a/grails-core/src/main/groovy/grails/core/GrailsDomainClass.java b/grace-core/src/main/groovy/grails/core/GrailsDomainClass.java similarity index 100% rename from grails-core/src/main/groovy/grails/core/GrailsDomainClass.java rename to grace-core/src/main/groovy/grails/core/GrailsDomainClass.java diff --git a/grails-core/src/main/groovy/grails/core/GrailsServiceClass.java b/grace-core/src/main/groovy/grails/core/GrailsServiceClass.java similarity index 100% rename from grails-core/src/main/groovy/grails/core/GrailsServiceClass.java rename to grace-core/src/main/groovy/grails/core/GrailsServiceClass.java diff --git a/grails-core/src/main/groovy/grails/core/GrailsUrlMappingsClass.java b/grace-core/src/main/groovy/grails/core/GrailsUrlMappingsClass.java similarity index 100% rename from grails-core/src/main/groovy/grails/core/GrailsUrlMappingsClass.java rename to grace-core/src/main/groovy/grails/core/GrailsUrlMappingsClass.java diff --git a/grails-core/src/main/groovy/grails/core/events/ArtefactAdditionEvent.groovy b/grace-core/src/main/groovy/grails/core/events/ArtefactAdditionEvent.groovy similarity index 100% rename from grails-core/src/main/groovy/grails/core/events/ArtefactAdditionEvent.groovy rename to grace-core/src/main/groovy/grails/core/events/ArtefactAdditionEvent.groovy diff --git a/grails-core/src/main/groovy/grails/persistence/Entity.java b/grace-core/src/main/groovy/grails/persistence/Entity.java similarity index 100% rename from grails-core/src/main/groovy/grails/persistence/Entity.java rename to grace-core/src/main/groovy/grails/persistence/Entity.java diff --git a/grails-core/src/main/groovy/grails/persistence/Event.java b/grace-core/src/main/groovy/grails/persistence/Event.java similarity index 100% rename from grails-core/src/main/groovy/grails/persistence/Event.java rename to grace-core/src/main/groovy/grails/persistence/Event.java diff --git a/grails-core/src/main/groovy/grails/persistence/PersistenceMethod.java b/grace-core/src/main/groovy/grails/persistence/PersistenceMethod.java similarity index 100% rename from grails-core/src/main/groovy/grails/persistence/PersistenceMethod.java rename to grace-core/src/main/groovy/grails/persistence/PersistenceMethod.java diff --git a/grails-core/src/main/groovy/grails/persistence/support/NullPersistentContextInterceptor.java b/grace-core/src/main/groovy/grails/persistence/support/NullPersistentContextInterceptor.java similarity index 100% rename from grails-core/src/main/groovy/grails/persistence/support/NullPersistentContextInterceptor.java rename to grace-core/src/main/groovy/grails/persistence/support/NullPersistentContextInterceptor.java diff --git a/grails-core/src/main/groovy/grails/persistence/support/PersistenceContextInterceptor.java b/grace-core/src/main/groovy/grails/persistence/support/PersistenceContextInterceptor.java similarity index 100% rename from grails-core/src/main/groovy/grails/persistence/support/PersistenceContextInterceptor.java rename to grace-core/src/main/groovy/grails/persistence/support/PersistenceContextInterceptor.java diff --git a/grails-core/src/main/groovy/grails/persistence/support/PersistenceContextInterceptorExecutor.groovy b/grace-core/src/main/groovy/grails/persistence/support/PersistenceContextInterceptorExecutor.groovy similarity index 100% rename from grails-core/src/main/groovy/grails/persistence/support/PersistenceContextInterceptorExecutor.groovy rename to grace-core/src/main/groovy/grails/persistence/support/PersistenceContextInterceptorExecutor.groovy diff --git a/grails-core/src/main/groovy/grails/transaction/TransactionManagerAware.java b/grace-core/src/main/groovy/grails/transaction/TransactionManagerAware.java similarity index 100% rename from grails-core/src/main/groovy/grails/transaction/TransactionManagerAware.java rename to grace-core/src/main/groovy/grails/transaction/TransactionManagerAware.java diff --git a/grails-core/src/main/groovy/grails/util/Holders.java b/grace-core/src/main/groovy/grails/util/Holders.java similarity index 100% rename from grails-core/src/main/groovy/grails/util/Holders.java rename to grace-core/src/main/groovy/grails/util/Holders.java diff --git a/grails-core/src/main/groovy/grails/validation/Constrained.java b/grace-core/src/main/groovy/grails/validation/Constrained.java similarity index 100% rename from grails-core/src/main/groovy/grails/validation/Constrained.java rename to grace-core/src/main/groovy/grails/validation/Constrained.java diff --git a/grails-core/src/main/groovy/grails/validation/ConstraintsEvaluator.java b/grace-core/src/main/groovy/grails/validation/ConstraintsEvaluator.java similarity index 100% rename from grails-core/src/main/groovy/grails/validation/ConstraintsEvaluator.java rename to grace-core/src/main/groovy/grails/validation/ConstraintsEvaluator.java diff --git a/grails-core/src/main/groovy/grails/validation/DeferredBindingActions.java b/grace-core/src/main/groovy/grails/validation/DeferredBindingActions.java similarity index 100% rename from grails-core/src/main/groovy/grails/validation/DeferredBindingActions.java rename to grace-core/src/main/groovy/grails/validation/DeferredBindingActions.java diff --git a/grails-core/src/main/groovy/grails/validation/ValidationErrors.groovy b/grace-core/src/main/groovy/grails/validation/ValidationErrors.groovy similarity index 100% rename from grails-core/src/main/groovy/grails/validation/ValidationErrors.groovy rename to grace-core/src/main/groovy/grails/validation/ValidationErrors.groovy diff --git a/grails-core/src/main/groovy/grails/validation/ValidationException.java b/grace-core/src/main/groovy/grails/validation/ValidationException.java similarity index 100% rename from grails-core/src/main/groovy/grails/validation/ValidationException.java rename to grace-core/src/main/groovy/grails/validation/ValidationException.java diff --git a/grails-core/src/main/groovy/grails/web/Action.java b/grace-core/src/main/groovy/grails/web/Action.java similarity index 100% rename from grails-core/src/main/groovy/grails/web/Action.java rename to grace-core/src/main/groovy/grails/web/Action.java diff --git a/grails-core/src/main/groovy/grails/web/CamelCaseUrlConverter.java b/grace-core/src/main/groovy/grails/web/CamelCaseUrlConverter.java similarity index 100% rename from grails-core/src/main/groovy/grails/web/CamelCaseUrlConverter.java rename to grace-core/src/main/groovy/grails/web/CamelCaseUrlConverter.java diff --git a/grails-core/src/main/groovy/grails/web/HyphenatedUrlConverter.java b/grace-core/src/main/groovy/grails/web/HyphenatedUrlConverter.java similarity index 100% rename from grails-core/src/main/groovy/grails/web/HyphenatedUrlConverter.java rename to grace-core/src/main/groovy/grails/web/HyphenatedUrlConverter.java diff --git a/grails-core/src/main/groovy/grails/web/UrlConverter.java b/grace-core/src/main/groovy/grails/web/UrlConverter.java similarity index 100% rename from grails-core/src/main/groovy/grails/web/UrlConverter.java rename to grace-core/src/main/groovy/grails/web/UrlConverter.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/CriteriaTypeCheckingExtension.groovy b/grace-core/src/main/groovy/org/grails/compiler/CriteriaTypeCheckingExtension.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/CriteriaTypeCheckingExtension.groovy rename to grace-core/src/main/groovy/org/grails/compiler/CriteriaTypeCheckingExtension.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/DomainMappingTypeCheckingExtension.groovy b/grace-core/src/main/groovy/org/grails/compiler/DomainMappingTypeCheckingExtension.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/DomainMappingTypeCheckingExtension.groovy rename to grace-core/src/main/groovy/org/grails/compiler/DomainMappingTypeCheckingExtension.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/DynamicFinderTypeCheckingExtension.groovy b/grace-core/src/main/groovy/org/grails/compiler/DynamicFinderTypeCheckingExtension.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/DynamicFinderTypeCheckingExtension.groovy rename to grace-core/src/main/groovy/org/grails/compiler/DynamicFinderTypeCheckingExtension.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/HttpServletRequestTypeCheckingExtension.groovy b/grace-core/src/main/groovy/org/grails/compiler/HttpServletRequestTypeCheckingExtension.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/HttpServletRequestTypeCheckingExtension.groovy rename to grace-core/src/main/groovy/org/grails/compiler/HttpServletRequestTypeCheckingExtension.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/NamedQueryTypeCheckingExtension.groovy b/grace-core/src/main/groovy/org/grails/compiler/NamedQueryTypeCheckingExtension.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/NamedQueryTypeCheckingExtension.groovy rename to grace-core/src/main/groovy/org/grails/compiler/NamedQueryTypeCheckingExtension.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/RelationshipManagementMethodTypeCheckingExtension.groovy b/grace-core/src/main/groovy/org/grails/compiler/RelationshipManagementMethodTypeCheckingExtension.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/RelationshipManagementMethodTypeCheckingExtension.groovy rename to grace-core/src/main/groovy/org/grails/compiler/RelationshipManagementMethodTypeCheckingExtension.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/ValidateableTypeCheckingExtension.groovy b/grace-core/src/main/groovy/org/grails/compiler/ValidateableTypeCheckingExtension.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/ValidateableTypeCheckingExtension.groovy rename to grace-core/src/main/groovy/org/grails/compiler/ValidateableTypeCheckingExtension.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/WhereQueryTypeCheckingExtension.groovy b/grace-core/src/main/groovy/org/grails/compiler/WhereQueryTypeCheckingExtension.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/WhereQueryTypeCheckingExtension.groovy rename to grace-core/src/main/groovy/org/grails/compiler/WhereQueryTypeCheckingExtension.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/ASTErrorsHelper.java b/grace-core/src/main/groovy/org/grails/compiler/injection/ASTErrorsHelper.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/ASTErrorsHelper.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/ASTErrorsHelper.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/ASTValidationErrorsHelper.java b/grace-core/src/main/groovy/org/grails/compiler/injection/ASTValidationErrorsHelper.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/ASTValidationErrorsHelper.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/ASTValidationErrorsHelper.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/AbstractArtefactTypeAstTransformation.java b/grace-core/src/main/groovy/org/grails/compiler/injection/AbstractArtefactTypeAstTransformation.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/AbstractArtefactTypeAstTransformation.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/AbstractArtefactTypeAstTransformation.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/AbstractGrailsArtefactTransformer.java b/grace-core/src/main/groovy/org/grails/compiler/injection/AbstractGrailsArtefactTransformer.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/AbstractGrailsArtefactTransformer.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/AbstractGrailsArtefactTransformer.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/ApiDelegateTransformation.java b/grace-core/src/main/groovy/org/grails/compiler/injection/ApiDelegateTransformation.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/ApiDelegateTransformation.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/ApiDelegateTransformation.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/ApplicationClassInjector.groovy b/grace-core/src/main/groovy/org/grails/compiler/injection/ApplicationClassInjector.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/ApplicationClassInjector.groovy rename to grace-core/src/main/groovy/org/grails/compiler/injection/ApplicationClassInjector.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformation.java b/grace-core/src/main/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformation.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformation.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformation.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/DefaultGrailsDomainClassInjector.java b/grace-core/src/main/groovy/org/grails/compiler/injection/DefaultGrailsDomainClassInjector.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/DefaultGrailsDomainClassInjector.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/DefaultGrailsDomainClassInjector.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/EnhancesTraitTransformation.groovy b/grace-core/src/main/groovy/org/grails/compiler/injection/EnhancesTraitTransformation.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/EnhancesTraitTransformation.groovy rename to grace-core/src/main/groovy/org/grails/compiler/injection/EnhancesTraitTransformation.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/EntityASTTransformation.java b/grace-core/src/main/groovy/org/grails/compiler/injection/EntityASTTransformation.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/EntityASTTransformation.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/EntityASTTransformation.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy b/grace-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy rename to grace-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsPluginTransformation.groovy b/grace-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsPluginTransformation.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsPluginTransformation.groovy rename to grace-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsPluginTransformation.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/GlobalImportTransformation.groovy b/grace-core/src/main/groovy/org/grails/compiler/injection/GlobalImportTransformation.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/GlobalImportTransformation.groovy rename to grace-core/src/main/groovy/org/grails/compiler/injection/GlobalImportTransformation.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsASTUtils.java b/grace-core/src/main/groovy/org/grails/compiler/injection/GrailsASTUtils.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/GrailsASTUtils.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/GrailsASTUtils.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareClassLoader.java b/grace-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareClassLoader.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareClassLoader.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareClassLoader.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareInjectionOperation.java b/grace-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareInjectionOperation.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareInjectionOperation.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareInjectionOperation.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/GroovyEclipseCompilationHelper.groovy b/grace-core/src/main/groovy/org/grails/compiler/injection/GroovyEclipseCompilationHelper.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/GroovyEclipseCompilationHelper.groovy rename to grace-core/src/main/groovy/org/grails/compiler/injection/GroovyEclipseCompilationHelper.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/MixinTransformation.java b/grace-core/src/main/groovy/org/grails/compiler/injection/MixinTransformation.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/MixinTransformation.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/MixinTransformation.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/NamedArtefactTypeAstTransformation.java b/grace-core/src/main/groovy/org/grails/compiler/injection/NamedArtefactTypeAstTransformation.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/NamedArtefactTypeAstTransformation.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/NamedArtefactTypeAstTransformation.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/PluginAstReader.java b/grace-core/src/main/groovy/org/grails/compiler/injection/PluginAstReader.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/PluginAstReader.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/PluginAstReader.java diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/TraitInjectionSupport.groovy b/grace-core/src/main/groovy/org/grails/compiler/injection/TraitInjectionSupport.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/TraitInjectionSupport.groovy rename to grace-core/src/main/groovy/org/grails/compiler/injection/TraitInjectionSupport.groovy diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/TraitInjectionUtils.java b/grace-core/src/main/groovy/org/grails/compiler/injection/TraitInjectionUtils.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/compiler/injection/TraitInjectionUtils.java rename to grace-core/src/main/groovy/org/grails/compiler/injection/TraitInjectionUtils.java diff --git a/grails-core/src/main/groovy/org/grails/core/AbstractGrailsApplication.java b/grace-core/src/main/groovy/org/grails/core/AbstractGrailsApplication.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/AbstractGrailsApplication.java rename to grace-core/src/main/groovy/org/grails/core/AbstractGrailsApplication.java diff --git a/grails-core/src/main/groovy/org/grails/core/DefaultGrailsControllerClass.java b/grace-core/src/main/groovy/org/grails/core/DefaultGrailsControllerClass.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/DefaultGrailsControllerClass.java rename to grace-core/src/main/groovy/org/grails/core/DefaultGrailsControllerClass.java diff --git a/grails-core/src/main/groovy/org/grails/core/DefaultGrailsDomainClass.java b/grace-core/src/main/groovy/org/grails/core/DefaultGrailsDomainClass.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/DefaultGrailsDomainClass.java rename to grace-core/src/main/groovy/org/grails/core/DefaultGrailsDomainClass.java diff --git a/grails-core/src/main/groovy/org/grails/core/DefaultGrailsServiceClass.java b/grace-core/src/main/groovy/org/grails/core/DefaultGrailsServiceClass.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/DefaultGrailsServiceClass.java rename to grace-core/src/main/groovy/org/grails/core/DefaultGrailsServiceClass.java diff --git a/grails-core/src/main/groovy/org/grails/core/DefaultGrailsUrlMappingsClass.java b/grace-core/src/main/groovy/org/grails/core/DefaultGrailsUrlMappingsClass.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/DefaultGrailsUrlMappingsClass.java rename to grace-core/src/main/groovy/org/grails/core/DefaultGrailsUrlMappingsClass.java diff --git a/grails-core/src/main/groovy/org/grails/core/artefact/AnnotationDomainClassArtefactHandler.java b/grace-core/src/main/groovy/org/grails/core/artefact/AnnotationDomainClassArtefactHandler.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/artefact/AnnotationDomainClassArtefactHandler.java rename to grace-core/src/main/groovy/org/grails/core/artefact/AnnotationDomainClassArtefactHandler.java diff --git a/grails-core/src/main/groovy/org/grails/core/artefact/ApplicationArtefactHandler.groovy b/grace-core/src/main/groovy/org/grails/core/artefact/ApplicationArtefactHandler.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/artefact/ApplicationArtefactHandler.groovy rename to grace-core/src/main/groovy/org/grails/core/artefact/ApplicationArtefactHandler.groovy diff --git a/grails-core/src/main/groovy/org/grails/core/artefact/ControllerArtefactHandler.java b/grace-core/src/main/groovy/org/grails/core/artefact/ControllerArtefactHandler.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/artefact/ControllerArtefactHandler.java rename to grace-core/src/main/groovy/org/grails/core/artefact/ControllerArtefactHandler.java diff --git a/grails-core/src/main/groovy/org/grails/core/artefact/DomainClassArtefactHandler.java b/grace-core/src/main/groovy/org/grails/core/artefact/DomainClassArtefactHandler.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/artefact/DomainClassArtefactHandler.java rename to grace-core/src/main/groovy/org/grails/core/artefact/DomainClassArtefactHandler.java diff --git a/grails-core/src/main/groovy/org/grails/core/artefact/ServiceArtefactHandler.java b/grace-core/src/main/groovy/org/grails/core/artefact/ServiceArtefactHandler.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/artefact/ServiceArtefactHandler.java rename to grace-core/src/main/groovy/org/grails/core/artefact/ServiceArtefactHandler.java diff --git a/grails-core/src/main/groovy/org/grails/core/artefact/UrlMappingsArtefactHandler.java b/grace-core/src/main/groovy/org/grails/core/artefact/UrlMappingsArtefactHandler.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/artefact/UrlMappingsArtefactHandler.java rename to grace-core/src/main/groovy/org/grails/core/artefact/UrlMappingsArtefactHandler.java diff --git a/grails-core/src/main/groovy/org/grails/core/io/GrailsByteArrayResource.java b/grace-core/src/main/groovy/org/grails/core/io/GrailsByteArrayResource.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/io/GrailsByteArrayResource.java rename to grace-core/src/main/groovy/org/grails/core/io/GrailsByteArrayResource.java diff --git a/grails-core/src/main/groovy/org/grails/core/io/GrailsResource.groovy b/grace-core/src/main/groovy/org/grails/core/io/GrailsResource.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/io/GrailsResource.groovy rename to grace-core/src/main/groovy/org/grails/core/io/GrailsResource.groovy diff --git a/grails-core/src/main/groovy/org/grails/core/io/MockFileResource.java b/grace-core/src/main/groovy/org/grails/core/io/MockFileResource.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/io/MockFileResource.java rename to grace-core/src/main/groovy/org/grails/core/io/MockFileResource.java diff --git a/grails-core/src/main/groovy/org/grails/core/io/MockResourceLoader.java b/grace-core/src/main/groovy/org/grails/core/io/MockResourceLoader.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/io/MockResourceLoader.java rename to grace-core/src/main/groovy/org/grails/core/io/MockResourceLoader.java diff --git a/grails-core/src/main/groovy/org/grails/core/io/MockStringResourceLoader.java b/grace-core/src/main/groovy/org/grails/core/io/MockStringResourceLoader.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/io/MockStringResourceLoader.java rename to grace-core/src/main/groovy/org/grails/core/io/MockStringResourceLoader.java diff --git a/grails-core/src/main/groovy/org/grails/core/io/SimpleMapResourceLoader.java b/grace-core/src/main/groovy/org/grails/core/io/SimpleMapResourceLoader.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/io/SimpleMapResourceLoader.java rename to grace-core/src/main/groovy/org/grails/core/io/SimpleMapResourceLoader.java diff --git a/grails-core/src/main/groovy/org/grails/core/io/StaticResourceLocator.java b/grace-core/src/main/groovy/org/grails/core/io/StaticResourceLocator.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/io/StaticResourceLocator.java rename to grace-core/src/main/groovy/org/grails/core/io/StaticResourceLocator.java diff --git a/grails-core/src/main/groovy/org/grails/core/io/watch/PackagingException.java b/grace-core/src/main/groovy/org/grails/core/io/watch/PackagingException.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/io/watch/PackagingException.java rename to grace-core/src/main/groovy/org/grails/core/io/watch/PackagingException.java diff --git a/grails-core/src/main/groovy/org/grails/core/lifecycle/ShutdownOperations.java b/grace-core/src/main/groovy/org/grails/core/lifecycle/ShutdownOperations.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/lifecycle/ShutdownOperations.java rename to grace-core/src/main/groovy/org/grails/core/lifecycle/ShutdownOperations.java diff --git a/grails-core/src/main/groovy/org/grails/core/support/ClassLoaderAwareBeanPostProcessor.java b/grace-core/src/main/groovy/org/grails/core/support/ClassLoaderAwareBeanPostProcessor.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/support/ClassLoaderAwareBeanPostProcessor.java rename to grace-core/src/main/groovy/org/grails/core/support/ClassLoaderAwareBeanPostProcessor.java diff --git a/grails-core/src/main/groovy/org/grails/core/support/GrailsApplicationAwareBeanPostProcessor.java b/grace-core/src/main/groovy/org/grails/core/support/GrailsApplicationAwareBeanPostProcessor.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/support/GrailsApplicationAwareBeanPostProcessor.java rename to grace-core/src/main/groovy/org/grails/core/support/GrailsApplicationAwareBeanPostProcessor.java diff --git a/grails-core/src/main/groovy/org/grails/core/support/GrailsApplicationDiscoveryStrategy.groovy b/grace-core/src/main/groovy/org/grails/core/support/GrailsApplicationDiscoveryStrategy.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/core/support/GrailsApplicationDiscoveryStrategy.groovy rename to grace-core/src/main/groovy/org/grails/core/support/GrailsApplicationDiscoveryStrategy.groovy diff --git a/grails-core/src/main/groovy/org/grails/transaction/ChainedTransactionManager.java b/grace-core/src/main/groovy/org/grails/transaction/ChainedTransactionManager.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/transaction/ChainedTransactionManager.java rename to grace-core/src/main/groovy/org/grails/transaction/ChainedTransactionManager.java diff --git a/grails-core/src/main/groovy/org/grails/transaction/ChainedTransactionManagerPostProcessor.java b/grace-core/src/main/groovy/org/grails/transaction/ChainedTransactionManagerPostProcessor.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/transaction/ChainedTransactionManagerPostProcessor.java rename to grace-core/src/main/groovy/org/grails/transaction/ChainedTransactionManagerPostProcessor.java diff --git a/grails-core/src/main/groovy/org/grails/transaction/GrailsTransactionAttribute.java b/grace-core/src/main/groovy/org/grails/transaction/GrailsTransactionAttribute.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/transaction/GrailsTransactionAttribute.java rename to grace-core/src/main/groovy/org/grails/transaction/GrailsTransactionAttribute.java diff --git a/grails-core/src/main/groovy/org/grails/transaction/GroovyAwareNamedTransactionAttributeSource.java b/grace-core/src/main/groovy/org/grails/transaction/GroovyAwareNamedTransactionAttributeSource.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/transaction/GroovyAwareNamedTransactionAttributeSource.java rename to grace-core/src/main/groovy/org/grails/transaction/GroovyAwareNamedTransactionAttributeSource.java diff --git a/grails-core/src/main/groovy/org/grails/transaction/MultiTransactionStatus.java b/grace-core/src/main/groovy/org/grails/transaction/MultiTransactionStatus.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/transaction/MultiTransactionStatus.java rename to grace-core/src/main/groovy/org/grails/transaction/MultiTransactionStatus.java diff --git a/grails-core/src/main/groovy/org/grails/transaction/SpringTransactionSynchronizationManager.java b/grace-core/src/main/groovy/org/grails/transaction/SpringTransactionSynchronizationManager.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/transaction/SpringTransactionSynchronizationManager.java rename to grace-core/src/main/groovy/org/grails/transaction/SpringTransactionSynchronizationManager.java diff --git a/grails-core/src/main/groovy/org/grails/transaction/SynchronizationManager.java b/grace-core/src/main/groovy/org/grails/transaction/SynchronizationManager.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/transaction/SynchronizationManager.java rename to grace-core/src/main/groovy/org/grails/transaction/SynchronizationManager.java diff --git a/grails-core/src/main/groovy/org/grails/transaction/TransactionManagerPostProcessor.java b/grace-core/src/main/groovy/org/grails/transaction/TransactionManagerPostProcessor.java similarity index 100% rename from grails-core/src/main/groovy/org/grails/transaction/TransactionManagerPostProcessor.java rename to grace-core/src/main/groovy/org/grails/transaction/TransactionManagerPostProcessor.java diff --git a/grails-core/src/main/groovy/org/grails/validation/ConstraintEvalUtils.groovy b/grace-core/src/main/groovy/org/grails/validation/ConstraintEvalUtils.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/validation/ConstraintEvalUtils.groovy rename to grace-core/src/main/groovy/org/grails/validation/ConstraintEvalUtils.groovy diff --git a/grails-core/src/main/groovy/org/grails/validation/discovery/ConstrainedDiscovery.groovy b/grace-core/src/main/groovy/org/grails/validation/discovery/ConstrainedDiscovery.groovy similarity index 100% rename from grails-core/src/main/groovy/org/grails/validation/discovery/ConstrainedDiscovery.groovy rename to grace-core/src/main/groovy/org/grails/validation/discovery/ConstrainedDiscovery.groovy diff --git a/grails-core/src/main/resources/META-INF/grails.factories b/grace-core/src/main/resources/META-INF/grails.factories similarity index 100% rename from grails-core/src/main/resources/META-INF/grails.factories rename to grace-core/src/main/resources/META-INF/grails.factories diff --git a/grails-core/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation b/grace-core/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation similarity index 100% rename from grails-core/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation rename to grace-core/src/main/resources/META-INF/services/org.codehaus.groovy.transform.ASTTransformation diff --git a/grails-core/src/test/groovy/grails/artefact/ApiDelegateSpec.groovy b/grace-core/src/test/groovy/grails/artefact/ApiDelegateSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/grails/artefact/ApiDelegateSpec.groovy rename to grace-core/src/test/groovy/grails/artefact/ApiDelegateSpec.groovy diff --git a/grails-core/src/test/groovy/grails/artefact/EnhancesSpec.groovy b/grace-core/src/test/groovy/grails/artefact/EnhancesSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/grails/artefact/EnhancesSpec.groovy rename to grace-core/src/test/groovy/grails/artefact/EnhancesSpec.groovy diff --git a/grails-core/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerTests.java b/grace-core/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerTests.java similarity index 100% rename from grails-core/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerTests.java rename to grace-core/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerTests.java diff --git a/grails-core/src/test/groovy/grails/spring/GrailsPlaceHolderConfigurerCorePluginRuntimeSpec.groovy b/grace-core/src/test/groovy/grails/spring/GrailsPlaceHolderConfigurerCorePluginRuntimeSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/grails/spring/GrailsPlaceHolderConfigurerCorePluginRuntimeSpec.groovy rename to grace-core/src/test/groovy/grails/spring/GrailsPlaceHolderConfigurerCorePluginRuntimeSpec.groovy diff --git a/grails-core/src/test/groovy/grails/spring/GrailsPlaceholderConfigurerSpec.groovy b/grace-core/src/test/groovy/grails/spring/GrailsPlaceholderConfigurerSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/grails/spring/GrailsPlaceholderConfigurerSpec.groovy rename to grace-core/src/test/groovy/grails/spring/GrailsPlaceholderConfigurerSpec.groovy diff --git a/grails-core/src/test/groovy/grails/web/CamelCaseUrlConverterSpec.groovy b/grace-core/src/test/groovy/grails/web/CamelCaseUrlConverterSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/grails/web/CamelCaseUrlConverterSpec.groovy rename to grace-core/src/test/groovy/grails/web/CamelCaseUrlConverterSpec.groovy diff --git a/grails-core/src/test/groovy/grails/web/HyphenatedUrlConverterSpec.groovy b/grace-core/src/test/groovy/grails/web/HyphenatedUrlConverterSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/grails/web/HyphenatedUrlConverterSpec.groovy rename to grace-core/src/test/groovy/grails/web/HyphenatedUrlConverterSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/compiler/injection/ASTValidationErrorsHelperSpec.groovy b/grace-core/src/test/groovy/org/grails/compiler/injection/ASTValidationErrorsHelperSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/compiler/injection/ASTValidationErrorsHelperSpec.groovy rename to grace-core/src/test/groovy/org/grails/compiler/injection/ASTValidationErrorsHelperSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformationSpec.groovy b/grace-core/src/test/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformationSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformationSpec.groovy rename to grace-core/src/test/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformationSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/compiler/injection/DefaultDomainClassInjectorSpec.groovy b/grace-core/src/test/groovy/org/grails/compiler/injection/DefaultDomainClassInjectorSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/compiler/injection/DefaultDomainClassInjectorSpec.groovy rename to grace-core/src/test/groovy/org/grails/compiler/injection/DefaultDomainClassInjectorSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/compiler/injection/GlobalGrailsPluginTransformationSpec.groovy b/grace-core/src/test/groovy/org/grails/compiler/injection/GlobalGrailsPluginTransformationSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/compiler/injection/GlobalGrailsPluginTransformationSpec.groovy rename to grace-core/src/test/groovy/org/grails/compiler/injection/GlobalGrailsPluginTransformationSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/compiler/injection/GrailsASTUtilsSpec.groovy b/grace-core/src/test/groovy/org/grails/compiler/injection/GrailsASTUtilsSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/compiler/injection/GrailsASTUtilsSpec.groovy rename to grace-core/src/test/groovy/org/grails/compiler/injection/GrailsASTUtilsSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/compiler/injection/GrailsASTUtilsTests.groovy b/grace-core/src/test/groovy/org/grails/compiler/injection/GrailsASTUtilsTests.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/compiler/injection/GrailsASTUtilsTests.groovy rename to grace-core/src/test/groovy/org/grails/compiler/injection/GrailsASTUtilsTests.groovy diff --git a/grails-core/src/test/groovy/org/grails/compiler/injection/GrailsArtefactTransformerSpec.groovy b/grace-core/src/test/groovy/org/grails/compiler/injection/GrailsArtefactTransformerSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/compiler/injection/GrailsArtefactTransformerSpec.groovy rename to grace-core/src/test/groovy/org/grails/compiler/injection/GrailsArtefactTransformerSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/compiler/injection/PluginAstReaderSpec.groovy b/grace-core/src/test/groovy/org/grails/compiler/injection/PluginAstReaderSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/compiler/injection/PluginAstReaderSpec.groovy rename to grace-core/src/test/groovy/org/grails/compiler/injection/PluginAstReaderSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/config/NavigableMapNestedEqualitySpec.groovy b/grace-core/src/test/groovy/org/grails/config/NavigableMapNestedEqualitySpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/config/NavigableMapNestedEqualitySpec.groovy rename to grace-core/src/test/groovy/org/grails/config/NavigableMapNestedEqualitySpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/config/NavigableMapPropertySourceSpec.groovy b/grace-core/src/test/groovy/org/grails/config/NavigableMapPropertySourceSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/config/NavigableMapPropertySourceSpec.groovy rename to grace-core/src/test/groovy/org/grails/config/NavigableMapPropertySourceSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/config/NavigableMapSpringProfilesSpec.groovy b/grace-core/src/test/groovy/org/grails/config/NavigableMapSpringProfilesSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/config/NavigableMapSpringProfilesSpec.groovy rename to grace-core/src/test/groovy/org/grails/config/NavigableMapSpringProfilesSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/config/PropertyResolutionSpec.groovy b/grace-core/src/test/groovy/org/grails/config/PropertyResolutionSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/config/PropertyResolutionSpec.groovy rename to grace-core/src/test/groovy/org/grails/config/PropertyResolutionSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/config/PropertySourcesConfigSpec.groovy b/grace-core/src/test/groovy/org/grails/config/PropertySourcesConfigSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/config/PropertySourcesConfigSpec.groovy rename to grace-core/src/test/groovy/org/grails/config/PropertySourcesConfigSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/core/DefaultGrailsControllerClassSpec.groovy b/grace-core/src/test/groovy/org/grails/core/DefaultGrailsControllerClassSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/core/DefaultGrailsControllerClassSpec.groovy rename to grace-core/src/test/groovy/org/grails/core/DefaultGrailsControllerClassSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/core/cfg/GroovyConfigPropertySourceLoaderSpec.groovy b/grace-core/src/test/groovy/org/grails/core/cfg/GroovyConfigPropertySourceLoaderSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/core/cfg/GroovyConfigPropertySourceLoaderSpec.groovy rename to grace-core/src/test/groovy/org/grails/core/cfg/GroovyConfigPropertySourceLoaderSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/core/io/ResourceLocatorSpec.groovy b/grace-core/src/test/groovy/org/grails/core/io/ResourceLocatorSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/core/io/ResourceLocatorSpec.groovy rename to grace-core/src/test/groovy/org/grails/core/io/ResourceLocatorSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/core/support/internal/tools/ClassRelativeClassLoaderSpec.groovy b/grace-core/src/test/groovy/org/grails/core/support/internal/tools/ClassRelativeClassLoaderSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/core/support/internal/tools/ClassRelativeClassLoaderSpec.groovy rename to grace-core/src/test/groovy/org/grails/core/support/internal/tools/ClassRelativeClassLoaderSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/exception/reporting/StackTraceFiltererSpec.groovy b/grace-core/src/test/groovy/org/grails/exception/reporting/StackTraceFiltererSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/exception/reporting/StackTraceFiltererSpec.groovy rename to grace-core/src/test/groovy/org/grails/exception/reporting/StackTraceFiltererSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/exception/reporting/StackTracePrinterSpec.groovy b/grace-core/src/test/groovy/org/grails/exception/reporting/StackTracePrinterSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/exception/reporting/StackTracePrinterSpec.groovy rename to grace-core/src/test/groovy/org/grails/exception/reporting/StackTracePrinterSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/plugins/TestBinaryGrailsPlugin.groovy b/grace-core/src/test/groovy/org/grails/plugins/TestBinaryGrailsPlugin.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/plugins/TestBinaryGrailsPlugin.groovy rename to grace-core/src/test/groovy/org/grails/plugins/TestBinaryGrailsPlugin.groovy diff --git a/grails-core/src/test/groovy/org/grails/plugins/TestGrailsPlugin.groovy b/grace-core/src/test/groovy/org/grails/plugins/TestGrailsPlugin.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/plugins/TestGrailsPlugin.groovy rename to grace-core/src/test/groovy/org/grails/plugins/TestGrailsPlugin.groovy diff --git a/grails-core/src/test/groovy/org/grails/plugins/TestTwoGrailsPlugin.groovy b/grace-core/src/test/groovy/org/grails/plugins/TestTwoGrailsPlugin.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/plugins/TestTwoGrailsPlugin.groovy rename to grace-core/src/test/groovy/org/grails/plugins/TestTwoGrailsPlugin.groovy diff --git a/grails-core/src/test/groovy/org/grails/plugins/metadata/GrailsPluginMetadataTests.groovy b/grace-core/src/test/groovy/org/grails/plugins/metadata/GrailsPluginMetadataTests.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/plugins/metadata/GrailsPluginMetadataTests.groovy rename to grace-core/src/test/groovy/org/grails/plugins/metadata/GrailsPluginMetadataTests.groovy diff --git a/grails-core/src/test/groovy/org/grails/transaction/ChainedTransactionManagerPostProcessorSpec.groovy b/grace-core/src/test/groovy/org/grails/transaction/ChainedTransactionManagerPostProcessorSpec.groovy similarity index 100% rename from grails-core/src/test/groovy/org/grails/transaction/ChainedTransactionManagerPostProcessorSpec.groovy rename to grace-core/src/test/groovy/org/grails/transaction/ChainedTransactionManagerPostProcessorSpec.groovy diff --git a/grails-core/src/test/groovy/org/grails/transaction/ChainedTransactionManagerTests.java b/grace-core/src/test/groovy/org/grails/transaction/ChainedTransactionManagerTests.java similarity index 100% rename from grails-core/src/test/groovy/org/grails/transaction/ChainedTransactionManagerTests.java rename to grace-core/src/test/groovy/org/grails/transaction/ChainedTransactionManagerTests.java diff --git a/grails-core/src/test/resources/application.yml b/grace-core/src/test/resources/application.yml similarity index 100% rename from grails-core/src/test/resources/application.yml rename to grace-core/src/test/resources/application.yml diff --git a/grails-core/src/test/resources/builtin-config.groovy b/grace-core/src/test/resources/builtin-config.groovy similarity index 100% rename from grails-core/src/test/resources/builtin-config.groovy rename to grace-core/src/test/resources/builtin-config.groovy diff --git a/grails-core/src/test/resources/test-application.groovy b/grace-core/src/test/resources/test-application.groovy similarity index 100% rename from grails-core/src/test/resources/test-application.groovy rename to grace-core/src/test/resources/test-application.groovy diff --git a/grails-databinding/README.md b/grace-databinding/README.md similarity index 97% rename from grails-databinding/README.md rename to grace-databinding/README.md index 07e734f1ed..3f74aead9e 100644 --- a/grails-databinding/README.md +++ b/grace-databinding/README.md @@ -1,4 +1,4 @@ -## grails-databinding +## grace-databinding This subproject contains much of the core data binding code. The main class here is [SimpleDataBinder](./src/main/groovy/grails/databinding/SimpleDataBinder.groovy). Most of the other code diff --git a/grails-databinding/build.gradle b/grace-databinding/build.gradle similarity index 100% rename from grails-databinding/build.gradle rename to grace-databinding/build.gradle diff --git a/grails-databinding/src/main/groovy/grails/databinding/BindInitializer.java b/grace-databinding/src/main/groovy/grails/databinding/BindInitializer.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/BindInitializer.java rename to grace-databinding/src/main/groovy/grails/databinding/BindInitializer.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/BindUsing.java b/grace-databinding/src/main/groovy/grails/databinding/BindUsing.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/BindUsing.java rename to grace-databinding/src/main/groovy/grails/databinding/BindUsing.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/BindingFormat.java b/grace-databinding/src/main/groovy/grails/databinding/BindingFormat.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/BindingFormat.java rename to grace-databinding/src/main/groovy/grails/databinding/BindingFormat.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/BindingHelper.java b/grace-databinding/src/main/groovy/grails/databinding/BindingHelper.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/BindingHelper.java rename to grace-databinding/src/main/groovy/grails/databinding/BindingHelper.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/CollectionDataBindingSource.java b/grace-databinding/src/main/groovy/grails/databinding/CollectionDataBindingSource.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/CollectionDataBindingSource.java rename to grace-databinding/src/main/groovy/grails/databinding/CollectionDataBindingSource.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/DataBinder.java b/grace-databinding/src/main/groovy/grails/databinding/DataBinder.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/DataBinder.java rename to grace-databinding/src/main/groovy/grails/databinding/DataBinder.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/DataBindingSource.java b/grace-databinding/src/main/groovy/grails/databinding/DataBindingSource.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/DataBindingSource.java rename to grace-databinding/src/main/groovy/grails/databinding/DataBindingSource.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/SimpleDataBinder.groovy b/grace-databinding/src/main/groovy/grails/databinding/SimpleDataBinder.groovy similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/SimpleDataBinder.groovy rename to grace-databinding/src/main/groovy/grails/databinding/SimpleDataBinder.groovy diff --git a/grails-databinding/src/main/groovy/grails/databinding/SimpleMapDataBindingSource.groovy b/grace-databinding/src/main/groovy/grails/databinding/SimpleMapDataBindingSource.groovy similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/SimpleMapDataBindingSource.groovy rename to grace-databinding/src/main/groovy/grails/databinding/SimpleMapDataBindingSource.groovy diff --git a/grails-databinding/src/main/groovy/grails/databinding/StructuredBindingEditor.java b/grace-databinding/src/main/groovy/grails/databinding/StructuredBindingEditor.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/StructuredBindingEditor.java rename to grace-databinding/src/main/groovy/grails/databinding/StructuredBindingEditor.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/TypedStructuredBindingEditor.java b/grace-databinding/src/main/groovy/grails/databinding/TypedStructuredBindingEditor.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/TypedStructuredBindingEditor.java rename to grace-databinding/src/main/groovy/grails/databinding/TypedStructuredBindingEditor.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/converters/FormattedValueConverter.java b/grace-databinding/src/main/groovy/grails/databinding/converters/FormattedValueConverter.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/converters/FormattedValueConverter.java rename to grace-databinding/src/main/groovy/grails/databinding/converters/FormattedValueConverter.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/converters/ValueConverter.java b/grace-databinding/src/main/groovy/grails/databinding/converters/ValueConverter.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/converters/ValueConverter.java rename to grace-databinding/src/main/groovy/grails/databinding/converters/ValueConverter.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/errors/BindingError.java b/grace-databinding/src/main/groovy/grails/databinding/errors/BindingError.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/errors/BindingError.java rename to grace-databinding/src/main/groovy/grails/databinding/errors/BindingError.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/events/DataBindingListener.java b/grace-databinding/src/main/groovy/grails/databinding/events/DataBindingListener.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/events/DataBindingListener.java rename to grace-databinding/src/main/groovy/grails/databinding/events/DataBindingListener.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/events/DataBindingListenerAdapter.java b/grace-databinding/src/main/groovy/grails/databinding/events/DataBindingListenerAdapter.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/events/DataBindingListenerAdapter.java rename to grace-databinding/src/main/groovy/grails/databinding/events/DataBindingListenerAdapter.java diff --git a/grails-databinding/src/main/groovy/grails/databinding/initializers/ValueInitializer.java b/grace-databinding/src/main/groovy/grails/databinding/initializers/ValueInitializer.java similarity index 100% rename from grails-databinding/src/main/groovy/grails/databinding/initializers/ValueInitializer.java rename to grace-databinding/src/main/groovy/grails/databinding/initializers/ValueInitializer.java diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/ClosureValueConverter.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/ClosureValueConverter.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/ClosureValueConverter.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/ClosureValueConverter.groovy diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/ClosureValueInitializer.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/ClosureValueInitializer.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/ClosureValueInitializer.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/ClosureValueInitializer.groovy diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/IndexedPropertyReferenceDescriptor.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/IndexedPropertyReferenceDescriptor.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/IndexedPropertyReferenceDescriptor.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/IndexedPropertyReferenceDescriptor.groovy diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/compiler/BindingFormatASTTransformation.java b/grace-databinding/src/main/groovy/org/grails/databinding/compiler/BindingFormatASTTransformation.java similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/compiler/BindingFormatASTTransformation.java rename to grace-databinding/src/main/groovy/org/grails/databinding/compiler/BindingFormatASTTransformation.java diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/converters/AbstractStructuredDateBindingEditor.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/converters/AbstractStructuredDateBindingEditor.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/converters/AbstractStructuredDateBindingEditor.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/converters/AbstractStructuredDateBindingEditor.groovy diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/converters/ConversionService.java b/grace-databinding/src/main/groovy/org/grails/databinding/converters/ConversionService.java similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/converters/ConversionService.java rename to grace-databinding/src/main/groovy/org/grails/databinding/converters/ConversionService.java diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/converters/CurrencyValueConverter.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/converters/CurrencyValueConverter.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/converters/CurrencyValueConverter.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/converters/CurrencyValueConverter.groovy diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/converters/DateConversionHelper.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/converters/DateConversionHelper.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/converters/DateConversionHelper.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/converters/DateConversionHelper.groovy diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/converters/FormattedDateValueConverter.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/converters/FormattedDateValueConverter.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/converters/FormattedDateValueConverter.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/converters/FormattedDateValueConverter.groovy diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/converters/StructuredCalendarBindingEditor.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/converters/StructuredCalendarBindingEditor.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/converters/StructuredCalendarBindingEditor.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/converters/StructuredCalendarBindingEditor.groovy diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/converters/StructuredDateBindingEditor.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/converters/StructuredDateBindingEditor.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/converters/StructuredDateBindingEditor.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/converters/StructuredDateBindingEditor.groovy diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/converters/StructuredSqlDateBindingEditor.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/converters/StructuredSqlDateBindingEditor.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/converters/StructuredSqlDateBindingEditor.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/converters/StructuredSqlDateBindingEditor.groovy diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/converters/TimeZoneConverter.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/converters/TimeZoneConverter.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/converters/TimeZoneConverter.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/converters/TimeZoneConverter.groovy diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/converters/UUIDConverter.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/converters/UUIDConverter.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/converters/UUIDConverter.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/converters/UUIDConverter.groovy diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/errors/SimpleBindingError.java b/grace-databinding/src/main/groovy/org/grails/databinding/errors/SimpleBindingError.java similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/errors/SimpleBindingError.java rename to grace-databinding/src/main/groovy/org/grails/databinding/errors/SimpleBindingError.java diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/xml/GPathResultCollectionDataBindingSource.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/xml/GPathResultCollectionDataBindingSource.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/xml/GPathResultCollectionDataBindingSource.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/xml/GPathResultCollectionDataBindingSource.groovy diff --git a/grails-databinding/src/main/groovy/org/grails/databinding/xml/GPathResultMap.groovy b/grace-databinding/src/main/groovy/org/grails/databinding/xml/GPathResultMap.groovy similarity index 100% rename from grails-databinding/src/main/groovy/org/grails/databinding/xml/GPathResultMap.groovy rename to grace-databinding/src/main/groovy/org/grails/databinding/xml/GPathResultMap.groovy diff --git a/grails-databinding/src/test/groovy/grails/databinding/BindInitializerSpec.groovy b/grace-databinding/src/test/groovy/grails/databinding/BindInitializerSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/grails/databinding/BindInitializerSpec.groovy rename to grace-databinding/src/test/groovy/grails/databinding/BindInitializerSpec.groovy diff --git a/grails-databinding/src/test/groovy/grails/databinding/BindUsingSpec.groovy b/grace-databinding/src/test/groovy/grails/databinding/BindUsingSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/grails/databinding/BindUsingSpec.groovy rename to grace-databinding/src/test/groovy/grails/databinding/BindUsingSpec.groovy diff --git a/grails-databinding/src/test/groovy/grails/databinding/BindingErrorSpec.groovy b/grace-databinding/src/test/groovy/grails/databinding/BindingErrorSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/grails/databinding/BindingErrorSpec.groovy rename to grace-databinding/src/test/groovy/grails/databinding/BindingErrorSpec.groovy diff --git a/grails-databinding/src/test/groovy/grails/databinding/BindingFormatSpec.groovy b/grace-databinding/src/test/groovy/grails/databinding/BindingFormatSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/grails/databinding/BindingFormatSpec.groovy rename to grace-databinding/src/test/groovy/grails/databinding/BindingFormatSpec.groovy diff --git a/grails-databinding/src/test/groovy/grails/databinding/BindingListenerSpec.groovy b/grace-databinding/src/test/groovy/grails/databinding/BindingListenerSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/grails/databinding/BindingListenerSpec.groovy rename to grace-databinding/src/test/groovy/grails/databinding/BindingListenerSpec.groovy diff --git a/grails-databinding/src/test/groovy/grails/databinding/CollectionBindingSpec.groovy b/grace-databinding/src/test/groovy/grails/databinding/CollectionBindingSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/grails/databinding/CollectionBindingSpec.groovy rename to grace-databinding/src/test/groovy/grails/databinding/CollectionBindingSpec.groovy diff --git a/grails-databinding/src/test/groovy/grails/databinding/CustomTypeConverterSpec.groovy b/grace-databinding/src/test/groovy/grails/databinding/CustomTypeConverterSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/grails/databinding/CustomTypeConverterSpec.groovy rename to grace-databinding/src/test/groovy/grails/databinding/CustomTypeConverterSpec.groovy diff --git a/grails-databinding/src/test/groovy/grails/databinding/IncludeExcludeBindingSpec.groovy b/grace-databinding/src/test/groovy/grails/databinding/IncludeExcludeBindingSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/grails/databinding/IncludeExcludeBindingSpec.groovy rename to grace-databinding/src/test/groovy/grails/databinding/IncludeExcludeBindingSpec.groovy diff --git a/grails-databinding/src/test/groovy/grails/databinding/SimpleDataBinderEnumBindingSpec.groovy b/grace-databinding/src/test/groovy/grails/databinding/SimpleDataBinderEnumBindingSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/grails/databinding/SimpleDataBinderEnumBindingSpec.groovy rename to grace-databinding/src/test/groovy/grails/databinding/SimpleDataBinderEnumBindingSpec.groovy diff --git a/grails-databinding/src/test/groovy/grails/databinding/SimpleDataBinderEnumValueConverterSpec.groovy b/grace-databinding/src/test/groovy/grails/databinding/SimpleDataBinderEnumValueConverterSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/grails/databinding/SimpleDataBinderEnumValueConverterSpec.groovy rename to grace-databinding/src/test/groovy/grails/databinding/SimpleDataBinderEnumValueConverterSpec.groovy diff --git a/grails-databinding/src/test/groovy/grails/databinding/SimpleDataBinderSpec.groovy b/grace-databinding/src/test/groovy/grails/databinding/SimpleDataBinderSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/grails/databinding/SimpleDataBinderSpec.groovy rename to grace-databinding/src/test/groovy/grails/databinding/SimpleDataBinderSpec.groovy diff --git a/grails-databinding/src/test/groovy/grails/databinding/XMLBindingSpec.groovy b/grace-databinding/src/test/groovy/grails/databinding/XMLBindingSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/grails/databinding/XMLBindingSpec.groovy rename to grace-databinding/src/test/groovy/grails/databinding/XMLBindingSpec.groovy diff --git a/grails-databinding/src/test/groovy/org/grails/databinding/compiler/BindingFormatCompilationErrorsSpec.groovy b/grace-databinding/src/test/groovy/org/grails/databinding/compiler/BindingFormatCompilationErrorsSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/org/grails/databinding/compiler/BindingFormatCompilationErrorsSpec.groovy rename to grace-databinding/src/test/groovy/org/grails/databinding/compiler/BindingFormatCompilationErrorsSpec.groovy diff --git a/grails-databinding/src/test/groovy/org/grails/databinding/converters/CurrencyConversionSpec.groovy b/grace-databinding/src/test/groovy/org/grails/databinding/converters/CurrencyConversionSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/org/grails/databinding/converters/CurrencyConversionSpec.groovy rename to grace-databinding/src/test/groovy/org/grails/databinding/converters/CurrencyConversionSpec.groovy diff --git a/grails-databinding/src/test/groovy/org/grails/databinding/converters/DateConversionHelperSpec.groovy b/grace-databinding/src/test/groovy/org/grails/databinding/converters/DateConversionHelperSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/org/grails/databinding/converters/DateConversionHelperSpec.groovy rename to grace-databinding/src/test/groovy/org/grails/databinding/converters/DateConversionHelperSpec.groovy diff --git a/grails-databinding/src/test/groovy/org/grails/databinding/converters/UUIDConversionSpec.groovy b/grace-databinding/src/test/groovy/org/grails/databinding/converters/UUIDConversionSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/org/grails/databinding/converters/UUIDConversionSpec.groovy rename to grace-databinding/src/test/groovy/org/grails/databinding/converters/UUIDConversionSpec.groovy diff --git a/grails-databinding/src/test/groovy/org/grails/databinding/xml/GPathCollectionDataBindingSourceSpec.groovy b/grace-databinding/src/test/groovy/org/grails/databinding/xml/GPathCollectionDataBindingSourceSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/org/grails/databinding/xml/GPathCollectionDataBindingSourceSpec.groovy rename to grace-databinding/src/test/groovy/org/grails/databinding/xml/GPathCollectionDataBindingSourceSpec.groovy diff --git a/grails-databinding/src/test/groovy/org/grails/databinding/xml/GPathResultMapSpec.groovy b/grace-databinding/src/test/groovy/org/grails/databinding/xml/GPathResultMapSpec.groovy similarity index 100% rename from grails-databinding/src/test/groovy/org/grails/databinding/xml/GPathResultMapSpec.groovy rename to grace-databinding/src/test/groovy/org/grails/databinding/xml/GPathResultMapSpec.groovy diff --git a/grace-dependencies/README.md b/grace-dependencies/README.md new file mode 100644 index 0000000000..ab7da503d5 --- /dev/null +++ b/grace-dependencies/README.md @@ -0,0 +1,2 @@ +## grace-dependencies + diff --git a/grails-dependencies/build.gradle b/grace-dependencies/build.gradle similarity index 58% rename from grails-dependencies/build.gradle rename to grace-dependencies/build.gradle index 1779b2e52c..d3b7d779bb 100644 --- a/grails-dependencies/build.gradle +++ b/grace-dependencies/build.gradle @@ -7,29 +7,46 @@ publishing { pom.withXml { def xml = asNode() - xml.children().last() + pomInfo - xml.children().last() + { delegate.dependencies { delegate.dependency { delegate.groupId "org.grails" - delegate.artifactId "grails-bootstrap" + delegate.artifactId "grace-bootstrap" delegate.version( project.version ) - delegate.scope "compile" + delegate.scope "api" + + delegate.exclusions { + delegate.exclusion { + delegate.groupId 'jline' + delegate.artifactId 'jline' + } + delegate.exclusion { + delegate.groupId 'org.fusesource.jansi' + delegate.artifactId 'jansi' + } + delegate.exclusion { + delegate.groupId 'net.java.dev.jna' + delegate.artifactId 'jna' + } + delegate.exclusion { + delegate.groupId 'org.codehaus.groovy' + delegate.artifactId 'groovy-ant' + } + } } - for(sub in ['converters', 'databinding', 'i18n', 'interceptors', 'rest', 'services', 'url-mappings']) { + for(sub in ['converters', 'rest', 'databinding', 'i18n', 'services', 'url-mappings', 'interceptors']) { delegate.dependency { delegate.groupId "org.grails" - delegate.artifactId "grails-plugin-${sub}" + delegate.artifactId "grace-plugin-${sub}" delegate.version( project.version ) - delegate.scope "compile" + delegate.scope "api" } } delegate.dependency { delegate.groupId "org.grails.plugins" delegate.artifactId "async" delegate.version libs.versions.grails.async.get() - delegate.scope "compile" + delegate.scope "api" delegate.exclusions { delegate.exclusion { delegate.groupId 'javax' @@ -41,7 +58,7 @@ publishing { delegate.groupId "org.grails.plugins" delegate.artifactId "gsp" delegate.version libs.versions.grails.gsp.get() - delegate.scope "compile" + delegate.scope "api" delegate.exclusions { delegate.exclusion { delegate.groupId 'javax' @@ -53,11 +70,13 @@ publishing { delegate.groupId "com.h2database" delegate.artifactId "h2" delegate.version libs.versions.h2.get() - delegate.scope "test" + delegate.scope "runtimeOnly" } + } } } + } } } diff --git a/grace-docs/README.md b/grace-docs/README.md new file mode 100644 index 0000000000..7c16339c85 --- /dev/null +++ b/grace-docs/README.md @@ -0,0 +1,2 @@ +## grace-docs + diff --git a/grails-docs/build.gradle b/grace-docs/build.gradle similarity index 100% rename from grails-docs/build.gradle rename to grace-docs/build.gradle diff --git a/grails-docs/src/main/groovy/grails/doc/DocEngine.groovy b/grace-docs/src/main/groovy/grails/doc/DocEngine.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/DocEngine.groovy rename to grace-docs/src/main/groovy/grails/doc/DocEngine.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/DocPublisher.groovy b/grace-docs/src/main/groovy/grails/doc/DocPublisher.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/DocPublisher.groovy rename to grace-docs/src/main/groovy/grails/doc/DocPublisher.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/LegacyDocMigrator.groovy b/grace-docs/src/main/groovy/grails/doc/LegacyDocMigrator.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/LegacyDocMigrator.groovy rename to grace-docs/src/main/groovy/grails/doc/LegacyDocMigrator.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/PdfBuilder.groovy b/grace-docs/src/main/groovy/grails/doc/PdfBuilder.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/PdfBuilder.groovy rename to grace-docs/src/main/groovy/grails/doc/PdfBuilder.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/PdfPublisher.groovy b/grace-docs/src/main/groovy/grails/doc/PdfPublisher.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/PdfPublisher.groovy rename to grace-docs/src/main/groovy/grails/doc/PdfPublisher.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/ant/DocPublisherTask.groovy b/grace-docs/src/main/groovy/grails/doc/ant/DocPublisherTask.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/ant/DocPublisherTask.groovy rename to grace-docs/src/main/groovy/grails/doc/ant/DocPublisherTask.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy b/grace-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy rename to grace-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/dropdown/CreateReleaseDropDownTask.groovy b/grace-docs/src/main/groovy/grails/doc/dropdown/CreateReleaseDropDownTask.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/dropdown/CreateReleaseDropDownTask.groovy rename to grace-docs/src/main/groovy/grails/doc/dropdown/CreateReleaseDropDownTask.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/dropdown/Snapshot.groovy b/grace-docs/src/main/groovy/grails/doc/dropdown/Snapshot.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/dropdown/Snapshot.groovy rename to grace-docs/src/main/groovy/grails/doc/dropdown/Snapshot.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/dropdown/SoftwareVersion.groovy b/grace-docs/src/main/groovy/grails/doc/dropdown/SoftwareVersion.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/dropdown/SoftwareVersion.groovy rename to grace-docs/src/main/groovy/grails/doc/dropdown/SoftwareVersion.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/filters/HeaderFilter.groovy b/grace-docs/src/main/groovy/grails/doc/filters/HeaderFilter.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/filters/HeaderFilter.groovy rename to grace-docs/src/main/groovy/grails/doc/filters/HeaderFilter.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/filters/LinkTestFilter.groovy b/grace-docs/src/main/groovy/grails/doc/filters/LinkTestFilter.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/filters/LinkTestFilter.groovy rename to grace-docs/src/main/groovy/grails/doc/filters/LinkTestFilter.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/filters/ListFilter.groovy b/grace-docs/src/main/groovy/grails/doc/filters/ListFilter.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/filters/ListFilter.groovy rename to grace-docs/src/main/groovy/grails/doc/filters/ListFilter.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/gradle/MigrateLegacyDocs.groovy b/grace-docs/src/main/groovy/grails/doc/gradle/MigrateLegacyDocs.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/gradle/MigrateLegacyDocs.groovy rename to grace-docs/src/main/groovy/grails/doc/gradle/MigrateLegacyDocs.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/gradle/PublishGuide.groovy b/grace-docs/src/main/groovy/grails/doc/gradle/PublishGuide.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/gradle/PublishGuide.groovy rename to grace-docs/src/main/groovy/grails/doc/gradle/PublishGuide.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/gradle/PublishPdf.groovy b/grace-docs/src/main/groovy/grails/doc/gradle/PublishPdf.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/gradle/PublishPdf.groovy rename to grace-docs/src/main/groovy/grails/doc/gradle/PublishPdf.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/internal/FileResourceChecker.groovy b/grace-docs/src/main/groovy/grails/doc/internal/FileResourceChecker.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/internal/FileResourceChecker.groovy rename to grace-docs/src/main/groovy/grails/doc/internal/FileResourceChecker.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/internal/LegacyTocStrategy.groovy b/grace-docs/src/main/groovy/grails/doc/internal/LegacyTocStrategy.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/internal/LegacyTocStrategy.groovy rename to grace-docs/src/main/groovy/grails/doc/internal/LegacyTocStrategy.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/internal/StringEscapeCategory.java b/grace-docs/src/main/groovy/grails/doc/internal/StringEscapeCategory.java similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/internal/StringEscapeCategory.java rename to grace-docs/src/main/groovy/grails/doc/internal/StringEscapeCategory.java diff --git a/grails-docs/src/main/groovy/grails/doc/internal/UserGuideNode.groovy b/grace-docs/src/main/groovy/grails/doc/internal/UserGuideNode.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/internal/UserGuideNode.groovy rename to grace-docs/src/main/groovy/grails/doc/internal/UserGuideNode.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/internal/YamlTocStrategy.groovy b/grace-docs/src/main/groovy/grails/doc/internal/YamlTocStrategy.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/internal/YamlTocStrategy.groovy rename to grace-docs/src/main/groovy/grails/doc/internal/YamlTocStrategy.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/macros/GspTagSourceMacro.groovy b/grace-docs/src/main/groovy/grails/doc/macros/GspTagSourceMacro.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/macros/GspTagSourceMacro.groovy rename to grace-docs/src/main/groovy/grails/doc/macros/GspTagSourceMacro.groovy diff --git a/grails-docs/src/main/groovy/grails/doc/macros/HiddenMacro.groovy b/grace-docs/src/main/groovy/grails/doc/macros/HiddenMacro.groovy similarity index 100% rename from grails-docs/src/main/groovy/grails/doc/macros/HiddenMacro.groovy rename to grace-docs/src/main/groovy/grails/doc/macros/HiddenMacro.groovy diff --git a/grails-docs/src/main/resources/grails/doc/doc.properties b/grace-docs/src/main/resources/grails/doc/doc.properties similarity index 100% rename from grails-docs/src/main/resources/grails/doc/doc.properties rename to grace-docs/src/main/resources/grails/doc/doc.properties diff --git a/grails-docs/src/main/resources/radeox_messages_en.properties b/grace-docs/src/main/resources/radeox_messages_en.properties similarity index 100% rename from grails-docs/src/main/resources/radeox_messages_en.properties rename to grace-docs/src/main/resources/radeox_messages_en.properties diff --git a/grails-docs/src/main/template/css/custom-pdf.css b/grace-docs/src/main/template/css/custom-pdf.css similarity index 100% rename from grails-docs/src/main/template/css/custom-pdf.css rename to grace-docs/src/main/template/css/custom-pdf.css diff --git a/grails-docs/src/main/template/css/custom.css b/grace-docs/src/main/template/css/custom.css similarity index 100% rename from grails-docs/src/main/template/css/custom.css rename to grace-docs/src/main/template/css/custom.css diff --git a/grails-docs/src/main/template/css/main.css b/grace-docs/src/main/template/css/main.css similarity index 100% rename from grails-docs/src/main/template/css/main.css rename to grace-docs/src/main/template/css/main.css diff --git a/grails-docs/src/main/template/css/menu.css b/grace-docs/src/main/template/css/menu.css similarity index 100% rename from grails-docs/src/main/template/css/menu.css rename to grace-docs/src/main/template/css/menu.css diff --git a/grails-docs/src/main/template/css/pdf.css b/grace-docs/src/main/template/css/pdf.css similarity index 100% rename from grails-docs/src/main/template/css/pdf.css rename to grace-docs/src/main/template/css/pdf.css diff --git a/grails-docs/src/main/template/css/ref.css b/grace-docs/src/main/template/css/ref.css similarity index 100% rename from grails-docs/src/main/template/css/ref.css rename to grace-docs/src/main/template/css/ref.css diff --git a/grails-docs/src/main/template/css/skin.css b/grace-docs/src/main/template/css/skin.css similarity index 100% rename from grails-docs/src/main/template/css/skin.css rename to grace-docs/src/main/template/css/skin.css diff --git a/grails-docs/src/main/template/css/tools.css b/grace-docs/src/main/template/css/tools.css similarity index 100% rename from grails-docs/src/main/template/css/tools.css rename to grace-docs/src/main/template/css/tools.css diff --git a/grails-docs/src/main/template/fonts/FontAwesome.otf b/grace-docs/src/main/template/fonts/FontAwesome.otf similarity index 100% rename from grails-docs/src/main/template/fonts/FontAwesome.otf rename to grace-docs/src/main/template/fonts/FontAwesome.otf diff --git a/grails-docs/src/main/template/fonts/fontawesome-webfont.eot b/grace-docs/src/main/template/fonts/fontawesome-webfont.eot similarity index 100% rename from grails-docs/src/main/template/fonts/fontawesome-webfont.eot rename to grace-docs/src/main/template/fonts/fontawesome-webfont.eot diff --git a/grails-docs/src/main/template/fonts/fontawesome-webfont.svg b/grace-docs/src/main/template/fonts/fontawesome-webfont.svg similarity index 100% rename from grails-docs/src/main/template/fonts/fontawesome-webfont.svg rename to grace-docs/src/main/template/fonts/fontawesome-webfont.svg diff --git a/grails-docs/src/main/template/fonts/fontawesome-webfont.ttf b/grace-docs/src/main/template/fonts/fontawesome-webfont.ttf similarity index 100% rename from grails-docs/src/main/template/fonts/fontawesome-webfont.ttf rename to grace-docs/src/main/template/fonts/fontawesome-webfont.ttf diff --git a/grails-docs/src/main/template/fonts/fontawesome-webfont.woff b/grace-docs/src/main/template/fonts/fontawesome-webfont.woff similarity index 100% rename from grails-docs/src/main/template/fonts/fontawesome-webfont.woff rename to grace-docs/src/main/template/fonts/fontawesome-webfont.woff diff --git a/grails-docs/src/main/template/img/default/bullet.gif b/grace-docs/src/main/template/img/default/bullet.gif similarity index 100% rename from grails-docs/src/main/template/img/default/bullet.gif rename to grace-docs/src/main/template/img/default/bullet.gif diff --git a/grails-docs/src/main/template/img/default/linear-gradient-green.png b/grace-docs/src/main/template/img/default/linear-gradient-green.png similarity index 100% rename from grails-docs/src/main/template/img/default/linear-gradient-green.png rename to grace-docs/src/main/template/img/default/linear-gradient-green.png diff --git a/grails-docs/src/main/template/img/default/linear-gradient.png b/grace-docs/src/main/template/img/default/linear-gradient.png similarity index 100% rename from grails-docs/src/main/template/img/default/linear-gradient.png rename to grace-docs/src/main/template/img/default/linear-gradient.png diff --git a/grails-docs/src/main/template/img/default/separator-horizontal.gif b/grace-docs/src/main/template/img/default/separator-horizontal.gif similarity index 100% rename from grails-docs/src/main/template/img/default/separator-horizontal.gif rename to grace-docs/src/main/template/img/default/separator-horizontal.gif diff --git a/grails-docs/src/main/template/img/default/separator-menu.png b/grace-docs/src/main/template/img/default/separator-menu.png similarity index 100% rename from grails-docs/src/main/template/img/default/separator-menu.png rename to grace-docs/src/main/template/img/default/separator-menu.png diff --git a/grails-docs/src/main/template/img/default/separator-vertical.gif b/grace-docs/src/main/template/img/default/separator-vertical.gif similarity index 100% rename from grails-docs/src/main/template/img/default/separator-vertical.gif rename to grace-docs/src/main/template/img/default/separator-vertical.gif diff --git a/grails-docs/src/main/template/img/favicon.ico b/grace-docs/src/main/template/img/favicon.ico similarity index 100% rename from grails-docs/src/main/template/img/favicon.ico rename to grace-docs/src/main/template/img/favicon.ico diff --git a/grails-docs/src/main/template/img/grails-cupsonly-logo-white.svg b/grace-docs/src/main/template/img/grails-cupsonly-logo-white.svg similarity index 100% rename from grails-docs/src/main/template/img/grails-cupsonly-logo-white.svg rename to grace-docs/src/main/template/img/grails-cupsonly-logo-white.svg diff --git a/grails-docs/src/main/template/img/grails-icon.png b/grace-docs/src/main/template/img/grails-icon.png similarity index 100% rename from grails-docs/src/main/template/img/grails-icon.png rename to grace-docs/src/main/template/img/grails-icon.png diff --git a/grails-docs/src/main/template/img/grails.png b/grace-docs/src/main/template/img/grails.png similarity index 100% rename from grails-docs/src/main/template/img/grails.png rename to grace-docs/src/main/template/img/grails.png diff --git a/grails-docs/src/main/template/img/grails.svg b/grace-docs/src/main/template/img/grails.svg similarity index 100% rename from grails-docs/src/main/template/img/grails.svg rename to grace-docs/src/main/template/img/grails.svg diff --git a/grails-docs/src/main/template/img/groovy.png b/grace-docs/src/main/template/img/groovy.png similarity index 100% rename from grails-docs/src/main/template/img/groovy.png rename to grace-docs/src/main/template/img/groovy.png diff --git a/grails-docs/src/main/template/img/note.gif b/grace-docs/src/main/template/img/note.gif similarity index 100% rename from grails-docs/src/main/template/img/note.gif rename to grace-docs/src/main/template/img/note.gif diff --git a/grails-docs/src/main/template/img/warning.gif b/grace-docs/src/main/template/img/warning.gif similarity index 100% rename from grails-docs/src/main/template/img/warning.gif rename to grace-docs/src/main/template/img/warning.gif diff --git a/grails-docs/src/main/template/js/docs.js b/grace-docs/src/main/template/js/docs.js similarity index 100% rename from grails-docs/src/main/template/js/docs.js rename to grace-docs/src/main/template/js/docs.js diff --git a/grails-docs/src/main/template/log4j.properties b/grace-docs/src/main/template/log4j.properties similarity index 100% rename from grails-docs/src/main/template/log4j.properties rename to grace-docs/src/main/template/log4j.properties diff --git a/grails-docs/src/main/template/style/guideItem.html b/grace-docs/src/main/template/style/guideItem.html similarity index 100% rename from grails-docs/src/main/template/style/guideItem.html rename to grace-docs/src/main/template/style/guideItem.html diff --git a/grails-docs/src/main/template/style/index.html b/grace-docs/src/main/template/style/index.html similarity index 100% rename from grails-docs/src/main/template/style/index.html rename to grace-docs/src/main/template/style/index.html diff --git a/grails-docs/src/main/template/style/layout.html b/grace-docs/src/main/template/style/layout.html similarity index 100% rename from grails-docs/src/main/template/style/layout.html rename to grace-docs/src/main/template/style/layout.html diff --git a/grails-docs/src/main/template/style/menu.html b/grace-docs/src/main/template/style/menu.html similarity index 100% rename from grails-docs/src/main/template/style/menu.html rename to grace-docs/src/main/template/style/menu.html diff --git a/grails-docs/src/main/template/style/referenceItem.html b/grace-docs/src/main/template/style/referenceItem.html similarity index 100% rename from grails-docs/src/main/template/style/referenceItem.html rename to grace-docs/src/main/template/style/referenceItem.html diff --git a/grails-docs/src/main/template/style/section.html b/grace-docs/src/main/template/style/section.html similarity index 100% rename from grails-docs/src/main/template/style/section.html rename to grace-docs/src/main/template/style/section.html diff --git a/grails-docs/src/test/groovy/grails/doc/PdfBuilderSpec.groovy b/grace-docs/src/test/groovy/grails/doc/PdfBuilderSpec.groovy similarity index 100% rename from grails-docs/src/test/groovy/grails/doc/PdfBuilderSpec.groovy rename to grace-docs/src/test/groovy/grails/doc/PdfBuilderSpec.groovy diff --git a/grails-docs/src/test/groovy/grails/doc/PdfPublisherSpec.groovy b/grace-docs/src/test/groovy/grails/doc/PdfPublisherSpec.groovy similarity index 100% rename from grails-docs/src/test/groovy/grails/doc/PdfPublisherSpec.groovy rename to grace-docs/src/test/groovy/grails/doc/PdfPublisherSpec.groovy diff --git a/grails-docs/src/test/groovy/grails/doc/dropdown/SoftwareVersionSpec.groovy b/grace-docs/src/test/groovy/grails/doc/dropdown/SoftwareVersionSpec.groovy similarity index 100% rename from grails-docs/src/test/groovy/grails/doc/dropdown/SoftwareVersionSpec.groovy rename to grace-docs/src/test/groovy/grails/doc/dropdown/SoftwareVersionSpec.groovy diff --git a/grails-docs/src/test/groovy/grails/doc/internal/LegacyTocStrategySpec.groovy b/grace-docs/src/test/groovy/grails/doc/internal/LegacyTocStrategySpec.groovy similarity index 100% rename from grails-docs/src/test/groovy/grails/doc/internal/LegacyTocStrategySpec.groovy rename to grace-docs/src/test/groovy/grails/doc/internal/LegacyTocStrategySpec.groovy diff --git a/grails-docs/src/test/groovy/grails/doc/internal/StringEscapeCategoryTests.groovy b/grace-docs/src/test/groovy/grails/doc/internal/StringEscapeCategoryTests.groovy similarity index 100% rename from grails-docs/src/test/groovy/grails/doc/internal/StringEscapeCategoryTests.groovy rename to grace-docs/src/test/groovy/grails/doc/internal/StringEscapeCategoryTests.groovy diff --git a/grails-docs/src/test/groovy/grails/doc/internal/YamlTocStrategySpec.groovy b/grace-docs/src/test/groovy/grails/doc/internal/YamlTocStrategySpec.groovy similarity index 100% rename from grails-docs/src/test/groovy/grails/doc/internal/YamlTocStrategySpec.groovy rename to grace-docs/src/test/groovy/grails/doc/internal/YamlTocStrategySpec.groovy diff --git a/grails-docs/src/test/groovy/grails/doc/macros/GspTagSourceMacroTest.groovy b/grace-docs/src/test/groovy/grails/doc/macros/GspTagSourceMacroTest.groovy similarity index 100% rename from grails-docs/src/test/groovy/grails/doc/macros/GspTagSourceMacroTest.groovy rename to grace-docs/src/test/groovy/grails/doc/macros/GspTagSourceMacroTest.groovy diff --git a/grails-docs/src/test/resources/docs/guide/single.html b/grace-docs/src/test/resources/docs/guide/single.html similarity index 100% rename from grails-docs/src/test/resources/docs/guide/single.html rename to grace-docs/src/test/resources/docs/guide/single.html diff --git a/grace-encoder/README.md b/grace-encoder/README.md new file mode 100644 index 0000000000..cf5fafe71e --- /dev/null +++ b/grace-encoder/README.md @@ -0,0 +1,2 @@ +## grace-encoder + diff --git a/grace-encoder/build.gradle b/grace-encoder/build.gradle new file mode 100644 index 0000000000..dd823cd1e7 --- /dev/null +++ b/grace-encoder/build.gradle @@ -0,0 +1,9 @@ +dependencies { + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-util") + + api libs.groovy.json + api libs.spring.context + api libs.spring.web +} diff --git a/grails-encoder/src/main/groovy/org/grails/buffer/CodecPrintWriter.java b/grace-encoder/src/main/groovy/org/grails/buffer/CodecPrintWriter.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/buffer/CodecPrintWriter.java rename to grace-encoder/src/main/groovy/org/grails/buffer/CodecPrintWriter.java diff --git a/grails-encoder/src/main/groovy/org/grails/buffer/FastStringPrintWriter.java b/grace-encoder/src/main/groovy/org/grails/buffer/FastStringPrintWriter.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/buffer/FastStringPrintWriter.java rename to grace-encoder/src/main/groovy/org/grails/buffer/FastStringPrintWriter.java diff --git a/grails-encoder/src/main/groovy/org/grails/buffer/FastStringWriter.java b/grace-encoder/src/main/groovy/org/grails/buffer/FastStringWriter.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/buffer/FastStringWriter.java rename to grace-encoder/src/main/groovy/org/grails/buffer/FastStringWriter.java diff --git a/grails-encoder/src/main/groovy/org/grails/buffer/GrailsLazyProxyPrintWriter.java b/grace-encoder/src/main/groovy/org/grails/buffer/GrailsLazyProxyPrintWriter.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/buffer/GrailsLazyProxyPrintWriter.java rename to grace-encoder/src/main/groovy/org/grails/buffer/GrailsLazyProxyPrintWriter.java diff --git a/grails-encoder/src/main/groovy/org/grails/buffer/GrailsPrintWriter.java b/grace-encoder/src/main/groovy/org/grails/buffer/GrailsPrintWriter.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/buffer/GrailsPrintWriter.java rename to grace-encoder/src/main/groovy/org/grails/buffer/GrailsPrintWriter.java diff --git a/grails-encoder/src/main/groovy/org/grails/buffer/GrailsPrintWriterAdapter.java b/grace-encoder/src/main/groovy/org/grails/buffer/GrailsPrintWriterAdapter.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/buffer/GrailsPrintWriterAdapter.java rename to grace-encoder/src/main/groovy/org/grails/buffer/GrailsPrintWriterAdapter.java diff --git a/grails-encoder/src/main/groovy/org/grails/buffer/GrailsWrappedWriter.java b/grace-encoder/src/main/groovy/org/grails/buffer/GrailsWrappedWriter.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/buffer/GrailsWrappedWriter.java rename to grace-encoder/src/main/groovy/org/grails/buffer/GrailsWrappedWriter.java diff --git a/grails-encoder/src/main/groovy/org/grails/buffer/StreamByteBuffer.java b/grace-encoder/src/main/groovy/org/grails/buffer/StreamByteBuffer.java similarity index 96% rename from grails-encoder/src/main/groovy/org/grails/buffer/StreamByteBuffer.java rename to grace-encoder/src/main/groovy/org/grails/buffer/StreamByteBuffer.java index 4dc0457e68..fc1beb63fd 100644 --- a/grails-encoder/src/main/groovy/org/grails/buffer/StreamByteBuffer.java +++ b/grace-encoder/src/main/groovy/org/grails/buffer/StreamByteBuffer.java @@ -1,456 +1,456 @@ -/* - * Copyright 2009-2022 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 - * - * https://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.buffer; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.ByteBuffer; -import java.nio.CharBuffer; -import java.nio.charset.CharacterCodingException; -import java.nio.charset.Charset; -import java.nio.charset.CharsetDecoder; -import java.nio.charset.CoderResult; -import java.nio.charset.CodingErrorAction; -import java.util.Iterator; -import java.util.LinkedList; - -import grails.util.GrailsArrayUtils; - -/** - * An in-memory buffer that provides OutputStream and InputStream interfaces. - * - * This is more efficient than using ByteArrayOutputStream/ByteArrayInputStream - * - * This is not thread-safe, it is intended to be used by a single Thread. - * - * @author Lari Hotari, Sagire Software Oy - */ -public class StreamByteBuffer { - - private static final int DEFAULT_CHUNK_SIZE = 8192; - - private LinkedList chunks = new LinkedList<>(); - - private StreamByteBufferChunk currentWriteChunk; - - private StreamByteBufferChunk currentReadChunk = null; - - private int chunkSize; - - private StreamByteBufferOutputStream output; - - private StreamByteBufferInputStream input; - - private int totalBytesUnreadInList = 0; - - private int totalBytesUnreadInIterator = 0; - - private ReadMode readMode; - - private Iterator readIterator; - - public enum ReadMode { - REMOVE_AFTER_READING, - RETAIN_AFTER_READING - } - - public StreamByteBuffer() { - this(DEFAULT_CHUNK_SIZE); - } - - public StreamByteBuffer(int chunkSize) { - this(chunkSize, ReadMode.REMOVE_AFTER_READING); - } - - public StreamByteBuffer(int chunkSize, ReadMode readMode) { - this.chunkSize = chunkSize; - this.readMode = readMode; - this.currentWriteChunk = new StreamByteBufferChunk(chunkSize); - this.output = new StreamByteBufferOutputStream(); - this.input = new StreamByteBufferInputStream(); - } - - public OutputStream getOutputStream() { - return this.output; - } - - public InputStream getInputStream() { - return this.input; - } - - public void writeTo(OutputStream target) throws IOException { - while (prepareRead() != -1) { - this.currentReadChunk.writeTo(target); - } - } - - public byte[] readAsByteArray() { - byte[] buf = new byte[totalBytesUnread()]; - this.input.readImpl(buf, 0, buf.length); - return buf; - } - - public String readAsString(String encoding) throws CharacterCodingException { - Charset charset = Charset.forName(encoding); - return readAsString(charset); - } - - public String readAsString(Charset charset) throws CharacterCodingException { - int unreadSize = totalBytesUnread(); - if (unreadSize > 0) { - CharsetDecoder decoder = charset.newDecoder().onMalformedInput( - CodingErrorAction.REPLACE).onUnmappableCharacter( - CodingErrorAction.REPLACE); - CharBuffer charbuffer = CharBuffer.allocate(unreadSize); - ByteBuffer buf = null; - while (prepareRead() != -1) { - buf = this.currentReadChunk.readToNioBuffer(); - boolean endOfInput = (prepareRead() == -1); - CoderResult result = decoder.decode(buf, charbuffer, endOfInput); - if (endOfInput) { - if (!result.isUnderflow()) { - result.throwException(); - } - } - } - CoderResult result = decoder.flush(charbuffer); - if (buf.hasRemaining()) { - throw new IllegalStateException("There's a bug here, buffer wasn't read fully."); - } - if (!result.isUnderflow()) { - result.throwException(); - } - charbuffer.flip(); - String str; - if (charbuffer.hasArray()) { - int len = charbuffer.remaining(); - char[] ch = charbuffer.array(); - if (len != ch.length) { - ch = (char[]) GrailsArrayUtils.subarray(ch, 0, len); - } - str = StringCharArrayAccessor.createString(ch); - } - else { - str = charbuffer.toString(); - } - return str; - } - return null; - } - - public int totalBytesUnread() { - int total = 0; - if (this.readMode == ReadMode.REMOVE_AFTER_READING) { - total = this.totalBytesUnreadInList; - } - else if (this.readMode == ReadMode.RETAIN_AFTER_READING) { - prepareRetainAfterReading(); - total = this.totalBytesUnreadInIterator; - } - if (this.currentReadChunk != null) { - total += this.currentReadChunk.bytesUnread(); - } - if (this.currentWriteChunk != null && this.currentWriteChunk != this.currentReadChunk) { - if (this.readMode == ReadMode.REMOVE_AFTER_READING) { - total += this.currentWriteChunk.bytesUnread(); - } - else if (this.readMode == ReadMode.RETAIN_AFTER_READING) { - total += this.currentWriteChunk.bytesUsed(); - } - } - return total; - } - - protected int allocateSpace() { - int spaceLeft = this.currentWriteChunk.spaceLeft(); - if (spaceLeft == 0) { - this.chunks.add(this.currentWriteChunk); - this.totalBytesUnreadInList += this.currentWriteChunk.bytesUnread(); - this.currentWriteChunk = new StreamByteBufferChunk(this.chunkSize); - spaceLeft = this.currentWriteChunk.spaceLeft(); - } - return spaceLeft; - } - - protected int prepareRead() { - prepareRetainAfterReading(); - int bytesUnread = (this.currentReadChunk != null) ? this.currentReadChunk.bytesUnread() : 0; - if (bytesUnread == 0) { - if (this.readMode == ReadMode.REMOVE_AFTER_READING && !this.chunks.isEmpty()) { - this.currentReadChunk = this.chunks.removeFirst(); - bytesUnread = this.currentReadChunk.bytesUnread(); - this.totalBytesUnreadInList -= bytesUnread; - } - else if (this.readMode == ReadMode.RETAIN_AFTER_READING && this.readIterator.hasNext()) { - this.currentReadChunk = this.readIterator.next(); - this.currentReadChunk.reset(); - bytesUnread = this.currentReadChunk.bytesUnread(); - this.totalBytesUnreadInIterator -= bytesUnread; - } - else if (this.currentReadChunk != this.currentWriteChunk) { - this.currentReadChunk = this.currentWriteChunk; - bytesUnread = this.currentReadChunk.bytesUnread(); - } - else { - bytesUnread = -1; - } - } - return bytesUnread; - } - - public void reset() { - if (this.readMode == ReadMode.RETAIN_AFTER_READING) { - this.readIterator = null; - prepareRetainAfterReading(); - if (this.currentWriteChunk != null) { - this.currentWriteChunk.reset(); - } - } - } - - private void prepareRetainAfterReading() { - if (this.readMode == ReadMode.RETAIN_AFTER_READING && this.readIterator == null) { - this.readIterator = this.chunks.iterator(); - this.totalBytesUnreadInIterator = this.totalBytesUnreadInList; - this.currentReadChunk = null; - } - } - - public ReadMode getReadMode() { - return this.readMode; - } - - public void setReadMode(ReadMode readMode) { - this.readMode = readMode; - } - - public void retainAfterReadingMode() { - setReadMode(ReadMode.RETAIN_AFTER_READING); - } - - public void clear() { - this.chunks.clear(); - this.currentReadChunk = null; - this.totalBytesUnreadInList = 0; - this.totalBytesUnreadInIterator = 0; - this.currentWriteChunk = new StreamByteBufferChunk(this.chunkSize); - this.readIterator = null; - } - - protected static class StreamByteBufferChunk { - - private int pointer = 0; - - private byte[] buffer; - - private int size; - - private int used = 0; - - public StreamByteBufferChunk(int size) { - this.size = size; - this.buffer = new byte[size]; - } - - public ByteBuffer readToNioBuffer() { - if (this.pointer < this.used) { - ByteBuffer result; - if (this.pointer > 0 || this.used < this.size) { - result = ByteBuffer.wrap(this.buffer, this.pointer, this.used - this.pointer); - } - else { - result = ByteBuffer.wrap(this.buffer); - } - this.pointer = this.used; - return result; - } - - return null; - } - - public boolean write(byte b) { - if (this.used < this.size) { - this.buffer[this.used++] = b; - return true; - } - - return false; - } - - public void write(byte[] b, int off, int len) { - System.arraycopy(b, off, this.buffer, this.used, len); - this.used = this.used + len; - } - - public void read(byte[] b, int off, int len) { - System.arraycopy(this.buffer, this.pointer, b, off, len); - this.pointer = this.pointer + len; - } - - public void writeTo(OutputStream target) throws IOException { - if (this.pointer < this.used) { - target.write(this.buffer, this.pointer, this.used - this.pointer); - this.pointer = this.used; - } - } - - public void reset() { - this.pointer = 0; - } - - public int bytesUsed() { - return this.used; - } - - public int bytesUnread() { - return this.used - this.pointer; - } - - public int read() { - if (this.pointer < this.used) { - return this.buffer[this.pointer++] & 0xff; - } - - return -1; - } - - public int spaceLeft() { - return this.size - this.used; - } - - } - - class StreamByteBufferOutputStream extends OutputStream { - - private boolean closed = false; - - @Override - public void write(byte[] b, int off, int len) throws IOException { - if (b == null) { - throw new NullPointerException(); - } - - if ((off < 0) || (off > b.length) || (len < 0) || - ((off + len) > b.length) || ((off + len) < 0)) { - throw new IndexOutOfBoundsException(); - } - - if (len == 0) { - return; - } - - int bytesLeft = len; - int currentOffset = off; - while (bytesLeft > 0) { - int spaceLeft = allocateSpace(); - int writeBytes = Math.min(spaceLeft, bytesLeft); - StreamByteBuffer.this.currentWriteChunk.write(b, currentOffset, writeBytes); - bytesLeft -= writeBytes; - currentOffset += writeBytes; - } - } - - @Override - public void close() throws IOException { - this.closed = true; - } - - public boolean isClosed() { - return this.closed; - } - - @Override - public void write(int b) throws IOException { - allocateSpace(); - StreamByteBuffer.this.currentWriteChunk.write((byte) b); - } - - public StreamByteBuffer getBuffer() { - return StreamByteBuffer.this; - } - - } - - class StreamByteBufferInputStream extends InputStream { - - @Override - public int read() throws IOException { - prepareRead(); - return StreamByteBuffer.this.currentReadChunk.read(); - } - - @Override - public int read(byte[] b, int off, int len) throws IOException { - return readImpl(b, off, len); - } - - int readImpl(byte[] b, int off, int len) { - if (b == null) { - throw new NullPointerException(); - } - - if ((off < 0) || (off > b.length) || (len < 0) || - ((off + len) > b.length) || ((off + len) < 0)) { - throw new IndexOutOfBoundsException(); - } - - if (len == 0) { - return 0; - } - - int bytesLeft = len; - int currentOffset = off; - int bytesUnread = prepareRead(); - int totalBytesRead = 0; - while (bytesLeft > 0 && bytesUnread != -1) { - int readBytes = Math.min(bytesUnread, bytesLeft); - StreamByteBuffer.this.currentReadChunk.read(b, currentOffset, readBytes); - bytesLeft -= readBytes; - currentOffset += readBytes; - totalBytesRead += readBytes; - bytesUnread = prepareRead(); - } - if (totalBytesRead > 0) { - return totalBytesRead; - } - - return -1; - } - - @Override - public synchronized void reset() throws IOException { - if (StreamByteBuffer.this.readMode == ReadMode.RETAIN_AFTER_READING) { - StreamByteBuffer.this.reset(); - } - else { - // reset isn't supported in ReadMode.REMOVE_AFTER_READING - super.reset(); - } - } - - @Override - public int available() throws IOException { - return totalBytesUnread(); - } - - public StreamByteBuffer getBuffer() { - return StreamByteBuffer.this; - } - - } - -} +/* + * Copyright 2009-2022 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 + * + * https://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.buffer; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.charset.CharacterCodingException; +import java.nio.charset.Charset; +import java.nio.charset.CharsetDecoder; +import java.nio.charset.CoderResult; +import java.nio.charset.CodingErrorAction; +import java.util.Iterator; +import java.util.LinkedList; + +import grails.util.GrailsArrayUtils; + +/** + * An in-memory buffer that provides OutputStream and InputStream interfaces. + * + * This is more efficient than using ByteArrayOutputStream/ByteArrayInputStream + * + * This is not thread-safe, it is intended to be used by a single Thread. + * + * @author Lari Hotari, Sagire Software Oy + */ +public class StreamByteBuffer { + + private static final int DEFAULT_CHUNK_SIZE = 8192; + + private LinkedList chunks = new LinkedList<>(); + + private StreamByteBufferChunk currentWriteChunk; + + private StreamByteBufferChunk currentReadChunk = null; + + private int chunkSize; + + private StreamByteBufferOutputStream output; + + private StreamByteBufferInputStream input; + + private int totalBytesUnreadInList = 0; + + private int totalBytesUnreadInIterator = 0; + + private ReadMode readMode; + + private Iterator readIterator; + + public enum ReadMode { + REMOVE_AFTER_READING, + RETAIN_AFTER_READING + } + + public StreamByteBuffer() { + this(DEFAULT_CHUNK_SIZE); + } + + public StreamByteBuffer(int chunkSize) { + this(chunkSize, ReadMode.REMOVE_AFTER_READING); + } + + public StreamByteBuffer(int chunkSize, ReadMode readMode) { + this.chunkSize = chunkSize; + this.readMode = readMode; + this.currentWriteChunk = new StreamByteBufferChunk(chunkSize); + this.output = new StreamByteBufferOutputStream(); + this.input = new StreamByteBufferInputStream(); + } + + public OutputStream getOutputStream() { + return this.output; + } + + public InputStream getInputStream() { + return this.input; + } + + public void writeTo(OutputStream target) throws IOException { + while (prepareRead() != -1) { + this.currentReadChunk.writeTo(target); + } + } + + public byte[] readAsByteArray() { + byte[] buf = new byte[totalBytesUnread()]; + this.input.readImpl(buf, 0, buf.length); + return buf; + } + + public String readAsString(String encoding) throws CharacterCodingException { + Charset charset = Charset.forName(encoding); + return readAsString(charset); + } + + public String readAsString(Charset charset) throws CharacterCodingException { + int unreadSize = totalBytesUnread(); + if (unreadSize > 0) { + CharsetDecoder decoder = charset.newDecoder().onMalformedInput( + CodingErrorAction.REPLACE).onUnmappableCharacter( + CodingErrorAction.REPLACE); + CharBuffer charbuffer = CharBuffer.allocate(unreadSize); + ByteBuffer buf = null; + while (prepareRead() != -1) { + buf = this.currentReadChunk.readToNioBuffer(); + boolean endOfInput = (prepareRead() == -1); + CoderResult result = decoder.decode(buf, charbuffer, endOfInput); + if (endOfInput) { + if (!result.isUnderflow()) { + result.throwException(); + } + } + } + CoderResult result = decoder.flush(charbuffer); + if (buf.hasRemaining()) { + throw new IllegalStateException("There's a bug here, buffer wasn't read fully."); + } + if (!result.isUnderflow()) { + result.throwException(); + } + charbuffer.flip(); + String str; + if (charbuffer.hasArray()) { + int len = charbuffer.remaining(); + char[] ch = charbuffer.array(); + if (len != ch.length) { + ch = (char[]) GrailsArrayUtils.subarray(ch, 0, len); + } + str = StringCharArrayAccessor.createString(ch); + } + else { + str = charbuffer.toString(); + } + return str; + } + return null; + } + + public int totalBytesUnread() { + int total = 0; + if (this.readMode == ReadMode.REMOVE_AFTER_READING) { + total = this.totalBytesUnreadInList; + } + else if (this.readMode == ReadMode.RETAIN_AFTER_READING) { + prepareRetainAfterReading(); + total = this.totalBytesUnreadInIterator; + } + if (this.currentReadChunk != null) { + total += this.currentReadChunk.bytesUnread(); + } + if (this.currentWriteChunk != null && this.currentWriteChunk != this.currentReadChunk) { + if (this.readMode == ReadMode.REMOVE_AFTER_READING) { + total += this.currentWriteChunk.bytesUnread(); + } + else if (this.readMode == ReadMode.RETAIN_AFTER_READING) { + total += this.currentWriteChunk.bytesUsed(); + } + } + return total; + } + + protected int allocateSpace() { + int spaceLeft = this.currentWriteChunk.spaceLeft(); + if (spaceLeft == 0) { + this.chunks.add(this.currentWriteChunk); + this.totalBytesUnreadInList += this.currentWriteChunk.bytesUnread(); + this.currentWriteChunk = new StreamByteBufferChunk(this.chunkSize); + spaceLeft = this.currentWriteChunk.spaceLeft(); + } + return spaceLeft; + } + + protected int prepareRead() { + prepareRetainAfterReading(); + int bytesUnread = (this.currentReadChunk != null) ? this.currentReadChunk.bytesUnread() : 0; + if (bytesUnread == 0) { + if (this.readMode == ReadMode.REMOVE_AFTER_READING && !this.chunks.isEmpty()) { + this.currentReadChunk = this.chunks.removeFirst(); + bytesUnread = this.currentReadChunk.bytesUnread(); + this.totalBytesUnreadInList -= bytesUnread; + } + else if (this.readMode == ReadMode.RETAIN_AFTER_READING && this.readIterator.hasNext()) { + this.currentReadChunk = this.readIterator.next(); + this.currentReadChunk.reset(); + bytesUnread = this.currentReadChunk.bytesUnread(); + this.totalBytesUnreadInIterator -= bytesUnread; + } + else if (this.currentReadChunk != this.currentWriteChunk) { + this.currentReadChunk = this.currentWriteChunk; + bytesUnread = this.currentReadChunk.bytesUnread(); + } + else { + bytesUnread = -1; + } + } + return bytesUnread; + } + + public void reset() { + if (this.readMode == ReadMode.RETAIN_AFTER_READING) { + this.readIterator = null; + prepareRetainAfterReading(); + if (this.currentWriteChunk != null) { + this.currentWriteChunk.reset(); + } + } + } + + private void prepareRetainAfterReading() { + if (this.readMode == ReadMode.RETAIN_AFTER_READING && this.readIterator == null) { + this.readIterator = this.chunks.iterator(); + this.totalBytesUnreadInIterator = this.totalBytesUnreadInList; + this.currentReadChunk = null; + } + } + + public ReadMode getReadMode() { + return this.readMode; + } + + public void setReadMode(ReadMode readMode) { + this.readMode = readMode; + } + + public void retainAfterReadingMode() { + setReadMode(ReadMode.RETAIN_AFTER_READING); + } + + public void clear() { + this.chunks.clear(); + this.currentReadChunk = null; + this.totalBytesUnreadInList = 0; + this.totalBytesUnreadInIterator = 0; + this.currentWriteChunk = new StreamByteBufferChunk(this.chunkSize); + this.readIterator = null; + } + + protected static class StreamByteBufferChunk { + + private int pointer = 0; + + private byte[] buffer; + + private int size; + + private int used = 0; + + public StreamByteBufferChunk(int size) { + this.size = size; + this.buffer = new byte[size]; + } + + public ByteBuffer readToNioBuffer() { + if (this.pointer < this.used) { + ByteBuffer result; + if (this.pointer > 0 || this.used < this.size) { + result = ByteBuffer.wrap(this.buffer, this.pointer, this.used - this.pointer); + } + else { + result = ByteBuffer.wrap(this.buffer); + } + this.pointer = this.used; + return result; + } + + return null; + } + + public boolean write(byte b) { + if (this.used < this.size) { + this.buffer[this.used++] = b; + return true; + } + + return false; + } + + public void write(byte[] b, int off, int len) { + System.arraycopy(b, off, this.buffer, this.used, len); + this.used = this.used + len; + } + + public void read(byte[] b, int off, int len) { + System.arraycopy(this.buffer, this.pointer, b, off, len); + this.pointer = this.pointer + len; + } + + public void writeTo(OutputStream target) throws IOException { + if (this.pointer < this.used) { + target.write(this.buffer, this.pointer, this.used - this.pointer); + this.pointer = this.used; + } + } + + public void reset() { + this.pointer = 0; + } + + public int bytesUsed() { + return this.used; + } + + public int bytesUnread() { + return this.used - this.pointer; + } + + public int read() { + if (this.pointer < this.used) { + return this.buffer[this.pointer++] & 0xff; + } + + return -1; + } + + public int spaceLeft() { + return this.size - this.used; + } + + } + + class StreamByteBufferOutputStream extends OutputStream { + + private boolean closed = false; + + @Override + public void write(byte[] b, int off, int len) throws IOException { + if (b == null) { + throw new NullPointerException(); + } + + if ((off < 0) || (off > b.length) || (len < 0) || + ((off + len) > b.length) || ((off + len) < 0)) { + throw new IndexOutOfBoundsException(); + } + + if (len == 0) { + return; + } + + int bytesLeft = len; + int currentOffset = off; + while (bytesLeft > 0) { + int spaceLeft = allocateSpace(); + int writeBytes = Math.min(spaceLeft, bytesLeft); + StreamByteBuffer.this.currentWriteChunk.write(b, currentOffset, writeBytes); + bytesLeft -= writeBytes; + currentOffset += writeBytes; + } + } + + @Override + public void close() throws IOException { + this.closed = true; + } + + public boolean isClosed() { + return this.closed; + } + + @Override + public void write(int b) throws IOException { + allocateSpace(); + StreamByteBuffer.this.currentWriteChunk.write((byte) b); + } + + public StreamByteBuffer getBuffer() { + return StreamByteBuffer.this; + } + + } + + class StreamByteBufferInputStream extends InputStream { + + @Override + public int read() throws IOException { + prepareRead(); + return StreamByteBuffer.this.currentReadChunk.read(); + } + + @Override + public int read(byte[] b, int off, int len) throws IOException { + return readImpl(b, off, len); + } + + int readImpl(byte[] b, int off, int len) { + if (b == null) { + throw new NullPointerException(); + } + + if ((off < 0) || (off > b.length) || (len < 0) || + ((off + len) > b.length) || ((off + len) < 0)) { + throw new IndexOutOfBoundsException(); + } + + if (len == 0) { + return 0; + } + + int bytesLeft = len; + int currentOffset = off; + int bytesUnread = prepareRead(); + int totalBytesRead = 0; + while (bytesLeft > 0 && bytesUnread != -1) { + int readBytes = Math.min(bytesUnread, bytesLeft); + StreamByteBuffer.this.currentReadChunk.read(b, currentOffset, readBytes); + bytesLeft -= readBytes; + currentOffset += readBytes; + totalBytesRead += readBytes; + bytesUnread = prepareRead(); + } + if (totalBytesRead > 0) { + return totalBytesRead; + } + + return -1; + } + + @Override + public synchronized void reset() throws IOException { + if (StreamByteBuffer.this.readMode == ReadMode.RETAIN_AFTER_READING) { + StreamByteBuffer.this.reset(); + } + else { + // reset isn't supported in ReadMode.REMOVE_AFTER_READING + super.reset(); + } + } + + @Override + public int available() throws IOException { + return totalBytesUnread(); + } + + public StreamByteBuffer getBuffer() { + return StreamByteBuffer.this; + } + + } + +} diff --git a/grails-encoder/src/main/groovy/org/grails/buffer/StreamCharBuffer.java b/grace-encoder/src/main/groovy/org/grails/buffer/StreamCharBuffer.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/buffer/StreamCharBuffer.java rename to grace-encoder/src/main/groovy/org/grails/buffer/StreamCharBuffer.java diff --git a/grails-encoder/src/main/groovy/org/grails/buffer/StreamCharBufferMetaUtils.groovy b/grace-encoder/src/main/groovy/org/grails/buffer/StreamCharBufferMetaUtils.groovy similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/buffer/StreamCharBufferMetaUtils.groovy rename to grace-encoder/src/main/groovy/org/grails/buffer/StreamCharBufferMetaUtils.groovy diff --git a/grails-encoder/src/main/groovy/org/grails/buffer/StringCharArrayAccessor.java b/grace-encoder/src/main/groovy/org/grails/buffer/StringCharArrayAccessor.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/buffer/StringCharArrayAccessor.java rename to grace-encoder/src/main/groovy/org/grails/buffer/StringCharArrayAccessor.java diff --git a/grails-encoder/src/main/groovy/org/grails/charsequences/CharArrayAccessible.java b/grace-encoder/src/main/groovy/org/grails/charsequences/CharArrayAccessible.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/charsequences/CharArrayAccessible.java rename to grace-encoder/src/main/groovy/org/grails/charsequences/CharArrayAccessible.java diff --git a/grails-encoder/src/main/groovy/org/grails/charsequences/CharArrayCharSequence.java b/grace-encoder/src/main/groovy/org/grails/charsequences/CharArrayCharSequence.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/charsequences/CharArrayCharSequence.java rename to grace-encoder/src/main/groovy/org/grails/charsequences/CharArrayCharSequence.java diff --git a/grails-encoder/src/main/groovy/org/grails/charsequences/CharSequences.java b/grace-encoder/src/main/groovy/org/grails/charsequences/CharSequences.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/charsequences/CharSequences.java rename to grace-encoder/src/main/groovy/org/grails/charsequences/CharSequences.java diff --git a/grails-encoder/src/main/groovy/org/grails/charsequences/SingleCharCharSequence.java b/grace-encoder/src/main/groovy/org/grails/charsequences/SingleCharCharSequence.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/charsequences/SingleCharCharSequence.java rename to grace-encoder/src/main/groovy/org/grails/charsequences/SingleCharCharSequence.java diff --git a/grails-encoder/src/main/groovy/org/grails/charsequences/SubCharSequence.java b/grace-encoder/src/main/groovy/org/grails/charsequences/SubCharSequence.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/charsequences/SubCharSequence.java rename to grace-encoder/src/main/groovy/org/grails/charsequences/SubCharSequence.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/AbstractCharReplacementEncoder.java b/grace-encoder/src/main/groovy/org/grails/encoder/AbstractCharReplacementEncoder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/AbstractCharReplacementEncoder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/AbstractCharReplacementEncoder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/AbstractEncodedAppender.java b/grace-encoder/src/main/groovy/org/grails/encoder/AbstractEncodedAppender.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/AbstractEncodedAppender.java rename to grace-encoder/src/main/groovy/org/grails/encoder/AbstractEncodedAppender.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/ChainedDecoder.java b/grace-encoder/src/main/groovy/org/grails/encoder/ChainedDecoder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/ChainedDecoder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/ChainedDecoder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/ChainedEncoder.java b/grace-encoder/src/main/groovy/org/grails/encoder/ChainedEncoder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/ChainedEncoder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/ChainedEncoder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/ChainedEncoders.java b/grace-encoder/src/main/groovy/org/grails/encoder/ChainedEncoders.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/ChainedEncoders.java rename to grace-encoder/src/main/groovy/org/grails/encoder/ChainedEncoders.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/CodecFactory.java b/grace-encoder/src/main/groovy/org/grails/encoder/CodecFactory.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/CodecFactory.java rename to grace-encoder/src/main/groovy/org/grails/encoder/CodecFactory.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/CodecIdentifier.java b/grace-encoder/src/main/groovy/org/grails/encoder/CodecIdentifier.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/CodecIdentifier.java rename to grace-encoder/src/main/groovy/org/grails/encoder/CodecIdentifier.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/CodecIdentifierProvider.java b/grace-encoder/src/main/groovy/org/grails/encoder/CodecIdentifierProvider.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/CodecIdentifierProvider.java rename to grace-encoder/src/main/groovy/org/grails/encoder/CodecIdentifierProvider.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/CodecLookup.java b/grace-encoder/src/main/groovy/org/grails/encoder/CodecLookup.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/CodecLookup.java rename to grace-encoder/src/main/groovy/org/grails/encoder/CodecLookup.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/CodecLookupHelper.java b/grace-encoder/src/main/groovy/org/grails/encoder/CodecLookupHelper.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/CodecLookupHelper.java rename to grace-encoder/src/main/groovy/org/grails/encoder/CodecLookupHelper.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/CodecMetaClassSupport.groovy b/grace-encoder/src/main/groovy/org/grails/encoder/CodecMetaClassSupport.groovy similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/CodecMetaClassSupport.groovy rename to grace-encoder/src/main/groovy/org/grails/encoder/CodecMetaClassSupport.groovy diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/CombinedCodecIdentifier.java b/grace-encoder/src/main/groovy/org/grails/encoder/CombinedCodecIdentifier.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/CombinedCodecIdentifier.java rename to grace-encoder/src/main/groovy/org/grails/encoder/CombinedCodecIdentifier.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/Decoder.java b/grace-encoder/src/main/groovy/org/grails/encoder/Decoder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/Decoder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/Decoder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/DefaultCodecIdentifier.java b/grace-encoder/src/main/groovy/org/grails/encoder/DefaultCodecIdentifier.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/DefaultCodecIdentifier.java rename to grace-encoder/src/main/groovy/org/grails/encoder/DefaultCodecIdentifier.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/DefaultEncodingStateRegistry.java b/grace-encoder/src/main/groovy/org/grails/encoder/DefaultEncodingStateRegistry.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/DefaultEncodingStateRegistry.java rename to grace-encoder/src/main/groovy/org/grails/encoder/DefaultEncodingStateRegistry.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/Encodeable.java b/grace-encoder/src/main/groovy/org/grails/encoder/Encodeable.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/Encodeable.java rename to grace-encoder/src/main/groovy/org/grails/encoder/Encodeable.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/EncodedAppender.java b/grace-encoder/src/main/groovy/org/grails/encoder/EncodedAppender.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/EncodedAppender.java rename to grace-encoder/src/main/groovy/org/grails/encoder/EncodedAppender.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/EncodedAppenderFactory.java b/grace-encoder/src/main/groovy/org/grails/encoder/EncodedAppenderFactory.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/EncodedAppenderFactory.java rename to grace-encoder/src/main/groovy/org/grails/encoder/EncodedAppenderFactory.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/EncodedAppenderWriter.java b/grace-encoder/src/main/groovy/org/grails/encoder/EncodedAppenderWriter.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/EncodedAppenderWriter.java rename to grace-encoder/src/main/groovy/org/grails/encoder/EncodedAppenderWriter.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/EncodedAppenderWriterFactory.java b/grace-encoder/src/main/groovy/org/grails/encoder/EncodedAppenderWriterFactory.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/EncodedAppenderWriterFactory.java rename to grace-encoder/src/main/groovy/org/grails/encoder/EncodedAppenderWriterFactory.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/Encoder.java b/grace-encoder/src/main/groovy/org/grails/encoder/Encoder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/Encoder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/Encoder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/EncoderAware.java b/grace-encoder/src/main/groovy/org/grails/encoder/EncoderAware.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/EncoderAware.java rename to grace-encoder/src/main/groovy/org/grails/encoder/EncoderAware.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/EncodesToWriter.java b/grace-encoder/src/main/groovy/org/grails/encoder/EncodesToWriter.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/EncodesToWriter.java rename to grace-encoder/src/main/groovy/org/grails/encoder/EncodesToWriter.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/EncodesToWriterAdapter.java b/grace-encoder/src/main/groovy/org/grails/encoder/EncodesToWriterAdapter.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/EncodesToWriterAdapter.java rename to grace-encoder/src/main/groovy/org/grails/encoder/EncodesToWriterAdapter.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/EncodingState.java b/grace-encoder/src/main/groovy/org/grails/encoder/EncodingState.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/EncodingState.java rename to grace-encoder/src/main/groovy/org/grails/encoder/EncodingState.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/EncodingStateImpl.java b/grace-encoder/src/main/groovy/org/grails/encoder/EncodingStateImpl.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/EncodingStateImpl.java rename to grace-encoder/src/main/groovy/org/grails/encoder/EncodingStateImpl.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/EncodingStateRegistry.java b/grace-encoder/src/main/groovy/org/grails/encoder/EncodingStateRegistry.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/EncodingStateRegistry.java rename to grace-encoder/src/main/groovy/org/grails/encoder/EncodingStateRegistry.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/EncodingStateRegistryLookup.java b/grace-encoder/src/main/groovy/org/grails/encoder/EncodingStateRegistryLookup.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/EncodingStateRegistryLookup.java rename to grace-encoder/src/main/groovy/org/grails/encoder/EncodingStateRegistryLookup.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/EncodingStateRegistryLookupHolder.java b/grace-encoder/src/main/groovy/org/grails/encoder/EncodingStateRegistryLookupHolder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/EncodingStateRegistryLookupHolder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/EncodingStateRegistryLookupHolder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/StreamEncodeable.java b/grace-encoder/src/main/groovy/org/grails/encoder/StreamEncodeable.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/StreamEncodeable.java rename to grace-encoder/src/main/groovy/org/grails/encoder/StreamEncodeable.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/StreamingEncoder.java b/grace-encoder/src/main/groovy/org/grails/encoder/StreamingEncoder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/StreamingEncoder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/StreamingEncoder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/StreamingEncoderEncodedAppender.java b/grace-encoder/src/main/groovy/org/grails/encoder/StreamingEncoderEncodedAppender.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/StreamingEncoderEncodedAppender.java rename to grace-encoder/src/main/groovy/org/grails/encoder/StreamingEncoderEncodedAppender.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/StreamingEncoderWritable.java b/grace-encoder/src/main/groovy/org/grails/encoder/StreamingEncoderWritable.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/StreamingEncoderWritable.java rename to grace-encoder/src/main/groovy/org/grails/encoder/StreamingEncoderWritable.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/StreamingEncoderWriter.java b/grace-encoder/src/main/groovy/org/grails/encoder/StreamingEncoderWriter.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/StreamingEncoderWriter.java rename to grace-encoder/src/main/groovy/org/grails/encoder/StreamingEncoderWriter.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/WriterEncodedAppender.java b/grace-encoder/src/main/groovy/org/grails/encoder/WriterEncodedAppender.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/WriterEncodedAppender.java rename to grace-encoder/src/main/groovy/org/grails/encoder/WriterEncodedAppender.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/BasicCodecLookup.java b/grace-encoder/src/main/groovy/org/grails/encoder/impl/BasicCodecLookup.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/BasicCodecLookup.java rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/BasicCodecLookup.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/BasicJSONEncoder.java b/grace-encoder/src/main/groovy/org/grails/encoder/impl/BasicJSONEncoder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/BasicJSONEncoder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/BasicJSONEncoder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/BasicXMLEncoder.java b/grace-encoder/src/main/groovy/org/grails/encoder/impl/BasicXMLEncoder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/BasicXMLEncoder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/BasicXMLEncoder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/HTML4Codec.java b/grace-encoder/src/main/groovy/org/grails/encoder/impl/HTML4Codec.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/HTML4Codec.java rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/HTML4Codec.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/HTML4Decoder.java b/grace-encoder/src/main/groovy/org/grails/encoder/impl/HTML4Decoder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/HTML4Decoder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/HTML4Decoder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/HTML4Encoder.java b/grace-encoder/src/main/groovy/org/grails/encoder/impl/HTML4Encoder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/HTML4Encoder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/HTML4Encoder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/HTMLCodecFactory.groovy b/grace-encoder/src/main/groovy/org/grails/encoder/impl/HTMLCodecFactory.groovy similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/HTMLCodecFactory.groovy rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/HTMLCodecFactory.groovy diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/HTMLEncoder.java b/grace-encoder/src/main/groovy/org/grails/encoder/impl/HTMLEncoder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/HTMLEncoder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/HTMLEncoder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/HTMLJSCodec.java b/grace-encoder/src/main/groovy/org/grails/encoder/impl/HTMLJSCodec.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/HTMLJSCodec.java rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/HTMLJSCodec.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/JSONCodecFactory.groovy b/grace-encoder/src/main/groovy/org/grails/encoder/impl/JSONCodecFactory.groovy similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/JSONCodecFactory.groovy rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/JSONCodecFactory.groovy diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/JavaScriptCodec.groovy b/grace-encoder/src/main/groovy/org/grails/encoder/impl/JavaScriptCodec.groovy similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/JavaScriptCodec.groovy rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/JavaScriptCodec.groovy diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/JavaScriptEncoder.java b/grace-encoder/src/main/groovy/org/grails/encoder/impl/JavaScriptEncoder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/JavaScriptEncoder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/JavaScriptEncoder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/NoneEncoder.java b/grace-encoder/src/main/groovy/org/grails/encoder/impl/NoneEncoder.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/NoneEncoder.java rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/NoneEncoder.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/RawCodec.java b/grace-encoder/src/main/groovy/org/grails/encoder/impl/RawCodec.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/RawCodec.java rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/RawCodec.java diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/StandaloneCodecLookup.groovy b/grace-encoder/src/main/groovy/org/grails/encoder/impl/StandaloneCodecLookup.groovy similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/StandaloneCodecLookup.groovy rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/StandaloneCodecLookup.groovy diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/URLCodecFactory.groovy b/grace-encoder/src/main/groovy/org/grails/encoder/impl/URLCodecFactory.groovy similarity index 96% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/URLCodecFactory.groovy rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/URLCodecFactory.groovy index e90394f32a..9924a1079c 100644 --- a/grails-encoder/src/main/groovy/org/grails/encoder/impl/URLCodecFactory.groovy +++ b/grace-encoder/src/main/groovy/org/grails/encoder/impl/URLCodecFactory.groovy @@ -1,85 +1,85 @@ -/* - * Copyright 2004-2022 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 - * - * https://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.encoder.impl - -import groovy.transform.CompileStatic -import org.grails.encoder.CodecFactory -import org.grails.encoder.CodecIdentifier -import org.grails.encoder.Decoder -import org.grails.encoder.DefaultCodecIdentifier -import org.grails.encoder.Encoder - -/** - * Implements the 'www-form-urlencoded' encoding scheme, also misleadingly known as URL encoding. - * - * @see Chapter 17.13.4 Form content types - * of the HTML 4.01 Specification - * - * @since 2.4 - */ -@CompileStatic -class URLCodecFactory implements CodecFactory { - - static final CodecIdentifier URL_CODEC_IDENTIFIER = new DefaultCodecIdentifier('URL') - - Encoder encoder = new Encoder() { - - @Override - CodecIdentifier getCodecIdentifier() { - URL_CODEC_IDENTIFIER - } - - Object encode(Object o) { - if (o == null) { - return null - } - URLEncoder.encode(String.valueOf(o), resolveEncoding()) - } - - boolean isApplyToSafelyEncoded() { - true - } - - boolean isSafe() { - true - } - - void markEncoded(CharSequence string) { - } - - } - - Decoder decoder = new Decoder() { - - CodecIdentifier getCodecIdentifier() { - URL_CODEC_IDENTIFIER - } - - @Override - Object decode(Object o) { - if (o == null) { - return null - } - URLDecoder.decode(String.valueOf(o), resolveEncoding()) - } - - } - - protected String resolveEncoding() { - 'UTF-8' - } - -} +/* + * Copyright 2004-2022 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 + * + * https://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.encoder.impl + +import groovy.transform.CompileStatic +import org.grails.encoder.CodecFactory +import org.grails.encoder.CodecIdentifier +import org.grails.encoder.Decoder +import org.grails.encoder.DefaultCodecIdentifier +import org.grails.encoder.Encoder + +/** + * Implements the 'www-form-urlencoded' encoding scheme, also misleadingly known as URL encoding. + * + * @see Chapter 17.13.4 Form content types + * of the HTML 4.01 Specification + * + * @since 2.4 + */ +@CompileStatic +class URLCodecFactory implements CodecFactory { + + static final CodecIdentifier URL_CODEC_IDENTIFIER = new DefaultCodecIdentifier('URL') + + Encoder encoder = new Encoder() { + + @Override + CodecIdentifier getCodecIdentifier() { + URL_CODEC_IDENTIFIER + } + + Object encode(Object o) { + if (o == null) { + return null + } + URLEncoder.encode(String.valueOf(o), resolveEncoding()) + } + + boolean isApplyToSafelyEncoded() { + true + } + + boolean isSafe() { + true + } + + void markEncoded(CharSequence string) { + } + + } + + Decoder decoder = new Decoder() { + + CodecIdentifier getCodecIdentifier() { + URL_CODEC_IDENTIFIER + } + + @Override + Object decode(Object o) { + if (o == null) { + return null + } + URLDecoder.decode(String.valueOf(o), resolveEncoding()) + } + + } + + protected String resolveEncoding() { + 'UTF-8' + } + +} diff --git a/grails-encoder/src/main/groovy/org/grails/encoder/impl/XMLCodecFactory.java b/grace-encoder/src/main/groovy/org/grails/encoder/impl/XMLCodecFactory.java similarity index 100% rename from grails-encoder/src/main/groovy/org/grails/encoder/impl/XMLCodecFactory.java rename to grace-encoder/src/main/groovy/org/grails/encoder/impl/XMLCodecFactory.java diff --git a/grails-encoder/src/test/groovy/org/grails/buffer/StreamCharBufferGroovyTests.groovy b/grace-encoder/src/test/groovy/org/grails/buffer/StreamCharBufferGroovyTests.groovy similarity index 100% rename from grails-encoder/src/test/groovy/org/grails/buffer/StreamCharBufferGroovyTests.groovy rename to grace-encoder/src/test/groovy/org/grails/buffer/StreamCharBufferGroovyTests.groovy diff --git a/grails-encoder/src/test/groovy/org/grails/buffer/StreamCharBufferTests.java b/grace-encoder/src/test/groovy/org/grails/buffer/StreamCharBufferTests.java similarity index 100% rename from grails-encoder/src/test/groovy/org/grails/buffer/StreamCharBufferTests.java rename to grace-encoder/src/test/groovy/org/grails/buffer/StreamCharBufferTests.java diff --git a/grails-encoder/src/test/groovy/org/grails/charsequences/CharSequencesSpec.groovy b/grace-encoder/src/test/groovy/org/grails/charsequences/CharSequencesSpec.groovy similarity index 100% rename from grails-encoder/src/test/groovy/org/grails/charsequences/CharSequencesSpec.groovy rename to grace-encoder/src/test/groovy/org/grails/charsequences/CharSequencesSpec.groovy diff --git a/grails-encoder/src/test/groovy/org/grails/encoder/ChainedEncodersSpec.groovy b/grace-encoder/src/test/groovy/org/grails/encoder/ChainedEncodersSpec.groovy similarity index 100% rename from grails-encoder/src/test/groovy/org/grails/encoder/ChainedEncodersSpec.groovy rename to grace-encoder/src/test/groovy/org/grails/encoder/ChainedEncodersSpec.groovy diff --git a/grails-encoder/src/test/groovy/org/grails/encoder/DefaultEncodingStateRegistrySpec.groovy b/grace-encoder/src/test/groovy/org/grails/encoder/DefaultEncodingStateRegistrySpec.groovy similarity index 100% rename from grails-encoder/src/test/groovy/org/grails/encoder/DefaultEncodingStateRegistrySpec.groovy rename to grace-encoder/src/test/groovy/org/grails/encoder/DefaultEncodingStateRegistrySpec.groovy diff --git a/grails-encoder/src/test/groovy/org/grails/encoder/impl/BasicCodecLookupSpec.groovy b/grace-encoder/src/test/groovy/org/grails/encoder/impl/BasicCodecLookupSpec.groovy similarity index 100% rename from grails-encoder/src/test/groovy/org/grails/encoder/impl/BasicCodecLookupSpec.groovy rename to grace-encoder/src/test/groovy/org/grails/encoder/impl/BasicCodecLookupSpec.groovy diff --git a/grails-encoder/src/test/groovy/org/grails/encoder/impl/HTMLEncoderSpec.groovy b/grace-encoder/src/test/groovy/org/grails/encoder/impl/HTMLEncoderSpec.groovy similarity index 100% rename from grails-encoder/src/test/groovy/org/grails/encoder/impl/HTMLEncoderSpec.groovy rename to grace-encoder/src/test/groovy/org/grails/encoder/impl/HTMLEncoderSpec.groovy diff --git a/grails-encoder/src/test/groovy/org/grails/encoder/impl/JavaScriptCodecTests.groovy b/grace-encoder/src/test/groovy/org/grails/encoder/impl/JavaScriptCodecTests.groovy similarity index 100% rename from grails-encoder/src/test/groovy/org/grails/encoder/impl/JavaScriptCodecTests.groovy rename to grace-encoder/src/test/groovy/org/grails/encoder/impl/JavaScriptCodecTests.groovy diff --git a/grace-gradle-model/README.md b/grace-gradle-model/README.md new file mode 100644 index 0000000000..aa945c9f6c --- /dev/null +++ b/grace-gradle-model/README.md @@ -0,0 +1,2 @@ +## grace-gradle-model + diff --git a/grails-gradle-model/src/main/groovy/org/grails/gradle/plugin/model/DefaultGrailsClasspath.groovy b/grace-gradle-model/src/main/groovy/org/grails/gradle/plugin/model/DefaultGrailsClasspath.groovy similarity index 100% rename from grails-gradle-model/src/main/groovy/org/grails/gradle/plugin/model/DefaultGrailsClasspath.groovy rename to grace-gradle-model/src/main/groovy/org/grails/gradle/plugin/model/DefaultGrailsClasspath.groovy diff --git a/grails-gradle-model/src/main/groovy/org/grails/gradle/plugin/model/GrailsClasspath.groovy b/grace-gradle-model/src/main/groovy/org/grails/gradle/plugin/model/GrailsClasspath.groovy similarity index 100% rename from grails-gradle-model/src/main/groovy/org/grails/gradle/plugin/model/GrailsClasspath.groovy rename to grace-gradle-model/src/main/groovy/org/grails/gradle/plugin/model/GrailsClasspath.groovy diff --git a/grails-gradle-plugin/README.md b/grace-gradle-plugin/README.md similarity index 100% rename from grails-gradle-plugin/README.md rename to grace-gradle-plugin/README.md diff --git a/grace-gradle-plugin/build.gradle b/grace-gradle-plugin/build.gradle new file mode 100644 index 0000000000..0e649a295f --- /dev/null +++ b/grace-gradle-plugin/build.gradle @@ -0,0 +1,183 @@ +buildscript { + repositories { + maven { url "https://plugins.gradle.org/m2/" } + maven { url 'https://repo.gradle.org/gradle/libs-releases' } + } +} + +repositories { + mavenCentral() + maven { url "https://repo.grails.org/grails/core" } + maven { url 'https://repo.gradle.org/gradle/libs-releases' } +} + +ext.isSnapshot = version.endsWith("-SNAPSHOT") +ext.isReleaseVersion = !ext.isSnapshot +ext."signing.keyId" = System.getenv("SIGNING_KEY") ?: project.hasProperty("signing.keyId") ? project.getProperty('signing.keyId') : null +ext."signing.password" = System.getenv("SIGNING_PASSPHRASE") ?: project.hasProperty("signing.password") ? project.getProperty('signing.password') : null +ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile") ? project.getProperty('signing.secretKeyRingFile') : null + +apply plugin: 'java-gradle-plugin' +apply plugin: 'maven-publish' + +java { + withJavadocJar() + withSourcesJar() +} + +configurations { + documentation + compileClasspath { + exclude group: 'org.codehaus.groovy', module: 'groovy-xml' + } +} + +dependencies { + api project(":grace-bootstrap") + api project(":grace-gradle-model") + api project(":grace-shell"), { + exclude group: "org.slf4j", module: "slf4j-simple" + } + api gradleApi() + api libs.gradle.extra.configurations.plugin + api libs.gradle.nexus.publish.plugin + api libs.gradle.nexus.plugin + api libs.maven.model + api libs.spring.boot.gradle.plugin + api libs.spring.dependency.management.plugin + + documentation libs.jansi + documentation libs.groovy.picocli +} + +gradlePlugin { + plugins { + graceCore { + displayName = "Grace Core Gradle Plugin" + description = 'The main Grace gradle plugin implementation' + id = 'org.graceframework.grace-core' + implementationClass = 'org.grails.gradle.plugin.core.GrailsGradlePlugin' + } + graceDoc { + displayName = "Grace Doc Gradle Plugin" + description = 'Adds Grace doc publishing support' + id = 'org.graceframework.grace-doc' + implementationClass = 'org.grails.gradle.plugin.doc.GrailsDocGradlePlugin' + } + graceGsp { + displayName = "Grace GSP Gradle Plugin" + description = 'A plugin that adds support for compiling Groovy Server Pages (GSP)' + id = 'org.graceframework.grace-gsp' + implementationClass = 'org.grails.gradle.plugin.web.gsp.GroovyPagePlugin' + } + gracePlugin { + displayName = "Grace-Plugin Gradle Plugin" + description = 'A Gradle plugin for Grace plugins' + id = 'org.graceframework.grace-plugin' + implementationClass = 'org.grails.gradle.plugin.core.GrailsPluginGradlePlugin' + } + graceProfile { + displayName = "Grace Profile Gradle Plugin" + description = 'A plugin that is capable of compiling a Grace profile into a JAR file for distribution' + id = 'org.graceframework.grace-profile' + implementationClass = 'org.grails.gradle.plugin.profiles.GrailsProfileGradlePlugin' + } + graceWeb { + displayName = "Grace Web Gradle Plugin" + description = 'Adds web specific extensions' + id = 'org.graceframework.grace-web' + implementationClass = 'org.grails.gradle.plugin.web.GrailsWebGradlePlugin' + } + gracePluginPublish { + displayName = "Grace Publish Gradle Plugin" + description = 'A plugin to setup publishing to Grace central repo' + id = 'org.graceframework.internal.grace-plugin-publish' + implementationClass = 'org.grails.gradle.plugin.publishing.internal.GrailsCentralPublishGradlePlugin' + } + graceProfilePublish { + displayName = "Grace Profile Publish Plugin" + description = 'A plugin for publishing profiles' + id = 'org.graceframework.internal.grace-profile-publish' + implementationClass = 'org.grails.gradle.plugin.profiles.internal.GrailsProfilePublishGradlePlugin' + } + } +} + +jar { + manifest.mainAttributes( + "Built-By": System.properties['user.name'], + "Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")", + "Implementation-Title": "Grace", + "Implementation-Version": projectVersion, + "Implementation-Vendor": 'graceframework.org') +} + +configure([compileGroovy, compileTestGroovy]) { + groovyOptions.fork(memoryInitialSize: '128M', memoryMaximumSize: '1G') + groovyOptions.encoding = "UTF-8" + options.encoding = "UTF-8" +} + +configure([compileJava, compileTestJava]) { + options.deprecation = true + options.debug = true +} + +configure([groovydoc]) { + destinationDir = project.file("build/docs/api") + classpath += configurations.documentation +} + +configure([javadoc]) { + options.encoding "UTF-8" + options.docEncoding "UTF-8" + options.charSet "UTF-8" + options.jFlags "-Xms64M", "-Xmx512M" +} + +tasks.withType(Copy) { + configure { + duplicatesStrategy = DuplicatesStrategy.INCLUDE + } +} + +if (isReleaseVersion) { + afterEvaluate { + signing { + required { isReleaseVersion && gradle.taskGraph.hasTask("publish") } + Publication[] publications = new Publication[publishing.publications.size()] + publishing.publications.findAll().toArray(publications) + sign(publications) + } + } + + tasks.withType(Sign) { + onlyIf { isReleaseVersion } + } +} + +tasks.withType(io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository).configureEach { + shouldRunAfter(tasks.withType(Sign)) +} + +publishing { + publications { + pluginMaven(MavenPublication) { + pom { + name = "Grace Gradle Plugin" + description = "A Gradle plugin for Grace which provides a bunch of useful plugins" + } + } + } +} + +project.afterEvaluate { + project.publishing.publications.each { MavenPublication publication-> + if (publication.name != "pluginMaven" || publication.name != "maven") { + publication.pom.withXml { + def xml = asNode() + xml.children().last() + pomInfo + } + } + } +} diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/commands/ApplicationContextCommandTask.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/commands/ApplicationContextCommandTask.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/commands/ApplicationContextCommandTask.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/commands/ApplicationContextCommandTask.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/commands/ApplicationContextScriptTask.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/commands/ApplicationContextScriptTask.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/commands/ApplicationContextScriptTask.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/commands/ApplicationContextScriptTask.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsExtension.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsExtension.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsExtension.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsExtension.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/IntegrationTestGradlePlugin.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/IntegrationTestGradlePlugin.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/IntegrationTestGradlePlugin.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/IntegrationTestGradlePlugin.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/PluginDefiner.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/PluginDefiner.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/PluginDefiner.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/PluginDefiner.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/doc/GrailsDocGradlePlugin.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/doc/GrailsDocGradlePlugin.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/doc/GrailsDocGradlePlugin.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/doc/GrailsDocGradlePlugin.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/doc/PublishGuideTask.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/doc/PublishGuideTask.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/doc/PublishGuideTask.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/doc/PublishGuideTask.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/model/GrailsClasspathToolingModelBuilder.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/model/GrailsClasspathToolingModelBuilder.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/model/GrailsClasspathToolingModelBuilder.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/model/GrailsClasspathToolingModelBuilder.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/profiles/GrailsProfileGradlePlugin.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/profiles/GrailsProfileGradlePlugin.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/profiles/GrailsProfileGradlePlugin.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/profiles/GrailsProfileGradlePlugin.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/profiles/internal/GrailsProfilePublishGradlePlugin.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/profiles/internal/GrailsProfilePublishGradlePlugin.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/profiles/internal/GrailsProfilePublishGradlePlugin.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/profiles/internal/GrailsProfilePublishGradlePlugin.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/profiles/tasks/ProfileCompilerTask.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/profiles/tasks/ProfileCompilerTask.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/profiles/tasks/ProfileCompilerTask.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/profiles/tasks/ProfileCompilerTask.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/publishing/internal/GrailsCentralPublishGradlePlugin.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/publishing/internal/GrailsCentralPublishGradlePlugin.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/publishing/internal/GrailsCentralPublishGradlePlugin.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/publishing/internal/GrailsCentralPublishGradlePlugin.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/publishing/internal/GrailsPublishExtension.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/publishing/internal/GrailsPublishExtension.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/publishing/internal/GrailsPublishExtension.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/publishing/internal/GrailsPublishExtension.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/run/FindMainClassTask.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/run/FindMainClassTask.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/run/FindMainClassTask.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/run/FindMainClassTask.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/run/GrailsRunTask.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/run/GrailsRunTask.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/run/GrailsRunTask.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/run/GrailsRunTask.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/util/SourceSets.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/util/SourceSets.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/util/SourceSets.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/util/SourceSets.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/watch/GrailsWatchPlugin.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/watch/GrailsWatchPlugin.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/watch/GrailsWatchPlugin.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/watch/GrailsWatchPlugin.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/watch/WatchConfig.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/watch/WatchConfig.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/watch/WatchConfig.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/watch/WatchConfig.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/GrailsWebGradlePlugin.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/GrailsWebGradlePlugin.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/GrailsWebGradlePlugin.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/GrailsWebGradlePlugin.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPageCompileTask.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPageCompileTask.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPageCompileTask.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPageCompileTask.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPageForkCompileTask.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPageForkCompileTask.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPageForkCompileTask.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPageForkCompileTask.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPagePlugin.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPagePlugin.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPagePlugin.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GroovyPagePlugin.groovy diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GspCompileOptions.groovy b/grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GspCompileOptions.groovy similarity index 100% rename from grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GspCompileOptions.groovy rename to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/gsp/GspCompileOptions.groovy diff --git a/grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-core.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-core.properties similarity index 100% rename from grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-core.properties rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-core.properties diff --git a/grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-doc.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-doc.properties similarity index 100% rename from grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-doc.properties rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-doc.properties diff --git a/grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-gsp.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-gsp.properties similarity index 100% rename from grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-gsp.properties rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-gsp.properties diff --git a/grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-plugin.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-plugin.properties similarity index 100% rename from grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-plugin.properties rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-plugin.properties diff --git a/grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-profile.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-profile.properties similarity index 100% rename from grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-profile.properties rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-profile.properties diff --git a/grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-web.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-web.properties similarity index 100% rename from grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-web.properties rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.grails-web.properties diff --git a/grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.internal.grails-plugin-publish.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.internal.grails-plugin-publish.properties similarity index 100% rename from grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.internal.grails-plugin-publish.properties rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.internal.grails-plugin-publish.properties diff --git a/grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.internal.grails-profile-publish.properties b/grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.internal.grails-profile-publish.properties similarity index 100% rename from grails-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.internal.grails-profile-publish.properties rename to grace-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.grails.internal.grails-profile-publish.properties diff --git a/grails-logging/README.md b/grace-logging/README.md similarity index 87% rename from grails-logging/README.md rename to grace-logging/README.md index 63a238f5fc..0740c145d9 100644 --- a/grails-logging/README.md +++ b/grace-logging/README.md @@ -1,3 +1,3 @@ -## grails-logging +## grace-logging This subproject adds a log property to all artefacts. Refer to http://grails.github.io/grails-doc/latest/ref/Plug-ins/logging.html \ No newline at end of file diff --git a/grace-logging/build.gradle b/grace-logging/build.gradle new file mode 100644 index 0000000000..c71c8158ed --- /dev/null +++ b/grace-logging/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(":grace-core") +} diff --git a/grails-logging/src/main/groovy/org/grails/compiler/logging/LoggingTransformer.java b/grace-logging/src/main/groovy/org/grails/compiler/logging/LoggingTransformer.java similarity index 100% rename from grails-logging/src/main/groovy/org/grails/compiler/logging/LoggingTransformer.java rename to grace-logging/src/main/groovy/org/grails/compiler/logging/LoggingTransformer.java diff --git a/grails-logging/src/test/groovy/org/grails/compiler/logging/LoggingTransformerSpec.groovy b/grace-logging/src/test/groovy/org/grails/compiler/logging/LoggingTransformerSpec.groovy similarity index 100% rename from grails-logging/src/test/groovy/org/grails/compiler/logging/LoggingTransformerSpec.groovy rename to grace-logging/src/test/groovy/org/grails/compiler/logging/LoggingTransformerSpec.groovy diff --git a/grace-plugin-api/README.md b/grace-plugin-api/README.md new file mode 100644 index 0000000000..272742651d --- /dev/null +++ b/grace-plugin-api/README.md @@ -0,0 +1,2 @@ +## grace-plugin-api + diff --git a/grails-plugin-api/build.gradle b/grace-plugin-api/build.gradle similarity index 51% rename from grails-plugin-api/build.gradle rename to grace-plugin-api/build.gradle index b9d5501aec..004dfbc288 100644 --- a/grails-plugin-api/build.gradle +++ b/grace-plugin-api/build.gradle @@ -1,15 +1,15 @@ dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-spring") - api project(":grails-spring-boot") - api project(":grails-util") + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-spring") + api project(":grace-spring-boot") + api project(":grace-util") api libs.commons.lang3 api libs.grails.datastore.core api libs.spring.boot.autoconfigure - testImplementation project(":grails-test") + testImplementation project(":grace-test") testImplementation(libs.spring.jdbc) { exclude group: 'commons-logging', module:'commons-logging' } diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/DefaultGrailsPluginManager.java b/grace-plugin-api/src/main/groovy/grails/plugins/DefaultGrailsPluginManager.java similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/DefaultGrailsPluginManager.java rename to grace-plugin-api/src/main/groovy/grails/plugins/DefaultGrailsPluginManager.java diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/DynamicGrailsPlugin.java b/grace-plugin-api/src/main/groovy/grails/plugins/DynamicGrailsPlugin.java similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/DynamicGrailsPlugin.java rename to grace-plugin-api/src/main/groovy/grails/plugins/DynamicGrailsPlugin.java diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/DynamicPlugin.groovy b/grace-plugin-api/src/main/groovy/grails/plugins/DynamicPlugin.groovy similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/DynamicPlugin.groovy rename to grace-plugin-api/src/main/groovy/grails/plugins/DynamicPlugin.groovy diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/GrailsPlugin.java b/grace-plugin-api/src/main/groovy/grails/plugins/GrailsPlugin.java similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/GrailsPlugin.java rename to grace-plugin-api/src/main/groovy/grails/plugins/GrailsPlugin.java diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/GrailsPluginInfo.java b/grace-plugin-api/src/main/groovy/grails/plugins/GrailsPluginInfo.java similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/GrailsPluginInfo.java rename to grace-plugin-api/src/main/groovy/grails/plugins/GrailsPluginInfo.java diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/GrailsPluginManager.java b/grace-plugin-api/src/main/groovy/grails/plugins/GrailsPluginManager.java similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/GrailsPluginManager.java rename to grace-plugin-api/src/main/groovy/grails/plugins/GrailsPluginManager.java diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/GrailsVersionUtils.groovy b/grace-plugin-api/src/main/groovy/grails/plugins/GrailsVersionUtils.groovy similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/GrailsVersionUtils.groovy rename to grace-plugin-api/src/main/groovy/grails/plugins/GrailsVersionUtils.groovy diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/ModuleDescriptor.java b/grace-plugin-api/src/main/groovy/grails/plugins/ModuleDescriptor.java similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/ModuleDescriptor.java rename to grace-plugin-api/src/main/groovy/grails/plugins/ModuleDescriptor.java diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/ModuleDescriptorFactory.java b/grace-plugin-api/src/main/groovy/grails/plugins/ModuleDescriptorFactory.java similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/ModuleDescriptorFactory.java rename to grace-plugin-api/src/main/groovy/grails/plugins/ModuleDescriptorFactory.java diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/Plugin.groovy b/grace-plugin-api/src/main/groovy/grails/plugins/Plugin.groovy similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/Plugin.groovy rename to grace-plugin-api/src/main/groovy/grails/plugins/Plugin.groovy diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/PluginFilter.java b/grace-plugin-api/src/main/groovy/grails/plugins/PluginFilter.java similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/PluginFilter.java rename to grace-plugin-api/src/main/groovy/grails/plugins/PluginFilter.java diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/PluginManagerAware.java b/grace-plugin-api/src/main/groovy/grails/plugins/PluginManagerAware.java similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/PluginManagerAware.java rename to grace-plugin-api/src/main/groovy/grails/plugins/PluginManagerAware.java diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/PluginManagerLoader.groovy b/grace-plugin-api/src/main/groovy/grails/plugins/PluginManagerLoader.groovy similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/PluginManagerLoader.groovy rename to grace-plugin-api/src/main/groovy/grails/plugins/PluginManagerLoader.groovy diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/exceptions/PluginException.java b/grace-plugin-api/src/main/groovy/grails/plugins/exceptions/PluginException.java similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/exceptions/PluginException.java rename to grace-plugin-api/src/main/groovy/grails/plugins/exceptions/PluginException.java diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/module/DefaultModuleFactory.java b/grace-plugin-api/src/main/groovy/grails/plugins/module/DefaultModuleFactory.java similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/module/DefaultModuleFactory.java rename to grace-plugin-api/src/main/groovy/grails/plugins/module/DefaultModuleFactory.java diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/module/ModuleFactory.java b/grace-plugin-api/src/main/groovy/grails/plugins/module/ModuleFactory.java similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/module/ModuleFactory.java rename to grace-plugin-api/src/main/groovy/grails/plugins/module/ModuleFactory.java diff --git a/grails-plugin-api/src/main/groovy/grails/plugins/module/ModuleType.java b/grace-plugin-api/src/main/groovy/grails/plugins/module/ModuleType.java similarity index 100% rename from grails-plugin-api/src/main/groovy/grails/plugins/module/ModuleType.java rename to grace-plugin-api/src/main/groovy/grails/plugins/module/ModuleType.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/core/io/DefaultResourceLocator.java b/grace-plugin-api/src/main/groovy/org/grails/core/io/DefaultResourceLocator.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/core/io/DefaultResourceLocator.java rename to grace-plugin-api/src/main/groovy/org/grails/core/io/DefaultResourceLocator.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/core/io/PluginPathAwareFileSystemResourceLoader.java b/grace-plugin-api/src/main/groovy/org/grails/core/io/PluginPathAwareFileSystemResourceLoader.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/core/io/PluginPathAwareFileSystemResourceLoader.java rename to grace-plugin-api/src/main/groovy/org/grails/core/io/PluginPathAwareFileSystemResourceLoader.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/AbstractGrailsPlugin.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/AbstractGrailsPlugin.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/AbstractGrailsPlugin.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/AbstractGrailsPlugin.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/AbstractGrailsPluginManager.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/AbstractGrailsPluginManager.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/AbstractGrailsPluginManager.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/AbstractGrailsPluginManager.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/AbstractModuleDescriptor.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/AbstractModuleDescriptor.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/AbstractModuleDescriptor.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/AbstractModuleDescriptor.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/BasePluginFilter.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/BasePluginFilter.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/BasePluginFilter.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/BasePluginFilter.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/BinaryGrailsPlugin.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/BinaryGrailsPlugin.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/BinaryGrailsPlugin.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/BinaryGrailsPlugin.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/BinaryGrailsPluginDescriptor.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/BinaryGrailsPluginDescriptor.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/BinaryGrailsPluginDescriptor.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/BinaryGrailsPluginDescriptor.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/CorePluginFinder.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/CorePluginFinder.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/CorePluginFinder.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/CorePluginFinder.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/DefaultDynamicGrailsPlugin.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/DefaultDynamicGrailsPlugin.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/DefaultDynamicGrailsPlugin.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/DefaultDynamicGrailsPlugin.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/DefaultGrailsPlugin.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/DefaultGrailsPlugin.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/DefaultGrailsPlugin.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/DefaultGrailsPlugin.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/DefaultModuleDescriptorFactory.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/DefaultModuleDescriptorFactory.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/DefaultModuleDescriptorFactory.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/DefaultModuleDescriptorFactory.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/DynamicBinaryGrailsPlugin.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/DynamicBinaryGrailsPlugin.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/DynamicBinaryGrailsPlugin.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/DynamicBinaryGrailsPlugin.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/ExcludingPluginFilter.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/ExcludingPluginFilter.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/ExcludingPluginFilter.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/ExcludingPluginFilter.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/GrailsPluginArtefactHandler.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/GrailsPluginArtefactHandler.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/GrailsPluginArtefactHandler.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/GrailsPluginArtefactHandler.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/GrailsPluginClass.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/GrailsPluginClass.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/GrailsPluginClass.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/GrailsPluginClass.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/GrailsPluginManagerCustomizer.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/GrailsPluginManagerCustomizer.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/GrailsPluginManagerCustomizer.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/GrailsPluginManagerCustomizer.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/IdentityPluginFilter.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/IdentityPluginFilter.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/IdentityPluginFilter.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/IdentityPluginFilter.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/IncludingPluginFilter.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/IncludingPluginFilter.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/IncludingPluginFilter.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/IncludingPluginFilter.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/PluginFilterRetriever.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/PluginFilterRetriever.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/PluginFilterRetriever.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/PluginFilterRetriever.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/config/GrailsDynamicModuleConfiguration.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/config/GrailsDynamicModuleConfiguration.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/config/GrailsDynamicModuleConfiguration.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/config/GrailsDynamicModuleConfiguration.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/config/GrailsPluginManagerConfiguration.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/config/GrailsPluginManagerConfiguration.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/config/GrailsPluginManagerConfiguration.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/config/GrailsPluginManagerConfiguration.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/support/GrailsDynamicPluginRegistryPostProcessor.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/support/GrailsDynamicPluginRegistryPostProcessor.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/support/GrailsDynamicPluginRegistryPostProcessor.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/support/GrailsDynamicPluginRegistryPostProcessor.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/support/GrailsPluginsInfoApplicationContextInitializer.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/support/GrailsPluginsInfoApplicationContextInitializer.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/support/GrailsPluginsInfoApplicationContextInitializer.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/support/GrailsPluginsInfoApplicationContextInitializer.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/support/PluginManagerAwareBeanPostProcessor.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/support/PluginManagerAwareBeanPostProcessor.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/support/PluginManagerAwareBeanPostProcessor.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/support/PluginManagerAwareBeanPostProcessor.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/support/PluginManagerGroovyShellBindingCustomizer.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/support/PluginManagerGroovyShellBindingCustomizer.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/support/PluginManagerGroovyShellBindingCustomizer.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/support/PluginManagerGroovyShellBindingCustomizer.java diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/support/WatchPattern.groovy b/grace-plugin-api/src/main/groovy/org/grails/plugins/support/WatchPattern.groovy similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/support/WatchPattern.groovy rename to grace-plugin-api/src/main/groovy/org/grails/plugins/support/WatchPattern.groovy diff --git a/grails-plugin-api/src/main/groovy/org/grails/plugins/support/WatchPatternParser.java b/grace-plugin-api/src/main/groovy/org/grails/plugins/support/WatchPatternParser.java similarity index 100% rename from grails-plugin-api/src/main/groovy/org/grails/plugins/support/WatchPatternParser.java rename to grace-plugin-api/src/main/groovy/org/grails/plugins/support/WatchPatternParser.java diff --git a/grails-plugin-api/src/main/resources/META-INF/grails.factories b/grace-plugin-api/src/main/resources/META-INF/grails.factories similarity index 100% rename from grails-plugin-api/src/main/resources/META-INF/grails.factories rename to grace-plugin-api/src/main/resources/META-INF/grails.factories diff --git a/grails-plugin-api/src/main/resources/META-INF/spring.factories b/grace-plugin-api/src/main/resources/META-INF/spring.factories similarity index 100% rename from grails-plugin-api/src/main/resources/META-INF/spring.factories rename to grace-plugin-api/src/main/resources/META-INF/spring.factories diff --git a/grails-plugin-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/grace-plugin-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from grails-plugin-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to grace-plugin-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/grails-plugin-api/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerSpec.groovy b/grace-plugin-api/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerSpec.groovy similarity index 100% rename from grails-plugin-api/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerSpec.groovy rename to grace-plugin-api/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerSpec.groovy diff --git a/grails-plugin-api/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerTests.java b/grace-plugin-api/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerTests.java similarity index 100% rename from grails-plugin-api/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerTests.java rename to grace-plugin-api/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerTests.java diff --git a/grails-plugin-api/src/test/groovy/grails/plugins/VersionComparatorSpec.groovy b/grace-plugin-api/src/test/groovy/grails/plugins/VersionComparatorSpec.groovy similarity index 100% rename from grails-plugin-api/src/test/groovy/grails/plugins/VersionComparatorSpec.groovy rename to grace-plugin-api/src/test/groovy/grails/plugins/VersionComparatorSpec.groovy diff --git a/grails-plugin-api/src/test/groovy/org/grails/plugins/BinaryPluginSpec.groovy b/grace-plugin-api/src/test/groovy/org/grails/plugins/BinaryPluginSpec.groovy similarity index 100% rename from grails-plugin-api/src/test/groovy/org/grails/plugins/BinaryPluginSpec.groovy rename to grace-plugin-api/src/test/groovy/org/grails/plugins/BinaryPluginSpec.groovy diff --git a/grails-plugin-api/src/test/groovy/org/grails/plugins/DefaultGrailsPluginTests.java b/grace-plugin-api/src/test/groovy/org/grails/plugins/DefaultGrailsPluginTests.java similarity index 100% rename from grails-plugin-api/src/test/groovy/org/grails/plugins/DefaultGrailsPluginTests.java rename to grace-plugin-api/src/test/groovy/org/grails/plugins/DefaultGrailsPluginTests.java diff --git a/grails-plugin-api/src/test/groovy/org/grails/plugins/GrailsPluginTests.groovy b/grace-plugin-api/src/test/groovy/org/grails/plugins/GrailsPluginTests.groovy similarity index 100% rename from grails-plugin-api/src/test/groovy/org/grails/plugins/GrailsPluginTests.groovy rename to grace-plugin-api/src/test/groovy/org/grails/plugins/GrailsPluginTests.groovy diff --git a/grails-plugin-api/src/test/groovy/org/grails/plugins/PluginFilterFactoryTests.java b/grace-plugin-api/src/test/groovy/org/grails/plugins/PluginFilterFactoryTests.java similarity index 100% rename from grails-plugin-api/src/test/groovy/org/grails/plugins/PluginFilterFactoryTests.java rename to grace-plugin-api/src/test/groovy/org/grails/plugins/PluginFilterFactoryTests.java diff --git a/grails-plugin-api/src/test/groovy/org/grails/plugins/PluginLoadOrderTests.groovy b/grace-plugin-api/src/test/groovy/org/grails/plugins/PluginLoadOrderTests.groovy similarity index 100% rename from grails-plugin-api/src/test/groovy/org/grails/plugins/PluginLoadOrderTests.groovy rename to grace-plugin-api/src/test/groovy/org/grails/plugins/PluginLoadOrderTests.groovy diff --git a/grails-plugin-api/src/test/groovy/org/grails/plugins/support/WatchPatternParserSpec.groovy b/grace-plugin-api/src/test/groovy/org/grails/plugins/support/WatchPatternParserSpec.groovy similarity index 100% rename from grails-plugin-api/src/test/groovy/org/grails/plugins/support/WatchPatternParserSpec.groovy rename to grace-plugin-api/src/test/groovy/org/grails/plugins/support/WatchPatternParserSpec.groovy diff --git a/grails-plugin-api/src/test/groovy/org/grails/plugins/test/TestConfiguration.java b/grace-plugin-api/src/test/groovy/org/grails/plugins/test/TestConfiguration.java similarity index 100% rename from grails-plugin-api/src/test/groovy/org/grails/plugins/test/TestConfiguration.java rename to grace-plugin-api/src/test/groovy/org/grails/plugins/test/TestConfiguration.java diff --git a/grails-plugin-api/src/test/groovy/org/grails/plugins/test/TestService.java b/grace-plugin-api/src/test/groovy/org/grails/plugins/test/TestService.java similarity index 100% rename from grails-plugin-api/src/test/groovy/org/grails/plugins/test/TestService.java rename to grace-plugin-api/src/test/groovy/org/grails/plugins/test/TestService.java diff --git a/grace-plugin-codecs/README.md b/grace-plugin-codecs/README.md new file mode 100644 index 0000000000..15b56dc963 --- /dev/null +++ b/grace-plugin-codecs/README.md @@ -0,0 +1,2 @@ +## grace-plugin-codecs + diff --git a/grace-plugin-codecs/build.gradle b/grace-plugin-codecs/build.gradle new file mode 100644 index 0000000000..8eeb698a66 --- /dev/null +++ b/grace-plugin-codecs/build.gradle @@ -0,0 +1,12 @@ +dependencies { + api project(":grace-api") + api project(":grace-core") + api project(":grace-plugin-api") + api project(":grace-encoder") + runtimeOnly project(":grace-codecs") + + api(libs.spring.boot.autoconfigure) + + testImplementation project(":grace-test") + testImplementation project(":grace-web-common") +} diff --git a/grails-plugin-codecs/src/main/groovy/org/grails/commons/CodecArtefactHandler.java b/grace-plugin-codecs/src/main/groovy/org/grails/commons/CodecArtefactHandler.java similarity index 96% rename from grails-plugin-codecs/src/main/groovy/org/grails/commons/CodecArtefactHandler.java rename to grace-plugin-codecs/src/main/groovy/org/grails/commons/CodecArtefactHandler.java index 454a312833..6c634c5e15 100644 --- a/grails-plugin-codecs/src/main/groovy/org/grails/commons/CodecArtefactHandler.java +++ b/grace-plugin-codecs/src/main/groovy/org/grails/commons/CodecArtefactHandler.java @@ -1,42 +1,42 @@ -/* - * Copyright 2004-2022 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 - * - * https://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.commons; - -import grails.core.ArtefactHandlerAdapter; - -import org.grails.core.artefact.DomainClassArtefactHandler; - -/** - * @author Marc Palmer (marc@anyware.co.uk) - */ -public class CodecArtefactHandler extends ArtefactHandlerAdapter { - - public static final String TYPE = "Codec"; - - public CodecArtefactHandler() { - super(TYPE, GrailsCodecClass.class, DefaultGrailsCodecClass.class, TYPE); - } - - @Override - public boolean isArtefactClass(@SuppressWarnings("rawtypes") Class clazz) { - if (clazz == null) { - return false; - } - - return clazz.getName().endsWith(DefaultGrailsCodecClass.CODEC) && !DomainClassArtefactHandler.isDomainClass(clazz); - } - -} +/* + * Copyright 2004-2022 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 + * + * https://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.commons; + +import grails.core.ArtefactHandlerAdapter; + +import org.grails.core.artefact.DomainClassArtefactHandler; + +/** + * @author Marc Palmer (marc@anyware.co.uk) + */ +public class CodecArtefactHandler extends ArtefactHandlerAdapter { + + public static final String TYPE = "Codec"; + + public CodecArtefactHandler() { + super(TYPE, GrailsCodecClass.class, DefaultGrailsCodecClass.class, TYPE); + } + + @Override + public boolean isArtefactClass(@SuppressWarnings("rawtypes") Class clazz) { + if (clazz == null) { + return false; + } + + return clazz.getName().endsWith(DefaultGrailsCodecClass.CODEC) && !DomainClassArtefactHandler.isDomainClass(clazz); + } + +} diff --git a/grails-plugin-codecs/src/main/groovy/org/grails/commons/DefaultGrailsCodecClass.java b/grace-plugin-codecs/src/main/groovy/org/grails/commons/DefaultGrailsCodecClass.java similarity index 100% rename from grails-plugin-codecs/src/main/groovy/org/grails/commons/DefaultGrailsCodecClass.java rename to grace-plugin-codecs/src/main/groovy/org/grails/commons/DefaultGrailsCodecClass.java diff --git a/grails-plugin-codecs/src/main/groovy/org/grails/commons/GrailsCodecClass.java b/grace-plugin-codecs/src/main/groovy/org/grails/commons/GrailsCodecClass.java similarity index 100% rename from grails-plugin-codecs/src/main/groovy/org/grails/commons/GrailsCodecClass.java rename to grace-plugin-codecs/src/main/groovy/org/grails/commons/GrailsCodecClass.java diff --git a/grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/CodecsGrailsPlugin.groovy b/grace-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/CodecsGrailsPlugin.groovy similarity index 100% rename from grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/CodecsGrailsPlugin.groovy rename to grace-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/CodecsGrailsPlugin.groovy diff --git a/grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/CodecsPluginConfiguration.java b/grace-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/CodecsPluginConfiguration.java similarity index 100% rename from grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/CodecsPluginConfiguration.java rename to grace-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/CodecsPluginConfiguration.java diff --git a/grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/DefaultCodecLookup.java b/grace-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/DefaultCodecLookup.java similarity index 100% rename from grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/DefaultCodecLookup.java rename to grace-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/DefaultCodecLookup.java diff --git a/grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/HTMLCodec.java b/grace-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/HTMLCodec.java similarity index 100% rename from grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/HTMLCodec.java rename to grace-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/HTMLCodec.java diff --git a/grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/URLCodec.groovy b/grace-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/URLCodec.groovy similarity index 96% rename from grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/URLCodec.groovy rename to grace-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/URLCodec.groovy index 7e5598208d..91a3b478ce 100644 --- a/grails-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/URLCodec.groovy +++ b/grace-plugin-codecs/src/main/groovy/org/grails/plugins/codecs/URLCodec.groovy @@ -1,34 +1,34 @@ -/* - * Copyright 2004-2022 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 - * - * https://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.plugins.codecs - -import org.springframework.web.context.request.RequestContextHolder - -import org.grails.encoder.impl.URLCodecFactory - -/** - * A codec that encodes and decodes Objects to and from URL encoded strings. - * - * @author Marc Palmer - * @since 0.5 - */ -class URLCodec extends URLCodecFactory { - - protected String resolveEncoding() { - RequestContextHolder.getRequestAttributes()?.request?.characterEncoding ?: 'UTF-8' - } - -} +/* + * Copyright 2004-2022 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 + * + * https://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.plugins.codecs + +import org.springframework.web.context.request.RequestContextHolder + +import org.grails.encoder.impl.URLCodecFactory + +/** + * A codec that encodes and decodes Objects to and from URL encoded strings. + * + * @author Marc Palmer + * @since 0.5 + */ +class URLCodec extends URLCodecFactory { + + protected String resolveEncoding() { + RequestContextHolder.getRequestAttributes()?.request?.characterEncoding ?: 'UTF-8' + } + +} diff --git a/grails-plugin-codecs/src/main/resources/META-INF/grails-plugin.xml b/grace-plugin-codecs/src/main/resources/META-INF/grails-plugin.xml similarity index 100% rename from grails-plugin-codecs/src/main/resources/META-INF/grails-plugin.xml rename to grace-plugin-codecs/src/main/resources/META-INF/grails-plugin.xml diff --git a/grails-plugin-codecs/src/main/resources/META-INF/grails.factories b/grace-plugin-codecs/src/main/resources/META-INF/grails.factories similarity index 100% rename from grails-plugin-codecs/src/main/resources/META-INF/grails.factories rename to grace-plugin-codecs/src/main/resources/META-INF/grails.factories diff --git a/grails-plugin-codecs/src/main/resources/META-INF/spring.factories b/grace-plugin-codecs/src/main/resources/META-INF/spring.factories similarity index 100% rename from grails-plugin-codecs/src/main/resources/META-INF/spring.factories rename to grace-plugin-codecs/src/main/resources/META-INF/spring.factories diff --git a/grails-plugin-codecs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/grace-plugin-codecs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from grails-plugin-codecs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to grace-plugin-codecs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/grails-plugin-codecs/src/test/groovy/org/grails/web/codecs/HTMLCodecTests.groovy b/grace-plugin-codecs/src/test/groovy/org/grails/web/codecs/HTMLCodecTests.groovy similarity index 100% rename from grails-plugin-codecs/src/test/groovy/org/grails/web/codecs/HTMLCodecTests.groovy rename to grace-plugin-codecs/src/test/groovy/org/grails/web/codecs/HTMLCodecTests.groovy diff --git a/grails-plugin-codecs/src/test/groovy/org/grails/web/codecs/HTMLJSCodecSpec.groovy b/grace-plugin-codecs/src/test/groovy/org/grails/web/codecs/HTMLJSCodecSpec.groovy similarity index 100% rename from grails-plugin-codecs/src/test/groovy/org/grails/web/codecs/HTMLJSCodecSpec.groovy rename to grace-plugin-codecs/src/test/groovy/org/grails/web/codecs/HTMLJSCodecSpec.groovy diff --git a/grails-plugin-codecs/src/test/groovy/org/grails/web/codecs/URLCodecTests.groovy b/grace-plugin-codecs/src/test/groovy/org/grails/web/codecs/URLCodecTests.groovy similarity index 100% rename from grails-plugin-codecs/src/test/groovy/org/grails/web/codecs/URLCodecTests.groovy rename to grace-plugin-codecs/src/test/groovy/org/grails/web/codecs/URLCodecTests.groovy diff --git a/grace-plugin-controllers/README.md b/grace-plugin-controllers/README.md new file mode 100644 index 0000000000..4524c9a2d5 --- /dev/null +++ b/grace-plugin-controllers/README.md @@ -0,0 +1,2 @@ +## grace-plugin-controllers + diff --git a/grace-plugin-controllers/build.gradle b/grace-plugin-controllers/build.gradle new file mode 100644 index 0000000000..0c33d4b4c1 --- /dev/null +++ b/grace-plugin-controllers/build.gradle @@ -0,0 +1,14 @@ +dependencies { + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-core") + api project(":grace-plugin-api") + api project(":grace-plugin-mimetypes") + api project(":grace-plugin-validation") + api project(":grace-util") + api project(":grace-web") + + api(libs.spring.boot.autoconfigure) + + testImplementation project(":grace-test") +} diff --git a/grails-plugin-controllers/src/main/groovy/grails/artefact/Controller.groovy b/grace-plugin-controllers/src/main/groovy/grails/artefact/Controller.groovy similarity index 100% rename from grails-plugin-controllers/src/main/groovy/grails/artefact/Controller.groovy rename to grace-plugin-controllers/src/main/groovy/grails/artefact/Controller.groovy diff --git a/grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/AllowedMethodsHelper.groovy b/grace-plugin-controllers/src/main/groovy/grails/artefact/controller/support/AllowedMethodsHelper.groovy similarity index 100% rename from grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/AllowedMethodsHelper.groovy rename to grace-plugin-controllers/src/main/groovy/grails/artefact/controller/support/AllowedMethodsHelper.groovy diff --git a/grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/RequestForwarder.groovy b/grace-plugin-controllers/src/main/groovy/grails/artefact/controller/support/RequestForwarder.groovy similarity index 100% rename from grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/RequestForwarder.groovy rename to grace-plugin-controllers/src/main/groovy/grails/artefact/controller/support/RequestForwarder.groovy diff --git a/grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRedirector.groovy b/grace-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRedirector.groovy similarity index 100% rename from grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRedirector.groovy rename to grace-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRedirector.groovy diff --git a/grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy b/grace-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy similarity index 100% rename from grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy rename to grace-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy diff --git a/grails-plugin-controllers/src/main/groovy/grails/compiler/traits/ControllerTraitInjector.groovy b/grace-plugin-controllers/src/main/groovy/grails/compiler/traits/ControllerTraitInjector.groovy similarity index 100% rename from grails-plugin-controllers/src/main/groovy/grails/compiler/traits/ControllerTraitInjector.groovy rename to grace-plugin-controllers/src/main/groovy/grails/compiler/traits/ControllerTraitInjector.groovy diff --git a/grails-plugin-controllers/src/main/groovy/grails/web/Controller.groovy b/grace-plugin-controllers/src/main/groovy/grails/web/Controller.groovy similarity index 100% rename from grails-plugin-controllers/src/main/groovy/grails/web/Controller.groovy rename to grace-plugin-controllers/src/main/groovy/grails/web/Controller.groovy diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java b/grace-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java similarity index 100% rename from grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java rename to grace-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerArtefactTypeTransformation.java b/grace-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerArtefactTypeTransformation.java similarity index 100% rename from grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerArtefactTypeTransformation.java rename to grace-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerArtefactTypeTransformation.java diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerDomainTransformer.java b/grace-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerDomainTransformer.java similarity index 100% rename from grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerDomainTransformer.java rename to grace-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerDomainTransformer.java diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllerExceptionHandlerMetaData.java b/grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllerExceptionHandlerMetaData.java similarity index 100% rename from grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllerExceptionHandlerMetaData.java rename to grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllerExceptionHandlerMetaData.java diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersGrailsPlugin.groovy b/grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersGrailsPlugin.groovy similarity index 100% rename from grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersGrailsPlugin.groovy rename to grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersGrailsPlugin.groovy diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersPluginConfiguration.java b/grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersPluginConfiguration.java similarity index 100% rename from grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersPluginConfiguration.java rename to grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersPluginConfiguration.java diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/DefaultControllerExceptionHandlerMetaData.groovy b/grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/DefaultControllerExceptionHandlerMetaData.groovy similarity index 100% rename from grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/DefaultControllerExceptionHandlerMetaData.groovy rename to grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/DefaultControllerExceptionHandlerMetaData.groovy diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/api/ControllersDomainBindingApi.java b/grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/api/ControllersDomainBindingApi.java similarity index 100% rename from grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/api/ControllersDomainBindingApi.java rename to grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/api/ControllersDomainBindingApi.java diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/metaclass/RenderDynamicMethod.java b/grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/metaclass/RenderDynamicMethod.java similarity index 100% rename from grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/metaclass/RenderDynamicMethod.java rename to grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/metaclass/RenderDynamicMethod.java diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/servlet/context/BootStrapClassRunner.groovy b/grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/servlet/context/BootStrapClassRunner.groovy similarity index 100% rename from grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/servlet/context/BootStrapClassRunner.groovy rename to grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/servlet/context/BootStrapClassRunner.groovy diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/servlet/mvc/InvalidResponseHandler.groovy b/grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/servlet/mvc/InvalidResponseHandler.groovy similarity index 100% rename from grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/servlet/mvc/InvalidResponseHandler.groovy rename to grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/servlet/mvc/InvalidResponseHandler.groovy diff --git a/grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/servlet/mvc/ValidResponseHandler.groovy b/grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/servlet/mvc/ValidResponseHandler.groovy similarity index 100% rename from grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/servlet/mvc/ValidResponseHandler.groovy rename to grace-plugin-controllers/src/main/groovy/org/grails/plugins/web/servlet/mvc/ValidResponseHandler.groovy diff --git a/grails-plugin-controllers/src/main/resources/META-INF/grails-plugin.xml b/grace-plugin-controllers/src/main/resources/META-INF/grails-plugin.xml similarity index 100% rename from grails-plugin-controllers/src/main/resources/META-INF/grails-plugin.xml rename to grace-plugin-controllers/src/main/resources/META-INF/grails-plugin.xml diff --git a/grails-plugin-controllers/src/main/resources/META-INF/grails.factories b/grace-plugin-controllers/src/main/resources/META-INF/grails.factories similarity index 100% rename from grails-plugin-controllers/src/main/resources/META-INF/grails.factories rename to grace-plugin-controllers/src/main/resources/META-INF/grails.factories diff --git a/grails-plugin-controllers/src/main/resources/META-INF/spring.factories b/grace-plugin-controllers/src/main/resources/META-INF/spring.factories similarity index 100% rename from grails-plugin-controllers/src/main/resources/META-INF/spring.factories rename to grace-plugin-controllers/src/main/resources/META-INF/spring.factories diff --git a/grails-plugin-controllers/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/grace-plugin-controllers/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from grails-plugin-controllers/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to grace-plugin-controllers/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/grails-plugin-controllers/src/test/groovy/grails/artefact/ControllerTraitGeneratedSpec.groovy b/grace-plugin-controllers/src/test/groovy/grails/artefact/ControllerTraitGeneratedSpec.groovy similarity index 100% rename from grails-plugin-controllers/src/test/groovy/grails/artefact/ControllerTraitGeneratedSpec.groovy rename to grace-plugin-controllers/src/test/groovy/grails/artefact/ControllerTraitGeneratedSpec.groovy diff --git a/grails-plugin-controllers/src/test/groovy/grails/artefact/controller/support/AllowedMethodsHelperSpec.groovy b/grace-plugin-controllers/src/test/groovy/grails/artefact/controller/support/AllowedMethodsHelperSpec.groovy similarity index 100% rename from grails-plugin-controllers/src/test/groovy/grails/artefact/controller/support/AllowedMethodsHelperSpec.groovy rename to grace-plugin-controllers/src/test/groovy/grails/artefact/controller/support/AllowedMethodsHelperSpec.groovy diff --git a/grails-plugin-controllers/src/test/groovy/grails/artefact/controller/support/RequestForwarderSpec.groovy b/grace-plugin-controllers/src/test/groovy/grails/artefact/controller/support/RequestForwarderSpec.groovy similarity index 100% rename from grails-plugin-controllers/src/test/groovy/grails/artefact/controller/support/RequestForwarderSpec.groovy rename to grace-plugin-controllers/src/test/groovy/grails/artefact/controller/support/RequestForwarderSpec.groovy diff --git a/grails-plugin-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerClosureActionOverridingSpec.groovy b/grace-plugin-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerClosureActionOverridingSpec.groovy similarity index 100% rename from grails-plugin-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerClosureActionOverridingSpec.groovy rename to grace-plugin-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerClosureActionOverridingSpec.groovy diff --git a/grails-plugin-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerCompilationErrorsSpec.groovy b/grace-plugin-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerCompilationErrorsSpec.groovy similarity index 100% rename from grails-plugin-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerCompilationErrorsSpec.groovy rename to grace-plugin-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerCompilationErrorsSpec.groovy diff --git a/grails-plugin-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerSpec.groovy b/grace-plugin-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerSpec.groovy similarity index 100% rename from grails-plugin-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerSpec.groovy rename to grace-plugin-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerSpec.groovy diff --git a/grace-plugin-converters/README.md b/grace-plugin-converters/README.md new file mode 100644 index 0000000000..cd2048d207 --- /dev/null +++ b/grace-plugin-converters/README.md @@ -0,0 +1 @@ +## grace-plugin-converters diff --git a/grails-plugin-converters/build.gradle b/grace-plugin-converters/build.gradle similarity index 50% rename from grails-plugin-converters/build.gradle rename to grace-plugin-converters/build.gradle index 40f1e359e4..f256735749 100644 --- a/grails-plugin-converters/build.gradle +++ b/grace-plugin-converters/build.gradle @@ -1,11 +1,11 @@ dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-core") - api project(":grails-plugin-api") - runtimeOnly project(":grails-plugin-controllers") - api project(":grails-util") - api project(":grails-web-common") + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-core") + api project(":grace-plugin-api") + runtimeOnly project(":grace-plugin-controllers") + api project(":grace-util") + api project(":grace-web-common") api libs.commons.lang3 compileOnly(libs.grails.datastore.core) { diff --git a/grails-plugin-converters/src/main/groovy/grails/converters/JSON.java b/grace-plugin-converters/src/main/groovy/grails/converters/JSON.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/grails/converters/JSON.java rename to grace-plugin-converters/src/main/groovy/grails/converters/JSON.java diff --git a/grails-plugin-converters/src/main/groovy/grails/converters/XML.java b/grace-plugin-converters/src/main/groovy/grails/converters/XML.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/grails/converters/XML.java rename to grace-plugin-converters/src/main/groovy/grails/converters/XML.java diff --git a/grails-plugin-converters/src/main/groovy/grails/encoders/JSONEncoder.java b/grace-plugin-converters/src/main/groovy/grails/encoders/JSONEncoder.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/grails/encoders/JSONEncoder.java rename to grace-plugin-converters/src/main/groovy/grails/encoders/JSONEncoder.java diff --git a/grails-plugin-converters/src/main/groovy/grails/encoders/XMLEncoder.java b/grace-plugin-converters/src/main/groovy/grails/encoders/XMLEncoder.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/grails/encoders/XMLEncoder.java rename to grace-plugin-converters/src/main/groovy/grails/encoders/XMLEncoder.java diff --git a/grails-plugin-converters/src/main/groovy/grails/web/JSONBuilder.groovy b/grace-plugin-converters/src/main/groovy/grails/web/JSONBuilder.groovy similarity index 100% rename from grails-plugin-converters/src/main/groovy/grails/web/JSONBuilder.groovy rename to grace-plugin-converters/src/main/groovy/grails/web/JSONBuilder.groovy diff --git a/grails-plugin-converters/src/main/groovy/org/grails/compiler/web/converters/ConvertersDomainTransformer.java b/grace-plugin-converters/src/main/groovy/org/grails/compiler/web/converters/ConvertersDomainTransformer.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/compiler/web/converters/ConvertersDomainTransformer.java rename to grace-plugin-converters/src/main/groovy/org/grails/compiler/web/converters/ConvertersDomainTransformer.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/compiler/web/converters/RenderConverterTrait.groovy b/grace-plugin-converters/src/main/groovy/org/grails/compiler/web/converters/RenderConverterTrait.groovy similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/compiler/web/converters/RenderConverterTrait.groovy rename to grace-plugin-converters/src/main/groovy/org/grails/compiler/web/converters/RenderConverterTrait.groovy diff --git a/grails-plugin-converters/src/main/groovy/org/grails/plugins/codecs/JSONCodec.java b/grace-plugin-converters/src/main/groovy/org/grails/plugins/codecs/JSONCodec.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/plugins/codecs/JSONCodec.java rename to grace-plugin-converters/src/main/groovy/org/grails/plugins/codecs/JSONCodec.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/plugins/codecs/XMLCodec.java b/grace-plugin-converters/src/main/groovy/org/grails/plugins/codecs/XMLCodec.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/plugins/codecs/XMLCodec.java rename to grace-plugin-converters/src/main/groovy/org/grails/plugins/codecs/XMLCodec.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/plugins/converters/ConvertersGrailsPlugin.groovy b/grace-plugin-converters/src/main/groovy/org/grails/plugins/converters/ConvertersGrailsPlugin.groovy similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/plugins/converters/ConvertersGrailsPlugin.groovy rename to grace-plugin-converters/src/main/groovy/org/grails/plugins/converters/ConvertersGrailsPlugin.groovy diff --git a/grails-plugin-converters/src/main/groovy/org/grails/plugins/converters/api/ConvertersApi.java b/grace-plugin-converters/src/main/groovy/org/grails/plugins/converters/api/ConvertersApi.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/plugins/converters/api/ConvertersApi.java rename to grace-plugin-converters/src/main/groovy/org/grails/plugins/converters/api/ConvertersApi.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/AbstractConverter.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/AbstractConverter.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/AbstractConverter.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/AbstractConverter.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/AbstractParsingParameterCreationListener.groovy b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/AbstractParsingParameterCreationListener.groovy similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/AbstractParsingParameterCreationListener.groovy rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/AbstractParsingParameterCreationListener.groovy diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/ConfigurableConverter.groovy b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/ConfigurableConverter.groovy similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/ConfigurableConverter.groovy rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/ConfigurableConverter.groovy diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/Converter.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/Converter.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/Converter.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/Converter.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/ConverterUtil.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/ConverterUtil.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/ConverterUtil.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/ConverterUtil.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/ConvertersExtension.groovy b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/ConvertersExtension.groovy similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/ConvertersExtension.groovy rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/ConvertersExtension.groovy diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/IncludeExcludeConverter.groovy b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/IncludeExcludeConverter.groovy similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/IncludeExcludeConverter.groovy rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/IncludeExcludeConverter.groovy diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ChainedConverterConfiguration.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ChainedConverterConfiguration.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ChainedConverterConfiguration.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ChainedConverterConfiguration.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ConverterConfiguration.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ConverterConfiguration.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ConverterConfiguration.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ConverterConfiguration.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ConvertersConfigurationHolder.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ConvertersConfigurationHolder.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ConvertersConfigurationHolder.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ConvertersConfigurationHolder.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ConvertersConfigurationInitializer.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ConvertersConfigurationInitializer.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ConvertersConfigurationInitializer.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ConvertersConfigurationInitializer.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/DefaultConverterConfiguration.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/DefaultConverterConfiguration.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/DefaultConverterConfiguration.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/DefaultConverterConfiguration.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ImmutableConverterConfiguration.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ImmutableConverterConfiguration.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ImmutableConverterConfiguration.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ImmutableConverterConfiguration.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ObjectMarshallerRegisterer.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ObjectMarshallerRegisterer.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ObjectMarshallerRegisterer.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/configuration/ObjectMarshallerRegisterer.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/exceptions/ConverterException.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/exceptions/ConverterException.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/exceptions/ConverterException.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/exceptions/ConverterException.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ByDatasourceDomainClassFetcher.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ByDatasourceDomainClassFetcher.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ByDatasourceDomainClassFetcher.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ByDatasourceDomainClassFetcher.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ByGrailsApplicationDomainClassFetcher.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ByGrailsApplicationDomainClassFetcher.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ByGrailsApplicationDomainClassFetcher.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ByGrailsApplicationDomainClassFetcher.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ClosureObjectMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ClosureObjectMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ClosureObjectMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ClosureObjectMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/DomainClassFetcher.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/DomainClassFetcher.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/DomainClassFetcher.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/DomainClassFetcher.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/IncludeExcludePropertyMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/IncludeExcludePropertyMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/IncludeExcludePropertyMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/IncludeExcludePropertyMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/NameAwareMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/NameAwareMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/NameAwareMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/NameAwareMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ObjectMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ObjectMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ObjectMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ObjectMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ProxyUnwrappingMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ProxyUnwrappingMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ProxyUnwrappingMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/ProxyUnwrappingMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ArrayMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ArrayMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ArrayMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ArrayMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ByteArrayMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ByteArrayMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ByteArrayMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ByteArrayMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/CollectionMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/CollectionMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/CollectionMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/CollectionMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/DateMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/DateMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/DateMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/DateMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/DeepDomainClassMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/DeepDomainClassMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/DeepDomainClassMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/DeepDomainClassMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/DomainClassMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/DomainClassMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/DomainClassMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/DomainClassMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/EnumMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/EnumMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/EnumMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/EnumMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/GenericJavaBeanMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/GenericJavaBeanMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/GenericJavaBeanMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/GenericJavaBeanMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/GroovyBeanMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/GroovyBeanMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/GroovyBeanMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/GroovyBeanMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/InstanceMethodBasedMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/InstanceMethodBasedMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/InstanceMethodBasedMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/InstanceMethodBasedMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/JavascriptDateMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/JavascriptDateMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/JavascriptDateMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/JavascriptDateMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/LocalDateMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/LocalDateMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/LocalDateMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/LocalDateMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/MapMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/MapMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/MapMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/MapMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ToStringBeanMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ToStringBeanMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ToStringBeanMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ToStringBeanMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ValidationErrorsMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ValidationErrorsMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ValidationErrorsMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/json/ValidationErrorsMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/ArrayMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/ArrayMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/ArrayMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/ArrayMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/Base64ByteArrayMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/Base64ByteArrayMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/Base64ByteArrayMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/Base64ByteArrayMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/CollectionMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/CollectionMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/CollectionMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/CollectionMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/DateMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/DateMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/DateMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/DateMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/DeepDomainClassMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/DeepDomainClassMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/DeepDomainClassMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/DeepDomainClassMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/DomainClassMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/DomainClassMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/DomainClassMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/DomainClassMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/EnumMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/EnumMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/EnumMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/EnumMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/GenericJavaBeanMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/GenericJavaBeanMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/GenericJavaBeanMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/GenericJavaBeanMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/GroovyBeanMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/GroovyBeanMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/GroovyBeanMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/GroovyBeanMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/InstanceMethodBasedMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/InstanceMethodBasedMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/InstanceMethodBasedMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/InstanceMethodBasedMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/MapMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/MapMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/MapMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/MapMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/ToStringBeanMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/ToStringBeanMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/ToStringBeanMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/ToStringBeanMarshaller.java diff --git a/grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/ValidationErrorsMarshaller.java b/grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/ValidationErrorsMarshaller.java similarity index 100% rename from grails-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/ValidationErrorsMarshaller.java rename to grace-plugin-converters/src/main/groovy/org/grails/web/converters/marshaller/xml/ValidationErrorsMarshaller.java diff --git a/grails-plugin-converters/src/main/resources/META-INF/grails-plugin.xml b/grace-plugin-converters/src/main/resources/META-INF/grails-plugin.xml similarity index 100% rename from grails-plugin-converters/src/main/resources/META-INF/grails-plugin.xml rename to grace-plugin-converters/src/main/resources/META-INF/grails-plugin.xml diff --git a/grails-plugin-converters/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/grace-plugin-converters/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule similarity index 100% rename from grails-plugin-converters/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule rename to grace-plugin-converters/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule diff --git a/grails-plugin-converters/src/test/groovy/grails/converters/ParsingNullJsonValuesSpec.groovy b/grace-plugin-converters/src/test/groovy/grails/converters/ParsingNullJsonValuesSpec.groovy similarity index 100% rename from grails-plugin-converters/src/test/groovy/grails/converters/ParsingNullJsonValuesSpec.groovy rename to grace-plugin-converters/src/test/groovy/grails/converters/ParsingNullJsonValuesSpec.groovy diff --git a/grails-plugin-converters/src/test/groovy/org/grails/compiler/web/converters/ConvertersDomainTransformerSpec.groovy b/grace-plugin-converters/src/test/groovy/org/grails/compiler/web/converters/ConvertersDomainTransformerSpec.groovy similarity index 100% rename from grails-plugin-converters/src/test/groovy/org/grails/compiler/web/converters/ConvertersDomainTransformerSpec.groovy rename to grace-plugin-converters/src/test/groovy/org/grails/compiler/web/converters/ConvertersDomainTransformerSpec.groovy diff --git a/grails-plugin-converters/src/test/groovy/org/grails/plugins/converters/api/ConvertersApiSpec.groovy b/grace-plugin-converters/src/test/groovy/org/grails/plugins/converters/api/ConvertersApiSpec.groovy similarity index 100% rename from grails-plugin-converters/src/test/groovy/org/grails/plugins/converters/api/ConvertersApiSpec.groovy rename to grace-plugin-converters/src/test/groovy/org/grails/plugins/converters/api/ConvertersApiSpec.groovy diff --git a/grails-plugin-converters/src/test/groovy/org/grails/plugins/encoders/JSONEncoderSpec.groovy b/grace-plugin-converters/src/test/groovy/org/grails/plugins/encoders/JSONEncoderSpec.groovy similarity index 100% rename from grails-plugin-converters/src/test/groovy/org/grails/plugins/encoders/JSONEncoderSpec.groovy rename to grace-plugin-converters/src/test/groovy/org/grails/plugins/encoders/JSONEncoderSpec.groovy diff --git a/grails-plugin-converters/src/test/groovy/org/grails/web/converters/ConverterUtilSpec.groovy b/grace-plugin-converters/src/test/groovy/org/grails/web/converters/ConverterUtilSpec.groovy similarity index 100% rename from grails-plugin-converters/src/test/groovy/org/grails/web/converters/ConverterUtilSpec.groovy rename to grace-plugin-converters/src/test/groovy/org/grails/web/converters/ConverterUtilSpec.groovy diff --git a/grails-plugin-converters/src/test/groovy/org/grails/web/converters/marshaller/json/DomainClassMarshallerSpec.groovy b/grace-plugin-converters/src/test/groovy/org/grails/web/converters/marshaller/json/DomainClassMarshallerSpec.groovy similarity index 100% rename from grails-plugin-converters/src/test/groovy/org/grails/web/converters/marshaller/json/DomainClassMarshallerSpec.groovy rename to grace-plugin-converters/src/test/groovy/org/grails/web/converters/marshaller/json/DomainClassMarshallerSpec.groovy diff --git a/grails-plugin-converters/src/test/groovy/org/grails/web/converters/marshaller/json/ValidationErrorsMarshallerSpec.groovy b/grace-plugin-converters/src/test/groovy/org/grails/web/converters/marshaller/json/ValidationErrorsMarshallerSpec.groovy similarity index 100% rename from grails-plugin-converters/src/test/groovy/org/grails/web/converters/marshaller/json/ValidationErrorsMarshallerSpec.groovy rename to grace-plugin-converters/src/test/groovy/org/grails/web/converters/marshaller/json/ValidationErrorsMarshallerSpec.groovy diff --git a/grace-plugin-core/README.md b/grace-plugin-core/README.md new file mode 100644 index 0000000000..0848d55de9 --- /dev/null +++ b/grace-plugin-core/README.md @@ -0,0 +1,2 @@ +## grace-plugin-core + diff --git a/grails-plugin-core/build.gradle b/grace-plugin-core/build.gradle similarity index 60% rename from grails-plugin-core/build.gradle rename to grace-plugin-core/build.gradle index 1bf76a2132..1d62c34859 100644 --- a/grails-plugin-core/build.gradle +++ b/grace-plugin-core/build.gradle @@ -1,15 +1,15 @@ dependencies { - api project(":grails-api") - api project(":grails-plugin-api") - api project(":grails-spring") - api project(":grails-spring-boot") + api project(":grace-api") + api project(":grace-plugin-api") + api project(":grace-spring") + api project(":grace-spring-boot") api libs.spring.beans api libs.spring.boot.autoconfigure api libs.spring.context api libs.spring.core - testImplementation project(":grails-test") + testImplementation project(":grace-test") testImplementation libs.spring.test testRuntimeOnly libs.spring.aspects testRuntimeOnly libs.aspectj.rt diff --git a/grails-plugin-core/src/main/groovy/org/grails/dev/support/DevelopmentShutdownHook.groovy b/grace-plugin-core/src/main/groovy/org/grails/dev/support/DevelopmentShutdownHook.groovy similarity index 100% rename from grails-plugin-core/src/main/groovy/org/grails/dev/support/DevelopmentShutdownHook.groovy rename to grace-plugin-core/src/main/groovy/org/grails/dev/support/DevelopmentShutdownHook.groovy diff --git a/grails-plugin-core/src/main/groovy/org/grails/plugins/core/CoreConfiguration.java b/grace-plugin-core/src/main/groovy/org/grails/plugins/core/CoreConfiguration.java similarity index 100% rename from grails-plugin-core/src/main/groovy/org/grails/plugins/core/CoreConfiguration.java rename to grace-plugin-core/src/main/groovy/org/grails/plugins/core/CoreConfiguration.java diff --git a/grails-plugin-core/src/main/groovy/org/grails/plugins/core/CoreGrailsPlugin.groovy b/grace-plugin-core/src/main/groovy/org/grails/plugins/core/CoreGrailsPlugin.groovy similarity index 100% rename from grails-plugin-core/src/main/groovy/org/grails/plugins/core/CoreGrailsPlugin.groovy rename to grace-plugin-core/src/main/groovy/org/grails/plugins/core/CoreGrailsPlugin.groovy diff --git a/grails-plugin-core/src/main/groovy/org/grails/plugins/core/PropertyPlaceholderConfiguration.java b/grace-plugin-core/src/main/groovy/org/grails/plugins/core/PropertyPlaceholderConfiguration.java similarity index 100% rename from grails-plugin-core/src/main/groovy/org/grails/plugins/core/PropertyPlaceholderConfiguration.java rename to grace-plugin-core/src/main/groovy/org/grails/plugins/core/PropertyPlaceholderConfiguration.java diff --git a/grails-plugin-core/src/main/resources/META-INF/grails-plugin.xml b/grace-plugin-core/src/main/resources/META-INF/grails-plugin.xml similarity index 100% rename from grails-plugin-core/src/main/resources/META-INF/grails-plugin.xml rename to grace-plugin-core/src/main/resources/META-INF/grails-plugin.xml diff --git a/grails-plugin-core/src/main/resources/META-INF/spring.factories b/grace-plugin-core/src/main/resources/META-INF/spring.factories similarity index 100% rename from grails-plugin-core/src/main/resources/META-INF/spring.factories rename to grace-plugin-core/src/main/resources/META-INF/spring.factories diff --git a/grails-plugin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/grace-plugin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from grails-plugin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to grace-plugin-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/grails-plugin-core/src/test/groovy/org/grails/plugins/core/CoreGrailsPluginTests.groovy b/grace-plugin-core/src/test/groovy/org/grails/plugins/core/CoreGrailsPluginTests.groovy similarity index 100% rename from grails-plugin-core/src/test/groovy/org/grails/plugins/core/CoreGrailsPluginTests.groovy rename to grace-plugin-core/src/test/groovy/org/grails/plugins/core/CoreGrailsPluginTests.groovy diff --git a/grace-plugin-databinding/README.md b/grace-plugin-databinding/README.md new file mode 100644 index 0000000000..09e59405d6 --- /dev/null +++ b/grace-plugin-databinding/README.md @@ -0,0 +1,2 @@ +## grace-plugin-databinding + diff --git a/grace-plugin-databinding/build.gradle b/grace-plugin-databinding/build.gradle new file mode 100644 index 0000000000..daa4a04628 --- /dev/null +++ b/grace-plugin-databinding/build.gradle @@ -0,0 +1,9 @@ + dependencies { + api project(":grace-api") + api project(":grace-plugin-api") + api project(":grace-web-databinding") + + api libs.spring.boot.autoconfigure + + testImplementation project(":grace-test-support") +} diff --git a/grails-plugin-databinding/src/main/groovy/org/grails/databinding/converters/DefaultConvertersConfiguration.java b/grace-plugin-databinding/src/main/groovy/org/grails/databinding/converters/DefaultConvertersConfiguration.java similarity index 100% rename from grails-plugin-databinding/src/main/groovy/org/grails/databinding/converters/DefaultConvertersConfiguration.java rename to grace-plugin-databinding/src/main/groovy/org/grails/databinding/converters/DefaultConvertersConfiguration.java diff --git a/grails-plugin-databinding/src/main/groovy/org/grails/databinding/converters/Jsr310ConvertersConfiguration.groovy b/grace-plugin-databinding/src/main/groovy/org/grails/databinding/converters/Jsr310ConvertersConfiguration.groovy similarity index 100% rename from grails-plugin-databinding/src/main/groovy/org/grails/databinding/converters/Jsr310ConvertersConfiguration.groovy rename to grace-plugin-databinding/src/main/groovy/org/grails/databinding/converters/Jsr310ConvertersConfiguration.groovy diff --git a/grails-plugin-databinding/src/main/groovy/org/grails/databinding/converters/web/LocaleAwareBigDecimalConverter.groovy b/grace-plugin-databinding/src/main/groovy/org/grails/databinding/converters/web/LocaleAwareBigDecimalConverter.groovy similarity index 100% rename from grails-plugin-databinding/src/main/groovy/org/grails/databinding/converters/web/LocaleAwareBigDecimalConverter.groovy rename to grace-plugin-databinding/src/main/groovy/org/grails/databinding/converters/web/LocaleAwareBigDecimalConverter.groovy diff --git a/grails-plugin-databinding/src/main/groovy/org/grails/databinding/converters/web/LocaleAwareNumberConverter.groovy b/grace-plugin-databinding/src/main/groovy/org/grails/databinding/converters/web/LocaleAwareNumberConverter.groovy similarity index 100% rename from grails-plugin-databinding/src/main/groovy/org/grails/databinding/converters/web/LocaleAwareNumberConverter.groovy rename to grace-plugin-databinding/src/main/groovy/org/grails/databinding/converters/web/LocaleAwareNumberConverter.groovy diff --git a/grails-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/AbstractDataBindingGrailsPlugin.groovy b/grace-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/AbstractDataBindingGrailsPlugin.groovy similarity index 100% rename from grails-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/AbstractDataBindingGrailsPlugin.groovy rename to grace-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/AbstractDataBindingGrailsPlugin.groovy diff --git a/grails-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingConfiguration.java b/grace-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingConfiguration.java similarity index 100% rename from grails-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingConfiguration.java rename to grace-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingConfiguration.java diff --git a/grails-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingConfigurationProperties.java b/grace-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingConfigurationProperties.java similarity index 100% rename from grails-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingConfigurationProperties.java rename to grace-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingConfigurationProperties.java diff --git a/grails-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingGrailsPlugin.java b/grace-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingGrailsPlugin.java similarity index 100% rename from grails-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingGrailsPlugin.java rename to grace-plugin-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingGrailsPlugin.java diff --git a/grails-plugin-databinding/src/main/resources/META-INF/spring.factories b/grace-plugin-databinding/src/main/resources/META-INF/spring.factories similarity index 100% rename from grails-plugin-databinding/src/main/resources/META-INF/spring.factories rename to grace-plugin-databinding/src/main/resources/META-INF/spring.factories diff --git a/grails-plugin-databinding/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/grace-plugin-databinding/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from grails-plugin-databinding/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to grace-plugin-databinding/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/grails-plugin-databinding/src/test/groovy/org/grails/databinding/converters/Jsr310ConvertersConfigurationSpec.groovy b/grace-plugin-databinding/src/test/groovy/org/grails/databinding/converters/Jsr310ConvertersConfigurationSpec.groovy similarity index 100% rename from grails-plugin-databinding/src/test/groovy/org/grails/databinding/converters/Jsr310ConvertersConfigurationSpec.groovy rename to grace-plugin-databinding/src/test/groovy/org/grails/databinding/converters/Jsr310ConvertersConfigurationSpec.groovy diff --git a/grails-plugin-databinding/src/test/groovy/org/grails/plugins/databinding/DataBindingConfigurationSpec.groovy b/grace-plugin-databinding/src/test/groovy/org/grails/plugins/databinding/DataBindingConfigurationSpec.groovy similarity index 100% rename from grails-plugin-databinding/src/test/groovy/org/grails/plugins/databinding/DataBindingConfigurationSpec.groovy rename to grace-plugin-databinding/src/test/groovy/org/grails/plugins/databinding/DataBindingConfigurationSpec.groovy diff --git a/grace-plugin-datasource/README.md b/grace-plugin-datasource/README.md new file mode 100644 index 0000000000..933a8f1b5e --- /dev/null +++ b/grace-plugin-datasource/README.md @@ -0,0 +1,2 @@ +## grace-plugin-datasource + diff --git a/grails-plugin-datasource/build.gradle b/grace-plugin-datasource/build.gradle similarity index 67% rename from grails-plugin-datasource/build.gradle rename to grace-plugin-datasource/build.gradle index 8e6e742217..6863f0bd62 100644 --- a/grails-plugin-datasource/build.gradle +++ b/grace-plugin-datasource/build.gradle @@ -1,7 +1,7 @@ dependencies { - api project(":grails-core") - api project(':grails-plugin-api') - api project(":grails-spring-boot") + api project(":grace-core") + api project(':grace-plugin-api') + api project(":grace-spring-boot") api libs.grails.datastore.core api libs.grails.datastore.gorm diff --git a/grails-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/DataSourceConnectionSourcesFactoryBean.groovy b/grace-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/DataSourceConnectionSourcesFactoryBean.groovy similarity index 100% rename from grails-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/DataSourceConnectionSourcesFactoryBean.groovy rename to grace-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/DataSourceConnectionSourcesFactoryBean.groovy diff --git a/grails-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/DataSourceGrailsPlugin.groovy b/grace-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/DataSourceGrailsPlugin.groovy similarity index 100% rename from grails-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/DataSourceGrailsPlugin.groovy rename to grace-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/DataSourceGrailsPlugin.groovy diff --git a/grails-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/DataSourceUtils.groovy b/grace-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/DataSourceUtils.groovy similarity index 100% rename from grails-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/DataSourceUtils.groovy rename to grace-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/DataSourceUtils.groovy diff --git a/grails-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/EmbeddedDatabaseShutdownHook.groovy b/grace-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/EmbeddedDatabaseShutdownHook.groovy similarity index 100% rename from grails-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/EmbeddedDatabaseShutdownHook.groovy rename to grace-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/EmbeddedDatabaseShutdownHook.groovy diff --git a/grails-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/ReadOnlyDriverManagerDataSource.java b/grace-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/ReadOnlyDriverManagerDataSource.java similarity index 100% rename from grails-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/ReadOnlyDriverManagerDataSource.java rename to grace-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/ReadOnlyDriverManagerDataSource.java diff --git a/grails-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/TomcatJDBCPoolMBeanExporter.groovy b/grace-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/TomcatJDBCPoolMBeanExporter.groovy similarity index 100% rename from grails-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/TomcatJDBCPoolMBeanExporter.groovy rename to grace-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/TomcatJDBCPoolMBeanExporter.groovy diff --git a/grails-plugin-datasource/src/main/resources/META-INF/grails-plugin.xml b/grace-plugin-datasource/src/main/resources/META-INF/grails-plugin.xml similarity index 100% rename from grails-plugin-datasource/src/main/resources/META-INF/grails-plugin.xml rename to grace-plugin-datasource/src/main/resources/META-INF/grails-plugin.xml diff --git a/grails-plugin-datasource/src/test/groovy/org/grails/plugins/datasource/DataSourceGrailsPluginSpec.groovy b/grace-plugin-datasource/src/test/groovy/org/grails/plugins/datasource/DataSourceGrailsPluginSpec.groovy similarity index 100% rename from grails-plugin-datasource/src/test/groovy/org/grails/plugins/datasource/DataSourceGrailsPluginSpec.groovy rename to grace-plugin-datasource/src/test/groovy/org/grails/plugins/datasource/DataSourceGrailsPluginSpec.groovy diff --git a/grace-plugin-domain-class/README.md b/grace-plugin-domain-class/README.md new file mode 100644 index 0000000000..a69bbbad43 --- /dev/null +++ b/grace-plugin-domain-class/README.md @@ -0,0 +1,2 @@ +## grace-plugin-domain-class + diff --git a/grails-plugin-domain-class/build.gradle b/grace-plugin-domain-class/build.gradle similarity index 70% rename from grails-plugin-domain-class/build.gradle rename to grace-plugin-domain-class/build.gradle index 6ddf80f8d1..86d957cf08 100644 --- a/grails-plugin-domain-class/build.gradle +++ b/grace-plugin-domain-class/build.gradle @@ -1,8 +1,8 @@ dependencies { - api project(":grails-core") - api project(":grails-plugin-api") - api project(":grails-plugin-validation") - api project(":grails-spring") + api project(":grace-core") + api project(":grace-plugin-api") + api project(":grace-plugin-validation") + api project(":grace-spring") api libs.javax.persistence api(libs.grails.datastore.core) { diff --git a/grails-plugin-domain-class/src/main/groovy/grails/artefact/DomainClass.groovy b/grace-plugin-domain-class/src/main/groovy/grails/artefact/DomainClass.groovy similarity index 100% rename from grails-plugin-domain-class/src/main/groovy/grails/artefact/DomainClass.groovy rename to grace-plugin-domain-class/src/main/groovy/grails/artefact/DomainClass.groovy diff --git a/grails-plugin-domain-class/src/main/groovy/grails/compiler/traits/DomainClassTraitInjector.groovy b/grace-plugin-domain-class/src/main/groovy/grails/compiler/traits/DomainClassTraitInjector.groovy similarity index 100% rename from grails-plugin-domain-class/src/main/groovy/grails/compiler/traits/DomainClassTraitInjector.groovy rename to grace-plugin-domain-class/src/main/groovy/grails/compiler/traits/DomainClassTraitInjector.groovy diff --git a/grails-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/DomainClassGrailsPlugin.groovy b/grace-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/DomainClassGrailsPlugin.groovy similarity index 100% rename from grails-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/DomainClassGrailsPlugin.groovy rename to grace-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/DomainClassGrailsPlugin.groovy diff --git a/grails-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/ConstraintEvaluatorAdapter.java b/grace-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/ConstraintEvaluatorAdapter.java similarity index 100% rename from grails-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/ConstraintEvaluatorAdapter.java rename to grace-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/ConstraintEvaluatorAdapter.java diff --git a/grails-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/DefaultConstraintEvaluatorFactoryBean.groovy b/grace-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/DefaultConstraintEvaluatorFactoryBean.groovy similarity index 100% rename from grails-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/DefaultConstraintEvaluatorFactoryBean.groovy rename to grace-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/DefaultConstraintEvaluatorFactoryBean.groovy diff --git a/grails-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/DefaultMappingContextFactoryBean.groovy b/grace-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/DefaultMappingContextFactoryBean.groovy similarity index 100% rename from grails-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/DefaultMappingContextFactoryBean.groovy rename to grace-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/DefaultMappingContextFactoryBean.groovy diff --git a/grails-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/ValidatorRegistryFactoryBean.groovy b/grace-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/ValidatorRegistryFactoryBean.groovy similarity index 100% rename from grails-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/ValidatorRegistryFactoryBean.groovy rename to grace-plugin-domain-class/src/main/groovy/org/grails/plugins/domain/support/ValidatorRegistryFactoryBean.groovy diff --git a/grails-plugin-domain-class/src/main/resources/META-INF/grails-plugin.xml b/grace-plugin-domain-class/src/main/resources/META-INF/grails-plugin.xml similarity index 100% rename from grails-plugin-domain-class/src/main/resources/META-INF/grails-plugin.xml rename to grace-plugin-domain-class/src/main/resources/META-INF/grails-plugin.xml diff --git a/grails-plugin-domain-class/src/main/resources/META-INF/grails.factories b/grace-plugin-domain-class/src/main/resources/META-INF/grails.factories similarity index 100% rename from grails-plugin-domain-class/src/main/resources/META-INF/grails.factories rename to grace-plugin-domain-class/src/main/resources/META-INF/grails.factories diff --git a/grails-plugin-domain-class/src/test/groovy/grails/persistence/DomainClassTraitSpec.groovy b/grace-plugin-domain-class/src/test/groovy/grails/persistence/DomainClassTraitSpec.groovy similarity index 100% rename from grails-plugin-domain-class/src/test/groovy/grails/persistence/DomainClassTraitSpec.groovy rename to grace-plugin-domain-class/src/test/groovy/grails/persistence/DomainClassTraitSpec.groovy diff --git a/grails-plugin-domain-class/src/test/groovy/grails/persistence/EntityTransformIncludesGormApiSpec.groovy b/grace-plugin-domain-class/src/test/groovy/grails/persistence/EntityTransformIncludesGormApiSpec.groovy similarity index 100% rename from grails-plugin-domain-class/src/test/groovy/grails/persistence/EntityTransformIncludesGormApiSpec.groovy rename to grace-plugin-domain-class/src/test/groovy/grails/persistence/EntityTransformIncludesGormApiSpec.groovy diff --git a/grails-plugin-domain-class/src/test/groovy/org/grails/core/support/MappingContextBuilder.groovy b/grace-plugin-domain-class/src/test/groovy/org/grails/core/support/MappingContextBuilder.groovy similarity index 100% rename from grails-plugin-domain-class/src/test/groovy/org/grails/core/support/MappingContextBuilder.groovy rename to grace-plugin-domain-class/src/test/groovy/org/grails/core/support/MappingContextBuilder.groovy diff --git a/grace-plugin-i18n/README.md b/grace-plugin-i18n/README.md new file mode 100644 index 0000000000..f329d28706 --- /dev/null +++ b/grace-plugin-i18n/README.md @@ -0,0 +1,2 @@ +## grace-plugin-i18n + diff --git a/grace-plugin-i18n/build.gradle b/grace-plugin-i18n/build.gradle new file mode 100644 index 0000000000..288c1714bc --- /dev/null +++ b/grace-plugin-i18n/build.gradle @@ -0,0 +1,12 @@ +dependencies { + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-core") + api project(":grace-plugin-api") + api project(":grace-util") + compileOnly project(":grace-web-common") + + api libs.groovy.ant + api libs.spring.boot.autoconfigure + annotationProcessor(libs.spring.boot.configurationProcessor) +} diff --git a/grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsI18nPluginConfiguration.java b/grace-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsI18nPluginConfiguration.java similarity index 100% rename from grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsI18nPluginConfiguration.java rename to grace-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsI18nPluginConfiguration.java diff --git a/grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsMessageSourceConfiguration.java b/grace-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsMessageSourceConfiguration.java similarity index 100% rename from grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsMessageSourceConfiguration.java rename to grace-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsMessageSourceConfiguration.java diff --git a/grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsMessageSourceExtension.groovy b/grace-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsMessageSourceExtension.groovy similarity index 100% rename from grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsMessageSourceExtension.groovy rename to grace-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/GrailsMessageSourceExtension.groovy diff --git a/grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/I18nGrailsPlugin.groovy b/grace-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/I18nGrailsPlugin.groovy similarity index 100% rename from grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/I18nGrailsPlugin.groovy rename to grace-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/I18nGrailsPlugin.groovy diff --git a/grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/I18nGroovyShellBindingCustomizer.java b/grace-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/I18nGroovyShellBindingCustomizer.java similarity index 100% rename from grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/I18nGroovyShellBindingCustomizer.java rename to grace-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/I18nGroovyShellBindingCustomizer.java diff --git a/grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/WebLocaleProperties.java b/grace-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/WebLocaleProperties.java similarity index 100% rename from grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/WebLocaleProperties.java rename to grace-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/WebLocaleProperties.java diff --git a/grails-plugin-i18n/src/main/groovy/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.java b/grace-plugin-i18n/src/main/groovy/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.java similarity index 100% rename from grails-plugin-i18n/src/main/groovy/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.java rename to grace-plugin-i18n/src/main/groovy/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.java diff --git a/grails-plugin-i18n/src/main/groovy/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.java b/grace-plugin-i18n/src/main/groovy/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.java similarity index 100% rename from grails-plugin-i18n/src/main/groovy/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.java rename to grace-plugin-i18n/src/main/groovy/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.java diff --git a/grails-plugin-i18n/src/main/resources/META-INF/grails-plugin.xml b/grace-plugin-i18n/src/main/resources/META-INF/grails-plugin.xml similarity index 100% rename from grails-plugin-i18n/src/main/resources/META-INF/grails-plugin.xml rename to grace-plugin-i18n/src/main/resources/META-INF/grails-plugin.xml diff --git a/grails-plugin-i18n/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/grace-plugin-i18n/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule similarity index 100% rename from grails-plugin-i18n/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule rename to grace-plugin-i18n/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule diff --git a/grails-plugin-i18n/src/main/resources/META-INF/spring.factories b/grace-plugin-i18n/src/main/resources/META-INF/spring.factories similarity index 100% rename from grails-plugin-i18n/src/main/resources/META-INF/spring.factories rename to grace-plugin-i18n/src/main/resources/META-INF/spring.factories diff --git a/grails-plugin-i18n/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/grace-plugin-i18n/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from grails-plugin-i18n/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to grace-plugin-i18n/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/grails-plugin-i18n/src/test/groovy/org/grails/spring/context/ResourceBundleMessageSourceSpec.groovy b/grace-plugin-i18n/src/test/groovy/org/grails/spring/context/ResourceBundleMessageSourceSpec.groovy similarity index 100% rename from grails-plugin-i18n/src/test/groovy/org/grails/spring/context/ResourceBundleMessageSourceSpec.groovy rename to grace-plugin-i18n/src/test/groovy/org/grails/spring/context/ResourceBundleMessageSourceSpec.groovy diff --git a/grails-plugin-i18n/src/test/resources/.gitkeep b/grace-plugin-i18n/src/test/resources/.gitkeep similarity index 100% rename from grails-plugin-i18n/src/test/resources/.gitkeep rename to grace-plugin-i18n/src/test/resources/.gitkeep diff --git a/grails-plugin-interceptors/README.md b/grace-plugin-interceptors/README.md similarity index 85% rename from grails-plugin-interceptors/README.md rename to grace-plugin-interceptors/README.md index a99833e8d6..79752de2c6 100644 --- a/grails-plugin-interceptors/README.md +++ b/grace-plugin-interceptors/README.md @@ -1,3 +1,3 @@ -## grails-plugin-interceptors +## grace-plugin-interceptors This subproject contains the code for the interceptors support. It contains the Interceptor trait and Matcher interface which are core to grails' Interceptor functionality. \ No newline at end of file diff --git a/grace-plugin-interceptors/build.gradle b/grace-plugin-interceptors/build.gradle new file mode 100644 index 0000000000..35f962980b --- /dev/null +++ b/grace-plugin-interceptors/build.gradle @@ -0,0 +1,12 @@ +dependencies { + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-core") + api project(":grace-plugin-api") + api project(":grace-plugin-controllers") + api project(":grace-plugin-url-mappings") + + api libs.spring.boot.autoconfigure + + testImplementation project(":grace-test") +} diff --git a/grails-plugin-interceptors/src/main/groovy/grails/artefact/Interceptor.groovy b/grace-plugin-interceptors/src/main/groovy/grails/artefact/Interceptor.groovy similarity index 100% rename from grails-plugin-interceptors/src/main/groovy/grails/artefact/Interceptor.groovy rename to grace-plugin-interceptors/src/main/groovy/grails/artefact/Interceptor.groovy diff --git a/grails-plugin-interceptors/src/main/groovy/grails/compiler/traits/InterceptorTraitInjector.groovy b/grace-plugin-interceptors/src/main/groovy/grails/compiler/traits/InterceptorTraitInjector.groovy similarity index 100% rename from grails-plugin-interceptors/src/main/groovy/grails/compiler/traits/InterceptorTraitInjector.groovy rename to grace-plugin-interceptors/src/main/groovy/grails/compiler/traits/InterceptorTraitInjector.groovy diff --git a/grails-plugin-interceptors/src/main/groovy/grails/interceptors/Matcher.groovy b/grace-plugin-interceptors/src/main/groovy/grails/interceptors/Matcher.groovy similarity index 100% rename from grails-plugin-interceptors/src/main/groovy/grails/interceptors/Matcher.groovy rename to grace-plugin-interceptors/src/main/groovy/grails/interceptors/Matcher.groovy diff --git a/grails-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/GrailsInterceptorHandlerInterceptorAdapter.groovy b/grace-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/GrailsInterceptorHandlerInterceptorAdapter.groovy similarity index 100% rename from grails-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/GrailsInterceptorHandlerInterceptorAdapter.groovy rename to grace-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/GrailsInterceptorHandlerInterceptorAdapter.groovy diff --git a/grails-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorArtefactHandler.groovy b/grace-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorArtefactHandler.groovy similarity index 100% rename from grails-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorArtefactHandler.groovy rename to grace-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorArtefactHandler.groovy diff --git a/grails-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorsGrailsPlugin.groovy b/grace-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorsGrailsPlugin.groovy similarity index 100% rename from grails-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorsGrailsPlugin.groovy rename to grace-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorsGrailsPlugin.groovy diff --git a/grails-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorsPluginConfiguration.java b/grace-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorsPluginConfiguration.java similarity index 100% rename from grails-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorsPluginConfiguration.java rename to grace-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/InterceptorsPluginConfiguration.java diff --git a/grails-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/UrlMappingMatcher.groovy b/grace-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/UrlMappingMatcher.groovy similarity index 100% rename from grails-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/UrlMappingMatcher.groovy rename to grace-plugin-interceptors/src/main/groovy/org/grails/plugins/web/interceptors/UrlMappingMatcher.groovy diff --git a/grails-plugin-interceptors/src/main/resources/META-INF/grails-plugin.xml b/grace-plugin-interceptors/src/main/resources/META-INF/grails-plugin.xml similarity index 100% rename from grails-plugin-interceptors/src/main/resources/META-INF/grails-plugin.xml rename to grace-plugin-interceptors/src/main/resources/META-INF/grails-plugin.xml diff --git a/grails-plugin-interceptors/src/main/resources/META-INF/spring.factories b/grace-plugin-interceptors/src/main/resources/META-INF/spring.factories similarity index 100% rename from grails-plugin-interceptors/src/main/resources/META-INF/spring.factories rename to grace-plugin-interceptors/src/main/resources/META-INF/spring.factories diff --git a/grails-plugin-interceptors/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/grace-plugin-interceptors/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from grails-plugin-interceptors/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to grace-plugin-interceptors/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/grails-plugin-interceptors/src/test/groovy/grails/artefact/GrailsInterceptorHandlerInterceptorAdapterSpec.groovy b/grace-plugin-interceptors/src/test/groovy/grails/artefact/GrailsInterceptorHandlerInterceptorAdapterSpec.groovy similarity index 100% rename from grails-plugin-interceptors/src/test/groovy/grails/artefact/GrailsInterceptorHandlerInterceptorAdapterSpec.groovy rename to grace-plugin-interceptors/src/test/groovy/grails/artefact/GrailsInterceptorHandlerInterceptorAdapterSpec.groovy diff --git a/grails-plugin-interceptors/src/test/groovy/grails/artefact/InterceptorSpec.groovy b/grace-plugin-interceptors/src/test/groovy/grails/artefact/InterceptorSpec.groovy similarity index 100% rename from grails-plugin-interceptors/src/test/groovy/grails/artefact/InterceptorSpec.groovy rename to grace-plugin-interceptors/src/test/groovy/grails/artefact/InterceptorSpec.groovy diff --git a/grails-plugin-interceptors/src/test/groovy/org/grails/plugins/web/interceptors/UrlMappingMatcherSpec.groovy b/grace-plugin-interceptors/src/test/groovy/org/grails/plugins/web/interceptors/UrlMappingMatcherSpec.groovy similarity index 100% rename from grails-plugin-interceptors/src/test/groovy/org/grails/plugins/web/interceptors/UrlMappingMatcherSpec.groovy rename to grace-plugin-interceptors/src/test/groovy/org/grails/plugins/web/interceptors/UrlMappingMatcherSpec.groovy diff --git a/grace-plugin-management/README.md b/grace-plugin-management/README.md new file mode 100644 index 0000000000..607216d3b2 --- /dev/null +++ b/grace-plugin-management/README.md @@ -0,0 +1,2 @@ +## grace-plugin-management + diff --git a/grace-plugin-management/build.gradle b/grace-plugin-management/build.gradle new file mode 100644 index 0000000000..8521d33328 --- /dev/null +++ b/grace-plugin-management/build.gradle @@ -0,0 +1,11 @@ +dependencies { + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-plugin-api") + + api libs.spring.boot.actuator.autoconfigure + api libs.spring.boot.autoconfigure + compileOnly libs.jackson.databind + + testImplementation project(":grace-test") +} diff --git a/grails-plugin-management/src/main/groovy/org/grails/boot/actuate/autoconfigure/AppInfoContributorAutoConfiguration.java b/grace-plugin-management/src/main/groovy/org/grails/boot/actuate/autoconfigure/AppInfoContributorAutoConfiguration.java similarity index 100% rename from grails-plugin-management/src/main/groovy/org/grails/boot/actuate/autoconfigure/AppInfoContributorAutoConfiguration.java rename to grace-plugin-management/src/main/groovy/org/grails/boot/actuate/autoconfigure/AppInfoContributorAutoConfiguration.java diff --git a/grails-plugin-management/src/main/groovy/org/grails/boot/actuate/autoconfigure/PluginsEndpointAutoConfiguration.java b/grace-plugin-management/src/main/groovy/org/grails/boot/actuate/autoconfigure/PluginsEndpointAutoConfiguration.java similarity index 100% rename from grails-plugin-management/src/main/groovy/org/grails/boot/actuate/autoconfigure/PluginsEndpointAutoConfiguration.java rename to grace-plugin-management/src/main/groovy/org/grails/boot/actuate/autoconfigure/PluginsEndpointAutoConfiguration.java diff --git a/grails-plugin-management/src/main/groovy/org/grails/boot/actuate/endpoint/AppInfoContributor.java b/grace-plugin-management/src/main/groovy/org/grails/boot/actuate/endpoint/AppInfoContributor.java similarity index 100% rename from grails-plugin-management/src/main/groovy/org/grails/boot/actuate/endpoint/AppInfoContributor.java rename to grace-plugin-management/src/main/groovy/org/grails/boot/actuate/endpoint/AppInfoContributor.java diff --git a/grails-plugin-management/src/main/groovy/org/grails/boot/actuate/endpoint/PluginsEndpoint.java b/grace-plugin-management/src/main/groovy/org/grails/boot/actuate/endpoint/PluginsEndpoint.java similarity index 100% rename from grails-plugin-management/src/main/groovy/org/grails/boot/actuate/endpoint/PluginsEndpoint.java rename to grace-plugin-management/src/main/groovy/org/grails/boot/actuate/endpoint/PluginsEndpoint.java diff --git a/grails-plugin-management/src/main/resources/META-INF/spring.factories b/grace-plugin-management/src/main/resources/META-INF/spring.factories similarity index 100% rename from grails-plugin-management/src/main/resources/META-INF/spring.factories rename to grace-plugin-management/src/main/resources/META-INF/spring.factories diff --git a/grails-plugin-management/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/grace-plugin-management/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from grails-plugin-management/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to grace-plugin-management/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/grace-plugin-mimetypes/README.md b/grace-plugin-mimetypes/README.md new file mode 100644 index 0000000000..0276d6b3a9 --- /dev/null +++ b/grace-plugin-mimetypes/README.md @@ -0,0 +1,2 @@ +## grace-plugin-mimetypes + diff --git a/grace-plugin-mimetypes/build.gradle b/grace-plugin-mimetypes/build.gradle new file mode 100644 index 0000000000..f8a6ce98aa --- /dev/null +++ b/grace-plugin-mimetypes/build.gradle @@ -0,0 +1,10 @@ +dependencies { + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-plugin-api") + api project(":grace-web") + + api libs.spring.boot.autoconfigure + + testImplementation project(":grace-test") +} diff --git a/grails-plugin-mimetypes/src/main/groovy/grails/web/mime/AcceptHeaderParser.groovy b/grace-plugin-mimetypes/src/main/groovy/grails/web/mime/AcceptHeaderParser.groovy similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/grails/web/mime/AcceptHeaderParser.groovy rename to grace-plugin-mimetypes/src/main/groovy/grails/web/mime/AcceptHeaderParser.groovy diff --git a/grails-plugin-mimetypes/src/main/groovy/grails/web/mime/MimeUtility.java b/grace-plugin-mimetypes/src/main/groovy/grails/web/mime/MimeUtility.java similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/grails/web/mime/MimeUtility.java rename to grace-plugin-mimetypes/src/main/groovy/grails/web/mime/MimeUtility.java diff --git a/grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/api/MimeTypesApiSupport.groovy b/grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/api/MimeTypesApiSupport.groovy similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/api/MimeTypesApiSupport.groovy rename to grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/api/MimeTypesApiSupport.groovy diff --git a/grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/AbstractMimeTypesGrailsPlugin.groovy b/grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/AbstractMimeTypesGrailsPlugin.groovy similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/AbstractMimeTypesGrailsPlugin.groovy rename to grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/AbstractMimeTypesGrailsPlugin.groovy diff --git a/grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/FormatInterceptor.groovy b/grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/FormatInterceptor.groovy similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/FormatInterceptor.groovy rename to grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/FormatInterceptor.groovy diff --git a/grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesConfiguration.java b/grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesConfiguration.java similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesConfiguration.java rename to grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesConfiguration.java diff --git a/grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesFactoryBean.groovy b/grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesFactoryBean.groovy similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesFactoryBean.groovy rename to grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesFactoryBean.groovy diff --git a/grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesGrailsPlugin.java b/grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesGrailsPlugin.java similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesGrailsPlugin.java rename to grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesGrailsPlugin.java diff --git a/grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesHolder.groovy b/grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesHolder.groovy similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesHolder.groovy rename to grace-plugin-mimetypes/src/main/groovy/org/grails/plugins/web/mime/MimeTypesHolder.groovy diff --git a/grails-plugin-mimetypes/src/main/groovy/org/grails/web/mime/DefaultAcceptHeaderParser.groovy b/grace-plugin-mimetypes/src/main/groovy/org/grails/web/mime/DefaultAcceptHeaderParser.groovy similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/org/grails/web/mime/DefaultAcceptHeaderParser.groovy rename to grace-plugin-mimetypes/src/main/groovy/org/grails/web/mime/DefaultAcceptHeaderParser.groovy diff --git a/grails-plugin-mimetypes/src/main/groovy/org/grails/web/mime/DefaultMimeTypeResolver.groovy b/grace-plugin-mimetypes/src/main/groovy/org/grails/web/mime/DefaultMimeTypeResolver.groovy similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/org/grails/web/mime/DefaultMimeTypeResolver.groovy rename to grace-plugin-mimetypes/src/main/groovy/org/grails/web/mime/DefaultMimeTypeResolver.groovy diff --git a/grails-plugin-mimetypes/src/main/groovy/org/grails/web/mime/DefaultMimeUtility.java b/grace-plugin-mimetypes/src/main/groovy/org/grails/web/mime/DefaultMimeUtility.java similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/org/grails/web/mime/DefaultMimeUtility.java rename to grace-plugin-mimetypes/src/main/groovy/org/grails/web/mime/DefaultMimeUtility.java diff --git a/grails-plugin-mimetypes/src/main/groovy/org/grails/web/mime/HttpServletRequestExtension.groovy b/grace-plugin-mimetypes/src/main/groovy/org/grails/web/mime/HttpServletRequestExtension.groovy similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/org/grails/web/mime/HttpServletRequestExtension.groovy rename to grace-plugin-mimetypes/src/main/groovy/org/grails/web/mime/HttpServletRequestExtension.groovy diff --git a/grails-plugin-mimetypes/src/main/groovy/org/grails/web/mime/HttpServletResponseExtension.groovy b/grace-plugin-mimetypes/src/main/groovy/org/grails/web/mime/HttpServletResponseExtension.groovy similarity index 100% rename from grails-plugin-mimetypes/src/main/groovy/org/grails/web/mime/HttpServletResponseExtension.groovy rename to grace-plugin-mimetypes/src/main/groovy/org/grails/web/mime/HttpServletResponseExtension.groovy diff --git a/grails-plugin-mimetypes/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/grace-plugin-mimetypes/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule similarity index 100% rename from grails-plugin-mimetypes/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule rename to grace-plugin-mimetypes/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule diff --git a/grails-plugin-mimetypes/src/main/resources/META-INF/spring.factories b/grace-plugin-mimetypes/src/main/resources/META-INF/spring.factories similarity index 100% rename from grails-plugin-mimetypes/src/main/resources/META-INF/spring.factories rename to grace-plugin-mimetypes/src/main/resources/META-INF/spring.factories diff --git a/grails-plugin-mimetypes/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/grace-plugin-mimetypes/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from grails-plugin-mimetypes/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to grace-plugin-mimetypes/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/grails-plugin-mimetypes/src/test/groovy/grails/web/mime/MimeUtilitySpec.groovy b/grace-plugin-mimetypes/src/test/groovy/grails/web/mime/MimeUtilitySpec.groovy similarity index 100% rename from grails-plugin-mimetypes/src/test/groovy/grails/web/mime/MimeUtilitySpec.groovy rename to grace-plugin-mimetypes/src/test/groovy/grails/web/mime/MimeUtilitySpec.groovy diff --git a/grails-plugin-mimetypes/src/test/groovy/org/grails/web/mime/AcceptHeaderParserTests.groovy b/grace-plugin-mimetypes/src/test/groovy/org/grails/web/mime/AcceptHeaderParserTests.groovy similarity index 100% rename from grails-plugin-mimetypes/src/test/groovy/org/grails/web/mime/AcceptHeaderParserTests.groovy rename to grace-plugin-mimetypes/src/test/groovy/org/grails/web/mime/AcceptHeaderParserTests.groovy diff --git a/grails-plugin-mimetypes/src/test/groovy/org/grails/web/servlet/mvc/RequestAndResponseMimeTypesApiSpec.groovy b/grace-plugin-mimetypes/src/test/groovy/org/grails/web/servlet/mvc/RequestAndResponseMimeTypesApiSpec.groovy similarity index 100% rename from grails-plugin-mimetypes/src/test/groovy/org/grails/web/servlet/mvc/RequestAndResponseMimeTypesApiSpec.groovy rename to grace-plugin-mimetypes/src/test/groovy/org/grails/web/servlet/mvc/RequestAndResponseMimeTypesApiSpec.groovy diff --git a/grace-plugin-rest/README.md b/grace-plugin-rest/README.md new file mode 100644 index 0000000000..d2442f96c1 --- /dev/null +++ b/grace-plugin-rest/README.md @@ -0,0 +1,2 @@ +## grace-plugin-rest + diff --git a/grails-plugin-rest/build.gradle b/grace-plugin-rest/build.gradle similarity index 54% rename from grails-plugin-rest/build.gradle rename to grace-plugin-rest/build.gradle index f360f6bb95..32284ff1c7 100644 --- a/grails-plugin-rest/build.gradle +++ b/grace-plugin-rest/build.gradle @@ -1,12 +1,12 @@ dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-core") - api project(':grails-plugin-api') - api project(":grails-plugin-controllers") - api project(":grails-plugin-converters") - api project(":grails-web-url-mappings") - api project(":grails-util") + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-core") + api project(':grace-plugin-api') + api project(":grace-plugin-controllers") + api project(":grace-plugin-converters") + api project(":grace-web-url-mappings") + api project(":grace-util") api libs.javax.jaxb.api api libs.spring.boot.autoconfigure @@ -23,6 +23,6 @@ dependencies { } implementation libs.caffeine - testImplementation project(":grails-plugin-url-mappings") - testImplementation project(":grails-test-suite-base") + testImplementation project(":grace-plugin-url-mappings") + testImplementation project(":grace-test-suite-base") } diff --git a/grails-plugin-rest/src/main/groovy/grails/artefact/controller/RestResponder.groovy b/grace-plugin-rest/src/main/groovy/grails/artefact/controller/RestResponder.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/artefact/controller/RestResponder.groovy rename to grace-plugin-rest/src/main/groovy/grails/artefact/controller/RestResponder.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/compiler/traits/RestResponderTraitInjector.groovy b/grace-plugin-rest/src/main/groovy/grails/compiler/traits/RestResponderTraitInjector.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/compiler/traits/RestResponderTraitInjector.groovy rename to grace-plugin-rest/src/main/groovy/grails/compiler/traits/RestResponderTraitInjector.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/Link.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/Link.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/Link.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/Link.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/Linkable.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/Linkable.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/Linkable.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/Linkable.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/Resource.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/Resource.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/Resource.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/Resource.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/RestfulController.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/RestfulController.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/RestfulController.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/RestfulController.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/AbstractIncludeExcludeRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/AbstractIncludeExcludeRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/AbstractIncludeExcludeRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/AbstractIncludeExcludeRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/AbstractRenderContext.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/AbstractRenderContext.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/AbstractRenderContext.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/AbstractRenderContext.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/AbstractRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/AbstractRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/AbstractRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/AbstractRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/ContainerRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/ContainerRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/ContainerRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/ContainerRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/RenderContext.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/RenderContext.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/RenderContext.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/RenderContext.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/Renderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/Renderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/Renderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/Renderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/RendererRegistry.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/RendererRegistry.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/RendererRegistry.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/RendererRegistry.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/atom/AtomCollectionRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/atom/AtomCollectionRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/atom/AtomCollectionRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/atom/AtomCollectionRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/atom/AtomRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/atom/AtomRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/atom/AtomRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/atom/AtomRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/errors/AbstractVndErrorRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/errors/AbstractVndErrorRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/errors/AbstractVndErrorRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/errors/AbstractVndErrorRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/errors/VndErrorJsonRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/errors/VndErrorJsonRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/errors/VndErrorJsonRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/errors/VndErrorJsonRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/errors/VndErrorXmlRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/errors/VndErrorXmlRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/errors/VndErrorXmlRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/errors/VndErrorXmlRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/hal/HalJsonCollectionRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/hal/HalJsonCollectionRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/hal/HalJsonCollectionRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/hal/HalJsonCollectionRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/hal/HalJsonRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/hal/HalJsonRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/hal/HalJsonRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/hal/HalJsonRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/hal/HalXmlCollectionRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/hal/HalXmlCollectionRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/hal/HalXmlCollectionRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/hal/HalXmlCollectionRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/hal/HalXmlRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/hal/HalXmlRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/hal/HalXmlRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/hal/HalXmlRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/json/JsonCollectionRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/json/JsonCollectionRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/json/JsonCollectionRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/json/JsonCollectionRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/json/JsonRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/json/JsonRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/json/JsonRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/json/JsonRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/util/AbstractLinkingRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/util/AbstractLinkingRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/util/AbstractLinkingRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/util/AbstractLinkingRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/xml/XmlCollectionRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/xml/XmlCollectionRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/xml/XmlCollectionRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/xml/XmlCollectionRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/grails/rest/render/xml/XmlRenderer.groovy b/grace-plugin-rest/src/main/groovy/grails/rest/render/xml/XmlRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/grails/rest/render/xml/XmlRenderer.groovy rename to grace-plugin-rest/src/main/groovy/grails/rest/render/xml/XmlRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/plugin/RestResponderGrailsPlugin.groovy b/grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/plugin/RestResponderGrailsPlugin.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/plugin/RestResponderGrailsPlugin.groovy rename to grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/plugin/RestResponderGrailsPlugin.groovy diff --git a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/plugin/RestResponderPluginConfiguration.java b/grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/plugin/RestResponderPluginConfiguration.java similarity index 100% rename from grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/plugin/RestResponderPluginConfiguration.java rename to grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/plugin/RestResponderPluginConfiguration.java diff --git a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/DefaultRendererRegistry.groovy b/grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/DefaultRendererRegistry.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/DefaultRendererRegistry.groovy rename to grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/DefaultRendererRegistry.groovy diff --git a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/ServletRenderContext.groovy b/grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/ServletRenderContext.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/ServletRenderContext.groovy rename to grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/ServletRenderContext.groovy diff --git a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/html/DefaultHtmlRenderer.groovy b/grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/html/DefaultHtmlRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/html/DefaultHtmlRenderer.groovy rename to grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/html/DefaultHtmlRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/json/DefaultJsonRenderer.groovy b/grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/json/DefaultJsonRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/json/DefaultJsonRenderer.groovy rename to grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/json/DefaultJsonRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRenderer.groovy b/grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRenderer.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRenderer.groovy rename to grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRenderer.groovy diff --git a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/LinkableTransform.groovy b/grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/LinkableTransform.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/LinkableTransform.groovy rename to grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/LinkableTransform.groovy diff --git a/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy b/grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy similarity index 100% rename from grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy rename to grace-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy diff --git a/grails-plugin-rest/src/main/resources/META-INF/grails-plugin.xml b/grace-plugin-rest/src/main/resources/META-INF/grails-plugin.xml similarity index 100% rename from grails-plugin-rest/src/main/resources/META-INF/grails-plugin.xml rename to grace-plugin-rest/src/main/resources/META-INF/grails-plugin.xml diff --git a/grails-plugin-rest/src/main/resources/META-INF/grails.factories b/grace-plugin-rest/src/main/resources/META-INF/grails.factories similarity index 100% rename from grails-plugin-rest/src/main/resources/META-INF/grails.factories rename to grace-plugin-rest/src/main/resources/META-INF/grails.factories diff --git a/grails-plugin-rest/src/main/resources/META-INF/spring.factories b/grace-plugin-rest/src/main/resources/META-INF/spring.factories similarity index 100% rename from grails-plugin-rest/src/main/resources/META-INF/spring.factories rename to grace-plugin-rest/src/main/resources/META-INF/spring.factories diff --git a/grails-plugin-rest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/grace-plugin-rest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from grails-plugin-rest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to grace-plugin-rest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/grails-plugin-rest/src/test/groovy/grails/artefact/ControllerTraitSpec.groovy b/grace-plugin-rest/src/test/groovy/grails/artefact/ControllerTraitSpec.groovy similarity index 100% rename from grails-plugin-rest/src/test/groovy/grails/artefact/ControllerTraitSpec.groovy rename to grace-plugin-rest/src/test/groovy/grails/artefact/ControllerTraitSpec.groovy diff --git a/grails-plugin-rest/src/test/groovy/grails/artefact/controller/RestResponderTraitGeneratedSpec.groovy b/grace-plugin-rest/src/test/groovy/grails/artefact/controller/RestResponderTraitGeneratedSpec.groovy similarity index 100% rename from grails-plugin-rest/src/test/groovy/grails/artefact/controller/RestResponderTraitGeneratedSpec.groovy rename to grace-plugin-rest/src/test/groovy/grails/artefact/controller/RestResponderTraitGeneratedSpec.groovy diff --git a/grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/DefaultRendererRegistrySpec.groovy b/grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/DefaultRendererRegistrySpec.groovy similarity index 100% rename from grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/DefaultRendererRegistrySpec.groovy rename to grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/DefaultRendererRegistrySpec.groovy diff --git a/grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/VndErrorRenderingSpec.groovy b/grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/VndErrorRenderingSpec.groovy similarity index 100% rename from grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/VndErrorRenderingSpec.groovy rename to grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/VndErrorRenderingSpec.groovy diff --git a/grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalJsonRendererSpec.groovy b/grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalJsonRendererSpec.groovy similarity index 100% rename from grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalJsonRendererSpec.groovy rename to grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalJsonRendererSpec.groovy diff --git a/grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/html/HtmlRendererSpec.groovy b/grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/html/HtmlRendererSpec.groovy similarity index 100% rename from grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/html/HtmlRendererSpec.groovy rename to grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/html/HtmlRendererSpec.groovy diff --git a/grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/json/JsonRendererSpec.groovy b/grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/json/JsonRendererSpec.groovy similarity index 100% rename from grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/json/JsonRendererSpec.groovy rename to grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/json/JsonRendererSpec.groovy diff --git a/grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/transform/LinkableTransformSpec.groovy b/grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/transform/LinkableTransformSpec.groovy similarity index 100% rename from grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/transform/LinkableTransformSpec.groovy rename to grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/transform/LinkableTransformSpec.groovy diff --git a/grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/transform/ResourceTransformSpec.groovy b/grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/transform/ResourceTransformSpec.groovy similarity index 100% rename from grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/transform/ResourceTransformSpec.groovy rename to grace-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/transform/ResourceTransformSpec.groovy diff --git a/grace-plugin-services/README.md b/grace-plugin-services/README.md new file mode 100644 index 0000000000..734456f03f --- /dev/null +++ b/grace-plugin-services/README.md @@ -0,0 +1,2 @@ +## grace-plugin-services + diff --git a/grace-plugin-services/build.gradle b/grace-plugin-services/build.gradle new file mode 100644 index 0000000000..ac55458bc8 --- /dev/null +++ b/grace-plugin-services/build.gradle @@ -0,0 +1,9 @@ +dependencies { + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-core") + api project(':grace-plugin-api') + api project(':grace-util') + + api libs.spring.tx +} diff --git a/grails-plugin-services/src/main/groovy/org/grails/plugins/services/ServiceBeanAliasPostProcessor.groovy b/grace-plugin-services/src/main/groovy/org/grails/plugins/services/ServiceBeanAliasPostProcessor.groovy similarity index 100% rename from grails-plugin-services/src/main/groovy/org/grails/plugins/services/ServiceBeanAliasPostProcessor.groovy rename to grace-plugin-services/src/main/groovy/org/grails/plugins/services/ServiceBeanAliasPostProcessor.groovy diff --git a/grails-plugin-services/src/main/groovy/org/grails/plugins/services/ServicesGrailsPlugin.groovy b/grace-plugin-services/src/main/groovy/org/grails/plugins/services/ServicesGrailsPlugin.groovy similarity index 100% rename from grails-plugin-services/src/main/groovy/org/grails/plugins/services/ServicesGrailsPlugin.groovy rename to grace-plugin-services/src/main/groovy/org/grails/plugins/services/ServicesGrailsPlugin.groovy diff --git a/grails-plugin-services/src/main/resources/META-INF/grails-plugin.xml b/grace-plugin-services/src/main/resources/META-INF/grails-plugin.xml similarity index 100% rename from grails-plugin-services/src/main/resources/META-INF/grails-plugin.xml rename to grace-plugin-services/src/main/resources/META-INF/grails-plugin.xml diff --git a/grails-plugin-services/src/main/resources/META-INF/grails.factories b/grace-plugin-services/src/main/resources/META-INF/grails.factories similarity index 100% rename from grails-plugin-services/src/main/resources/META-INF/grails.factories rename to grace-plugin-services/src/main/resources/META-INF/grails.factories diff --git a/grace-plugin-url-mappings/README.md b/grace-plugin-url-mappings/README.md new file mode 100644 index 0000000000..9876a58199 --- /dev/null +++ b/grace-plugin-url-mappings/README.md @@ -0,0 +1,2 @@ +## grace-plugin-url-mappings + diff --git a/grace-plugin-url-mappings/build.gradle b/grace-plugin-url-mappings/build.gradle new file mode 100644 index 0000000000..b7879720c7 --- /dev/null +++ b/grace-plugin-url-mappings/build.gradle @@ -0,0 +1,11 @@ +dependencies { + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-core") + api project(":grace-plugin-controllers") + api project(":grace-util") + api project(":grace-web-url-mappings") + + annotationProcessor libs.spring.boot.configurationProcessor + api libs.spring.boot.autoconfigure +} diff --git a/grails-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsGrailsPlugin.groovy b/grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsGrailsPlugin.groovy similarity index 100% rename from grails-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsGrailsPlugin.groovy rename to grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsGrailsPlugin.groovy diff --git a/grails-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsPluginConfiguration.java b/grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsPluginConfiguration.java similarity index 100% rename from grails-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsPluginConfiguration.java rename to grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsPluginConfiguration.java diff --git a/grails-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsProperties.java b/grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsProperties.java similarity index 100% rename from grails-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsProperties.java rename to grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsProperties.java diff --git a/grails-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/factory/UrlMappingFactoryBean.java b/grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/factory/UrlMappingFactoryBean.java similarity index 100% rename from grails-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/factory/UrlMappingFactoryBean.java rename to grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/factory/UrlMappingFactoryBean.java diff --git a/grails-plugin-url-mappings/src/main/resources/META-INF/grails-plugin.xml b/grace-plugin-url-mappings/src/main/resources/META-INF/grails-plugin.xml similarity index 100% rename from grails-plugin-url-mappings/src/main/resources/META-INF/grails-plugin.xml rename to grace-plugin-url-mappings/src/main/resources/META-INF/grails-plugin.xml diff --git a/grails-plugin-url-mappings/src/main/resources/META-INF/spring.factories b/grace-plugin-url-mappings/src/main/resources/META-INF/spring.factories similarity index 100% rename from grails-plugin-url-mappings/src/main/resources/META-INF/spring.factories rename to grace-plugin-url-mappings/src/main/resources/META-INF/spring.factories diff --git a/grails-plugin-url-mappings/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/grace-plugin-url-mappings/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from grails-plugin-url-mappings/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to grace-plugin-url-mappings/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/grace-plugin-validation/README.md b/grace-plugin-validation/README.md new file mode 100644 index 0000000000..1da274d766 --- /dev/null +++ b/grace-plugin-validation/README.md @@ -0,0 +1,2 @@ +## grace-plugin-validation + diff --git a/grails-plugin-validation/build.gradle b/grace-plugin-validation/build.gradle similarity index 54% rename from grails-plugin-validation/build.gradle rename to grace-plugin-validation/build.gradle index 3e47015d8b..8f152219a8 100644 --- a/grails-plugin-validation/build.gradle +++ b/grace-plugin-validation/build.gradle @@ -1,10 +1,10 @@ dependencies { - api project(":grails-core") - api project(":grails-util") + api project(":grace-core") + api project(":grace-util") api(libs.grails.datastore.gorm.validation) { transitive = false } - testImplementation project(":grails-web-common") + testImplementation project(":grace-web-common") testImplementation libs.spring.test } diff --git a/grails-plugin-validation/src/main/groovy/grails/validation/ASTValidateableHelper.java b/grace-plugin-validation/src/main/groovy/grails/validation/ASTValidateableHelper.java similarity index 100% rename from grails-plugin-validation/src/main/groovy/grails/validation/ASTValidateableHelper.java rename to grace-plugin-validation/src/main/groovy/grails/validation/ASTValidateableHelper.java diff --git a/grails-plugin-validation/src/main/groovy/grails/validation/ConstrainedDelegate.groovy b/grace-plugin-validation/src/main/groovy/grails/validation/ConstrainedDelegate.groovy similarity index 100% rename from grails-plugin-validation/src/main/groovy/grails/validation/ConstrainedDelegate.groovy rename to grace-plugin-validation/src/main/groovy/grails/validation/ConstrainedDelegate.groovy diff --git a/grails-plugin-validation/src/main/groovy/grails/validation/DefaultASTValidateableHelper.java b/grace-plugin-validation/src/main/groovy/grails/validation/DefaultASTValidateableHelper.java similarity index 100% rename from grails-plugin-validation/src/main/groovy/grails/validation/DefaultASTValidateableHelper.java rename to grace-plugin-validation/src/main/groovy/grails/validation/DefaultASTValidateableHelper.java diff --git a/grails-plugin-validation/src/main/groovy/grails/validation/Validateable.groovy b/grace-plugin-validation/src/main/groovy/grails/validation/Validateable.groovy similarity index 100% rename from grails-plugin-validation/src/main/groovy/grails/validation/Validateable.groovy rename to grace-plugin-validation/src/main/groovy/grails/validation/Validateable.groovy diff --git a/grails-plugin-validation/src/main/groovy/org/grails/web/plugins/support/DefaultConstrainedDiscovery.groovy b/grace-plugin-validation/src/main/groovy/org/grails/web/plugins/support/DefaultConstrainedDiscovery.groovy similarity index 100% rename from grails-plugin-validation/src/main/groovy/org/grails/web/plugins/support/DefaultConstrainedDiscovery.groovy rename to grace-plugin-validation/src/main/groovy/org/grails/web/plugins/support/DefaultConstrainedDiscovery.groovy diff --git a/grails-plugin-validation/src/main/groovy/org/grails/web/plugins/support/ValidationSupport.groovy b/grace-plugin-validation/src/main/groovy/org/grails/web/plugins/support/ValidationSupport.groovy similarity index 100% rename from grails-plugin-validation/src/main/groovy/org/grails/web/plugins/support/ValidationSupport.groovy rename to grace-plugin-validation/src/main/groovy/org/grails/web/plugins/support/ValidationSupport.groovy diff --git a/grails-plugin-validation/src/main/resources/META-INF/grails.factories b/grace-plugin-validation/src/main/resources/META-INF/grails.factories similarity index 100% rename from grails-plugin-validation/src/main/resources/META-INF/grails.factories rename to grace-plugin-validation/src/main/resources/META-INF/grails.factories diff --git a/grails-plugin-validation/src/test/groovy/grails/validation/CommandObjectConstraintGettersSpec.groovy b/grace-plugin-validation/src/test/groovy/grails/validation/CommandObjectConstraintGettersSpec.groovy similarity index 100% rename from grails-plugin-validation/src/test/groovy/grails/validation/CommandObjectConstraintGettersSpec.groovy rename to grace-plugin-validation/src/test/groovy/grails/validation/CommandObjectConstraintGettersSpec.groovy diff --git a/grails-plugin-validation/src/test/groovy/grails/validation/DefaultASTValidateableHelperSpec.groovy b/grace-plugin-validation/src/test/groovy/grails/validation/DefaultASTValidateableHelperSpec.groovy similarity index 100% rename from grails-plugin-validation/src/test/groovy/grails/validation/DefaultASTValidateableHelperSpec.groovy rename to grace-plugin-validation/src/test/groovy/grails/validation/DefaultASTValidateableHelperSpec.groovy diff --git a/grails-plugin-validation/src/test/groovy/grails/validation/MappingContextBuilder.groovy b/grace-plugin-validation/src/test/groovy/grails/validation/MappingContextBuilder.groovy similarity index 100% rename from grails-plugin-validation/src/test/groovy/grails/validation/MappingContextBuilder.groovy rename to grace-plugin-validation/src/test/groovy/grails/validation/MappingContextBuilder.groovy diff --git a/grails-plugin-validation/src/test/groovy/grails/validation/SerializableValidateableSpec.groovy b/grace-plugin-validation/src/test/groovy/grails/validation/SerializableValidateableSpec.groovy similarity index 100% rename from grails-plugin-validation/src/test/groovy/grails/validation/SerializableValidateableSpec.groovy rename to grace-plugin-validation/src/test/groovy/grails/validation/SerializableValidateableSpec.groovy diff --git a/grails-plugin-validation/src/test/groovy/grails/validation/SomeJavaClass.java b/grace-plugin-validation/src/test/groovy/grails/validation/SomeJavaClass.java similarity index 100% rename from grails-plugin-validation/src/test/groovy/grails/validation/SomeJavaClass.java rename to grace-plugin-validation/src/test/groovy/grails/validation/SomeJavaClass.java diff --git a/grails-plugin-validation/src/test/groovy/grails/validation/TestClass.java b/grace-plugin-validation/src/test/groovy/grails/validation/TestClass.java similarity index 100% rename from grails-plugin-validation/src/test/groovy/grails/validation/TestClass.java rename to grace-plugin-validation/src/test/groovy/grails/validation/TestClass.java diff --git a/grails-plugin-validation/src/test/groovy/grails/validation/ValidateableMockSpec.groovy b/grace-plugin-validation/src/test/groovy/grails/validation/ValidateableMockSpec.groovy similarity index 100% rename from grails-plugin-validation/src/test/groovy/grails/validation/ValidateableMockSpec.groovy rename to grace-plugin-validation/src/test/groovy/grails/validation/ValidateableMockSpec.groovy diff --git a/grails-plugin-validation/src/test/groovy/grails/validation/ValidateableTraitAdHocSpec.groovy b/grace-plugin-validation/src/test/groovy/grails/validation/ValidateableTraitAdHocSpec.groovy similarity index 100% rename from grails-plugin-validation/src/test/groovy/grails/validation/ValidateableTraitAdHocSpec.groovy rename to grace-plugin-validation/src/test/groovy/grails/validation/ValidateableTraitAdHocSpec.groovy diff --git a/grails-plugin-validation/src/test/groovy/grails/validation/ValidateableTraitSpec.groovy b/grace-plugin-validation/src/test/groovy/grails/validation/ValidateableTraitSpec.groovy similarity index 100% rename from grails-plugin-validation/src/test/groovy/grails/validation/ValidateableTraitSpec.groovy rename to grace-plugin-validation/src/test/groovy/grails/validation/ValidateableTraitSpec.groovy diff --git a/grails-shell/README.md b/grace-shell/README.md similarity index 82% rename from grails-shell/README.md rename to grace-shell/README.md index 4ecb23353d..95003cf42f 100644 --- a/grails-shell/README.md +++ b/grace-shell/README.md @@ -1,3 +1,3 @@ -## grails-shell +## grace-shell This subproject provides code related to the Grails CLI and plugin commands. diff --git a/grails-shell/build.gradle b/grace-shell/build.gradle similarity index 88% rename from grails-shell/build.gradle rename to grace-shell/build.gradle index dd81e93d67..3222ca32ca 100644 --- a/grails-shell/build.gradle +++ b/grace-shell/build.gradle @@ -16,11 +16,11 @@ configurations { } dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-cli") - api project(":grails-gradle-model") - api project(":grails-util") + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-cli") + api project(":grace-gradle-model") + api project(":grace-util") api libs.ant api libs.gradle.tooling.api @@ -32,7 +32,7 @@ dependencies { api libs.spring.boot.cli, { exclude group: "org.codehaus.groovy", module: "groovy" } - dependenciesBom project(path: ":grails-bom", configuration: 'effectiveBom') + dependenciesBom project(path: ":grace-bom", configuration: 'effectiveBom') implementation(libs.maven.resolver.provider) { exclude group: "com.google.guava", module: "guava" } diff --git a/grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy b/grace-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy rename to grace-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/boot/GrailsApplicationCompilerAutoConfiguration.java b/grace-shell/src/main/groovy/org/grails/cli/boot/GrailsApplicationCompilerAutoConfiguration.java similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/boot/GrailsApplicationCompilerAutoConfiguration.java rename to grace-shell/src/main/groovy/org/grails/cli/boot/GrailsApplicationCompilerAutoConfiguration.java diff --git a/grails-shell/src/main/groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy b/grace-shell/src/main/groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy rename to grace-shell/src/main/groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/boot/GrailsTestCompilerAutoConfiguration.groovy b/grace-shell/src/main/groovy/org/grails/cli/boot/GrailsTestCompilerAutoConfiguration.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/boot/GrailsTestCompilerAutoConfiguration.groovy rename to grace-shell/src/main/groovy/org/grails/cli/boot/GrailsTestCompilerAutoConfiguration.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/boot/SpringInvoker.groovy b/grace-shell/src/main/groovy/org/grails/cli/boot/SpringInvoker.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/boot/SpringInvoker.groovy rename to grace-shell/src/main/groovy/org/grails/cli/boot/SpringInvoker.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/boot/dependencies/GrailsDependenciesDependencyManagement.java b/grace-shell/src/main/groovy/org/grails/cli/boot/dependencies/GrailsDependenciesDependencyManagement.java similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/boot/dependencies/GrailsDependenciesDependencyManagement.java rename to grace-shell/src/main/groovy/org/grails/cli/boot/dependencies/GrailsDependenciesDependencyManagement.java diff --git a/grails-shell/src/main/groovy/org/grails/cli/gradle/ClasspathBuildAction.groovy b/grace-shell/src/main/groovy/org/grails/cli/gradle/ClasspathBuildAction.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/gradle/ClasspathBuildAction.groovy rename to grace-shell/src/main/groovy/org/grails/cli/gradle/ClasspathBuildAction.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/gradle/FetchAllTaskSelectorsBuildAction.java b/grace-shell/src/main/groovy/org/grails/cli/gradle/FetchAllTaskSelectorsBuildAction.java similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/gradle/FetchAllTaskSelectorsBuildAction.java rename to grace-shell/src/main/groovy/org/grails/cli/gradle/FetchAllTaskSelectorsBuildAction.java diff --git a/grails-shell/src/main/groovy/org/grails/cli/gradle/GradleAsyncInvoker.groovy b/grace-shell/src/main/groovy/org/grails/cli/gradle/GradleAsyncInvoker.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/gradle/GradleAsyncInvoker.groovy rename to grace-shell/src/main/groovy/org/grails/cli/gradle/GradleAsyncInvoker.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/gradle/GradleInvoker.groovy b/grace-shell/src/main/groovy/org/grails/cli/gradle/GradleInvoker.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/gradle/GradleInvoker.groovy rename to grace-shell/src/main/groovy/org/grails/cli/gradle/GradleInvoker.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/gradle/GradleUtil.groovy b/grace-shell/src/main/groovy/org/grails/cli/gradle/GradleUtil.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/gradle/GradleUtil.groovy rename to grace-shell/src/main/groovy/org/grails/cli/gradle/GradleUtil.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/gradle/cache/CachedGradleOperation.groovy b/grace-shell/src/main/groovy/org/grails/cli/gradle/cache/CachedGradleOperation.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/gradle/cache/CachedGradleOperation.groovy rename to grace-shell/src/main/groovy/org/grails/cli/gradle/cache/CachedGradleOperation.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/gradle/cache/ListReadingCachedGradleOperation.groovy b/grace-shell/src/main/groovy/org/grails/cli/gradle/cache/ListReadingCachedGradleOperation.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/gradle/cache/ListReadingCachedGradleOperation.groovy rename to grace-shell/src/main/groovy/org/grails/cli/gradle/cache/ListReadingCachedGradleOperation.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/gradle/cache/MapReadingCachedGradleOperation.groovy b/grace-shell/src/main/groovy/org/grails/cli/gradle/cache/MapReadingCachedGradleOperation.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/gradle/cache/MapReadingCachedGradleOperation.groovy rename to grace-shell/src/main/groovy/org/grails/cli/gradle/cache/MapReadingCachedGradleOperation.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/gradle/commands/GradleCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/gradle/commands/GradleCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/gradle/commands/GradleCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/gradle/commands/GradleCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/gradle/commands/GradleTaskCommandAdapter.groovy b/grace-shell/src/main/groovy/org/grails/cli/gradle/commands/GradleTaskCommandAdapter.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/gradle/commands/GradleTaskCommandAdapter.groovy rename to grace-shell/src/main/groovy/org/grails/cli/gradle/commands/GradleTaskCommandAdapter.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/gradle/commands/ReadGradleTasks.groovy b/grace-shell/src/main/groovy/org/grails/cli/gradle/commands/ReadGradleTasks.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/gradle/commands/ReadGradleTasks.groovy rename to grace-shell/src/main/groovy/org/grails/cli/gradle/commands/ReadGradleTasks.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/interactive/completers/AllClassCompleter.groovy b/grace-shell/src/main/groovy/org/grails/cli/interactive/completers/AllClassCompleter.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/interactive/completers/AllClassCompleter.groovy rename to grace-shell/src/main/groovy/org/grails/cli/interactive/completers/AllClassCompleter.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/interactive/completers/ClassNameCompleter.groovy b/grace-shell/src/main/groovy/org/grails/cli/interactive/completers/ClassNameCompleter.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/interactive/completers/ClassNameCompleter.groovy rename to grace-shell/src/main/groovy/org/grails/cli/interactive/completers/ClassNameCompleter.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/interactive/completers/ClosureCompleter.groovy b/grace-shell/src/main/groovy/org/grails/cli/interactive/completers/ClosureCompleter.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/interactive/completers/ClosureCompleter.groovy rename to grace-shell/src/main/groovy/org/grails/cli/interactive/completers/ClosureCompleter.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/interactive/completers/DomainClassCompleter.groovy b/grace-shell/src/main/groovy/org/grails/cli/interactive/completers/DomainClassCompleter.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/interactive/completers/DomainClassCompleter.groovy rename to grace-shell/src/main/groovy/org/grails/cli/interactive/completers/DomainClassCompleter.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/interactive/completers/EscapingFileNameCompletor.groovy b/grace-shell/src/main/groovy/org/grails/cli/interactive/completers/EscapingFileNameCompletor.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/interactive/completers/EscapingFileNameCompletor.groovy rename to grace-shell/src/main/groovy/org/grails/cli/interactive/completers/EscapingFileNameCompletor.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/interactive/completers/RegexCompletor.groovy b/grace-shell/src/main/groovy/org/grails/cli/interactive/completers/RegexCompletor.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/interactive/completers/RegexCompletor.groovy rename to grace-shell/src/main/groovy/org/grails/cli/interactive/completers/RegexCompletor.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/interactive/completers/SimpleOrFileNameCompletor.groovy b/grace-shell/src/main/groovy/org/grails/cli/interactive/completers/SimpleOrFileNameCompletor.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/interactive/completers/SimpleOrFileNameCompletor.groovy rename to grace-shell/src/main/groovy/org/grails/cli/interactive/completers/SimpleOrFileNameCompletor.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/interactive/completers/SortedAggregateCompleter.java b/grace-shell/src/main/groovy/org/grails/cli/interactive/completers/SortedAggregateCompleter.java similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/interactive/completers/SortedAggregateCompleter.java rename to grace-shell/src/main/groovy/org/grails/cli/interactive/completers/SortedAggregateCompleter.java diff --git a/grails-shell/src/main/groovy/org/grails/cli/interactive/completers/StringsCompleter.java b/grace-shell/src/main/groovy/org/grails/cli/interactive/completers/StringsCompleter.java similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/interactive/completers/StringsCompleter.java rename to grace-shell/src/main/groovy/org/grails/cli/interactive/completers/StringsCompleter.java diff --git a/grails-shell/src/main/groovy/org/grails/cli/interactive/completers/TestsCompleter.groovy b/grace-shell/src/main/groovy/org/grails/cli/interactive/completers/TestsCompleter.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/interactive/completers/TestsCompleter.groovy rename to grace-shell/src/main/groovy/org/grails/cli/interactive/completers/TestsCompleter.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/AbstractStep.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/AbstractStep.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/AbstractStep.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/AbstractStep.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/Command.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/Command.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/Command.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/Command.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/CommandArgument.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/CommandArgument.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/CommandArgument.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/CommandArgument.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/CommandCancellationListener.java b/grace-shell/src/main/groovy/org/grails/cli/profile/CommandCancellationListener.java similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/CommandCancellationListener.java rename to grace-shell/src/main/groovy/org/grails/cli/profile/CommandCancellationListener.java diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/CommandDescription.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/CommandDescription.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/CommandDescription.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/CommandDescription.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/CommandException.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/CommandException.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/CommandException.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/CommandException.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/DefaultFeature.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/DefaultFeature.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/DefaultFeature.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/DefaultFeature.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/ExecutionContext.java b/grace-shell/src/main/groovy/org/grails/cli/profile/ExecutionContext.java similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/ExecutionContext.java rename to grace-shell/src/main/groovy/org/grails/cli/profile/ExecutionContext.java diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/Feature.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/Feature.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/Feature.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/Feature.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/FileSystemProfile.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/FileSystemProfile.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/FileSystemProfile.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/FileSystemProfile.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/MultiStepCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/MultiStepCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/MultiStepCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/MultiStepCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/Profile.java b/grace-shell/src/main/groovy/org/grails/cli/profile/Profile.java similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/Profile.java rename to grace-shell/src/main/groovy/org/grails/cli/profile/Profile.java diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/ProfileCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/ProfileCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/ProfileCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/ProfileCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/ProfileRepository.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/ProfileRepository.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/ProfileRepository.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/ProfileRepository.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/ProfileRepositoryAware.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/ProfileRepositoryAware.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/ProfileRepositoryAware.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/ProfileRepositoryAware.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/ProfileUtil.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/ProfileUtil.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/ProfileUtil.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/ProfileUtil.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/ProjectCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/ProjectCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/ProjectCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/ProjectCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/ProjectContext.java b/grace-shell/src/main/groovy/org/grails/cli/profile/ProjectContext.java similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/ProjectContext.java rename to grace-shell/src/main/groovy/org/grails/cli/profile/ProjectContext.java diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/ProjectContextAware.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/ProjectContextAware.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/ProjectContextAware.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/ProjectContextAware.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/ResourceProfile.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/ResourceProfile.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/ResourceProfile.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/ResourceProfile.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/Step.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/Step.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/Step.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/Step.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/ArgumentCompletingCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/ArgumentCompletingCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/ArgumentCompletingCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/ArgumentCompletingCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/ClosureExecutingCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/ClosureExecutingCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/ClosureExecutingCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/ClosureExecutingCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/CommandCompleter.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/CommandCompleter.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/CommandCompleter.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/CommandCompleter.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/CommandRegistry.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/CommandRegistry.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/CommandRegistry.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/CommandRegistry.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/CreateAppCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/CreateAppCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/CreateAppCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/CreateAppCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/CreatePluginCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/CreatePluginCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/CreatePluginCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/CreatePluginCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/CreateProfileCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/CreateProfileCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/CreateProfileCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/CreateProfileCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/DefaultMultiStepCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/DefaultMultiStepCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/DefaultMultiStepCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/DefaultMultiStepCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/HelpCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/HelpCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/HelpCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/HelpCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/ListProfilesCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/ListProfilesCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/ListProfilesCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/ListProfilesCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/OpenCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/OpenCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/OpenCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/OpenCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/ProfileInfoCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/ProfileInfoCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/ProfileInfoCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/ProfileInfoCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/events/CommandEvents.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/events/CommandEvents.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/events/CommandEvents.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/events/CommandEvents.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/events/EventStorage.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/events/EventStorage.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/events/EventStorage.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/events/EventStorage.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ApplicationContextCommandFactory.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ApplicationContextCommandFactory.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ApplicationContextCommandFactory.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ApplicationContextCommandFactory.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ClasspathCommandResourceResolver.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ClasspathCommandResourceResolver.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ClasspathCommandResourceResolver.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ClasspathCommandResourceResolver.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/CommandFactory.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/CommandFactory.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/CommandFactory.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/CommandFactory.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/CommandResourceResolver.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/CommandResourceResolver.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/CommandResourceResolver.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/CommandResourceResolver.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/FileSystemCommandResourceResolver.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/FileSystemCommandResourceResolver.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/FileSystemCommandResourceResolver.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/FileSystemCommandResourceResolver.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/GroovyScriptCommandFactory.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/GroovyScriptCommandFactory.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/GroovyScriptCommandFactory.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/GroovyScriptCommandFactory.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ResourceResolvingCommandFactory.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ResourceResolvingCommandFactory.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ResourceResolvingCommandFactory.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ResourceResolvingCommandFactory.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ServiceCommandFactory.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ServiceCommandFactory.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ServiceCommandFactory.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/ServiceCommandFactory.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/YamlCommandFactory.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/YamlCommandFactory.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/factory/YamlCommandFactory.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/factory/YamlCommandFactory.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/io/FileSystemInteraction.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/io/FileSystemInteraction.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/io/FileSystemInteraction.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/io/FileSystemInteraction.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/io/FileSystemInteractionImpl.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/io/FileSystemInteractionImpl.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/io/FileSystemInteractionImpl.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/io/FileSystemInteractionImpl.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/io/GradleDependency.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/io/GradleDependency.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/io/GradleDependency.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/io/GradleDependency.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/io/ServerInteraction.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/io/ServerInteraction.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/io/ServerInteraction.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/io/ServerInteraction.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/script/GroovyScriptCommand.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/script/GroovyScriptCommand.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/script/GroovyScriptCommand.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/script/GroovyScriptCommand.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/script/GroovyScriptCommandTransform.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/script/GroovyScriptCommandTransform.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/script/GroovyScriptCommandTransform.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/script/GroovyScriptCommandTransform.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/templates/SimpleTemplate.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/templates/SimpleTemplate.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/templates/SimpleTemplate.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/templates/SimpleTemplate.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/templates/TemplateException.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/templates/TemplateException.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/templates/TemplateException.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/templates/TemplateException.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/templates/TemplateRenderer.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/templates/TemplateRenderer.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/templates/TemplateRenderer.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/templates/TemplateRenderer.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/commands/templates/TemplateRendererImpl.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/commands/templates/TemplateRendererImpl.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/commands/templates/TemplateRendererImpl.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/commands/templates/TemplateRendererImpl.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/repository/AbstractJarProfileRepository.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/repository/AbstractJarProfileRepository.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/repository/AbstractJarProfileRepository.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/repository/AbstractJarProfileRepository.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/repository/GrailsAetherGrapeEngineFactory.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/repository/GrailsAetherGrapeEngineFactory.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/repository/GrailsAetherGrapeEngineFactory.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/repository/GrailsAetherGrapeEngineFactory.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/repository/GrailsRepositoryConfiguration.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/repository/GrailsRepositoryConfiguration.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/repository/GrailsRepositoryConfiguration.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/repository/GrailsRepositoryConfiguration.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/repository/MavenProfileRepository.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/repository/MavenProfileRepository.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/repository/MavenProfileRepository.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/repository/MavenProfileRepository.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/repository/StaticJarProfileRepository.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/repository/StaticJarProfileRepository.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/repository/StaticJarProfileRepository.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/repository/StaticJarProfileRepository.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/steps/DefaultStepFactory.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/steps/DefaultStepFactory.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/steps/DefaultStepFactory.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/steps/DefaultStepFactory.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/steps/ExecuteStep.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/steps/ExecuteStep.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/steps/ExecuteStep.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/steps/ExecuteStep.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/steps/GradleStep.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/steps/GradleStep.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/steps/GradleStep.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/steps/GradleStep.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/steps/MkdirStep.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/steps/MkdirStep.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/steps/MkdirStep.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/steps/MkdirStep.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/steps/RenderStep.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/steps/RenderStep.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/steps/RenderStep.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/steps/RenderStep.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/steps/StepFactory.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/steps/StepFactory.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/steps/StepFactory.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/steps/StepFactory.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/steps/StepRegistry.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/steps/StepRegistry.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/steps/StepRegistry.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/steps/StepRegistry.groovy diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/support/ArtefactVariableResolver.groovy b/grace-shell/src/main/groovy/org/grails/cli/profile/support/ArtefactVariableResolver.groovy similarity index 100% rename from grails-shell/src/main/groovy/org/grails/cli/profile/support/ArtefactVariableResolver.groovy rename to grace-shell/src/main/groovy/org/grails/cli/profile/support/ArtefactVariableResolver.groovy diff --git a/grails-shell/src/main/resources/META-INF/services/org.grails.cli.profile.Command b/grace-shell/src/main/resources/META-INF/services/org.grails.cli.profile.Command similarity index 100% rename from grails-shell/src/main/resources/META-INF/services/org.grails.cli.profile.Command rename to grace-shell/src/main/resources/META-INF/services/org.grails.cli.profile.Command diff --git a/grails-shell/src/main/resources/META-INF/services/org.grails.cli.profile.commands.factory.CommandFactory b/grace-shell/src/main/resources/META-INF/services/org.grails.cli.profile.commands.factory.CommandFactory similarity index 100% rename from grails-shell/src/main/resources/META-INF/services/org.grails.cli.profile.commands.factory.CommandFactory rename to grace-shell/src/main/resources/META-INF/services/org.grails.cli.profile.commands.factory.CommandFactory diff --git a/grails-shell/src/main/resources/META-INF/services/org.grails.cli.profile.steps.StepFactory b/grace-shell/src/main/resources/META-INF/services/org.grails.cli.profile.steps.StepFactory similarity index 100% rename from grails-shell/src/main/resources/META-INF/services/org.grails.cli.profile.steps.StepFactory rename to grace-shell/src/main/resources/META-INF/services/org.grails.cli.profile.steps.StepFactory diff --git a/grails-shell/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration b/grace-shell/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration similarity index 100% rename from grails-shell/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration rename to grace-shell/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration diff --git a/grails-shell/src/main/resources/unixStartScript.txt b/grace-shell/src/main/resources/unixStartScript.txt similarity index 100% rename from grails-shell/src/main/resources/unixStartScript.txt rename to grace-shell/src/main/resources/unixStartScript.txt diff --git a/grails-shell/src/test/groovy/org/grails/cli/TestTerminal.java b/grace-shell/src/test/groovy/org/grails/cli/TestTerminal.java similarity index 100% rename from grails-shell/src/test/groovy/org/grails/cli/TestTerminal.java rename to grace-shell/src/test/groovy/org/grails/cli/TestTerminal.java diff --git a/grails-shell/src/test/groovy/org/grails/cli/interactive/completers/RegexCompletorSpec.groovy b/grace-shell/src/test/groovy/org/grails/cli/interactive/completers/RegexCompletorSpec.groovy similarity index 100% rename from grails-shell/src/test/groovy/org/grails/cli/interactive/completers/RegexCompletorSpec.groovy rename to grace-shell/src/test/groovy/org/grails/cli/interactive/completers/RegexCompletorSpec.groovy diff --git a/grails-shell/src/test/groovy/org/grails/cli/profile/ResourceProfileSpec.groovy b/grace-shell/src/test/groovy/org/grails/cli/profile/ResourceProfileSpec.groovy similarity index 100% rename from grails-shell/src/test/groovy/org/grails/cli/profile/ResourceProfileSpec.groovy rename to grace-shell/src/test/groovy/org/grails/cli/profile/ResourceProfileSpec.groovy diff --git a/grails-shell/src/test/groovy/org/grails/cli/profile/commands/CommandScriptTransformSpec.groovy b/grace-shell/src/test/groovy/org/grails/cli/profile/commands/CommandScriptTransformSpec.groovy similarity index 100% rename from grails-shell/src/test/groovy/org/grails/cli/profile/commands/CommandScriptTransformSpec.groovy rename to grace-shell/src/test/groovy/org/grails/cli/profile/commands/CommandScriptTransformSpec.groovy diff --git a/grails-shell/src/test/groovy/org/grails/cli/profile/commands/CreateAppCommandSpec.groovy b/grace-shell/src/test/groovy/org/grails/cli/profile/commands/CreateAppCommandSpec.groovy similarity index 100% rename from grails-shell/src/test/groovy/org/grails/cli/profile/commands/CreateAppCommandSpec.groovy rename to grace-shell/src/test/groovy/org/grails/cli/profile/commands/CreateAppCommandSpec.groovy diff --git a/grails-shell/src/test/groovy/org/grails/cli/profile/commands/events/CommandEventsTraitGeneratedSpec.groovy b/grace-shell/src/test/groovy/org/grails/cli/profile/commands/events/CommandEventsTraitGeneratedSpec.groovy similarity index 100% rename from grails-shell/src/test/groovy/org/grails/cli/profile/commands/events/CommandEventsTraitGeneratedSpec.groovy rename to grace-shell/src/test/groovy/org/grails/cli/profile/commands/events/CommandEventsTraitGeneratedSpec.groovy diff --git a/grails-shell/src/test/groovy/org/grails/cli/profile/repository/MavenRepositorySpec.groovy b/grace-shell/src/test/groovy/org/grails/cli/profile/repository/MavenRepositorySpec.groovy similarity index 100% rename from grails-shell/src/test/groovy/org/grails/cli/profile/repository/MavenRepositorySpec.groovy rename to grace-shell/src/test/groovy/org/grails/cli/profile/repository/MavenRepositorySpec.groovy diff --git a/grails-shell/src/test/groovy/org/grails/cli/profile/steps/StepRegistrySpec.groovy b/grace-shell/src/test/groovy/org/grails/cli/profile/steps/StepRegistrySpec.groovy similarity index 100% rename from grails-shell/src/test/groovy/org/grails/cli/profile/steps/StepRegistrySpec.groovy rename to grace-shell/src/test/groovy/org/grails/cli/profile/steps/StepRegistrySpec.groovy diff --git a/grails-shell/src/test/resources/gradle-sample/build.gradle b/grace-shell/src/test/resources/gradle-sample/build.gradle similarity index 100% rename from grails-shell/src/test/resources/gradle-sample/build.gradle rename to grace-shell/src/test/resources/gradle-sample/build.gradle diff --git a/grails-shell/src/test/resources/gradle-sample/gradle/wrapper/gradle-wrapper.jar b/grace-shell/src/test/resources/gradle-sample/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from grails-shell/src/test/resources/gradle-sample/gradle/wrapper/gradle-wrapper.jar rename to grace-shell/src/test/resources/gradle-sample/gradle/wrapper/gradle-wrapper.jar diff --git a/grails-shell/src/test/resources/gradle-sample/gradle/wrapper/gradle-wrapper.properties b/grace-shell/src/test/resources/gradle-sample/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from grails-shell/src/test/resources/gradle-sample/gradle/wrapper/gradle-wrapper.properties rename to grace-shell/src/test/resources/gradle-sample/gradle/wrapper/gradle-wrapper.properties diff --git a/grails-shell/src/test/resources/gradle-sample/gradlew b/grace-shell/src/test/resources/gradle-sample/gradlew similarity index 100% rename from grails-shell/src/test/resources/gradle-sample/gradlew rename to grace-shell/src/test/resources/gradle-sample/gradlew diff --git a/grails-shell/src/test/resources/gradle-sample/gradlew.bat b/grace-shell/src/test/resources/gradle-sample/gradlew.bat similarity index 96% rename from grails-shell/src/test/resources/gradle-sample/gradlew.bat rename to grace-shell/src/test/resources/gradle-sample/gradlew.bat index aec99730b4..8a0b282aa6 100644 --- a/grails-shell/src/test/resources/gradle-sample/gradlew.bat +++ b/grace-shell/src/test/resources/gradle-sample/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/grails-shell/src/test/resources/gradle-sample/settings.gradle b/grace-shell/src/test/resources/gradle-sample/settings.gradle similarity index 100% rename from grails-shell/src/test/resources/gradle-sample/settings.gradle rename to grace-shell/src/test/resources/gradle-sample/settings.gradle diff --git a/grails-shell/src/test/resources/gradle-sample/subproj/build.gradle b/grace-shell/src/test/resources/gradle-sample/subproj/build.gradle similarity index 100% rename from grails-shell/src/test/resources/gradle-sample/subproj/build.gradle rename to grace-shell/src/test/resources/gradle-sample/subproj/build.gradle diff --git a/grails-shell/src/test/resources/gradle-sample/subproj2/build.gradle b/grace-shell/src/test/resources/gradle-sample/subproj2/build.gradle similarity index 100% rename from grails-shell/src/test/resources/gradle-sample/subproj2/build.gradle rename to grace-shell/src/test/resources/gradle-sample/subproj2/build.gradle diff --git a/grails-shell/src/test/resources/profiles-repository/profiles/web/commands/TestGroovy.groovy b/grace-shell/src/test/resources/profiles-repository/profiles/web/commands/TestGroovy.groovy similarity index 100% rename from grails-shell/src/test/resources/profiles-repository/profiles/web/commands/TestGroovy.groovy rename to grace-shell/src/test/resources/profiles-repository/profiles/web/commands/TestGroovy.groovy diff --git a/grace-spring-boot/README.md b/grace-spring-boot/README.md new file mode 100644 index 0000000000..6d2915f34c --- /dev/null +++ b/grace-spring-boot/README.md @@ -0,0 +1,2 @@ +## grace-spring-boot + diff --git a/grace-spring-boot/build.gradle b/grace-spring-boot/build.gradle new file mode 100644 index 0000000000..7d7339d98e --- /dev/null +++ b/grace-spring-boot/build.gradle @@ -0,0 +1,13 @@ +dependencies { + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-util") + + api libs.spring.beans + api libs.spring.boot + api libs.spring.context + api libs.spring.core + api libs.spring.tx + + testImplementation project(":grace-test-support") +} diff --git a/grails-spring-boot/src/main/groovy/org/grails/beans/support/PropertiesEditor.java b/grace-spring-boot/src/main/groovy/org/grails/beans/support/PropertiesEditor.java similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/beans/support/PropertiesEditor.java rename to grace-spring-boot/src/main/groovy/org/grails/beans/support/PropertiesEditor.java diff --git a/grails-spring-boot/src/main/groovy/org/grails/core/support/ClassEditor.java b/grace-spring-boot/src/main/groovy/org/grails/core/support/ClassEditor.java similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/core/support/ClassEditor.java rename to grace-spring-boot/src/main/groovy/org/grails/core/support/ClassEditor.java diff --git a/grails-spring-boot/src/main/groovy/org/grails/core/support/internal/tools/ClassRelativeClassLoader.java b/grace-spring-boot/src/main/groovy/org/grails/core/support/internal/tools/ClassRelativeClassLoader.java similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/core/support/internal/tools/ClassRelativeClassLoader.java rename to grace-spring-boot/src/main/groovy/org/grails/core/support/internal/tools/ClassRelativeClassLoader.java diff --git a/grails-spring-boot/src/main/groovy/org/grails/core/support/internal/tools/ClassRelativeResourcePatternResolver.java b/grace-spring-boot/src/main/groovy/org/grails/core/support/internal/tools/ClassRelativeResourcePatternResolver.java similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/core/support/internal/tools/ClassRelativeResourcePatternResolver.java rename to grace-spring-boot/src/main/groovy/org/grails/core/support/internal/tools/ClassRelativeResourcePatternResolver.java diff --git a/grails-spring-boot/src/main/groovy/org/grails/core/support/internal/tools/MetaClassChangeReporter.java b/grace-spring-boot/src/main/groovy/org/grails/core/support/internal/tools/MetaClassChangeReporter.java similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/core/support/internal/tools/MetaClassChangeReporter.java rename to grace-spring-boot/src/main/groovy/org/grails/core/support/internal/tools/MetaClassChangeReporter.java diff --git a/grails-spring-boot/src/main/groovy/org/grails/spring/aop/autoproxy/GroovyAwareAspectJAwareAdvisorAutoProxyCreator.java b/grace-spring-boot/src/main/groovy/org/grails/spring/aop/autoproxy/GroovyAwareAspectJAwareAdvisorAutoProxyCreator.java similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/spring/aop/autoproxy/GroovyAwareAspectJAwareAdvisorAutoProxyCreator.java rename to grace-spring-boot/src/main/groovy/org/grails/spring/aop/autoproxy/GroovyAwareAspectJAwareAdvisorAutoProxyCreator.java diff --git a/grails-spring-boot/src/main/groovy/org/grails/spring/aop/autoproxy/GroovyAwareInfrastructureAdvisorAutoProxyCreator.java b/grace-spring-boot/src/main/groovy/org/grails/spring/aop/autoproxy/GroovyAwareInfrastructureAdvisorAutoProxyCreator.java similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/spring/aop/autoproxy/GroovyAwareInfrastructureAdvisorAutoProxyCreator.java rename to grace-spring-boot/src/main/groovy/org/grails/spring/aop/autoproxy/GroovyAwareInfrastructureAdvisorAutoProxyCreator.java diff --git a/grails-spring-boot/src/main/groovy/org/grails/spring/beans/factory/GenericBeanFactoryAccessor.java b/grace-spring-boot/src/main/groovy/org/grails/spring/beans/factory/GenericBeanFactoryAccessor.java similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/spring/beans/factory/GenericBeanFactoryAccessor.java rename to grace-spring-boot/src/main/groovy/org/grails/spring/beans/factory/GenericBeanFactoryAccessor.java diff --git a/grails-spring-boot/src/main/groovy/org/grails/spring/beans/factory/HotSwappableTargetSourceFactoryBean.groovy b/grace-spring-boot/src/main/groovy/org/grails/spring/beans/factory/HotSwappableTargetSourceFactoryBean.groovy similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/spring/beans/factory/HotSwappableTargetSourceFactoryBean.groovy rename to grace-spring-boot/src/main/groovy/org/grails/spring/beans/factory/HotSwappableTargetSourceFactoryBean.groovy diff --git a/grails-spring-boot/src/main/groovy/org/grails/spring/beans/factory/InstanceFactoryBean.java b/grace-spring-boot/src/main/groovy/org/grails/spring/beans/factory/InstanceFactoryBean.java similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/spring/beans/factory/InstanceFactoryBean.java rename to grace-spring-boot/src/main/groovy/org/grails/spring/beans/factory/InstanceFactoryBean.java diff --git a/grails-spring-boot/src/main/groovy/org/grails/spring/boot/env/GroovyConfigPropertySourceLoader.groovy b/grace-spring-boot/src/main/groovy/org/grails/spring/boot/env/GroovyConfigPropertySourceLoader.groovy similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/spring/boot/env/GroovyConfigPropertySourceLoader.groovy rename to grace-spring-boot/src/main/groovy/org/grails/spring/boot/env/GroovyConfigPropertySourceLoader.groovy diff --git a/grails-spring-boot/src/main/groovy/org/grails/spring/boot/env/YamlPropertySourceLoader.java b/grace-spring-boot/src/main/groovy/org/grails/spring/boot/env/YamlPropertySourceLoader.java similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/spring/boot/env/YamlPropertySourceLoader.java rename to grace-spring-boot/src/main/groovy/org/grails/spring/boot/env/YamlPropertySourceLoader.java diff --git a/grails-spring-boot/src/main/groovy/org/grails/spring/context/ApplicationContextExtension.groovy b/grace-spring-boot/src/main/groovy/org/grails/spring/context/ApplicationContextExtension.groovy similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/spring/context/ApplicationContextExtension.groovy rename to grace-spring-boot/src/main/groovy/org/grails/spring/context/ApplicationContextExtension.groovy diff --git a/grails-spring-boot/src/main/groovy/org/grails/spring/context/support/GrailsBeanPropertyOverrideConfigurer.java b/grace-spring-boot/src/main/groovy/org/grails/spring/context/support/GrailsBeanPropertyOverrideConfigurer.java similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/spring/context/support/GrailsBeanPropertyOverrideConfigurer.java rename to grace-spring-boot/src/main/groovy/org/grails/spring/context/support/GrailsBeanPropertyOverrideConfigurer.java diff --git a/grails-spring-boot/src/main/groovy/org/grails/spring/context/support/GrailsPlaceholderConfigurer.java b/grace-spring-boot/src/main/groovy/org/grails/spring/context/support/GrailsPlaceholderConfigurer.java similarity index 100% rename from grails-spring-boot/src/main/groovy/org/grails/spring/context/support/GrailsPlaceholderConfigurer.java rename to grace-spring-boot/src/main/groovy/org/grails/spring/context/support/GrailsPlaceholderConfigurer.java diff --git a/grails-spring-boot/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/grace-spring-boot/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule similarity index 100% rename from grails-spring-boot/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule rename to grace-spring-boot/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule diff --git a/grails-spring-boot/src/test/groovy/org/grails/config/GroovyConfigPropertySourceLoaderSpec.groovy b/grace-spring-boot/src/test/groovy/org/grails/config/GroovyConfigPropertySourceLoaderSpec.groovy similarity index 100% rename from grails-spring-boot/src/test/groovy/org/grails/config/GroovyConfigPropertySourceLoaderSpec.groovy rename to grace-spring-boot/src/test/groovy/org/grails/config/GroovyConfigPropertySourceLoaderSpec.groovy diff --git a/grails-spring-boot/src/test/groovy/org/grails/config/PropertySourceConfigSpec.groovy b/grace-spring-boot/src/test/groovy/org/grails/config/PropertySourceConfigSpec.groovy similarity index 100% rename from grails-spring-boot/src/test/groovy/org/grails/config/PropertySourceConfigSpec.groovy rename to grace-spring-boot/src/test/groovy/org/grails/config/PropertySourceConfigSpec.groovy diff --git a/grails-spring-boot/src/test/groovy/org/grails/config/SystemEnvironmentConfigSpec.groovy b/grace-spring-boot/src/test/groovy/org/grails/config/SystemEnvironmentConfigSpec.groovy similarity index 100% rename from grails-spring-boot/src/test/groovy/org/grails/config/SystemEnvironmentConfigSpec.groovy rename to grace-spring-boot/src/test/groovy/org/grails/config/SystemEnvironmentConfigSpec.groovy diff --git a/grails-spring-boot/src/test/groovy/org/grails/config/YamlPropertySourceLoaderSpec.groovy b/grace-spring-boot/src/test/groovy/org/grails/config/YamlPropertySourceLoaderSpec.groovy similarity index 100% rename from grails-spring-boot/src/test/groovy/org/grails/config/YamlPropertySourceLoaderSpec.groovy rename to grace-spring-boot/src/test/groovy/org/grails/config/YamlPropertySourceLoaderSpec.groovy diff --git a/grails-spring-boot/src/test/groovy/org/grails/spring/context/ApplicationContextExtensionSpec.groovy b/grace-spring-boot/src/test/groovy/org/grails/spring/context/ApplicationContextExtensionSpec.groovy similarity index 100% rename from grails-spring-boot/src/test/groovy/org/grails/spring/context/ApplicationContextExtensionSpec.groovy rename to grace-spring-boot/src/test/groovy/org/grails/spring/context/ApplicationContextExtensionSpec.groovy diff --git a/grails-spring-boot/src/test/resources/.gitkeep b/grace-spring-boot/src/test/resources/.gitkeep similarity index 100% rename from grails-spring-boot/src/test/resources/.gitkeep rename to grace-spring-boot/src/test/resources/.gitkeep diff --git a/grails-spring-boot/src/test/resources/application.groovy b/grace-spring-boot/src/test/resources/application.groovy similarity index 100% rename from grails-spring-boot/src/test/resources/application.groovy rename to grace-spring-boot/src/test/resources/application.groovy diff --git a/grails-spring-boot/src/test/resources/application.yml b/grace-spring-boot/src/test/resources/application.yml similarity index 100% rename from grails-spring-boot/src/test/resources/application.yml rename to grace-spring-boot/src/test/resources/application.yml diff --git a/grails-spring-boot/src/test/resources/config/application.yml b/grace-spring-boot/src/test/resources/config/application.yml similarity index 100% rename from grails-spring-boot/src/test/resources/config/application.yml rename to grace-spring-boot/src/test/resources/config/application.yml diff --git a/grails-spring-boot/src/test/resources/foo-plugin-environments.yml b/grace-spring-boot/src/test/resources/foo-plugin-environments.yml similarity index 100% rename from grails-spring-boot/src/test/resources/foo-plugin-environments.yml rename to grace-spring-boot/src/test/resources/foo-plugin-environments.yml diff --git a/grails-spring-boot/src/test/resources/foo-plugin-multiple-environments.yml b/grace-spring-boot/src/test/resources/foo-plugin-multiple-environments.yml similarity index 100% rename from grails-spring-boot/src/test/resources/foo-plugin-multiple-environments.yml rename to grace-spring-boot/src/test/resources/foo-plugin-multiple-environments.yml diff --git a/grace-spring/README.md b/grace-spring/README.md new file mode 100644 index 0000000000..94db8f4686 --- /dev/null +++ b/grace-spring/README.md @@ -0,0 +1,2 @@ +## grace-spring + diff --git a/grails-spring/build.gradle b/grace-spring/build.gradle similarity index 100% rename from grails-spring/build.gradle rename to grace-spring/build.gradle diff --git a/grails-spring/src/main/groovy/grails/spring/BeanBuilder.java b/grace-spring/src/main/groovy/grails/spring/BeanBuilder.java similarity index 100% rename from grails-spring/src/main/groovy/grails/spring/BeanBuilder.java rename to grace-spring/src/main/groovy/grails/spring/BeanBuilder.java diff --git a/grails-spring/src/main/groovy/grails/spring/DynamicElementReader.groovy b/grace-spring/src/main/groovy/grails/spring/DynamicElementReader.groovy similarity index 100% rename from grails-spring/src/main/groovy/grails/spring/DynamicElementReader.groovy rename to grace-spring/src/main/groovy/grails/spring/DynamicElementReader.groovy diff --git a/grails-spring/src/main/groovy/org/grails/spring/BeanConfiguration.java b/grace-spring/src/main/groovy/org/grails/spring/BeanConfiguration.java similarity index 96% rename from grails-spring/src/main/groovy/org/grails/spring/BeanConfiguration.java rename to grace-spring/src/main/groovy/org/grails/spring/BeanConfiguration.java index a37ac63b36..66f29fc776 100644 --- a/grails-spring/src/main/groovy/org/grails/spring/BeanConfiguration.java +++ b/grace-spring/src/main/groovy/org/grails/spring/BeanConfiguration.java @@ -1,154 +1,154 @@ -/* - * Copyright 2004-2022 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 - * - * https://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.spring; - -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.support.AbstractBeanDefinition; -import org.springframework.core.io.Resource; - -/** - * Represents a runtime bean configuration. - * - * Credit must go to Solomon Duskis and the - * article: http://jroller.com/page/Solomon?entry=programmatic_configuration_in_spring - * - * @author Graeme - * @since 0.3 - */ -public interface BeanConfiguration { - - String AUTOWIRE_BY_TYPE = "byType"; - - String AUTOWIRE_BY_NAME = "byName"; - - /** - * @return The name of the bean - */ - String getName(); - - /** - * @return true if the bean is singleton - */ - boolean isSingleton(); - - /** - * @return The Spring bean definition instance - */ - AbstractBeanDefinition getBeanDefinition(); - - /** - * Adds a property value to this bean. - * @param propertyName The name of the property - * @param propertyValue The value of the property - * - * @return Returns this bean configuration - */ - BeanConfiguration addProperty(String propertyName, Object propertyValue); - - /** - * Sets the name of the method to call when destroying the bean. - * - * @param methodName The method name - * @return This bean configuration - */ - BeanConfiguration setDestroyMethod(String methodName); - - /** - * Sets the names of the beans this bean configuration depends on - * - * @param dependsOn Bean names it depends on - * @return This bean configuration - */ - BeanConfiguration setDependsOn(String[] dependsOn); - - /** - * - * @param beanName - * @return This BeanConfiguration - */ - BeanConfiguration setFactoryBean(String beanName); - - /** - * - * @param methodName - * @return This BeanConfiguration - */ - BeanConfiguration setFactoryMethod(String methodName); - - /** - * Sets the autowire type, either "byType" or "byName" - * - * @param type The type - * @return This BeanConfiguration - */ - BeanConfiguration setAutowire(String type); - - /** - * Sets the name of the bean in the app ctx. - * @param beanName The bean name - */ - void setName(String beanName); - - /** - * Set the resource that this bean definition came from. - * @param resource the resource - */ - void setResource(Resource resource); - - Resource getResource(); - - /** - * Returns true if the bean config has the name property set. - * @param name The name of the property - * @return true if it does have a property with the given name - */ - boolean hasProperty(String name); - - /** - * Returns the value of the given property or throws a MissingPropertyException. - * - * @param name The name of the property - * @return The value of the property - */ - Object getPropertyValue(String name); - - /** - * Sets a property value on the bean configuration - * - * @param property The name of the property - * @param newValue The value - */ - void setPropertyValue(String property, Object newValue); - - /** - * Sets the BeanConfiguration as an Abstract bean definition - * @param isAbstract Whether its abstract or not - * @return This BeanConfiguration object - */ - BeanConfiguration setAbstract(boolean isAbstract); - - /** - * Sets the name of the parent bean. - * - * @param name Either a string which is the name of the bean, a RuntimeBeanReference or a BeanConfiguration - */ - void setParent(Object name); - - void setBeanDefinition(BeanDefinition definition); - - boolean isConditionOn(); - -} +/* + * Copyright 2004-2022 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 + * + * https://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.spring; + +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.beans.factory.support.AbstractBeanDefinition; +import org.springframework.core.io.Resource; + +/** + * Represents a runtime bean configuration. + * + * Credit must go to Solomon Duskis and the + * article: http://jroller.com/page/Solomon?entry=programmatic_configuration_in_spring + * + * @author Graeme + * @since 0.3 + */ +public interface BeanConfiguration { + + String AUTOWIRE_BY_TYPE = "byType"; + + String AUTOWIRE_BY_NAME = "byName"; + + /** + * @return The name of the bean + */ + String getName(); + + /** + * @return true if the bean is singleton + */ + boolean isSingleton(); + + /** + * @return The Spring bean definition instance + */ + AbstractBeanDefinition getBeanDefinition(); + + /** + * Adds a property value to this bean. + * @param propertyName The name of the property + * @param propertyValue The value of the property + * + * @return Returns this bean configuration + */ + BeanConfiguration addProperty(String propertyName, Object propertyValue); + + /** + * Sets the name of the method to call when destroying the bean. + * + * @param methodName The method name + * @return This bean configuration + */ + BeanConfiguration setDestroyMethod(String methodName); + + /** + * Sets the names of the beans this bean configuration depends on + * + * @param dependsOn Bean names it depends on + * @return This bean configuration + */ + BeanConfiguration setDependsOn(String[] dependsOn); + + /** + * + * @param beanName + * @return This BeanConfiguration + */ + BeanConfiguration setFactoryBean(String beanName); + + /** + * + * @param methodName + * @return This BeanConfiguration + */ + BeanConfiguration setFactoryMethod(String methodName); + + /** + * Sets the autowire type, either "byType" or "byName" + * + * @param type The type + * @return This BeanConfiguration + */ + BeanConfiguration setAutowire(String type); + + /** + * Sets the name of the bean in the app ctx. + * @param beanName The bean name + */ + void setName(String beanName); + + /** + * Set the resource that this bean definition came from. + * @param resource the resource + */ + void setResource(Resource resource); + + Resource getResource(); + + /** + * Returns true if the bean config has the name property set. + * @param name The name of the property + * @return true if it does have a property with the given name + */ + boolean hasProperty(String name); + + /** + * Returns the value of the given property or throws a MissingPropertyException. + * + * @param name The name of the property + * @return The value of the property + */ + Object getPropertyValue(String name); + + /** + * Sets a property value on the bean configuration + * + * @param property The name of the property + * @param newValue The value + */ + void setPropertyValue(String property, Object newValue); + + /** + * Sets the BeanConfiguration as an Abstract bean definition + * @param isAbstract Whether its abstract or not + * @return This BeanConfiguration object + */ + BeanConfiguration setAbstract(boolean isAbstract); + + /** + * Sets the name of the parent bean. + * + * @param name Either a string which is the name of the bean, a RuntimeBeanReference or a BeanConfiguration + */ + void setParent(Object name); + + void setBeanDefinition(BeanDefinition definition); + + boolean isConditionOn(); + +} diff --git a/grails-spring/src/main/groovy/org/grails/spring/DefaultBeanConfiguration.java b/grace-spring/src/main/groovy/org/grails/spring/DefaultBeanConfiguration.java similarity index 97% rename from grails-spring/src/main/groovy/org/grails/spring/DefaultBeanConfiguration.java rename to grace-spring/src/main/groovy/org/grails/spring/DefaultBeanConfiguration.java index 3d93338eb9..032ee1b9c3 100644 --- a/grails-spring/src/main/groovy/org/grails/spring/DefaultBeanConfiguration.java +++ b/grace-spring/src/main/groovy/org/grails/spring/DefaultBeanConfiguration.java @@ -1,385 +1,385 @@ -/* - * Copyright 2004-2022 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 - * - * https://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.spring; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import groovy.lang.GroovyObjectSupport; -import org.springframework.beans.BeanWrapper; -import org.springframework.beans.BeanWrapperImpl; -import org.springframework.beans.PropertyValue; -import org.springframework.beans.factory.config.AutowireCapableBeanFactory; -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.config.ConstructorArgumentValues; -import org.springframework.beans.factory.config.RuntimeBeanReference; -import org.springframework.beans.factory.support.AbstractBeanDefinition; -import org.springframework.beans.factory.support.GenericBeanDefinition; -import org.springframework.context.annotation.Lazy; -import org.springframework.context.annotation.Role; -import org.springframework.core.io.Resource; -import org.springframework.util.Assert; - -/** - * Default implementation of the BeanConfiguration interface . - * - * Credit must go to Solomon Duskis and the - * article: http://jroller.com/page/Solomon?entry=programmatic_configuration_in_spring - * - * @author Graeme - * @author Michael Yan - * @since 0.3 - */ -public class DefaultBeanConfiguration extends GroovyObjectSupport implements BeanConfiguration { - - private static final String AUTOWIRE = "autowire"; - - private static final String SINGLETON = "singleton"; - - private static final String CONSTRUCTOR_ARGS = "constructorArgs"; - - private static final String DESTROY_METHOD = "destroyMethod"; - - private static final String FACTORY_BEAN = "factoryBean"; - - private static final String FACTORY_METHOD = "factoryMethod"; - - private static final String INIT_METHOD = "initMethod"; - - private static final String BY_NAME = "byName"; - - private static final String PARENT = "parent"; - - private static final String BY_TYPE = "byType"; - - private static final String BY_CONSTRUCTOR = "constructor"; - - private static final String ROLE = "role"; - - private static final String ROLE_APPLICATION = "application"; - - private static final String ROLE_SUPPORT = "support"; - - private static final String ROLE_INFRASTRUCTURE = "infrastructure"; - - private static final List DYNAMIC_PROPS = Arrays.asList( - AUTOWIRE, - CONSTRUCTOR_ARGS, - DESTROY_METHOD, - FACTORY_BEAN, - FACTORY_METHOD, - INIT_METHOD, - BY_NAME, - BY_TYPE, - BY_CONSTRUCTOR); - - private Class clazz; - - private String name; - - private boolean singleton = true; - - private AbstractBeanDefinition definition; - - private Resource resource; - - private boolean condition = true; - - private Collection constructorArgs = Collections.emptyList(); - - private BeanWrapper wrapper; - - private String parentName; - - public DefaultBeanConfiguration(String name, Class clazz) { - this.name = name; - this.clazz = clazz; - } - - public DefaultBeanConfiguration(String name, Class clazz, boolean prototype) { - this(name, clazz, Collections.emptyList()); - this.singleton = !prototype; - } - - public DefaultBeanConfiguration(String name) { - this(name, null, Collections.emptyList()); - } - - public DefaultBeanConfiguration(Class clazz2) { - this.clazz = clazz2; - } - - public DefaultBeanConfiguration(String name2, Class clazz2, Collection args) { - this.name = name2; - this.clazz = clazz2; - this.constructorArgs = args; - } - - public DefaultBeanConfiguration(String name2, boolean prototype) { - this(name2, null, Collections.emptyList()); - this.singleton = !prototype; - } - - public DefaultBeanConfiguration(Class clazz2, Collection constructorArguments) { - this.clazz = clazz2; - this.constructorArgs = constructorArguments; - } - - public String getName() { - return this.name; - } - - @Override - public Object getProperty(String property) { - @SuppressWarnings("unused") - AbstractBeanDefinition bd = getBeanDefinition(); - if (this.wrapper.isReadableProperty(property)) { - return this.wrapper.getPropertyValue(property); - } - if (DYNAMIC_PROPS.contains(property)) { - return null; - } - return super.getProperty(property); - } - - @Override - public void setProperty(String property, Object newValue) { - if (PARENT.equals(property)) { - setParent(newValue); - return; - } - - AbstractBeanDefinition bd = getBeanDefinition(); - if (AUTOWIRE.equals(property)) { - if (BY_NAME.equals(newValue)) { - bd.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_BY_NAME); - } - else if (BY_TYPE.equals(newValue)) { - bd.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE); - } - else if (Boolean.TRUE.equals(newValue)) { - bd.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_BY_NAME); - } - else if (BY_CONSTRUCTOR.equals(newValue)) { - bd.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR); - } - } - // role - else if (ROLE.equals(property)) { - if (ROLE_APPLICATION.equals(newValue) || Integer.valueOf(BeanDefinition.ROLE_APPLICATION).equals(newValue)) { - bd.setRole(BeanDefinition.ROLE_APPLICATION); - } - else if (ROLE_SUPPORT.equals(newValue) || Integer.valueOf(BeanDefinition.ROLE_SUPPORT).equals(newValue)) { - bd.setRole(BeanDefinition.ROLE_SUPPORT); - } - else if (ROLE_INFRASTRUCTURE.equals(newValue) || Integer.valueOf(BeanDefinition.ROLE_INFRASTRUCTURE).equals(newValue)) { - bd.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); - } - } - // constructorArgs - else if (CONSTRUCTOR_ARGS.equals(property) && newValue instanceof List) { - ConstructorArgumentValues cav = new ConstructorArgumentValues(); - for (Object e : (List) newValue) { - cav.addGenericArgumentValue(e); - } - bd.setConstructorArgumentValues(cav); - } - // destroyMethod - else if (DESTROY_METHOD.equals(property)) { - if (newValue != null) { - bd.setDestroyMethodName(newValue.toString()); - } - } - // factoryBean - else if (FACTORY_BEAN.equals(property)) { - if (newValue != null) { - bd.setFactoryBeanName(newValue.toString()); - } - } - // factoryMethod - else if (FACTORY_METHOD.equals(property)) { - if (newValue != null) { - bd.setFactoryMethodName(newValue.toString()); - } - } - // initMethod - else if (INIT_METHOD.equals(property)) { - if (newValue != null) { - bd.setInitMethodName(newValue.toString()); - } - } - // singleton property - else if (SINGLETON.equals(property)) { - bd.setScope(Boolean.TRUE.equals(newValue) ? BeanDefinition.SCOPE_SINGLETON : BeanDefinition.SCOPE_PROTOTYPE); - } - else if (this.wrapper.isWritableProperty(property)) { - this.wrapper.setPropertyValue(property, newValue); - } - // autowire - else { - super.setProperty(property, newValue); - } - } - - public boolean isSingleton() { - return this.singleton; - } - - public AbstractBeanDefinition getBeanDefinition() { - if (this.definition == null) { - this.definition = createBeanDefinition(); - } - else if (this.definition.getResource() == null) { - this.definition.setResource(this.resource); - } - return this.definition; - } - - public void setBeanDefinition(BeanDefinition definition) { - this.definition = (AbstractBeanDefinition) definition; - } - - protected AbstractBeanDefinition createBeanDefinition() { - AbstractBeanDefinition bd = new GenericBeanDefinition(); - if (!this.constructorArgs.isEmpty()) { - ConstructorArgumentValues cav = new ConstructorArgumentValues(); - for (Object constructorArg : this.constructorArgs) { - cav.addGenericArgumentValue(constructorArg); - } - bd.setConstructorArgumentValues(cav); - } - if (this.clazz != null) { - Lazy lazy = this.clazz.getAnnotation(Lazy.class); - if (lazy != null) { - bd.setLazyInit(lazy.value()); - } - Role role = this.clazz.getAnnotation(Role.class); - if (role != null) { - bd.setRole(role.value()); - } - bd.setBeanClass(this.clazz); - } - bd.setScope(this.singleton ? AbstractBeanDefinition.SCOPE_SINGLETON : AbstractBeanDefinition.SCOPE_PROTOTYPE); - if (this.parentName != null) { - bd.setParentName(this.parentName); - } - if (this.resource != null) { - bd.setResource(this.resource); - } - this.wrapper = new BeanWrapperImpl(bd); - return bd; - } - - public BeanConfiguration addProperty(String propertyName, Object propertyValue) { - if (propertyValue instanceof BeanConfiguration) { - propertyValue = ((BeanConfiguration) propertyValue).getBeanDefinition(); - } - getBeanDefinition() - .getPropertyValues() - .addPropertyValue(propertyName, propertyValue); - - return this; - } - - public BeanConfiguration setDestroyMethod(String methodName) { - getBeanDefinition().setDestroyMethodName(methodName); - return this; - } - - public BeanConfiguration setDependsOn(String[] dependsOn) { - getBeanDefinition().setDependsOn(dependsOn); - return this; - } - - public BeanConfiguration setFactoryBean(String beanName) { - getBeanDefinition().setFactoryBeanName(beanName); - return this; - } - - public BeanConfiguration setFactoryMethod(String methodName) { - getBeanDefinition().setFactoryMethodName(methodName); - return this; - } - - public BeanConfiguration setAutowire(String type) { - if ("byName".equals(type)) { - getBeanDefinition().setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_NAME); - } - else if ("byType".equals(type)) { - getBeanDefinition().setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE); - } - return this; - } - - public void setName(String beanName) { - this.name = beanName; - } - - public void setResource(Resource resource) { - this.resource = resource; - } - - public Resource getResource() { - return this.resource; - } - - public Object getPropertyValue(String propName) { - PropertyValue propertyValue = getBeanDefinition() - .getPropertyValues() - .getPropertyValue(propName); - if (propertyValue == null) { - return null; - } - - return propertyValue.getValue(); - } - - public boolean hasProperty(String propName) { - return getBeanDefinition().getPropertyValues().contains(propName); - } - - public void setPropertyValue(String property, Object newValue) { - getBeanDefinition().getPropertyValues().addPropertyValue(property, newValue); - } - - public BeanConfiguration setAbstract(boolean isAbstract) { - getBeanDefinition().setAbstract(isAbstract); - return this; - } - - public void setParent(Object obj) { - Assert.notNull(obj, "Parent bean cannot be set to a null runtime bean reference!"); - - if (obj instanceof String) { - this.parentName = (String) obj; - } - else if (obj instanceof RuntimeBeanReference) { - this.parentName = ((RuntimeBeanReference) obj).getBeanName(); - } - else if (obj instanceof BeanConfiguration) { - this.parentName = ((BeanConfiguration) obj).getName(); - } - getBeanDefinition().setParentName(this.parentName); - setAbstract(false); - } - - public boolean isConditionOn() { - return this.condition; - } - -} +/* + * Copyright 2004-2022 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 + * + * https://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.spring; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import groovy.lang.GroovyObjectSupport; +import org.springframework.beans.BeanWrapper; +import org.springframework.beans.BeanWrapperImpl; +import org.springframework.beans.PropertyValue; +import org.springframework.beans.factory.config.AutowireCapableBeanFactory; +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.beans.factory.config.ConstructorArgumentValues; +import org.springframework.beans.factory.config.RuntimeBeanReference; +import org.springframework.beans.factory.support.AbstractBeanDefinition; +import org.springframework.beans.factory.support.GenericBeanDefinition; +import org.springframework.context.annotation.Lazy; +import org.springframework.context.annotation.Role; +import org.springframework.core.io.Resource; +import org.springframework.util.Assert; + +/** + * Default implementation of the BeanConfiguration interface . + * + * Credit must go to Solomon Duskis and the + * article: http://jroller.com/page/Solomon?entry=programmatic_configuration_in_spring + * + * @author Graeme + * @author Michael Yan + * @since 0.3 + */ +public class DefaultBeanConfiguration extends GroovyObjectSupport implements BeanConfiguration { + + private static final String AUTOWIRE = "autowire"; + + private static final String SINGLETON = "singleton"; + + private static final String CONSTRUCTOR_ARGS = "constructorArgs"; + + private static final String DESTROY_METHOD = "destroyMethod"; + + private static final String FACTORY_BEAN = "factoryBean"; + + private static final String FACTORY_METHOD = "factoryMethod"; + + private static final String INIT_METHOD = "initMethod"; + + private static final String BY_NAME = "byName"; + + private static final String PARENT = "parent"; + + private static final String BY_TYPE = "byType"; + + private static final String BY_CONSTRUCTOR = "constructor"; + + private static final String ROLE = "role"; + + private static final String ROLE_APPLICATION = "application"; + + private static final String ROLE_SUPPORT = "support"; + + private static final String ROLE_INFRASTRUCTURE = "infrastructure"; + + private static final List DYNAMIC_PROPS = Arrays.asList( + AUTOWIRE, + CONSTRUCTOR_ARGS, + DESTROY_METHOD, + FACTORY_BEAN, + FACTORY_METHOD, + INIT_METHOD, + BY_NAME, + BY_TYPE, + BY_CONSTRUCTOR); + + private Class clazz; + + private String name; + + private boolean singleton = true; + + private AbstractBeanDefinition definition; + + private Resource resource; + + private boolean condition = true; + + private Collection constructorArgs = Collections.emptyList(); + + private BeanWrapper wrapper; + + private String parentName; + + public DefaultBeanConfiguration(String name, Class clazz) { + this.name = name; + this.clazz = clazz; + } + + public DefaultBeanConfiguration(String name, Class clazz, boolean prototype) { + this(name, clazz, Collections.emptyList()); + this.singleton = !prototype; + } + + public DefaultBeanConfiguration(String name) { + this(name, null, Collections.emptyList()); + } + + public DefaultBeanConfiguration(Class clazz2) { + this.clazz = clazz2; + } + + public DefaultBeanConfiguration(String name2, Class clazz2, Collection args) { + this.name = name2; + this.clazz = clazz2; + this.constructorArgs = args; + } + + public DefaultBeanConfiguration(String name2, boolean prototype) { + this(name2, null, Collections.emptyList()); + this.singleton = !prototype; + } + + public DefaultBeanConfiguration(Class clazz2, Collection constructorArguments) { + this.clazz = clazz2; + this.constructorArgs = constructorArguments; + } + + public String getName() { + return this.name; + } + + @Override + public Object getProperty(String property) { + @SuppressWarnings("unused") + AbstractBeanDefinition bd = getBeanDefinition(); + if (this.wrapper.isReadableProperty(property)) { + return this.wrapper.getPropertyValue(property); + } + if (DYNAMIC_PROPS.contains(property)) { + return null; + } + return super.getProperty(property); + } + + @Override + public void setProperty(String property, Object newValue) { + if (PARENT.equals(property)) { + setParent(newValue); + return; + } + + AbstractBeanDefinition bd = getBeanDefinition(); + if (AUTOWIRE.equals(property)) { + if (BY_NAME.equals(newValue)) { + bd.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_BY_NAME); + } + else if (BY_TYPE.equals(newValue)) { + bd.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE); + } + else if (Boolean.TRUE.equals(newValue)) { + bd.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_BY_NAME); + } + else if (BY_CONSTRUCTOR.equals(newValue)) { + bd.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR); + } + } + // role + else if (ROLE.equals(property)) { + if (ROLE_APPLICATION.equals(newValue) || Integer.valueOf(BeanDefinition.ROLE_APPLICATION).equals(newValue)) { + bd.setRole(BeanDefinition.ROLE_APPLICATION); + } + else if (ROLE_SUPPORT.equals(newValue) || Integer.valueOf(BeanDefinition.ROLE_SUPPORT).equals(newValue)) { + bd.setRole(BeanDefinition.ROLE_SUPPORT); + } + else if (ROLE_INFRASTRUCTURE.equals(newValue) || Integer.valueOf(BeanDefinition.ROLE_INFRASTRUCTURE).equals(newValue)) { + bd.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); + } + } + // constructorArgs + else if (CONSTRUCTOR_ARGS.equals(property) && newValue instanceof List) { + ConstructorArgumentValues cav = new ConstructorArgumentValues(); + for (Object e : (List) newValue) { + cav.addGenericArgumentValue(e); + } + bd.setConstructorArgumentValues(cav); + } + // destroyMethod + else if (DESTROY_METHOD.equals(property)) { + if (newValue != null) { + bd.setDestroyMethodName(newValue.toString()); + } + } + // factoryBean + else if (FACTORY_BEAN.equals(property)) { + if (newValue != null) { + bd.setFactoryBeanName(newValue.toString()); + } + } + // factoryMethod + else if (FACTORY_METHOD.equals(property)) { + if (newValue != null) { + bd.setFactoryMethodName(newValue.toString()); + } + } + // initMethod + else if (INIT_METHOD.equals(property)) { + if (newValue != null) { + bd.setInitMethodName(newValue.toString()); + } + } + // singleton property + else if (SINGLETON.equals(property)) { + bd.setScope(Boolean.TRUE.equals(newValue) ? BeanDefinition.SCOPE_SINGLETON : BeanDefinition.SCOPE_PROTOTYPE); + } + else if (this.wrapper.isWritableProperty(property)) { + this.wrapper.setPropertyValue(property, newValue); + } + // autowire + else { + super.setProperty(property, newValue); + } + } + + public boolean isSingleton() { + return this.singleton; + } + + public AbstractBeanDefinition getBeanDefinition() { + if (this.definition == null) { + this.definition = createBeanDefinition(); + } + else if (this.definition.getResource() == null) { + this.definition.setResource(this.resource); + } + return this.definition; + } + + public void setBeanDefinition(BeanDefinition definition) { + this.definition = (AbstractBeanDefinition) definition; + } + + protected AbstractBeanDefinition createBeanDefinition() { + AbstractBeanDefinition bd = new GenericBeanDefinition(); + if (!this.constructorArgs.isEmpty()) { + ConstructorArgumentValues cav = new ConstructorArgumentValues(); + for (Object constructorArg : this.constructorArgs) { + cav.addGenericArgumentValue(constructorArg); + } + bd.setConstructorArgumentValues(cav); + } + if (this.clazz != null) { + Lazy lazy = this.clazz.getAnnotation(Lazy.class); + if (lazy != null) { + bd.setLazyInit(lazy.value()); + } + Role role = this.clazz.getAnnotation(Role.class); + if (role != null) { + bd.setRole(role.value()); + } + bd.setBeanClass(this.clazz); + } + bd.setScope(this.singleton ? AbstractBeanDefinition.SCOPE_SINGLETON : AbstractBeanDefinition.SCOPE_PROTOTYPE); + if (this.parentName != null) { + bd.setParentName(this.parentName); + } + if (this.resource != null) { + bd.setResource(this.resource); + } + this.wrapper = new BeanWrapperImpl(bd); + return bd; + } + + public BeanConfiguration addProperty(String propertyName, Object propertyValue) { + if (propertyValue instanceof BeanConfiguration) { + propertyValue = ((BeanConfiguration) propertyValue).getBeanDefinition(); + } + getBeanDefinition() + .getPropertyValues() + .addPropertyValue(propertyName, propertyValue); + + return this; + } + + public BeanConfiguration setDestroyMethod(String methodName) { + getBeanDefinition().setDestroyMethodName(methodName); + return this; + } + + public BeanConfiguration setDependsOn(String[] dependsOn) { + getBeanDefinition().setDependsOn(dependsOn); + return this; + } + + public BeanConfiguration setFactoryBean(String beanName) { + getBeanDefinition().setFactoryBeanName(beanName); + return this; + } + + public BeanConfiguration setFactoryMethod(String methodName) { + getBeanDefinition().setFactoryMethodName(methodName); + return this; + } + + public BeanConfiguration setAutowire(String type) { + if ("byName".equals(type)) { + getBeanDefinition().setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_NAME); + } + else if ("byType".equals(type)) { + getBeanDefinition().setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE); + } + return this; + } + + public void setName(String beanName) { + this.name = beanName; + } + + public void setResource(Resource resource) { + this.resource = resource; + } + + public Resource getResource() { + return this.resource; + } + + public Object getPropertyValue(String propName) { + PropertyValue propertyValue = getBeanDefinition() + .getPropertyValues() + .getPropertyValue(propName); + if (propertyValue == null) { + return null; + } + + return propertyValue.getValue(); + } + + public boolean hasProperty(String propName) { + return getBeanDefinition().getPropertyValues().contains(propName); + } + + public void setPropertyValue(String property, Object newValue) { + getBeanDefinition().getPropertyValues().addPropertyValue(property, newValue); + } + + public BeanConfiguration setAbstract(boolean isAbstract) { + getBeanDefinition().setAbstract(isAbstract); + return this; + } + + public void setParent(Object obj) { + Assert.notNull(obj, "Parent bean cannot be set to a null runtime bean reference!"); + + if (obj instanceof String) { + this.parentName = (String) obj; + } + else if (obj instanceof RuntimeBeanReference) { + this.parentName = ((RuntimeBeanReference) obj).getBeanName(); + } + else if (obj instanceof BeanConfiguration) { + this.parentName = ((BeanConfiguration) obj).getName(); + } + getBeanDefinition().setParentName(this.parentName); + setAbstract(false); + } + + public boolean isConditionOn() { + return this.condition; + } + +} diff --git a/grails-spring/src/main/groovy/org/grails/spring/DefaultRuntimeSpringConfiguration.java b/grace-spring/src/main/groovy/org/grails/spring/DefaultRuntimeSpringConfiguration.java similarity index 97% rename from grails-spring/src/main/groovy/org/grails/spring/DefaultRuntimeSpringConfiguration.java rename to grace-spring/src/main/groovy/org/grails/spring/DefaultRuntimeSpringConfiguration.java index a081eb58b0..b4587bb61d 100644 --- a/grails-spring/src/main/groovy/org/grails/spring/DefaultRuntimeSpringConfiguration.java +++ b/grace-spring/src/main/groovy/org/grails/spring/DefaultRuntimeSpringConfiguration.java @@ -1,393 +1,393 @@ -/* - * Copyright 2004-2023 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 - * - * https://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.spring; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import groovy.lang.GroovySystem; -import groovy.lang.MetaClass; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.MutablePropertyValues; -import org.springframework.beans.PropertyValue; -import org.springframework.beans.factory.ListableBeanFactory; -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.beans.factory.config.BeanFactoryPostProcessor; -import org.springframework.beans.factory.support.AbstractBeanDefinition; -import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.GenericApplicationContext; -import org.springframework.util.Assert; - -/** - * A programmable runtime Spring configuration that allows a spring ApplicationContext - * to be constructed at runtime. - * - * Credit must go to Solomon Duskis and the - * article: Programmatic Configuration in Spring - * - * @author Graeme - * @since 0.3 - */ -public class DefaultRuntimeSpringConfiguration implements RuntimeSpringConfiguration { - - private static final Log logger = LogFactory.getLog(DefaultRuntimeSpringConfiguration.class); - - protected GenericApplicationContext context; - - private final Map beanConfigs = new HashMap<>(); - - private final Map beanDefinitions = new HashMap<>(); - - private final Set beanNames = new LinkedHashSet<>(); - - protected ApplicationContext parent; - - protected ClassLoader classLoader; - - protected final Map> aliases = new HashMap<>(); - - protected ListableBeanFactory beanFactory; - - /** - * Creates the ApplicationContext instance. Subclasses can override to customise the used ApplicationContext - * - * @param parentCtx The parent ApplicationContext instance. Can be null. - * - * @return An instance of GenericApplicationContext - */ - protected GenericApplicationContext createApplicationContext(ApplicationContext parentCtx) { - if (parentCtx != null && this.beanFactory != null) { - Assert.isInstanceOf(DefaultListableBeanFactory.class, this.beanFactory, - "ListableBeanFactory set must be a subclass of DefaultListableBeanFactory"); - - return new GrailsApplicationContext((DefaultListableBeanFactory) this.beanFactory, parentCtx); - } - - if (this.beanFactory != null) { - Assert.isInstanceOf(DefaultListableBeanFactory.class, this.beanFactory, - "ListableBeanFactory set must be a subclass of DefaultListableBeanFactory"); - - return new GrailsApplicationContext((DefaultListableBeanFactory) this.beanFactory); - } - - if (parentCtx != null) { - return new GrailsApplicationContext(parentCtx); - } - - return new GrailsApplicationContext(); - } - - public DefaultRuntimeSpringConfiguration() { - super(); - } - - public DefaultRuntimeSpringConfiguration(ApplicationContext parent) { - this(parent, null); - } - - public DefaultRuntimeSpringConfiguration(ApplicationContext parent, ClassLoader cl) { - this.parent = parent; - this.classLoader = cl; - } - - private void trySettingClassLoaderOnContextIfFoundInParent(ApplicationContext parentCtx) { - if (parentCtx.containsBean("classLoader")) { - Object cl = parentCtx.getBean("classLoader"); - if (cl instanceof ClassLoader) { - setClassLoaderOnContext((ClassLoader) cl); - } - } - } - - private void setClassLoaderOnContext(ClassLoader cl) { - this.context.setClassLoader(cl); - this.context.getBeanFactory().setBeanClassLoader(cl); - } - - /** - * Initialises the ApplicationContext instance. - */ - protected void initialiseApplicationContext() { - if (this.context != null) { - return; - } - - this.context = createApplicationContext(this.parent); - - if (this.parent != null && this.classLoader == null) { - trySettingClassLoaderOnContextIfFoundInParent(this.parent); - } - else if (this.classLoader != null) { - setClassLoaderOnContext(this.classLoader); - } - - Assert.notNull(this.context, "ApplicationContext cannot be null"); - } - - public BeanConfiguration addSingletonBean(String name, @SuppressWarnings("rawtypes") Class clazz) { - BeanConfiguration bc = new DefaultBeanConfiguration(name, clazz); - registerBeanConfiguration(name, bc); - return bc; - } - - public BeanConfiguration addPrototypeBean(String name, @SuppressWarnings("rawtypes") Class clazz) { - BeanConfiguration bc = new DefaultBeanConfiguration(name, clazz, true); - registerBeanConfiguration(name, bc); - return bc; - } - - public ApplicationContext getApplicationContext() { - long now = logger.isDebugEnabled() ? System.currentTimeMillis() : 0; - initialiseApplicationContext(); - registerBeansWithContext(this.context); - this.context.refresh(); - if (logger.isDebugEnabled()) { - logger.debug("Created ApplicationContext in " + (System.currentTimeMillis() - now) + "ms"); - } - return this.context; - } - - public ApplicationContext getUnrefreshedApplicationContext() { - initialiseApplicationContext(); - return this.context; - } - - public BeanConfiguration addSingletonBean(String name) { - BeanConfiguration bc = new DefaultBeanConfiguration(name); - registerBeanConfiguration(name, bc); - return bc; - } - - public BeanConfiguration createSingletonBean(@SuppressWarnings("rawtypes") Class clazz) { - return new DefaultBeanConfiguration(clazz); - } - - @SuppressWarnings("rawtypes") - public BeanConfiguration addSingletonBean(String name, Class clazz, Collection args) { - BeanConfiguration bc = new DefaultBeanConfiguration(name, clazz, args); - registerBeanConfiguration(name, bc); - return bc; - } - - public BeanConfiguration addPrototypeBean(String name) { - BeanConfiguration bc = new DefaultBeanConfiguration(name, true); - registerBeanConfiguration(name, bc); - return bc; - } - - private void registerBeanConfiguration(String name, BeanConfiguration bc) { - this.beanConfigs.put(name, bc); - this.beanNames.add(name); - } - - @SuppressWarnings("rawtypes") - public BeanConfiguration createSingletonBean(Class clazz, Collection constructorArguments) { - return new DefaultBeanConfiguration(clazz, constructorArguments); - } - - public BeanConfiguration createPrototypeBean(String name) { - return new DefaultBeanConfiguration(name, true); - } - - public BeanConfiguration createSingletonBean(String name) { - return new DefaultBeanConfiguration(name); - } - - public void addBeanConfiguration(String beanName, BeanConfiguration beanConfiguration) { - beanConfiguration.setName(beanName); - registerBeanConfiguration(beanName, beanConfiguration); - } - - public void addBeanDefinition(String name, BeanDefinition bd) { - this.beanDefinitions.put(name, bd); - this.beanConfigs.remove(name); - this.beanNames.add(name); - } - - public boolean containsBean(String name) { - return this.beanNames.contains(name); - } - - public BeanConfiguration getBeanConfig(String name) { - return this.beanConfigs.get(name); - } - - public AbstractBeanDefinition createBeanDefinition(String name) { - if (containsBean(name)) { - if (this.beanDefinitions.containsKey(name)) { - return (AbstractBeanDefinition) this.beanDefinitions.get(name); - } - if (this.beanConfigs.containsKey(name)) { - return this.beanConfigs.get(name).getBeanDefinition(); - } - } - return null; - } - - public void registerPostProcessor(BeanFactoryPostProcessor processor) { - initialiseApplicationContext(); - this.context.addBeanFactoryPostProcessor(processor); - } - - public List getBeanNames() { - return Collections.unmodifiableList(new ArrayList<>(this.beanNames)); - } - - public void registerBeansWithContext(GenericApplicationContext applicationContext) { - registerBeansWithRegistry(applicationContext); - } - - public void registerBeansWithRegistry(BeanDefinitionRegistry registry) { - registerUnrefreshedBeansWithRegistry(registry); - registerBeanConfigsWithRegistry(registry); - registerBeanDefinitionsWithRegistry(registry); - registerBeanAliasesWithRegistry(registry); - } - - private void registerUnrefreshedBeansWithRegistry(BeanDefinitionRegistry registry) { - if (this.context != null) { - for (String beanName : this.context.getBeanDefinitionNames()) { - registry.registerBeanDefinition(beanName, this.context.getBeanDefinition(beanName)); - } - } - } - - private void registerBeanConfigsWithRegistry(BeanDefinitionRegistry registry) { - for (BeanConfiguration bc : this.beanConfigs.values()) { - String beanName = bc.getName(); - - if (bc.isConditionOn()) { - if (logger.isDebugEnabled()) { - logger.debug("Registering bean definition for bean name '" + beanName + "'"); - if (logger.isTraceEnabled()) { - MutablePropertyValues pvs = bc.getBeanDefinition().getPropertyValues(); - for (PropertyValue pv : pvs) { - logger.trace(" with property: " + pv.getName() + " = " + pv.getValue()); - } - } - } - - registry.registerBeanDefinition(beanName, bc.getBeanDefinition()); - } - else { - if (logger.isDebugEnabled()) { - logger.debug("Bean '" + beanName + "' is not registered with bean.condition = false"); - } - } - } - } - - private void registerBeanDefinitionsWithRegistry(BeanDefinitionRegistry registry) { - for (Object key : this.beanDefinitions.keySet()) { - BeanDefinition bd = this.beanDefinitions.get(key); - if (logger.isDebugEnabled()) { - logger.debug("Registering bean definition for bean name '" + key + "'"); - if (logger.isTraceEnabled()) { - MutablePropertyValues pvs = bd.getPropertyValues(); - for (PropertyValue pv : pvs) { - logger.trace(" with property: " + pv.getName() + " = " + pv.getValue()); - } - } - } - String beanName = key.toString(); - registry.registerBeanDefinition(beanName, bd); - } - } - - public void registerBeansWithConfig(RuntimeSpringConfiguration targetSpringConfig) { - if (targetSpringConfig == null) { - return; - } - - ApplicationContext ctx = targetSpringConfig.getUnrefreshedApplicationContext(); - if (ctx instanceof BeanDefinitionRegistry) { - BeanDefinitionRegistry registry = (BeanDefinitionRegistry) ctx; - registerUnrefreshedBeansWithRegistry(registry); - registerBeansWithRegistry(registry); - } - for (Map.Entry beanEntry : this.beanConfigs.entrySet()) { - String beanName = beanEntry.getKey(); - BeanConfiguration bc = beanEntry.getValue(); - if (beanEntry.getValue().isConditionOn()) { - if (logger.isDebugEnabled()) { - logger.debug("Registering bean definition for bean name '" + beanName + "'"); - if (logger.isTraceEnabled()) { - MutablePropertyValues pvs = bc.getBeanDefinition().getPropertyValues(); - for (PropertyValue pv : pvs) { - logger.trace(" with property: " + pv.getName() + " = " + pv.getValue()); - } - } - } - - targetSpringConfig.addBeanConfiguration(beanEntry.getKey(), beanEntry.getValue()); - } - else { - if (logger.isDebugEnabled()) { - logger.debug("Bean '" + beanName + "' is not registered with bean.condition = false"); - } - } - } - } - - private void registerBeanAliasesWithRegistry(BeanDefinitionRegistry beanDefinitionRegistry) { - for (Map.Entry> entry : this.aliases.entrySet()) { - String beanName = entry.getKey(); - List beanAliases = entry.getValue(); - if (beanAliases != null && !beanAliases.isEmpty()) { - for (String alias : beanAliases) { - beanDefinitionRegistry.registerAlias(beanName, alias); - } - } - } - } - - private void removeBeanDefinition(BeanDefinitionRegistry registry, String beanName) { - MetaClass mc = GroovySystem.getMetaClassRegistry().getMetaClass(registry.getClass()); - if (!mc.respondsTo(registry, "removeBeanDefinition").isEmpty()) { - mc.invokeMethod(registry, "removeBeanDefinition", new Object[] { beanName }); - } - } - - public BeanConfiguration addAbstractBean(String name) { - BeanConfiguration bc = new DefaultBeanConfiguration(name); - bc.setAbstract(true); - registerBeanConfiguration(name, bc); - return bc; - } - - public void addAlias(String alias, String beanName) { - List beanAliases = this.aliases.computeIfAbsent(beanName, k -> new ArrayList<>()); - beanAliases.add(alias); - } - - public BeanDefinition getBeanDefinition(String beanName) { - return this.beanDefinitions.get(beanName); - } - - public void setBeanFactory(ListableBeanFactory beanFactory) { - this.beanFactory = beanFactory; - } - -} +/* + * Copyright 2004-2023 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 + * + * https://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.spring; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import groovy.lang.GroovySystem; +import groovy.lang.MetaClass; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.beans.MutablePropertyValues; +import org.springframework.beans.PropertyValue; +import org.springframework.beans.factory.ListableBeanFactory; +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.beans.factory.config.BeanFactoryPostProcessor; +import org.springframework.beans.factory.support.AbstractBeanDefinition; +import org.springframework.beans.factory.support.BeanDefinitionRegistry; +import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.util.Assert; + +/** + * A programmable runtime Spring configuration that allows a spring ApplicationContext + * to be constructed at runtime. + * + * Credit must go to Solomon Duskis and the + * article: Programmatic Configuration in Spring + * + * @author Graeme + * @since 0.3 + */ +public class DefaultRuntimeSpringConfiguration implements RuntimeSpringConfiguration { + + private static final Log logger = LogFactory.getLog(DefaultRuntimeSpringConfiguration.class); + + protected GenericApplicationContext context; + + private final Map beanConfigs = new HashMap<>(); + + private final Map beanDefinitions = new HashMap<>(); + + private final Set beanNames = new LinkedHashSet<>(); + + protected ApplicationContext parent; + + protected ClassLoader classLoader; + + protected final Map> aliases = new HashMap<>(); + + protected ListableBeanFactory beanFactory; + + /** + * Creates the ApplicationContext instance. Subclasses can override to customise the used ApplicationContext + * + * @param parentCtx The parent ApplicationContext instance. Can be null. + * + * @return An instance of GenericApplicationContext + */ + protected GenericApplicationContext createApplicationContext(ApplicationContext parentCtx) { + if (parentCtx != null && this.beanFactory != null) { + Assert.isInstanceOf(DefaultListableBeanFactory.class, this.beanFactory, + "ListableBeanFactory set must be a subclass of DefaultListableBeanFactory"); + + return new GrailsApplicationContext((DefaultListableBeanFactory) this.beanFactory, parentCtx); + } + + if (this.beanFactory != null) { + Assert.isInstanceOf(DefaultListableBeanFactory.class, this.beanFactory, + "ListableBeanFactory set must be a subclass of DefaultListableBeanFactory"); + + return new GrailsApplicationContext((DefaultListableBeanFactory) this.beanFactory); + } + + if (parentCtx != null) { + return new GrailsApplicationContext(parentCtx); + } + + return new GrailsApplicationContext(); + } + + public DefaultRuntimeSpringConfiguration() { + super(); + } + + public DefaultRuntimeSpringConfiguration(ApplicationContext parent) { + this(parent, null); + } + + public DefaultRuntimeSpringConfiguration(ApplicationContext parent, ClassLoader cl) { + this.parent = parent; + this.classLoader = cl; + } + + private void trySettingClassLoaderOnContextIfFoundInParent(ApplicationContext parentCtx) { + if (parentCtx.containsBean("classLoader")) { + Object cl = parentCtx.getBean("classLoader"); + if (cl instanceof ClassLoader) { + setClassLoaderOnContext((ClassLoader) cl); + } + } + } + + private void setClassLoaderOnContext(ClassLoader cl) { + this.context.setClassLoader(cl); + this.context.getBeanFactory().setBeanClassLoader(cl); + } + + /** + * Initialises the ApplicationContext instance. + */ + protected void initialiseApplicationContext() { + if (this.context != null) { + return; + } + + this.context = createApplicationContext(this.parent); + + if (this.parent != null && this.classLoader == null) { + trySettingClassLoaderOnContextIfFoundInParent(this.parent); + } + else if (this.classLoader != null) { + setClassLoaderOnContext(this.classLoader); + } + + Assert.notNull(this.context, "ApplicationContext cannot be null"); + } + + public BeanConfiguration addSingletonBean(String name, @SuppressWarnings("rawtypes") Class clazz) { + BeanConfiguration bc = new DefaultBeanConfiguration(name, clazz); + registerBeanConfiguration(name, bc); + return bc; + } + + public BeanConfiguration addPrototypeBean(String name, @SuppressWarnings("rawtypes") Class clazz) { + BeanConfiguration bc = new DefaultBeanConfiguration(name, clazz, true); + registerBeanConfiguration(name, bc); + return bc; + } + + public ApplicationContext getApplicationContext() { + long now = logger.isDebugEnabled() ? System.currentTimeMillis() : 0; + initialiseApplicationContext(); + registerBeansWithContext(this.context); + this.context.refresh(); + if (logger.isDebugEnabled()) { + logger.debug("Created ApplicationContext in " + (System.currentTimeMillis() - now) + "ms"); + } + return this.context; + } + + public ApplicationContext getUnrefreshedApplicationContext() { + initialiseApplicationContext(); + return this.context; + } + + public BeanConfiguration addSingletonBean(String name) { + BeanConfiguration bc = new DefaultBeanConfiguration(name); + registerBeanConfiguration(name, bc); + return bc; + } + + public BeanConfiguration createSingletonBean(@SuppressWarnings("rawtypes") Class clazz) { + return new DefaultBeanConfiguration(clazz); + } + + @SuppressWarnings("rawtypes") + public BeanConfiguration addSingletonBean(String name, Class clazz, Collection args) { + BeanConfiguration bc = new DefaultBeanConfiguration(name, clazz, args); + registerBeanConfiguration(name, bc); + return bc; + } + + public BeanConfiguration addPrototypeBean(String name) { + BeanConfiguration bc = new DefaultBeanConfiguration(name, true); + registerBeanConfiguration(name, bc); + return bc; + } + + private void registerBeanConfiguration(String name, BeanConfiguration bc) { + this.beanConfigs.put(name, bc); + this.beanNames.add(name); + } + + @SuppressWarnings("rawtypes") + public BeanConfiguration createSingletonBean(Class clazz, Collection constructorArguments) { + return new DefaultBeanConfiguration(clazz, constructorArguments); + } + + public BeanConfiguration createPrototypeBean(String name) { + return new DefaultBeanConfiguration(name, true); + } + + public BeanConfiguration createSingletonBean(String name) { + return new DefaultBeanConfiguration(name); + } + + public void addBeanConfiguration(String beanName, BeanConfiguration beanConfiguration) { + beanConfiguration.setName(beanName); + registerBeanConfiguration(beanName, beanConfiguration); + } + + public void addBeanDefinition(String name, BeanDefinition bd) { + this.beanDefinitions.put(name, bd); + this.beanConfigs.remove(name); + this.beanNames.add(name); + } + + public boolean containsBean(String name) { + return this.beanNames.contains(name); + } + + public BeanConfiguration getBeanConfig(String name) { + return this.beanConfigs.get(name); + } + + public AbstractBeanDefinition createBeanDefinition(String name) { + if (containsBean(name)) { + if (this.beanDefinitions.containsKey(name)) { + return (AbstractBeanDefinition) this.beanDefinitions.get(name); + } + if (this.beanConfigs.containsKey(name)) { + return this.beanConfigs.get(name).getBeanDefinition(); + } + } + return null; + } + + public void registerPostProcessor(BeanFactoryPostProcessor processor) { + initialiseApplicationContext(); + this.context.addBeanFactoryPostProcessor(processor); + } + + public List getBeanNames() { + return Collections.unmodifiableList(new ArrayList<>(this.beanNames)); + } + + public void registerBeansWithContext(GenericApplicationContext applicationContext) { + registerBeansWithRegistry(applicationContext); + } + + public void registerBeansWithRegistry(BeanDefinitionRegistry registry) { + registerUnrefreshedBeansWithRegistry(registry); + registerBeanConfigsWithRegistry(registry); + registerBeanDefinitionsWithRegistry(registry); + registerBeanAliasesWithRegistry(registry); + } + + private void registerUnrefreshedBeansWithRegistry(BeanDefinitionRegistry registry) { + if (this.context != null) { + for (String beanName : this.context.getBeanDefinitionNames()) { + registry.registerBeanDefinition(beanName, this.context.getBeanDefinition(beanName)); + } + } + } + + private void registerBeanConfigsWithRegistry(BeanDefinitionRegistry registry) { + for (BeanConfiguration bc : this.beanConfigs.values()) { + String beanName = bc.getName(); + + if (bc.isConditionOn()) { + if (logger.isDebugEnabled()) { + logger.debug("Registering bean definition for bean name '" + beanName + "'"); + if (logger.isTraceEnabled()) { + MutablePropertyValues pvs = bc.getBeanDefinition().getPropertyValues(); + for (PropertyValue pv : pvs) { + logger.trace(" with property: " + pv.getName() + " = " + pv.getValue()); + } + } + } + + registry.registerBeanDefinition(beanName, bc.getBeanDefinition()); + } + else { + if (logger.isDebugEnabled()) { + logger.debug("Bean '" + beanName + "' is not registered with bean.condition = false"); + } + } + } + } + + private void registerBeanDefinitionsWithRegistry(BeanDefinitionRegistry registry) { + for (Object key : this.beanDefinitions.keySet()) { + BeanDefinition bd = this.beanDefinitions.get(key); + if (logger.isDebugEnabled()) { + logger.debug("Registering bean definition for bean name '" + key + "'"); + if (logger.isTraceEnabled()) { + MutablePropertyValues pvs = bd.getPropertyValues(); + for (PropertyValue pv : pvs) { + logger.trace(" with property: " + pv.getName() + " = " + pv.getValue()); + } + } + } + String beanName = key.toString(); + registry.registerBeanDefinition(beanName, bd); + } + } + + public void registerBeansWithConfig(RuntimeSpringConfiguration targetSpringConfig) { + if (targetSpringConfig == null) { + return; + } + + ApplicationContext ctx = targetSpringConfig.getUnrefreshedApplicationContext(); + if (ctx instanceof BeanDefinitionRegistry) { + BeanDefinitionRegistry registry = (BeanDefinitionRegistry) ctx; + registerUnrefreshedBeansWithRegistry(registry); + registerBeansWithRegistry(registry); + } + for (Map.Entry beanEntry : this.beanConfigs.entrySet()) { + String beanName = beanEntry.getKey(); + BeanConfiguration bc = beanEntry.getValue(); + if (beanEntry.getValue().isConditionOn()) { + if (logger.isDebugEnabled()) { + logger.debug("Registering bean definition for bean name '" + beanName + "'"); + if (logger.isTraceEnabled()) { + MutablePropertyValues pvs = bc.getBeanDefinition().getPropertyValues(); + for (PropertyValue pv : pvs) { + logger.trace(" with property: " + pv.getName() + " = " + pv.getValue()); + } + } + } + + targetSpringConfig.addBeanConfiguration(beanEntry.getKey(), beanEntry.getValue()); + } + else { + if (logger.isDebugEnabled()) { + logger.debug("Bean '" + beanName + "' is not registered with bean.condition = false"); + } + } + } + } + + private void registerBeanAliasesWithRegistry(BeanDefinitionRegistry beanDefinitionRegistry) { + for (Map.Entry> entry : this.aliases.entrySet()) { + String beanName = entry.getKey(); + List beanAliases = entry.getValue(); + if (beanAliases != null && !beanAliases.isEmpty()) { + for (String alias : beanAliases) { + beanDefinitionRegistry.registerAlias(beanName, alias); + } + } + } + } + + private void removeBeanDefinition(BeanDefinitionRegistry registry, String beanName) { + MetaClass mc = GroovySystem.getMetaClassRegistry().getMetaClass(registry.getClass()); + if (!mc.respondsTo(registry, "removeBeanDefinition").isEmpty()) { + mc.invokeMethod(registry, "removeBeanDefinition", new Object[] { beanName }); + } + } + + public BeanConfiguration addAbstractBean(String name) { + BeanConfiguration bc = new DefaultBeanConfiguration(name); + bc.setAbstract(true); + registerBeanConfiguration(name, bc); + return bc; + } + + public void addAlias(String alias, String beanName) { + List beanAliases = this.aliases.computeIfAbsent(beanName, k -> new ArrayList<>()); + beanAliases.add(alias); + } + + public BeanDefinition getBeanDefinition(String beanName) { + return this.beanDefinitions.get(beanName); + } + + public void setBeanFactory(ListableBeanFactory beanFactory) { + this.beanFactory = beanFactory; + } + +} diff --git a/grails-spring/src/main/groovy/org/grails/spring/GrailsApplicationContext.java b/grace-spring/src/main/groovy/org/grails/spring/GrailsApplicationContext.java similarity index 100% rename from grails-spring/src/main/groovy/org/grails/spring/GrailsApplicationContext.java rename to grace-spring/src/main/groovy/org/grails/spring/GrailsApplicationContext.java diff --git a/grails-spring/src/main/groovy/org/grails/spring/GrailsContextEvent.java b/grace-spring/src/main/groovy/org/grails/spring/GrailsContextEvent.java similarity index 100% rename from grails-spring/src/main/groovy/org/grails/spring/GrailsContextEvent.java rename to grace-spring/src/main/groovy/org/grails/spring/GrailsContextEvent.java diff --git a/grails-spring/src/main/groovy/org/grails/spring/RuntimeSpringConfigUtilities.java b/grace-spring/src/main/groovy/org/grails/spring/RuntimeSpringConfigUtilities.java similarity index 100% rename from grails-spring/src/main/groovy/org/grails/spring/RuntimeSpringConfigUtilities.java rename to grace-spring/src/main/groovy/org/grails/spring/RuntimeSpringConfigUtilities.java diff --git a/grails-spring/src/main/groovy/org/grails/spring/RuntimeSpringConfiguration.java b/grace-spring/src/main/groovy/org/grails/spring/RuntimeSpringConfiguration.java similarity index 100% rename from grails-spring/src/main/groovy/org/grails/spring/RuntimeSpringConfiguration.java rename to grace-spring/src/main/groovy/org/grails/spring/RuntimeSpringConfiguration.java diff --git a/grails-spring/src/main/groovy/org/grails/spring/TypeSpecifyableTransactionProxyFactoryBean.java b/grace-spring/src/main/groovy/org/grails/spring/TypeSpecifyableTransactionProxyFactoryBean.java similarity index 100% rename from grails-spring/src/main/groovy/org/grails/spring/TypeSpecifyableTransactionProxyFactoryBean.java rename to grace-spring/src/main/groovy/org/grails/spring/TypeSpecifyableTransactionProxyFactoryBean.java diff --git a/grails-spring/src/test/groovy/grails/spring/BeanBuilderTests.groovy b/grace-spring/src/test/groovy/grails/spring/BeanBuilderTests.groovy similarity index 100% rename from grails-spring/src/test/groovy/grails/spring/BeanBuilderTests.groovy rename to grace-spring/src/test/groovy/grails/spring/BeanBuilderTests.groovy diff --git a/grails-spring/src/test/groovy/grails/spring/DynamicElementReaderTests.groovy b/grace-spring/src/test/groovy/grails/spring/DynamicElementReaderTests.groovy similarity index 100% rename from grails-spring/src/test/groovy/grails/spring/DynamicElementReaderTests.groovy rename to grace-spring/src/test/groovy/grails/spring/DynamicElementReaderTests.groovy diff --git a/grails-spring/src/test/groovy/org/grails/spring/BeanConfigurationTests.groovy b/grace-spring/src/test/groovy/org/grails/spring/BeanConfigurationTests.groovy similarity index 100% rename from grails-spring/src/test/groovy/org/grails/spring/BeanConfigurationTests.groovy rename to grace-spring/src/test/groovy/org/grails/spring/BeanConfigurationTests.groovy diff --git a/grails-spring/src/test/resources/grails/spring/resources1.groovy b/grace-spring/src/test/resources/grails/spring/resources1.groovy similarity index 100% rename from grails-spring/src/test/resources/grails/spring/resources1.groovy rename to grace-spring/src/test/resources/grails/spring/resources1.groovy diff --git a/grails-spring/src/test/resources/grails/spring/test.groovy b/grace-spring/src/test/resources/grails/spring/test.groovy similarity index 100% rename from grails-spring/src/test/resources/grails/spring/test.groovy rename to grace-spring/src/test/resources/grails/spring/test.groovy diff --git a/grails-spring/src/test/resources/grails/spring/test.xml b/grace-spring/src/test/resources/grails/spring/test.xml similarity index 100% rename from grails-spring/src/test/resources/grails/spring/test.xml rename to grace-spring/src/test/resources/grails/spring/test.xml diff --git a/grace-test-suite-base/README.md b/grace-test-suite-base/README.md new file mode 100644 index 0000000000..89cefc3f75 --- /dev/null +++ b/grace-test-suite-base/README.md @@ -0,0 +1,2 @@ +## grace-test-suite-base + diff --git a/grace-test-suite-base/build.gradle b/grace-test-suite-base/build.gradle new file mode 100644 index 0000000000..e76fb6b199 --- /dev/null +++ b/grace-test-suite-base/build.gradle @@ -0,0 +1,11 @@ +dependencies { + api project(":grace-api") + api project(":grace-bootstrap") + api project(":grace-core") + api project(":grace-plugin-converters") + api project(":grace-plugin-core") + api project(":grace-plugin-domain-class") + api project(":grace-spring") + api project(":grace-web") + api project(":grace-test") +} diff --git a/grails-test-suite-base/src/main/groovy/grails/util/MockHttpServletResponse.java b/grace-test-suite-base/src/main/groovy/grails/util/MockHttpServletResponse.java similarity index 100% rename from grails-test-suite-base/src/main/groovy/grails/util/MockHttpServletResponse.java rename to grace-test-suite-base/src/main/groovy/grails/util/MockHttpServletResponse.java diff --git a/grails-test-suite-base/src/main/groovy/grails/util/MockRequestDataValueProcessor.java b/grace-test-suite-base/src/main/groovy/grails/util/MockRequestDataValueProcessor.java similarity index 100% rename from grails-test-suite-base/src/main/groovy/grails/util/MockRequestDataValueProcessor.java rename to grace-test-suite-base/src/main/groovy/grails/util/MockRequestDataValueProcessor.java diff --git a/grails-test-suite-base/src/main/groovy/org/grails/commons/test/AbstractGrailsMockTests.java b/grace-test-suite-base/src/main/groovy/org/grails/commons/test/AbstractGrailsMockTests.java similarity index 100% rename from grails-test-suite-base/src/main/groovy/org/grails/commons/test/AbstractGrailsMockTests.java rename to grace-test-suite-base/src/main/groovy/org/grails/commons/test/AbstractGrailsMockTests.java diff --git a/grails-test-suite-base/src/main/groovy/org/grails/web/servlet/mvc/HibernateProxy.java b/grace-test-suite-base/src/main/groovy/org/grails/web/servlet/mvc/HibernateProxy.java similarity index 100% rename from grails-test-suite-base/src/main/groovy/org/grails/web/servlet/mvc/HibernateProxy.java rename to grace-test-suite-base/src/main/groovy/org/grails/web/servlet/mvc/HibernateProxy.java diff --git a/grails-test-suite-base/src/main/groovy/org/grails/web/servlet/mvc/LazyInitializer.java b/grace-test-suite-base/src/main/groovy/org/grails/web/servlet/mvc/LazyInitializer.java similarity index 100% rename from grails-test-suite-base/src/main/groovy/org/grails/web/servlet/mvc/LazyInitializer.java rename to grace-test-suite-base/src/main/groovy/org/grails/web/servlet/mvc/LazyInitializer.java diff --git a/grails-test-suite-base/src/main/groovy/org/grails/web/servlet/mvc/MockHibernateProxyHandler.java b/grace-test-suite-base/src/main/groovy/org/grails/web/servlet/mvc/MockHibernateProxyHandler.java similarity index 100% rename from grails-test-suite-base/src/main/groovy/org/grails/web/servlet/mvc/MockHibernateProxyHandler.java rename to grace-test-suite-base/src/main/groovy/org/grails/web/servlet/mvc/MockHibernateProxyHandler.java diff --git a/grace-test-suite-persistence/README.md b/grace-test-suite-persistence/README.md new file mode 100644 index 0000000000..0a794ae822 --- /dev/null +++ b/grace-test-suite-persistence/README.md @@ -0,0 +1,2 @@ +## grace-test-suite-persistence + diff --git a/grails-test-suite-persistence/build.gradle b/grace-test-suite-persistence/build.gradle similarity index 80% rename from grails-test-suite-persistence/build.gradle rename to grace-test-suite-persistence/build.gradle index 06563d7c6b..4781bff9c7 100644 --- a/grails-test-suite-persistence/build.gradle +++ b/grace-test-suite-persistence/build.gradle @@ -3,18 +3,18 @@ configurations.testCompileClasspath { } dependencies { - testImplementation project(":grails-boot") - testImplementation project(":grails-bootstrap") - testImplementation project(":grails-plugin-controllers") - testImplementation project(":grails-plugin-databinding") - testImplementation project(":grails-plugin-datasource") - testImplementation project(":grails-plugin-domain-class") - testImplementation project(":grails-plugin-i18n") - testImplementation project(":grails-plugin-services") - testImplementation project(":grails-plugin-url-mappings") - testImplementation project(":grails-spring") - testImplementation project(":grails-test-suite-base") - testImplementation project(":grails-test-support") + testImplementation project(":grace-boot") + testImplementation project(":grace-bootstrap") + testImplementation project(":grace-plugin-controllers") + testImplementation project(":grace-plugin-databinding") + testImplementation project(":grace-plugin-datasource") + testImplementation project(":grace-plugin-domain-class") + testImplementation project(":grace-plugin-i18n") + testImplementation project(":grace-plugin-services") + testImplementation project(":grace-plugin-url-mappings") + testImplementation project(":grace-spring") + testImplementation project(":grace-test-suite-base") + testImplementation project(":grace-test-support") testImplementation libs.grails.plugin.async, { exclude module:'grails-plugin-codecs' diff --git a/grails-test-suite-persistence/src/test/groovy/grails/artefact/DomainClassTraitSpec.groovy b/grace-test-suite-persistence/src/test/groovy/grails/artefact/DomainClassTraitSpec.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/grails/artefact/DomainClassTraitSpec.groovy rename to grace-test-suite-persistence/src/test/groovy/grails/artefact/DomainClassTraitSpec.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/grails/gorm/criteri/WithCriteriaReadOnlySpec.groovy b/grace-test-suite-persistence/src/test/groovy/grails/gorm/criteri/WithCriteriaReadOnlySpec.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/grails/gorm/criteri/WithCriteriaReadOnlySpec.groovy rename to grace-test-suite-persistence/src/test/groovy/grails/gorm/criteri/WithCriteriaReadOnlySpec.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/grails/test/mixin/domain/DomainClassUnitTestMixinTests.groovy b/grace-test-suite-persistence/src/test/groovy/grails/test/mixin/domain/DomainClassUnitTestMixinTests.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/grails/test/mixin/domain/DomainClassUnitTestMixinTests.groovy rename to grace-test-suite-persistence/src/test/groovy/grails/test/mixin/domain/DomainClassUnitTestMixinTests.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/grails/test/mixin/domain/SaveDomainSpec.groovy b/grace-test-suite-persistence/src/test/groovy/grails/test/mixin/domain/SaveDomainSpec.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/grails/test/mixin/domain/SaveDomainSpec.groovy rename to grace-test-suite-persistence/src/test/groovy/grails/test/mixin/domain/SaveDomainSpec.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderBindingXmlSpec.groovy b/grace-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderBindingXmlSpec.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderBindingXmlSpec.groovy rename to grace-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderBindingXmlSpec.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderConfigurationSpec.groovy b/grace-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderConfigurationSpec.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderConfigurationSpec.groovy rename to grace-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderConfigurationSpec.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderListenerSpec.groovy b/grace-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderListenerSpec.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderListenerSpec.groovy rename to grace-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderListenerSpec.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderSpec.groovy b/grace-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderSpec.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderSpec.groovy rename to grace-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderSpec.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBindingListenerSpec.groovy b/grace-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBindingListenerSpec.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBindingListenerSpec.groovy rename to grace-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBindingListenerSpec.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBindingStructuredEditorSpec.groovy b/grace-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBindingStructuredEditorSpec.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBindingStructuredEditorSpec.groovy rename to grace-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBindingStructuredEditorSpec.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/log4j.properties b/grace-test-suite-persistence/src/test/groovy/log4j.properties similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/log4j.properties rename to grace-test-suite-persistence/src/test/groovy/log4j.properties diff --git a/grails-test-suite-persistence/src/test/groovy/org/grails/domain/compiler/DomainPropertiesAccessorSpec.groovy b/grace-test-suite-persistence/src/test/groovy/org/grails/domain/compiler/DomainPropertiesAccessorSpec.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/org/grails/domain/compiler/DomainPropertiesAccessorSpec.groovy rename to grace-test-suite-persistence/src/test/groovy/org/grails/domain/compiler/DomainPropertiesAccessorSpec.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/org/grails/orm/support/TransactionManagerPostProcessorTests.groovy b/grace-test-suite-persistence/src/test/groovy/org/grails/orm/support/TransactionManagerPostProcessorTests.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/org/grails/orm/support/TransactionManagerPostProcessorTests.groovy rename to grace-test-suite-persistence/src/test/groovy/org/grails/orm/support/TransactionManagerPostProcessorTests.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/org/grails/plugins/MockHibernateGrailsPlugin.groovy b/grace-test-suite-persistence/src/test/groovy/org/grails/plugins/MockHibernateGrailsPlugin.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/org/grails/plugins/MockHibernateGrailsPlugin.groovy rename to grace-test-suite-persistence/src/test/groovy/org/grails/plugins/MockHibernateGrailsPlugin.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/org/grails/plugins/services/DataSourcesGrailsPluginTests.groovy b/grace-test-suite-persistence/src/test/groovy/org/grails/plugins/services/DataSourcesGrailsPluginTests.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/org/grails/plugins/services/DataSourcesGrailsPluginTests.groovy rename to grace-test-suite-persistence/src/test/groovy/org/grails/plugins/services/DataSourcesGrailsPluginTests.groovy diff --git a/grails-test-suite-persistence/src/test/groovy/org/grails/plugins/services/ScopedProxyAndServiceClassTests.groovy b/grace-test-suite-persistence/src/test/groovy/org/grails/plugins/services/ScopedProxyAndServiceClassTests.groovy similarity index 100% rename from grails-test-suite-persistence/src/test/groovy/org/grails/plugins/services/ScopedProxyAndServiceClassTests.groovy rename to grace-test-suite-persistence/src/test/groovy/org/grails/plugins/services/ScopedProxyAndServiceClassTests.groovy diff --git a/grace-test-suite-uber/README.md b/grace-test-suite-uber/README.md new file mode 100644 index 0000000000..5d957fbbe8 --- /dev/null +++ b/grace-test-suite-uber/README.md @@ -0,0 +1,2 @@ +## grace-test-suite-uber + diff --git a/grails-test-suite-uber/build.gradle b/grace-test-suite-uber/build.gradle similarity index 84% rename from grails-test-suite-uber/build.gradle rename to grace-test-suite-uber/build.gradle index 5736f46561..bfb5cf297b 100644 --- a/grails-test-suite-uber/build.gradle +++ b/grace-test-suite-uber/build.gradle @@ -3,25 +3,25 @@ configurations.testCompileClasspath { } dependencies { - api project(":grails-api") - api project(":grails-util") - api project(":grails-test-suite-base") - api project(":grails-plugin-interceptors") - api project(":grails-plugin-controllers") + api project(":grace-api") + api project(":grace-util") + api project(":grace-test-suite-base") + api project(":grace-plugin-interceptors") + api project(":grace-plugin-controllers") api libs.tomcat.jdbc - testImplementation project(":grails-boot") - testImplementation project(":grails-plugin-codecs") - testImplementation project(":grails-plugin-domain-class") - testImplementation project(":grails-plugin-url-mappings") - testImplementation project(":grails-plugin-datasource") - testImplementation project(":grails-plugin-services") - testImplementation project(":grails-plugin-rest") - testImplementation project(":grails-plugin-i18n") - testImplementation project(":grails-plugin-databinding") - testImplementation project(":grails-spring") - testImplementation project(":grails-test-support") + testImplementation project(":grace-boot") + testImplementation project(":grace-plugin-codecs") + testImplementation project(":grace-plugin-domain-class") + testImplementation project(":grace-plugin-url-mappings") + testImplementation project(":grace-plugin-datasource") + testImplementation project(":grace-plugin-services") + testImplementation project(":grace-plugin-rest") + testImplementation project(":grace-plugin-i18n") + testImplementation project(":grace-plugin-databinding") + testImplementation project(":grace-spring") + testImplementation project(":grace-test-support") testImplementation libs.micronaut.spring.context testImplementation libs.grails.datastore.gorm.hibernate5, { exclude group: 'org.grails', module:'grails-datastore-gorm' diff --git a/grails-test-suite-uber/src/test/groovy/WEB-INF/grails-app/views/layouts/test.gsp b/grace-test-suite-uber/src/test/groovy/WEB-INF/grails-app/views/layouts/test.gsp similarity index 100% rename from grails-test-suite-uber/src/test/groovy/WEB-INF/grails-app/views/layouts/test.gsp rename to grace-test-suite-uber/src/test/groovy/WEB-INF/grails-app/views/layouts/test.gsp diff --git a/grails-test-suite-uber/src/test/groovy/WEB-INF/grails-app/views/layouts/test2/testAction.gsp b/grace-test-suite-uber/src/test/groovy/WEB-INF/grails-app/views/layouts/test2/testAction.gsp similarity index 100% rename from grails-test-suite-uber/src/test/groovy/WEB-INF/grails-app/views/layouts/test2/testAction.gsp rename to grace-test-suite-uber/src/test/groovy/WEB-INF/grails-app/views/layouts/test2/testAction.gsp diff --git a/grails-test-suite-uber/src/test/groovy/WEB-INF/grails-app/views/render/_testTemplate.gsp b/grace-test-suite-uber/src/test/groovy/WEB-INF/grails-app/views/render/_testTemplate.gsp similarity index 100% rename from grails-test-suite-uber/src/test/groovy/WEB-INF/grails-app/views/render/_testTemplate.gsp rename to grace-test-suite-uber/src/test/groovy/WEB-INF/grails-app/views/render/_testTemplate.gsp diff --git a/grails-test-suite-uber/src/test/groovy/WEB-INF/spring/resources.xml b/grace-test-suite-uber/src/test/groovy/WEB-INF/spring/resources.xml similarity index 100% rename from grails-test-suite-uber/src/test/groovy/WEB-INF/spring/resources.xml rename to grace-test-suite-uber/src/test/groovy/WEB-INF/spring/resources.xml diff --git a/grails-test-suite-uber/src/test/groovy/application.properties b/grace-test-suite-uber/src/test/groovy/application.properties similarity index 100% rename from grails-test-suite-uber/src/test/groovy/application.properties rename to grace-test-suite-uber/src/test/groovy/application.properties diff --git a/grails-test-suite-uber/src/test/groovy/defaultErrorMessages.properties b/grace-test-suite-uber/src/test/groovy/defaultErrorMessages.properties similarity index 100% rename from grails-test-suite-uber/src/test/groovy/defaultErrorMessages.properties rename to grace-test-suite-uber/src/test/groovy/defaultErrorMessages.properties diff --git a/grails-test-suite-uber/src/test/groovy/ehcache.xml b/grace-test-suite-uber/src/test/groovy/ehcache.xml similarity index 100% rename from grails-test-suite-uber/src/test/groovy/ehcache.xml rename to grace-test-suite-uber/src/test/groovy/ehcache.xml diff --git a/grails-test-suite-uber/src/test/groovy/grails/compiler/GrailsCompileStaticCompilationErrorsSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/compiler/GrailsCompileStaticCompilationErrorsSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/compiler/GrailsCompileStaticCompilationErrorsSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/compiler/GrailsCompileStaticCompilationErrorsSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/compiler/GrailsTypeCheckedCompilationErrorsSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/compiler/GrailsTypeCheckedCompilationErrorsSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/compiler/GrailsTypeCheckedCompilationErrorsSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/compiler/GrailsTypeCheckedCompilationErrorsSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/persistence/EntityTransformTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/persistence/EntityTransformTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/persistence/EntityTransformTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/persistence/EntityTransformTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerTests.java b/grace-test-suite-uber/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerTests.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerTests.java rename to grace-test-suite-uber/src/test/groovy/grails/plugins/DefaultGrailsPluginManagerTests.java diff --git a/grails-test-suite-uber/src/test/groovy/grails/spring/BeanBuilderTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/spring/BeanBuilderTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/spring/BeanBuilderTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/spring/BeanBuilderTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/spring/DynamicElementReaderTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/spring/DynamicElementReaderTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/spring/DynamicElementReaderTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/spring/DynamicElementReaderTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/MetaTestHelper.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/MetaTestHelper.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/MetaTestHelper.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/MetaTestHelper.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AddToAndServiceInjectionTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/AddToAndServiceInjectionTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/AddToAndServiceInjectionTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/AddToAndServiceInjectionTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AnotherController.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/AnotherController.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/AnotherController.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/AnotherController.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AstEnhancedControllerUnitTestMixinTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/AstEnhancedControllerUnitTestMixinTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/AstEnhancedControllerUnitTestMixinTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/AstEnhancedControllerUnitTestMixinTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/AutowireServiceViaDefineBeansTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/AutowireServiceViaDefineBeansTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/AutowireServiceViaDefineBeansTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/AutowireServiceViaDefineBeansTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/BidirectionalOneToManyUnitTestTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/BidirectionalOneToManyUnitTestTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/BidirectionalOneToManyUnitTestTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/BidirectionalOneToManyUnitTestTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/CascadeValidationForEmbeddedSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/CascadeValidationForEmbeddedSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/CascadeValidationForEmbeddedSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/CascadeValidationForEmbeddedSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerAndGroovyPageMixinTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerAndGroovyPageMixinTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerAndGroovyPageMixinTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerAndGroovyPageMixinTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerMockWithMultipleControllersSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerMockWithMultipleControllersSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerMockWithMultipleControllersSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerMockWithMultipleControllersSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerTestForTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerTestForTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerTestForTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerTestForTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerUnitTestMixinTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerWithMockCollabTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerWithMockCollabTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerWithMockCollabTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerWithMockCollabTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassAnnotatedSetupMethodTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassAnnotatedSetupMethodTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassAnnotatedSetupMethodTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassAnnotatedSetupMethodTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassControllerUnitTestMixinTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassControllerUnitTestMixinTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassControllerUnitTestMixinTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassControllerUnitTestMixinTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassDeepValidationSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassDeepValidationSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassDeepValidationSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassDeepValidationSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassSetupMethodTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassSetupMethodTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassSetupMethodTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassSetupMethodTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithAutoTimestampSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithAutoTimestampSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithAutoTimestampSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithAutoTimestampSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithCustomValidatorTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithCustomValidatorTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithCustomValidatorTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithCustomValidatorTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithDefaultConstraintsUnitTestMixinTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithDefaultConstraintsUnitTestMixinTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithDefaultConstraintsUnitTestMixinTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithDefaultConstraintsUnitTestMixinTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithUniqueConstraintSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithUniqueConstraintSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithUniqueConstraintSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassWithUniqueConstraintSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/FirstController.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/FirstController.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/FirstController.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/FirstController.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinWithCustomViewDirSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinWithCustomViewDirSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinWithCustomViewDirSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/GroovyPageUnitTestMixinWithCustomViewDirSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/InheritanceWithValidationTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/InheritanceWithValidationTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/InheritanceWithValidationTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/InheritanceWithValidationTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/InterceptorUnitTestMixinSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/InterceptorUnitTestMixinSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/InterceptorUnitTestMixinSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/InterceptorUnitTestMixinSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/MainContextTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/MainContextTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/MainContextTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/MainContextTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/MyService.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/MyService.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/MyService.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/MyService.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/PartialMockWithManyToManySpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/PartialMockWithManyToManySpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/PartialMockWithManyToManySpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/PartialMockWithManyToManySpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ResourceAnnotationRestfulControllerSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/ResourceAnnotationRestfulControllerSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/ResourceAnnotationRestfulControllerSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/ResourceAnnotationRestfulControllerSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSubclassSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSubclassSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSubclassSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSubclassSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSuperClassSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSuperClassSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSuperClassSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/RestfulControllerSuperClassSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/ServiceTestMixinInheritanceSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/ServiceTestMixinInheritanceSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/ServiceTestMixinInheritanceSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/ServiceTestMixinInheritanceSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/SetupTeardownInvokeTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/SetupTeardownInvokeTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/SetupTeardownInvokeTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/SetupTeardownInvokeTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/SpyBeanSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/SpyBeanSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/SpyBeanSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/SpyBeanSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/StaticCallbacksSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/StaticCallbacksSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/StaticCallbacksSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/StaticCallbacksSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/TagLibraryInvokeBodySpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/TagLibraryInvokeBodySpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/TagLibraryInvokeBodySpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/TagLibraryInvokeBodySpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/TestForControllerWithoutMockDomainTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/TestForControllerWithoutMockDomainTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/TestForControllerWithoutMockDomainTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/TestForControllerWithoutMockDomainTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/TestInstanceCallbacksSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/TestInstanceCallbacksSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/TestInstanceCallbacksSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/TestInstanceCallbacksSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/TestMixinSetupTeardownInvokeTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/TestMixinSetupTeardownInvokeTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/TestMixinSetupTeardownInvokeTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/TestMixinSetupTeardownInvokeTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/UnitTestDataBindingAssociatonTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/UnitTestDataBindingAssociatonTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/UnitTestDataBindingAssociatonTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/UnitTestDataBindingAssociatonTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/UnitTestEmbeddedPropertyQuery.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/UnitTestEmbeddedPropertyQuery.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/UnitTestEmbeddedPropertyQuery.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/UnitTestEmbeddedPropertyQuery.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/UrlMappingsTestMixinTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/UrlMappingsTestMixinTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/UrlMappingsTestMixinTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/UrlMappingsTestMixinTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/User.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/User.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/User.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/User.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/cascade/CascadeCircularSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/cascade/CascadeCircularSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/cascade/CascadeCircularSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/cascade/CascadeCircularSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/support/GrailsUnitTestMixinGrailsApplicationAwareSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/support/GrailsUnitTestMixinGrailsApplicationAwareSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/support/GrailsUnitTestMixinGrailsApplicationAwareSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/support/GrailsUnitTestMixinGrailsApplicationAwareSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/unique/UniqueConstraintOnHasOneSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/mixin/unique/UniqueConstraintOnHasOneSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/mixin/unique/UniqueConstraintOnHasOneSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/mixin/unique/UniqueConstraintOnHasOneSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/runtime/DirtiesRuntimeSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/test/runtime/DirtiesRuntimeSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/test/runtime/DirtiesRuntimeSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/test/runtime/DirtiesRuntimeSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/validation/DomainConstraintGettersSpec.groovy b/grace-test-suite-uber/src/test/groovy/grails/validation/DomainConstraintGettersSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/validation/DomainConstraintGettersSpec.groovy rename to grace-test-suite-uber/src/test/groovy/grails/validation/DomainConstraintGettersSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/grails/web/JSONBuilderTests.groovy b/grace-test-suite-uber/src/test/groovy/grails/web/JSONBuilderTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/grails/web/JSONBuilderTests.groovy rename to grace-test-suite-uber/src/test/groovy/grails/web/JSONBuilderTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/log4j.properties b/grace-test-suite-uber/src/test/groovy/log4j.properties similarity index 100% rename from grails-test-suite-uber/src/test/groovy/log4j.properties rename to grace-test-suite-uber/src/test/groovy/log4j.properties diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/cli/ScriptNameResolverTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/cli/ScriptNameResolverTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/cli/ScriptNameResolverTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/cli/ScriptNameResolverTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/BootStrapArtefactHandlerTests.java b/grace-test-suite-uber/src/test/groovy/org/grails/commons/BootStrapArtefactHandlerTests.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/BootStrapArtefactHandlerTests.java rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/BootStrapArtefactHandlerTests.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/CodecArtefactHandlerTests.java b/grace-test-suite-uber/src/test/groovy/org/grails/commons/CodecArtefactHandlerTests.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/CodecArtefactHandlerTests.java rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/CodecArtefactHandlerTests.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/ControllerArtefactHandlerTests.java b/grace-test-suite-uber/src/test/groovy/org/grails/commons/ControllerArtefactHandlerTests.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/ControllerArtefactHandlerTests.java rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/ControllerArtefactHandlerTests.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/DefaultArtefactInfoTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/commons/DefaultArtefactInfoTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/DefaultArtefactInfoTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/DefaultArtefactInfoTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/DefaultGrailsCodecClassTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/commons/DefaultGrailsCodecClassTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/DefaultGrailsCodecClassTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/DefaultGrailsCodecClassTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/DomainClassArtefactHandlerTests.java b/grace-test-suite-uber/src/test/groovy/org/grails/commons/DomainClassArtefactHandlerTests.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/DomainClassArtefactHandlerTests.java rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/DomainClassArtefactHandlerTests.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/GrailsClassTests.java b/grace-test-suite-uber/src/test/groovy/org/grails/commons/GrailsClassTests.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/GrailsClassTests.java rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/GrailsClassTests.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/GrailsPluginManagerTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/commons/GrailsPluginManagerTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/GrailsPluginManagerTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/GrailsPluginManagerTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/MultipleClassesPerFileTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/commons/MultipleClassesPerFileTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/MultipleClassesPerFileTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/MultipleClassesPerFileTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/ServiceArtefactHandlerTests.java b/grace-test-suite-uber/src/test/groovy/org/grails/commons/ServiceArtefactHandlerTests.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/ServiceArtefactHandlerTests.java rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/ServiceArtefactHandlerTests.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/TagLibArtefactHandlerTests.java b/grace-test-suite-uber/src/test/groovy/org/grails/commons/TagLibArtefactHandlerTests.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/TagLibArtefactHandlerTests.java rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/TagLibArtefactHandlerTests.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/TestReload.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/commons/TestReload.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/TestReload.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/TestReload.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/UrlMappingsArtefactHandlerTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/commons/UrlMappingsArtefactHandlerTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/UrlMappingsArtefactHandlerTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/UrlMappingsArtefactHandlerTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/cfg/ExampleConfigClassObject.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/commons/cfg/ExampleConfigClassObject.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/cfg/ExampleConfigClassObject.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/cfg/ExampleConfigClassObject.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/cfg/ExampleConfigCompiledClass.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/commons/cfg/ExampleConfigCompiledClass.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/cfg/ExampleConfigCompiledClass.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/cfg/ExampleConfigCompiledClass.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/commons/spring/GrailsMockDependantObject.java b/grace-test-suite-uber/src/test/groovy/org/grails/commons/spring/GrailsMockDependantObject.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/commons/spring/GrailsMockDependantObject.java rename to grace-test-suite-uber/src/test/groovy/org/grails/commons/spring/GrailsMockDependantObject.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/domain/CircularRelationship.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/domain/CircularRelationship.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/domain/CircularRelationship.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/domain/CircularRelationship.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/domain/ManyToManyTest.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/domain/ManyToManyTest.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/domain/ManyToManyTest.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/domain/ManyToManyTest.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/domain/OneToManyTest2.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/domain/OneToManyTest2.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/domain/OneToManyTest2.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/domain/OneToManyTest2.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/domain/OneToOneTest.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/domain/OneToOneTest.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/domain/OneToOneTest.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/domain/OneToOneTest.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/domain/RelationshipsTest.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/domain/RelationshipsTest.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/domain/RelationshipsTest.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/domain/RelationshipsTest.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/domain/Test1.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/domain/Test1.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/domain/Test1.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/domain/Test1.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/domain/Test2.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/domain/Test2.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/domain/Test2.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/domain/Test2.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/domain/UniOneToManyTest.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/domain/UniOneToManyTest.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/domain/UniOneToManyTest.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/domain/UniOneToManyTest.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/io/support/GrailsResourceUtilsSpec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/io/support/GrailsResourceUtilsSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/io/support/GrailsResourceUtilsSpec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/io/support/GrailsResourceUtilsSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/io/support/GrailsResourceUtilsTests.java b/grace-test-suite-uber/src/test/groovy/org/grails/io/support/GrailsResourceUtilsTests.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/io/support/GrailsResourceUtilsTests.java rename to grace-test-suite-uber/src/test/groovy/org/grails/io/support/GrailsResourceUtilsTests.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/PluginFilterFactoryTests.java b/grace-test-suite-uber/src/test/groovy/org/grails/plugins/PluginFilterFactoryTests.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/plugins/PluginFilterFactoryTests.java rename to grace-test-suite-uber/src/test/groovy/org/grails/plugins/PluginFilterFactoryTests.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/grails-app/conf/NonPooledApplicationDataSource.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/plugins/grails-app/conf/NonPooledApplicationDataSource.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/plugins/grails-app/conf/NonPooledApplicationDataSource.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/plugins/grails-app/conf/NonPooledApplicationDataSource.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/grails-app/conf/PooledApplicationDataSource.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/plugins/grails-app/conf/PooledApplicationDataSource.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/plugins/grails-app/conf/PooledApplicationDataSource.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/plugins/grails-app/conf/PooledApplicationDataSource.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/grails-app/services/TestService.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/plugins/grails-app/services/TestService.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/plugins/grails-app/services/TestService.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/plugins/grails-app/services/TestService.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/metadata/GrailsPluginMetadataTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/plugins/metadata/GrailsPluginMetadataTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/plugins/metadata/GrailsPluginMetadataTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/plugins/metadata/GrailsPluginMetadataTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestSpec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestSpec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletResponseTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletResponseTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletResponseTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletResponseTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpSessionTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpSessionTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpSessionTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpSessionTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/web/mime/MimeTypesConfigurationSpec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/plugins/web/mime/MimeTypesConfigurationSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/plugins/web/mime/MimeTypesConfigurationSpec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/plugins/web/mime/MimeTypesConfigurationSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/atom/AtomDomainClassRendererSpec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/atom/AtomDomainClassRendererSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/atom/AtomDomainClassRendererSpec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/atom/AtomDomainClassRendererSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalDomainClassJsonRendererSpec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalDomainClassJsonRendererSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalDomainClassJsonRendererSpec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalDomainClassJsonRendererSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalDomainClassXmlRendererSpec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalDomainClassXmlRendererSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalDomainClassXmlRendererSpec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalDomainClassXmlRendererSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/reload/SpringProxiedBeanReloadTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/reload/SpringProxiedBeanReloadTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/reload/SpringProxiedBeanReloadTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/reload/SpringProxiedBeanReloadTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/support/StaticResourceLoaderTests.java b/grace-test-suite-uber/src/test/groovy/org/grails/support/StaticResourceLoaderTests.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/support/StaticResourceLoaderTests.java rename to grace-test-suite-uber/src/test/groovy/org/grails/support/StaticResourceLoaderTests.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/test/support/ControllerNameExtractorTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/test/support/ControllerNameExtractorTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/test/support/ControllerNameExtractorTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/test/support/ControllerNameExtractorTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/test/support/MockHibernatePluginHelper.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/test/support/MockHibernatePluginHelper.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/test/support/MockHibernatePluginHelper.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/test/support/MockHibernatePluginHelper.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/validation/CascadingErrorCountSpec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/validation/CascadingErrorCountSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/validation/CascadingErrorCountSpec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/validation/CascadingErrorCountSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/validation/ConstrainedPropertyBuilderForCommandsTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/validation/ConstrainedPropertyBuilderForCommandsTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/validation/ConstrainedPropertyBuilderForCommandsTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/validation/ConstrainedPropertyBuilderForCommandsTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/validation/TestConstraints.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/validation/TestConstraints.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/validation/TestConstraints.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/validation/TestConstraints.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/validation/TestingValidationSpec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/validation/TestingValidationSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/validation/TestingValidationSpec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/validation/TestingValidationSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/validation/UrlConstrainedPropertyBuilderForCommandsTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/validation/UrlConstrainedPropertyBuilderForCommandsTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/validation/UrlConstrainedPropertyBuilderForCommandsTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/validation/UrlConstrainedPropertyBuilderForCommandsTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/codecs/HTMLJSCodecIntegrationSpec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/codecs/HTMLJSCodecIntegrationSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/codecs/HTMLJSCodecIntegrationSpec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/codecs/HTMLJSCodecIntegrationSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/errors/GrailsExceptionResolverTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/errors/GrailsExceptionResolverTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/errors/GrailsExceptionResolverTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/errors/GrailsExceptionResolverTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/filters/HiddenHttpMethodFilterTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/filters/HiddenHttpMethodFilterTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/filters/HiddenHttpMethodFilterTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/filters/HiddenHttpMethodFilterTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptorTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptorTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptorTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptorTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/json/JSONObjectTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/json/JSONObjectTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/json/JSONObjectTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/json/JSONObjectTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ChainMethodTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ChainMethodTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ChainMethodTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ChainMethodTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ChainMethodWithRequestDataValueProcessorSpec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ChainMethodWithRequestDataValueProcessorSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ChainMethodWithRequestDataValueProcessorSpec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ChainMethodWithRequestDataValueProcessorSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodspec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodspec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodspec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/metaclass/ForwardMethodspec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/WithFormMethodTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/metaclass/WithFormMethodTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/metaclass/WithFormMethodTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/metaclass/WithFormMethodTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/MyHandlerInterceptor.java b/grace-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/MyHandlerInterceptor.java similarity index 97% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/MyHandlerInterceptor.java rename to grace-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/MyHandlerInterceptor.java index e41b5acef3..7202462b0d 100755 --- a/grails-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/MyHandlerInterceptor.java +++ b/grace-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/MyHandlerInterceptor.java @@ -1,22 +1,22 @@ -package org.grails.web.plugins.support; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.ModelAndView; - -public class MyHandlerInterceptor implements HandlerInterceptor { - - public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { - // do nothing - } - - public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) { - // do nothing - } - - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { - return false; - } -} +package org.grails.web.plugins.support; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +public class MyHandlerInterceptor implements HandlerInterceptor { + + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { + // do nothing + } + + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) { + // do nothing + } + + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { + return false; + } +} diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/MyWebRequestInterceptor.java b/grace-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/MyWebRequestInterceptor.java similarity index 96% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/MyWebRequestInterceptor.java rename to grace-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/MyWebRequestInterceptor.java index 2cbcda367c..caa2e650da 100755 --- a/grails-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/MyWebRequestInterceptor.java +++ b/grace-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/MyWebRequestInterceptor.java @@ -1,20 +1,20 @@ -package org.grails.web.plugins.support; - -import org.springframework.ui.ModelMap; -import org.springframework.web.context.request.WebRequest; -import org.springframework.web.context.request.WebRequestInterceptor; - -public class MyWebRequestInterceptor implements WebRequestInterceptor { - - public void afterCompletion(WebRequest request, Exception ex) { - // do nothing - } - - public void postHandle(WebRequest request, ModelMap model) { - // do nothing - } - - public void preHandle(WebRequest request) throws Exception { - // do nothing - } -} +package org.grails.web.plugins.support; + +import org.springframework.ui.ModelMap; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.context.request.WebRequestInterceptor; + +public class MyWebRequestInterceptor implements WebRequestInterceptor { + + public void afterCompletion(WebRequest request, Exception ex) { + // do nothing + } + + public void postHandle(WebRequest request, ModelMap model) { + // do nothing + } + + public void preHandle(WebRequest request) throws Exception { + // do nothing + } +} diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/web-interceptor-wiring-tests.xml b/grace-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/web-interceptor-wiring-tests.xml similarity index 97% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/web-interceptor-wiring-tests.xml rename to grace-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/web-interceptor-wiring-tests.xml index a31f8791f7..fb21fe5bf7 100755 --- a/grails-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/web-interceptor-wiring-tests.xml +++ b/grace-test-suite-uber/src/test/groovy/org/grails/web/plugins/support/web-interceptor-wiring-tests.xml @@ -1,18 +1,18 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributesTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributesTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributesTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributesTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/FlashScopeWithErrorsTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/FlashScopeWithErrorsTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/FlashScopeWithErrorsTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/FlashScopeWithErrorsTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/GrailsApplicationAttributesTests.java b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/GrailsApplicationAttributesTests.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/GrailsApplicationAttributesTests.java rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/GrailsApplicationAttributesTests.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/GrailsFlashScopeTests.java b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/GrailsFlashScopeTests.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/GrailsFlashScopeTests.java rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/GrailsFlashScopeTests.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/MultipleRenderCallsContentTypeTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/MultipleRenderCallsContentTypeTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/MultipleRenderCallsContentTypeTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/MultipleRenderCallsContentTypeTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/RenderMethodTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/RenderMethodTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/RenderMethodTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/RenderMethodTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/ControllerInheritanceTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/ControllerInheritanceTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/ControllerInheritanceTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/ControllerInheritanceTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/ParamsObjectTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/ParamsObjectTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/ParamsObjectTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/ParamsObjectTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/PermanentRedirectSpec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/PermanentRedirectSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/PermanentRedirectSpec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/PermanentRedirectSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectController.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectController.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectController.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectController.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectMethodTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectMethodTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectMethodTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectMethodTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectMethodWithRequestDataValueProcessorSpec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectMethodWithRequestDataValueProcessorSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectMethodWithRequestDataValueProcessorSpec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectMethodWithRequestDataValueProcessorSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectToDefaultActionTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectToDefaultActionTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectToDefaultActionTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectToDefaultActionTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RenderDynamicMethodTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RenderDynamicMethodTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RenderDynamicMethodTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RenderDynamicMethodTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/ReturnModelAndViewController.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/ReturnModelAndViewController.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/ReturnModelAndViewController.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/ReturnModelAndViewController.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/TagLibDynamicMethodsTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/TagLibDynamicMethodsTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/TagLibDynamicMethodsTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/TagLibDynamicMethodsTests.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/AnotherNamespacedController.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/AnotherNamespacedController.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/AnotherNamespacedController.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/AnotherNamespacedController.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/alpha/NamespacedController.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/beta/AnotherNamespacedController.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/beta/AnotherNamespacedController.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/beta/AnotherNamespacedController.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/beta/AnotherNamespacedController.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/beta/NamespacedController.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/beta/NamespacedController.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/beta/NamespacedController.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/beta/NamespacedController.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/controller1.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/controller1.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/controller1.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/controller1.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/controller2.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/controller2.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/controller2.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/controller2.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/controller4.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/controller4.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/controller4.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/controller4.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/simple-grails-controller-tests.xml b/grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/simple-grails-controller-tests.xml similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/simple-grails-controller-tests.xml rename to grace-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/simple-grails-controller-tests.xml diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/util/BoundedCharsAsEncodedBytesCounterTest.java b/grace-test-suite-uber/src/test/groovy/org/grails/web/util/BoundedCharsAsEncodedBytesCounterTest.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/util/BoundedCharsAsEncodedBytesCounterTest.java rename to grace-test-suite-uber/src/test/groovy/org/grails/web/util/BoundedCharsAsEncodedBytesCounterTest.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/util/CodecPrintWriterTest.java b/grace-test-suite-uber/src/test/groovy/org/grails/web/util/CodecPrintWriterTest.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/util/CodecPrintWriterTest.java rename to grace-test-suite-uber/src/test/groovy/org/grails/web/util/CodecPrintWriterTest.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/util/CodecWithClosureProperties.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/util/CodecWithClosureProperties.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/util/CodecWithClosureProperties.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/util/CodecWithClosureProperties.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/util/StreamByteBufferTest.java b/grace-test-suite-uber/src/test/groovy/org/grails/web/util/StreamByteBufferTest.java similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/util/StreamByteBufferTest.java rename to grace-test-suite-uber/src/test/groovy/org/grails/web/util/StreamByteBufferTest.java diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/util/StreamCharBufferSpec.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/util/StreamCharBufferSpec.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/util/StreamCharBufferSpec.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/util/StreamCharBufferSpec.groovy diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/util/WebUtilsTests.groovy b/grace-test-suite-uber/src/test/groovy/org/grails/web/util/WebUtilsTests.groovy similarity index 100% rename from grails-test-suite-uber/src/test/groovy/org/grails/web/util/WebUtilsTests.groovy rename to grace-test-suite-uber/src/test/groovy/org/grails/web/util/WebUtilsTests.groovy diff --git a/grails-test-suite-uber/src/test/resources/customviews/grails-app/views/demo/_myTemplate.gsp b/grace-test-suite-uber/src/test/resources/customviews/grails-app/views/demo/_myTemplate.gsp similarity index 100% rename from grails-test-suite-uber/src/test/resources/customviews/grails-app/views/demo/_myTemplate.gsp rename to grace-test-suite-uber/src/test/resources/customviews/grails-app/views/demo/_myTemplate.gsp diff --git a/grails-test-suite-uber/src/test/resources/grails/spring/resources1.groovy b/grace-test-suite-uber/src/test/resources/grails/spring/resources1.groovy similarity index 100% rename from grails-test-suite-uber/src/test/resources/grails/spring/resources1.groovy rename to grace-test-suite-uber/src/test/resources/grails/spring/resources1.groovy diff --git a/grails-test-suite-uber/src/test/resources/grails/spring/test.xml b/grace-test-suite-uber/src/test/resources/grails/spring/test.xml similarity index 100% rename from grails-test-suite-uber/src/test/resources/grails/spring/test.xml rename to grace-test-suite-uber/src/test/resources/grails/spring/test.xml diff --git a/grails-test-suite-uber/src/test/resources/org/grails/commons/cfg/ExampleConfig.properties b/grace-test-suite-uber/src/test/resources/org/grails/commons/cfg/ExampleConfig.properties similarity index 100% rename from grails-test-suite-uber/src/test/resources/org/grails/commons/cfg/ExampleConfig.properties rename to grace-test-suite-uber/src/test/resources/org/grails/commons/cfg/ExampleConfig.properties diff --git a/grails-test-suite-uber/src/test/resources/org/grails/commons/cfg/ExampleConfigDefaults.groovy b/grace-test-suite-uber/src/test/resources/org/grails/commons/cfg/ExampleConfigDefaults.groovy similarity index 100% rename from grails-test-suite-uber/src/test/resources/org/grails/commons/cfg/ExampleConfigDefaults.groovy rename to grace-test-suite-uber/src/test/resources/org/grails/commons/cfg/ExampleConfigDefaults.groovy diff --git a/grails-test-suite-uber/src/test/resources/org/grails/commons/cfg/ExampleConfigScript.groovy b/grace-test-suite-uber/src/test/resources/org/grails/commons/cfg/ExampleConfigScript.groovy similarity index 100% rename from grails-test-suite-uber/src/test/resources/org/grails/commons/cfg/ExampleConfigScript.groovy rename to grace-test-suite-uber/src/test/resources/org/grails/commons/cfg/ExampleConfigScript.groovy diff --git a/grails-test-suite-uber/src/test/resources/org/grails/commons/classes.groovy b/grace-test-suite-uber/src/test/resources/org/grails/commons/classes.groovy similarity index 100% rename from grails-test-suite-uber/src/test/resources/org/grails/commons/classes.groovy rename to grace-test-suite-uber/src/test/resources/org/grails/commons/classes.groovy diff --git a/grails-test-suite-uber/src/test/resources/org/grails/commons/test-web.xml b/grace-test-suite-uber/src/test/resources/org/grails/commons/test-web.xml similarity index 100% rename from grails-test-suite-uber/src/test/resources/org/grails/commons/test-web.xml rename to grace-test-suite-uber/src/test/resources/org/grails/commons/test-web.xml diff --git a/grails-test-suite-uber/src/test/resources/org/grails/plugins/ClassEditorGrailsPlugin.groovy b/grace-test-suite-uber/src/test/resources/org/grails/plugins/ClassEditorGrailsPlugin.groovy similarity index 100% rename from grails-test-suite-uber/src/test/resources/org/grails/plugins/ClassEditorGrailsPlugin.groovy rename to grace-test-suite-uber/src/test/resources/org/grails/plugins/ClassEditorGrailsPlugin.groovy diff --git a/grails-test-suite-uber/test/defaultErrorMessages.properties b/grace-test-suite-uber/test/defaultErrorMessages.properties similarity index 100% rename from grails-test-suite-uber/test/defaultErrorMessages.properties rename to grace-test-suite-uber/test/defaultErrorMessages.properties diff --git a/grails-test-suite-uber/test/resources/grails-app/conf/BuildConfig.groovy b/grace-test-suite-uber/test/resources/grails-app/conf/BuildConfig.groovy similarity index 100% rename from grails-test-suite-uber/test/resources/grails-app/conf/BuildConfig.groovy rename to grace-test-suite-uber/test/resources/grails-app/conf/BuildConfig.groovy diff --git a/grails-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/LoggingGrailsPlugin.groovy b/grace-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/LoggingGrailsPlugin.groovy similarity index 100% rename from grails-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/LoggingGrailsPlugin.groovy rename to grace-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/LoggingGrailsPlugin.groovy diff --git a/grails-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/plugin.xml b/grace-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/plugin.xml similarity index 100% rename from grails-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/plugin.xml rename to grace-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/plugin.xml diff --git a/grails-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/scripts/DoSomething.groovy b/grace-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/scripts/DoSomething.groovy similarity index 100% rename from grails-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/scripts/DoSomething.groovy rename to grace-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/scripts/DoSomething.groovy diff --git a/grails-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/scripts/_Install.groovy b/grace-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/scripts/_Install.groovy similarity index 100% rename from grails-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/scripts/_Install.groovy rename to grace-test-suite-uber/test/resources/grails-plugin-utils/global-plugins/logging-0.1/scripts/_Install.groovy diff --git a/grails-test-suite-uber/test/resources/grails-plugin-utils/grails-debug/plugin.xml b/grace-test-suite-uber/test/resources/grails-plugin-utils/grails-debug/plugin.xml similarity index 100% rename from grails-test-suite-uber/test/resources/grails-plugin-utils/grails-debug/plugin.xml rename to grace-test-suite-uber/test/resources/grails-plugin-utils/grails-debug/plugin.xml diff --git a/grails-test-suite-uber/test/resources/grails-plugin-utils/grails-debug/scripts/RunDebug.groovy b/grace-test-suite-uber/test/resources/grails-plugin-utils/grails-debug/scripts/RunDebug.groovy similarity index 100% rename from grails-test-suite-uber/test/resources/grails-plugin-utils/grails-debug/scripts/RunDebug.groovy rename to grace-test-suite-uber/test/resources/grails-plugin-utils/grails-debug/scripts/RunDebug.groovy diff --git a/grails-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/JSecurityGrailsPlugin.groovy b/grace-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/JSecurityGrailsPlugin.groovy similarity index 100% rename from grails-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/JSecurityGrailsPlugin.groovy rename to grace-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/JSecurityGrailsPlugin.groovy diff --git a/grails-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/plugin.xml b/grace-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/plugin.xml similarity index 100% rename from grails-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/plugin.xml rename to grace-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/plugin.xml diff --git a/grails-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/scripts/CreateAuthController.groovy b/grace-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/scripts/CreateAuthController.groovy similarity index 100% rename from grails-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/scripts/CreateAuthController.groovy rename to grace-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/scripts/CreateAuthController.groovy diff --git a/grails-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/scripts/CreateDbRealm.groovy b/grace-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/scripts/CreateDbRealm.groovy similarity index 100% rename from grails-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/scripts/CreateDbRealm.groovy rename to grace-test-suite-uber/test/resources/grails-plugin-utils/plugins/jsecurity-0.3/scripts/CreateDbRealm.groovy diff --git a/grails-test-suite-uber/test/resources/spring/test.groovy b/grace-test-suite-uber/test/resources/spring/test.groovy similarity index 100% rename from grails-test-suite-uber/test/resources/spring/test.groovy rename to grace-test-suite-uber/test/resources/spring/test.groovy diff --git a/grails-test-suite-uber/test/test-projects/inline-plugins/README.txt b/grace-test-suite-uber/test/test-projects/inline-plugins/README.txt similarity index 100% rename from grails-test-suite-uber/test/test-projects/inline-plugins/README.txt rename to grace-test-suite-uber/test/test-projects/inline-plugins/README.txt diff --git a/grails-test-suite-uber/test/test-projects/inline-plugins/app/grails-app/conf/BuildConfig.groovy b/grace-test-suite-uber/test/test-projects/inline-plugins/app/grails-app/conf/BuildConfig.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/inline-plugins/app/grails-app/conf/BuildConfig.groovy rename to grace-test-suite-uber/test/test-projects/inline-plugins/app/grails-app/conf/BuildConfig.groovy diff --git a/grails-test-suite-uber/test/test-projects/inline-plugins/plugins/foo/FooGrailsPlugin.groovy b/grace-test-suite-uber/test/test-projects/inline-plugins/plugins/foo/FooGrailsPlugin.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/inline-plugins/plugins/foo/FooGrailsPlugin.groovy rename to grace-test-suite-uber/test/test-projects/inline-plugins/plugins/foo/FooGrailsPlugin.groovy diff --git a/grails-test-suite-uber/test/test-projects/inline-plugins/plugins/foo/grails-app/controllers/foo/FooController.groovy b/grace-test-suite-uber/test/test-projects/inline-plugins/plugins/foo/grails-app/controllers/foo/FooController.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/inline-plugins/plugins/foo/grails-app/controllers/foo/FooController.groovy rename to grace-test-suite-uber/test/test-projects/inline-plugins/plugins/foo/grails-app/controllers/foo/FooController.groovy diff --git a/grails-test-suite-uber/test/test-projects/inline-plugins/plugins/foobar/FoobarGrailsPlugin.groovy b/grace-test-suite-uber/test/test-projects/inline-plugins/plugins/foobar/FoobarGrailsPlugin.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/inline-plugins/plugins/foobar/FoobarGrailsPlugin.groovy rename to grace-test-suite-uber/test/test-projects/inline-plugins/plugins/foobar/FoobarGrailsPlugin.groovy diff --git a/grails-test-suite-uber/test/test-projects/inline-plugins/plugins/foobar/grails-app/controllers/foobar/FoobarController.groovy b/grace-test-suite-uber/test/test-projects/inline-plugins/plugins/foobar/grails-app/controllers/foobar/FoobarController.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/inline-plugins/plugins/foobar/grails-app/controllers/foobar/FoobarController.groovy rename to grace-test-suite-uber/test/test-projects/inline-plugins/plugins/foobar/grails-app/controllers/foobar/FoobarController.groovy diff --git a/grails-test-suite-uber/test/test-projects/nested-inline-plugins/README.txt b/grace-test-suite-uber/test/test-projects/nested-inline-plugins/README.txt similarity index 100% rename from grails-test-suite-uber/test/test-projects/nested-inline-plugins/README.txt rename to grace-test-suite-uber/test/test-projects/nested-inline-plugins/README.txt diff --git a/grails-test-suite-uber/test/test-projects/nested-inline-plugins/app/grails-app/conf/BuildConfig.groovy b/grace-test-suite-uber/test/test-projects/nested-inline-plugins/app/grails-app/conf/BuildConfig.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/nested-inline-plugins/app/grails-app/conf/BuildConfig.groovy rename to grace-test-suite-uber/test/test-projects/nested-inline-plugins/app/grails-app/conf/BuildConfig.groovy diff --git a/grails-test-suite-uber/test/test-projects/nested-inline-plugins/plugins/plugin-one/PluginOneGrailsPlugin.groovy b/grace-test-suite-uber/test/test-projects/nested-inline-plugins/plugins/plugin-one/PluginOneGrailsPlugin.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/nested-inline-plugins/plugins/plugin-one/PluginOneGrailsPlugin.groovy rename to grace-test-suite-uber/test/test-projects/nested-inline-plugins/plugins/plugin-one/PluginOneGrailsPlugin.groovy diff --git a/grails-test-suite-uber/test/test-projects/nested-inline-plugins/plugins/plugin-one/grails-app/conf/BuildConfig.groovy b/grace-test-suite-uber/test/test-projects/nested-inline-plugins/plugins/plugin-one/grails-app/conf/BuildConfig.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/nested-inline-plugins/plugins/plugin-one/grails-app/conf/BuildConfig.groovy rename to grace-test-suite-uber/test/test-projects/nested-inline-plugins/plugins/plugin-one/grails-app/conf/BuildConfig.groovy diff --git a/grails-test-suite-uber/test/test-projects/nested-inline-plugins/plugins/plugin-two/PluginTwoGrailsPlugin.groovy b/grace-test-suite-uber/test/test-projects/nested-inline-plugins/plugins/plugin-two/PluginTwoGrailsPlugin.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/nested-inline-plugins/plugins/plugin-two/PluginTwoGrailsPlugin.groovy rename to grace-test-suite-uber/test/test-projects/nested-inline-plugins/plugins/plugin-two/PluginTwoGrailsPlugin.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/application.properties b/grace-test-suite-uber/test/test-projects/plugin-build-settings/application.properties similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/application.properties rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/application.properties diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/BootStrap.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/BootStrap.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/BootStrap.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/BootStrap.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/BuildConfig.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/BuildConfig.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/BuildConfig.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/BuildConfig.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/Config.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/Config.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/Config.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/Config.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/DataSource.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/DataSource.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/DataSource.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/DataSource.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/UrlMappings.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/UrlMappings.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/UrlMappings.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/UrlMappings.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/spring/resources.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/spring/resources.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/spring/resources.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/conf/spring/resources.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/i18n/messages.properties b/grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/i18n/messages.properties similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/i18n/messages.properties rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/grails-app/i18n/messages.properties diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/HibernateGrailsPlugin.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/HibernateGrailsPlugin.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/HibernateGrailsPlugin.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/HibernateGrailsPlugin.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/application.properties b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/application.properties similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/application.properties rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/application.properties diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/dependencies.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/dependencies.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/dependencies.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/dependencies.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/grails-app/i18n/messages.properties b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/grails-app/i18n/messages.properties similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/grails-app/i18n/messages.properties rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/grails-app/i18n/messages.properties diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/grails-app/i18n/org/example/custom.properties b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/grails-app/i18n/org/example/custom.properties similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/grails-app/i18n/org/example/custom.properties rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/grails-app/i18n/org/example/custom.properties diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/grails-app/i18n/org/example/custom_fr.properties b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/grails-app/i18n/org/example/custom_fr.properties similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/grails-app/i18n/org/example/custom_fr.properties rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/grails-app/i18n/org/example/custom_fr.properties diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/lib/hibernate-annotations-3.4.0.GA.jar b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/lib/hibernate-annotations-3.4.0.GA.jar similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/lib/hibernate-annotations-3.4.0.GA.jar rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/lib/hibernate-annotations-3.4.0.GA.jar diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/lib/hibernate-core-3.3.1.GA.jar b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/lib/hibernate-core-3.3.1.GA.jar similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/lib/hibernate-core-3.3.1.GA.jar rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/lib/hibernate-core-3.3.1.GA.jar diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/plugin.xml b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/plugin.xml similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/plugin.xml rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/plugin.xml diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/scripts/_Install.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/scripts/_Install.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/scripts/_Install.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/scripts/_Install.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/scripts/_Uninstall.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/scripts/_Uninstall.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/scripts/_Uninstall.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/scripts/_Uninstall.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/scripts/_Upgrade.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/scripts/_Upgrade.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/scripts/_Upgrade.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/hibernate-1.2-SNAPSHOT/scripts/_Upgrade.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/WebflowGrailsPlugin.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/WebflowGrailsPlugin.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/WebflowGrailsPlugin.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/WebflowGrailsPlugin.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/application.properties b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/application.properties similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/application.properties rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/application.properties diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/dependencies.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/dependencies.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/dependencies.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/dependencies.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/grails-app/i18n/messages.properties b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/grails-app/i18n/messages.properties similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/grails-app/i18n/messages.properties rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/grails-app/i18n/messages.properties diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/lib/org.springframework.webflow-2.0.8.RELEASE.jar b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/lib/org.springframework.webflow-2.0.8.RELEASE.jar similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/lib/org.springframework.webflow-2.0.8.RELEASE.jar rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/lib/org.springframework.webflow-2.0.8.RELEASE.jar diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/plugin.xml b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/plugin.xml similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/plugin.xml rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/plugin.xml diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/scripts/_Install.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/scripts/_Install.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/scripts/_Install.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/scripts/_Install.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/scripts/_Uninstall.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/scripts/_Uninstall.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/scripts/_Uninstall.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/scripts/_Uninstall.groovy diff --git a/grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/scripts/_Upgrade.groovy b/grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/scripts/_Upgrade.groovy similarity index 100% rename from grails-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/scripts/_Upgrade.groovy rename to grace-test-suite-uber/test/test-projects/plugin-build-settings/plugins/webflow-1.2-SNAPSHOT/scripts/_Upgrade.groovy diff --git a/grace-test-suite-web/README.md b/grace-test-suite-web/README.md new file mode 100644 index 0000000000..e650a16333 --- /dev/null +++ b/grace-test-suite-web/README.md @@ -0,0 +1,2 @@ +## grace-test-suite-web + diff --git a/grails-test-suite-web/build.gradle b/grace-test-suite-web/build.gradle similarity index 81% rename from grails-test-suite-web/build.gradle rename to grace-test-suite-web/build.gradle index 3b867988ba..d2254c5505 100644 --- a/grails-test-suite-web/build.gradle +++ b/grace-test-suite-web/build.gradle @@ -9,23 +9,23 @@ configurations.testCompileClasspath { } dependencies { - testImplementation project(":grails-boot") - testImplementation project(":grails-test-suite-base") - testImplementation project(":grails-plugin-domain-class") - testImplementation project(":grails-plugin-codecs") - testImplementation project(":grails-plugin-converters") - testImplementation project(":grails-plugin-datasource") - testImplementation project(":grails-plugin-i18n") - testImplementation project(":grails-plugin-url-mappings") - testImplementation project(":grails-plugin-databinding") - testImplementation project(":grails-plugin-services") - testImplementation project(":grails-plugin-interceptors") - testImplementation project(":grails-plugin-controllers") - testImplementation project(":grails-plugin-rest") - testImplementation project(":grails-web") - testImplementation project(":grails-web-databinding") - testImplementation project(":grails-spring") - testImplementation project(":grails-test-support") + testImplementation project(":grace-boot") + testImplementation project(":grace-test-suite-base") + testImplementation project(":grace-plugin-domain-class") + testImplementation project(":grace-plugin-codecs") + testImplementation project(":grace-plugin-converters") + testImplementation project(":grace-plugin-datasource") + testImplementation project(":grace-plugin-i18n") + testImplementation project(":grace-plugin-url-mappings") + testImplementation project(":grace-plugin-databinding") + testImplementation project(":grace-plugin-services") + testImplementation project(":grace-plugin-interceptors") + testImplementation project(":grace-plugin-controllers") + testImplementation project(":grace-plugin-rest") + testImplementation project(":grace-web") + testImplementation project(":grace-web-databinding") + testImplementation project(":grace-spring") + testImplementation project(":grace-test-support") api libs.javax.servlet testImplementation libs.javax.el diff --git a/grails-test-suite-web/src/test/groovy/grails/artefact/ControllerTraitSpec.groovy b/grace-test-suite-web/src/test/groovy/grails/artefact/ControllerTraitSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/grails/artefact/ControllerTraitSpec.groovy rename to grace-test-suite-web/src/test/groovy/grails/artefact/ControllerTraitSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/grails/rest/web/RespondMethodSpec.groovy b/grace-test-suite-web/src/test/groovy/grails/rest/web/RespondMethodSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/grails/rest/web/RespondMethodSpec.groovy rename to grace-test-suite-web/src/test/groovy/grails/rest/web/RespondMethodSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/grails/test/mixin/TagLibWithServiceMockTests.groovy b/grace-test-suite-web/src/test/groovy/grails/test/mixin/TagLibWithServiceMockTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/grails/test/mixin/TagLibWithServiceMockTests.groovy rename to grace-test-suite-web/src/test/groovy/grails/test/mixin/TagLibWithServiceMockTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/grails/test/mixin/TestForControllerWithNamePropertySpec.groovy b/grace-test-suite-web/src/test/groovy/grails/test/mixin/TestForControllerWithNamePropertySpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/grails/test/mixin/TestForControllerWithNamePropertySpec.groovy rename to grace-test-suite-web/src/test/groovy/grails/test/mixin/TestForControllerWithNamePropertySpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/grails/test/mixin/UrlMappingsTestForTests.groovy b/grace-test-suite-web/src/test/groovy/grails/test/mixin/UrlMappingsTestForTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/grails/test/mixin/UrlMappingsTestForTests.groovy rename to grace-test-suite-web/src/test/groovy/grails/test/mixin/UrlMappingsTestForTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/grails/test/web/FordedUrlSpec.groovy b/grace-test-suite-web/src/test/groovy/grails/test/web/FordedUrlSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/grails/test/web/FordedUrlSpec.groovy rename to grace-test-suite-web/src/test/groovy/grails/test/web/FordedUrlSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/grails/test/web/GetHeadersFromResponseSpec.groovy b/grace-test-suite-web/src/test/groovy/grails/test/web/GetHeadersFromResponseSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/grails/test/web/GetHeadersFromResponseSpec.groovy rename to grace-test-suite-web/src/test/groovy/grails/test/web/GetHeadersFromResponseSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/grails/test/web/RedirectToDomainSpec.groovy b/grace-test-suite-web/src/test/groovy/grails/test/web/RedirectToDomainSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/grails/test/web/RedirectToDomainSpec.groovy rename to grace-test-suite-web/src/test/groovy/grails/test/web/RedirectToDomainSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerAllowedMethodsSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerAllowedMethodsSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerAllowedMethodsSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerAllowedMethodsSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/compiler/web/WithFormatSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/compiler/web/WithFormatSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/compiler/web/WithFormatSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/compiler/web/WithFormatSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/compiler/web/converters/ConvertersControllersApiSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/compiler/web/converters/ConvertersControllersApiSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/compiler/web/converters/ConvertersControllersApiSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/compiler/web/converters/ConvertersControllersApiSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRendererSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRendererSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRendererSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRendererSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindCommandObjectsSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindCommandObjectsSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindCommandObjectsSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindCommandObjectsSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindStringArrayToGenericListTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindStringArrayToGenericListTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindStringArrayToGenericListTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindStringArrayToGenericListTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindToEnumTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindToEnumTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindToEnumTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindToEnumTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindToObjectWithEmbeddableTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindToObjectWithEmbeddableTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindToObjectWithEmbeddableTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindToObjectWithEmbeddableTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindToPropertyThatIsNotReadableTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindToPropertyThatIsNotReadableTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindToPropertyThatIsNotReadableTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindToPropertyThatIsNotReadableTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindXmlWithAssociationTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindXmlWithAssociationTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindXmlWithAssociationTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindXmlWithAssociationTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindingExcludeTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindingExcludeTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindingExcludeTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindingExcludeTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindingRequestMethodSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindingRequestMethodSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindingRequestMethodSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindingRequestMethodSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindingToNullableTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindingToNullableTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/BindingToNullableTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/BindingToNullableTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/CheckboxBindingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/CheckboxBindingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/CheckboxBindingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/CheckboxBindingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/ControllerActionParameterBindingSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/ControllerActionParameterBindingSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/ControllerActionParameterBindingSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/ControllerActionParameterBindingSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/DataBindingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/DataBindingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/DataBindingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/DataBindingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/DefaultASTDatabindingHelperDomainClassSpecialPropertiesSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/DefaultASTDatabindingHelperDomainClassSpecialPropertiesSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/DefaultASTDatabindingHelperDomainClassSpecialPropertiesSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/DefaultASTDatabindingHelperDomainClassSpecialPropertiesSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/EnumBindingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/EnumBindingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/EnumBindingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/EnumBindingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/GrailsParameterMapBindingSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/GrailsParameterMapBindingSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/GrailsParameterMapBindingSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/GrailsParameterMapBindingSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/JSONBindingToNullTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/JSONBindingToNullTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/JSONBindingToNullTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/JSONBindingToNullTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/JSONRequestToResponseRenderingSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/JSONRequestToResponseRenderingSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/JSONRequestToResponseRenderingSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/JSONRequestToResponseRenderingSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/NestedXmlBindingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/NestedXmlBindingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/NestedXmlBindingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/NestedXmlBindingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/hal/json/HalJsonBindingSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/hal/json/HalJsonBindingSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/hal/json/HalJsonBindingSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/hal/json/HalJsonBindingSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/hal/xml/HalXmlBindingSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/hal/xml/HalXmlBindingSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/hal/xml/HalXmlBindingSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/hal/xml/HalXmlBindingSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/json/JsonBindingSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/json/JsonBindingSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/json/JsonBindingSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/json/JsonBindingSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/json/JsonBindingWithExceptionHandlerSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/json/JsonBindingWithExceptionHandlerSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/json/JsonBindingWithExceptionHandlerSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/json/JsonBindingWithExceptionHandlerSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/binding/xml/XmlBindingSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/binding/xml/XmlBindingSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/binding/xml/XmlBindingSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/binding/xml/XmlBindingSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/codecs/CodecSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/codecs/CodecSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/codecs/CodecSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/codecs/CodecSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/ClassWithNoValidateMethod.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/ClassWithNoValidateMethod.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/ClassWithNoValidateMethod.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/ClassWithNoValidateMethod.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectInstantiationSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectInstantiationSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectInstantiationSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectInstantiationSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectNoDataSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectNoDataSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectNoDataSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectNoDataSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectNullabilitySpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectNullabilitySpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectNullabilitySpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectNullabilitySpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectsSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectsSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectsSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/CommandObjectsSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/NonValidateableCommand.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/NonValidateableCommand.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/NonValidateableCommand.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/NonValidateableCommand.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/SomeValidateableClass.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/SomeValidateableClass.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/commandobjects/SomeValidateableClass.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/commandobjects/SomeValidateableClass.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ContentNegotiationSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/controllers/ContentNegotiationSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ContentNegotiationSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/controllers/ContentNegotiationSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerCompilationErrorsSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerCompilationErrorsSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerCompilationErrorsSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerCompilationErrorsSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerInheritanceSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerInheritanceSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerInheritanceSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerInheritanceSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerMetaProgrammingSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerMetaProgrammingSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerMetaProgrammingSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerMetaProgrammingSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/converters/Author.java b/grace-test-suite-web/src/test/groovy/org/grails/web/converters/Author.java similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/converters/Author.java rename to grace-test-suite-web/src/test/groovy/org/grails/web/converters/Author.java diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/converters/ControllerWithXmlConvertersTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/converters/ControllerWithXmlConvertersTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/converters/ControllerWithXmlConvertersTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/converters/ControllerWithXmlConvertersTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/converters/ConverterConfigurationTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/converters/ConverterConfigurationTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/converters/ConverterConfigurationTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/converters/ConverterConfigurationTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/converters/JSONArrayTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/converters/JSONArrayTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/converters/JSONArrayTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/converters/JSONArrayTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/converters/JSONConverterTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/converters/JSONConverterTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/converters/JSONConverterTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/converters/JSONConverterTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/converters/MarshallerRegistrarSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/converters/MarshallerRegistrarSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/converters/MarshallerRegistrarSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/converters/MarshallerRegistrarSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/includes/IncludeHandlingSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/includes/IncludeHandlingSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/includes/IncludeHandlingSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/includes/IncludeHandlingSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/json/DomainClassCollectionRenderingSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/json/DomainClassCollectionRenderingSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/json/DomainClassCollectionRenderingSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/json/DomainClassCollectionRenderingSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/json/JSONWriterSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/json/JSONWriterSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/json/JSONWriterSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/json/JSONWriterSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/AdditionalParamsMappingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/AdditionalParamsMappingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/AdditionalParamsMappingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/AdditionalParamsMappingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/DoubleWildcardUrlMappingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/DoubleWildcardUrlMappingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/DoubleWildcardUrlMappingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/DoubleWildcardUrlMappingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/DynamicActionNameEvaluatingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/DynamicActionNameEvaluatingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/DynamicActionNameEvaluatingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/DynamicActionNameEvaluatingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/DynamicParameterValuesTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/DynamicParameterValuesTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/DynamicParameterValuesTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/DynamicParameterValuesTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/IdUrlMappingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/IdUrlMappingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/IdUrlMappingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/IdUrlMappingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/OverlappingUrlMappingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/OverlappingUrlMappingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/OverlappingUrlMappingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/OverlappingUrlMappingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/RegexUrlMappingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/RegexUrlMappingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/RegexUrlMappingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/RegexUrlMappingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/ResponseCodeUrlMappingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/ResponseCodeUrlMappingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/ResponseCodeUrlMappingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/ResponseCodeUrlMappingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/RestfulMappingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/RestfulMappingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/RestfulMappingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/RestfulMappingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/UriUrlMappingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/UriUrlMappingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/UriUrlMappingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/UriUrlMappingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingEvaluatorTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingEvaluatorTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingEvaluatorTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingEvaluatorTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingParameterTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingParameterTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingParameterTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingParameterTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingWithCustomValidatorTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingWithCustomValidatorTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingWithCustomValidatorTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingWithCustomValidatorTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingsHolderTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingsHolderTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingsHolderTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/UrlMappingsHolderTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/ViewUrlMappingTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mapping/ViewUrlMappingTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mapping/ViewUrlMappingTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mapping/ViewUrlMappingTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/metaclass/CollectionBindDataMethodSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/metaclass/CollectionBindDataMethodSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/metaclass/CollectionBindDataMethodSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/metaclass/CollectionBindDataMethodSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mime/ContentFormatControllerTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mime/ContentFormatControllerTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mime/ContentFormatControllerTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mime/ContentFormatControllerTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mime/WithFormatContentTypeSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/mime/WithFormatContentTypeSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/mime/WithFormatContentTypeSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/mime/WithFormatContentTypeSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/servlet/BindDataMethodTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/servlet/BindDataMethodTests.groovy similarity index 96% rename from grails-test-suite-web/src/test/groovy/org/grails/web/servlet/BindDataMethodTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/servlet/BindDataMethodTests.groovy index 15ddf0e7e1..62b51708ee 100644 --- a/grails-test-suite-web/src/test/groovy/org/grails/web/servlet/BindDataMethodTests.groovy +++ b/grace-test-suite-web/src/test/groovy/org/grails/web/servlet/BindDataMethodTests.groovy @@ -1,193 +1,193 @@ -/* - * Copyright 2013 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.servlet - -import grails.artefact.Artefact -import grails.testing.web.controllers.ControllerUnitTest -import spock.lang.Specification - -/** - * Tests for the bindData method - * - */ -class BindDataMethodTests extends Specification implements ControllerUnitTest { - - void 'Test bindData with Map'() { - when: - def model = controller.bindWithMap() - def target = model.target - - then: - target.name == 'Marc Palmer' - } - - void 'Test bindData With Excludes'() { - when: - def model = controller.bindWithExcludes() - def target = model.target - - then: - target.name == 'Marc Palmer' - target.email == null - } - - void 'Test bindData With Includes'() { - when: - def model = controller.bindWithIncludes() - def target = model.target - - then: - target.name == 'Marc Palmer' - target.email == null - } - - void 'Test bindData With Empty Includes/Excludes Map'() { - when: - def model = controller.bindWithEmptyIncludesExcludesMap() - def target = model.target - - then: - target.name == 'Marc Palmer' - target.email == 'dowantthis' - } - - void 'Test bindData Overriding Included With Excluded'() { - when: - def model = controller.bindWithIncludeOverriddenByExclude() - def target = model.target - - then: - target.name == 'Marc Palmer' - target.email == null - } - - void 'Test bindData With Prefix Filter'() { - when: - def model = controller.bindWithPrefixFilter() - def target = model.target - - then: - target.name == 'Lee Butts' - target.email == 'lee@mail.com' - } - - void 'Test bindData With Disallowed And GrailsParameterMap'() { - when: - params.name = 'Marc Palmer' - params.email = 'dontwantthis' - params.'address.country' = 'gbr' - def model = controller.bindWithParamsAndDisallowed() - def target = model.target - - then: - target.name == 'Marc Palmer' - target.address.country == 'gbr' - target.email == null - } - - void 'Test bindData With Prefix Filter And Disallowed'() { - when: - def model = controller.bindWithPrefixFilterAndDisallowed() - def target = model.target - - then: - target.name == 'Lee Butts' - target.email == null - } - - void 'Test bindData Converts Single String In Map To List'() { - when: - def model = controller.bindWithStringConvertedToList() - def target = model.target - - then: - target.name == 'Lee Butts' - target.email == null - } -} - -@Artefact('Controller') -class BindingController { - - def bindWithMap() { - def target = new CommandObject() - bindData target, [ name : 'Marc Palmer' ] - [target: target] - } - - def bindWithExcludes() { - def target = new CommandObject() - bindData target, [name: 'Marc Palmer', email: 'dontwantthis'], [exclude: ['email']] - [target: target] - } - - def bindWithIncludes() { - def target = new CommandObject() - bindData target, [ name : 'Marc Palmer', email : 'dontwantthis' ], [include:['name']] - [target: target] - } - - def bindWithEmptyIncludesExcludesMap() { - def target = new CommandObject() - bindData target, [ name : 'Marc Palmer', email : 'dowantthis' ], [:] - [target: target] - } - - def bindWithIncludeOverriddenByExclude() { - def target = new CommandObject() - bindData target, [ name : 'Marc Palmer', email : 'dontwantthis' ], [include: ['name', 'email'], exclude: ['email']] - [target: target] - } - - def bindWithPrefixFilter() { - def target = new CommandObject() - def filter = "lee" - bindData target, [ 'mark.name' : 'Marc Palmer', 'mark.email' : 'dontwantthis', 'lee.name': 'Lee Butts', 'lee.email': 'lee@mail.com'], filter - [target: target] - } - - def bindWithParamsAndDisallowed() { - def target = new CommandObject() - bindData target, params, [exclude:['email']] - [target: target] - } - - def bindWithPrefixFilterAndDisallowed() { - def target = new CommandObject() - def filter = "lee" - def disallowed = [exclude:["email"]] - bindData target, [ 'mark.name' : 'Marc Palmer', 'mark.email' : 'dontwantthis', 'lee.name': 'Lee Butts', 'lee.email': 'lee@mail.com'], disallowed, filter - [target: target] - } - - def bindWithStringConvertedToList() { - def target = new CommandObject() - def filter = "lee" - def disallowed = [exclude:"email"] - bindData target, [ 'mark.name' : 'Marc Palmer', 'mark.email' : 'dontwantthis', 'lee.name': 'Lee Butts', 'lee.email': 'lee@mail.com'], disallowed, filter - [target: target] - } -} - -class CommandObject { - String name - String email - Address address = new Address() -} - -class Address { - String country -} +/* + * Copyright 2013 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.servlet + +import grails.artefact.Artefact +import grails.testing.web.controllers.ControllerUnitTest +import spock.lang.Specification + +/** + * Tests for the bindData method + * + */ +class BindDataMethodTests extends Specification implements ControllerUnitTest { + + void 'Test bindData with Map'() { + when: + def model = controller.bindWithMap() + def target = model.target + + then: + target.name == 'Marc Palmer' + } + + void 'Test bindData With Excludes'() { + when: + def model = controller.bindWithExcludes() + def target = model.target + + then: + target.name == 'Marc Palmer' + target.email == null + } + + void 'Test bindData With Includes'() { + when: + def model = controller.bindWithIncludes() + def target = model.target + + then: + target.name == 'Marc Palmer' + target.email == null + } + + void 'Test bindData With Empty Includes/Excludes Map'() { + when: + def model = controller.bindWithEmptyIncludesExcludesMap() + def target = model.target + + then: + target.name == 'Marc Palmer' + target.email == 'dowantthis' + } + + void 'Test bindData Overriding Included With Excluded'() { + when: + def model = controller.bindWithIncludeOverriddenByExclude() + def target = model.target + + then: + target.name == 'Marc Palmer' + target.email == null + } + + void 'Test bindData With Prefix Filter'() { + when: + def model = controller.bindWithPrefixFilter() + def target = model.target + + then: + target.name == 'Lee Butts' + target.email == 'lee@mail.com' + } + + void 'Test bindData With Disallowed And GrailsParameterMap'() { + when: + params.name = 'Marc Palmer' + params.email = 'dontwantthis' + params.'address.country' = 'gbr' + def model = controller.bindWithParamsAndDisallowed() + def target = model.target + + then: + target.name == 'Marc Palmer' + target.address.country == 'gbr' + target.email == null + } + + void 'Test bindData With Prefix Filter And Disallowed'() { + when: + def model = controller.bindWithPrefixFilterAndDisallowed() + def target = model.target + + then: + target.name == 'Lee Butts' + target.email == null + } + + void 'Test bindData Converts Single String In Map To List'() { + when: + def model = controller.bindWithStringConvertedToList() + def target = model.target + + then: + target.name == 'Lee Butts' + target.email == null + } +} + +@Artefact('Controller') +class BindingController { + + def bindWithMap() { + def target = new CommandObject() + bindData target, [ name : 'Marc Palmer' ] + [target: target] + } + + def bindWithExcludes() { + def target = new CommandObject() + bindData target, [name: 'Marc Palmer', email: 'dontwantthis'], [exclude: ['email']] + [target: target] + } + + def bindWithIncludes() { + def target = new CommandObject() + bindData target, [ name : 'Marc Palmer', email : 'dontwantthis' ], [include:['name']] + [target: target] + } + + def bindWithEmptyIncludesExcludesMap() { + def target = new CommandObject() + bindData target, [ name : 'Marc Palmer', email : 'dowantthis' ], [:] + [target: target] + } + + def bindWithIncludeOverriddenByExclude() { + def target = new CommandObject() + bindData target, [ name : 'Marc Palmer', email : 'dontwantthis' ], [include: ['name', 'email'], exclude: ['email']] + [target: target] + } + + def bindWithPrefixFilter() { + def target = new CommandObject() + def filter = "lee" + bindData target, [ 'mark.name' : 'Marc Palmer', 'mark.email' : 'dontwantthis', 'lee.name': 'Lee Butts', 'lee.email': 'lee@mail.com'], filter + [target: target] + } + + def bindWithParamsAndDisallowed() { + def target = new CommandObject() + bindData target, params, [exclude:['email']] + [target: target] + } + + def bindWithPrefixFilterAndDisallowed() { + def target = new CommandObject() + def filter = "lee" + def disallowed = [exclude:["email"]] + bindData target, [ 'mark.name' : 'Marc Palmer', 'mark.email' : 'dontwantthis', 'lee.name': 'Lee Butts', 'lee.email': 'lee@mail.com'], disallowed, filter + [target: target] + } + + def bindWithStringConvertedToList() { + def target = new CommandObject() + def filter = "lee" + def disallowed = [exclude:"email"] + bindData target, [ 'mark.name' : 'Marc Palmer', 'mark.email' : 'dontwantthis', 'lee.name': 'Lee Butts', 'lee.email': 'lee@mail.com'], disallowed, filter + [target: target] + } +} + +class CommandObject { + String name + String email + Address address = new Address() +} + +class Address { + String country +} diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/servlet/GrailsFlashScopeSpec.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/servlet/GrailsFlashScopeSpec.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/servlet/GrailsFlashScopeSpec.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/servlet/GrailsFlashScopeSpec.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/servlet/mvc/SynchronizerTokensHolderTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/servlet/mvc/SynchronizerTokensHolderTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/servlet/mvc/SynchronizerTokensHolderTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/servlet/mvc/SynchronizerTokensHolderTests.groovy diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/servlet/view/GroovyPageViewTests.groovy b/grace-test-suite-web/src/test/groovy/org/grails/web/servlet/view/GroovyPageViewTests.groovy similarity index 100% rename from grails-test-suite-web/src/test/groovy/org/grails/web/servlet/view/GroovyPageViewTests.groovy rename to grace-test-suite-web/src/test/groovy/org/grails/web/servlet/view/GroovyPageViewTests.groovy diff --git a/grails-test-suite-web/src/test/resources/application.properties b/grace-test-suite-web/src/test/resources/application.properties similarity index 100% rename from grails-test-suite-web/src/test/resources/application.properties rename to grace-test-suite-web/src/test/resources/application.properties diff --git a/grails-test-support/build.gradle b/grace-test-support/build.gradle similarity index 63% rename from grails-test-support/build.gradle rename to grace-test-support/build.gradle index 8cb0ed5589..551779a369 100755 --- a/grails-test-support/build.gradle +++ b/grace-test-support/build.gradle @@ -1,12 +1,14 @@ +apply plugin: 'groovy' + dependencies { - api project(":grails-plugin-codecs") - api project(":grails-plugin-core") - api project(":grails-plugin-databinding") - api project(":grails-plugin-domain-class") - api project(":grails-plugin-i18n") - api project(":grails-plugin-interceptors") - api project(":grails-plugin-rest") - api project(":grails-test") + api project(":grace-plugin-codecs") + api project(":grace-plugin-core") + api project(":grace-plugin-databinding") + api project(":grace-plugin-domain-class") + api project(":grace-plugin-i18n") + api project(":grace-plugin-interceptors") + api project(":grace-plugin-rest") + api project(":grace-test") api libs.grails.plugin.async, { exclude module: 'grails-plugin-controllers' diff --git a/grails-test-support/src/main/groovy/grails/testing/gorm/DataTest.groovy b/grace-test-support/src/main/groovy/grails/testing/gorm/DataTest.groovy similarity index 100% rename from grails-test-support/src/main/groovy/grails/testing/gorm/DataTest.groovy rename to grace-test-support/src/main/groovy/grails/testing/gorm/DataTest.groovy diff --git a/grails-test-support/src/main/groovy/grails/testing/gorm/DomainUnitTest.groovy b/grace-test-support/src/main/groovy/grails/testing/gorm/DomainUnitTest.groovy similarity index 100% rename from grails-test-support/src/main/groovy/grails/testing/gorm/DomainUnitTest.groovy rename to grace-test-support/src/main/groovy/grails/testing/gorm/DomainUnitTest.groovy diff --git a/grails-test-support/src/main/groovy/grails/testing/mixin/integration/Integration.groovy b/grace-test-support/src/main/groovy/grails/testing/mixin/integration/Integration.groovy similarity index 100% rename from grails-test-support/src/main/groovy/grails/testing/mixin/integration/Integration.groovy rename to grace-test-support/src/main/groovy/grails/testing/mixin/integration/Integration.groovy diff --git a/grails-test-support/src/main/groovy/grails/testing/services/ServiceUnitTest.groovy b/grace-test-support/src/main/groovy/grails/testing/services/ServiceUnitTest.groovy similarity index 100% rename from grails-test-support/src/main/groovy/grails/testing/services/ServiceUnitTest.groovy rename to grace-test-support/src/main/groovy/grails/testing/services/ServiceUnitTest.groovy diff --git a/grails-test-support/src/main/groovy/grails/testing/spock/OnceBefore.groovy b/grace-test-support/src/main/groovy/grails/testing/spock/OnceBefore.groovy similarity index 100% rename from grails-test-support/src/main/groovy/grails/testing/spock/OnceBefore.groovy rename to grace-test-support/src/main/groovy/grails/testing/spock/OnceBefore.groovy diff --git a/grails-test-support/src/main/groovy/grails/testing/spock/RunOnce.groovy b/grace-test-support/src/main/groovy/grails/testing/spock/RunOnce.groovy similarity index 100% rename from grails-test-support/src/main/groovy/grails/testing/spock/RunOnce.groovy rename to grace-test-support/src/main/groovy/grails/testing/spock/RunOnce.groovy diff --git a/grails-test-support/src/main/groovy/grails/testing/spring/AutowiredTest.groovy b/grace-test-support/src/main/groovy/grails/testing/spring/AutowiredTest.groovy similarity index 100% rename from grails-test-support/src/main/groovy/grails/testing/spring/AutowiredTest.groovy rename to grace-test-support/src/main/groovy/grails/testing/spring/AutowiredTest.groovy diff --git a/grails-test-support/src/main/groovy/grails/testing/web/GrailsWebUnitTest.groovy b/grace-test-support/src/main/groovy/grails/testing/web/GrailsWebUnitTest.groovy similarity index 100% rename from grails-test-support/src/main/groovy/grails/testing/web/GrailsWebUnitTest.groovy rename to grace-test-support/src/main/groovy/grails/testing/web/GrailsWebUnitTest.groovy diff --git a/grails-test-support/src/main/groovy/grails/testing/web/UrlMappingsUnitTest.groovy b/grace-test-support/src/main/groovy/grails/testing/web/UrlMappingsUnitTest.groovy similarity index 100% rename from grails-test-support/src/main/groovy/grails/testing/web/UrlMappingsUnitTest.groovy rename to grace-test-support/src/main/groovy/grails/testing/web/UrlMappingsUnitTest.groovy diff --git a/grails-test-support/src/main/groovy/grails/testing/web/controllers/ControllerUnitTest.groovy b/grace-test-support/src/main/groovy/grails/testing/web/controllers/ControllerUnitTest.groovy similarity index 100% rename from grails-test-support/src/main/groovy/grails/testing/web/controllers/ControllerUnitTest.groovy rename to grace-test-support/src/main/groovy/grails/testing/web/controllers/ControllerUnitTest.groovy diff --git a/grails-test-support/src/main/groovy/grails/testing/web/interceptor/InterceptorUnitTest.groovy b/grace-test-support/src/main/groovy/grails/testing/web/interceptor/InterceptorUnitTest.groovy similarity index 100% rename from grails-test-support/src/main/groovy/grails/testing/web/interceptor/InterceptorUnitTest.groovy rename to grace-test-support/src/main/groovy/grails/testing/web/interceptor/InterceptorUnitTest.groovy diff --git a/grails-test-support/src/main/groovy/grails/testing/web/taglib/TagLibUnitTest.groovy b/grace-test-support/src/main/groovy/grails/testing/web/taglib/TagLibUnitTest.groovy similarity index 100% rename from grails-test-support/src/main/groovy/grails/testing/web/taglib/TagLibUnitTest.groovy rename to grace-test-support/src/main/groovy/grails/testing/web/taglib/TagLibUnitTest.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/compiler/injection/testing/IntegrationTestMixinTransformation.groovy b/grace-test-support/src/main/groovy/org/grails/compiler/injection/testing/IntegrationTestMixinTransformation.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/compiler/injection/testing/IntegrationTestMixinTransformation.groovy rename to grace-test-support/src/main/groovy/org/grails/compiler/injection/testing/IntegrationTestMixinTransformation.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/GrailsApplicationBuilder.groovy b/grace-test-support/src/main/groovy/org/grails/testing/GrailsApplicationBuilder.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/GrailsApplicationBuilder.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/GrailsApplicationBuilder.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/GrailsUnitTest.groovy b/grace-test-support/src/main/groovy/org/grails/testing/GrailsUnitTest.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/GrailsUnitTest.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/GrailsUnitTest.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/ParameterizedGrailsUnitTest.groovy b/grace-test-support/src/main/groovy/org/grails/testing/ParameterizedGrailsUnitTest.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/ParameterizedGrailsUnitTest.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/ParameterizedGrailsUnitTest.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/context/junit4/GrailsJunit4ClassRunner.groovy b/grace-test-support/src/main/groovy/org/grails/testing/context/junit4/GrailsJunit4ClassRunner.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/context/junit4/GrailsJunit4ClassRunner.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/context/junit4/GrailsJunit4ClassRunner.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/context/junit4/GrailsTestConfiguration.java b/grace-test-support/src/main/groovy/org/grails/testing/context/junit4/GrailsTestConfiguration.java similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/context/junit4/GrailsTestConfiguration.java rename to grace-test-support/src/main/groovy/org/grails/testing/context/junit4/GrailsTestConfiguration.java diff --git a/grails-test-support/src/main/groovy/org/grails/testing/gorm/MockCascadingDomainClassValidator.groovy b/grace-test-support/src/main/groovy/org/grails/testing/gorm/MockCascadingDomainClassValidator.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/gorm/MockCascadingDomainClassValidator.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/gorm/MockCascadingDomainClassValidator.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupInterceptor.groovy b/grace-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupInterceptor.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupInterceptor.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupInterceptor.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupSpecInterceptor.groovy b/grace-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupSpecInterceptor.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupSpecInterceptor.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestCleanupSpecInterceptor.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupInterceptor.groovy b/grace-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupInterceptor.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupInterceptor.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupInterceptor.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupSpecInterceptor.groovy b/grace-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupSpecInterceptor.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupSpecInterceptor.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/gorm/spock/DataTestSetupSpecInterceptor.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/gorm/spock/GormTestingSupportExtension.groovy b/grace-test-support/src/main/groovy/org/grails/testing/gorm/spock/GormTestingSupportExtension.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/gorm/spock/GormTestingSupportExtension.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/gorm/spock/GormTestingSupportExtension.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/runtime/support/ActionSettingMethodHandler.groovy b/grace-test-support/src/main/groovy/org/grails/testing/runtime/support/ActionSettingMethodHandler.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/runtime/support/ActionSettingMethodHandler.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/runtime/support/ActionSettingMethodHandler.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/runtime/support/GroovyPageUnitTestResourceLoader.java b/grace-test-support/src/main/groovy/org/grails/testing/runtime/support/GroovyPageUnitTestResourceLoader.java similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/runtime/support/GroovyPageUnitTestResourceLoader.java rename to grace-test-support/src/main/groovy/org/grails/testing/runtime/support/GroovyPageUnitTestResourceLoader.java diff --git a/grails-test-support/src/main/groovy/org/grails/testing/runtime/support/LazyTagLibraryLookup.java b/grace-test-support/src/main/groovy/org/grails/testing/runtime/support/LazyTagLibraryLookup.java similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/runtime/support/LazyTagLibraryLookup.java rename to grace-test-support/src/main/groovy/org/grails/testing/runtime/support/LazyTagLibraryLookup.java diff --git a/grails-test-support/src/main/groovy/org/grails/testing/spock/AutowiredInterceptor.groovy b/grace-test-support/src/main/groovy/org/grails/testing/spock/AutowiredInterceptor.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/spock/AutowiredInterceptor.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/spock/AutowiredInterceptor.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/spock/CleanupContextInterceptor.groovy b/grace-test-support/src/main/groovy/org/grails/testing/spock/CleanupContextInterceptor.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/spock/CleanupContextInterceptor.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/spock/CleanupContextInterceptor.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/spock/InterceptorSetupSpecInterceptor.groovy b/grace-test-support/src/main/groovy/org/grails/testing/spock/InterceptorSetupSpecInterceptor.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/spock/InterceptorSetupSpecInterceptor.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/spock/InterceptorSetupSpecInterceptor.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/spock/RunOnceExtension.groovy b/grace-test-support/src/main/groovy/org/grails/testing/spock/RunOnceExtension.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/spock/RunOnceExtension.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/spock/RunOnceExtension.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/spock/RunOnceInterceptor.groovy b/grace-test-support/src/main/groovy/org/grails/testing/spock/RunOnceInterceptor.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/spock/RunOnceInterceptor.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/spock/RunOnceInterceptor.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/spock/TestingSupportExtension.groovy b/grace-test-support/src/main/groovy/org/grails/testing/spock/TestingSupportExtension.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/spock/TestingSupportExtension.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/spock/TestingSupportExtension.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/spock/UrlMappingSetupSpecInterceptor.groovy b/grace-test-support/src/main/groovy/org/grails/testing/spock/UrlMappingSetupSpecInterceptor.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/spock/UrlMappingSetupSpecInterceptor.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/spock/UrlMappingSetupSpecInterceptor.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/spock/WebCleanupInterceptor.groovy b/grace-test-support/src/main/groovy/org/grails/testing/spock/WebCleanupInterceptor.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/spock/WebCleanupInterceptor.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/spock/WebCleanupInterceptor.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/spock/WebCleanupSpecInterceptor.groovy b/grace-test-support/src/main/groovy/org/grails/testing/spock/WebCleanupSpecInterceptor.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/spock/WebCleanupSpecInterceptor.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/spock/WebCleanupSpecInterceptor.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/spock/WebSetupInterceptor.groovy b/grace-test-support/src/main/groovy/org/grails/testing/spock/WebSetupInterceptor.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/spock/WebSetupInterceptor.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/spock/WebSetupInterceptor.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/spock/WebSetupSpecInterceptor.groovy b/grace-test-support/src/main/groovy/org/grails/testing/spock/WebSetupSpecInterceptor.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/spock/WebSetupSpecInterceptor.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/spock/WebSetupSpecInterceptor.groovy diff --git a/grails-test-support/src/main/groovy/org/grails/testing/spock/WebTestingSupportExtension.groovy b/grace-test-support/src/main/groovy/org/grails/testing/spock/WebTestingSupportExtension.groovy similarity index 100% rename from grails-test-support/src/main/groovy/org/grails/testing/spock/WebTestingSupportExtension.groovy rename to grace-test-support/src/main/groovy/org/grails/testing/spock/WebTestingSupportExtension.groovy diff --git a/grails-test-support/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension b/grace-test-support/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension similarity index 100% rename from grails-test-support/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension rename to grace-test-support/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension diff --git a/grails-test-support/src/test/groovy/grails/testing/spock/OnceBeforeSpec.groovy b/grace-test-support/src/test/groovy/grails/testing/spock/OnceBeforeSpec.groovy similarity index 100% rename from grails-test-support/src/test/groovy/grails/testing/spock/OnceBeforeSpec.groovy rename to grace-test-support/src/test/groovy/grails/testing/spock/OnceBeforeSpec.groovy diff --git a/grails-test-support/src/test/groovy/grails/testing/spock/RunOnceSpec.groovy b/grace-test-support/src/test/groovy/grails/testing/spock/RunOnceSpec.groovy similarity index 100% rename from grails-test-support/src/test/groovy/grails/testing/spock/RunOnceSpec.groovy rename to grace-test-support/src/test/groovy/grails/testing/spock/RunOnceSpec.groovy diff --git a/grace-test/README.md b/grace-test/README.md new file mode 100644 index 0000000000..b47cc05755 --- /dev/null +++ b/grace-test/README.md @@ -0,0 +1,2 @@ +## grace-test + diff --git a/grails-test/build.gradle b/grace-test/build.gradle similarity index 68% rename from grails-test/build.gradle rename to grace-test/build.gradle index 79796d09cb..e814037d5a 100644 --- a/grails-test/build.gradle +++ b/grace-test/build.gradle @@ -1,8 +1,8 @@ dependencies { - api project(":grails-boot") - api project(":grails-plugin-converters") - api project(":grails-plugin-mimetypes") - api project(":grails-web") + api project(":grace-boot") + api project(":grace-plugin-converters") + api project(":grace-plugin-mimetypes") + api project(":grace-web") api libs.ant api libs.ant.junit diff --git a/grails-test/src/main/groovy/grails/boot/test/GrailsApplicationContextLoader.groovy b/grace-test/src/main/groovy/grails/boot/test/GrailsApplicationContextLoader.groovy similarity index 100% rename from grails-test/src/main/groovy/grails/boot/test/GrailsApplicationContextLoader.groovy rename to grace-test/src/main/groovy/grails/boot/test/GrailsApplicationContextLoader.groovy diff --git a/grails-test/src/main/groovy/grails/test/AbstractClosureProxy.java b/grace-test/src/main/groovy/grails/test/AbstractClosureProxy.java similarity index 100% rename from grails-test/src/main/groovy/grails/test/AbstractClosureProxy.java rename to grace-test/src/main/groovy/grails/test/AbstractClosureProxy.java diff --git a/grails-test/src/main/groovy/grails/test/MockClosureProxy.java b/grace-test/src/main/groovy/grails/test/MockClosureProxy.java similarity index 100% rename from grails-test/src/main/groovy/grails/test/MockClosureProxy.java rename to grace-test/src/main/groovy/grails/test/MockClosureProxy.java diff --git a/grails-test/src/main/groovy/grails/util/GrailsWebMockUtil.groovy b/grace-test/src/main/groovy/grails/util/GrailsWebMockUtil.groovy similarity index 100% rename from grails-test/src/main/groovy/grails/util/GrailsWebMockUtil.groovy rename to grace-test/src/main/groovy/grails/util/GrailsWebMockUtil.groovy diff --git a/grails-test/src/main/groovy/org/grails/plugins/MockGrailsApplication.java b/grace-test/src/main/groovy/org/grails/plugins/MockGrailsApplication.java similarity index 100% rename from grails-test/src/main/groovy/org/grails/plugins/MockGrailsApplication.java rename to grace-test/src/main/groovy/org/grails/plugins/MockGrailsApplication.java diff --git a/grails-test/src/main/groovy/org/grails/plugins/MockGrailsPluginManager.java b/grace-test/src/main/groovy/org/grails/plugins/MockGrailsPluginManager.java similarity index 100% rename from grails-test/src/main/groovy/org/grails/plugins/MockGrailsPluginManager.java rename to grace-test/src/main/groovy/org/grails/plugins/MockGrailsPluginManager.java diff --git a/grails-test/src/main/groovy/org/grails/plugins/testing/AbstractGrailsMockHttpServletResponse.groovy b/grace-test/src/main/groovy/org/grails/plugins/testing/AbstractGrailsMockHttpServletResponse.groovy similarity index 100% rename from grails-test/src/main/groovy/org/grails/plugins/testing/AbstractGrailsMockHttpServletResponse.groovy rename to grace-test/src/main/groovy/org/grails/plugins/testing/AbstractGrailsMockHttpServletResponse.groovy diff --git a/grails-test/src/main/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequest.groovy b/grace-test/src/main/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequest.groovy similarity index 100% rename from grails-test/src/main/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequest.groovy rename to grace-test/src/main/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequest.groovy diff --git a/grails-test/src/main/groovy/org/grails/plugins/testing/GrailsMockHttpServletResponse.java b/grace-test/src/main/groovy/org/grails/plugins/testing/GrailsMockHttpServletResponse.java similarity index 100% rename from grails-test/src/main/groovy/org/grails/plugins/testing/GrailsMockHttpServletResponse.java rename to grace-test/src/main/groovy/org/grails/plugins/testing/GrailsMockHttpServletResponse.java diff --git a/grails-test/src/main/groovy/org/grails/plugins/testing/GrailsMockHttpSession.groovy b/grace-test/src/main/groovy/org/grails/plugins/testing/GrailsMockHttpSession.groovy similarity index 100% rename from grails-test/src/main/groovy/org/grails/plugins/testing/GrailsMockHttpSession.groovy rename to grace-test/src/main/groovy/org/grails/plugins/testing/GrailsMockHttpSession.groovy diff --git a/grails-test/src/main/groovy/org/grails/plugins/testing/GrailsMockMultipartFile.java b/grace-test/src/main/groovy/org/grails/plugins/testing/GrailsMockMultipartFile.java similarity index 100% rename from grails-test/src/main/groovy/org/grails/plugins/testing/GrailsMockMultipartFile.java rename to grace-test/src/main/groovy/org/grails/plugins/testing/GrailsMockMultipartFile.java diff --git a/grails-test/src/main/groovy/org/grails/support/MockApplicationContext.java b/grace-test/src/main/groovy/org/grails/support/MockApplicationContext.java similarity index 100% rename from grails-test/src/main/groovy/org/grails/support/MockApplicationContext.java rename to grace-test/src/main/groovy/org/grails/support/MockApplicationContext.java diff --git a/grails-test/src/main/groovy/org/grails/test/io/MultiplexingOutputStream.groovy b/grace-test/src/main/groovy/org/grails/test/io/MultiplexingOutputStream.groovy similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/io/MultiplexingOutputStream.groovy rename to grace-test/src/main/groovy/org/grails/test/io/MultiplexingOutputStream.groovy diff --git a/grails-test/src/main/groovy/org/grails/test/io/SystemOutAndErrSwapper.groovy b/grace-test/src/main/groovy/org/grails/test/io/SystemOutAndErrSwapper.groovy similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/io/SystemOutAndErrSwapper.groovy rename to grace-test/src/main/groovy/org/grails/test/io/SystemOutAndErrSwapper.groovy diff --git a/grails-test/src/main/groovy/org/grails/test/report/junit/JUnitReports.java b/grace-test/src/main/groovy/org/grails/test/report/junit/JUnitReports.java similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/report/junit/JUnitReports.java rename to grace-test/src/main/groovy/org/grails/test/report/junit/JUnitReports.java diff --git a/grails-test/src/main/groovy/org/grails/test/report/junit/JUnitReportsFactory.java b/grace-test/src/main/groovy/org/grails/test/report/junit/JUnitReportsFactory.java similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/report/junit/JUnitReportsFactory.java rename to grace-test/src/main/groovy/org/grails/test/report/junit/JUnitReportsFactory.java diff --git a/grails-test/src/main/groovy/org/grails/test/report/junit/PlainFormatter.java b/grace-test/src/main/groovy/org/grails/test/report/junit/PlainFormatter.java similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/report/junit/PlainFormatter.java rename to grace-test/src/main/groovy/org/grails/test/report/junit/PlainFormatter.java diff --git a/grails-test/src/main/groovy/org/grails/test/report/junit/XMLFormatter.java b/grace-test/src/main/groovy/org/grails/test/report/junit/XMLFormatter.java similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/report/junit/XMLFormatter.java rename to grace-test/src/main/groovy/org/grails/test/report/junit/XMLFormatter.java diff --git a/grails-test/src/main/groovy/org/grails/test/spock/IntegrationSpecConfigurerExtension.groovy b/grace-test/src/main/groovy/org/grails/test/spock/IntegrationSpecConfigurerExtension.groovy similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/spock/IntegrationSpecConfigurerExtension.groovy rename to grace-test/src/main/groovy/org/grails/test/spock/IntegrationSpecConfigurerExtension.groovy diff --git a/grails-test/src/main/groovy/org/grails/test/support/ControllerNameExtractor.groovy b/grace-test/src/main/groovy/org/grails/test/support/ControllerNameExtractor.groovy similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/support/ControllerNameExtractor.groovy rename to grace-test/src/main/groovy/org/grails/test/support/ControllerNameExtractor.groovy diff --git a/grails-test/src/main/groovy/org/grails/test/support/GrailsTestAutowirer.groovy b/grace-test/src/main/groovy/org/grails/test/support/GrailsTestAutowirer.groovy similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/support/GrailsTestAutowirer.groovy rename to grace-test/src/main/groovy/org/grails/test/support/GrailsTestAutowirer.groovy diff --git a/grails-test/src/main/groovy/org/grails/test/support/GrailsTestInterceptor.groovy b/grace-test/src/main/groovy/org/grails/test/support/GrailsTestInterceptor.groovy similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/support/GrailsTestInterceptor.groovy rename to grace-test/src/main/groovy/org/grails/test/support/GrailsTestInterceptor.groovy diff --git a/grails-test/src/main/groovy/org/grails/test/support/GrailsTestMode.groovy b/grace-test/src/main/groovy/org/grails/test/support/GrailsTestMode.groovy similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/support/GrailsTestMode.groovy rename to grace-test/src/main/groovy/org/grails/test/support/GrailsTestMode.groovy diff --git a/grails-test/src/main/groovy/org/grails/test/support/GrailsTestRequestEnvironmentInterceptor.groovy b/grace-test/src/main/groovy/org/grails/test/support/GrailsTestRequestEnvironmentInterceptor.groovy similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/support/GrailsTestRequestEnvironmentInterceptor.groovy rename to grace-test/src/main/groovy/org/grails/test/support/GrailsTestRequestEnvironmentInterceptor.groovy diff --git a/grails-test/src/main/groovy/org/grails/test/support/GrailsTestTransactionInterceptor.groovy b/grace-test/src/main/groovy/org/grails/test/support/GrailsTestTransactionInterceptor.groovy similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/support/GrailsTestTransactionInterceptor.groovy rename to grace-test/src/main/groovy/org/grails/test/support/GrailsTestTransactionInterceptor.groovy diff --git a/grails-test/src/main/groovy/org/grails/test/support/TestStacktraceSanitizer.java b/grace-test/src/main/groovy/org/grails/test/support/TestStacktraceSanitizer.java similarity index 100% rename from grails-test/src/main/groovy/org/grails/test/support/TestStacktraceSanitizer.java rename to grace-test/src/main/groovy/org/grails/test/support/TestStacktraceSanitizer.java diff --git a/grails-util/README.md b/grace-util/README.md similarity index 53% rename from grails-util/README.md rename to grace-util/README.md index 43168e56aa..b99d453341 100644 --- a/grails-util/README.md +++ b/grace-util/README.md @@ -1,3 +1,3 @@ -## grails-util +## grace-util Grails Utilities \ No newline at end of file diff --git a/grails-util/build.gradle b/grace-util/build.gradle similarity index 100% rename from grails-util/build.gradle rename to grace-util/build.gradle diff --git a/grails-util/src/main/groovy/grails/util/ClosureToMapPopulator.java b/grace-util/src/main/groovy/grails/util/ClosureToMapPopulator.java similarity index 100% rename from grails-util/src/main/groovy/grails/util/ClosureToMapPopulator.java rename to grace-util/src/main/groovy/grails/util/ClosureToMapPopulator.java diff --git a/grails-util/src/main/groovy/grails/util/CollectionUtils.java b/grace-util/src/main/groovy/grails/util/CollectionUtils.java similarity index 100% rename from grails-util/src/main/groovy/grails/util/CollectionUtils.java rename to grace-util/src/main/groovy/grails/util/CollectionUtils.java diff --git a/grails-util/src/main/groovy/grails/util/DomainBuilder.java b/grace-util/src/main/groovy/grails/util/DomainBuilder.java similarity index 100% rename from grails-util/src/main/groovy/grails/util/DomainBuilder.java rename to grace-util/src/main/groovy/grails/util/DomainBuilder.java diff --git a/grails-util/src/main/groovy/grails/util/ExtendedProxy.java b/grace-util/src/main/groovy/grails/util/ExtendedProxy.java similarity index 100% rename from grails-util/src/main/groovy/grails/util/ExtendedProxy.java rename to grace-util/src/main/groovy/grails/util/ExtendedProxy.java diff --git a/grails-util/src/main/groovy/grails/util/GrailsArrayUtils.groovy b/grace-util/src/main/groovy/grails/util/GrailsArrayUtils.groovy similarity index 100% rename from grails-util/src/main/groovy/grails/util/GrailsArrayUtils.groovy rename to grace-util/src/main/groovy/grails/util/GrailsArrayUtils.groovy diff --git a/grails-util/src/main/groovy/grails/util/GrailsClassUtils.java b/grace-util/src/main/groovy/grails/util/GrailsClassUtils.java similarity index 100% rename from grails-util/src/main/groovy/grails/util/GrailsClassUtils.java rename to grace-util/src/main/groovy/grails/util/GrailsClassUtils.java diff --git a/grails-util/src/main/groovy/grails/util/GrailsMetaClassUtils.java b/grace-util/src/main/groovy/grails/util/GrailsMetaClassUtils.java similarity index 100% rename from grails-util/src/main/groovy/grails/util/GrailsMetaClassUtils.java rename to grace-util/src/main/groovy/grails/util/GrailsMetaClassUtils.java diff --git a/grails-util/src/main/groovy/grails/util/GrailsNameUtils.java b/grace-util/src/main/groovy/grails/util/GrailsNameUtils.java similarity index 100% rename from grails-util/src/main/groovy/grails/util/GrailsNameUtils.java rename to grace-util/src/main/groovy/grails/util/GrailsNameUtils.java diff --git a/grails-util/src/main/groovy/grails/util/GrailsStringUtils.groovy b/grace-util/src/main/groovy/grails/util/GrailsStringUtils.groovy similarity index 100% rename from grails-util/src/main/groovy/grails/util/GrailsStringUtils.groovy rename to grace-util/src/main/groovy/grails/util/GrailsStringUtils.groovy diff --git a/grails-util/src/main/groovy/org/grails/core/util/IncludeExcludeSupport.groovy b/grace-util/src/main/groovy/org/grails/core/util/IncludeExcludeSupport.groovy similarity index 100% rename from grails-util/src/main/groovy/org/grails/core/util/IncludeExcludeSupport.groovy rename to grace-util/src/main/groovy/org/grails/core/util/IncludeExcludeSupport.groovy diff --git a/grails-util/src/test/groovy/grails/util/ClosureToMapPopulatorTests.groovy b/grace-util/src/test/groovy/grails/util/ClosureToMapPopulatorTests.groovy similarity index 100% rename from grails-util/src/test/groovy/grails/util/ClosureToMapPopulatorTests.groovy rename to grace-util/src/test/groovy/grails/util/ClosureToMapPopulatorTests.groovy diff --git a/grails-util/src/test/groovy/grails/util/CollectionUtilsTests.groovy b/grace-util/src/test/groovy/grails/util/CollectionUtilsTests.groovy similarity index 100% rename from grails-util/src/test/groovy/grails/util/CollectionUtilsTests.groovy rename to grace-util/src/test/groovy/grails/util/CollectionUtilsTests.groovy diff --git a/grails-util/src/test/groovy/grails/util/DomainBuilderTests.java b/grace-util/src/test/groovy/grails/util/DomainBuilderTests.java similarity index 100% rename from grails-util/src/test/groovy/grails/util/DomainBuilderTests.java rename to grace-util/src/test/groovy/grails/util/DomainBuilderTests.java diff --git a/grails-util/src/test/groovy/grails/util/GrailsArrayUtilsSpec.groovy b/grace-util/src/test/groovy/grails/util/GrailsArrayUtilsSpec.groovy similarity index 100% rename from grails-util/src/test/groovy/grails/util/GrailsArrayUtilsSpec.groovy rename to grace-util/src/test/groovy/grails/util/GrailsArrayUtilsSpec.groovy diff --git a/grails-util/src/test/groovy/grails/util/GrailsClassUtilsTests.java b/grace-util/src/test/groovy/grails/util/GrailsClassUtilsTests.java similarity index 100% rename from grails-util/src/test/groovy/grails/util/GrailsClassUtilsTests.java rename to grace-util/src/test/groovy/grails/util/GrailsClassUtilsTests.java diff --git a/grails-util/src/test/groovy/grails/util/GrailsMetaClassUtilsSpec.groovy b/grace-util/src/test/groovy/grails/util/GrailsMetaClassUtilsSpec.groovy similarity index 100% rename from grails-util/src/test/groovy/grails/util/GrailsMetaClassUtilsSpec.groovy rename to grace-util/src/test/groovy/grails/util/GrailsMetaClassUtilsSpec.groovy diff --git a/grails-util/src/test/groovy/grails/util/GrailsMetaClassUtilsTests.groovy b/grace-util/src/test/groovy/grails/util/GrailsMetaClassUtilsTests.groovy similarity index 100% rename from grails-util/src/test/groovy/grails/util/GrailsMetaClassUtilsTests.groovy rename to grace-util/src/test/groovy/grails/util/GrailsMetaClassUtilsTests.groovy diff --git a/grails-util/src/test/groovy/grails/util/GrailsNameUtilsTests.groovy b/grace-util/src/test/groovy/grails/util/GrailsNameUtilsTests.groovy similarity index 100% rename from grails-util/src/test/groovy/grails/util/GrailsNameUtilsTests.groovy rename to grace-util/src/test/groovy/grails/util/GrailsNameUtilsTests.groovy diff --git a/grails-util/src/test/groovy/grails/util/GrailsStringUtilsSpec.groovy b/grace-util/src/test/groovy/grails/util/GrailsStringUtilsSpec.groovy similarity index 100% rename from grails-util/src/test/groovy/grails/util/GrailsStringUtilsSpec.groovy rename to grace-util/src/test/groovy/grails/util/GrailsStringUtilsSpec.groovy diff --git a/grails-util/src/test/groovy/grails/util/SomeGroovyClass.groovy b/grace-util/src/test/groovy/grails/util/SomeGroovyClass.groovy similarity index 100% rename from grails-util/src/test/groovy/grails/util/SomeGroovyClass.groovy rename to grace-util/src/test/groovy/grails/util/SomeGroovyClass.groovy diff --git a/grails-util/src/test/groovy/grails/util/TestBean.java b/grace-util/src/test/groovy/grails/util/TestBean.java similarity index 100% rename from grails-util/src/test/groovy/grails/util/TestBean.java rename to grace-util/src/test/groovy/grails/util/TestBean.java diff --git a/grace-web-boot/README.md b/grace-web-boot/README.md new file mode 100644 index 0000000000..4303496e98 --- /dev/null +++ b/grace-web-boot/README.md @@ -0,0 +1,2 @@ +## grace-web-boot + diff --git a/grace-web-boot/build.gradle b/grace-web-boot/build.gradle new file mode 100644 index 0000000000..998296d1cc --- /dev/null +++ b/grace-web-boot/build.gradle @@ -0,0 +1,9 @@ +dependencies { + api project(":grace-web-common") + + api libs.javax.servlet + testImplementation project(":grace-plugin-controllers") + testImplementation libs.tomcat.embed.core + testRuntimeOnly project(":grace-plugin-i18n") + testRuntimeOnly project(":grace-plugin-url-mappings") +} diff --git a/grails-web-boot/src/main/groovy/org/grails/boot/context/web/.gitkeep b/grace-web-boot/src/main/groovy/org/grails/boot/context/web/.gitkeep similarity index 100% rename from grails-web-boot/src/main/groovy/org/grails/boot/context/web/.gitkeep rename to grace-web-boot/src/main/groovy/org/grails/boot/context/web/.gitkeep diff --git a/grails-web-boot/src/main/groovy/org/grails/compiler/boot/.gitkeep b/grace-web-boot/src/main/groovy/org/grails/compiler/boot/.gitkeep similarity index 100% rename from grails-web-boot/src/main/groovy/org/grails/compiler/boot/.gitkeep rename to grace-web-boot/src/main/groovy/org/grails/compiler/boot/.gitkeep diff --git a/grails-web-boot/src/test/groovy/grails/boot/.gitkeep b/grace-web-boot/src/test/groovy/grails/boot/.gitkeep similarity index 100% rename from grails-web-boot/src/test/groovy/grails/boot/.gitkeep rename to grace-web-boot/src/test/groovy/grails/boot/.gitkeep diff --git a/grails-web-boot/src/test/groovy/org/grails/.gitkeep b/grace-web-boot/src/test/groovy/org/grails/.gitkeep similarity index 100% rename from grails-web-boot/src/test/groovy/org/grails/.gitkeep rename to grace-web-boot/src/test/groovy/org/grails/.gitkeep diff --git a/grace-web-common/README.md b/grace-web-common/README.md new file mode 100644 index 0000000000..fe250ed2d4 --- /dev/null +++ b/grace-web-common/README.md @@ -0,0 +1,2 @@ +## grace-web-common + diff --git a/grails-web-common/build.gradle b/grace-web-common/build.gradle similarity index 61% rename from grails-web-common/build.gradle rename to grace-web-common/build.gradle index 493aeaf870..19ed870508 100644 --- a/grails-web-common/build.gradle +++ b/grace-web-common/build.gradle @@ -1,9 +1,9 @@ dependencies { - api project(":grails-api") - api project(":grails-core") - api project(":grails-databinding") - api project(":grails-encoder") - api project(":grails-util") + api project(":grace-api") + api project(":grace-core") + api project(":grace-databinding") + api project(":grace-encoder") + api project(":grace-util") api libs.grails.gsp, { exclude group:'org.grails', module:'grails-core' @@ -17,5 +17,5 @@ dependencies { compileOnly libs.jsr305 implementation libs.caffeine - testImplementation project(":grails-test") + testImplementation project(":grace-test") } diff --git a/grails-web-common/src/main/groovy/grails/util/GrailsWebUtil.java b/grace-web-common/src/main/groovy/grails/util/GrailsWebUtil.java similarity index 100% rename from grails-web-common/src/main/groovy/grails/util/GrailsWebUtil.java rename to grace-web-common/src/main/groovy/grails/util/GrailsWebUtil.java diff --git a/grails-web-common/src/main/groovy/grails/web/RequestParameter.java b/grace-web-common/src/main/groovy/grails/web/RequestParameter.java similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/RequestParameter.java rename to grace-web-common/src/main/groovy/grails/web/RequestParameter.java diff --git a/grails-web-common/src/main/groovy/grails/web/api/ServletAttributes.groovy b/grace-web-common/src/main/groovy/grails/web/api/ServletAttributes.groovy similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/api/ServletAttributes.groovy rename to grace-web-common/src/main/groovy/grails/web/api/ServletAttributes.groovy diff --git a/grails-web-common/src/main/groovy/grails/web/api/WebAttributes.groovy b/grace-web-common/src/main/groovy/grails/web/api/WebAttributes.groovy similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/api/WebAttributes.groovy rename to grace-web-common/src/main/groovy/grails/web/api/WebAttributes.groovy diff --git a/grails-web-common/src/main/groovy/grails/web/context/ServletContextHolder.java b/grace-web-common/src/main/groovy/grails/web/context/ServletContextHolder.java similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/context/ServletContextHolder.java rename to grace-web-common/src/main/groovy/grails/web/context/ServletContextHolder.java diff --git a/grails-web-common/src/main/groovy/grails/web/context/WebRequestServletHolder.java b/grace-web-common/src/main/groovy/grails/web/context/WebRequestServletHolder.java similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/context/WebRequestServletHolder.java rename to grace-web-common/src/main/groovy/grails/web/context/WebRequestServletHolder.java diff --git a/grails-web-common/src/main/groovy/grails/web/controllers/ControllerMethod.java b/grace-web-common/src/main/groovy/grails/web/controllers/ControllerMethod.java similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/controllers/ControllerMethod.java rename to grace-web-common/src/main/groovy/grails/web/controllers/ControllerMethod.java diff --git a/grails-web-common/src/main/groovy/grails/web/http/HttpHeaders.java b/grace-web-common/src/main/groovy/grails/web/http/HttpHeaders.java similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/http/HttpHeaders.java rename to grace-web-common/src/main/groovy/grails/web/http/HttpHeaders.java diff --git a/grails-web-common/src/main/groovy/grails/web/mime/MimeType.groovy b/grace-web-common/src/main/groovy/grails/web/mime/MimeType.groovy similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/mime/MimeType.groovy rename to grace-web-common/src/main/groovy/grails/web/mime/MimeType.groovy diff --git a/grails-web-common/src/main/groovy/grails/web/mime/MimeTypeProvider.groovy b/grace-web-common/src/main/groovy/grails/web/mime/MimeTypeProvider.groovy similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/mime/MimeTypeProvider.groovy rename to grace-web-common/src/main/groovy/grails/web/mime/MimeTypeProvider.groovy diff --git a/grails-web-common/src/main/groovy/grails/web/mime/MimeTypeResolver.groovy b/grace-web-common/src/main/groovy/grails/web/mime/MimeTypeResolver.groovy similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/mime/MimeTypeResolver.groovy rename to grace-web-common/src/main/groovy/grails/web/mime/MimeTypeResolver.groovy diff --git a/grails-web-common/src/main/groovy/grails/web/mime/MimeTypeUtils.groovy b/grace-web-common/src/main/groovy/grails/web/mime/MimeTypeUtils.groovy similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/mime/MimeTypeUtils.groovy rename to grace-web-common/src/main/groovy/grails/web/mime/MimeTypeUtils.groovy diff --git a/grails-web-common/src/main/groovy/grails/web/mvc/FlashScope.java b/grace-web-common/src/main/groovy/grails/web/mvc/FlashScope.java similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/mvc/FlashScope.java rename to grace-web-common/src/main/groovy/grails/web/mvc/FlashScope.java diff --git a/grails-web-common/src/main/groovy/grails/web/pages/GroovyPagesUriService.java b/grace-web-common/src/main/groovy/grails/web/pages/GroovyPagesUriService.java similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/pages/GroovyPagesUriService.java rename to grace-web-common/src/main/groovy/grails/web/pages/GroovyPagesUriService.java diff --git a/grails-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsHttpSession.java b/grace-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsHttpSession.java similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsHttpSession.java rename to grace-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsHttpSession.java diff --git a/grails-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsParameterMap.java b/grace-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsParameterMap.java similarity index 100% rename from grails-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsParameterMap.java rename to grace-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsParameterMap.java diff --git a/grails-web-common/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreationException.java b/grace-web-common/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreationException.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreationException.java rename to grace-web-common/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreationException.java diff --git a/grails-web-common/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreator.groovy b/grace-web-common/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreator.groovy similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreator.groovy rename to grace-web-common/src/main/groovy/org/grails/databinding/bindingsource/DataBindingSourceCreator.groovy diff --git a/grails-web-common/src/main/groovy/org/grails/web/beans/PropertyEditorRegistryUtils.groovy b/grace-web-common/src/main/groovy/org/grails/web/beans/PropertyEditorRegistryUtils.groovy similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/beans/PropertyEditorRegistryUtils.groovy rename to grace-web-common/src/main/groovy/org/grails/web/beans/PropertyEditorRegistryUtils.groovy diff --git a/grails-web-common/src/main/groovy/org/grails/web/binding/CompositeEditor.java b/grace-web-common/src/main/groovy/org/grails/web/binding/CompositeEditor.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/binding/CompositeEditor.java rename to grace-web-common/src/main/groovy/org/grails/web/binding/CompositeEditor.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/binding/StructuredDateEditor.java b/grace-web-common/src/main/groovy/org/grails/web/binding/StructuredDateEditor.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/binding/StructuredDateEditor.java rename to grace-web-common/src/main/groovy/org/grails/web/binding/StructuredDateEditor.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/binding/StructuredPropertyEditor.java b/grace-web-common/src/main/groovy/org/grails/web/binding/StructuredPropertyEditor.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/binding/StructuredPropertyEditor.java rename to grace-web-common/src/main/groovy/org/grails/web/binding/StructuredPropertyEditor.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/context/ServletEnvironmentGrailsApplicationDiscoveryStrategy.groovy b/grace-web-common/src/main/groovy/org/grails/web/context/ServletEnvironmentGrailsApplicationDiscoveryStrategy.groovy similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/context/ServletEnvironmentGrailsApplicationDiscoveryStrategy.groovy rename to grace-web-common/src/main/groovy/org/grails/web/context/ServletEnvironmentGrailsApplicationDiscoveryStrategy.groovy diff --git a/grails-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DataBindingSourceRegistry.groovy b/grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DataBindingSourceRegistry.groovy similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DataBindingSourceRegistry.groovy rename to grace-web-common/src/main/groovy/org/grails/web/databinding/bindingsource/DataBindingSourceRegistry.groovy diff --git a/grails-web-common/src/main/groovy/org/grails/web/errors/ErrorsViewStackTracePrinter.groovy b/grace-web-common/src/main/groovy/org/grails/web/errors/ErrorsViewStackTracePrinter.groovy similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/errors/ErrorsViewStackTracePrinter.groovy rename to grace-web-common/src/main/groovy/org/grails/web/errors/ErrorsViewStackTracePrinter.groovy diff --git a/grails-web-common/src/main/groovy/org/grails/web/errors/GrailsWrappedRuntimeException.java b/grace-web-common/src/main/groovy/org/grails/web/errors/GrailsWrappedRuntimeException.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/errors/GrailsWrappedRuntimeException.java rename to grace-web-common/src/main/groovy/org/grails/web/errors/GrailsWrappedRuntimeException.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptor.groovy b/grace-web-common/src/main/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptor.groovy similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptor.groovy rename to grace-web-common/src/main/groovy/org/grails/web/i18n/ParamsAwareLocaleChangeInterceptor.groovy diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/JSONArray.java b/grace-web-common/src/main/groovy/org/grails/web/json/JSONArray.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/JSONArray.java rename to grace-web-common/src/main/groovy/org/grails/web/json/JSONArray.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/JSONElement.java b/grace-web-common/src/main/groovy/org/grails/web/json/JSONElement.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/JSONElement.java rename to grace-web-common/src/main/groovy/org/grails/web/json/JSONElement.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/JSONException.java b/grace-web-common/src/main/groovy/org/grails/web/json/JSONException.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/JSONException.java rename to grace-web-common/src/main/groovy/org/grails/web/json/JSONException.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/JSONObject.java b/grace-web-common/src/main/groovy/org/grails/web/json/JSONObject.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/JSONObject.java rename to grace-web-common/src/main/groovy/org/grails/web/json/JSONObject.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/JSONTokener.java b/grace-web-common/src/main/groovy/org/grails/web/json/JSONTokener.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/JSONTokener.java rename to grace-web-common/src/main/groovy/org/grails/web/json/JSONTokener.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/JSONWriter.java b/grace-web-common/src/main/groovy/org/grails/web/json/JSONWriter.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/JSONWriter.java rename to grace-web-common/src/main/groovy/org/grails/web/json/JSONWriter.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/PathCapturingJSONWriterWrapper.java b/grace-web-common/src/main/groovy/org/grails/web/json/PathCapturingJSONWriterWrapper.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/PathCapturingJSONWriterWrapper.java rename to grace-web-common/src/main/groovy/org/grails/web/json/PathCapturingJSONWriterWrapper.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/PrettyPrintJSONWriter.java b/grace-web-common/src/main/groovy/org/grails/web/json/PrettyPrintJSONWriter.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/PrettyPrintJSONWriter.java rename to grace-web-common/src/main/groovy/org/grails/web/json/PrettyPrintJSONWriter.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/parser/JSONParser.java b/grace-web-common/src/main/groovy/org/grails/web/json/parser/JSONParser.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/parser/JSONParser.java rename to grace-web-common/src/main/groovy/org/grails/web/json/parser/JSONParser.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/parser/JsonParserConstants.java b/grace-web-common/src/main/groovy/org/grails/web/json/parser/JsonParserConstants.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/parser/JsonParserConstants.java rename to grace-web-common/src/main/groovy/org/grails/web/json/parser/JsonParserConstants.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/parser/JsonParserTokenManager.java b/grace-web-common/src/main/groovy/org/grails/web/json/parser/JsonParserTokenManager.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/parser/JsonParserTokenManager.java rename to grace-web-common/src/main/groovy/org/grails/web/json/parser/JsonParserTokenManager.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/parser/ParseException.java b/grace-web-common/src/main/groovy/org/grails/web/json/parser/ParseException.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/parser/ParseException.java rename to grace-web-common/src/main/groovy/org/grails/web/json/parser/ParseException.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/parser/SimpleCharStream.java b/grace-web-common/src/main/groovy/org/grails/web/json/parser/SimpleCharStream.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/parser/SimpleCharStream.java rename to grace-web-common/src/main/groovy/org/grails/web/json/parser/SimpleCharStream.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/parser/StringUnmarshaller.java b/grace-web-common/src/main/groovy/org/grails/web/json/parser/StringUnmarshaller.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/parser/StringUnmarshaller.java rename to grace-web-common/src/main/groovy/org/grails/web/json/parser/StringUnmarshaller.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/parser/Token.java b/grace-web-common/src/main/groovy/org/grails/web/json/parser/Token.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/parser/Token.java rename to grace-web-common/src/main/groovy/org/grails/web/json/parser/Token.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/json/parser/TokenMgrError.java b/grace-web-common/src/main/groovy/org/grails/web/json/parser/TokenMgrError.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/json/parser/TokenMgrError.java rename to grace-web-common/src/main/groovy/org/grails/web/json/parser/TokenMgrError.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/pages/DefaultGroovyPagesUriService.java b/grace-web-common/src/main/groovy/org/grails/web/pages/DefaultGroovyPagesUriService.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/pages/DefaultGroovyPagesUriService.java rename to grace-web-common/src/main/groovy/org/grails/web/pages/DefaultGroovyPagesUriService.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/pages/FilteringCodecsByContentTypeSettings.java b/grace-web-common/src/main/groovy/org/grails/web/pages/FilteringCodecsByContentTypeSettings.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/pages/FilteringCodecsByContentTypeSettings.java rename to grace-web-common/src/main/groovy/org/grails/web/pages/FilteringCodecsByContentTypeSettings.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/pages/GroovyPagesUriSupport.java b/grace-web-common/src/main/groovy/org/grails/web/pages/GroovyPagesUriSupport.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/pages/GroovyPagesUriSupport.java rename to grace-web-common/src/main/groovy/org/grails/web/pages/GroovyPagesUriSupport.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributes.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributes.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributes.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributes.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/GrailsFlashScope.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/GrailsFlashScope.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/GrailsFlashScope.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/GrailsFlashScope.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/GrailsRequestContext.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/GrailsRequestContext.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/GrailsRequestContext.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/GrailsRequestContext.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/WebRequestDelegatingRequestContext.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/WebRequestDelegatingRequestContext.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/WebRequestDelegatingRequestContext.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/WebRequestDelegatingRequestContext.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/WrappedResponseHolder.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/WrappedResponseHolder.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/WrappedResponseHolder.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/WrappedResponseHolder.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/ActionResultTransformer.groovy b/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/ActionResultTransformer.groovy similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/ActionResultTransformer.groovy rename to grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/ActionResultTransformer.groovy diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/DefaultRequestStateLookupStrategy.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/DefaultRequestStateLookupStrategy.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/DefaultRequestStateLookupStrategy.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/DefaultRequestStateLookupStrategy.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsRequestStateLookupStrategy.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsRequestStateLookupStrategy.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsRequestStateLookupStrategy.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsRequestStateLookupStrategy.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequest.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequest.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequest.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequest.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/OutputAwareHttpServletResponse.groovy b/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/OutputAwareHttpServletResponse.groovy similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/OutputAwareHttpServletResponse.groovy rename to grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/OutputAwareHttpServletResponse.groovy diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/ParameterCreationListener.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/ParameterCreationListener.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/ParameterCreationListener.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/ParameterCreationListener.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/exceptions/ControllerExecutionException.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/exceptions/ControllerExecutionException.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/exceptions/ControllerExecutionException.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/exceptions/ControllerExecutionException.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/exceptions/GrailsMVCException.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/exceptions/GrailsMVCException.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/exceptions/GrailsMVCException.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/mvc/exceptions/GrailsMVCException.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/view/AbstractGrailsView.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/view/AbstractGrailsView.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/view/AbstractGrailsView.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/view/AbstractGrailsView.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/view/CompositeViewResolver.groovy b/grace-web-common/src/main/groovy/org/grails/web/servlet/view/CompositeViewResolver.groovy similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/view/CompositeViewResolver.groovy rename to grace-web-common/src/main/groovy/org/grails/web/servlet/view/CompositeViewResolver.groovy diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/view/GrailsViewResolver.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/view/GrailsViewResolver.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/view/GrailsViewResolver.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/view/GrailsViewResolver.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/servlet/view/LayoutViewResolver.java b/grace-web-common/src/main/groovy/org/grails/web/servlet/view/LayoutViewResolver.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/servlet/view/LayoutViewResolver.java rename to grace-web-common/src/main/groovy/org/grails/web/servlet/view/LayoutViewResolver.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/util/BoundedCharsAsEncodedBytesCounter.java b/grace-web-common/src/main/groovy/org/grails/web/util/BoundedCharsAsEncodedBytesCounter.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/util/BoundedCharsAsEncodedBytesCounter.java rename to grace-web-common/src/main/groovy/org/grails/web/util/BoundedCharsAsEncodedBytesCounter.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/util/ClassAndMimeTypeRegistry.groovy b/grace-web-common/src/main/groovy/org/grails/web/util/ClassAndMimeTypeRegistry.groovy similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/util/ClassAndMimeTypeRegistry.groovy rename to grace-web-common/src/main/groovy/org/grails/web/util/ClassAndMimeTypeRegistry.groovy diff --git a/grails-web-common/src/main/groovy/org/grails/web/util/GrailsApplicationAttributes.java b/grace-web-common/src/main/groovy/org/grails/web/util/GrailsApplicationAttributes.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/util/GrailsApplicationAttributes.java rename to grace-web-common/src/main/groovy/org/grails/web/util/GrailsApplicationAttributes.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/util/IncludeResponseWrapper.java b/grace-web-common/src/main/groovy/org/grails/web/util/IncludeResponseWrapper.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/util/IncludeResponseWrapper.java rename to grace-web-common/src/main/groovy/org/grails/web/util/IncludeResponseWrapper.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/util/IncludedContent.java b/grace-web-common/src/main/groovy/org/grails/web/util/IncludedContent.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/util/IncludedContent.java rename to grace-web-common/src/main/groovy/org/grails/web/util/IncludedContent.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/util/WebUtils.java b/grace-web-common/src/main/groovy/org/grails/web/util/WebUtils.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/util/WebUtils.java rename to grace-web-common/src/main/groovy/org/grails/web/util/WebUtils.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/xml/PrettyPrintXMLStreamWriter.java b/grace-web-common/src/main/groovy/org/grails/web/xml/PrettyPrintXMLStreamWriter.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/xml/PrettyPrintXMLStreamWriter.java rename to grace-web-common/src/main/groovy/org/grails/web/xml/PrettyPrintXMLStreamWriter.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/xml/StreamingMarkupWriter.java b/grace-web-common/src/main/groovy/org/grails/web/xml/StreamingMarkupWriter.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/xml/StreamingMarkupWriter.java rename to grace-web-common/src/main/groovy/org/grails/web/xml/StreamingMarkupWriter.java diff --git a/grails-web-common/src/main/groovy/org/grails/web/xml/XMLStreamWriter.java b/grace-web-common/src/main/groovy/org/grails/web/xml/XMLStreamWriter.java similarity index 100% rename from grails-web-common/src/main/groovy/org/grails/web/xml/XMLStreamWriter.java rename to grace-web-common/src/main/groovy/org/grails/web/xml/XMLStreamWriter.java diff --git a/grails-web-common/src/main/resources/META-INF/grails.factories b/grace-web-common/src/main/resources/META-INF/grails.factories similarity index 100% rename from grails-web-common/src/main/resources/META-INF/grails.factories rename to grace-web-common/src/main/resources/META-INF/grails.factories diff --git a/grails-web-common/src/main/resources/org/grails/web/json/jsonparser.jj b/grace-web-common/src/main/resources/org/grails/web/json/jsonparser.jj similarity index 100% rename from grails-web-common/src/main/resources/org/grails/web/json/jsonparser.jj rename to grace-web-common/src/main/resources/org/grails/web/json/jsonparser.jj diff --git a/grails-web-common/src/test/groovy/grails/web/api/ServletAttributesTraitGeneratedSpec.groovy b/grace-web-common/src/test/groovy/grails/web/api/ServletAttributesTraitGeneratedSpec.groovy similarity index 100% rename from grails-web-common/src/test/groovy/grails/web/api/ServletAttributesTraitGeneratedSpec.groovy rename to grace-web-common/src/test/groovy/grails/web/api/ServletAttributesTraitGeneratedSpec.groovy diff --git a/grails-web-common/src/test/groovy/grails/web/api/WebAttributesTraitGeneratedSpec.groovy b/grace-web-common/src/test/groovy/grails/web/api/WebAttributesTraitGeneratedSpec.groovy similarity index 100% rename from grails-web-common/src/test/groovy/grails/web/api/WebAttributesTraitGeneratedSpec.groovy rename to grace-web-common/src/test/groovy/grails/web/api/WebAttributesTraitGeneratedSpec.groovy diff --git a/grails-web-common/src/test/groovy/grails/web/servlet/mvc/GrailsParameterMapTests.groovy b/grace-web-common/src/test/groovy/grails/web/servlet/mvc/GrailsParameterMapTests.groovy similarity index 100% rename from grails-web-common/src/test/groovy/grails/web/servlet/mvc/GrailsParameterMapTests.groovy rename to grace-web-common/src/test/groovy/grails/web/servlet/mvc/GrailsParameterMapTests.groovy diff --git a/grails-web-common/src/test/groovy/org/grails/web/json/parser/JSONParserSpec.groovy b/grace-web-common/src/test/groovy/org/grails/web/json/parser/JSONParserSpec.groovy similarity index 100% rename from grails-web-common/src/test/groovy/org/grails/web/json/parser/JSONParserSpec.groovy rename to grace-web-common/src/test/groovy/org/grails/web/json/parser/JSONParserSpec.groovy diff --git a/grails-web-common/src/test/groovy/org/grails/web/pages/GroovyPagesUriSupportTests.java b/grace-web-common/src/test/groovy/org/grails/web/pages/GroovyPagesUriSupportTests.java similarity index 100% rename from grails-web-common/src/test/groovy/org/grails/web/pages/GroovyPagesUriSupportTests.java rename to grace-web-common/src/test/groovy/org/grails/web/pages/GroovyPagesUriSupportTests.java diff --git a/grails-web-common/src/test/groovy/org/grails/web/util/WebUtilsSpec.groovy b/grace-web-common/src/test/groovy/org/grails/web/util/WebUtilsSpec.groovy similarity index 100% rename from grails-web-common/src/test/groovy/org/grails/web/util/WebUtilsSpec.groovy rename to grace-web-common/src/test/groovy/org/grails/web/util/WebUtilsSpec.groovy diff --git a/grails-web-databinding/README.md b/grace-web-databinding/README.md similarity index 96% rename from grails-web-databinding/README.md rename to grace-web-databinding/README.md index 6f1f2d1972..16f36e4874 100644 --- a/grails-web-databinding/README.md +++ b/grace-web-databinding/README.md @@ -1,4 +1,4 @@ -## grails-web-databinding +## grace-web-databinding This subproject includes a lot of code to support data binding. diff --git a/grails-web-databinding/build.gradle b/grace-web-databinding/build.gradle similarity index 59% rename from grails-web-databinding/build.gradle rename to grace-web-databinding/build.gradle index 4aa68de135..4a4fd83539 100644 --- a/grails-web-databinding/build.gradle +++ b/grace-web-databinding/build.gradle @@ -1,7 +1,7 @@ dependencies { - api project(":grails-databinding") - api project(":grails-util") - api project(":grails-web-common") + api project(":grace-databinding") + api project(":grace-util") + api project(":grace-web-common") api libs.grails.datastore.core, { transitive = false diff --git a/grails-web-databinding/src/main/groovy/grails/beans/util/LazyBeanMap.groovy b/grace-web-databinding/src/main/groovy/grails/beans/util/LazyBeanMap.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/grails/beans/util/LazyBeanMap.groovy rename to grace-web-databinding/src/main/groovy/grails/beans/util/LazyBeanMap.groovy diff --git a/grails-web-databinding/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java b/grace-web-databinding/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java similarity index 100% rename from grails-web-databinding/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java rename to grace-web-databinding/src/main/groovy/grails/beans/util/LazyMetaPropertyMap.java diff --git a/grails-web-databinding/src/main/groovy/grails/compiler/traits/WebDataBindingTraitInjector.groovy b/grace-web-databinding/src/main/groovy/grails/compiler/traits/WebDataBindingTraitInjector.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/grails/compiler/traits/WebDataBindingTraitInjector.groovy rename to grace-web-databinding/src/main/groovy/grails/compiler/traits/WebDataBindingTraitInjector.groovy diff --git a/grails-web-databinding/src/main/groovy/grails/web/databinding/DataBinder.groovy b/grace-web-databinding/src/main/groovy/grails/web/databinding/DataBinder.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/grails/web/databinding/DataBinder.groovy rename to grace-web-databinding/src/main/groovy/grails/web/databinding/DataBinder.groovy diff --git a/grails-web-databinding/src/main/groovy/grails/web/databinding/DataBindingUtils.java b/grace-web-databinding/src/main/groovy/grails/web/databinding/DataBindingUtils.java similarity index 100% rename from grails-web-databinding/src/main/groovy/grails/web/databinding/DataBindingUtils.java rename to grace-web-databinding/src/main/groovy/grails/web/databinding/DataBindingUtils.java diff --git a/grails-web-databinding/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy b/grace-web-databinding/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy rename to grace-web-databinding/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy diff --git a/grails-web-databinding/src/main/groovy/grails/web/databinding/WebDataBinding.groovy b/grace-web-databinding/src/main/groovy/grails/web/databinding/WebDataBinding.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/grails/web/databinding/WebDataBinding.groovy rename to grace-web-databinding/src/main/groovy/grails/web/databinding/WebDataBinding.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/ASTDatabindingHelper.java diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingEventMulticastListener.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMap.java diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/DefaultASTDatabindingHelper.java diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/GrailsWebDataBindingListener.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/SpringConversionServiceAdapter.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreator.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceCreator.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/DefaultDataBindingSourceRegistry.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMap.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalJsonDataBindingSourceCreator.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalXmlDataBindingSourceCreator.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalXmlDataBindingSourceCreator.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalXmlDataBindingSourceCreator.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/HalXmlDataBindingSourceCreator.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/InvalidRequestBodyException.java diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonApiDataBindingSourceCreator.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/JsonDataBindingSourceCreator.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/XmlDataBindingSourceCreator.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/XmlDataBindingSourceCreator.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/XmlDataBindingSourceCreator.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/bindingsource/XmlDataBindingSourceCreator.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy diff --git a/grails-web-databinding/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy b/grace-web-databinding/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy similarity index 100% rename from grails-web-databinding/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy rename to grace-web-databinding/src/main/groovy/org/grails/web/databinding/converters/ByteArrayMultipartFileValueConverter.groovy diff --git a/grails-web-databinding/src/main/resources/META-INF/grails.factories b/grace-web-databinding/src/main/resources/META-INF/grails.factories similarity index 100% rename from grails-web-databinding/src/main/resources/META-INF/grails.factories rename to grace-web-databinding/src/main/resources/META-INF/grails.factories diff --git a/grails-web-databinding/src/test/groovy/grails/bean/util/LazyMetaPropertyMapSpec.groovy b/grace-web-databinding/src/test/groovy/grails/bean/util/LazyMetaPropertyMapSpec.groovy similarity index 100% rename from grails-web-databinding/src/test/groovy/grails/bean/util/LazyMetaPropertyMapSpec.groovy rename to grace-web-databinding/src/test/groovy/grails/bean/util/LazyMetaPropertyMapSpec.groovy diff --git a/grails-web-databinding/src/test/groovy/grails/bean/util/LazyMetaPropertyMapTests.groovy b/grace-web-databinding/src/test/groovy/grails/bean/util/LazyMetaPropertyMapTests.groovy similarity index 100% rename from grails-web-databinding/src/test/groovy/grails/bean/util/LazyMetaPropertyMapTests.groovy rename to grace-web-databinding/src/test/groovy/grails/bean/util/LazyMetaPropertyMapTests.groovy diff --git a/grails-web-databinding/src/test/groovy/grails/web/databinding/DataBinderTraitGeneratedSpec.groovy b/grace-web-databinding/src/test/groovy/grails/web/databinding/DataBinderTraitGeneratedSpec.groovy similarity index 100% rename from grails-web-databinding/src/test/groovy/grails/web/databinding/DataBinderTraitGeneratedSpec.groovy rename to grace-web-databinding/src/test/groovy/grails/web/databinding/DataBinderTraitGeneratedSpec.groovy diff --git a/grails-web-databinding/src/test/groovy/grails/web/databinding/WebDataBindingTraitGeneratedSpec.groovy b/grace-web-databinding/src/test/groovy/grails/web/databinding/WebDataBindingTraitGeneratedSpec.groovy similarity index 100% rename from grails-web-databinding/src/test/groovy/grails/web/databinding/WebDataBindingTraitGeneratedSpec.groovy rename to grace-web-databinding/src/test/groovy/grails/web/databinding/WebDataBindingTraitGeneratedSpec.groovy diff --git a/grails-web-databinding/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy b/grace-web-databinding/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy similarity index 100% rename from grails-web-databinding/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy rename to grace-web-databinding/src/test/groovy/org/grails/web/databinding/DataBindingLazyMetaPropertyMapTests.groovy diff --git a/grails-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreatorSpec.groovy b/grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreatorSpec.groovy similarity index 100% rename from grails-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreatorSpec.groovy rename to grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/AbstractRequestBodyDataBindingSourceCreatorSpec.groovy diff --git a/grails-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy b/grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy similarity index 100% rename from grails-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy rename to grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy diff --git a/grails-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/hal/json/HalJsonDataBindingSourceCreatorSpec.groovy b/grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/hal/json/HalJsonDataBindingSourceCreatorSpec.groovy similarity index 100% rename from grails-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/hal/json/HalJsonDataBindingSourceCreatorSpec.groovy rename to grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/hal/json/HalJsonDataBindingSourceCreatorSpec.groovy diff --git a/grails-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/json/JsonDataBindingSourceCreatorSpec.groovy b/grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/json/JsonDataBindingSourceCreatorSpec.groovy similarity index 100% rename from grails-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/json/JsonDataBindingSourceCreatorSpec.groovy rename to grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/json/JsonDataBindingSourceCreatorSpec.groovy diff --git a/grails-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/json/api/JsonApiDataBindingSourceCreatorSpec.groovy b/grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/json/api/JsonApiDataBindingSourceCreatorSpec.groovy similarity index 100% rename from grails-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/json/api/JsonApiDataBindingSourceCreatorSpec.groovy rename to grace-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/json/api/JsonApiDataBindingSourceCreatorSpec.groovy diff --git a/grace-web-mvc/README.md b/grace-web-mvc/README.md new file mode 100644 index 0000000000..cc2728eac3 --- /dev/null +++ b/grace-web-mvc/README.md @@ -0,0 +1,2 @@ +## grace-web-mvc + diff --git a/grails-web-mvc/build.gradle b/grace-web-mvc/build.gradle similarity index 69% rename from grails-web-mvc/build.gradle rename to grace-web-mvc/build.gradle index 6a567cd2b3..4fa29db314 100644 --- a/grails-web-mvc/build.gradle +++ b/grace-web-mvc/build.gradle @@ -1,6 +1,6 @@ dependencies { - api project(":grails-web-common") - api project(":grails-web-url-mappings") + api project(":grace-web-common") + api project(":grace-web-url-mappings") api libs.grails.web.sitemesh, { exclude group:'org.grails', module:'grails-web-common' diff --git a/grails-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java b/grace-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java similarity index 100% rename from grails-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java rename to grace-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java diff --git a/grails-web-mvc/src/main/groovy/org/grails/web/filters/HiddenHttpMethodFilter.java b/grace-web-mvc/src/main/groovy/org/grails/web/filters/HiddenHttpMethodFilter.java similarity index 100% rename from grails-web-mvc/src/main/groovy/org/grails/web/filters/HiddenHttpMethodFilter.java rename to grace-web-mvc/src/main/groovy/org/grails/web/filters/HiddenHttpMethodFilter.java diff --git a/grails-web-mvc/src/main/groovy/org/grails/web/filters/OrderedHiddenHttpMethodFilter.java b/grace-web-mvc/src/main/groovy/org/grails/web/filters/OrderedHiddenHttpMethodFilter.java similarity index 100% rename from grails-web-mvc/src/main/groovy/org/grails/web/filters/OrderedHiddenHttpMethodFilter.java rename to grace-web-mvc/src/main/groovy/org/grails/web/filters/OrderedHiddenHttpMethodFilter.java diff --git a/grails-web-mvc/src/main/groovy/org/grails/web/servlet/GrailsUrlPathHelper.java b/grace-web-mvc/src/main/groovy/org/grails/web/servlet/GrailsUrlPathHelper.java similarity index 100% rename from grails-web-mvc/src/main/groovy/org/grails/web/servlet/GrailsUrlPathHelper.java rename to grace-web-mvc/src/main/groovy/org/grails/web/servlet/GrailsUrlPathHelper.java diff --git a/grails-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/AbstractTokenResponseHandler.java b/grace-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/AbstractTokenResponseHandler.java similarity index 100% rename from grails-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/AbstractTokenResponseHandler.java rename to grace-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/AbstractTokenResponseHandler.java diff --git a/grails-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/GrailsDispatcherServlet.groovy b/grace-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/GrailsDispatcherServlet.groovy similarity index 100% rename from grails-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/GrailsDispatcherServlet.groovy rename to grace-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/GrailsDispatcherServlet.groovy diff --git a/grails-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequestFilter.java b/grace-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequestFilter.java similarity index 100% rename from grails-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequestFilter.java rename to grace-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/GrailsWebRequestFilter.java diff --git a/grails-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/SynchronizerTokensHolder.groovy b/grace-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/SynchronizerTokensHolder.groovy similarity index 100% rename from grails-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/SynchronizerTokensHolder.groovy rename to grace-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/SynchronizerTokensHolder.groovy diff --git a/grails-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/TokenResponseActionResultTransformer.groovy b/grace-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/TokenResponseActionResultTransformer.groovy similarity index 100% rename from grails-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/TokenResponseActionResultTransformer.groovy rename to grace-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/TokenResponseActionResultTransformer.groovy diff --git a/grails-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/TokenResponseHandler.java b/grace-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/TokenResponseHandler.java similarity index 100% rename from grails-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/TokenResponseHandler.java rename to grace-web-mvc/src/main/groovy/org/grails/web/servlet/mvc/TokenResponseHandler.java diff --git a/grails-web-mvc/src/test/groovy/org/grails/web/errors/GrailsExceptionResolverSpec.groovy b/grace-web-mvc/src/test/groovy/org/grails/web/errors/GrailsExceptionResolverSpec.groovy similarity index 100% rename from grails-web-mvc/src/test/groovy/org/grails/web/errors/GrailsExceptionResolverSpec.groovy rename to grace-web-mvc/src/test/groovy/org/grails/web/errors/GrailsExceptionResolverSpec.groovy diff --git a/grace-web-url-mappings/README.md b/grace-web-url-mappings/README.md new file mode 100644 index 0000000000..eb3a748ef3 --- /dev/null +++ b/grace-web-url-mappings/README.md @@ -0,0 +1,2 @@ +## grace-web-url-mappings + diff --git a/grails-web-url-mappings/build.gradle b/grace-web-url-mappings/build.gradle similarity index 68% rename from grails-web-url-mappings/build.gradle rename to grace-web-url-mappings/build.gradle index 0a1eeefcc7..cff350f420 100644 --- a/grails-web-url-mappings/build.gradle +++ b/grace-web-url-mappings/build.gradle @@ -1,8 +1,8 @@ dependencies { - api project(":grails-api") - api project(":grails-cli") - api project(":grails-util") - api project(":grails-web-common") + api project(":grace-api") + api project(":grace-cli") + api project(":grace-util") + api project(":grace-web-common") api(libs.grails.datastore.gorm.validation) { transitive = false @@ -13,7 +13,7 @@ dependencies { compileOnly libs.jansi compileOnly libs.jline - testImplementation project(":grails-test-suite-base") + testImplementation project(":grace-test-suite-base") } tasks.withType(Test) { diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/LinkGenerator.java b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/LinkGenerator.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/LinkGenerator.java rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/LinkGenerator.java diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/LinkGeneratorFactory.groovy b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/LinkGeneratorFactory.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/LinkGeneratorFactory.groovy rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/LinkGeneratorFactory.groovy diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/ResponseRedirector.groovy b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/ResponseRedirector.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/ResponseRedirector.groovy rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/ResponseRedirector.groovy diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlCreator.java b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlCreator.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlCreator.java rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlCreator.java diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMapping.java b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMapping.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMapping.java rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMapping.java diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingData.java b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingData.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingData.java rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingData.java diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingEvaluator.java b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingEvaluator.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingEvaluator.java rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingEvaluator.java diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingInfo.java b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingInfo.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingInfo.java rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingInfo.java diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingParser.java b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingParser.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingParser.java rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingParser.java diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappings.java b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappings.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappings.java rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappings.java diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingsFactory.groovy b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingsFactory.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingsFactory.groovy rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingsFactory.groovy diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingsHolder.java b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingsHolder.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingsHolder.java rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/UrlMappingsHolder.java diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsConfiguration.groovy b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsConfiguration.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsConfiguration.groovy rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsConfiguration.groovy diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsFilter.groovy b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsFilter.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsFilter.groovy rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsFilter.groovy diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsDefaultCorsConfiguration.groovy b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsDefaultCorsConfiguration.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsDefaultCorsConfiguration.groovy rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsDefaultCorsConfiguration.groovy diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/exceptions/UrlMappingException.java b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/exceptions/UrlMappingException.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/exceptions/UrlMappingException.java rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/exceptions/UrlMappingException.java diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/mvc/RedirectEventListener.java b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/mvc/RedirectEventListener.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/mvc/RedirectEventListener.java rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/mvc/RedirectEventListener.java diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/mvc/exceptions/CannotRedirectException.java b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/mvc/exceptions/CannotRedirectException.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/mvc/exceptions/CannotRedirectException.java rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/mvc/exceptions/CannotRedirectException.java diff --git a/grails-web-url-mappings/src/main/groovy/grails/web/mapping/reporting/UrlMappingsRenderer.groovy b/grace-web-url-mappings/src/main/groovy/grails/web/mapping/reporting/UrlMappingsRenderer.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/grails/web/mapping/reporting/UrlMappingsRenderer.groovy rename to grace-web-url-mappings/src/main/groovy/grails/web/mapping/reporting/UrlMappingsRenderer.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/AbstractUrlMapping.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/AbstractUrlMapping.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/AbstractUrlMapping.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/AbstractUrlMapping.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/AbstractUrlMappingInfo.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/AbstractUrlMappingInfo.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/AbstractUrlMappingInfo.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/AbstractUrlMappingInfo.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/CachingLinkGenerator.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/CachingLinkGenerator.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/CachingLinkGenerator.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/CachingLinkGenerator.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/ControllerActionConventions.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/ControllerActionConventions.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/ControllerActionConventions.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/ControllerActionConventions.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultLinkGenerator.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultLinkGenerator.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultLinkGenerator.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultLinkGenerator.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlCreator.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlCreator.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlCreator.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlCreator.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingData.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingData.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingData.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingData.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingEvaluator.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingEvaluator.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingEvaluator.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingEvaluator.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingInfo.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingInfo.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingInfo.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingInfo.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingParser.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingParser.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingParser.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingParser.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappings.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappings.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappings.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappings.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingsHolder.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingsHolder.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingsHolder.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingsHolder.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/ForwardUrlMappingInfo.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/ForwardUrlMappingInfo.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/ForwardUrlMappingInfo.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/ForwardUrlMappingInfo.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/MetaMappingInfo.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/MetaMappingInfo.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/MetaMappingInfo.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/MetaMappingInfo.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/RegexUrlMapping.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/RegexUrlMapping.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/RegexUrlMapping.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/RegexUrlMapping.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/ResponseCodeMappingData.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/ResponseCodeMappingData.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/ResponseCodeMappingData.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/ResponseCodeMappingData.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/ResponseCodeUrlMapping.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/ResponseCodeUrlMapping.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/ResponseCodeUrlMapping.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/ResponseCodeUrlMapping.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/ResponseCodeUrlMappingVisitor.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/ResponseCodeUrlMappingVisitor.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/ResponseCodeUrlMappingVisitor.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/ResponseCodeUrlMappingVisitor.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlCreatorCache.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlCreatorCache.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlCreatorCache.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlCreatorCache.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingUtils.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingUtils.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingUtils.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingUtils.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingsHolderFactoryBean.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingsHolderFactoryBean.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingsHolderFactoryBean.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingsHolderFactoryBean.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingsTargetSourceFactoryBean.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingsTargetSourceFactoryBean.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingsTargetSourceFactoryBean.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingsTargetSourceFactoryBean.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/AbstractGrailsControllerUrlMappings.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/AbstractGrailsControllerUrlMappings.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/AbstractGrailsControllerUrlMappings.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/AbstractGrailsControllerUrlMappings.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/GrailsControllerUrlMappingInfo.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/GrailsControllerUrlMappingInfo.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/GrailsControllerUrlMappingInfo.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/GrailsControllerUrlMappingInfo.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/GrailsControllerUrlMappings.java b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/GrailsControllerUrlMappings.java similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/GrailsControllerUrlMappings.java rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/GrailsControllerUrlMappings.java diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMapping.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMapping.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMapping.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMapping.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsInfoHandlerAdapter.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsInfoHandlerAdapter.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsInfoHandlerAdapter.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsInfoHandlerAdapter.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRenderer.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRenderer.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRenderer.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRenderer.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/reporting/UrlMappingsReportCommand.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/reporting/UrlMappingsReportCommand.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/reporting/UrlMappingsReportCommand.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/reporting/UrlMappingsReportCommand.groovy diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/servlet/UrlMappingsErrorPageCustomizer.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/servlet/UrlMappingsErrorPageCustomizer.groovy similarity index 100% rename from grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/servlet/UrlMappingsErrorPageCustomizer.groovy rename to grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/servlet/UrlMappingsErrorPageCustomizer.groovy diff --git a/grails-web-url-mappings/src/main/resources/META-INF/grails.factories b/grace-web-url-mappings/src/main/resources/META-INF/grails.factories similarity index 100% rename from grails-web-url-mappings/src/main/resources/META-INF/grails.factories rename to grace-web-url-mappings/src/main/resources/META-INF/grails.factories diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/AbstractUrlMappingsSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/AbstractUrlMappingsSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/AbstractUrlMappingsSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/AbstractUrlMappingsSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/CollectionWithVariableUrlMappingSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/CollectionWithVariableUrlMappingSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/CollectionWithVariableUrlMappingSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/CollectionWithVariableUrlMappingSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/DefaultActionUrlMappingSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/DefaultActionUrlMappingSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/DefaultActionUrlMappingSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/DefaultActionUrlMappingSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/DoubleWildcardUrlMappingSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/DoubleWildcardUrlMappingSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/DoubleWildcardUrlMappingSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/DoubleWildcardUrlMappingSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/GroupedUrlMappingSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/GroupedUrlMappingSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/GroupedUrlMappingSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/GroupedUrlMappingSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/MandatoryParamMappingSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/MandatoryParamMappingSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/MandatoryParamMappingSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/MandatoryParamMappingSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/OverlappingUrlMappingsMatchingSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/OverlappingUrlMappingsMatchingSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/OverlappingUrlMappingsMatchingSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/OverlappingUrlMappingsMatchingSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/RedirectNonAbsoluteURISpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/RedirectNonAbsoluteURISpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/RedirectNonAbsoluteURISpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/RedirectNonAbsoluteURISpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/RedirectWithParamsSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/RedirectWithParamsSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/RedirectWithParamsSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/RedirectWithParamsSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/RegisterUrlMappingsAtRuntimeSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/RegisterUrlMappingsAtRuntimeSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/RegisterUrlMappingsAtRuntimeSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/RegisterUrlMappingsAtRuntimeSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/RestfulResourceMappingSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/RestfulResourceMappingSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/RestfulResourceMappingSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/RestfulResourceMappingSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/UrlMappingSizeConstraintSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/UrlMappingSizeConstraintSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/UrlMappingSizeConstraintSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/UrlMappingSizeConstraintSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/UrlMappingsWithOptionalExtensionSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/UrlMappingsWithOptionalExtensionSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/UrlMappingsWithOptionalExtensionSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/UrlMappingsWithOptionalExtensionSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/VersionedResourceMappingSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/VersionedResourceMappingSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/VersionedResourceMappingSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/VersionedResourceMappingSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/grails/web/mapping/cors/GrailsCorsConfigurationSpec.groovy b/grace-web-url-mappings/src/test/groovy/grails/web/mapping/cors/GrailsCorsConfigurationSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/grails/web/mapping/cors/GrailsCorsConfigurationSpec.groovy rename to grace-web-url-mappings/src/test/groovy/grails/web/mapping/cors/GrailsCorsConfigurationSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/CachingLinkGeneratorSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/CachingLinkGeneratorSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/CachingLinkGeneratorSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/CachingLinkGeneratorSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/DefaultUrlCreatorTests.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/DefaultUrlCreatorTests.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/DefaultUrlCreatorTests.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/DefaultUrlCreatorTests.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/LinkGeneratorSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/LinkGeneratorSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/LinkGeneratorSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/LinkGeneratorSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/LinkGeneratorWithFormatSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/LinkGeneratorWithFormatSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/LinkGeneratorWithFormatSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/LinkGeneratorWithFormatSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/LinkGeneratorWithUrlMappingsSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/LinkGeneratorWithUrlMappingsSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/LinkGeneratorWithUrlMappingsSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/LinkGeneratorWithUrlMappingsSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/NestedMappingWithinGroupSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/NestedMappingWithinGroupSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/NestedMappingWithinGroupSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/NestedMappingWithinGroupSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/OverlappingParametersReverseMappingSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/OverlappingParametersReverseMappingSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/OverlappingParametersReverseMappingSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/OverlappingParametersReverseMappingSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/RegexUrlMappingTests.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/RegexUrlMappingTests.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/RegexUrlMappingTests.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/RegexUrlMappingTests.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/ResourcesWithSingleSlashSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/ResourcesWithSingleSlashSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/ResourcesWithSingleSlashSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/ResourcesWithSingleSlashSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/RestfulUrlMappingSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/RestfulUrlMappingSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/RestfulUrlMappingSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/RestfulUrlMappingSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/StaticAndWildcardMappingSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/StaticAndWildcardMappingSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/StaticAndWildcardMappingSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/StaticAndWildcardMappingSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingDataTests.java b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingDataTests.java similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingDataTests.java rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingDataTests.java diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingUtilsSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingUtilsSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingUtilsSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingUtilsSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsBindingSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsBindingSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsBindingSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsBindingSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsHolderComparatorSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsHolderComparatorSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsHolderComparatorSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsHolderComparatorSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsHolderFactoryBeanSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsHolderFactoryBeanSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsHolderFactoryBeanSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsHolderFactoryBeanSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsWithHttpMethodNotInNamedParametersSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsWithHttpMethodNotInNamedParametersSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsWithHttpMethodNotInNamedParametersSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsWithHttpMethodNotInNamedParametersSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsWithHttpMethodSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsWithHttpMethodSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsWithHttpMethodSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/UrlMappingsWithHttpMethodSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/mvc/EncodePathFromURISpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/mvc/EncodePathFromURISpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/mvc/EncodePathFromURISpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/mvc/EncodePathFromURISpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMappingSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMappingSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMappingSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMappingSpec.groovy diff --git a/grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRendererSpec.groovy b/grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRendererSpec.groovy similarity index 100% rename from grails-web-url-mappings/src/test/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRendererSpec.groovy rename to grace-web-url-mappings/src/test/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRendererSpec.groovy diff --git a/grails-web-url-mappings/src/test/resources/simplelogger.properties b/grace-web-url-mappings/src/test/resources/simplelogger.properties similarity index 100% rename from grails-web-url-mappings/src/test/resources/simplelogger.properties rename to grace-web-url-mappings/src/test/resources/simplelogger.properties diff --git a/grace-web/README.md b/grace-web/README.md new file mode 100644 index 0000000000..c569c9c4f4 --- /dev/null +++ b/grace-web/README.md @@ -0,0 +1,2 @@ +## grace-web + diff --git a/grails-web/build.gradle b/grace-web/build.gradle similarity index 63% rename from grails-web/build.gradle rename to grace-web/build.gradle index 57f6405336..1414bade3f 100644 --- a/grails-web/build.gradle +++ b/grace-web/build.gradle @@ -1,10 +1,10 @@ dependencies { - api project(":grails-api") - api project(":grails-plugin-api") - api project(":grails-web-common") - api project(":grails-web-databinding") - api project(":grails-web-mvc") - api project(":grails-web-url-mappings") + api project(":grace-api") + api project(":grace-plugin-api") + api project(":grace-web-common") + api project(":grace-web-databinding") + api project(":grace-web-mvc") + api project(":grace-web-url-mappings") api libs.grails.web.gsp, { exclude group:'org.grails', module:'grails-core' @@ -18,5 +18,5 @@ dependencies { } api libs.javax.servlet - testImplementation project(":grails-test") + testImplementation project(":grace-test") } diff --git a/grails-web/src/main/groovy/grails/spring/WebBeanBuilder.java b/grace-web/src/main/groovy/grails/spring/WebBeanBuilder.java similarity index 100% rename from grails-web/src/main/groovy/grails/spring/WebBeanBuilder.java rename to grace-web/src/main/groovy/grails/spring/WebBeanBuilder.java diff --git a/grails-web/src/main/groovy/grails/web/servlet/bootstrap/GrailsBootstrapClass.java b/grace-web/src/main/groovy/grails/web/servlet/bootstrap/GrailsBootstrapClass.java similarity index 100% rename from grails-web/src/main/groovy/grails/web/servlet/bootstrap/GrailsBootstrapClass.java rename to grace-web/src/main/groovy/grails/web/servlet/bootstrap/GrailsBootstrapClass.java diff --git a/grails-web/src/main/groovy/grails/web/servlet/context/GrailsWebApplicationContext.java b/grace-web/src/main/groovy/grails/web/servlet/context/GrailsWebApplicationContext.java similarity index 100% rename from grails-web/src/main/groovy/grails/web/servlet/context/GrailsWebApplicationContext.java rename to grace-web/src/main/groovy/grails/web/servlet/context/GrailsWebApplicationContext.java diff --git a/grails-web/src/main/groovy/grails/web/servlet/context/support/GrailsEnvironment.java b/grace-web/src/main/groovy/grails/web/servlet/context/support/GrailsEnvironment.java similarity index 100% rename from grails-web/src/main/groovy/grails/web/servlet/context/support/GrailsEnvironment.java rename to grace-web/src/main/groovy/grails/web/servlet/context/support/GrailsEnvironment.java diff --git a/grails-web/src/main/groovy/grails/web/servlet/plugins/GrailsWebPluginManager.groovy b/grace-web/src/main/groovy/grails/web/servlet/plugins/GrailsWebPluginManager.groovy similarity index 100% rename from grails-web/src/main/groovy/grails/web/servlet/plugins/GrailsWebPluginManager.groovy rename to grace-web/src/main/groovy/grails/web/servlet/plugins/GrailsWebPluginManager.groovy diff --git a/grails-web/src/main/groovy/org/grails/web/servlet/HttpServletRequestExtension.groovy b/grace-web/src/main/groovy/org/grails/web/servlet/HttpServletRequestExtension.groovy similarity index 100% rename from grails-web/src/main/groovy/org/grails/web/servlet/HttpServletRequestExtension.groovy rename to grace-web/src/main/groovy/org/grails/web/servlet/HttpServletRequestExtension.groovy diff --git a/grails-web/src/main/groovy/org/grails/web/servlet/HttpServletResponseExtension.groovy b/grace-web/src/main/groovy/org/grails/web/servlet/HttpServletResponseExtension.groovy similarity index 100% rename from grails-web/src/main/groovy/org/grails/web/servlet/HttpServletResponseExtension.groovy rename to grace-web/src/main/groovy/org/grails/web/servlet/HttpServletResponseExtension.groovy diff --git a/grails-web/src/main/groovy/org/grails/web/servlet/HttpSessionExtension.groovy b/grace-web/src/main/groovy/org/grails/web/servlet/HttpSessionExtension.groovy similarity index 100% rename from grails-web/src/main/groovy/org/grails/web/servlet/HttpSessionExtension.groovy rename to grace-web/src/main/groovy/org/grails/web/servlet/HttpSessionExtension.groovy diff --git a/grails-web/src/main/groovy/org/grails/web/servlet/ServletContextExtension.groovy b/grace-web/src/main/groovy/org/grails/web/servlet/ServletContextExtension.groovy similarity index 100% rename from grails-web/src/main/groovy/org/grails/web/servlet/ServletContextExtension.groovy rename to grace-web/src/main/groovy/org/grails/web/servlet/ServletContextExtension.groovy diff --git a/grails-web/src/main/groovy/org/grails/web/servlet/boostrap/BootstrapArtefactHandler.java b/grace-web/src/main/groovy/org/grails/web/servlet/boostrap/BootstrapArtefactHandler.java similarity index 100% rename from grails-web/src/main/groovy/org/grails/web/servlet/boostrap/BootstrapArtefactHandler.java rename to grace-web/src/main/groovy/org/grails/web/servlet/boostrap/BootstrapArtefactHandler.java diff --git a/grails-web/src/main/groovy/org/grails/web/servlet/boostrap/DefaultGrailsBootstrapClass.java b/grace-web/src/main/groovy/org/grails/web/servlet/boostrap/DefaultGrailsBootstrapClass.java similarity index 100% rename from grails-web/src/main/groovy/org/grails/web/servlet/boostrap/DefaultGrailsBootstrapClass.java rename to grace-web/src/main/groovy/org/grails/web/servlet/boostrap/DefaultGrailsBootstrapClass.java diff --git a/grails-web/src/main/groovy/org/grails/web/servlet/context/GrailsConfigUtils.java b/grace-web/src/main/groovy/org/grails/web/servlet/context/GrailsConfigUtils.java similarity index 100% rename from grails-web/src/main/groovy/org/grails/web/servlet/context/GrailsConfigUtils.java rename to grace-web/src/main/groovy/org/grails/web/servlet/context/GrailsConfigUtils.java diff --git a/grails-web/src/main/groovy/org/grails/web/servlet/context/support/WebRuntimeSpringConfiguration.java b/grace-web/src/main/groovy/org/grails/web/servlet/context/support/WebRuntimeSpringConfiguration.java similarity index 100% rename from grails-web/src/main/groovy/org/grails/web/servlet/context/support/WebRuntimeSpringConfiguration.java rename to grace-web/src/main/groovy/org/grails/web/servlet/context/support/WebRuntimeSpringConfiguration.java diff --git a/grails-web/src/main/resources/META-INF/grails.factories b/grace-web/src/main/resources/META-INF/grails.factories similarity index 100% rename from grails-web/src/main/resources/META-INF/grails.factories rename to grace-web/src/main/resources/META-INF/grails.factories diff --git a/grails-web/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/grace-web/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule similarity index 100% rename from grails-web/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule rename to grace-web/src/main/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule diff --git a/grails-web/src/test/groovy/grails/web/context/ServletContextHolderSpec.groovy b/grace-web/src/test/groovy/grails/web/context/ServletContextHolderSpec.groovy similarity index 100% rename from grails-web/src/test/groovy/grails/web/context/ServletContextHolderSpec.groovy rename to grace-web/src/test/groovy/grails/web/context/ServletContextHolderSpec.groovy diff --git a/grails-web/src/test/groovy/org/grails/web/servlet/ServletRequestXhrApiSpec.groovy b/grace-web/src/test/groovy/org/grails/web/servlet/ServletRequestXhrApiSpec.groovy similarity index 100% rename from grails-web/src/test/groovy/org/grails/web/servlet/ServletRequestXhrApiSpec.groovy rename to grace-web/src/test/groovy/org/grails/web/servlet/ServletRequestXhrApiSpec.groovy diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle index 1fc7a47600..a692e738c5 100644 --- a/gradle/assemble.gradle +++ b/gradle/assemble.gradle @@ -4,9 +4,9 @@ apply plugin: org.grails.gradle.GrailsBuildPlugin def libsConfigurations = [] subprojects { subproject -> - if(subproject.name == 'grails-dependencies') return - if(subproject.name == 'grails-bom') return - if(subproject.name == 'grails-shell' || subproject.name == 'grails-core') { + if(subproject.name == 'grace-dependencies') return + if(subproject.name == 'grace-bom') return + if(subproject.name == 'grace-shell' || subproject.name == 'grace-core') { configurations { libsConfigurations << libs { @@ -132,23 +132,23 @@ task populateDependencies(type: Sync, dependsOn: configurePopulateDependencies) // Can't use sync task here because this directory contains other things as well. task sourcesJars(type: Sync) { into homeSrcDir - from subprojects.findAll { !it.name.startsWith('grails-test-suite') && !it.name.startsWith('grails-dependencies') && !it.name.startsWith('grails-bom') }.sourcesJar*.outputs*.files + from subprojects.findAll { !it.name.startsWith('grace-test-suite') && !it.name.startsWith('grace-dependencies') && !it.name.startsWith('grace-bom') }.sourcesJar*.outputs*.files // sourcesFor comes from GrailsBuildPlugin - from { sourcesFor(libsConfigurations*.copyRecursive { it.name.startsWith('grails-datastore') }.collect { it.transitive = false; it }) } + from { sourcesFor(libsConfigurations*.copyRecursive { it.name.startsWith('grace-datastore') }.collect { it.transitive = false; it }) } } task grailsCreateStartScripts(type: GrailsCreateStartScripts) { - description = "Creates OS specific scripts to run grails-shell as a JVM application." + description = "Creates OS specific scripts to run grace-shell as a JVM application." mainClass = 'org.grails.cli.GrailsCli' - applicationName = 'grails' + applicationName = 'grace' defaultJvmOpts = ["-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1", "-XX:CICompilerCount=3"] outputDir = file('bin') - classpath = rootProject.childProjects['grails-shell'].configurations.runtimeClasspath - projectArtifacts = rootProject.childProjects['grails-shell'].tasks['jar'].outputs.files.collect { "dist/${it.name}" } + classpath = rootProject.childProjects['grace-shell'].configurations.runtimeClasspath + projectArtifacts = rootProject.childProjects['grace-shell'].tasks['jar'].outputs.files.collect { "dist/${it.name}" } doLast { - ant.replace(file: file('bin/grails'), token: 'media/gradle.icns', value: 'media/icons/grails.icns') - ant.chmod(file: file('bin/grails'), perm: 'ugo+rx') + ant.replace(file: file('bin/grace'), token: 'media/gradle.icns', value: 'media/icons/grails.icns') + ant.chmod(file: file('bin/grace'), perm: 'ugo+rx') } } @@ -159,7 +159,7 @@ class GrailsCreateStartScripts extends org.gradle.api.tasks.application.CreateSt @org.gradle.api.tasks.TaskAction void generate() { def generator = new org.gradle.api.internal.plugins.StartScriptGenerator() - generator.unixStartScriptGenerator.template = project.rootProject.childProjects['grails-shell'].resources.text.fromFile('src/main/resources/unixStartScript.txt') + generator.unixStartScriptGenerator.template = project.rootProject.childProjects['grace-shell'].resources.text.fromFile('src/main/resources/unixStartScript.txt') generator.applicationName = getApplicationName() generator.mainClassName = getMainClass().get() generator.defaultJvmOpts = getDefaultJvmOpts() @@ -168,7 +168,7 @@ class GrailsCreateStartScripts extends org.gradle.api.tasks.application.CreateSt generator.classpath = projectArtifacts + getClasspath().resolvedConfiguration.resolvedArtifacts.collect { artifact -> def dependency = artifact.moduleVersion.id String installedFile = "lib/$dependency.group/$dependency.name/jars/$artifact.file.name" - if(dependency.group=='org.grails' && !project.file(installedFile).exists()) { + if(dependency.group=='org.graceframework' && !project.file(installedFile).exists()) { installedFile = "dist/$artifact.file.name" } installedFile @@ -181,7 +181,7 @@ class GrailsCreateStartScripts extends org.gradle.api.tasks.application.CreateSt task install(dependsOn: [populateDependencies, grailsCreateStartScripts]) { task -> subprojects { Project project -> - if(!project.name.startsWith('grails-test-suite')) { + if(!project.name.startsWith('grace-test-suite')) { task.dependsOn("$project.name:publishToMavenLocal") } } @@ -191,14 +191,14 @@ task install(dependsOn: [populateDependencies, grailsCreateStartScripts]) { task task zipDist(type: Zip, dependsOn: [sourcesJars, install]) { destinationDirectory = "${buildDir}/distributions" as File - archiveBaseName = 'grails' + archiveBaseName = 'grace' archiveAppendix = grailsVersion exclude "**/CVS/**" - into("grails-$grailsVersion") { + into("grace-$grailsVersion") { from(projectDir) { - include 'bin/grails', 'bin/grails.bat', 'lib/', 'media/', 'samples/', 'scripts/', 'LICENSE', 'INSTALL', "src/" + include 'bin/grace', 'bin/grace.bat', 'lib/', 'samples/', 'scripts/', 'LICENSE', 'INSTALL', "src/" exclude 'ant/bin', 'src/grails', 'src/war' } from(docs.destinationDir) { diff --git a/gradle/grails.versions.toml b/gradle/grails.versions.toml index 79ee27fd2e..ddb222041a 100644 --- a/gradle/grails.versions.toml +++ b/gradle/grails.versions.toml @@ -1,13 +1,13 @@ [plugins] cache = "5.0.1" -fields = "5.0.0-SNAPSHOT" +fields = "5.0.0" geb = "3.0.0" -hibernate5 = "2022.0.0-SNAPSHOT" +hibernate5 = "2022.0.0" mongodb = "7.2.1" neo4j = "7.2.1" rxjava = "1.1.1" rxjava2 = "2.0.0" -scaffolding = "5.0.0-SNAPSHOT" +scaffolding = "5.0.0" [profiles] angular = "8.0.1" @@ -19,6 +19,6 @@ rest-api = "5.0.1" rest-api-plugin = "5.0.1" vue = "5.0.2" web = "5.0.5" -web-bootstrap = "5.0.0-SNAPSHOT" -web-clean = "5.0.0-SNAPSHOT" +web-bootstrap = "2022.0.0" +web-clean = "2022.0.0" web-plugin = "4.0.1" \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9d8a716ba1..c86816f299 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,14 +13,14 @@ gradle-extra-configurations-plugin = "7.0.0" gradle-git-properties = "2.4.1" gradle-nexus-plugin = "2.3.1" gradle-nexus-publish-plugin = "1.1.0" -grails-async = "5.0.0-SNAPSHOT" -grails-events = "5.0.0-SNAPSHOT" +grails-async = "5.0.0" +grails-events = "5.0.0" grails-gdoc = "1.0.1" -grails-gorm = "2022.0.0-SNAPSHOT" -grails-gorm-hibernate = "2022.0.0-SNAPSHOT" -grails-gsp = "2022.0.0-SNAPSHOT" -grails-scaffolding = "5.0.0-SNAPSHOT" -grails-views = "5.0.0-SNAPSHOT" +grails-gorm = "2022.0.0" +grails-gorm-hibernate = "2022.0.0" +grails-gsp = "2022.0.0" +grails-scaffolding = "5.0.0" +grails-views = "5.0.0" groovy = "3.0.15" gson = "2.9.1" h2 = "2.1.214" @@ -82,44 +82,44 @@ gradle-extra-configurations-plugin = { module = "com.netflix.nebula:gradle-extra gradle-nexus-plugin = { module = "com.bmuschko:gradle-nexus-plugin", version.ref = "gradle-nexus-plugin" } gradle-nexus-publish-plugin = { module = "io.github.gradle-nexus:publish-plugin", version.ref = "gradle-nexus-publish-plugin" } gradle-tooling-api = { module = "org.gradle:gradle-tooling-api", version.ref = "gradle" } -grails-async = { module = "org.grails:grails-async", version.ref = "grails-async" } -grails-async-gpars = { module = "org.grails:grails-async-gpars", version.ref = "grails-async" } -grails-async-rxjava = { module = "org.grails:grails-async-rxjava", version.ref = "grails-async" } -grails-async-rxjava2 = { module = "org.grails:grails-async-rxjava2", version.ref = "grails-async" } -grails-events = { module = "org.grails:grails-events", version.ref = "grails-events" } -grails-events-compat = { module = "org.grails:grails-events-compat", version.ref = "grails-events" } -grails-events-gpars = { module = "org.grails:grails-events-gpars", version.ref = "grails-events" } -grails-events-rxjava = { module = "org.grails:grails-events-rxjava", version.ref = "grails-events" } -grails-events-rxjava2 = { module = "org.grails:grails-events-rxjava2", version.ref = "grails-events" } -grails-events-spring = { module = "org.grails:grails-events-spring", version.ref = "grails-events" } -grails-events-transform = { module = "org.grails:grails-events-transform", version.ref = "grails-events" } -grails-datastore-core = { module = "org.grails:grails-datastore-core", version.ref = "grails-gorm" } -grails-datastore-async = { module = "org.grails:grails-datastore-async", version.ref = "grails-gorm" } -grails-datastore-gorm = { module = "org.grails:grails-datastore-gorm", version.ref = "grails-gorm" } -grails-datastore-gorm-async = { module = "org.grails:grails-datastore-gorm-async", version.ref = "grails-gorm" } -grails-datastore-gorm-hibernate5 = { module = "org.grails:grails-datastore-gorm-hibernate5", version.ref = "grails-gorm-hibernate" } -grails-datastore-gorm-support = { module = "org.grails:grails-datastore-gorm-support", version.ref = "grails-gorm" } -grails-datastore-gorm-test = { module = "org.grails:grails-datastore-gorm-test", version.ref = "grails-gorm" } -grails-datastore-gorm-validation = { module = "org.grails:grails-datastore-gorm-validation", version.ref = "grails-gorm" } -grails-datastore-web = { module = "org.grails:grails-datastore-web", version.ref = "grails-gorm" } +grails-async = { module = "org.graceframework:grace-async", version.ref = "grails-async" } +grails-async-gpars = { module = "org.graceframework:grace-async-gpars", version.ref = "grails-async" } +grails-async-rxjava = { module = "org.graceframework:grace-async-rxjava", version.ref = "grails-async" } +grails-async-rxjava2 = { module = "org.graceframework:grace-async-rxjava2", version.ref = "grails-async" } +grails-events = { module = "org.graceframework:grace-events", version.ref = "grails-events" } +grails-events-compat = { module = "org.graceframework:grace-events-compat", version.ref = "grails-events" } +grails-events-gpars = { module = "org.graceframework:grace-events-gpars", version.ref = "grails-events" } +grails-events-rxjava = { module = "org.graceframework:grace-events-rxjava", version.ref = "grails-events" } +grails-events-rxjava2 = { module = "org.graceframework:grace-events-rxjava2", version.ref = "grails-events" } +grails-events-spring = { module = "org.graceframework:grace-events-spring", version.ref = "grails-events" } +grails-events-transform = { module = "org.graceframework:grace-events-transform", version.ref = "grails-events" } +grails-datastore-core = { module = "org.graceframework:grace-datastore-core", version.ref = "grails-gorm" } +grails-datastore-async = { module = "org.graceframework:grace-datastore-async", version.ref = "grails-gorm" } +grails-datastore-gorm = { module = "org.graceframework:grace-datastore-gorm", version.ref = "grails-gorm" } +grails-datastore-gorm-async = { module = "org.graceframework:grace-datastore-gorm-async", version.ref = "grails-gorm" } +grails-datastore-gorm-hibernate5 = { module = "org.graceframework:grace-datastore-gorm-hibernate5", version.ref = "grails-gorm-hibernate" } +grails-datastore-gorm-support = { module = "org.graceframework:grace-datastore-gorm-support", version.ref = "grails-gorm" } +grails-datastore-gorm-test = { module = "org.graceframework:grace-datastore-gorm-test", version.ref = "grails-gorm" } +grails-datastore-gorm-validation = { module = "org.graceframework:grace-datastore-gorm-validation", version.ref = "grails-gorm" } +grails-datastore-web = { module = "org.graceframework:grace-datastore-web", version.ref = "grails-gorm" } grails-gdoc-engine = { module = "org.grails:grails-gdoc-engine", version.ref = "grails-gdoc" } -grails-gsp = { module = "org.grails:grails-gsp", version.ref = "grails-gsp" } -grails-plugin-async = { module = "org.grails.plugins:async", version.ref = "grails-async" } -grails-plugin-gsp = { module = "org.grails.plugins:gsp", version.ref = "grails-gsp" } -grails-plugin-events = { module = "org.grails.plugins:events", version.ref = "grails-events" } -grails-scaffolding-core = { module = "org.grails:grails-scaffolding-core", version.ref = "grails-scaffolding" } -grails-taglib = { module = "org.grails:grails-taglib", version.ref = "grails-gsp" } -grails-views-core = { module = "org.grails:views-core", version.ref = "grails-views" } -grails-views-gradle = { module = "org.grails.plugins:views-gradle", version.ref = "grails-views" } -grails-views-json = { module = "org.grails.plugins:views-json", version.ref = "grails-views" } -grails-views-json-templates = { module = "org.grails.plugins:views-json-templates", version.ref = "grails-views" } -grails-views-json-testing-support = { module = "org.grails:views-json-testing-support", version.ref = "grails-views" } -grails-views-markup = { module = "org.grails.plugins:views-markup", version.ref = "grails-views" } -grails-web-gsp = { module = "org.grails:grails-web-gsp", version.ref = "grails-gsp" } -grails-web-gsp-taglib = { module = "org.grails:grails-web-gsp-taglib", version.ref = "grails-gsp" } -grails-web-jsp = { module = "org.grails:grails-web-jsp", version.ref = "grails-gsp" } -grails-web-sitemesh = { module = "org.grails:grails-web-sitemesh", version.ref = "grails-gsp" } -grails-web-taglib = { module = "org.grails:grails-web-taglib", version.ref = "grails-gsp" } +grails-gsp = { module = "org.graceframework:grace-gsp", version.ref = "grails-gsp" } +grails-plugin-async = { module = "org.graceframework.plugins:async", version.ref = "grails-async" } +grails-plugin-gsp = { module = "org.graceframework.plugins:gsp", version.ref = "grails-gsp" } +grails-plugin-events = { module = "org.graceframework.plugins:events", version.ref = "grails-events" } +grails-scaffolding-core = { module = "org.graceframework:grace-scaffolding-core", version.ref = "grails-scaffolding" } +grails-taglib = { module = "org.graceframework:grace-taglib", version.ref = "grails-gsp" } +grails-views-core = { module = "org.graceframework:views-core", version.ref = "grails-views" } +grails-views-gradle = { module = "org.graceframework.plugins:views-gradle", version.ref = "grails-views" } +grails-views-json = { module = "org.graceframework.plugins:views-json", version.ref = "grails-views" } +grails-views-json-templates = { module = "org.graceframework.plugins:views-json-templates", version.ref = "grails-views" } +grails-views-json-testing-support = { module = "org.graceframework:views-json-testing-support", version.ref = "grails-views" } +grails-views-markup = { module = "org.graceframework.plugins:views-markup", version.ref = "grails-views" } +grails-web-gsp = { module = "org.graceframework:grace-web-gsp", version.ref = "grails-gsp" } +grails-web-gsp-taglib = { module = "org.graceframework:grace-web-gsp-taglib", version.ref = "grails-gsp" } +grails-web-jsp = { module = "org.graceframework:grace-web-jsp", version.ref = "grails-gsp" } +grails-web-sitemesh = { module = "org.graceframework:grace-web-sitemesh", version.ref = "grails-gsp" } +grails-web-taglib = { module = "org.graceframework:grace-web-taglib", version.ref = "grails-gsp" } groovy-ant = { module = "org.codehaus.groovy:groovy-ant", version.ref = "groovy" } groovy-bom = { module = "org.codehaus.groovy:groovy-bom", version.ref = "groovy" } groovy-console = { module = "org.codehaus.groovy:groovy-console", version.ref = "groovy" } diff --git a/grails-cli/README.md b/grails-cli/README.md deleted file mode 100644 index c015961ca0..0000000000 --- a/grails-cli/README.md +++ /dev/null @@ -1 +0,0 @@ -## grails-cli diff --git a/grails-cli/build.gradle b/grails-cli/build.gradle deleted file mode 100644 index 3bcc629383..0000000000 --- a/grails-cli/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - - api libs.groovy.templates -} diff --git a/grails-dependencies/README.md b/grails-dependencies/README.md deleted file mode 100644 index cd2d52a9d5..0000000000 --- a/grails-dependencies/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-dependencies - diff --git a/grails-docs/README.md b/grails-docs/README.md deleted file mode 100644 index 8e42006cc7..0000000000 --- a/grails-docs/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-docs - diff --git a/grails-encoder/README.md b/grails-encoder/README.md deleted file mode 100644 index 7a772b9f43..0000000000 --- a/grails-encoder/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-encoder - diff --git a/grails-encoder/build.gradle b/grails-encoder/build.gradle deleted file mode 100644 index 686d3ae0ac..0000000000 --- a/grails-encoder/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-util") - - api libs.groovy.json - api libs.spring.context - api libs.spring.web -} diff --git a/grails-gradle-model/README.md b/grails-gradle-model/README.md deleted file mode 100644 index 4ac0ee46a5..0000000000 --- a/grails-gradle-model/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-gradle-model - diff --git a/grails-gradle-plugin/build.gradle b/grails-gradle-plugin/build.gradle deleted file mode 100644 index a33dfc353f..0000000000 --- a/grails-gradle-plugin/build.gradle +++ /dev/null @@ -1,122 +0,0 @@ -buildscript { - repositories { - maven { url "https://plugins.gradle.org/m2/" } - maven { url 'https://repo.gradle.org/gradle/libs-releases' } - } -} - -repositories { - mavenCentral() - maven { url "https://repo.grails.org/grails/core" } - maven { url 'https://repo.gradle.org/gradle/libs-releases' } -} - -apply plugin: 'java-gradle-plugin' - -configurations { - documentation - all*.exclude group: 'org.codehaus.groovy', module: 'groovy-xml' -} - -dependencies { - api project(":grails-bootstrap") - api project(":grails-gradle-model") - api project(":grails-shell"), { - exclude group: "org.slf4j", module: "slf4j-simple" - } - api gradleApi() - api libs.gradle.extra.configurations.plugin - api libs.gradle.nexus.publish.plugin - api libs.gradle.nexus.plugin - api libs.maven.model - api libs.spring.boot.gradle.plugin - api libs.spring.dependency.management.plugin - - documentation libs.jansi - documentation libs.groovy.picocli -} - -gradlePlugin { - plugins { - grailsCore { - displayName = "Grails Core Gradle Plugin" - description = 'The main Grails gradle plugin implementation' - id = 'org.grails.grails-core' - implementationClass = 'org.grails.gradle.plugin.core.GrailsGradlePlugin' - } - grailsDoc { - displayName = "Grails Doc Gradle Plugin" - description = 'Adds Grails doc publishing support' - id = 'org.grails.grails-doc' - implementationClass = 'org.grails.gradle.plugin.doc.GrailsDocGradlePlugin' - } - grailsGsp { - displayName = "Grails GSP Gradle Plugin" - description = 'A plugin that adds support for compiling Groovy Server Pages (GSP)' - id = 'org.grails.grails-gsp' - implementationClass = 'org.grails.gradle.plugin.web.gsp.GroovyPagePlugin' - } - grailsPlugin { - displayName = "Grails-Plugin Gradle Plugin" - description = 'A Gradle plugin for Grails plugins' - id = 'org.grails.grails-plugin' - implementationClass = 'org.grails.gradle.plugin.core.GrailsPluginGradlePlugin' - } - grailsProfile { - displayName = "Grails Profile Gradle Plugin" - description = 'A plugin that is capable of compiling a Grails profile into a JAR file for distribution' - id = 'org.grails.grails-profile' - implementationClass = 'org.grails.gradle.plugin.profiles.GrailsProfileGradlePlugin' - } - grailsWeb { - displayName = "Grails Web Gradle Plugin" - description = 'Adds web specific extensions' - id = 'org.grails.grails-web' - implementationClass = 'org.grails.gradle.plugin.web.GrailsWebGradlePlugin' - } - grailsPluginPublish { - displayName = "Grails Publish Gradle Plugin" - description = 'A plugin to setup publishing to Grails central repo' - id = 'org.grails.internal.grails-plugin-publish' - implementationClass = 'org.grails.gradle.plugin.publishing.internal.GrailsCentralPublishGradlePlugin' - } - grailsProfilePublish { - displayName = "Grails Profile Publish Plugin" - description = 'A plugin for publishing profiles' - id = 'org.grails.internal.grails-profile-publish' - implementationClass = 'org.grails.gradle.plugin.profiles.internal.GrailsProfilePublishGradlePlugin' - } - } -} - -jar { - manifest.mainAttributes( - "Built-By": System.properties['user.name'], - "Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")", - "Implementation-Title": "Grails", - "Implementation-Version": projectVersion, - "Implementation-Vendor": 'grails.org') -} - -configure([compileGroovy, compileTestGroovy]) { - groovyOptions.fork(memoryInitialSize: '128M', memoryMaximumSize: '1G') - groovyOptions.encoding = "UTF-8" - options.encoding = "UTF-8" -} - -configure([compileJava, compileTestJava]) { - options.deprecation = true - options.debug = true -} - -configure([groovydoc]) { - destinationDir = project.file("build/docs/api") - classpath += configurations.documentation -} - -configure([javadoc]) { - options.encoding "UTF-8" - options.docEncoding "UTF-8" - options.charSet "UTF-8" - options.jFlags "-Xms64M", "-Xmx512M" -} diff --git a/grails-logging/build.gradle b/grails-logging/build.gradle deleted file mode 100644 index 9a260428d3..0000000000 --- a/grails-logging/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - api project(":grails-core") -} diff --git a/grails-plugin-api/README.md b/grails-plugin-api/README.md deleted file mode 100644 index fd2a3ebe9d..0000000000 --- a/grails-plugin-api/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-api - diff --git a/grails-plugin-codecs/README.md b/grails-plugin-codecs/README.md deleted file mode 100644 index c4771bbbfa..0000000000 --- a/grails-plugin-codecs/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-codecs - diff --git a/grails-plugin-codecs/build.gradle b/grails-plugin-codecs/build.gradle deleted file mode 100644 index bb20bed54b..0000000000 --- a/grails-plugin-codecs/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -dependencies { - api project(":grails-api") - api project(":grails-core") - api project(":grails-plugin-api") - api project(":grails-encoder") - runtimeOnly project(":grails-codecs") - - api(libs.spring.boot.autoconfigure) - - testImplementation project(":grails-test") - testImplementation project(":grails-web-common") -} diff --git a/grails-plugin-controllers/README.md b/grails-plugin-controllers/README.md deleted file mode 100644 index bceac82e80..0000000000 --- a/grails-plugin-controllers/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-controllers - diff --git a/grails-plugin-controllers/build.gradle b/grails-plugin-controllers/build.gradle deleted file mode 100644 index 2d3935a6d2..0000000000 --- a/grails-plugin-controllers/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-core") - api project(":grails-plugin-api") - api project(":grails-plugin-mimetypes") - api project(":grails-plugin-validation") - api project(":grails-util") - api project(":grails-web") - - api(libs.spring.boot.autoconfigure) - - testImplementation project(":grails-test") -} diff --git a/grails-plugin-converters/README.md b/grails-plugin-converters/README.md deleted file mode 100644 index b7909bdc40..0000000000 --- a/grails-plugin-converters/README.md +++ /dev/null @@ -1 +0,0 @@ -## grails-plugin-converters diff --git a/grails-plugin-core/README.md b/grails-plugin-core/README.md deleted file mode 100644 index c955cfca3d..0000000000 --- a/grails-plugin-core/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-core - diff --git a/grails-plugin-databinding/README.md b/grails-plugin-databinding/README.md deleted file mode 100644 index f7df623893..0000000000 --- a/grails-plugin-databinding/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-databinding - diff --git a/grails-plugin-databinding/build.gradle b/grails-plugin-databinding/build.gradle deleted file mode 100644 index d4fbce482e..0000000000 --- a/grails-plugin-databinding/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ - dependencies { - api project(":grails-api") - api project(":grails-plugin-api") - api project(":grails-web-databinding") - - api libs.spring.boot.autoconfigure - - testImplementation project(":grails-test-support") -} diff --git a/grails-plugin-datasource/README.md b/grails-plugin-datasource/README.md deleted file mode 100644 index 8c1117be39..0000000000 --- a/grails-plugin-datasource/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-datasource - diff --git a/grails-plugin-domain-class/README.md b/grails-plugin-domain-class/README.md deleted file mode 100644 index 9446bf393b..0000000000 --- a/grails-plugin-domain-class/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-domain-class - diff --git a/grails-plugin-i18n/README.md b/grails-plugin-i18n/README.md deleted file mode 100644 index 5c5875c42c..0000000000 --- a/grails-plugin-i18n/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-i18n - diff --git a/grails-plugin-i18n/build.gradle b/grails-plugin-i18n/build.gradle deleted file mode 100644 index 39e9e1dcc0..0000000000 --- a/grails-plugin-i18n/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-core") - api project(":grails-plugin-api") - api project(":grails-util") - compileOnly project(":grails-web-common") - - api libs.groovy.ant - api libs.spring.boot.autoconfigure - annotationProcessor(libs.spring.boot.configurationProcessor) -} diff --git a/grails-plugin-interceptors/build.gradle b/grails-plugin-interceptors/build.gradle deleted file mode 100644 index 76d24fdd59..0000000000 --- a/grails-plugin-interceptors/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-core") - api project(":grails-plugin-api") - api project(":grails-plugin-controllers") - api project(":grails-plugin-url-mappings") - - api libs.spring.boot.autoconfigure - - testImplementation project(":grails-test") -} diff --git a/grails-plugin-management/README.md b/grails-plugin-management/README.md deleted file mode 100644 index 08c264aff2..0000000000 --- a/grails-plugin-management/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-management - diff --git a/grails-plugin-management/build.gradle b/grails-plugin-management/build.gradle deleted file mode 100644 index f3d6542117..0000000000 --- a/grails-plugin-management/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-plugin-api") - - api libs.spring.boot.actuator.autoconfigure - api libs.spring.boot.autoconfigure - compileOnly libs.jackson.databind - - testImplementation project(":grails-test") -} diff --git a/grails-plugin-mimetypes/README.md b/grails-plugin-mimetypes/README.md deleted file mode 100644 index f0ff0de07c..0000000000 --- a/grails-plugin-mimetypes/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-mimetypes - diff --git a/grails-plugin-mimetypes/build.gradle b/grails-plugin-mimetypes/build.gradle deleted file mode 100644 index bf5d60dca7..0000000000 --- a/grails-plugin-mimetypes/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-plugin-api") - api project(":grails-web") - - api libs.spring.boot.autoconfigure - - testImplementation project(":grails-test") -} diff --git a/grails-plugin-rest/README.md b/grails-plugin-rest/README.md deleted file mode 100644 index 4ad832dcb8..0000000000 --- a/grails-plugin-rest/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-rest - diff --git a/grails-plugin-services/README.md b/grails-plugin-services/README.md deleted file mode 100644 index 09fe3400a9..0000000000 --- a/grails-plugin-services/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-services - diff --git a/grails-plugin-services/build.gradle b/grails-plugin-services/build.gradle deleted file mode 100644 index da66049bf2..0000000000 --- a/grails-plugin-services/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-core") - api project(':grails-plugin-api') - api project(':grails-util') - - api libs.spring.tx -} diff --git a/grails-plugin-url-mappings/README.md b/grails-plugin-url-mappings/README.md deleted file mode 100644 index 26e3d7ac56..0000000000 --- a/grails-plugin-url-mappings/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-url-mappings - diff --git a/grails-plugin-url-mappings/build.gradle b/grails-plugin-url-mappings/build.gradle deleted file mode 100644 index c3455c8466..0000000000 --- a/grails-plugin-url-mappings/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-core") - api project(":grails-plugin-controllers") - api project(":grails-util") - api project(":grails-web-url-mappings") - - annotationProcessor libs.spring.boot.configurationProcessor - api libs.spring.boot.autoconfigure -} diff --git a/grails-plugin-validation/README.md b/grails-plugin-validation/README.md deleted file mode 100644 index d4de238b2d..0000000000 --- a/grails-plugin-validation/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-plugin-validation - diff --git a/grails-spring-boot/README.md b/grails-spring-boot/README.md deleted file mode 100644 index 0424dbd517..0000000000 --- a/grails-spring-boot/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-spring-boot - diff --git a/grails-spring-boot/build.gradle b/grails-spring-boot/build.gradle deleted file mode 100644 index 4cdc768580..0000000000 --- a/grails-spring-boot/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-util") - - api libs.spring.beans - api libs.spring.boot - api libs.spring.context - api libs.spring.core - api libs.spring.tx - - testImplementation project(":grails-test-support") -} diff --git a/grails-spring/README.md b/grails-spring/README.md deleted file mode 100644 index 7606947886..0000000000 --- a/grails-spring/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-spring - diff --git a/grails-test-suite-base/README.md b/grails-test-suite-base/README.md deleted file mode 100644 index 4752a3d25d..0000000000 --- a/grails-test-suite-base/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-test-suite-base - diff --git a/grails-test-suite-base/build.gradle b/grails-test-suite-base/build.gradle deleted file mode 100644 index bb7c303b08..0000000000 --- a/grails-test-suite-base/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -dependencies { - api project(":grails-api") - api project(":grails-bootstrap") - api project(":grails-core") - api project(":grails-plugin-converters") - api project(":grails-plugin-core") - api project(":grails-plugin-domain-class") - api project(":grails-spring") - api project(":grails-web") - api project(":grails-test") -} diff --git a/grails-test-suite-persistence/README.md b/grails-test-suite-persistence/README.md deleted file mode 100644 index 2420dedcd9..0000000000 --- a/grails-test-suite-persistence/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-test-suite-persistence - diff --git a/grails-test-suite-uber/README.md b/grails-test-suite-uber/README.md deleted file mode 100644 index adf9a623c7..0000000000 --- a/grails-test-suite-uber/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-test-suite-uber - diff --git a/grails-test-suite-web/README.md b/grails-test-suite-web/README.md deleted file mode 100644 index 6195eb7493..0000000000 --- a/grails-test-suite-web/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-test-suite-web - diff --git a/grails-test/README.md b/grails-test/README.md deleted file mode 100644 index 176ef9ffd7..0000000000 --- a/grails-test/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-test - diff --git a/grails-web-boot/README.md b/grails-web-boot/README.md deleted file mode 100644 index 24b5f69093..0000000000 --- a/grails-web-boot/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-web-boot - diff --git a/grails-web-boot/build.gradle b/grails-web-boot/build.gradle deleted file mode 100644 index af6621a1db..0000000000 --- a/grails-web-boot/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -dependencies { - api project(":grails-web-common") - - api libs.javax.servlet - testImplementation project(":grails-plugin-controllers") - testImplementation libs.tomcat.embed.core - testRuntimeOnly project(":grails-plugin-i18n") - testRuntimeOnly project(":grails-plugin-url-mappings") -} diff --git a/grails-web-common/README.md b/grails-web-common/README.md deleted file mode 100644 index 8ec7a6a1c6..0000000000 --- a/grails-web-common/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-web-common - diff --git a/grails-web-mvc/README.md b/grails-web-mvc/README.md deleted file mode 100644 index ae9482d752..0000000000 --- a/grails-web-mvc/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-web-mvc - diff --git a/grails-web-url-mappings/README.md b/grails-web-url-mappings/README.md deleted file mode 100644 index 7f9ec065cc..0000000000 --- a/grails-web-url-mappings/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-web-url-mappings - diff --git a/grails-web/README.md b/grails-web/README.md deleted file mode 100644 index f134129995..0000000000 --- a/grails-web/README.md +++ /dev/null @@ -1,2 +0,0 @@ -## grails-web - diff --git a/settings.gradle b/settings.gradle index 4a57cc20b8..d22a98ff28 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,59 +1,59 @@ -rootProject.name = "grails-framework" +rootProject.name = "Grace.Framework" include ( - 'grails-api', - 'grails-boot', - 'grails-bootstrap', - 'grails-cli', - 'grails-codecs', - 'grails-console', - 'grails-core', - 'grails-databinding', - 'grails-docs', - 'grails-encoder', - 'grails-logging', - 'grails-shell', - 'grails-spring', - 'grails-spring-boot', - 'grails-test', - 'grails-test-support', - 'grails-util', - 'grails-web', - 'grails-web-common', - 'grails-web-boot', - 'grails-web-databinding', - 'grails-web-mvc', - 'grails-web-url-mappings', + 'grace-api', + 'grace-boot', + 'grace-bootstrap', + 'grace-cli', + 'grace-codecs', + 'grace-console', + 'grace-core', + 'grace-databinding', + 'grace-docs', + 'grace-encoder', + 'grace-logging', + 'grace-shell', + 'grace-spring', + 'grace-spring-boot', + 'grace-test', + 'grace-test-support', + 'grace-util', + 'grace-web', + 'grace-web-common', + 'grace-web-boot', + 'grace-web-databinding', + 'grace-web-mvc', + 'grace-web-url-mappings', // POM / BOMs - 'grails-dependencies', - 'grails-bom', + 'grace-dependencies', + 'grace-bom', // Plugins - 'grails-plugin-api', - 'grails-plugin-codecs', - 'grails-plugin-controllers', - 'grails-plugin-converters', - 'grails-plugin-core', - 'grails-plugin-databinding', - 'grails-plugin-datasource', - 'grails-plugin-domain-class', - 'grails-plugin-interceptors', - 'grails-plugin-i18n', - 'grails-plugin-management', - 'grails-plugin-mimetypes', - 'grails-plugin-rest', - 'grails-plugin-services', - 'grails-plugin-url-mappings', - 'grails-plugin-validation', + 'grace-plugin-api', + 'grace-plugin-codecs', + 'grace-plugin-controllers', + 'grace-plugin-converters', + 'grace-plugin-core', + 'grace-plugin-databinding', + 'grace-plugin-datasource', + 'grace-plugin-domain-class', + 'grace-plugin-interceptors', + 'grace-plugin-i18n', + 'grace-plugin-management', + 'grace-plugin-mimetypes', + 'grace-plugin-rest', + 'grace-plugin-services', + 'grace-plugin-url-mappings', + 'grace-plugin-validation', // Test Suite - 'grails-test-suite-base', - 'grails-test-suite-persistence', - 'grails-test-suite-uber', - 'grails-test-suite-web', + 'grace-test-suite-base', + 'grace-test-suite-persistence', + 'grace-test-suite-uber', + 'grace-test-suite-web', // Gradle Plugin - 'grails-gradle-model', - 'grails-gradle-plugin' + 'grace-gradle-model', + 'grace-gradle-plugin' ) \ No newline at end of file