From e0820f87f8b9ea924bfe6ad78f28e6066eed105b Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 20 Jun 2011 12:26:36 -0500 Subject: [PATCH] revert to the old "install" task which sets the development workspace root up as a valid GRAILS_HOME --- .gitignore | 10 ++- .../src/grails/grails-home/INSTALL => INSTALL | 0 .../src/grails/grails-home/LICENSE => LICENSE | 0 build.gradle | 49 ++++++++++-- .../dependencies.txt => dependencies.txt | 0 gradle/assemble.gradle | 71 +++++++++++++----- .../grails/util/PluginBuildSettings.groovy | 1 - grails-resources/build.gradle | 48 ++++-------- .../src/grails => }/ant/build.xml | 0 .../{grails-home/src/grails => }/ant/ivy.xml | 0 .../src/grails => }/ant/ivysettings.xml | 0 .../grails-app/conf/BootStrap.groovy | 0 .../grails-app/conf/BuildConfig.groovy | 0 .../grails => }/grails-app/conf/Config.groovy | 0 .../grails-app/conf/DataSource.groovy | 0 .../grails-app/conf/UrlMappings.groovy | 0 .../grails-app/conf/spring/resources.groovy | 0 .../grails-app/i18n/messages.properties | 0 .../grails-app/i18n/messages_cs_CZ.properties | 0 .../grails-app/i18n/messages_da.properties | 0 .../grails-app/i18n/messages_de.properties | 0 .../grails-app/i18n/messages_es.properties | 0 .../grails-app/i18n/messages_fr.properties | 0 .../grails-app/i18n/messages_it.properties | 0 .../grails-app/i18n/messages_ja.properties | 0 .../grails-app/i18n/messages_nl.properties | 0 .../grails-app/i18n/messages_pt_BR.properties | 0 .../grails-app/i18n/messages_pt_PT.properties | 0 .../grails-app/i18n/messages_ru.properties | 0 .../grails-app/i18n/messages_sv.properties | 0 .../grails-app/i18n/messages_th.properties | 0 .../grails-app/i18n/messages_zh_CN.properties | 0 .../grails => }/grails-app/views/error.gsp | 0 .../grails => }/grails-app/views/index.gsp | 0 .../grails-app/views/layouts/main.gsp | 0 .../src/grails => }/grails-macros.xml | 0 .../{grails-home/bin => home/bash}/cygrails | 0 .../{grails-home/bin => home/bash}/grails | 0 .../bin => home/bash}/grails-debug | 0 .../bin => home/bash}/grails-debug.bat | 0 .../{grails-home/bin => home/bash}/grails.bat | 0 .../bin => home/bash}/startGrails | 0 .../bin => home/bash}/startGrails.bat | 0 .../conf/groovy-starter.conf | 0 .../grails/{grails-home => home/docs}/README | 0 .../dsl-support/dsld/grails.dsld | 0 .../resources => home}/tests/junit-frames.xsl | 0 .../tests/junit-noframes.xsl | 0 .../plugin/grails-app/conf/BuildConfig.groovy | 0 .../plugin/grails-app/conf/Config.groovy | 0 .../templates/artifacts/Controller.groovy | 0 .../templates/artifacts/DomainClass.groovy | 0 .../templates/artifacts/Filters.groovy | 0 .../templates/artifacts/Script.groovy | 0 .../templates/artifacts/Service.groovy | 0 .../templates/artifacts/TagLib.groovy | 0 .../templates/artifacts/Tests.groovy | 0 .../templates/artifacts/WebTest.groovy | 0 .../templates/artifacts/hibernate.cfg.xml | 0 .../templates/ide-support/eclipse/.classpath | 0 .../templates/ide-support/eclipse/.project | 0 ....codehaus.groovy.eclipse.preferences.prefs | 0 .../ide-support/git/grailsProject.gitignore | 0 .../intellij/ideaGrailsProject.iml | 0 .../intellij/ideaGrailsProject.ipr | 0 .../intellij/ideaGrailsProject.iws | 0 .../ide-support/textmate/project.tmproj | 0 .../templates/plugins/GrailsPlugin.groovy | 0 .../templates/plugins/scripts/_Install.groovy | 0 .../plugins/scripts/_Uninstall.groovy | 0 .../templates/plugins/scripts/_Upgrade.groovy | 0 .../templates/scaffolding/Controller.groovy | 0 .../templates/scaffolding/Test.groovy | 0 .../templates/scaffolding/_form.gsp | 0 .../templates/scaffolding/create.gsp | 0 .../templates/scaffolding/edit.gsp | 0 .../templates/scaffolding/list.gsp | 0 .../scaffolding/renderEditor.template | 0 .../templates/scaffolding/show.gsp | 0 .../templates/testing/Controller.groovy | 0 .../templates/testing/DomainClass.groovy | 0 .../templates/testing/Filters.groovy | 0 .../templates/testing/Generic.groovy | 0 .../templates/testing/Service.groovy | 0 .../templates/testing/TagLib.groovy | 0 .../war/WEB-INF/applicationContext.xml | 0 .../src => }/war/WEB-INF/log4j.properties | 0 .../src => }/war/WEB-INF/sitemesh.xml | 0 .../war/WEB-INF/test-applicationContext.xml | 0 .../src => }/war/WEB-INF/tld/2.3/c.tld | 0 .../src => }/war/WEB-INF/tld/2.3/fmt.tld | 0 .../src => }/war/WEB-INF/tld/2.4/c.tld | 0 .../src => }/war/WEB-INF/tld/2.4/fmt.tld | 0 .../src => }/war/WEB-INF/tld/2.5/c.tld | 0 .../src => }/war/WEB-INF/tld/2.5/fmt.tld | 0 .../src => }/war/WEB-INF/tld/3.0/c.tld | 0 .../src => }/war/WEB-INF/tld/3.0/fmt.tld | 0 .../src => }/war/WEB-INF/tld/grails.tld | 0 .../src => }/war/WEB-INF/tld/spring.tld | 0 .../src => }/war/WEB-INF/web2.4.template.xml | 0 .../src => }/war/WEB-INF/web2.5.template.xml | 0 .../src => }/war/WEB-INF/web3.0.template.xml | 0 .../grails-home/src => }/war/css/main.css | 0 .../grails-home/src => }/war/css/mobile.css | 0 .../war/images/apple-touch-icon-retina.png | Bin .../src => }/war/images/apple-touch-icon.png | Bin .../media/icons => war/images}/favicon.ico | Bin .../src => }/war/images/grails_logo.jpg | Bin .../src => }/war/images/grails_logo.png | Bin .../src => }/war/images/leftnav_btm.png | Bin .../war/images/leftnav_midstretch.png | Bin .../src => }/war/images/leftnav_top.png | Bin .../src => }/war/images/skin/database_add.png | Bin .../war/images/skin/database_delete.png | Bin .../war/images/skin/database_edit.png | Bin .../war/images/skin/database_save.png | Bin .../war/images/skin/database_table.png | Bin .../src => }/war/images/skin/exclamation.png | Bin .../src => }/war/images/skin/house.png | Bin .../src => }/war/images/skin/information.png | Bin .../src => }/war/images/skin/shadow.jpg | Bin .../src => }/war/images/skin/sorted_asc.gif | Bin .../src => }/war/images/skin/sorted_desc.gif | Bin .../src => }/war/images/spinner.gif | Bin .../src => }/war/images/springsource.png | Bin .../src => }/war/js/application.js | 0 grails-scripts/build.gradle | 11 +-- ...DefaultGrailsTemplateGeneratorTests.groovy | 4 +- .../GrailsTemplateGeneratorsTests.java | 4 +- .../ext/jsp/GroovyPageWithJSPTagsTests.groovy | 4 +- .../pages/ext/jsp/IterativeJspTagTests.groovy | 2 +- .../MockRootLoaderTagLibraryResolver.groovy | 2 +- .../war/images => media/icons}/favicon.ico | Bin .../media => media}/icons/favicon16.png | Bin .../media => media}/icons/favicon32.png | Bin .../media => media}/icons/favicon48.png | Bin .../logos/branding_blck_whit_colr.jpg | Bin .../logos/branding_blck_whit_colr.png | Bin .../logos/grails-color-logo.svg | 0 .../media => media}/logos/grails-logo.eps | 0 .../media => media}/logos/grails-logo.svg | 0 .../logos/grailslogo-medium.png | Bin .../media => media}/logos/grailslogo.png | Bin .../src/scripts => scripts}/AddProxy_.groovy | 0 .../src/scripts => scripts}/Bootstrap.groovy | 0 .../src/scripts => scripts}/BugReport.groovy | 0 .../src/scripts => scripts}/Clean.groovy | 0 .../scripts => scripts}/ClearProxy_.groovy | 0 .../src/scripts => scripts}/Compile.groovy | 0 .../src/scripts => scripts}/Console.groovy | 0 .../src/scripts => scripts}/CreateApp_.groovy | 0 .../CreateController.groovy | 0 .../CreateDomainClass.groovy | 0 .../scripts => scripts}/CreateFilters.groovy | 0 .../CreateHibernateCfgXml.groovy | 0 .../CreateIntegrationTest.groovy | 0 .../scripts => scripts}/CreatePlugin_.groovy | 0 .../scripts => scripts}/CreateScript.groovy | 0 .../scripts => scripts}/CreateService.groovy | 0 .../scripts => scripts}/CreateTagLib.groovy | 0 .../scripts => scripts}/CreateUnitTest.groovy | 0 .../DependencyReport.groovy | 0 .../src/scripts => scripts}/Doc.groovy | 0 .../scripts => scripts}/GenerateAll.groovy | 0 .../GenerateController.groovy | 0 .../scripts => scripts}/GenerateViews.groovy | 0 .../src/scripts => scripts}/Help_.groovy | 0 .../src/scripts => scripts}/Init.groovy | 0 .../InstallDependency.groovy | 0 .../scripts => scripts}/InstallPlugin.groovy | 0 .../InstallTemplates.groovy | 0 .../scripts => scripts}/IntegrateWith.groovy | 0 .../scripts => scripts}/Interactive.groovy | 0 .../ListPluginUpdates.groovy | 0 .../scripts => scripts}/ListPlugins_.groovy | 0 .../src/scripts => scripts}/Package.groovy | 0 .../scripts => scripts}/PackagePlugin_.groovy | 0 .../scripts => scripts}/PluginInfo_.groovy | 0 .../scripts => scripts}/RemoveProxy_.groovy | 0 .../src/scripts => scripts}/RunApp.groovy | 0 .../src/scripts => scripts}/RunScript.groovy | 0 .../src/scripts => scripts}/RunWar.groovy | 0 .../scripts => scripts}/SchemaExport.groovy | 0 .../src/scripts => scripts}/SetProxy_.groovy | 0 .../src/scripts => scripts}/SetVersion.groovy | 0 .../src/scripts => scripts}/Shell.groovy | 0 .../src/scripts => scripts}/Stats.groovy | 0 .../src/scripts => scripts}/TestApp.groovy | 0 .../UninstallPlugin.groovy | 0 .../src/scripts => scripts}/Upgrade.groovy | 0 .../src/scripts => scripts}/War.groovy | 0 .../_GrailsArgParsing.groovy | 0 .../_GrailsBootstrap.groovy | 0 .../_GrailsClasspath.groovy | 0 .../scripts => scripts}/_GrailsClean.groovy | 0 .../scripts => scripts}/_GrailsCompile.groovy | 0 .../_GrailsCreateArtifacts.groovy | 0 .../_GrailsCreateProject.groovy | 0 .../scripts => scripts}/_GrailsDocs.groovy | 0 .../scripts => scripts}/_GrailsEvents.groovy | 0 .../_GrailsGenerate.groovy | 0 .../scripts => scripts}/_GrailsInit.groovy | 0 .../scripts => scripts}/_GrailsPackage.groovy | 0 .../_GrailsPluginDev.groovy | 0 .../scripts => scripts}/_GrailsPlugins.groovy | 0 .../scripts => scripts}/_GrailsProxy.groovy | 0 .../src/scripts => scripts}/_GrailsRun.groovy | 0 .../_GrailsSettings.groovy | 0 .../scripts => scripts}/_GrailsTest.groovy | 0 .../src/scripts => scripts}/_GrailsWar.groovy | 0 .../_PackagePlugins.groovy | 0 .../_PluginDependencies.groovy | 0 .../src/scripts => scripts}/log4j.properties | 0 213 files changed, 127 insertions(+), 79 deletions(-) rename grails-resources/src/grails/grails-home/INSTALL => INSTALL (100%) rename grails-resources/src/grails/grails-home/LICENSE => LICENSE (100%) rename grails-resources/src/grails/grails-home/dependencies.txt => dependencies.txt (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/ant/build.xml (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/ant/ivy.xml (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/ant/ivysettings.xml (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/conf/BootStrap.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/conf/BuildConfig.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/conf/Config.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/conf/DataSource.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/conf/UrlMappings.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/conf/spring/resources.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_cs_CZ.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_da.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_de.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_es.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_fr.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_it.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_ja.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_nl.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_pt_BR.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_pt_PT.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_ru.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_sv.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_th.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/i18n/messages_zh_CN.properties (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/views/error.gsp (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/views/index.gsp (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-app/views/layouts/main.gsp (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/grails-macros.xml (100%) rename grails-resources/src/grails/{grails-home/bin => home/bash}/cygrails (100%) rename grails-resources/src/grails/{grails-home/bin => home/bash}/grails (100%) rename grails-resources/src/grails/{grails-home/bin => home/bash}/grails-debug (100%) rename grails-resources/src/grails/{grails-home/bin => home/bash}/grails-debug.bat (100%) rename grails-resources/src/grails/{grails-home/bin => home/bash}/grails.bat (100%) rename grails-resources/src/grails/{grails-home/bin => home/bash}/startGrails (100%) rename grails-resources/src/grails/{grails-home/bin => home/bash}/startGrails.bat (100%) rename grails-resources/src/grails/{grails-home => home}/conf/groovy-starter.conf (100%) rename grails-resources/src/grails/{grails-home => home/docs}/README (100%) rename grails-resources/src/grails/{grails-home => home}/dsl-support/dsld/grails.dsld (100%) rename grails-resources/src/grails/{grails-home/src/resources => home}/tests/junit-frames.xsl (100%) rename grails-resources/src/grails/{grails-home/src/resources => home}/tests/junit-noframes.xsl (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/plugin/grails-app/conf/BuildConfig.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/plugin/grails-app/conf/Config.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/artifacts/Controller.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/artifacts/DomainClass.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/artifacts/Filters.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/artifacts/Script.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/artifacts/Service.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/artifacts/TagLib.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/artifacts/Tests.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/artifacts/WebTest.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/artifacts/hibernate.cfg.xml (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/ide-support/eclipse/.classpath (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/ide-support/eclipse/.project (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/ide-support/eclipse/.settings/org.codehaus.groovy.eclipse.preferences.prefs (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/ide-support/git/grailsProject.gitignore (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/ide-support/intellij/ideaGrailsProject.iml (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/ide-support/intellij/ideaGrailsProject.ipr (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/ide-support/intellij/ideaGrailsProject.iws (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/ide-support/textmate/project.tmproj (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/plugins/GrailsPlugin.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/plugins/scripts/_Install.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/plugins/scripts/_Uninstall.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/plugins/scripts/_Upgrade.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/scaffolding/Controller.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/scaffolding/Test.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/scaffolding/_form.gsp (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/scaffolding/create.gsp (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/scaffolding/edit.gsp (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/scaffolding/list.gsp (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/scaffolding/renderEditor.template (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/scaffolding/show.gsp (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/testing/Controller.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/testing/DomainClass.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/testing/Filters.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/testing/Generic.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/testing/Service.groovy (100%) rename grails-resources/src/grails/{grails-home/src/grails => }/templates/testing/TagLib.groovy (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/applicationContext.xml (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/log4j.properties (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/sitemesh.xml (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/test-applicationContext.xml (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/tld/2.3/c.tld (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/tld/2.3/fmt.tld (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/tld/2.4/c.tld (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/tld/2.4/fmt.tld (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/tld/2.5/c.tld (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/tld/2.5/fmt.tld (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/tld/3.0/c.tld (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/tld/3.0/fmt.tld (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/tld/grails.tld (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/tld/spring.tld (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/web2.4.template.xml (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/web2.5.template.xml (100%) rename grails-resources/src/{grails/grails-home/src => }/war/WEB-INF/web3.0.template.xml (100%) rename grails-resources/src/{grails/grails-home/src => }/war/css/main.css (100%) rename grails-resources/src/{grails/grails-home/src => }/war/css/mobile.css (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/apple-touch-icon-retina.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/apple-touch-icon.png (100%) rename grails-resources/src/{grails/grails-home/media/icons => war/images}/favicon.ico (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/grails_logo.jpg (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/grails_logo.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/leftnav_btm.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/leftnav_midstretch.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/leftnav_top.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/skin/database_add.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/skin/database_delete.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/skin/database_edit.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/skin/database_save.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/skin/database_table.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/skin/exclamation.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/skin/house.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/skin/information.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/skin/shadow.jpg (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/skin/sorted_asc.gif (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/skin/sorted_desc.gif (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/spinner.gif (100%) rename grails-resources/src/{grails/grails-home/src => }/war/images/springsource.png (100%) rename grails-resources/src/{grails/grails-home/src => }/war/js/application.js (100%) rename {grails-resources/src/grails/grails-home/src/war/images => media/icons}/favicon.ico (100%) rename {grails-resources/src/grails/grails-home/media => media}/icons/favicon16.png (100%) rename {grails-resources/src/grails/grails-home/media => media}/icons/favicon32.png (100%) rename {grails-resources/src/grails/grails-home/media => media}/icons/favicon48.png (100%) rename {grails-resources/src/grails/grails-home/media => media}/logos/branding_blck_whit_colr.jpg (100%) rename {grails-resources/src/grails/grails-home/media => media}/logos/branding_blck_whit_colr.png (100%) rename {grails-resources/src/grails/grails-home/media => media}/logos/grails-color-logo.svg (100%) rename {grails-resources/src/grails/grails-home/media => media}/logos/grails-logo.eps (100%) rename {grails-resources/src/grails/grails-home/media => media}/logos/grails-logo.svg (100%) rename {grails-resources/src/grails/grails-home/media => media}/logos/grailslogo-medium.png (100%) rename {grails-resources/src/grails/grails-home/media => media}/logos/grailslogo.png (100%) rename {grails-scripts/src/scripts => scripts}/AddProxy_.groovy (100%) rename {grails-scripts/src/scripts => scripts}/Bootstrap.groovy (100%) rename {grails-scripts/src/scripts => scripts}/BugReport.groovy (100%) rename {grails-scripts/src/scripts => scripts}/Clean.groovy (100%) rename {grails-scripts/src/scripts => scripts}/ClearProxy_.groovy (100%) rename {grails-scripts/src/scripts => scripts}/Compile.groovy (100%) rename {grails-scripts/src/scripts => scripts}/Console.groovy (100%) rename {grails-scripts/src/scripts => scripts}/CreateApp_.groovy (100%) rename {grails-scripts/src/scripts => scripts}/CreateController.groovy (100%) rename {grails-scripts/src/scripts => scripts}/CreateDomainClass.groovy (100%) rename {grails-scripts/src/scripts => scripts}/CreateFilters.groovy (100%) rename {grails-scripts/src/scripts => scripts}/CreateHibernateCfgXml.groovy (100%) rename {grails-scripts/src/scripts => scripts}/CreateIntegrationTest.groovy (100%) rename {grails-scripts/src/scripts => scripts}/CreatePlugin_.groovy (100%) rename {grails-scripts/src/scripts => scripts}/CreateScript.groovy (100%) rename {grails-scripts/src/scripts => scripts}/CreateService.groovy (100%) rename {grails-scripts/src/scripts => scripts}/CreateTagLib.groovy (100%) rename {grails-scripts/src/scripts => scripts}/CreateUnitTest.groovy (100%) rename {grails-scripts/src/scripts => scripts}/DependencyReport.groovy (100%) rename {grails-scripts/src/scripts => scripts}/Doc.groovy (100%) rename {grails-scripts/src/scripts => scripts}/GenerateAll.groovy (100%) rename {grails-scripts/src/scripts => scripts}/GenerateController.groovy (100%) rename {grails-scripts/src/scripts => scripts}/GenerateViews.groovy (100%) rename {grails-scripts/src/scripts => scripts}/Help_.groovy (100%) rename {grails-scripts/src/scripts => scripts}/Init.groovy (100%) rename {grails-scripts/src/scripts => scripts}/InstallDependency.groovy (100%) rename {grails-scripts/src/scripts => scripts}/InstallPlugin.groovy (100%) rename {grails-scripts/src/scripts => scripts}/InstallTemplates.groovy (100%) rename {grails-scripts/src/scripts => scripts}/IntegrateWith.groovy (100%) rename {grails-scripts/src/scripts => scripts}/Interactive.groovy (100%) rename {grails-scripts/src/scripts => scripts}/ListPluginUpdates.groovy (100%) rename {grails-scripts/src/scripts => scripts}/ListPlugins_.groovy (100%) rename {grails-scripts/src/scripts => scripts}/Package.groovy (100%) rename {grails-scripts/src/scripts => scripts}/PackagePlugin_.groovy (100%) rename {grails-scripts/src/scripts => scripts}/PluginInfo_.groovy (100%) rename {grails-scripts/src/scripts => scripts}/RemoveProxy_.groovy (100%) rename {grails-scripts/src/scripts => scripts}/RunApp.groovy (100%) rename {grails-scripts/src/scripts => scripts}/RunScript.groovy (100%) rename {grails-scripts/src/scripts => scripts}/RunWar.groovy (100%) rename {grails-scripts/src/scripts => scripts}/SchemaExport.groovy (100%) rename {grails-scripts/src/scripts => scripts}/SetProxy_.groovy (100%) rename {grails-scripts/src/scripts => scripts}/SetVersion.groovy (100%) rename {grails-scripts/src/scripts => scripts}/Shell.groovy (100%) rename {grails-scripts/src/scripts => scripts}/Stats.groovy (100%) rename {grails-scripts/src/scripts => scripts}/TestApp.groovy (100%) rename {grails-scripts/src/scripts => scripts}/UninstallPlugin.groovy (100%) rename {grails-scripts/src/scripts => scripts}/Upgrade.groovy (100%) rename {grails-scripts/src/scripts => scripts}/War.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsArgParsing.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsBootstrap.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsClasspath.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsClean.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsCompile.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsCreateArtifacts.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsCreateProject.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsDocs.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsEvents.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsGenerate.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsInit.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsPackage.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsPluginDev.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsPlugins.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsProxy.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsRun.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsSettings.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsTest.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_GrailsWar.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_PackagePlugins.groovy (100%) rename {grails-scripts/src/scripts => scripts}/_PluginDependencies.groovy (100%) rename {grails-scripts/src/scripts => scripts}/log4j.properties (100%) diff --git a/.gitignore b/.gitignore index 4d8f672e19c..3db416df80b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,21 @@ -/install/ +/src /out +/bin +/conf +/dsl-support *.ipr idea +/lib /doc /cobertura.ser /cruise/coverage/report /downloads +/test/groovy/grails/config +/test/grails-app stacktrace.log +/dist /idea-target +target /build /grails.iws .gradle diff --git a/grails-resources/src/grails/grails-home/INSTALL b/INSTALL similarity index 100% rename from grails-resources/src/grails/grails-home/INSTALL rename to INSTALL diff --git a/grails-resources/src/grails/grails-home/LICENSE b/LICENSE similarity index 100% rename from grails-resources/src/grails/grails-home/LICENSE rename to LICENSE diff --git a/build.gradle b/build.gradle index d27f238658c..80b8781b734 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +import org.apache.tools.ant.filters.ReplaceTokens + buildscript { repositories { mavenRepo(urls: "http://repo.grails.org/grails/core") @@ -10,8 +12,8 @@ buildscript { apply plugin: 'idea' + grailsVersion = '1.4.0.BUILD-SNAPSHOT' -installDir = "${rootProject.projectDir}/install" antVersion = "1.8.2" antTraxVersion = "1.7.1" aspectjVersion = "1.6.10" @@ -116,7 +118,7 @@ subprojects { project -> from(project.libsDir) { include "*-${grailsVersion}.jar" } - into "${installDir}/dist" + into "${rootProject.projectDir}/dist" } } @@ -210,13 +212,50 @@ task clean << { // delete(docs.destinationDir, libs.destinationDir) delete(libs.destinationDir) delete(buildDir) - delete(installDir) } task installResources << { copy { - from 'build.properties' - into "${installDir}" + from('grails-resources/src/grails/home/tests') + into('lib') + filter(ReplaceTokens, tokens: ['grails.version': grailsVersion]) + } + + copy { + from("grails-resources/src/grails/home/bash") + filter(ReplaceTokens, tokens: ['grails.version': grailsVersion]) + filter(ReplaceTokens, tokens: ['groovy.version': groovyVersion]) + filter(ReplaceTokens, tokens: ['spring.loaded.version': springLoadedVersion]) + fileMode = 0755 + into "bin" + + } + // the fileMode property above should take care of the chmod work, but + // it doesn't per http://jira.codehaus.org/browse/GRADLE-971 + ant.chmod(dir: 'bin', perm: '755', includes: '*') + + copy { + from("grails-resources/src/grails/home/conf") + into "conf" + filter(ReplaceTokens, tokens: ['grails.version': grailsVersion]) + filter(ReplaceTokens, tokens: ['groovy.version': groovyVersion]) + filter(ReplaceTokens, tokens: ['jline.version': jlineVersion]) + filter(ReplaceTokens, tokens: ['jansi.version': jansiVersion]) + filter(ReplaceTokens, tokens: ['jna.version': jnaVersion]) + filter(ReplaceTokens, tokens: ['commons.cli.version': commonsCliVersion]) + filter(ReplaceTokens, tokens: ['ant.version': antVersion]) + filter(ReplaceTokens, tokens: ['gant.version': gantVersion]) + filter(ReplaceTokens, tokens: ['ivy.version': ivyVersion]) + } + + copy { + from 'grails-resources/src/grails/home/dsl-support' + into 'dsl-support' + } + + copy { + from "grails-resources/src/war/WEB-INF" + into 'src/war/WEB-INF' } } diff --git a/grails-resources/src/grails/grails-home/dependencies.txt b/dependencies.txt similarity index 100% rename from grails-resources/src/grails/grails-home/dependencies.txt rename to dependencies.txt diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle index 3d465fd0be5..7ea1acfa5b3 100644 --- a/gradle/assemble.gradle +++ b/gradle/assemble.gradle @@ -21,14 +21,14 @@ dependencyCache = { includes = dependencyIncludes as List exclude "org.grails/**" } - into "$installDir/lib" + into "$projectDir/lib" } copy { from (cacheLocation) { includes = ['org.grails/grails-datastore-gorm/jars/grails-datastore-gorm-*.jar', 'org.grails/grails-gdoc-engine/jars/grails-gdoc-engine-*.jar'] } - into "$installDir/lib" + into "$projectDir/lib" } } @@ -50,10 +50,10 @@ task libs(dependsOn: getTasksByName("assemble", true)) { into 'dist' } copy { - from("$projectDir/grails-resources/src/grails/grails-home") { + from("$projectDir/grails-resources") { include 'src/grails', 'src/war' } - into installDir + into projectDir } } } @@ -81,38 +81,71 @@ task pluginsFromSvn { binExecutables = ["cygrails", "grails", "grails-debug", "grails-debug.bat", "grails.bat"] distSpec = copySpec { - from(installDir) { + from(projectDir) { into "grails-$grailsVersion" - exclude "bin/*" + include 'lib/', 'gradle/', 'media/', 'samples/', 'scripts/', 'build.gradle', 'build.properties', 'dependencies.txt', + 'LICENSE', 'INSTALL', "src/", "gradlew.bat","gradle.properties" + exclude 'ant/bin' } - - from (installDir) { + from("grails-resources") { into "grails-$grailsVersion" - include "bin/*" - fileMode = 0755 + include 'src/grails/**', 'src/war/**' + // this file is accounted for later with special handling to do some token replacement + exclude 'src/grails/grails-macros.xml' } - - from(projectDir) { - into "grails-$grailsVersion" - include 'gradle/', 'build.gradle', "gradlew.bat","gradle.properties" - } - from(projectDir) { into "grails-$grailsVersion" include "gradlew" fileMode = 0755 } - from(docs.destinationDir) { into "grails-$grailsVersion/doc" } - + exclude "**/CVS/**" from(project.files(pluginsFromSvn.dir) { builtBy 'pluginsFromSvn' }) { into "grails-$grailsVersion/plugins" } + from('grails-resources/src/grails/home/docs/README') { + into "grails-$grailsVersion" + filter(ReplaceTokens, tokens: ['grails.version': grailsVersion]) + } + from('grails-resources/src/grails/home/tests') { + into "grails-$grailsVersion/src/resources/tests" + filter(ReplaceTokens, tokens: ['grails.version': grailsVersion]) + } + from("grails-resources/src/grails/home/bash") { + into "grails-$grailsVersion/bin" + filter(ReplaceTokens, tokens: ['grails.version': grailsVersion]) + filter(ReplaceTokens, tokens: ['groovy.version': groovyVersion]) + filter(ReplaceTokens, tokens: ['spring.loaded.version': springLoadedVersion]) + fileMode = 0755 + } + from("grails-resources/src/grails/home/conf") { + into "grails-$grailsVersion/conf" + filter(ReplaceTokens, tokens: ['grails.version': grailsVersion]) + filter(ReplaceTokens, tokens: ['groovy.version': groovyVersion]) + filter(ReplaceTokens, tokens: ['ant.version': antVersion]) + filter(ReplaceTokens, tokens: ['gant.version': gantVersion]) + filter(ReplaceTokens, tokens: ['ivy.version': ivyVersion]) + filter(ReplaceTokens, tokens: ['jline.version': jlineVersion]) + filter(ReplaceTokens, tokens: ['jansi.version': jansiVersion]) + filter(ReplaceTokens, tokens: ['jna.version': jnaVersion]) + filter(ReplaceTokens, tokens: ['commons.cli.version': commonsCliVersion]) + } + from(libs.destinationDir) { + into "grails-$grailsVersion/dist" + exclude "*.zip" + } + from("grails-resources/src/grails/grails-macros.xml") { + into "grails-$grailsVersion/src/grails" + filter(ReplaceTokens, tokens: ['grails.version': grailsVersion]) + } + from('grails-resources/src/grails/home/dsl-support') { + into "grails-$grailsVersion/dsl-support" + } } -task zipDist(type: Zip,dependsOn: [getTasksByName('install', true), 'populateDependencies', 'installResources']) { +task zipDist(type: Zip,dependsOn:libs) { from distSpec destinationDir = "${buildDir}/distributions" as File baseName = 'grails' diff --git a/grails-bootstrap/src/main/groovy/grails/util/PluginBuildSettings.groovy b/grails-bootstrap/src/main/groovy/grails/util/PluginBuildSettings.groovy index 8fe2a92e860..e93eb6db6ec 100644 --- a/grails-bootstrap/src/main/groovy/grails/util/PluginBuildSettings.groovy +++ b/grails-bootstrap/src/main/groovy/grails/util/PluginBuildSettings.groovy @@ -264,7 +264,6 @@ class PluginBuildSettings { def userHome = System.getProperty("user.home") def grailsHome = buildSettings.grailsHome.absolutePath def basedir = buildSettings.baseDir.absolutePath - resourceResolver("file:${grailsHome}/grails-scripts/src/scripts/**.groovy").each { if (!it.file.name.startsWith('_')) scripts << it } resourceResolver("file:${grailsHome}/scripts/**.groovy").each { if (!it.file.name.startsWith('_')) scripts << it } resourceResolver("file:${basedir}/scripts/*.groovy").each { if (!it.file.name.startsWith('_')) scripts << it } pluginScripts.each { if (!it.file.name.startsWith('_')) scripts << it } diff --git a/grails-resources/build.gradle b/grails-resources/build.gradle index fc68057c3a0..d5f47d348c0 100644 --- a/grails-resources/build.gradle +++ b/grails-resources/build.gradle @@ -1,33 +1,12 @@ -import org.apache.tools.ant.filters.ReplaceTokens - -task installGrailsHomeResources << { - copy { - from("src/grails/grails-home") - into "${installDir}/" - filter(ReplaceTokens, tokens: ['grails.version': grailsVersion]) - filter(ReplaceTokens, tokens: ['groovy.version': groovyVersion]) - filter(ReplaceTokens, tokens: ['jline.version': jlineVersion]) - filter(ReplaceTokens, tokens: ['jansi.version': jansiVersion]) - filter(ReplaceTokens, tokens: ['jna.version': jnaVersion]) - filter(ReplaceTokens, tokens: ['commons.cli.version': commonsCliVersion]) - filter(ReplaceTokens, tokens: ['ant.version': antVersion]) - filter(ReplaceTokens, tokens: ['gant.version': gantVersion]) - filter(ReplaceTokens, tokens: ['ivy.version': ivyVersion]) - filter(ReplaceTokens, tokens: ['spring.loaded.version': springLoadedVersion]) - } - - ant.chmod(dir: "${installDir}/bin", perm: '755', includes: '*') -} - task createSharedFilesJar(type: Jar, description: 'Package up the files that are shared by both applications and plugins.') { version = null appendix = "shared-files" appFileJar = true - from("src/grails/grails-home/src/war/WEB-INF") { + from("src/war/WEB-INF") { into "web-app/WEB-INF" include "applicationContext.xml", "sitemesh.xml", "tld/*.tld" } - from("src/grails/grails-home/src/grails/grails-app/conf") { + from("src/grails/grails-app/conf") { into "grails-app/conf" include "DataSource.groovy", "UrlMappings.groovy" } @@ -37,11 +16,11 @@ task createSharedApplicationFilesJar(type: Jar, description: 'Package up the fil version = null appendix = "app-files" appFileJar = true - from("src/grails/grails-home/src/war") { + from("src/war") { into "web-app" exclude "WEB-INF/**" } - from("src/grails/grails-home/src/grails/grails-app") { + from("src/grails/grails-app") { into "grails-app" exclude "taglib/**", "utils/**", "conf/DataSource.groovy", "conf/UrlMappings.groovy" } @@ -51,22 +30,23 @@ task createSharedPluginFilesJar(type: Jar, description: 'Package up the files th version = null appendix = "plugin-files" appFileJar = true - from("src/grails/grails-home/src/grails/templates/plugins") - from("src/grails/grails-home/src/grails") { + from("src/grails/templates/plugins") + from("src/grails") { include "grails-app/views/error.gsp" } - from("src/grails/grails-home/src/grails/plugin") + from("src/grails/plugin") } task createIntegrationFilesJar(type: Jar, description: 'Files to integrate Grails with IDEs and build systems.') { version = null appendix = "integration-files" appFileJar = true - from("src/grails/grails-home/src/grails/templates/ide-support", "src/grails/ant") + from("src/grails/templates/ide-support", "src/grails/ant") } allJarFileTasks = [createSharedFilesJar,createSharedApplicationFilesJar,createSharedPluginFilesJar,createIntegrationFilesJar] -task resourceJarFiles(dependsOn: allJarFileTasks) +task resourceJarFiles(dependsOn:allJarFileTasks) + jar.dependsOn resourceJarFiles @@ -74,15 +54,13 @@ for (jarTask in allJarFileTasks) { jar.from(jarTask.archivePath) } -jar.from("src/grails/grails-home/src/war") { +jar.from("src/war") { into "src/war" include "WEB-INF/**" exclude 'WEB-INF/tld/grails.tld', 'WEB-INF/tld/spring.tld' } -jar.from("src/grails/grails-home/src/grails/templates") { +jar.from("src/grails/templates") { into "src/grails/templates" } -jar.appendix = 'resources' - -install.dependsOn installGrailsHomeResources \ No newline at end of file +jar.appendix = 'resources' \ No newline at end of file diff --git a/grails-resources/src/grails/grails-home/src/grails/ant/build.xml b/grails-resources/src/grails/ant/build.xml similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/ant/build.xml rename to grails-resources/src/grails/ant/build.xml diff --git a/grails-resources/src/grails/grails-home/src/grails/ant/ivy.xml b/grails-resources/src/grails/ant/ivy.xml similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/ant/ivy.xml rename to grails-resources/src/grails/ant/ivy.xml diff --git a/grails-resources/src/grails/grails-home/src/grails/ant/ivysettings.xml b/grails-resources/src/grails/ant/ivysettings.xml similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/ant/ivysettings.xml rename to grails-resources/src/grails/ant/ivysettings.xml diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/conf/BootStrap.groovy b/grails-resources/src/grails/grails-app/conf/BootStrap.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/conf/BootStrap.groovy rename to grails-resources/src/grails/grails-app/conf/BootStrap.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/conf/BuildConfig.groovy b/grails-resources/src/grails/grails-app/conf/BuildConfig.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/conf/BuildConfig.groovy rename to grails-resources/src/grails/grails-app/conf/BuildConfig.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/conf/Config.groovy b/grails-resources/src/grails/grails-app/conf/Config.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/conf/Config.groovy rename to grails-resources/src/grails/grails-app/conf/Config.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/conf/DataSource.groovy b/grails-resources/src/grails/grails-app/conf/DataSource.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/conf/DataSource.groovy rename to grails-resources/src/grails/grails-app/conf/DataSource.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/conf/UrlMappings.groovy b/grails-resources/src/grails/grails-app/conf/UrlMappings.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/conf/UrlMappings.groovy rename to grails-resources/src/grails/grails-app/conf/UrlMappings.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/conf/spring/resources.groovy b/grails-resources/src/grails/grails-app/conf/spring/resources.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/conf/spring/resources.groovy rename to grails-resources/src/grails/grails-app/conf/spring/resources.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages.properties b/grails-resources/src/grails/grails-app/i18n/messages.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages.properties rename to grails-resources/src/grails/grails-app/i18n/messages.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_cs_CZ.properties b/grails-resources/src/grails/grails-app/i18n/messages_cs_CZ.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_cs_CZ.properties rename to grails-resources/src/grails/grails-app/i18n/messages_cs_CZ.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_da.properties b/grails-resources/src/grails/grails-app/i18n/messages_da.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_da.properties rename to grails-resources/src/grails/grails-app/i18n/messages_da.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_de.properties b/grails-resources/src/grails/grails-app/i18n/messages_de.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_de.properties rename to grails-resources/src/grails/grails-app/i18n/messages_de.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_es.properties b/grails-resources/src/grails/grails-app/i18n/messages_es.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_es.properties rename to grails-resources/src/grails/grails-app/i18n/messages_es.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_fr.properties b/grails-resources/src/grails/grails-app/i18n/messages_fr.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_fr.properties rename to grails-resources/src/grails/grails-app/i18n/messages_fr.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_it.properties b/grails-resources/src/grails/grails-app/i18n/messages_it.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_it.properties rename to grails-resources/src/grails/grails-app/i18n/messages_it.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_ja.properties b/grails-resources/src/grails/grails-app/i18n/messages_ja.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_ja.properties rename to grails-resources/src/grails/grails-app/i18n/messages_ja.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_nl.properties b/grails-resources/src/grails/grails-app/i18n/messages_nl.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_nl.properties rename to grails-resources/src/grails/grails-app/i18n/messages_nl.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_pt_BR.properties b/grails-resources/src/grails/grails-app/i18n/messages_pt_BR.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_pt_BR.properties rename to grails-resources/src/grails/grails-app/i18n/messages_pt_BR.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_pt_PT.properties b/grails-resources/src/grails/grails-app/i18n/messages_pt_PT.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_pt_PT.properties rename to grails-resources/src/grails/grails-app/i18n/messages_pt_PT.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_ru.properties b/grails-resources/src/grails/grails-app/i18n/messages_ru.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_ru.properties rename to grails-resources/src/grails/grails-app/i18n/messages_ru.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_sv.properties b/grails-resources/src/grails/grails-app/i18n/messages_sv.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_sv.properties rename to grails-resources/src/grails/grails-app/i18n/messages_sv.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_th.properties b/grails-resources/src/grails/grails-app/i18n/messages_th.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_th.properties rename to grails-resources/src/grails/grails-app/i18n/messages_th.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_zh_CN.properties b/grails-resources/src/grails/grails-app/i18n/messages_zh_CN.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/i18n/messages_zh_CN.properties rename to grails-resources/src/grails/grails-app/i18n/messages_zh_CN.properties diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/views/error.gsp b/grails-resources/src/grails/grails-app/views/error.gsp similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/views/error.gsp rename to grails-resources/src/grails/grails-app/views/error.gsp diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/views/index.gsp b/grails-resources/src/grails/grails-app/views/index.gsp similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/views/index.gsp rename to grails-resources/src/grails/grails-app/views/index.gsp diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-app/views/layouts/main.gsp b/grails-resources/src/grails/grails-app/views/layouts/main.gsp similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-app/views/layouts/main.gsp rename to grails-resources/src/grails/grails-app/views/layouts/main.gsp diff --git a/grails-resources/src/grails/grails-home/src/grails/grails-macros.xml b/grails-resources/src/grails/grails-macros.xml similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/grails-macros.xml rename to grails-resources/src/grails/grails-macros.xml diff --git a/grails-resources/src/grails/grails-home/bin/cygrails b/grails-resources/src/grails/home/bash/cygrails similarity index 100% rename from grails-resources/src/grails/grails-home/bin/cygrails rename to grails-resources/src/grails/home/bash/cygrails diff --git a/grails-resources/src/grails/grails-home/bin/grails b/grails-resources/src/grails/home/bash/grails similarity index 100% rename from grails-resources/src/grails/grails-home/bin/grails rename to grails-resources/src/grails/home/bash/grails diff --git a/grails-resources/src/grails/grails-home/bin/grails-debug b/grails-resources/src/grails/home/bash/grails-debug similarity index 100% rename from grails-resources/src/grails/grails-home/bin/grails-debug rename to grails-resources/src/grails/home/bash/grails-debug diff --git a/grails-resources/src/grails/grails-home/bin/grails-debug.bat b/grails-resources/src/grails/home/bash/grails-debug.bat similarity index 100% rename from grails-resources/src/grails/grails-home/bin/grails-debug.bat rename to grails-resources/src/grails/home/bash/grails-debug.bat diff --git a/grails-resources/src/grails/grails-home/bin/grails.bat b/grails-resources/src/grails/home/bash/grails.bat similarity index 100% rename from grails-resources/src/grails/grails-home/bin/grails.bat rename to grails-resources/src/grails/home/bash/grails.bat diff --git a/grails-resources/src/grails/grails-home/bin/startGrails b/grails-resources/src/grails/home/bash/startGrails similarity index 100% rename from grails-resources/src/grails/grails-home/bin/startGrails rename to grails-resources/src/grails/home/bash/startGrails diff --git a/grails-resources/src/grails/grails-home/bin/startGrails.bat b/grails-resources/src/grails/home/bash/startGrails.bat similarity index 100% rename from grails-resources/src/grails/grails-home/bin/startGrails.bat rename to grails-resources/src/grails/home/bash/startGrails.bat diff --git a/grails-resources/src/grails/grails-home/conf/groovy-starter.conf b/grails-resources/src/grails/home/conf/groovy-starter.conf similarity index 100% rename from grails-resources/src/grails/grails-home/conf/groovy-starter.conf rename to grails-resources/src/grails/home/conf/groovy-starter.conf diff --git a/grails-resources/src/grails/grails-home/README b/grails-resources/src/grails/home/docs/README similarity index 100% rename from grails-resources/src/grails/grails-home/README rename to grails-resources/src/grails/home/docs/README diff --git a/grails-resources/src/grails/grails-home/dsl-support/dsld/grails.dsld b/grails-resources/src/grails/home/dsl-support/dsld/grails.dsld similarity index 100% rename from grails-resources/src/grails/grails-home/dsl-support/dsld/grails.dsld rename to grails-resources/src/grails/home/dsl-support/dsld/grails.dsld diff --git a/grails-resources/src/grails/grails-home/src/resources/tests/junit-frames.xsl b/grails-resources/src/grails/home/tests/junit-frames.xsl similarity index 100% rename from grails-resources/src/grails/grails-home/src/resources/tests/junit-frames.xsl rename to grails-resources/src/grails/home/tests/junit-frames.xsl diff --git a/grails-resources/src/grails/grails-home/src/resources/tests/junit-noframes.xsl b/grails-resources/src/grails/home/tests/junit-noframes.xsl similarity index 100% rename from grails-resources/src/grails/grails-home/src/resources/tests/junit-noframes.xsl rename to grails-resources/src/grails/home/tests/junit-noframes.xsl diff --git a/grails-resources/src/grails/grails-home/src/grails/plugin/grails-app/conf/BuildConfig.groovy b/grails-resources/src/grails/plugin/grails-app/conf/BuildConfig.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/plugin/grails-app/conf/BuildConfig.groovy rename to grails-resources/src/grails/plugin/grails-app/conf/BuildConfig.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/plugin/grails-app/conf/Config.groovy b/grails-resources/src/grails/plugin/grails-app/conf/Config.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/plugin/grails-app/conf/Config.groovy rename to grails-resources/src/grails/plugin/grails-app/conf/Config.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/artifacts/Controller.groovy b/grails-resources/src/grails/templates/artifacts/Controller.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/artifacts/Controller.groovy rename to grails-resources/src/grails/templates/artifacts/Controller.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/artifacts/DomainClass.groovy b/grails-resources/src/grails/templates/artifacts/DomainClass.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/artifacts/DomainClass.groovy rename to grails-resources/src/grails/templates/artifacts/DomainClass.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/artifacts/Filters.groovy b/grails-resources/src/grails/templates/artifacts/Filters.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/artifacts/Filters.groovy rename to grails-resources/src/grails/templates/artifacts/Filters.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/artifacts/Script.groovy b/grails-resources/src/grails/templates/artifacts/Script.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/artifacts/Script.groovy rename to grails-resources/src/grails/templates/artifacts/Script.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/artifacts/Service.groovy b/grails-resources/src/grails/templates/artifacts/Service.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/artifacts/Service.groovy rename to grails-resources/src/grails/templates/artifacts/Service.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/artifacts/TagLib.groovy b/grails-resources/src/grails/templates/artifacts/TagLib.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/artifacts/TagLib.groovy rename to grails-resources/src/grails/templates/artifacts/TagLib.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/artifacts/Tests.groovy b/grails-resources/src/grails/templates/artifacts/Tests.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/artifacts/Tests.groovy rename to grails-resources/src/grails/templates/artifacts/Tests.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/artifacts/WebTest.groovy b/grails-resources/src/grails/templates/artifacts/WebTest.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/artifacts/WebTest.groovy rename to grails-resources/src/grails/templates/artifacts/WebTest.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/artifacts/hibernate.cfg.xml b/grails-resources/src/grails/templates/artifacts/hibernate.cfg.xml similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/artifacts/hibernate.cfg.xml rename to grails-resources/src/grails/templates/artifacts/hibernate.cfg.xml diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/ide-support/eclipse/.classpath b/grails-resources/src/grails/templates/ide-support/eclipse/.classpath similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/ide-support/eclipse/.classpath rename to grails-resources/src/grails/templates/ide-support/eclipse/.classpath diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/ide-support/eclipse/.project b/grails-resources/src/grails/templates/ide-support/eclipse/.project similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/ide-support/eclipse/.project rename to grails-resources/src/grails/templates/ide-support/eclipse/.project diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/ide-support/eclipse/.settings/org.codehaus.groovy.eclipse.preferences.prefs b/grails-resources/src/grails/templates/ide-support/eclipse/.settings/org.codehaus.groovy.eclipse.preferences.prefs similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/ide-support/eclipse/.settings/org.codehaus.groovy.eclipse.preferences.prefs rename to grails-resources/src/grails/templates/ide-support/eclipse/.settings/org.codehaus.groovy.eclipse.preferences.prefs diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/ide-support/git/grailsProject.gitignore b/grails-resources/src/grails/templates/ide-support/git/grailsProject.gitignore similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/ide-support/git/grailsProject.gitignore rename to grails-resources/src/grails/templates/ide-support/git/grailsProject.gitignore diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/ide-support/intellij/ideaGrailsProject.iml b/grails-resources/src/grails/templates/ide-support/intellij/ideaGrailsProject.iml similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/ide-support/intellij/ideaGrailsProject.iml rename to grails-resources/src/grails/templates/ide-support/intellij/ideaGrailsProject.iml diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/ide-support/intellij/ideaGrailsProject.ipr b/grails-resources/src/grails/templates/ide-support/intellij/ideaGrailsProject.ipr similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/ide-support/intellij/ideaGrailsProject.ipr rename to grails-resources/src/grails/templates/ide-support/intellij/ideaGrailsProject.ipr diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/ide-support/intellij/ideaGrailsProject.iws b/grails-resources/src/grails/templates/ide-support/intellij/ideaGrailsProject.iws similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/ide-support/intellij/ideaGrailsProject.iws rename to grails-resources/src/grails/templates/ide-support/intellij/ideaGrailsProject.iws diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/ide-support/textmate/project.tmproj b/grails-resources/src/grails/templates/ide-support/textmate/project.tmproj similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/ide-support/textmate/project.tmproj rename to grails-resources/src/grails/templates/ide-support/textmate/project.tmproj diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/plugins/GrailsPlugin.groovy b/grails-resources/src/grails/templates/plugins/GrailsPlugin.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/plugins/GrailsPlugin.groovy rename to grails-resources/src/grails/templates/plugins/GrailsPlugin.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/plugins/scripts/_Install.groovy b/grails-resources/src/grails/templates/plugins/scripts/_Install.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/plugins/scripts/_Install.groovy rename to grails-resources/src/grails/templates/plugins/scripts/_Install.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/plugins/scripts/_Uninstall.groovy b/grails-resources/src/grails/templates/plugins/scripts/_Uninstall.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/plugins/scripts/_Uninstall.groovy rename to grails-resources/src/grails/templates/plugins/scripts/_Uninstall.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/plugins/scripts/_Upgrade.groovy b/grails-resources/src/grails/templates/plugins/scripts/_Upgrade.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/plugins/scripts/_Upgrade.groovy rename to grails-resources/src/grails/templates/plugins/scripts/_Upgrade.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/Controller.groovy b/grails-resources/src/grails/templates/scaffolding/Controller.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/Controller.groovy rename to grails-resources/src/grails/templates/scaffolding/Controller.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/Test.groovy b/grails-resources/src/grails/templates/scaffolding/Test.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/Test.groovy rename to grails-resources/src/grails/templates/scaffolding/Test.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/_form.gsp b/grails-resources/src/grails/templates/scaffolding/_form.gsp similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/_form.gsp rename to grails-resources/src/grails/templates/scaffolding/_form.gsp diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/create.gsp b/grails-resources/src/grails/templates/scaffolding/create.gsp similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/create.gsp rename to grails-resources/src/grails/templates/scaffolding/create.gsp diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/edit.gsp b/grails-resources/src/grails/templates/scaffolding/edit.gsp similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/edit.gsp rename to grails-resources/src/grails/templates/scaffolding/edit.gsp diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/list.gsp b/grails-resources/src/grails/templates/scaffolding/list.gsp similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/list.gsp rename to grails-resources/src/grails/templates/scaffolding/list.gsp diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/renderEditor.template b/grails-resources/src/grails/templates/scaffolding/renderEditor.template similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/renderEditor.template rename to grails-resources/src/grails/templates/scaffolding/renderEditor.template diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/show.gsp b/grails-resources/src/grails/templates/scaffolding/show.gsp similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/scaffolding/show.gsp rename to grails-resources/src/grails/templates/scaffolding/show.gsp diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/testing/Controller.groovy b/grails-resources/src/grails/templates/testing/Controller.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/testing/Controller.groovy rename to grails-resources/src/grails/templates/testing/Controller.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/testing/DomainClass.groovy b/grails-resources/src/grails/templates/testing/DomainClass.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/testing/DomainClass.groovy rename to grails-resources/src/grails/templates/testing/DomainClass.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/testing/Filters.groovy b/grails-resources/src/grails/templates/testing/Filters.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/testing/Filters.groovy rename to grails-resources/src/grails/templates/testing/Filters.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/testing/Generic.groovy b/grails-resources/src/grails/templates/testing/Generic.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/testing/Generic.groovy rename to grails-resources/src/grails/templates/testing/Generic.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/testing/Service.groovy b/grails-resources/src/grails/templates/testing/Service.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/testing/Service.groovy rename to grails-resources/src/grails/templates/testing/Service.groovy diff --git a/grails-resources/src/grails/grails-home/src/grails/templates/testing/TagLib.groovy b/grails-resources/src/grails/templates/testing/TagLib.groovy similarity index 100% rename from grails-resources/src/grails/grails-home/src/grails/templates/testing/TagLib.groovy rename to grails-resources/src/grails/templates/testing/TagLib.groovy diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/applicationContext.xml b/grails-resources/src/war/WEB-INF/applicationContext.xml similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/applicationContext.xml rename to grails-resources/src/war/WEB-INF/applicationContext.xml diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/log4j.properties b/grails-resources/src/war/WEB-INF/log4j.properties similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/log4j.properties rename to grails-resources/src/war/WEB-INF/log4j.properties diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/sitemesh.xml b/grails-resources/src/war/WEB-INF/sitemesh.xml similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/sitemesh.xml rename to grails-resources/src/war/WEB-INF/sitemesh.xml diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/test-applicationContext.xml b/grails-resources/src/war/WEB-INF/test-applicationContext.xml similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/test-applicationContext.xml rename to grails-resources/src/war/WEB-INF/test-applicationContext.xml diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/2.3/c.tld b/grails-resources/src/war/WEB-INF/tld/2.3/c.tld similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/2.3/c.tld rename to grails-resources/src/war/WEB-INF/tld/2.3/c.tld diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/2.3/fmt.tld b/grails-resources/src/war/WEB-INF/tld/2.3/fmt.tld similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/2.3/fmt.tld rename to grails-resources/src/war/WEB-INF/tld/2.3/fmt.tld diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/2.4/c.tld b/grails-resources/src/war/WEB-INF/tld/2.4/c.tld similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/2.4/c.tld rename to grails-resources/src/war/WEB-INF/tld/2.4/c.tld diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/2.4/fmt.tld b/grails-resources/src/war/WEB-INF/tld/2.4/fmt.tld similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/2.4/fmt.tld rename to grails-resources/src/war/WEB-INF/tld/2.4/fmt.tld diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/2.5/c.tld b/grails-resources/src/war/WEB-INF/tld/2.5/c.tld similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/2.5/c.tld rename to grails-resources/src/war/WEB-INF/tld/2.5/c.tld diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/2.5/fmt.tld b/grails-resources/src/war/WEB-INF/tld/2.5/fmt.tld similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/2.5/fmt.tld rename to grails-resources/src/war/WEB-INF/tld/2.5/fmt.tld diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/3.0/c.tld b/grails-resources/src/war/WEB-INF/tld/3.0/c.tld similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/3.0/c.tld rename to grails-resources/src/war/WEB-INF/tld/3.0/c.tld diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/3.0/fmt.tld b/grails-resources/src/war/WEB-INF/tld/3.0/fmt.tld similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/3.0/fmt.tld rename to grails-resources/src/war/WEB-INF/tld/3.0/fmt.tld diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/grails.tld b/grails-resources/src/war/WEB-INF/tld/grails.tld similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/grails.tld rename to grails-resources/src/war/WEB-INF/tld/grails.tld diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/spring.tld b/grails-resources/src/war/WEB-INF/tld/spring.tld similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/tld/spring.tld rename to grails-resources/src/war/WEB-INF/tld/spring.tld diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/web2.4.template.xml b/grails-resources/src/war/WEB-INF/web2.4.template.xml similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/web2.4.template.xml rename to grails-resources/src/war/WEB-INF/web2.4.template.xml diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/web2.5.template.xml b/grails-resources/src/war/WEB-INF/web2.5.template.xml similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/web2.5.template.xml rename to grails-resources/src/war/WEB-INF/web2.5.template.xml diff --git a/grails-resources/src/grails/grails-home/src/war/WEB-INF/web3.0.template.xml b/grails-resources/src/war/WEB-INF/web3.0.template.xml similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/WEB-INF/web3.0.template.xml rename to grails-resources/src/war/WEB-INF/web3.0.template.xml diff --git a/grails-resources/src/grails/grails-home/src/war/css/main.css b/grails-resources/src/war/css/main.css similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/css/main.css rename to grails-resources/src/war/css/main.css diff --git a/grails-resources/src/grails/grails-home/src/war/css/mobile.css b/grails-resources/src/war/css/mobile.css similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/css/mobile.css rename to grails-resources/src/war/css/mobile.css diff --git a/grails-resources/src/grails/grails-home/src/war/images/apple-touch-icon-retina.png b/grails-resources/src/war/images/apple-touch-icon-retina.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/apple-touch-icon-retina.png rename to grails-resources/src/war/images/apple-touch-icon-retina.png diff --git a/grails-resources/src/grails/grails-home/src/war/images/apple-touch-icon.png b/grails-resources/src/war/images/apple-touch-icon.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/apple-touch-icon.png rename to grails-resources/src/war/images/apple-touch-icon.png diff --git a/grails-resources/src/grails/grails-home/media/icons/favicon.ico b/grails-resources/src/war/images/favicon.ico similarity index 100% rename from grails-resources/src/grails/grails-home/media/icons/favicon.ico rename to grails-resources/src/war/images/favicon.ico diff --git a/grails-resources/src/grails/grails-home/src/war/images/grails_logo.jpg b/grails-resources/src/war/images/grails_logo.jpg similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/grails_logo.jpg rename to grails-resources/src/war/images/grails_logo.jpg diff --git a/grails-resources/src/grails/grails-home/src/war/images/grails_logo.png b/grails-resources/src/war/images/grails_logo.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/grails_logo.png rename to grails-resources/src/war/images/grails_logo.png diff --git a/grails-resources/src/grails/grails-home/src/war/images/leftnav_btm.png b/grails-resources/src/war/images/leftnav_btm.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/leftnav_btm.png rename to grails-resources/src/war/images/leftnav_btm.png diff --git a/grails-resources/src/grails/grails-home/src/war/images/leftnav_midstretch.png b/grails-resources/src/war/images/leftnav_midstretch.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/leftnav_midstretch.png rename to grails-resources/src/war/images/leftnav_midstretch.png diff --git a/grails-resources/src/grails/grails-home/src/war/images/leftnav_top.png b/grails-resources/src/war/images/leftnav_top.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/leftnav_top.png rename to grails-resources/src/war/images/leftnav_top.png diff --git a/grails-resources/src/grails/grails-home/src/war/images/skin/database_add.png b/grails-resources/src/war/images/skin/database_add.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/skin/database_add.png rename to grails-resources/src/war/images/skin/database_add.png diff --git a/grails-resources/src/grails/grails-home/src/war/images/skin/database_delete.png b/grails-resources/src/war/images/skin/database_delete.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/skin/database_delete.png rename to grails-resources/src/war/images/skin/database_delete.png diff --git a/grails-resources/src/grails/grails-home/src/war/images/skin/database_edit.png b/grails-resources/src/war/images/skin/database_edit.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/skin/database_edit.png rename to grails-resources/src/war/images/skin/database_edit.png diff --git a/grails-resources/src/grails/grails-home/src/war/images/skin/database_save.png b/grails-resources/src/war/images/skin/database_save.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/skin/database_save.png rename to grails-resources/src/war/images/skin/database_save.png diff --git a/grails-resources/src/grails/grails-home/src/war/images/skin/database_table.png b/grails-resources/src/war/images/skin/database_table.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/skin/database_table.png rename to grails-resources/src/war/images/skin/database_table.png diff --git a/grails-resources/src/grails/grails-home/src/war/images/skin/exclamation.png b/grails-resources/src/war/images/skin/exclamation.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/skin/exclamation.png rename to grails-resources/src/war/images/skin/exclamation.png diff --git a/grails-resources/src/grails/grails-home/src/war/images/skin/house.png b/grails-resources/src/war/images/skin/house.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/skin/house.png rename to grails-resources/src/war/images/skin/house.png diff --git a/grails-resources/src/grails/grails-home/src/war/images/skin/information.png b/grails-resources/src/war/images/skin/information.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/skin/information.png rename to grails-resources/src/war/images/skin/information.png diff --git a/grails-resources/src/grails/grails-home/src/war/images/skin/shadow.jpg b/grails-resources/src/war/images/skin/shadow.jpg similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/skin/shadow.jpg rename to grails-resources/src/war/images/skin/shadow.jpg diff --git a/grails-resources/src/grails/grails-home/src/war/images/skin/sorted_asc.gif b/grails-resources/src/war/images/skin/sorted_asc.gif similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/skin/sorted_asc.gif rename to grails-resources/src/war/images/skin/sorted_asc.gif diff --git a/grails-resources/src/grails/grails-home/src/war/images/skin/sorted_desc.gif b/grails-resources/src/war/images/skin/sorted_desc.gif similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/skin/sorted_desc.gif rename to grails-resources/src/war/images/skin/sorted_desc.gif diff --git a/grails-resources/src/grails/grails-home/src/war/images/spinner.gif b/grails-resources/src/war/images/spinner.gif similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/spinner.gif rename to grails-resources/src/war/images/spinner.gif diff --git a/grails-resources/src/grails/grails-home/src/war/images/springsource.png b/grails-resources/src/war/images/springsource.png similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/springsource.png rename to grails-resources/src/war/images/springsource.png diff --git a/grails-resources/src/grails/grails-home/src/war/js/application.js b/grails-resources/src/war/js/application.js similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/js/application.js rename to grails-resources/src/war/js/application.js diff --git a/grails-scripts/build.gradle b/grails-scripts/build.gradle index 30cd6379661..3e84e448263 100644 --- a/grails-scripts/build.gradle +++ b/grails-scripts/build.gradle @@ -22,17 +22,8 @@ dependencies { sourceSets { main { - groovy.srcDirs = ['src/scripts'] + groovy.srcDirs = ['../scripts'] } } jar.appendix = 'scripts' - -task installScripts { - copy { - from("src/scripts") - into "${installDir}/scripts" - } -} - -install.dependsOn installScripts diff --git a/grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGeneratorTests.groovy b/grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGeneratorTests.groovy index 36d337131bd..3ffeec5482e 100644 --- a/grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGeneratorTests.groovy +++ b/grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGeneratorTests.groovy @@ -51,7 +51,7 @@ class ScaffoldingTest { ''' void testGenerateDateSelect() { - def templateGenerator = new DefaultGrailsTemplateGenerator(basedir:"../grails-resources/src/grails/grails-home") + def templateGenerator = new DefaultGrailsTemplateGenerator(basedir:"../grails-resources") gcl.parseClass(testDomain) def testClass = gcl.loadClass("ScaffoldingTest") @@ -72,7 +72,7 @@ class ScaffoldingTest { } void testGenerateNumberSelect() { - def templateGenerator = new DefaultGrailsTemplateGenerator(basedir:"../grails-resources/src/grails/grails-home") + def templateGenerator = new DefaultGrailsTemplateGenerator(basedir:"../grails-resources") gcl.parseClass(testDomain) def testClass = gcl.loadClass("ScaffoldingTest") diff --git a/grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/scaffolding/GrailsTemplateGeneratorsTests.java b/grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/scaffolding/GrailsTemplateGeneratorsTests.java index c4c8aa1df70..e7cd7d9ff2d 100644 --- a/grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/scaffolding/GrailsTemplateGeneratorsTests.java +++ b/grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/scaffolding/GrailsTemplateGeneratorsTests.java @@ -59,7 +59,7 @@ public void testGenerateController() throws Exception { GroovyClassLoader gcl = new GroovyClassLoader(Thread.currentThread().getContextClassLoader()); generator = new DefaultGrailsTemplateGenerator(); - generator.setBasedir("../grails-resources/src/grails/grails-home"); + generator.setBasedir("../grails-resources"); Class dc = gcl.parseClass("class Test { \n Long id;\n Long version; }"); GrailsDomainClass domainClass = new DefaultGrailsDomainClass(dc); @@ -103,7 +103,7 @@ public void testGenerateViews() throws Exception { GroovyClassLoader gcl = new GroovyClassLoader(Thread.currentThread().getContextClassLoader()); DefaultGrailsTemplateGenerator generator = new DefaultGrailsTemplateGenerator(); - generator.setBasedir("../grails-resources/src/grails/grails-home"); + generator.setBasedir("../grails-resources"); Class dc = gcl.parseClass( "class Test { " + diff --git a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/GroovyPageWithJSPTagsTests.groovy b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/GroovyPageWithJSPTagsTests.groovy index a7d4786ab61..20da901dd46 100644 --- a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/GroovyPageWithJSPTagsTests.groovy +++ b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/GroovyPageWithJSPTagsTests.groovy @@ -20,9 +20,9 @@ class GroovyPageWithJSPTagsTests extends AbstractGrailsTagTests { GroovySystem.metaClassRegistry.removeMetaClass MockHttpServletRequest TagLibraryResolver.metaClass.resolveRootLoader = {-> def rootLoader = new RootLoader([] as URL[], Thread.currentThread().getContextClassLoader()) - def res = new FileSystemResource("../install/lib/taglibs/standard/jars/standard-1.1.2.jar") + def res = new FileSystemResource("../lib/taglibs/standard/jars/standard-1.1.2.jar") rootLoader.addURL res.getURL() - resolver.getResources("file:../install/lib/org.springframework/spring-web*/jars/*.jar").each { + resolver.getResources("file:../lib/org.springframework/spring-web*/jars/*.jar").each { rootLoader.addURL it.getURL() } return rootLoader diff --git a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/IterativeJspTagTests.groovy b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/IterativeJspTagTests.groovy index b986c3750f2..47d3948b326 100644 --- a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/IterativeJspTagTests.groovy +++ b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/IterativeJspTagTests.groovy @@ -32,7 +32,7 @@ class IterativeJspTagTests extends GroovyTestCase { TagLibraryResolver.metaClass.resolveRootLoader = {-> def rootLoader = new RootLoader([] as URL[], Thread.currentThread().getContextClassLoader()) - def res = new FileSystemResource("../install/lib/taglibs/standard/jars/standard-1.1.2.jar") + def res = new FileSystemResource("../lib/taglibs/standard/jars/standard-1.1.2.jar") rootLoader.addURL res.getURL() return rootLoader } diff --git a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/MockRootLoaderTagLibraryResolver.groovy b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/MockRootLoaderTagLibraryResolver.groovy index 301df37d92b..30003b0e1af 100644 --- a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/MockRootLoaderTagLibraryResolver.groovy +++ b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/MockRootLoaderTagLibraryResolver.groovy @@ -13,7 +13,7 @@ class MockRootLoaderTagLibraryResolver extends TagLibraryResolver { protected RootLoader resolveRootLoader() { def rootLoader = new RootLoader([] as URL[], Thread.currentThread().getContextClassLoader()) - def res = new FileSystemResource("../install/lib/taglibs/standard/jars/standard-1.1.2.jar") + def res = new FileSystemResource("../lib/taglibs/standard/jars/standard-1.1.2.jar") rootLoader.addURL res.getURL() return rootLoader } diff --git a/grails-resources/src/grails/grails-home/src/war/images/favicon.ico b/media/icons/favicon.ico similarity index 100% rename from grails-resources/src/grails/grails-home/src/war/images/favicon.ico rename to media/icons/favicon.ico diff --git a/grails-resources/src/grails/grails-home/media/icons/favicon16.png b/media/icons/favicon16.png similarity index 100% rename from grails-resources/src/grails/grails-home/media/icons/favicon16.png rename to media/icons/favicon16.png diff --git a/grails-resources/src/grails/grails-home/media/icons/favicon32.png b/media/icons/favicon32.png similarity index 100% rename from grails-resources/src/grails/grails-home/media/icons/favicon32.png rename to media/icons/favicon32.png diff --git a/grails-resources/src/grails/grails-home/media/icons/favicon48.png b/media/icons/favicon48.png similarity index 100% rename from grails-resources/src/grails/grails-home/media/icons/favicon48.png rename to media/icons/favicon48.png diff --git a/grails-resources/src/grails/grails-home/media/logos/branding_blck_whit_colr.jpg b/media/logos/branding_blck_whit_colr.jpg similarity index 100% rename from grails-resources/src/grails/grails-home/media/logos/branding_blck_whit_colr.jpg rename to media/logos/branding_blck_whit_colr.jpg diff --git a/grails-resources/src/grails/grails-home/media/logos/branding_blck_whit_colr.png b/media/logos/branding_blck_whit_colr.png similarity index 100% rename from grails-resources/src/grails/grails-home/media/logos/branding_blck_whit_colr.png rename to media/logos/branding_blck_whit_colr.png diff --git a/grails-resources/src/grails/grails-home/media/logos/grails-color-logo.svg b/media/logos/grails-color-logo.svg similarity index 100% rename from grails-resources/src/grails/grails-home/media/logos/grails-color-logo.svg rename to media/logos/grails-color-logo.svg diff --git a/grails-resources/src/grails/grails-home/media/logos/grails-logo.eps b/media/logos/grails-logo.eps similarity index 100% rename from grails-resources/src/grails/grails-home/media/logos/grails-logo.eps rename to media/logos/grails-logo.eps diff --git a/grails-resources/src/grails/grails-home/media/logos/grails-logo.svg b/media/logos/grails-logo.svg similarity index 100% rename from grails-resources/src/grails/grails-home/media/logos/grails-logo.svg rename to media/logos/grails-logo.svg diff --git a/grails-resources/src/grails/grails-home/media/logos/grailslogo-medium.png b/media/logos/grailslogo-medium.png similarity index 100% rename from grails-resources/src/grails/grails-home/media/logos/grailslogo-medium.png rename to media/logos/grailslogo-medium.png diff --git a/grails-resources/src/grails/grails-home/media/logos/grailslogo.png b/media/logos/grailslogo.png similarity index 100% rename from grails-resources/src/grails/grails-home/media/logos/grailslogo.png rename to media/logos/grailslogo.png diff --git a/grails-scripts/src/scripts/AddProxy_.groovy b/scripts/AddProxy_.groovy similarity index 100% rename from grails-scripts/src/scripts/AddProxy_.groovy rename to scripts/AddProxy_.groovy diff --git a/grails-scripts/src/scripts/Bootstrap.groovy b/scripts/Bootstrap.groovy similarity index 100% rename from grails-scripts/src/scripts/Bootstrap.groovy rename to scripts/Bootstrap.groovy diff --git a/grails-scripts/src/scripts/BugReport.groovy b/scripts/BugReport.groovy similarity index 100% rename from grails-scripts/src/scripts/BugReport.groovy rename to scripts/BugReport.groovy diff --git a/grails-scripts/src/scripts/Clean.groovy b/scripts/Clean.groovy similarity index 100% rename from grails-scripts/src/scripts/Clean.groovy rename to scripts/Clean.groovy diff --git a/grails-scripts/src/scripts/ClearProxy_.groovy b/scripts/ClearProxy_.groovy similarity index 100% rename from grails-scripts/src/scripts/ClearProxy_.groovy rename to scripts/ClearProxy_.groovy diff --git a/grails-scripts/src/scripts/Compile.groovy b/scripts/Compile.groovy similarity index 100% rename from grails-scripts/src/scripts/Compile.groovy rename to scripts/Compile.groovy diff --git a/grails-scripts/src/scripts/Console.groovy b/scripts/Console.groovy similarity index 100% rename from grails-scripts/src/scripts/Console.groovy rename to scripts/Console.groovy diff --git a/grails-scripts/src/scripts/CreateApp_.groovy b/scripts/CreateApp_.groovy similarity index 100% rename from grails-scripts/src/scripts/CreateApp_.groovy rename to scripts/CreateApp_.groovy diff --git a/grails-scripts/src/scripts/CreateController.groovy b/scripts/CreateController.groovy similarity index 100% rename from grails-scripts/src/scripts/CreateController.groovy rename to scripts/CreateController.groovy diff --git a/grails-scripts/src/scripts/CreateDomainClass.groovy b/scripts/CreateDomainClass.groovy similarity index 100% rename from grails-scripts/src/scripts/CreateDomainClass.groovy rename to scripts/CreateDomainClass.groovy diff --git a/grails-scripts/src/scripts/CreateFilters.groovy b/scripts/CreateFilters.groovy similarity index 100% rename from grails-scripts/src/scripts/CreateFilters.groovy rename to scripts/CreateFilters.groovy diff --git a/grails-scripts/src/scripts/CreateHibernateCfgXml.groovy b/scripts/CreateHibernateCfgXml.groovy similarity index 100% rename from grails-scripts/src/scripts/CreateHibernateCfgXml.groovy rename to scripts/CreateHibernateCfgXml.groovy diff --git a/grails-scripts/src/scripts/CreateIntegrationTest.groovy b/scripts/CreateIntegrationTest.groovy similarity index 100% rename from grails-scripts/src/scripts/CreateIntegrationTest.groovy rename to scripts/CreateIntegrationTest.groovy diff --git a/grails-scripts/src/scripts/CreatePlugin_.groovy b/scripts/CreatePlugin_.groovy similarity index 100% rename from grails-scripts/src/scripts/CreatePlugin_.groovy rename to scripts/CreatePlugin_.groovy diff --git a/grails-scripts/src/scripts/CreateScript.groovy b/scripts/CreateScript.groovy similarity index 100% rename from grails-scripts/src/scripts/CreateScript.groovy rename to scripts/CreateScript.groovy diff --git a/grails-scripts/src/scripts/CreateService.groovy b/scripts/CreateService.groovy similarity index 100% rename from grails-scripts/src/scripts/CreateService.groovy rename to scripts/CreateService.groovy diff --git a/grails-scripts/src/scripts/CreateTagLib.groovy b/scripts/CreateTagLib.groovy similarity index 100% rename from grails-scripts/src/scripts/CreateTagLib.groovy rename to scripts/CreateTagLib.groovy diff --git a/grails-scripts/src/scripts/CreateUnitTest.groovy b/scripts/CreateUnitTest.groovy similarity index 100% rename from grails-scripts/src/scripts/CreateUnitTest.groovy rename to scripts/CreateUnitTest.groovy diff --git a/grails-scripts/src/scripts/DependencyReport.groovy b/scripts/DependencyReport.groovy similarity index 100% rename from grails-scripts/src/scripts/DependencyReport.groovy rename to scripts/DependencyReport.groovy diff --git a/grails-scripts/src/scripts/Doc.groovy b/scripts/Doc.groovy similarity index 100% rename from grails-scripts/src/scripts/Doc.groovy rename to scripts/Doc.groovy diff --git a/grails-scripts/src/scripts/GenerateAll.groovy b/scripts/GenerateAll.groovy similarity index 100% rename from grails-scripts/src/scripts/GenerateAll.groovy rename to scripts/GenerateAll.groovy diff --git a/grails-scripts/src/scripts/GenerateController.groovy b/scripts/GenerateController.groovy similarity index 100% rename from grails-scripts/src/scripts/GenerateController.groovy rename to scripts/GenerateController.groovy diff --git a/grails-scripts/src/scripts/GenerateViews.groovy b/scripts/GenerateViews.groovy similarity index 100% rename from grails-scripts/src/scripts/GenerateViews.groovy rename to scripts/GenerateViews.groovy diff --git a/grails-scripts/src/scripts/Help_.groovy b/scripts/Help_.groovy similarity index 100% rename from grails-scripts/src/scripts/Help_.groovy rename to scripts/Help_.groovy diff --git a/grails-scripts/src/scripts/Init.groovy b/scripts/Init.groovy similarity index 100% rename from grails-scripts/src/scripts/Init.groovy rename to scripts/Init.groovy diff --git a/grails-scripts/src/scripts/InstallDependency.groovy b/scripts/InstallDependency.groovy similarity index 100% rename from grails-scripts/src/scripts/InstallDependency.groovy rename to scripts/InstallDependency.groovy diff --git a/grails-scripts/src/scripts/InstallPlugin.groovy b/scripts/InstallPlugin.groovy similarity index 100% rename from grails-scripts/src/scripts/InstallPlugin.groovy rename to scripts/InstallPlugin.groovy diff --git a/grails-scripts/src/scripts/InstallTemplates.groovy b/scripts/InstallTemplates.groovy similarity index 100% rename from grails-scripts/src/scripts/InstallTemplates.groovy rename to scripts/InstallTemplates.groovy diff --git a/grails-scripts/src/scripts/IntegrateWith.groovy b/scripts/IntegrateWith.groovy similarity index 100% rename from grails-scripts/src/scripts/IntegrateWith.groovy rename to scripts/IntegrateWith.groovy diff --git a/grails-scripts/src/scripts/Interactive.groovy b/scripts/Interactive.groovy similarity index 100% rename from grails-scripts/src/scripts/Interactive.groovy rename to scripts/Interactive.groovy diff --git a/grails-scripts/src/scripts/ListPluginUpdates.groovy b/scripts/ListPluginUpdates.groovy similarity index 100% rename from grails-scripts/src/scripts/ListPluginUpdates.groovy rename to scripts/ListPluginUpdates.groovy diff --git a/grails-scripts/src/scripts/ListPlugins_.groovy b/scripts/ListPlugins_.groovy similarity index 100% rename from grails-scripts/src/scripts/ListPlugins_.groovy rename to scripts/ListPlugins_.groovy diff --git a/grails-scripts/src/scripts/Package.groovy b/scripts/Package.groovy similarity index 100% rename from grails-scripts/src/scripts/Package.groovy rename to scripts/Package.groovy diff --git a/grails-scripts/src/scripts/PackagePlugin_.groovy b/scripts/PackagePlugin_.groovy similarity index 100% rename from grails-scripts/src/scripts/PackagePlugin_.groovy rename to scripts/PackagePlugin_.groovy diff --git a/grails-scripts/src/scripts/PluginInfo_.groovy b/scripts/PluginInfo_.groovy similarity index 100% rename from grails-scripts/src/scripts/PluginInfo_.groovy rename to scripts/PluginInfo_.groovy diff --git a/grails-scripts/src/scripts/RemoveProxy_.groovy b/scripts/RemoveProxy_.groovy similarity index 100% rename from grails-scripts/src/scripts/RemoveProxy_.groovy rename to scripts/RemoveProxy_.groovy diff --git a/grails-scripts/src/scripts/RunApp.groovy b/scripts/RunApp.groovy similarity index 100% rename from grails-scripts/src/scripts/RunApp.groovy rename to scripts/RunApp.groovy diff --git a/grails-scripts/src/scripts/RunScript.groovy b/scripts/RunScript.groovy similarity index 100% rename from grails-scripts/src/scripts/RunScript.groovy rename to scripts/RunScript.groovy diff --git a/grails-scripts/src/scripts/RunWar.groovy b/scripts/RunWar.groovy similarity index 100% rename from grails-scripts/src/scripts/RunWar.groovy rename to scripts/RunWar.groovy diff --git a/grails-scripts/src/scripts/SchemaExport.groovy b/scripts/SchemaExport.groovy similarity index 100% rename from grails-scripts/src/scripts/SchemaExport.groovy rename to scripts/SchemaExport.groovy diff --git a/grails-scripts/src/scripts/SetProxy_.groovy b/scripts/SetProxy_.groovy similarity index 100% rename from grails-scripts/src/scripts/SetProxy_.groovy rename to scripts/SetProxy_.groovy diff --git a/grails-scripts/src/scripts/SetVersion.groovy b/scripts/SetVersion.groovy similarity index 100% rename from grails-scripts/src/scripts/SetVersion.groovy rename to scripts/SetVersion.groovy diff --git a/grails-scripts/src/scripts/Shell.groovy b/scripts/Shell.groovy similarity index 100% rename from grails-scripts/src/scripts/Shell.groovy rename to scripts/Shell.groovy diff --git a/grails-scripts/src/scripts/Stats.groovy b/scripts/Stats.groovy similarity index 100% rename from grails-scripts/src/scripts/Stats.groovy rename to scripts/Stats.groovy diff --git a/grails-scripts/src/scripts/TestApp.groovy b/scripts/TestApp.groovy similarity index 100% rename from grails-scripts/src/scripts/TestApp.groovy rename to scripts/TestApp.groovy diff --git a/grails-scripts/src/scripts/UninstallPlugin.groovy b/scripts/UninstallPlugin.groovy similarity index 100% rename from grails-scripts/src/scripts/UninstallPlugin.groovy rename to scripts/UninstallPlugin.groovy diff --git a/grails-scripts/src/scripts/Upgrade.groovy b/scripts/Upgrade.groovy similarity index 100% rename from grails-scripts/src/scripts/Upgrade.groovy rename to scripts/Upgrade.groovy diff --git a/grails-scripts/src/scripts/War.groovy b/scripts/War.groovy similarity index 100% rename from grails-scripts/src/scripts/War.groovy rename to scripts/War.groovy diff --git a/grails-scripts/src/scripts/_GrailsArgParsing.groovy b/scripts/_GrailsArgParsing.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsArgParsing.groovy rename to scripts/_GrailsArgParsing.groovy diff --git a/grails-scripts/src/scripts/_GrailsBootstrap.groovy b/scripts/_GrailsBootstrap.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsBootstrap.groovy rename to scripts/_GrailsBootstrap.groovy diff --git a/grails-scripts/src/scripts/_GrailsClasspath.groovy b/scripts/_GrailsClasspath.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsClasspath.groovy rename to scripts/_GrailsClasspath.groovy diff --git a/grails-scripts/src/scripts/_GrailsClean.groovy b/scripts/_GrailsClean.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsClean.groovy rename to scripts/_GrailsClean.groovy diff --git a/grails-scripts/src/scripts/_GrailsCompile.groovy b/scripts/_GrailsCompile.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsCompile.groovy rename to scripts/_GrailsCompile.groovy diff --git a/grails-scripts/src/scripts/_GrailsCreateArtifacts.groovy b/scripts/_GrailsCreateArtifacts.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsCreateArtifacts.groovy rename to scripts/_GrailsCreateArtifacts.groovy diff --git a/grails-scripts/src/scripts/_GrailsCreateProject.groovy b/scripts/_GrailsCreateProject.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsCreateProject.groovy rename to scripts/_GrailsCreateProject.groovy diff --git a/grails-scripts/src/scripts/_GrailsDocs.groovy b/scripts/_GrailsDocs.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsDocs.groovy rename to scripts/_GrailsDocs.groovy diff --git a/grails-scripts/src/scripts/_GrailsEvents.groovy b/scripts/_GrailsEvents.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsEvents.groovy rename to scripts/_GrailsEvents.groovy diff --git a/grails-scripts/src/scripts/_GrailsGenerate.groovy b/scripts/_GrailsGenerate.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsGenerate.groovy rename to scripts/_GrailsGenerate.groovy diff --git a/grails-scripts/src/scripts/_GrailsInit.groovy b/scripts/_GrailsInit.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsInit.groovy rename to scripts/_GrailsInit.groovy diff --git a/grails-scripts/src/scripts/_GrailsPackage.groovy b/scripts/_GrailsPackage.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsPackage.groovy rename to scripts/_GrailsPackage.groovy diff --git a/grails-scripts/src/scripts/_GrailsPluginDev.groovy b/scripts/_GrailsPluginDev.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsPluginDev.groovy rename to scripts/_GrailsPluginDev.groovy diff --git a/grails-scripts/src/scripts/_GrailsPlugins.groovy b/scripts/_GrailsPlugins.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsPlugins.groovy rename to scripts/_GrailsPlugins.groovy diff --git a/grails-scripts/src/scripts/_GrailsProxy.groovy b/scripts/_GrailsProxy.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsProxy.groovy rename to scripts/_GrailsProxy.groovy diff --git a/grails-scripts/src/scripts/_GrailsRun.groovy b/scripts/_GrailsRun.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsRun.groovy rename to scripts/_GrailsRun.groovy diff --git a/grails-scripts/src/scripts/_GrailsSettings.groovy b/scripts/_GrailsSettings.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsSettings.groovy rename to scripts/_GrailsSettings.groovy diff --git a/grails-scripts/src/scripts/_GrailsTest.groovy b/scripts/_GrailsTest.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsTest.groovy rename to scripts/_GrailsTest.groovy diff --git a/grails-scripts/src/scripts/_GrailsWar.groovy b/scripts/_GrailsWar.groovy similarity index 100% rename from grails-scripts/src/scripts/_GrailsWar.groovy rename to scripts/_GrailsWar.groovy diff --git a/grails-scripts/src/scripts/_PackagePlugins.groovy b/scripts/_PackagePlugins.groovy similarity index 100% rename from grails-scripts/src/scripts/_PackagePlugins.groovy rename to scripts/_PackagePlugins.groovy diff --git a/grails-scripts/src/scripts/_PluginDependencies.groovy b/scripts/_PluginDependencies.groovy similarity index 100% rename from grails-scripts/src/scripts/_PluginDependencies.groovy rename to scripts/_PluginDependencies.groovy diff --git a/grails-scripts/src/scripts/log4j.properties b/scripts/log4j.properties similarity index 100% rename from grails-scripts/src/scripts/log4j.properties rename to scripts/log4j.properties