Permalink
Browse files

Refactor 'org.codehaus.groovy.grails' -> 'org.grails' for grails-boot…

…strap
  • Loading branch information...
1 parent 8d5caf7 commit df90d10e4b1277f824de0f058625b786c540c8f7 @graemerocher graemerocher committed Jul 9, 2014
Showing with 537 additions and 442 deletions.
  1. +4 −4 ...roovy/org/grails/{resolve → dependency/resolution}/maven/aether/AetherArtifactResultReport.groovy
  2. +37 −37 ...n/groovy/org/grails/{resolve → dependency/resolution}/maven/aether/AetherDependencyManager.groovy
  3. +4 −4 ...in/groovy/org/grails/{resolve → dependency/resolution}/maven/aether/AetherDependencyReport.groovy
  4. +4 −4 ...ain/groovy/org/grails/{resolve → dependency/resolution}/maven/aether/AetherExcludeResolver.groovy
  5. +3 −3 .../src/main/groovy/org/grails/{resolve → dependency/resolution}/maven/aether/AetherGraphNode.groovy
  6. +2 −2 ...src/main/groovy/org/grails/{resolve → dependency/resolution}/maven/aether/config/AetherDsl.groovy
  7. +4 −4 ...org/grails/{resolve → dependency/resolution}/maven/aether/config/DependenciesConfiguration.groovy
  8. +1 −1 ...y/org/grails/{resolve → dependency/resolution}/maven/aether/config/DependencyConfiguration.groovy
  9. +2 −4 ...ls/{resolve → dependency/resolution}/maven/aether/config/DependencyManagementConfiguration.groovy
  10. +3 −3 .../grails/{resolve → dependency/resolution}/maven/aether/config/GrailsAetherCoreDependencies.groovy
  11. +10 −10 ...roovy/org/grails/{resolve → dependency/resolution}/maven/aether/config/PluginConfiguration.groovy
  12. +2 −3 ...org/grails/{resolve → dependency/resolution}/maven/aether/config/RepositoriesConfiguration.groovy
  13. +1 −1 ...y/org/grails/{resolve → dependency/resolution}/maven/aether/config/RepositoryConfiguration.groovy
  14. +1 −1 ...g/grails/{resolve → dependency/resolution}/maven/aether/support/GrailsConsoleLoggerManager.groovy
  15. +1 −1 ...rg/grails/{resolve → dependency/resolution}/maven/aether/support/GrailsHomeWorkspaceReader.groovy
  16. +1 −1 ...oovy/org/grails/{resolve → dependency/resolution}/maven/aether/support/GrailsModelResolver.groovy
  17. +1 −1 ...s/{resolve → dependency/resolution}/maven/aether/support/MultipleTopLevelJavaScopeSelector.groovy
  18. +1 −1 ...ls/{resolve → dependency/resolution}/maven/aether/support/ScopeAwareNearestVersionSelector.groovy
  19. +5 −5 grails-aether/src/test/groovy/org/grails/resolve/maven/AetherDependencyManagerSpec.groovy
  20. +3 −3 grails-aether/src/test/groovy/org/grails/resolve/maven/AetherExcludeResolverSpec.groovy
  21. +4 −2 ...in/groovy/{org/codehaus/groovy/grails/io/support/GrailsIOUtils.groovy → grails/io/IOUtils.groovy}
  22. +10 −13 grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
  23. +11 −11 grails-bootstrap/src/main/groovy/grails/util/PluginBuildSettings.groovy
  24. +1 −1 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/CachedScript.java
  25. +2 −2 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/GrailsScriptRunner.java
  26. +4 −7 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/api/BaseSettingsApi.java
  27. +2 −2 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/fork/ForkedGrailsProcess.groovy
  28. +3 −3 ...trap/src/main/groovy/org/codehaus/groovy/grails/cli/interactive/GrailsInteractiveCompletor.groovy
  29. +3 −3 ...p/src/main/groovy/org/codehaus/groovy/grails/cli/interactive/completors/ClassNameCompletor.groovy
  30. +0 −3 ...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/maven/MavenMultiProjectGenerator.groovy
  31. +7 −7 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/maven/MavenPomGenerator.groovy
  32. +1 −1 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/support/ClasspathConfigurer.java
  33. +1 −1 ...ls-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/support/GrailsBuildEventListener.java
  34. +1 −1 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/AstPluginDescriptorReader.java
  35. +1 −1 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/BasicGrailsPluginInfo.java
  36. +1 −1 ...bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/CompositePluginDescriptorReader.java
  37. +1 −1 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/GrailsPluginInfo.java
  38. +1 −1 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/GrailsPluginUtils.groovy
  39. +1 −1 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/PluginDescriptorReader.java
  40. +3 −3 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/PluginInfo.groovy
  41. +1 −1 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/XmlPluginDescriptorReader.java
  42. +1 −1 ...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/build/scopes/PluginScopeInfo.groovy
  43. +3 −3 ...ls-bootstrap/src/main/groovy/{ → org}/grails/build/interactive/completors/CreateController.groovy
  44. +1 −1 ...otstrap/src/main/groovy/{ → org}/grails/build/interactive/completors/CreateIntegrationTest.groovy
  45. +3 −3 ...trap/src/main/groovy/{ → org}/grails/build/interactive/completors/CreateScaffoldController.groovy
  46. +3 −3 grails-bootstrap/src/main/groovy/{ → org}/grails/build/interactive/completors/CreateService.groovy
  47. +3 −3 grails-bootstrap/src/main/groovy/{ → org}/grails/build/interactive/completors/CreateTagLib.groovy
  48. +1 −1 grails-bootstrap/src/main/groovy/{ → org}/grails/build/interactive/completors/CreateUnitTest.groovy
  49. +1 −1 ...rap/src/main/groovy/{ → org}/grails/build/interactive/completors/EscapingFileNameCompletor.groovy
  50. +3 −3 grails-bootstrap/src/main/groovy/{ → org}/grails/build/interactive/completors/GenerateAll.groovy
  51. +3 −3 ...strap/src/main/groovy/{ → org}/grails/build/interactive/completors/GenerateAsyncController.groovy
  52. +3 −3 ...-bootstrap/src/main/groovy/{ → org}/grails/build/interactive/completors/GenerateController.groovy
  53. +3 −3 grails-bootstrap/src/main/groovy/{ → org}/grails/build/interactive/completors/GenerateViews.groovy
  54. +1 −1 grails-bootstrap/src/main/groovy/{ → org}/grails/build/interactive/completors/Open.groovy
  55. +1 −1 grails-bootstrap/src/main/groovy/{ → org}/grails/build/interactive/completors/RegexCompletor.groovy
  56. +1 −1 ...rap/src/main/groovy/{ → org}/grails/build/interactive/completors/SimpleOrFileNameCompletor.groovy
  57. +1 −1 grails-bootstrap/src/main/groovy/{ → org}/grails/build/interactive/completors/StringsCompleter.java
  58. +1 −1 grails-bootstrap/src/main/groovy/{ → org}/grails/build/interactive/completors/TestApp.groovy
  59. +1 −1 ...main/groovy/org/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/Dependency.groovy
  60. +1 −1 ...g/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/DependencyDefinitionParser.java
  61. +1 −1 ...groovy/org/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/DependencyManager.java
  62. +5 −3 ...codehaus/groovy/grails/resolve → grails/dependency/resolution}/DependencyManagerConfigurer.groovy
  63. +3 −3 ...org/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/DependencyManagerUtils.groovy
  64. +1 −1 .../groovy/org/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/DependencyReport.java
  65. +1 −1 ...roovy/org/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/DependencyResolver.java
  66. +1 −1 ...groovy/org/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/ExcludeResolver.groovy
  67. +1 −1 ...y/org/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/GrailsCoreDependencies.java
  68. +1 −1 ...s/groovy/grails/resolve → grails/dependency/resolution}/GrailsCoreDependenciesPomGenerator.groovy
  69. +6 −5 ...vy/org/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/PluginInstallEngine.groovy
  70. +3 −3 ...vy/org/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/PluginResolveEngine.groovy
  71. +1 −1 ...org/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/ResolvedArtifactReport.groovy
  72. +5 −5 ...ehaus/groovy/grails/resolve → grails/dependency/resolution/ivy}/AbstractIvyDependencyManager.java
  73. +1 −1 ...ovy/grails/resolve → grails/dependency/resolution/ivy}/EnhancedDefaultDependencyDescriptor.groovy
  74. +6 −4 .../{codehaus/groovy/grails/resolve → grails/dependency/resolution/ivy}/GrailsIvyDependencies.groovy
  75. +1 −1 ...aus/groovy/grails/resolve → grails/dependency/resolution/ivy}/GrailsPluginsDirectoryResolver.java
  76. +1 −1 ...y/org/{codehaus/groovy/grails/resolve → grails/dependency/resolution/ivy}/GrailsRepoResolver.java
  77. +1 −1 ...ovy/org/{codehaus/groovy/grails/resolve → grails/dependency/resolution/ivy}/GrailsRepository.java
  78. +10 −7 ...g/{codehaus/groovy/grails/resolve → grails/dependency/resolution/ivy}/IvyDependencyManager.groovy
  79. +4 −1 ...rg/{codehaus/groovy/grails/resolve → grails/dependency/resolution/ivy}/IvyDependencyReport.groovy
  80. +5 −5 ...org/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/ivy/IvyExcludeResolver.groovy
  81. +3 −3 ...roovy/org/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/ivy/IvyGraphNode.groovy
  82. +1 −1 ...ehaus/groovy/grails/resolve → grails/dependency/resolution/ivy}/LastModifiedResolvedResource.java
  83. +1 −1 ...y/org/{codehaus/groovy/grails/resolve → grails/dependency/resolution/ivy}/ResolveException.groovy
  84. +1 −1 .../{codehaus/groovy/grails/resolve → grails/dependency/resolution/ivy}/SnapshotAwareM2Resolver.java
  85. +2 −2 ...ovy/grails/resolve → grails/dependency/resolution/ivy}/config/AbstractDependenciesConfigurer.java
  86. +3 −3 ...ls/resolve → grails/dependency/resolution/ivy}/config/AbstractDependencyManagementConfigurer.java
  87. +1 −1 ...rails/resolve → grails/dependency/resolution/ivy}/config/DependencyConfigurationConfigurer.groovy
  88. +4 −4 ...ovy/grails/resolve → grails/dependency/resolution/ivy}/config/DependencyConfigurationContext.java
  89. +1 −1 ...aus/groovy/grails/resolve → grails/dependency/resolution/ivy}/config/InheritanceConfigurer.groovy
  90. +2 −2 ...s/groovy/grails/resolve → grails/dependency/resolution/ivy}/config/JarDependenciesConfigurer.java
  91. +2 −2 ...roovy/grails/resolve → grails/dependency/resolution/ivy}/config/PluginDependenciesConfigurer.java
  92. +6 −6 ...us/groovy/grails/resolve → grails/dependency/resolution/ivy}/config/RepositoriesConfigurer.groovy
  93. +1 −1 ...lve → grails/dependency/resolution/ivy}/maven/GrailsPackagingAwarePomModuleDescriptorBuilder.java
  94. +1 −1 ...us/groovy/grails/resolve → grails/dependency/resolution/ivy}/maven/PomModuleDescriptorParser.java
  95. +1 −1 ...us/groovy/grails/resolve → grails/dependency/resolution}/reporting/DependencyGraphRenderer.groovy
  96. +2 −2 ...vy/org/{codehaus/groovy/grails/resolve → grails/dependency/resolution}/reporting/GraphNode.groovy
  97. +1 −1 ...dehaus/groovy/grails/resolve → grails/dependency/resolution}/reporting/SimpleGraphRenderer.groovy
  98. +1 −1 ...y/org/{codehaus/groovy/grails/exceptions → grails/exceptions/reporting}/CodeSnippetPrinter.groovy
  99. +1 −1 .../{codehaus/groovy/grails/exceptions → grails/exceptions/reporting}/DefaultStackTraceFilterer.java
  100. +1 −1 ...{codehaus/groovy/grails/exceptions → grails/exceptions/reporting}/DefaultStackTracePrinter.groovy
  101. +1 −1 ...groovy/org/{codehaus/groovy/grails/exceptions → grails/exceptions/reporting}/SourceCodeAware.java
  102. +1 −1 ...ovy/org/{codehaus/groovy/grails/exceptions → grails/exceptions/reporting}/StackTraceFilterer.java
  103. +1 −1 ...vy/org/{codehaus/groovy/grails/exceptions → grails/exceptions/reporting}/StackTracePrinter.groovy
  104. +1 −1 ...rap/src/main/groovy/org/{codehaus/groovy → }/grails/io/support/AbstractFileResolvingResource.java
  105. +1 −1 grails-bootstrap/src/main/groovy/org/{codehaus/groovy → }/grails/io/support/AntPathMatcher.java
  106. +1 −1 grails-bootstrap/src/main/groovy/org/{codehaus/groovy → }/grails/io/support/ByteArrayResource.groovy
  107. +1 −1 grails-bootstrap/src/main/groovy/org/{codehaus/groovy → }/grails/io/support/ClassPathResource.java
  108. +1 −1 ...s-bootstrap/src/main/groovy/org/{codehaus/groovy → }/grails/io/support/DefaultResourceLoader.java
  109. +1 −1 grails-bootstrap/src/main/groovy/org/{codehaus/groovy → }/grails/io/support/FileSystemResource.java
  110. +1 −1 grails-bootstrap/src/main/groovy/org/{codehaus/groovy → }/grails/io/support/GrailsResourceUtils.java
  111. +1 −1 ...c/main/groovy/org/{codehaus/groovy → }/grails/io/support/PathMatchingResourcePatternResolver.java
  112. +1 −1 grails-bootstrap/src/main/groovy/org/{codehaus/groovy → }/grails/io/support/Resource.java
  113. +1 −1 grails-bootstrap/src/main/groovy/org/{codehaus/groovy → }/grails/io/support/ResourceLoader.java
  114. +2 −2 ...roovy/org/{codehaus/groovy/grails/io/support/IOUtils.java → grails/io/support/SpringIOUtils.java}
  115. +1 −1 grails-bootstrap/src/main/groovy/org/{codehaus/groovy → }/grails/io/support/UrlResource.java
  116. +1 −0 grails-bootstrap/src/test/groovy/grails/build/interactive/completors/RegexCompletorSpec.groovy
  117. +4 −4 grails-bootstrap/src/test/groovy/org/codehaus/groovy/grails/cli/maven/MavenPomGeneratorSpec.groovy
  118. +2 −0 ...otstrap/src/test/groovy/org/codehaus/groovy/grails/resolve/DependencyManagerConfigurerSpec.groovy
  119. +4 −1 grails-bootstrap/src/test/groovy/org/codehaus/groovy/grails/resolve/IvyDependencyManagerTests.groovy
  120. +3 −1 grails-bootstrap/src/test/groovy/org/codehaus/groovy/grails/resolve/IvyExcludeResolverSpec.groovy
  121. +2 −1 grails-bootstrap/src/test/groovy/org/codehaus/groovy/grails/resolve/PluginResolveEngineSpec.groovy
  122. +3 −1 ...strap/src/test/groovy/org/codehaus/groovy/grails/resolve/reporting/SimpleGraphRendererSpec.groovy
  123. +3 −3 grails-bootstrap/src/uaa/groovy/org/codehaus/groovy/grails/cli/support/UaaEnabler.groovy
  124. +9 −0 grails-compat/src/main/groovy/org/codehaus/groovy/grails/io/support/GrailsIOUtils.groovy
  125. +9 −0 grails-compat/src/main/groovy/org/codehaus/groovy/grails/io/support/IOUtils.groovy
  126. +23 −0 grails-compat/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.groovy
  127. +30 −0 grails-compat/src/main/groovy/org/codehaus/groovy/grails/resolve/PluginInstallEngine.groovy
  128. +5 −4 grails-core/src/main/groovy/grails/core/DefaultGrailsApplication.java
  129. +1 −1 grails-core/src/main/groovy/grails/plugins/DefaultGrailsPluginManager.java
  130. +2 −2 grails-core/src/main/groovy/grails/util/GrailsUtil.java
  131. +1 −1 grails-core/src/main/groovy/org/grails/compiler/injection/DefaultGrailsDomainClassInjector.java
  132. +4 −4 grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareInjectionOperation.java
  133. +3 −3 grails-core/src/main/groovy/org/grails/core/exceptions/DefaultErrorsPrinter.groovy
  134. +1 −1 grails-core/src/main/groovy/org/grails/core/io/DefaultResourceLocator.java
  135. +2 −2 grails-core/src/main/groovy/org/grails/core/io/GrailsResource.groovy
  136. +1 −1 grails-core/src/main/groovy/org/grails/core/io/SpringResource.java
  137. +2 −2 grails-core/src/main/groovy/org/grails/dev/support/DevelopmentResourceLoader.java
  138. +1 −1 grails-core/src/main/groovy/org/grails/plugins/AbstractGrailsPluginManager.java
  139. +2 −2 grails-core/src/main/groovy/org/grails/plugins/CorePluginFinder.java
  140. +5 −5 grails-core/src/main/groovy/org/grails/plugins/DefaultGrailsPlugin.java
  141. +1 −1 grails-core/src/main/groovy/org/grails/plugins/publishing/PluginDescriptorGenerator.groovy
  142. +4 −4 grails-core/src/main/groovy/org/grails/spring/beans/factory/GrailsApplicationFactoryBean.java
  143. +2 −2 grails-core/src/main/groovy/org/grails/spring/beans/factory/GrailsPluginManagerFactoryBean.java
  144. +1 −0 grails-core/src/test/groovy/org/codehaus/groovy/grails/exceptions/StackTraceFiltererSpec.groovy
  145. +1 −0 grails-core/src/test/groovy/org/codehaus/groovy/grails/exceptions/StackTracePrinterSpec.groovy
  146. +1 −1 ...rc/test/groovy/org/codehaus/groovy/grails/plugins/publishing/PluginDescriptorGeneratorSpec.groovy
  147. +14 −15 grails-encoder/src/test/groovy/org/codehaus/groovy/grails/web/util/StreamCharBufferTests.java
  148. +1 −1 grails-logging/src/main/groovy/org/grails/compiler/logging/LoggingTransformer.java
  149. +1 −1 grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerDomainTransformer.java
  150. +1 −1 grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerTransformer.java
  151. +6 −6 grails-plugin-controllers/src/main/groovy/org/grails/plugins/web/controllers/api/ControllersApi.java
  152. +3 −3 grails-plugin-converters/src/main/groovy/grails/converters/JSON.java
  153. +3 −3 grails-plugin-converters/src/main/groovy/grails/converters/XML.java
  154. +1 −1 ...nverters/src/main/groovy/org/grails/compiler/web/converters/ConvertersControllersTransformer.java
  155. +1 −1 ...in-converters/src/main/groovy/org/grails/compiler/web/converters/ConvertersDomainTransformer.java
  156. +1 −1 ...rc/ast/groovy/org/codehaus/groovy/grails/compiler/web/taglib/ControllerTagLibraryTransformer.java
  157. +1 −1 grails-plugin-i18n/src/main/groovy/org/grails/plugins/i18n/I18nGrailsPlugin.groovy
  158. +5 −2 ...lugin-log4j/src/main/groovy/org/grails/plugins/logging/log4j/appenders/GrailsConsoleAppender.java
  159. +1 −1 grails-plugin-log4j/src/main/groovy/org/slf4j/impl/GrailsLog4jLoggerAdapter.java
  160. +1 −1 grails-plugin-mimetypes/src/main/groovy/org/grails/compiler/web/mime/MimeTypesTransformer.java
  161. +1 −1 ...ls-plugin-testing/src/main/groovy/grails/test/mixin/support/GroovyPageUnitTestResourceLoader.java
  162. +3 −2 ...ing/src/main/groovy/org/codehaus/groovy/grails/compiler/injection/test/TestForTransformation.java
  163. +2 −2 ...s-project-api/src/main/groovy/org/codehaus/groovy/grails/plugins/publishing/PluginPackager.groovy
  164. +5 −4 ...project-api/src/main/groovy/org/codehaus/groovy/grails/project/compiler/GrailsProjectWatcher.java
  165. +1 −1 ...ect-api/src/main/groovy/org/codehaus/groovy/grails/project/packaging/GrailsProjectPackager.groovy
  166. +1 −1 ...t-api/src/main/groovy/org/codehaus/groovy/grails/project/plugins/GrailsProjectPluginLoader.groovy
  167. +1 −1 grails-test-suite-uber/src/test/groovy/grails/util/PluginBuildSettingsTests.groovy
  168. +3 −0 ...st-suite-uber/src/test/groovy/org/codehaus/groovy/grails/io/support/GrailsResourceUtilsTests.java
  169. +1 −1 ...-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/plugins/GrailsPluginUtilsTests.groovy
  170. +2 −2 ...-suite-uber/src/test/groovy/org/codehaus/groovy/grails/plugins/PluginDescriptorReaderTests.groovy
  171. +1 −1 grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/plugins/PluginInfoTests.groovy
  172. +1 −0 ...test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/resolve/GrailsRepoResolverTests.groovy
  173. +2 −1 grails-test/src/main/groovy/grails/test/GrailsAwareGroovyTestSuite.java
  174. +2 −2 ...in/groovy/org/codehaus/groovy/grails/plugins/testing/AbstractGrailsMockHttpServletResponse.groovy
  175. +2 −2 grails-test/src/main/groovy/org/codehaus/groovy/grails/test/event/GrailsTestRunNotifier.java
  176. +1 −1 grails-test/src/main/groovy/org/codehaus/groovy/grails/test/support/TestStacktraceSanitizer.java
  177. +2 −2 grails-validation/src/main/groovy/org/grails/validation/DefaultConstraintEvaluator.java
  178. +2 −2 grails-web-common/src/main/groovy/grails/web/servlet/mvc/GrailsParameterMap.java
  179. +1 −1 grails-web-common/src/main/groovy/org/grails/web/errors/ErrorsViewStackTracePrinter.groovy
  180. +1 −1 grails-web-common/src/main/groovy/org/grails/web/errors/GrailsWrappedRuntimeException.java
  181. +2 −2 grails-web-common/src/main/groovy/org/grails/web/support/ResourceAwareTemplateEngine.java
  182. +2 −2 ...ng/src/main/groovy/org/grails/web/databinding/bindingsource/HalXmlDataBindingSourceCreator.groovy
  183. +3 −3 ...nding/src/main/groovy/org/grails/web/databinding/bindingsource/XmlDataBindingSourceCreator.groovy
  184. +1 −1 ...web-gsp/src/main/groovy/org/codehaus/groovy/grails/compiler/web/taglib/TagLibraryTransformer.java
  185. +3 −3 grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/GroovyPageMetaInfo.java
  186. +6 −6 grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/GroovyPageParser.java
  187. +1 −1 grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/GroovyPageResourceLoader.java
  188. +1 −1 grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/GroovyPagesTemplateRenderer.java
  189. +1 −1 ...-gsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/discovery/DefaultGroovyPageLocator.java
  190. +1 −1 ...main/groovy/org/codehaus/groovy/grails/web/pages/discovery/GrailsConventionGroovyPageLocator.java
  191. +1 −1 ...rc/main/groovy/org/codehaus/groovy/grails/web/pages/discovery/GroovyPageResourceScriptSource.java
  192. +1 −1 ...c/main/groovy/org/codehaus/groovy/grails/web/pages/discovery/GroovyPageStaticResourceLocator.java
  193. +1 −1 ...web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/exceptions/GroovyPagesException.java
  194. +1 −1 ...-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/taglib/exceptions/GrailsTagException.java
  195. +2 −2 grails-web-jsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/TldReader.groovy
  196. +2 −2 ...eb-jsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/WebXmlTagLibraryReader.groovy
  197. +2 −2 grails-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java
  198. +1 −1 ...-web-sitemesh/src/main/groovy/org/codehaus/groovy/grails/web/sitemesh/GroovyPageLayoutFinder.java
  199. +2 −2 grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultUrlMappingEvaluator.java
  200. +1 −1 grails-web/src/main/groovy/org/grails/web/servlet/context/GrailsContextLoaderListener.java
View
8 .../aether/AetherArtifactResultReport.groovy → .../aether/AetherArtifactResultReport.groovy
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether
+package org.grails.dependency.resolution.maven.aether
import groovy.transform.CompileStatic
-import org.codehaus.groovy.grails.resolve.Dependency
-import org.codehaus.groovy.grails.resolve.DependencyReport
-import org.codehaus.groovy.grails.resolve.ResolvedArtifactReport
+import org.grails.dependency.resolution.Dependency
+import org.grails.dependency.resolution.DependencyReport
+import org.grails.dependency.resolution.ResolvedArtifactReport
import org.eclipse.aether.resolution.ArtifactResult
/**
View
74 ...ven/aether/AetherDependencyManager.groovy → ...ven/aether/AetherDependencyManager.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether
+package org.grails.dependency.resolution.maven.aether
import grails.build.logging.GrailsConsole
import grails.util.BuildSettings
@@ -29,20 +29,20 @@ import org.apache.maven.settings.Settings
import org.apache.maven.settings.building.DefaultSettingsBuildingRequest
import org.apache.maven.settings.building.SettingsBuilder
import org.apache.maven.settings.building.SettingsBuildingResult
-import org.codehaus.groovy.grails.io.support.IOUtils
-import org.codehaus.groovy.grails.resolve.DependencyManager
-import org.codehaus.groovy.grails.resolve.DependencyManagerUtils
-import org.codehaus.groovy.grails.resolve.DependencyReport
-import org.codehaus.groovy.grails.resolve.ExcludeResolver
-import org.codehaus.groovy.grails.resolve.GrailsCoreDependencies
-import org.grails.resolve.maven.aether.config.AetherDsl
-import org.grails.resolve.maven.aether.config.DependencyConfiguration
-import org.grails.resolve.maven.aether.support.GrailsConsoleLoggerManager
-import org.grails.resolve.maven.aether.support.GrailsHomeWorkspaceReader
-import org.grails.resolve.maven.aether.support.GrailsModelResolver
-import org.grails.resolve.maven.aether.support.MultipleTopLevelJavaScopeSelector
-import org.grails.resolve.maven.aether.support.ScopeAwareNearestVersionSelector
-import org.codehaus.groovy.grails.resolve.reporting.SimpleGraphRenderer
+import org.grails.io.support.SpringIOUtils
+import org.grails.dependency.resolution.DependencyManager
+import org.grails.dependency.resolution.DependencyManagerUtils
+import org.grails.dependency.resolution.DependencyReport
+import org.grails.dependency.resolution.ExcludeResolver
+import org.grails.dependency.resolution.GrailsCoreDependencies
+import org.grails.dependency.resolution.maven.aether.config.AetherDsl
+import org.grails.dependency.resolution.maven.aether.config.DependencyConfiguration
+import org.grails.dependency.resolution.maven.aether.support.GrailsConsoleLoggerManager
+import org.grails.dependency.resolution.maven.aether.support.GrailsHomeWorkspaceReader
+import org.grails.dependency.resolution.maven.aether.support.GrailsModelResolver
+import org.grails.dependency.resolution.maven.aether.support.MultipleTopLevelJavaScopeSelector
+import org.grails.dependency.resolution.maven.aether.support.ScopeAwareNearestVersionSelector
+import org.grails.dependency.resolution.reporting.SimpleGraphRenderer
import org.codehaus.plexus.DefaultPlexusContainer
import org.eclipse.aether.DefaultRepositorySystemSession
import org.eclipse.aether.RepositorySystem
@@ -111,15 +111,15 @@ class AetherDependencyManager implements DependencyManager {
protected DependencyReport jvmAgentReport
protected List<Dependency> dependencies = []
protected List<Dependency> managedDependencies = []
- protected Set<org.codehaus.groovy.grails.resolve.Dependency> grailsPluginDependencies = []
+ protected Set<org.grails.dependency.resolution.Dependency> grailsPluginDependencies = []
protected List<Dependency> buildDependencies = []
- protected Map<String, List<org.codehaus.groovy.grails.resolve.Dependency>> grailsDependenciesByScope = [:].withDefault {
+ protected Map<String, List<org.grails.dependency.resolution.Dependency>> grailsDependenciesByScope = [:].withDefault {
[]
}
- protected Map<String, List<org.codehaus.groovy.grails.resolve.Dependency>> grailsPluginDependenciesByScope = [:].withDefault {
+ protected Map<String, List<org.grails.dependency.resolution.Dependency>> grailsPluginDependenciesByScope = [:].withDefault {
[]
}
- protected List<org.codehaus.groovy.grails.resolve.Dependency> grailsDependencies = []
+ protected List<org.grails.dependency.resolution.Dependency> grailsDependencies = []
protected List<RemoteRepository> repositories = []
String cacheDir
String basedir = new File('.')
@@ -233,7 +233,7 @@ class AetherDependencyManager implements DependencyManager {
if (report.allArtifacts) {
File pluginXml = report.allArtifacts.find { File f -> f.name.endsWith('-plugin.xml') }
- return IOUtils.createXmlSlurper().parse(pluginXml)
+ return SpringIOUtils.createXmlSlurper().parse(pluginXml)
}
return null
@@ -303,7 +303,7 @@ class AetherDependencyManager implements DependencyManager {
}
@Override
- Collection<org.codehaus.groovy.grails.resolve.Dependency> getPluginDependencies() {
+ Collection<org.grails.dependency.resolution.Dependency> getPluginDependencies() {
return grailsPluginDependencies
}
@@ -416,7 +416,7 @@ class AetherDependencyManager implements DependencyManager {
}
@Override
- public DependencyReport resolveDependency(org.codehaus.groovy.grails.resolve.Dependency dependency) {
+ public DependencyReport resolveDependency(org.grails.dependency.resolution.Dependency dependency) {
DefaultDependencyNode node = new DefaultDependencyNode(new DefaultArtifact(dependency.group, dependency.name, dependency.classifier, dependency.extension, dependency.version))
DependencyResult resolveResult = resolveToResult(node, null)
@@ -535,7 +535,7 @@ class AetherDependencyManager implements DependencyManager {
String id = "org.grails:${grailsDep}:${coreDependencies.grailsVersion}"
registerManagedDependency(collectRequest, id,alreadyManagedArtefacts)
}
- for(org.codehaus.groovy.grails.resolve.Dependency d in coreDependencies.compileDependencies) {
+ for(org.grails.dependency.resolution.Dependency d in coreDependencies.compileDependencies) {
if(d.group == 'org.grails') {
registerManagedDependency(collectRequest, d.pattern,alreadyManagedArtefacts)
}
@@ -580,7 +580,7 @@ class AetherDependencyManager implements DependencyManager {
* @param configuration The depdency configuration
*/
void addDependency(Dependency dependency, DependencyConfiguration configuration = null) {
- org.codehaus.groovy.grails.resolve.Dependency grailsDependency = createGrailsDependency(dependency, configuration)
+ org.grails.dependency.resolution.Dependency grailsDependency = createGrailsDependency(dependency, configuration)
grailsDependencies << grailsDependency
grailsDependenciesByScope[dependency.scope] << grailsDependency
final aetherDependencies = dependencies
@@ -591,9 +591,9 @@ class AetherDependencyManager implements DependencyManager {
}
}
- protected org.codehaus.groovy.grails.resolve.Dependency createGrailsDependency(Dependency dependency, DependencyConfiguration configuration = null) {
+ protected org.grails.dependency.resolution.Dependency createGrailsDependency(Dependency dependency, DependencyConfiguration configuration = null) {
Artifact artifact = dependency.artifact
- final grailsDependency = new org.codehaus.groovy.grails.resolve.Dependency(artifact.groupId, artifact.artifactId, artifact.version)
+ final grailsDependency = new org.grails.dependency.resolution.Dependency(artifact.groupId, artifact.artifactId, artifact.version)
grailsDependency.extension = artifact.extension
if (configuration) {
grailsDependency.transitive = configuration.transitive
@@ -617,7 +617,7 @@ class AetherDependencyManager implements DependencyManager {
}
}
- void addBuildDependency(org.codehaus.groovy.grails.resolve.Dependency dependency, ExclusionDependencySelector exclusionDependencySelector = null) {
+ void addBuildDependency(org.grails.dependency.resolution.Dependency dependency, ExclusionDependencySelector exclusionDependencySelector = null) {
Collection<Exclusion> exclusions = new ArrayList<>()
for (exc in dependency.excludes) {
exclusions << new Exclusion(exc.group, exc.name, "*", "*")
@@ -647,7 +647,7 @@ class AetherDependencyManager implements DependencyManager {
}
}
- void addDependency(org.codehaus.groovy.grails.resolve.Dependency dependency, String scope, ExclusionDependencySelector exclusionDependencySelector = null) {
+ void addDependency(org.grails.dependency.resolution.Dependency dependency, String scope, ExclusionDependencySelector exclusionDependencySelector = null) {
Collection<Exclusion> exclusions = new ArrayList<>()
for (exc in dependency.excludes) {
exclusions << new Exclusion(exc.group, exc.name, "*", "*")
@@ -665,7 +665,7 @@ class AetherDependencyManager implements DependencyManager {
}
}
- protected boolean isGrailsPlugin(org.codehaus.groovy.grails.resolve.Dependency dependency) {
+ protected boolean isGrailsPlugin(org.grails.dependency.resolution.Dependency dependency) {
dependency.group == 'org.grails.plugins' || dependency.extension == 'zip'
}
@@ -678,27 +678,27 @@ class AetherDependencyManager implements DependencyManager {
@Override
@CompileStatic(TypeCheckingMode.SKIP)
- Collection<org.codehaus.groovy.grails.resolve.Dependency> getApplicationDependencies() {
- return grailsDependencies.findAll { org.codehaus.groovy.grails.resolve.Dependency d -> !d.inherited && !isGrailsPlugin(d) }.asImmutable()
+ Collection<org.grails.dependency.resolution.Dependency> getApplicationDependencies() {
+ return grailsDependencies.findAll { org.grails.dependency.resolution.Dependency d -> !d.inherited && !isGrailsPlugin(d) }.asImmutable()
}
@Override
- Collection<org.codehaus.groovy.grails.resolve.Dependency> getAllDependencies() {
+ Collection<org.grails.dependency.resolution.Dependency> getAllDependencies() {
return grailsDependencies.asImmutable()
}
@Override
@CompileStatic(TypeCheckingMode.SKIP)
- Collection<org.codehaus.groovy.grails.resolve.Dependency> getApplicationDependencies(String scope) {
- return grailsDependenciesByScope[scope].findAll { org.codehaus.groovy.grails.resolve.Dependency d -> !d.inherited && !isGrailsPlugin(d) }.asImmutable()
+ Collection<org.grails.dependency.resolution.Dependency> getApplicationDependencies(String scope) {
+ return grailsDependenciesByScope[scope].findAll { org.grails.dependency.resolution.Dependency d -> !d.inherited && !isGrailsPlugin(d) }.asImmutable()
}
- Collection<org.codehaus.groovy.grails.resolve.Dependency> getPluginDependencies(String scope) {
- return grailsPluginDependenciesByScope[scope].findAll { org.codehaus.groovy.grails.resolve.Dependency d -> !d.inherited }.asImmutable()
+ Collection<org.grails.dependency.resolution.Dependency> getPluginDependencies(String scope) {
+ return grailsPluginDependenciesByScope[scope].findAll { org.grails.dependency.resolution.Dependency d -> !d.inherited }.asImmutable()
}
@Override
- Collection<org.codehaus.groovy.grails.resolve.Dependency> getAllDependencies(String scope) {
+ Collection<org.grails.dependency.resolution.Dependency> getAllDependencies(String scope) {
return grailsDependencies[scope].asImmutable()
}
View
8 ...aven/aether/AetherDependencyReport.groovy → ...aven/aether/AetherDependencyReport.groovy
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether
+package org.grails.dependency.resolution.maven.aether
import groovy.transform.CompileStatic
-import org.codehaus.groovy.grails.resolve.Dependency
-import org.codehaus.groovy.grails.resolve.DependencyReport
-import org.codehaus.groovy.grails.resolve.ResolvedArtifactReport
+import org.grails.dependency.resolution.Dependency
+import org.grails.dependency.resolution.DependencyReport
+import org.grails.dependency.resolution.ResolvedArtifactReport
import org.eclipse.aether.graph.DependencyNode
import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator
View
8 ...maven/aether/AetherExcludeResolver.groovy → ...maven/aether/AetherExcludeResolver.groovy
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether
+package org.grails.dependency.resolution.maven.aether
-import org.codehaus.groovy.grails.resolve.Dependency
-import org.codehaus.groovy.grails.resolve.ExcludeResolver
-import org.codehaus.groovy.grails.resolve.reporting.GraphNode
+import org.grails.dependency.resolution.Dependency
+import org.grails.dependency.resolution.ExcludeResolver
+import org.grails.dependency.resolution.reporting.GraphNode
/**
* An exclude resolver for Aether
View
6 ...solve/maven/aether/AetherGraphNode.groovy → ...ution/maven/aether/AetherGraphNode.groovy
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether
+package org.grails.dependency.resolution.maven.aether
import groovy.transform.CompileStatic
-import org.codehaus.groovy.grails.resolve.Dependency
-import org.codehaus.groovy.grails.resolve.reporting.GraphNode
+import org.grails.dependency.resolution.Dependency
+import org.grails.dependency.resolution.reporting.GraphNode
import org.eclipse.aether.artifact.Artifact
import org.eclipse.aether.graph.DependencyNode
import org.eclipse.aether.resolution.DependencyResult
View
4 ...olve/maven/aether/config/AetherDsl.groovy → ...tion/maven/aether/config/AetherDsl.groovy
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether.config
+package org.grails.dependency.resolution.maven.aether.config
import grails.build.logging.GrailsConsole
import groovy.transform.CompileStatic
-import org.grails.resolve.maven.aether.AetherDependencyManager
+import org.grails.dependency.resolution.maven.aether.AetherDependencyManager
import org.codehaus.plexus.logging.Logger
import org.eclipse.aether.DefaultRepositorySystemSession
import org.eclipse.aether.graph.Dependency
View
8 ...r/config/DependenciesConfiguration.groovy → ...r/config/DependenciesConfiguration.groovy
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether.config
+package org.grails.dependency.resolution.maven.aether.config
import grails.build.logging.GrailsConsole
import groovy.transform.CompileStatic
import groovy.transform.TypeCheckingMode
import java.util.regex.Pattern
-import org.grails.resolve.maven.aether.AetherDependencyManager
+import org.grails.dependency.resolution.maven.aether.AetherDependencyManager
import org.eclipse.aether.graph.Dependency
import org.eclipse.aether.artifact.DefaultArtifact
import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector
@@ -99,11 +99,11 @@ class DependenciesConfiguration {
return new Dependency(new DefaultArtifact(properties.group, properties.name, properties.classifier, properties.extension ?: 'jar', version), scope)
}
- void addDependency(org.codehaus.groovy.grails.resolve.Dependency dependency, String scope) {
+ void addDependency(org.grails.dependency.resolution.Dependency dependency, String scope) {
dependencyManager.addDependency dependency, scope, exclusionDependencySelector
}
- void addBuildDependency(org.codehaus.groovy.grails.resolve.Dependency dependency) {
+ void addBuildDependency(org.grails.dependency.resolution.Dependency dependency) {
dependencyManager.addBuildDependency dependency, exclusionDependencySelector
}
View
2 ...her/config/DependencyConfiguration.groovy → ...her/config/DependencyConfiguration.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether.config
+package org.grails.dependency.resolution.maven.aether.config
import grails.build.logging.GrailsConsole
import groovy.transform.CompileStatic
View
6 .../DependencyManagementConfiguration.groovy → .../DependencyManagementConfiguration.groovy
@@ -13,13 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether.config
+package org.grails.dependency.resolution.maven.aether.config
import org.eclipse.aether.artifact.DefaultArtifact
import org.eclipse.aether.graph.Dependency
-import org.grails.resolve.maven.aether.AetherDependencyManager
-import org.grails.resolve.maven.aether.config.DependenciesConfiguration
-import org.grails.resolve.maven.aether.config.DependencyConfiguration
+import org.grails.dependency.resolution.maven.aether.AetherDependencyManager
/**
* Allows configuration of dependency management.
View
6 ...onfig/GrailsAetherCoreDependencies.groovy → ...onfig/GrailsAetherCoreDependencies.groovy
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether.config
+package org.grails.dependency.resolution.maven.aether.config
import groovy.transform.CompileStatic
import groovy.transform.TypeCheckingMode
-import org.codehaus.groovy.grails.resolve.Dependency
-import org.codehaus.groovy.grails.resolve.GrailsCoreDependencies
+import org.grails.dependency.resolution.Dependency
+import org.grails.dependency.resolution.GrailsCoreDependencies
import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector
/**
View
20 .../aether/config/PluginConfiguration.groovy → .../aether/config/PluginConfiguration.groovy
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether.config
+package org.grails.dependency.resolution.maven.aether.config
import groovy.transform.CompileStatic
-import org.grails.resolve.maven.aether.AetherDependencyManager
+import org.grails.dependency.resolution.maven.aether.AetherDependencyManager
import org.eclipse.aether.graph.Dependency
/**
@@ -33,42 +33,42 @@ class PluginConfiguration extends DependenciesConfiguration {
@Override
void addDependency(Dependency dependency, @DelegatesTo(DependencyConfiguration) Closure customizer) {
- super.addDependency(dependency, customizer)
+ Object.addDependency(dependency, customizer)
}
@Override
void addBuildDependency(Dependency dependency, @DelegatesTo(DependencyConfiguration) Closure customizer) {
- super.addBuildDependency(dependency, customizer)
+ Object.addBuildDependency(dependency, customizer)
}
@Override
void build(String pattern, @DelegatesTo(DependencyConfiguration) Closure customizer) {
- super.build(extractDependencyProperties(pattern), customizer)
+ Object.build(extractDependencyProperties(pattern), customizer)
}
@Override
void compile(String pattern, @DelegatesTo(DependencyConfiguration) Closure customizer) {
- super.compile(extractDependencyProperties(pattern), customizer)
+ Object.compile(extractDependencyProperties(pattern), customizer)
}
@Override
void runtime(String pattern, @DelegatesTo(DependencyConfiguration) Closure customizer) {
- super.runtime(extractDependencyProperties(pattern), customizer)
+ Object.runtime(extractDependencyProperties(pattern), customizer)
}
@Override
void provided(String pattern, @DelegatesTo(DependencyConfiguration) Closure customizer) {
- super.provided(extractDependencyProperties(pattern), customizer)
+ Object.provided(extractDependencyProperties(pattern), customizer)
}
@Override
void optional(String pattern, @DelegatesTo(DependencyConfiguration) Closure customizer) {
- super.optional(extractDependencyProperties(pattern), customizer)
+ Object.optional(extractDependencyProperties(pattern), customizer)
}
@Override
void test(String pattern, @DelegatesTo(DependencyConfiguration) Closure customizer) {
- super.test(extractDependencyProperties(pattern), customizer)
+ Object.test(extractDependencyProperties(pattern), customizer)
}
@Override
View
5 ...r/config/RepositoriesConfiguration.groovy → ...r/config/RepositoriesConfiguration.groovy
@@ -13,16 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether.config
+package org.grails.dependency.resolution.maven.aether.config
import groovy.transform.CompileStatic
import org.eclipse.aether.DefaultRepositorySystemSession
-import org.eclipse.aether.repository.ArtifactRepository
import org.eclipse.aether.repository.Proxy
import org.eclipse.aether.repository.RemoteRepository
import grails.util.Environment
import grails.build.logging.GrailsConsole
-import org.grails.resolve.maven.aether.AetherDependencyManager
+import org.grails.dependency.resolution.maven.aether.AetherDependencyManager
import org.eclipse.aether.util.repository.AuthenticationBuilder
/**
View
2 ...her/config/RepositoryConfiguration.groovy → ...her/config/RepositoryConfiguration.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether.config
+package org.grails.dependency.resolution.maven.aether.config
import groovy.transform.CompileStatic
import org.eclipse.aether.repository.Authentication
View
2 ...support/GrailsConsoleLoggerManager.groovy → ...support/GrailsConsoleLoggerManager.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.resolve.maven.aether.support
+package org.grails.dependency.resolution.maven.aether.support
import grails.build.logging.GrailsConsole
import groovy.transform.CompileStatic
View
2 .../support/GrailsHomeWorkspaceReader.groovy → .../support/GrailsHomeWorkspaceReader.groovy
@@ -1,4 +1,4 @@
-package org.grails.resolve.maven.aether.support
+package org.grails.dependency.resolution.maven.aether.support
import groovy.transform.CompileStatic
import org.eclipse.aether.artifact.Artifact
View
2 ...aether/support/GrailsModelResolver.groovy → ...aether/support/GrailsModelResolver.groovy
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.grails.resolve.maven.aether.support
+package org.grails.dependency.resolution.maven.aether.support
import groovy.transform.CompileStatic
import org.apache.maven.model.Repository
View
2 .../MultipleTopLevelJavaScopeSelector.groovy → .../MultipleTopLevelJavaScopeSelector.groovy
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.grails.resolve.maven.aether.support
+package org.grails.dependency.resolution.maven.aether.support
import groovy.transform.CompileStatic
import org.eclipse.aether.util.graph.transformer.ConflictResolver
View
2 ...t/ScopeAwareNearestVersionSelector.groovy → ...t/ScopeAwareNearestVersionSelector.groovy
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.grails.resolve.maven.aether.support
+package org.grails.dependency.resolution.maven.aether.support
import groovy.transform.CompileStatic
import org.eclipse.aether.graph.DependencyNode
View
10 grails-aether/src/test/groovy/org/grails/resolve/maven/AetherDependencyManagerSpec.groovy
@@ -15,10 +15,10 @@
*/
package org.grails.resolve.maven
-import org.codehaus.groovy.grails.resolve.Dependency
-import org.codehaus.groovy.grails.resolve.DependencyReport
-import org.grails.resolve.maven.aether.AetherDependencyManager
-import org.grails.resolve.maven.aether.config.GrailsAetherCoreDependencies
+import org.grails.dependency.resolution.Dependency
+import org.grails.dependency.resolution.DependencyReport
+import org.grails.dependency.resolution.maven.aether.AetherDependencyManager
+import org.grails.dependency.resolution.maven.aether.config.GrailsAetherCoreDependencies
import org.eclipse.aether.RepositorySystem
import org.eclipse.aether.repository.Authentication
import org.eclipse.aether.repository.RemoteRepository
@@ -591,7 +591,7 @@ class AetherDependencyManagerSpec extends Specification {
resolveDependencies(_,_) >> { new DependencyResult(new DependencyRequest()) }
}
when: "A dependency is provided"
- org.codehaus.groovy.grails.resolve.Dependency dependency = new org.codehaus.groovy.grails.resolve.Dependency('org.slf4j', 'slf4j-api', '1.7.2')
+ Dependency dependency = new Dependency('org.slf4j', 'slf4j-api', '1.7.2')
DependencyReport report = dependencyManager.resolveDependency(dependency)
then: "The dependency is resolved"
report != null
View
6 grails-aether/src/test/groovy/org/grails/resolve/maven/AetherExcludeResolverSpec.groovy
@@ -15,9 +15,9 @@
*/
package org.grails.resolve.maven
-import org.codehaus.groovy.grails.resolve.Dependency
-import org.grails.resolve.maven.aether.AetherDependencyManager
-import org.grails.resolve.maven.aether.AetherExcludeResolver
+import org.grails.dependency.resolution.Dependency
+import org.grails.dependency.resolution.maven.aether.AetherDependencyManager
+import org.grails.dependency.resolution.maven.aether.AetherExcludeResolver
import spock.lang.Specification
/**
View
6 ...vy/grails/io/support/GrailsIOUtils.groovy → .../src/main/groovy/grails/io/IOUtils.groovy
@@ -13,17 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.io.support
+package grails.io
import groovy.transform.CompileStatic
+import org.grails.io.support.SpringIOUtils
/**
+ * Utility methods for performing I/O operations.
*
* @author Graeme Rocher
* @since 2.4
*/
@CompileStatic
-class GrailsIOUtils extends IOUtils{
+class IOUtils extends SpringIOUtils {
/**
* Gracefully opens a stream for a file, throwing exceptions where appropriate. Based off the commons-io method
View
23 grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
@@ -15,8 +15,6 @@
*/
package grails.util
-import org.codehaus.groovy.grails.io.support.IOUtils
-
import grails.build.logging.GrailsConsole
import org.codehaus.groovy.grails.cli.fork.ForkedGrailsProcess
@@ -28,14 +26,13 @@ import java.util.regex.Pattern
import org.codehaus.groovy.grails.cli.support.ClasspathConfigurer
import org.codehaus.groovy.grails.cli.support.OwnerlessClosure
-import org.codehaus.groovy.grails.io.support.IOUtils
-import org.codehaus.groovy.grails.resolve.DependencyManager
-import org.codehaus.groovy.grails.resolve.DependencyManagerConfigurer
-import org.codehaus.groovy.grails.resolve.DependencyReport
-import org.codehaus.groovy.grails.resolve.EnhancedDefaultDependencyDescriptor
-import org.codehaus.groovy.grails.resolve.GrailsCoreDependencies
-import org.codehaus.groovy.grails.resolve.IvyDependencyManager
-import org.codehaus.groovy.runtime.StackTraceUtils
+import org.grails.io.support.SpringIOUtils
+import org.grails.dependency.resolution.DependencyManager
+import org.grails.dependency.resolution.DependencyManagerConfigurer
+import org.grails.dependency.resolution.DependencyReport
+import org.grails.dependency.resolution.ivy.EnhancedDefaultDependencyDescriptor
+import org.grails.dependency.resolution.GrailsCoreDependencies
+import org.grails.dependency.resolution.ivy.IvyDependencyManager
/**
* <p>Represents the project paths and other build settings
@@ -1135,8 +1132,8 @@ class BuildSettings extends AbstractBuildSettings {
if (!modified && !useMavenDependencyResolver) {
if (configFile?.exists() && metadataFile?.exists()) {
- resolveChecksum = IOUtils.computeChecksum(configFile, "md5") +
- IOUtils.computeChecksum(metadataFile, "md5")
+ resolveChecksum = SpringIOUtils.computeChecksum(configFile, "md5") +
+ SpringIOUtils.computeChecksum(metadataFile, "md5")
}
def cachedResolve = new File(projectWorkDir, "${resolveChecksum}.resolve")
@@ -1670,7 +1667,7 @@ class BuildSettings extends AbstractBuildSettings {
final isFile = !f.isDirectory()
final isHidden = f.isHidden()
if (isFile && !isHidden && !f.name.endsWith('.groovy')) {
- IOUtils.copy(f, new File(targetPath, f.name))
+ SpringIOUtils.copy(f, new File(targetPath, f.name))
}
else if (!isFile && !isHidden) {
final fileName = f.name
View
22 grails-bootstrap/src/main/groovy/grails/util/PluginBuildSettings.groovy
@@ -22,11 +22,11 @@ import java.util.concurrent.ConcurrentHashMap
import java.util.zip.ZipEntry
import java.util.zip.ZipFile
-import org.codehaus.groovy.grails.io.support.AntPathMatcher
-import org.codehaus.groovy.grails.io.support.FileSystemResource
-import org.codehaus.groovy.grails.io.support.IOUtils
-import org.codehaus.groovy.grails.io.support.PathMatchingResourcePatternResolver
-import org.codehaus.groovy.grails.io.support.Resource
+import org.grails.io.support.AntPathMatcher
+import org.grails.io.support.FileSystemResource
+import org.grails.io.support.SpringIOUtils
+import org.grails.io.support.PathMatchingResourcePatternResolver
+import org.grails.io.support.Resource
import org.codehaus.groovy.grails.plugins.BasicGrailsPluginInfo
import org.codehaus.groovy.grails.plugins.CompositePluginDescriptorReader
import org.codehaus.groovy.grails.plugins.GrailsPluginInfo
@@ -346,7 +346,7 @@ class PluginBuildSettings {
*/
GPathResult getMetadataForPlugin(Resource pluginDir) {
try {
- return IOUtils.createXmlSlurper().parse(new File("$pluginDir.file.absolutePath/plugin.xml"))
+ return SpringIOUtils.createXmlSlurper().parse(new File("$pluginDir.file.absolutePath/plugin.xml"))
}
catch (e) {
return null
@@ -417,8 +417,8 @@ class PluginBuildSettings {
sourceFiles = new Resource[0]
sourceFiles = resolvePluginResourcesAndAdd(sourceFiles, true) { pluginDir ->
Resource[] pluginSourceFiles = resourceResolver("file:${pluginDir}/grails-app/*")
- pluginSourceFiles = (Resource[])IOUtils.addAll(pluginSourceFiles, resourceResolver("file:${pluginDir}/src/java"))
- pluginSourceFiles = (Resource[])IOUtils.addAll(pluginSourceFiles, resourceResolver("file:${pluginDir}/src/groovy"))
+ pluginSourceFiles = (Resource[])SpringIOUtils.addAll(pluginSourceFiles, resourceResolver("file:${pluginDir}/src/java"))
+ pluginSourceFiles = (Resource[])SpringIOUtils.addAll(pluginSourceFiles, resourceResolver("file:${pluginDir}/src/groovy"))
cache['sourceFilesPerPlugin'][pluginDir] = pluginSourceFiles
return pluginSourceFiles
}
@@ -550,7 +550,7 @@ class PluginBuildSettings {
}
// now build of application resources so that these can override plugin resources
- resources = IOUtils.addAll(resources, getArtefactResourcesForOne(new File(basedir).canonicalFile.absolutePath))
+ resources = SpringIOUtils.addAll(resources, getArtefactResourcesForOne(new File(basedir).canonicalFile.absolutePath))
allArtefactResources = resources
cache.allArtefactResources = resources
@@ -753,7 +753,7 @@ class PluginBuildSettings {
zipFile = new ZipFile(zipLocation)
ZipEntry entry = zipFile.entries().find {ZipEntry entry -> entry.name == 'plugin.xml'}
if (entry) {
- def pluginXml = IOUtils.createXmlSlurper().parse(zipFile.getInputStream(entry))
+ def pluginXml = SpringIOUtils.createXmlSlurper().parse(zipFile.getInputStream(entry))
def name = pluginXml.'@name'.text()
def release = pluginXml.'@version'.text()
return [name, release, pluginXml]
@@ -865,7 +865,7 @@ class PluginBuildSettings {
}
}
}
- originalResources = (Resource[])IOUtils.addAll(originalResources, newResources as Resource[])
+ originalResources = (Resource[])SpringIOUtils.addAll(originalResources, newResources as Resource[])
}
}
return originalResources
View
2 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/CachedScript.java
@@ -16,7 +16,7 @@
package org.codehaus.groovy.grails.cli;
import org.codehaus.gant.GantBinding;
-import org.codehaus.groovy.grails.io.support.Resource;
+import org.grails.io.support.Resource;
import java.util.List;
View
4 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/GrailsScriptRunner.java
@@ -53,8 +53,8 @@
import org.codehaus.groovy.grails.cli.support.ClasspathConfigurer;
import org.codehaus.groovy.grails.cli.support.PluginPathDiscoverySupport;
import org.codehaus.groovy.grails.cli.support.ScriptBindingInitializer;
-import org.codehaus.groovy.grails.io.support.PathMatchingResourcePatternResolver;
-import org.codehaus.groovy.grails.io.support.Resource;
+import org.grails.io.support.PathMatchingResourcePatternResolver;
+import org.grails.io.support.Resource;
import org.codehaus.groovy.grails.plugins.GrailsPluginUtils;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
View
11 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/api/BaseSettingsApi.java
@@ -47,11 +47,8 @@
import org.codehaus.groovy.grails.cli.ScriptExitException;
import org.codehaus.groovy.grails.cli.support.GrailsBuildEventListener;
-import org.codehaus.groovy.grails.io.support.ClassPathResource;
-import org.codehaus.groovy.grails.io.support.FileSystemResource;
-import org.codehaus.groovy.grails.io.support.IOUtils;
-import org.codehaus.groovy.grails.io.support.PathMatchingResourcePatternResolver;
-import org.codehaus.groovy.grails.io.support.Resource;
+import org.grails.io.support.*;
+import org.grails.io.support.SpringIOUtils;
import org.codehaus.groovy.grails.plugins.GrailsPluginUtils;
import org.codehaus.groovy.runtime.MethodClosure;
import org.xml.sax.SAXException;
@@ -236,7 +233,7 @@ public void copyGrailsResource(Object targetFile, Resource resource) throws File
public void copyGrailsResource(Object targetFile, Resource resource, boolean overwrite) throws FileNotFoundException, IOException {
File file = new File(targetFile.toString());
if (overwrite || !file.exists()) {
- IOUtils.copy(resource.getInputStream(), new FileOutputStream(file));
+ SpringIOUtils.copy(resource.getInputStream(), new FileOutputStream(file));
}
}
@@ -318,7 +315,7 @@ public GPathResult readPluginXmlMetadata(String pluginName) throws Exception {
}
public XmlSlurper createXmlSlurper() throws ParserConfigurationException, SAXException {
- return IOUtils.createXmlSlurper();
+ return SpringIOUtils.createXmlSlurper();
}
/**
* Times the execution of a closure, which can include a target. For
View
4 ...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/fork/ForkedGrailsProcess.groovy
@@ -25,7 +25,7 @@ import groovy.transform.CompileStatic
import org.codehaus.groovy.grails.cli.logging.GrailsConsoleErrorPrintStream
import org.codehaus.groovy.grails.cli.logging.GrailsConsolePrintStream
import org.codehaus.groovy.grails.cli.parsing.CommandLineParser
-import org.codehaus.groovy.grails.io.support.GrailsIOUtils
+import grails.io.IOUtils
import java.lang.reflect.Method
@@ -675,7 +675,7 @@ abstract class ForkedGrailsProcess {
@CompileStatic
protected File findJarFile(Class targetClass) {
- GrailsIOUtils.findJarFile(targetClass)
+ IOUtils.findJarFile(targetClass)
}
@CompileStatic
View
6 .../main/groovy/org/codehaus/groovy/grails/cli/interactive/GrailsInteractiveCompletor.groovy
@@ -15,11 +15,11 @@
*/
package org.codehaus.groovy.grails.cli.interactive
-import grails.build.interactive.completors.StringsCompleter
+import org.grails.build.interactive.completors.StringsCompleter
import grails.util.BuildSettings
import grails.util.GrailsNameUtils
-import grails.build.interactive.completors.EscapingFileNameCompletor
-import grails.build.interactive.completors.RegexCompletor
+import org.grails.build.interactive.completors.EscapingFileNameCompletor
+import org.grails.build.interactive.completors.RegexCompletor
import jline.console.completer.ArgumentCompleter
import jline.console.completer.Completer
View
6 ...in/groovy/org/codehaus/groovy/grails/cli/interactive/completors/ClassNameCompletor.groovy
@@ -15,13 +15,13 @@
*/
package org.codehaus.groovy.grails.cli.interactive.completors
-import grails.build.interactive.completors.StringsCompleter
+import org.grails.build.interactive.completors.StringsCompleter
import grails.util.BuildSettings
import grails.util.PluginBuildSettings
import groovy.transform.CompileStatic
import org.codehaus.groovy.grails.cli.support.BuildSettingsAware
-import org.codehaus.groovy.grails.io.support.GrailsResourceUtils
-import org.codehaus.groovy.grails.io.support.Resource
+import org.grails.io.support.GrailsResourceUtils
+import org.grails.io.support.Resource
import org.codehaus.groovy.grails.plugins.GrailsPluginUtils
/**
View
3 ...ap/src/main/groovy/org/codehaus/groovy/grails/cli/maven/MavenMultiProjectGenerator.groovy
@@ -17,9 +17,6 @@ package org.codehaus.groovy.grails.cli.maven
import org.codehaus.groovy.grails.cli.api.BaseSettingsApi
import grails.util.BuildSettings
-import org.codehaus.groovy.grails.plugins.AstPluginDescriptorReader
-import grails.util.Metadata
-import org.codehaus.groovy.grails.io.support.FileSystemResource
/**
* Generates a Maven multi-module build structure for a Grails project and plugins
View
14 ...s-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/maven/MavenPomGenerator.groovy
@@ -20,14 +20,14 @@ import grails.util.Metadata
import groovy.text.SimpleTemplateEngine
import org.codehaus.groovy.grails.cli.api.BaseSettingsApi
-import org.codehaus.groovy.grails.io.support.FileSystemResource
-import org.codehaus.groovy.grails.io.support.IOUtils
+import org.grails.io.support.FileSystemResource
import org.codehaus.groovy.grails.plugins.AstPluginDescriptorReader
import org.codehaus.groovy.grails.plugins.GrailsPluginInfo
-import org.codehaus.groovy.grails.resolve.Dependency
-import org.codehaus.groovy.grails.resolve.DependencyManager
-import org.codehaus.groovy.grails.resolve.DependencyReport
-import org.codehaus.groovy.grails.resolve.ResolvedArtifactReport
+import org.grails.dependency.resolution.Dependency
+import org.grails.dependency.resolution.DependencyManager
+import org.grails.dependency.resolution.DependencyReport
+import org.grails.dependency.resolution.ResolvedArtifactReport
+import org.grails.io.support.SpringIOUtils
/**
* Generates a POM for a Grails application.
@@ -205,7 +205,7 @@ class MavenPomGenerator extends BaseSettingsApi {
}
protected Map getParentModel(File pomFile) {
- def xml = IOUtils.createXmlSlurper().parse(pomFile)
+ def xml = SpringIOUtils.createXmlSlurper().parse(pomFile)
return [parent: [group: xml.groupId.text(), name: xml.artifactId.text(), version: xml.version.text()]]
}
View
2 ...bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/support/ClasspathConfigurer.java
@@ -31,7 +31,7 @@
import java.util.List;
import java.util.Set;
-import org.codehaus.groovy.grails.resolve.DependencyReport;
+import org.grails.dependency.resolution.DependencyReport;
/**
* Support class that configures the Grails classpath when executing command line scripts.
View
2 ...trap/src/main/groovy/org/codehaus/groovy/grails/cli/support/GrailsBuildEventListener.java
@@ -37,7 +37,7 @@
import org.apache.tools.ant.BuildEvent;
import org.apache.tools.ant.BuildListener;
-import org.codehaus.groovy.grails.io.support.Resource;
+import org.grails.io.support.Resource;
import org.codehaus.groovy.runtime.StackTraceUtils;
/**
View
2 ...otstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/AstPluginDescriptorReader.java
@@ -37,7 +37,7 @@
import org.codehaus.groovy.control.CompilationUnit;
import org.codehaus.groovy.control.Phases;
import org.codehaus.groovy.control.SourceUnit;
-import org.codehaus.groovy.grails.io.support.Resource;
+import org.grails.io.support.Resource;
import org.codehaus.groovy.grails.plugins.exceptions.PluginException;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
View
2 ...s-bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/BasicGrailsPluginInfo.java
@@ -22,7 +22,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.codehaus.groovy.grails.io.support.Resource;
+import org.grails.io.support.Resource;
/**
* Simple Javabean implementation of the GrailsPluginInfo interface.
View
2 ...p/src/main/groovy/org/codehaus/groovy/grails/plugins/CompositePluginDescriptorReader.java
@@ -20,7 +20,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.codehaus.groovy.grails.io.support.Resource;
+import org.grails.io.support.Resource;
/**
* Combines different implementation into one.
View
2 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/GrailsPluginInfo.java
@@ -17,7 +17,7 @@
import java.util.Map;
-import org.codehaus.groovy.grails.io.support.Resource;
+import org.grails.io.support.Resource;
/**
* Base interface that just contains information about a particular plugin.
View
2 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/GrailsPluginUtils.groovy
@@ -20,7 +20,7 @@ import grails.util.BuildSettingsHolder
import grails.util.PluginBuildSettings
import groovy.util.slurpersupport.GPathResult
-import org.codehaus.groovy.grails.io.support.Resource
+import org.grails.io.support.Resource
/**
* Utility class containing methods that aid in loading and evaluating plug-ins.
View
2 ...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/PluginDescriptorReader.java
@@ -15,7 +15,7 @@
*/
package org.codehaus.groovy.grails.plugins;
-import org.codehaus.groovy.grails.io.support.Resource;
+import org.grails.io.support.Resource;
/**
* Reads information about a plugin.
View
6 grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/PluginInfo.groovy
@@ -18,8 +18,8 @@ package org.codehaus.groovy.grails.plugins
import grails.util.PluginBuildSettings
import groovy.util.slurpersupport.GPathResult
-import org.codehaus.groovy.grails.io.support.Resource
-import org.codehaus.groovy.grails.io.support.IOUtils
+import org.grails.io.support.Resource
+import org.grails.io.support.SpringIOUtils
/**
* Used mainly by the build system that encapsulates access to information
@@ -55,7 +55,7 @@ class PluginInfo extends GroovyObjectSupport implements GrailsPluginInfo {
InputStream input
try {
input = pluginXml.getInputStream()
- return IOUtils.createXmlSlurper().parse(input)
+ return SpringIOUtils.createXmlSlurper().parse(input)
}
finally { input?.close() }
}
View
2 ...otstrap/src/main/groovy/org/codehaus/groovy/grails/plugins/XmlPluginDescriptorReader.java
@@ -16,7 +16,7 @@
package org.codehaus.groovy.grails.plugins;
import grails.util.PluginBuildSettings;
-import org.codehaus.groovy.grails.io.support.Resource;
+import org.grails.io.support.Resource;
/**
* Reads plugin information from the plugin.xml descriptor.
View
2 ...ap/src/main/groovy/org/codehaus/groovy/grails/plugins/build/scopes/PluginScopeInfo.groovy
@@ -15,7 +15,7 @@
*/
package org.codehaus.groovy.grails.plugins.build.scopes
-import org.codehaus.groovy.grails.io.support.Resource
+import org.grails.io.support.Resource
import org.codehaus.groovy.grails.plugins.GrailsPluginInfo
/**
View
6 ...active/completors/CreateController.groovy → ...active/completors/CreateController.groovy
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import org.codehaus.groovy.grails.cli.interactive.completors.ClassNameCompletor
-import org.codehaus.groovy.grails.io.support.GrailsResourceUtils
-import org.codehaus.groovy.grails.io.support.Resource
+import org.grails.io.support.GrailsResourceUtils
+import org.grails.io.support.Resource
/**
* A completor for the create-controller command
View
2 ...e/completors/CreateIntegrationTest.groovy → ...e/completors/CreateIntegrationTest.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import org.codehaus.groovy.grails.cli.interactive.completors.ClassNameCompletor
View
6 ...ompletors/CreateScaffoldController.groovy → ...ompletors/CreateScaffoldController.groovy
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import org.codehaus.groovy.grails.cli.interactive.completors.ClassNameCompletor
-import org.codehaus.groovy.grails.io.support.GrailsResourceUtils
-import org.codehaus.groovy.grails.io.support.Resource
+import org.grails.io.support.GrailsResourceUtils
+import org.grails.io.support.Resource
/**
* A completor for the create-scaffold-controller command
View
6 ...teractive/completors/CreateService.groovy → ...teractive/completors/CreateService.groovy
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import org.codehaus.groovy.grails.cli.interactive.completors.ClassNameCompletor
-import org.codehaus.groovy.grails.io.support.GrailsResourceUtils
-import org.codehaus.groovy.grails.io.support.Resource
+import org.grails.io.support.GrailsResourceUtils
+import org.grails.io.support.Resource
/**
* A completor for the create-service command
View
6 ...nteractive/completors/CreateTagLib.groovy → ...nteractive/completors/CreateTagLib.groovy
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import org.codehaus.groovy.grails.cli.interactive.completors.ClassNameCompletor
-import org.codehaus.groovy.grails.io.support.GrailsResourceUtils
-import org.codehaus.groovy.grails.io.support.Resource
+import org.grails.io.support.GrailsResourceUtils
+import org.grails.io.support.Resource
/**
* A completor for the create-tag-lib command
View
2 ...eractive/completors/CreateUnitTest.groovy → ...eractive/completors/CreateUnitTest.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import org.codehaus.groovy.grails.cli.interactive.completors.ClassNameCompletor
View
2 ...mpletors/EscapingFileNameCompletor.groovy → ...mpletors/EscapingFileNameCompletor.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import jline.console.completer.FileNameCompleter
View
6 ...interactive/completors/GenerateAll.groovy → ...interactive/completors/GenerateAll.groovy
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import org.codehaus.groovy.grails.cli.interactive.completors.ClassNameCompletor
-import org.codehaus.groovy.grails.io.support.GrailsResourceUtils
-import org.codehaus.groovy.grails.io.support.Resource
+import org.grails.io.support.GrailsResourceUtils
+import org.grails.io.support.Resource
/**
* Completor for the generate-all command.
View
6 ...completors/GenerateAsyncController.groovy → ...completors/GenerateAsyncController.groovy
@@ -1,8 +1,8 @@
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import org.codehaus.groovy.grails.cli.interactive.completors.ClassNameCompletor
-import org.codehaus.groovy.grails.io.support.GrailsResourceUtils
-import org.codehaus.groovy.grails.io.support.Resource
+import org.grails.io.support.GrailsResourceUtils
+import org.grails.io.support.Resource
/**
* Completor for the generate-controller command.
View
6 ...tive/completors/GenerateController.groovy → ...tive/completors/GenerateController.groovy
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import org.codehaus.groovy.grails.cli.interactive.completors.ClassNameCompletor
-import org.codehaus.groovy.grails.io.support.GrailsResourceUtils
-import org.codehaus.groovy.grails.io.support.Resource
+import org.grails.io.support.GrailsResourceUtils
+import org.grails.io.support.Resource
/**
* Completor for the generate-controller command.
View
6 ...teractive/completors/GenerateViews.groovy → ...teractive/completors/GenerateViews.groovy
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import org.codehaus.groovy.grails.cli.interactive.completors.ClassNameCompletor
-import org.codehaus.groovy.grails.io.support.GrailsResourceUtils
-import org.codehaus.groovy.grails.io.support.Resource
+import org.grails.io.support.GrailsResourceUtils
+import org.grails.io.support.Resource
/**
* Completor for the generate-views command.
View
2 .../build/interactive/completors/Open.groovy → .../build/interactive/completors/Open.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import jline.console.completer.ArgumentCompleter
import org.codehaus.groovy.grails.cli.interactive.InteractiveMode
View
2 ...eractive/completors/RegexCompletor.groovy → ...eractive/completors/RegexCompletor.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import jline.console.completer.Completer
View
2 ...mpletors/SimpleOrFileNameCompletor.groovy → ...mpletors/SimpleOrFileNameCompletor.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import jline.console.completer.Completer
import jline.console.completer.StringsCompleter
View
2 ...eractive/completors/StringsCompleter.java → ...eractive/completors/StringsCompleter.java
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors;
+package org.grails.build.interactive.completors;
import jline.console.completer.Completer;
View
2 ...ild/interactive/completors/TestApp.groovy → ...ild/interactive/completors/TestApp.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.build.interactive.completors
+package org.grails.build.interactive.completors
import org.codehaus.groovy.grails.cli.interactive.completors.ClassNameCompletor
View
2 ...s/groovy/grails/resolve/Dependency.groovy → ...s/dependency/resolution/Dependency.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.resolve
+package org.grails.dependency.resolution
import groovy.transform.Canonical
import groovy.transform.CompileStatic
View
2 ...s/resolve/DependencyDefinitionParser.java → ...esolution/DependencyDefinitionParser.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.resolve;
+package org.grails.dependency.resolution;
import groovy.lang.Closure;
View
2 ...ovy/grails/resolve/DependencyManager.java → ...endency/resolution/DependencyManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.resolve;
+package org.grails.dependency.resolution;
import grails.util.BuildSettings;
import groovy.lang.Closure;
View
8 ...esolve/DependencyManagerConfigurer.groovy → ...lution/DependencyManagerConfigurer.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.resolve
+package org.grails.dependency.resolution
import grails.build.logging.GrailsConsole
import grails.util.BuildSettings
@@ -27,6 +27,8 @@ import org.apache.ivy.plugins.repository.TransferListener
import org.apache.ivy.util.DefaultMessageLogger
import org.apache.ivy.util.Message
import org.codehaus.groovy.tools.LoaderConfiguration
+import org.grails.dependency.resolution.ivy.GrailsIvyDependencies
+import org.grails.dependency.resolution.ivy.IvyDependencyManager
/**
* Configures the Ivy dependency manager for usage within Grails
@@ -53,7 +55,7 @@ class DependencyManagerConfigurer {
configureRepoAuthentication(grailsConfig, aetherDependencyManager)
- final coreDeps = classLoader.loadClass("org.grails.resolve.maven.aether.config.GrailsAetherCoreDependencies")
+ final coreDeps = classLoader.loadClass("org.grails.dependency.resolution.maven.aether.config.GrailsAetherCoreDependencies")
.newInstance(grailsVersion, buildSettings.servletVersion, !org.codehaus.groovy.grails.plugins.GrailsVersionUtils.isVersionGreaterThan("1.5", buildSettings.compilerTargetLevel), buildSettings.isGrailsProject())
buildSettings.coreDependencies = (GrailsCoreDependencies)coreDeps
prepareAetherDependencies(aetherDependencyManager, buildSettings, coreDeps)
@@ -73,7 +75,7 @@ class DependencyManagerConfigurer {
@CompileStatic
private static DependencyManager loadAetherDependencyManager(GroovyClassLoader classLoader) {
- (DependencyManager) classLoader.loadClass("org.grails.resolve.maven.aether.AetherDependencyManager").newInstance()
+ (DependencyManager) classLoader.loadClass("org.grails.dependency.resolution.maven.aether.AetherDependencyManager").newInstance()
}
@CompileStatic
View
6 ...ils/resolve/DependencyManagerUtils.groovy → .../resolution/DependencyManagerUtils.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.resolve
+package org.grails.dependency.resolution
import groovy.transform.CompileStatic
import groovy.util.slurpersupport.GPathResult
@@ -25,7 +25,7 @@ import javax.xml.parsers.ParserConfigurationException
import org.xml.sax.ErrorHandler
import org.xml.sax.SAXException
import org.xml.sax.SAXParseException
-import org.codehaus.groovy.grails.io.support.IOUtils
+import org.grails.io.support.SpringIOUtils
/**
* Abstract implementation of DependencyManager interface
@@ -52,7 +52,7 @@ abstract class DependencyManagerUtils {
}
}
- def xmlSlurper = IOUtils.createXmlSlurper()
+ def xmlSlurper = SpringIOUtils.createXmlSlurper()
xmlSlurper.setErrorHandler(new ErrorHandler() {
void warning(SAXParseException e) { /*noop*/ }
void error(SAXParseException e) { /*noop*/ }
View
2 ...oovy/grails/resolve/DependencyReport.java → ...pendency/resolution/DependencyReport.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.resolve;
+package org.grails.dependency.resolution;
import java.io.File;
import java.util.List;
View
2 ...vy/grails/resolve/DependencyResolver.java → ...ndency/resolution/DependencyResolver.java