Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Refactor, rename 'org.codehaus' -> 'org.grails' for 'grails-core'

  • Loading branch information...
commit 229c82cdf54488b7e734a1845f2dbbfb628c2aef 1 parent aa6a9a3
graemerocher authored
Showing with 834 additions and 448 deletions.
  1. +15 −0 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/ClassPropertyFetcher.groovy
  2. +36 −0 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsControllerClass.groovy
  3. +33 −0 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClass.groovy
  4. +37 −0 ...ls-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassProperty.groovy
  5. +15 −0 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsServiceClass.groovy
  6. +27 −0 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsTagLibClass.groovy
  7. +29 −0 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsUrlMappingsClass.groovy
  8. +2 −2 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DomainClassArtefactHandler.groovy
  9. +27 −0 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/cfg/ConfigurationHelper.java
  10. +2 −2 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/exceptions/GrailsConfigurationException.groovy
  11. +2 −2 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/exceptions/GrailsDomainException.groovy
  12. +2 −2 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/exceptions/GrailsException.groovy
  13. +2 −2 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/exceptions/GrailsRuntimeException.groovy
  14. +24 −0 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/support/ClassEditor.groovy
  15. +24 −0 ...ls-compatibility/src/main/groovy/org/codehaus/groovy/grails/support/GrailsApplicationDiscoveryStrategy.java
  16. +37 −0 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/support/IncludeExcludeSupport.java
  17. +25 −0 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/support/PersistenceContextInterceptor.groovy
  18. +31 −0 ...compatibility/src/main/groovy/org/codehaus/groovy/grails/support/PersistenceContextInterceptorExecutor.java
  19. +24 −0 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/support/SoftThreadLocalMap.groovy
  20. +1 −1  grails-core/src/main/groovy/grails/beans/utils/LazyBeanMap.groovy
  21. +1 −1  grails-core/src/main/groovy/grails/config/GrailsConfig.java
  22. +1 −3 grails-core/src/main/groovy/grails/core/AbstractGrailsApplication.java
  23. +2 −2 grails-core/src/main/groovy/grails/core/AbstractGrailsClass.java
  24. +4 −5 grails-core/src/main/groovy/grails/core/DefaultGrailsApplication.java
  25. +1 −1  grails-core/src/main/groovy/grails/core/GrailsDomainClass.java
  26. +1 −1  .../src/main/groovy/{org/codehaus/groovy/grails → grails/core}/support/ParentApplicationContextAware.java
  27. +1 −1  ...groovy/{org/codehaus/groovy/grails → grails/persistence}/support/NullPersistentContextInterceptor.java
  28. +1 −1  ...in/groovy/{org/codehaus/groovy/grails → grails/persistence}/support/PersistenceContextInterceptor.java
  29. +1 −1  ...{org/codehaus/groovy/grails → grails/persistence}/support/PersistenceContextInterceptorExecutor.groovy
  30. +1 −1  grails-core/src/main/groovy/grails/util/Holders.java
  31. +1 −1  grails-core/src/main/groovy/grails/validation/ValidationException.java
  32. +1 −1  grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/AbstractGrailsPluginManager.java
  33. +4 −4 grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/CoreGrailsPlugin.groovy
  34. +2 −2 grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/CorePluginFinder.java
  35. +2 −2 grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/DefaultGrailsPlugin.java
  36. +2 −2 grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/DefaultGrailsPluginManager.java
  37. +1 −1  grails-core/src/main/groovy/org/grails/compiler/injection/AbstractGrailsArtefactTransformer.java
  38. +1 −1  grails-core/src/main/groovy/org/grails/compiler/injection/DefaultGrailsDomainClassInjector.java
  39. +1 −1  grails-core/src/main/groovy/org/grails/compiler/injection/EntityASTTransformation.java
  40. +1 −1  ...e/src/main/groovy/org/{codehaus/groovy/grails/commons → grails/core}/DefaultGrailsControllerClass.java
  41. +5 −4 ...-core/src/main/groovy/org/{codehaus/groovy/grails/commons → grails/core}/DefaultGrailsDomainClass.java
  42. +3 −2 ...c/main/groovy/org/{codehaus/groovy/grails/commons → grails/core}/DefaultGrailsDomainClassProperty.java
  43. +1 −1  ...core/src/main/groovy/org/{codehaus/groovy/grails/commons → grails/core}/DefaultGrailsServiceClass.java
  44. +1 −1  ...-core/src/main/groovy/org/{codehaus/groovy/grails/commons → grails/core}/DefaultGrailsTagLibClass.java
  45. +1 −1  .../src/main/groovy/org/{codehaus/groovy/grails/commons → grails/core}/DefaultGrailsUrlMappingsClass.java
  46. +1 −2  .../org/{codehaus/groovy/grails/commons → grails/core/artefact}/AnnotationDomainClassArtefactHandler.java
  47. +52 −51 ...main/groovy/org/{codehaus/groovy/grails/commons → grails/core/artefact}/ControllerArtefactHandler.java
  48. +2 −2 grails-core/src/main/groovy/org/grails/core/{ → artefact}/DomainClassArtefactHandler.java
  49. +45 −45 ...rc/main/groovy/org/{codehaus/groovy/grails/commons → grails/core/artefact}/ServiceArtefactHandler.java
  50. +100 −99 ...src/main/groovy/org/{codehaus/groovy/grails/commons → grails/core/artefact}/TagLibArtefactHandler.java
  51. +2 −1  ...ain/groovy/org/{codehaus/groovy/grails/commons → grails/core/artefact}/UrlMappingsArtefactHandler.java
  52. +1 −1  ...core/src/main/groovy/org/{codehaus/groovy/grails/commons → grails/core}/cfg/ConfigurationHelper.groovy
  53. +1 −1  grails-core/src/main/groovy/{grails → org/grails/core}/exceptions/DefaultErrorsPrinter.groovy
  54. +1 −1  grails-core/src/main/groovy/{grails → org/grails/core}/exceptions/GrailsConfigurationException.java
  55. +1 −1  grails-core/src/main/groovy/{grails → org/grails/core}/exceptions/GrailsDomainException.java
  56. +1 −1  grails-core/src/main/groovy/{grails → org/grails/core}/exceptions/GrailsException.java
  57. +1 −3 grails-core/src/main/groovy/{grails → org/grails/core}/exceptions/GrailsRuntimeException.java
  58. +1 −3 grails-core/src/main/groovy/{grails → org/grails/core}/exceptions/InvalidPropertyException.java
  59. +1 −3 grails-core/src/main/groovy/{grails → org/grails/core}/exceptions/NewInstanceCreationException.java
  60. +1 −1  ...ore/src/main/groovy/org/{codehaus/groovy/grails/support → grails/core/io}/GrailsByteArrayResource.java
  61. +1 −1  grails-core/src/main/groovy/org/{codehaus/groovy/grails/support → grails/core/io}/MockFileResource.java
  62. +1 −1  grails-core/src/main/groovy/org/{codehaus/groovy/grails/support → grails/core/io}/MockResourceLoader.java
  63. +1 −1  ...re/src/main/groovy/org/{codehaus/groovy/grails/support → grails/core/io}/MockStringResourceLoader.java
  64. +1 −1  ...ore/src/main/groovy/org/{codehaus/groovy/grails/support → grails/core/io}/SimpleMapResourceLoader.java
  65. +1 −1  ...s-core/src/main/groovy/org/{codehaus/groovy/grails/support → grails/core/io}/StaticResourceLoader.java
  66. +2 −2 grails-core/src/main/groovy/org/grails/core/lifecycle/ShutdownOperations.java
  67. +1 −1  grails-core/src/main/groovy/org/{codehaus/groovy/grails → grails/core}/support/ClassEditor.java
  68. +1 −1  ...in/groovy/org/{codehaus/groovy/grails → grails/core}/support/GrailsApplicationDiscoveryStrategy.groovy
  69. +1 −1  grails-core/src/main/groovy/org/grails/core/support/GrailsDomainConfigurationUtil.java
  70. +1 −1  .../groovy/org/{codehaus/groovy/grails → grails/core}/support/internal/tools/MetaClassChangeReporter.java
  71. +2 −2 ...core/src/main/groovy/org/{codehaus/groovy/grails/commons → grails/core/util}/ClassPropertyFetcher.java
  72. +1 −1  ...e/src/main/groovy/org/{codehaus/groovy/grails/support → grails/core/util}/IncludeExcludeSupport.groovy
  73. +1 −1  ...s-core/src/main/groovy/org/{codehaus/groovy/grails/support → grails/core/util}/SoftThreadLocalMap.java
  74. +1 −1  ...-core/src/main/groovy/org/{codehaus/groovy/grails → grails/dev}/support/CommandLineResourceLoader.java
  75. +1 −1  ...-core/src/main/groovy/org/{codehaus/groovy/grails → grails/dev}/support/DevelopmentResourceLoader.java
  76. +1 −1  ...-core/src/main/groovy/org/{codehaus/groovy/grails → grails/dev}/support/DevelopmentShutdownHook.groovy
  77. +1 −1  ...ore/src/main/groovy/org/grails/{plugins/support → spring/beans}/ClassLoaderAwareBeanPostProcessor.java
  78. +1 −1  ...c/main/groovy/org/grails/{plugins/support → spring/beans}/GrailsApplicationAwareBeanPostProcessor.java
  79. +1 −1  ...e/src/main/groovy/org/grails/{plugins/support → spring/beans}/PluginManagerAwareBeanPostProcessor.java
  80. +1 −1  grails-core/src/main/groovy/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.java
  81. +2 −2 ...c/test/groovy/org/codehaus/groovy/grails/context/support/PluginAwareResourceBundleMessageSourceTests.groovy
  82. +1 −1  grails-core/src/test/groovy/org/codehaus/groovy/grails/core/io/ResourceLocatorSpec.groovy
  83. +1 −1  grails-core/src/test/groovy/org/codehaus/groovy/grails/exceptions/StackTracePrinterSpec.groovy
  84. +1 −1  grails-plugin-async/src/main/groovy/grails/async/services/PersistenceContextPromiseDecorator.groovy
  85. +1 −1  grails-plugin-async/src/main/groovy/org/grails/compiler/web/async/ControllerAsyncTransformer.java
  86. +1 −1  grails-plugin-async/src/main/groovy/org/grails/plugins/web/async/GrailsAsyncContext.groovy
  87. +1 −1  grails-plugin-codecs/src/main/groovy/org/codehaus/groovy/grails/commons/CodecArtefactHandler.java
  88. +2 −2 ...plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/compiler/web/ControllerActionTransformer.java
  89. +1 −1  ...ntrollers/src/main/groovy/org/codehaus/groovy/grails/compiler/web/ControllerArtefactTypeTransformation.java
  90. +1 −1  ...plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/compiler/web/ControllerDomainTransformer.java
  91. +1 −1  grails-plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/compiler/web/ControllerTransformer.java
  92. +2 −2 ...ls-plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/plugins/web/ControllersGrailsPlugin.groovy
  93. +2 −2 grails-plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/plugins/web/api/ControllersApi.java
  94. +1 −1  ...gin-controllers/src/main/groovy/org/codehaus/groovy/grails/plugins/web/api/ControllersDomainBindingApi.java
  95. +1 −1  grails-plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/web/metaclass/ChainMethod.groovy
  96. +1 −1  ...-controllers/src/test/groovy/org/codehaus/groovy/grails/compiler/web/ControllerDomainTransformerSpec.groovy
  97. +1 −1  ...rs/src/main/groovy/org/codehaus/groovy/grails/compiler/web/converters/ConvertersControllersTransformer.java
  98. +1 −1  ...verters/src/main/groovy/org/codehaus/groovy/grails/compiler/web/converters/ConvertersDomainTransformer.java
  99. +3 −3 ...erters/src/main/groovy/org/codehaus/groovy/grails/web/converters/marshaller/json/DomainClassMarshaller.java
  100. +1 −1  ...verters/src/main/groovy/org/codehaus/groovy/grails/web/converters/marshaller/json/GroovyBeanMarshaller.java
  101. +3 −3 ...verters/src/main/groovy/org/codehaus/groovy/grails/web/converters/marshaller/xml/DomainClassMarshaller.java
  102. +1 −1  ...nverters/src/main/groovy/org/codehaus/groovy/grails/web/converters/marshaller/xml/GroovyBeanMarshaller.java
  103. +2 −2 ...ugin-datasource/src/main/groovy/org/codehaus/groovy/grails/plugins/datasource/DataSourceGrailsPlugin.groovy
  104. +2 −2 grails-plugin-domain-class/src/main/groovy/org/codehaus/groovy/grails/plugins/DomainClassGrailsPlugin.groovy
  105. +1 −1  ...ugin-gsp/src/ast/groovy/org/codehaus/groovy/grails/compiler/web/taglib/ControllerTagLibraryTransformer.java
  106. +1 −1  grails-plugin-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/GroovyPagesGrailsPlugin.groovy
  107. +1 −1  grails-plugin-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/FormTagLib.groovy
  108. +1 −1  grails-plugin-mimetypes/src/main/groovy/org/grails/compiler/web/mime/MimeTypesTransformer.java
  109. +1 −1  grails-plugin-rest/src/main/groovy/grails/rest/render/AbstractIncludeExcludeRenderer.groovy
  110. +1 −1  grails-plugin-rest/src/main/groovy/grails/rest/render/json/JsonRenderer.groovy
  111. +2 −2 grails-plugin-rest/src/main/groovy/grails/rest/render/util/AbstractLinkingRenderer.groovy
  112. +1 −1  grails-plugin-rest/src/main/groovy/grails/rest/render/xml/XmlRenderer.groovy
  113. +1 −1  ...s-plugin-rest/src/main/groovy/org/codehaus/groovy/grails/compiler/web/rest/ControllerRestTransformer.groovy
  114. +2 −2 grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/plugin/RestResponderGrailsPlugin.groovy
  115. +1 −1  grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/render/ServletRenderContext.groovy
  116. +1 −1  grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy
  117. +1 −1  ...n-services/src/main/groovy/org/codehaus/groovy/grails/plugins/services/ServiceBeanAliasPostProcessor.groovy
  118. +1 −1  grails-plugin-services/src/main/groovy/org/codehaus/groovy/grails/plugins/services/ServicesGrailsPlugin.groovy
  119. +1 −0  grails-plugin-testing/src/main/groovy/grails/test/GrailsUnitTestCase.groovy
  120. +2 −2 grails-plugin-testing/src/main/groovy/grails/test/MockUtils.groovy
  121. +1 −1  grails-plugin-testing/src/main/groovy/grails/test/mixin/domain/DomainClassUnitTestMixin.groovy
  122. +1 −1  grails-plugin-testing/src/main/groovy/grails/test/mixin/services/ServiceUnitTestMixin.groovy
  123. +1 −1  grails-plugin-testing/src/main/groovy/grails/test/mixin/support/LazyTagLibraryLookup.java
  124. +1 −1  grails-plugin-testing/src/main/groovy/grails/test/mixin/web/ControllerUnitTestMixin.groovy
  125. +1 −1  grails-plugin-testing/src/main/groovy/grails/test/mixin/web/GroovyPageUnitTestMixin.groovy
  126. +2 −2 grails-plugin-testing/src/main/groovy/grails/test/mixin/web/UrlMappingsUnitTestMixin.groovy
  127. +1 −1  grails-plugin-testing/src/main/groovy/grails/test/runtime/ControllerTestPlugin.groovy
  128. +1 −1  grails-plugin-testing/src/main/groovy/grails/test/runtime/CoreBeansTestPlugin.groovy
  129. +2 −2 grails-plugin-testing/src/main/groovy/grails/test/runtime/GrailsApplicationTestPlugin.groovy
  130. +4 −4 ...lugin-testing/src/main/groovy/org/codehaus/groovy/grails/compiler/injection/test/TestForTransformation.java
  131. +1 −1  grails-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsGrailsPlugin.groovy
  132. +1 −1  grails-plugin-validation/src/main/groovy/org/grails/plugins/validation/ValidationGrailsPlugin.groovy
  133. +1 −1  grails-project-api/src/main/groovy/org/codehaus/groovy/grails/cli/agent/GrailsPluginManagerReloadPlugin.java
  134. +1 −1  grails-project-api/src/main/groovy/org/codehaus/groovy/grails/project/compiler/GrailsProjectWatcher.java
  135. +1 −1  grails-project-api/src/main/groovy/org/codehaus/groovy/grails/project/loader/GrailsProjectLoader.groovy
  136. +1 −1  grails-project-api/src/main/groovy/org/codehaus/groovy/grails/project/packaging/GrailsProjectPackager.groovy
  137. +1 −1  grails-project-api/src/main/groovy/org/codehaus/groovy/grails/project/ui/GrailsProjectConsole.groovy
  138. +1 −1  grails-test-suite-base/src/main/groovy/org/codehaus/groovy/grails/plugins/web/AbstractGrailsPluginTests.groovy
  139. +2 −2 grails-test-suite-base/src/main/groovy/org/codehaus/groovy/grails/web/taglib/AbstractGrailsTagTests.groovy
  140. +1 −1  grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/GormSpec.groovy
  141. +1 −1  ...-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/plugins/MockHibernateGrailsPlugin.groovy
  142. +1 −1  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/CodecArtefactHandlerTests.java
  143. +1 −0  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/ControllerArtefactHandlerTests.java
  144. +1 −0  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/DefaultArtefactInfoTests.groovy
  145. +1 −0  ...-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassPropertyTests.groovy
  146. +2 −1  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassTests.groovy
  147. +1 −1  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/DomainClassArtefactHandlerTests.java
  148. +1 −0  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/ServiceArtefactHandlerTests.java
  149. +1 −0  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/TagLibArtefactHandlerTests.java
  150. +1 −0  ...s-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/UrlMappingsArtefactHandlerTests.groovy
  151. +1 −0  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/cfg/ConfigurationHelperTests.groovy
  152. +1 −1  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/domain/HeirarchyDomainClassTests.java
  153. +1 −1  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/plugins/GrailsPluginTests.groovy
  154. +1 −0  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/support/DevelopmentResourceLoaderTests.java
  155. +1 −0  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/support/StaticResourceLoaderTests.java
  156. +1 −1  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/validation/ConstrainedPropertyTests.java
  157. +1 −1  ...st-suite-uber/src/test/groovy/org/codehaus/groovy/grails/validation/ConstraintsEvaluatingPropertyTests.java
  158. +1 −1  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/metaclass/WithFormMethodTests.groovy
  159. +2 −2 ...est-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/servlet/GrailsApplicationAttributesTests.java
  160. +1 −1  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/servlet/RenderMethodTests.groovy
  161. +1 −1  ...s-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/web/sitemesh/FullSitemeshLifeCycleTests.groovy
  162. +2 −2 grails-test-suite-web/src/test/groovy/grails/gsp/PageRendererSpec.groovy
  163. +1 −1  ...ls-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/filters/FilterToHandlerAdapterTests.groovy
  164. +1 −1  grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/GroovyPageServletSpec.groovy
  165. +1 −1  ...s-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/GroovyPagesTemplateEngineTests.groovy
  166. +1 −4 grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/servlet/view/GroovyPageViewTests.groovy
  167. +2 −2 ...-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/ControllerTagLibMethodDispatchTests.groovy
  168. +2 −2 grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/JavascriptTagLibTests.groovy
  169. +2 −3 grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/LinkRenderingTagLib2Tests.groovy
  170. +1 −1  grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/LinkRenderingTagLibTests.groovy
  171. +1 −1  grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/NamedTagBodyParamsTests.groovy
  172. +1 −1  ...-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/NamespacedNamedUrlMappingTests.groovy
  173. +1 −1  grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/NamespacedTagLibMethodTests.groovy
  174. +2 −2 ...st-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/NamespacedTagLibRenderMethodTests.groovy
  175. +1 −1  ...st-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/OverlappingReverseMappedLinkTests.groovy
  176. +1 −1  grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/PageScopeTests.groovy
  177. +2 −2 grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/RenderTagLibTests.groovy
  178. +1 −1  grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/ValidationTagLibTests.groovy
  179. +1 −1  grails-test/src/main/groovy/org/codehaus/groovy/grails/test/runner/phase/FunctionalTestPhaseConfigurer.groovy
  180. +1 −1  grails-test/src/main/groovy/org/codehaus/groovy/grails/test/runner/phase/IntegrationTestPhaseConfigurer.groovy
  181. +1 −1  grails-validation/src/main/groovy/org/codehaus/groovy/grails/validation/ConstrainedPropertyBuilder.java
  182. +1 −1  grails-validation/src/main/groovy/org/codehaus/groovy/grails/validation/DefaultConstraintEvaluator.java
  183. +1 −1  grails-validation/src/main/groovy/org/codehaus/groovy/grails/validation/GrailsDomainClassValidator.java
  184. +1 −1  ...b-common/src/main/groovy/org/grails/web/context/ServletEnvironmentGrailsApplicationDiscoveryStrategy.groovy
  185. +1 −1  grails-web-common/src/main/groovy/org/grails/web/errors/ErrorsViewStackTracePrinter.groovy
  186. +4 −4 grails-web-common/src/main/groovy/org/grails/web/errors/GrailsWrappedRuntimeException.java
  187. +1 −1  grails-web-common/src/main/groovy/org/grails/web/pages/GroovyPagesUriSupport.java
  188. +1 −1  grails-web-common/src/main/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributes.java
  189. +1 −1  grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/DefaultRequestStateLookupStrategy.java
  190. +1 −1  grails-web-common/src/main/groovy/org/grails/web/servlet/mvc/exceptions/GrailsMVCException.java
  191. +2 −2 grails-web-databinding/src/main/groovy/grails/web/databinding/GrailsWebDataBinder.groovy
  192. +1 −1  grails-web-databinding/src/main/groovy/org/codehaus/groovy/grails/web/binding/DataBindingUtils.java
  193. +1 −1  grails-web-gsp-taglib/src/main/groovy/org/codehaus/groovy/grails/web/pages/StandaloneTagLibraryLookup.java
  194. +1 −1  grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/compiler/web/taglib/TagLibraryTransformer.java
  195. +1 −1  grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/api/TagLibraryApi.java
  196. +2 −2 grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/GroovyPageResourceLoader.java
  197. +2 −2 grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/GroovyPagesTemplateEngine.java
  198. +2 −2 grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/TagLibraryLookup.java
  199. +1 −1  ...b-gsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/discovery/GrailsConventionGroovyPageLocator.java
  200. +1 −1  grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/pages/exceptions/GroovyPagesException.java
  201. +1 −1  grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/taglib/RenderInputTag.java
  202. +1 −1  grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/taglib/exceptions/GrailsTagException.java
  203. +1 −1  ...src/test/groovy/org/codehaus/groovy/grails/web/pages/discovery/GrailsConventionGroovyPageLocatorSpec.groovy
  204. +1 −1  grails-web-jsp/src/main/groovy/org/codehaus/groovy/grails/web/taglib/jsp/JspInvokeGrailsTagLibTag.java
  205. +1 −1  grails-web-mvc/src/main/groovy/org/grails/web/errors/GrailsExceptionResolver.java
  206. +1 −1  grails-web-url-mappings/src/main/groovy/grails/web/mapping/exceptions/UrlMappingException.java
  207. +1 −1  grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/DefaultLinkGenerator.groovy
  208. +1 −1  grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingsHolderFactoryBean.java
  209. +1 −1  grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/AbstractGrailsControllerUrlMappings.groovy
  210. +1 −1  grails-web/src/main/groovy/org/grails/web/servlet/context/GrailsConfigUtils.java
  211. +1 −1  grails-web/src/main/groovy/org/grails/web/servlet/context/support/GrailsRuntimeConfigurator.java
View
15 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/ClassPropertyFetcher.groovy
@@ -0,0 +1,15 @@
+package org.codehaus.groovy.grails.commons
+
+import groovy.transform.CompileStatic
+
+/**
+ * @author Graeme Rocher
+ * @deprecated Use {@link org.grails.core.util.ClassPropertyFetcher} instead
+ */
+@CompileStatic
+@Deprecated
+class ClassPropertyFetcher extends org.grails.core.util.ClassPropertyFetcher {
+ ClassPropertyFetcher(Class<?> clazz, ReferenceInstanceCallback callback) {
+ super(clazz, callback)
+ }
+}
View
36 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsControllerClass.groovy
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.codehaus.groovy.grails.commons
+
+import groovy.transform.CompileStatic
+
+/**
+ * Evaluates the conventions contained within controllers to perform auto-configuration.
+ *
+ * @author Graeme Rocher
+ * @author Steven Devijver
+ * @since 0.1
+ * @deprecated Use {@link org.grails.core.DefaultGrailsControllerClass} instead
+ */
+@Deprecated
+@CompileStatic
+class DefaultGrailsControllerClass extends org.grails.core.DefaultGrailsControllerClass {
+
+ DefaultGrailsControllerClass(Class<?> clazz) {
+ super(clazz)
+ }
+}
View
33 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClass.groovy
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.grails.commons
+
+import groovy.transform.CompileStatic
+
+/**
+ * @author Graeme Rocher
+ * @deprecated Use {@link org.grails.core.DefaultGrailsDomainClass} instead
+ */
+@CompileStatic
+class DefaultGrailsDomainClass extends org.grails.core.DefaultGrailsDomainClass {
+ DefaultGrailsDomainClass(Class<?> clazz, Map<String, Object> defaultConstraints) {
+ super(clazz, defaultConstraints)
+ }
+
+ DefaultGrailsDomainClass(Class<?> clazz) {
+ super(clazz)
+ }
+}
View
37 ...compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassProperty.groovy
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.grails.commons
+
+import groovy.transform.CompileStatic
+
+import java.beans.PropertyDescriptor
+
+/**
+ * @author Graeme Rocher
+ * @deprecated Use {@link org.grails.core.DefaultGrailsDomainClassProperty} instead
+ */
+@Deprecated
+@CompileStatic
+class DefaultGrailsDomainClassProperty extends org.grails.core.DefaultGrailsDomainClassProperty {
+
+ DefaultGrailsDomainClassProperty(grails.core.GrailsDomainClass domainClass, PropertyDescriptor descriptor) {
+ super(domainClass, descriptor)
+ }
+
+ DefaultGrailsDomainClassProperty(grails.core.GrailsDomainClass domainClass, PropertyDescriptor descriptor, Map<String, Object> defaultConstraints) {
+ super(domainClass, descriptor, defaultConstraints)
+ }
+}
View
15 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsServiceClass.groovy
@@ -0,0 +1,15 @@
+package org.codehaus.groovy.grails.commons
+
+import groovy.transform.CompileStatic
+
+/**
+ * @author Graeme Rocher
+ * @deprecated Use {@link org.grails.core.DefaultGrailsServiceClass} instead
+ */
+@Deprecated
+@CompileStatic
+class DefaultGrailsServiceClass extends org.grails.core.DefaultGrailsServiceClass {
+ DefaultGrailsServiceClass(Class<?> clazz) {
+ super(clazz)
+ }
+}
View
27 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsTagLibClass.groovy
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.grails.commons
+
+/**
+ * @author Graeme Rocher
+ * @deprecated Use {@link org.grails.core.DefaultGrailsTagLibClass} instead
+ */
+class DefaultGrailsTagLibClass extends org.grails.core.DefaultGrailsTagLibClass {
+
+ DefaultGrailsTagLibClass(Class<?> clazz) {
+ super(clazz)
+ }
+}
View
29 ...ls-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsUrlMappingsClass.groovy
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.grails.commons
+
+import groovy.transform.CompileStatic
+
+/**
+ * @deprecated Use {@link org.grails.core.DefaultGrailsUrlMappingsClass} instead
+ */
+@Deprecated
+@CompileStatic
+class DefaultGrailsUrlMappingsClass extends org.grails.core.DefaultGrailsUrlMappingsClass {
+ DefaultGrailsUrlMappingsClass(Class<?> clazz) {
+ super(clazz)
+ }
+}
View
4 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/DomainClassArtefactHandler.groovy
@@ -17,8 +17,8 @@ package org.codehaus.groovy.grails.commons
/**
* @author Graeme Rocher
- * @deprecated Use {@link org.grails.core.DomainClassArtefactHandler} instead
+ * @deprecated Use {@link org.grails.core.artefact.DomainClassArtefactHandler} instead
*/
@Deprecated
-class DomainClassArtefactHandler extends org.grails.core.DomainClassArtefactHandler {
+class DomainClassArtefactHandler extends org.grails.core.artefact.DomainClassArtefactHandler {
}
View
27 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/commons/cfg/ConfigurationHelper.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2006-2007 Graeme Rocher
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.grails.commons.cfg;
+
+/**
+ * Helper methods for initialising config object.
+ *
+ * @author Graeme Rocher
+ * @deprecated Use {@link org.grails.core.cfg.ConfigurationHelper} instead
+ * @since 1.0
+ */
+@Deprecated
+public class ConfigurationHelper extends org.grails.core.cfg.ConfigurationHelper {
+}
View
4 ...-compatibility/src/main/groovy/org/codehaus/groovy/grails/exceptions/GrailsConfigurationException.groovy
@@ -19,11 +19,11 @@ import groovy.transform.CompileStatic
/**
* @author Graeme Rocher
- * @deprecated Use {@link grails.exceptions.GrailsConfigurationException} instead
+ * @deprecated Use {@link org.grails.core.exceptions.GrailsConfigurationException} instead
*/
@Deprecated
@CompileStatic
-class GrailsConfigurationException extends grails.exceptions.GrailsConfigurationException{
+class GrailsConfigurationException extends org.grails.core.exceptions.GrailsConfigurationException{
GrailsConfigurationException() {
}
View
4 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/exceptions/GrailsDomainException.groovy
@@ -4,11 +4,11 @@ import groovy.transform.CompileStatic
/**
* @author Graeme Rocher
- * @deprecated Use {@link grails.exceptions.GrailsDomainException} instead
+ * @deprecated Use {@link org.grails.core.exceptions.GrailsDomainException} instead
*/
@Deprecated
@CompileStatic
-class GrailsDomainException extends grails.exceptions.GrailsDomainException{
+class GrailsDomainException extends org.grails.core.exceptions.GrailsDomainException{
GrailsDomainException() {
}
View
4 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/exceptions/GrailsException.groovy
@@ -19,11 +19,11 @@ import groovy.transform.CompileStatic
/**
* @author Graeme Rocher
- * @deprecated Use {@link grails.exceptions.GrailsException} instead
+ * @deprecated Use {@link org.grails.core.exceptions.GrailsException} instead
*/
@CompileStatic
@Deprecated
-class GrailsException extends grails.exceptions.GrailsException{
+class GrailsException extends org.grails.core.exceptions.GrailsException{
GrailsException() {
}
View
4 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/exceptions/GrailsRuntimeException.groovy
@@ -19,11 +19,11 @@ import groovy.transform.CompileStatic
/**
* @author Graeme Rocher
- * @deprecated Use {@link grails.exceptions.GrailsRuntimeException} instead
+ * @deprecated Use {@link org.grails.core.exceptions.GrailsRuntimeException} instead
*/
@Deprecated
@CompileStatic
-class GrailsRuntimeException extends grails.exceptions.GrailsRuntimeException{
+class GrailsRuntimeException extends org.grails.core.exceptions.GrailsRuntimeException{
GrailsRuntimeException(String message) {
super(message)
View
24 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/support/ClassEditor.groovy
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.grails.support
+
+/**
+ * @author Graeme Rocher
+ * @deprecated Use {@link org.grails.core.support.ClassEditor} instead
+ */
+@Deprecated
+class ClassEditor extends org.grails.core.support.ClassEditor {
+}
View
24 ...compatibility/src/main/groovy/org/codehaus/groovy/grails/support/GrailsApplicationDiscoveryStrategy.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.codehaus.groovy.grails.support;
+
+/**
+ * @deprecated Use {@link org.grails.core.support.GrailsApplicationDiscoveryStrategy} instead
+ */
+@Deprecated
+public interface GrailsApplicationDiscoveryStrategy extends org.grails.core.support.GrailsApplicationDiscoveryStrategy {
+}
View
37 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/support/IncludeExcludeSupport.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.grails.support;
+
+import java.util.List;
+
+/**
+ * @author Graeme Rocher
+ * @deprecated Use {@link org.grails.core.util.IncludeExcludeSupport} instead
+ */
+@Deprecated
+public class IncludeExcludeSupport<T> extends org.grails.core.util.IncludeExcludeSupport<T> {
+
+ public IncludeExcludeSupport(List<T> defaultIncludes, List<T> defaultExcludes) {
+ super(defaultIncludes, defaultExcludes);
+ }
+
+ public IncludeExcludeSupport(List<T> defaultIncludes) {
+ super(defaultIncludes);
+ }
+
+ public IncludeExcludeSupport() {
+ }
+}
View
25 ...ls-compatibility/src/main/groovy/org/codehaus/groovy/grails/support/PersistenceContextInterceptor.groovy
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 Graeme Rocher
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.grails.support
+
+/**
+ * @author Graeme Rocher
+ * @deprecated Use {@link grails.persistence.support.PersistenceContextInterceptor} instead
+ */
+@Deprecated
+public interface PersistenceContextInterceptor extends grails.persistence.support.PersistenceContextInterceptor{
+
+}
View
31 ...patibility/src/main/groovy/org/codehaus/groovy/grails/support/PersistenceContextInterceptorExecutor.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2013 SpringSource
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.codehaus.groovy.grails.support;
+
+import grails.persistence.support.PersistenceContextInterceptor;
+
+import java.util.Collection;
+
+/**
+ * @deprecated Use {@link grails.persistence.support.PersistenceContextInterceptorExecutor} instead
+ */
+@Deprecated
+public class PersistenceContextInterceptorExecutor extends grails.persistence.support.PersistenceContextInterceptorExecutor {
+ public PersistenceContextInterceptorExecutor(Collection<PersistenceContextInterceptor> persistenceContextInterceptors) {
+ super(persistenceContextInterceptors);
+ }
+}
View
24 grails-compatibility/src/main/groovy/org/codehaus/groovy/grails/support/SoftThreadLocalMap.groovy
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.grails.support
+
+/**
+ * @deprecated Use {@link org.grails.core.util.SoftThreadLocalMap} instead
+ */
+@Deprecated
+class SoftThreadLocalMap extends org.grails.core.util.SoftThreadLocalMap{
+
+}
View
2  grails-core/src/main/groovy/grails/beans/utils/LazyBeanMap.groovy
@@ -16,7 +16,7 @@
package grails.beans.utils
import groovy.transform.CompileStatic
-import org.codehaus.groovy.grails.commons.ClassPropertyFetcher
+import org.grails.core.util.ClassPropertyFetcher
import java.beans.PropertyDescriptor
View
2  grails-core/src/main/groovy/grails/config/GrailsConfig.java
@@ -19,7 +19,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import grails.core.GrailsApplication;
-import grails.exceptions.GrailsConfigurationException;
+import org.grails.core.exceptions.GrailsConfigurationException;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import java.util.List;
View
4 grails-core/src/main/groovy/grails/core/AbstractGrailsApplication.java
@@ -14,8 +14,6 @@
*/
package grails.core;
-import grails.core.ArtefactHandler;
-import grails.core.GrailsApplication;
import grails.util.Holders;
import grails.util.Metadata;
import groovy.lang.GroovyObjectSupport;
@@ -25,7 +23,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
-import org.codehaus.groovy.grails.commons.cfg.ConfigurationHelper;
+import org.grails.core.cfg.ConfigurationHelper;
import org.codehaus.groovy.grails.plugins.GrailsPluginManager;
import grails.core.support.GrailsConfigurationAware;
import org.springframework.beans.BeansException;
View
4 grails-core/src/main/groovy/grails/core/AbstractGrailsClass.java
@@ -23,8 +23,8 @@
import groovy.lang.GroovyObject;
import groovy.lang.MetaClass;
import groovy.lang.MetaProperty;
-import grails.exceptions.NewInstanceCreationException;
-import org.codehaus.groovy.grails.commons.ClassPropertyFetcher;
+import org.grails.core.exceptions.NewInstanceCreationException;
+import org.grails.core.util.ClassPropertyFetcher;
import org.codehaus.groovy.grails.plugins.GrailsVersionUtils;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;
View
9 grails-core/src/main/groovy/grails/core/DefaultGrailsApplication.java
@@ -29,13 +29,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codehaus.groovy.grails.commons.*;
-import org.codehaus.groovy.grails.commons.cfg.ConfigurationHelper;
+import org.grails.core.cfg.ConfigurationHelper;
import grails.core.events.ArtefactAdditionEvent;
-import org.grails.core.DomainClassArtefactHandler;
+import org.grails.core.artefact.*;
import org.grails.core.io.support.GrailsFactoriesLoader;
-import grails.exceptions.GrailsConfigurationException;
-import org.grails.plugins.support.GrailsApplicationAwareBeanPostProcessor;
+import org.grails.core.exceptions.GrailsConfigurationException;
+import org.grails.spring.beans.GrailsApplicationAwareBeanPostProcessor;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.Resource;
View
2  grails-core/src/main/groovy/grails/core/GrailsDomainClass.java
@@ -85,7 +85,7 @@
* Returns the property for the given name
*
* @param name The property for the name
- * @throws grails.exceptions.InvalidPropertyException
+ * @throws org.grails.core.exceptions.InvalidPropertyException
* @return The domain class property for the given name
*/
GrailsDomainClassProperty getPropertyByName(String name);
View
2  ...grails/support/ParentApplicationContextAware.java → ...s/core/support/ParentApplicationContextAware.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support;
+package grails.core.support;
import org.springframework.beans.factory.Aware;
import org.springframework.context.ApplicationContext;
View
2  ...ils/support/NullPersistentContextInterceptor.java → ...nce/support/NullPersistentContextInterceptor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support;
+package grails.persistence.support;
/**
* A dummy persistence context interceptor that does nothing.
View
2  ...grails/support/PersistenceContextInterceptor.java → ...stence/support/PersistenceContextInterceptor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support;
+package grails.persistence.support;
/**
* Sets up the persistent context before and after a Grails operation is invoked.
View
2  ...port/PersistenceContextInterceptorExecutor.groovy → ...port/PersistenceContextInterceptorExecutor.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support
+package grails.persistence.support
import groovy.transform.CompileStatic
import org.springframework.context.ApplicationContext
View
2  grails-core/src/main/groovy/grails/util/Holders.java
@@ -28,7 +28,7 @@
import grails.core.GrailsApplication;
import org.grails.core.io.support.GrailsFactoriesLoader;
import org.codehaus.groovy.grails.plugins.GrailsPluginManager;
-import org.codehaus.groovy.grails.support.GrailsApplicationDiscoveryStrategy;
+import org.grails.core.support.GrailsApplicationDiscoveryStrategy;
import org.springframework.context.ApplicationContext;
import org.springframework.context.Lifecycle;
import org.springframework.util.Assert;
View
2  grails-core/src/main/groovy/grails/validation/ValidationException.java
@@ -15,7 +15,7 @@
*/
package grails.validation;
-import grails.exceptions.GrailsException;
+import org.grails.core.exceptions.GrailsException;
import org.springframework.validation.Errors;
import org.springframework.validation.ObjectError;
View
2  grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/AbstractGrailsPluginManager.java
@@ -36,7 +36,7 @@
import org.apache.commons.logging.LogFactory;
import grails.core.ArtefactHandler;
import grails.core.GrailsApplication;
-import org.codehaus.groovy.grails.commons.cfg.ConfigurationHelper;
+import org.grails.core.cfg.ConfigurationHelper;
import org.grails.spring.RuntimeSpringConfiguration;
import org.codehaus.groovy.grails.io.support.GrailsResourceUtils;
import org.codehaus.groovy.grails.plugins.exceptions.PluginException;
View
8 grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/CoreGrailsPlugin.groovy
@@ -31,10 +31,10 @@ import org.grails.spring.beans.factory.OptimizedAutowireCapableBeanFactory
import org.grails.spring.RuntimeSpringConfigUtilities
import org.grails.core.io.DefaultResourceLocator
import grails.core.support.GrailsApplicationAware
-import org.grails.plugins.support.GrailsApplicationAwareBeanPostProcessor
-import org.grails.plugins.support.PluginManagerAwareBeanPostProcessor
-import org.codehaus.groovy.grails.support.ClassEditor
-import org.codehaus.groovy.grails.support.DevelopmentShutdownHook
+import org.grails.spring.beans.GrailsApplicationAwareBeanPostProcessor
+import org.grails.spring.beans.PluginManagerAwareBeanPostProcessor
+import org.grails.core.support.ClassEditor
+import org.grails.dev.support.DevelopmentShutdownHook
import org.grails.beans.support.PropertiesEditor
import grails.core.support.proxy.DefaultProxyHandler
import org.springframework.beans.factory.config.CustomEditorConfigurer
View
4 grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/CorePluginFinder.java
@@ -32,9 +32,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import grails.core.GrailsApplication;
-import grails.exceptions.GrailsConfigurationException;
+import org.grails.core.exceptions.GrailsConfigurationException;
import org.codehaus.groovy.grails.io.support.IOUtils;
-import org.codehaus.groovy.grails.support.ParentApplicationContextAware;
+import grails.core.support.ParentApplicationContextAware;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
View
4 grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/DefaultGrailsPlugin.java
@@ -43,13 +43,13 @@
import grails.util.GrailsArrayUtils;
import grails.util.GrailsClassUtils;
import org.grails.core.io.SpringResource;
-import grails.exceptions.GrailsConfigurationException;
+import org.grails.core.exceptions.GrailsConfigurationException;
import org.grails.spring.RuntimeSpringConfiguration;
import org.codehaus.groovy.grails.plugins.exceptions.PluginException;
import org.codehaus.groovy.grails.plugins.support.WatchPattern;
import org.codehaus.groovy.grails.plugins.support.WatchPatternParser;
import grails.core.support.GrailsApplicationAware;
-import org.codehaus.groovy.grails.support.ParentApplicationContextAware;
+import grails.core.support.ParentApplicationContextAware;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;
View
4 grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/DefaultGrailsPluginManager.java
@@ -25,10 +25,10 @@
import grails.core.GrailsApplication;
import org.grails.spring.DefaultRuntimeSpringConfiguration;
import org.grails.spring.RuntimeSpringConfiguration;
-import grails.exceptions.GrailsConfigurationException;
+import org.grails.core.exceptions.GrailsConfigurationException;
import org.codehaus.groovy.grails.io.support.GrailsResourceUtils;
import org.codehaus.groovy.grails.plugins.exceptions.PluginException;
-import org.codehaus.groovy.grails.support.ParentApplicationContextAware;
+import grails.core.support.ParentApplicationContextAware;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import org.codehaus.groovy.runtime.IOGroovyMethods;
import org.springframework.beans.BeansException;
View
2  grails-core/src/main/groovy/org/grails/compiler/injection/AbstractGrailsArtefactTransformer.java
@@ -48,7 +48,7 @@
import org.codehaus.groovy.ast.stmt.ThrowStatement;
import org.codehaus.groovy.classgen.GeneratorContext;
import org.codehaus.groovy.control.SourceUnit;
-import org.grails.core.DomainClassArtefactHandler;
+import org.grails.core.artefact.DomainClassArtefactHandler;
import org.codehaus.groovy.runtime.MetaClassHelper;
import org.codehaus.groovy.syntax.Token;
import org.codehaus.groovy.syntax.Types;
View
2  grails-core/src/main/groovy/org/grails/compiler/injection/DefaultGrailsDomainClassInjector.java
@@ -39,7 +39,7 @@
import org.codehaus.groovy.ast.stmt.Statement;
import org.codehaus.groovy.classgen.GeneratorContext;
import org.codehaus.groovy.control.SourceUnit;
-import org.grails.core.DomainClassArtefactHandler;
+import org.grails.core.artefact.DomainClassArtefactHandler;
import grails.core.GrailsDomainClassProperty;
import org.codehaus.groovy.grails.io.support.GrailsResourceUtils;
View
2  grails-core/src/main/groovy/org/grails/compiler/injection/EntityASTTransformation.java
@@ -26,7 +26,7 @@
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.control.CompilePhase;
import org.codehaus.groovy.control.SourceUnit;
-import org.grails.core.DomainClassArtefactHandler;
+import org.grails.core.artefact.DomainClassArtefactHandler;
import org.codehaus.groovy.transform.ASTTransformation;
import org.codehaus.groovy.transform.GroovyASTTransformation;
View
2  .../grails/commons/DefaultGrailsControllerClass.java → ...org/grails/core/DefaultGrailsControllerClass.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.commons;
+package org.grails.core;
import grails.core.AbstractInjectableGrailsClass;
import grails.core.GrailsControllerClass;
View
9 ...oovy/grails/commons/DefaultGrailsDomainClass.java → ...ovy/org/grails/core/DefaultGrailsDomainClass.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.commons;
+package org.grails.core;
import grails.core.AbstractGrailsClass;
import grails.core.ComponentCapableDomainClass;
@@ -33,12 +33,13 @@
import java.util.Map;
import java.util.Set;
-import org.grails.core.DomainClassArtefactHandler;
+import org.grails.core.artefact.DomainClassArtefactHandler;
import org.grails.core.io.support.GrailsFactoriesLoader;
-import grails.exceptions.GrailsDomainException;
-import grails.exceptions.InvalidPropertyException;
+import org.grails.core.exceptions.GrailsDomainException;
+import org.grails.core.exceptions.InvalidPropertyException;
import grails.validation.ConstraintsEvaluator;
import org.grails.core.support.GrailsDomainConfigurationUtil;
+import org.grails.core.util.ClassPropertyFetcher;
import org.springframework.context.ApplicationContext;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;
View
5 ...ils/commons/DefaultGrailsDomainClassProperty.java → ...grails/core/DefaultGrailsDomainClassProperty.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.commons;
+package org.grails.core;
import grails.core.AbstractGrailsClass;
import grails.core.ComponentCapableDomainClass;
@@ -32,10 +32,11 @@
import java.util.Set;
import grails.validation.Constrained;
-import org.grails.core.DomainClassArtefactHandler;
+import org.grails.core.artefact.DomainClassArtefactHandler;
import org.grails.core.io.support.GrailsFactoriesLoader;
import grails.validation.ConstraintsEvaluator;
import org.grails.core.support.GrailsDomainConfigurationUtil;
+import org.grails.core.util.ClassPropertyFetcher;
import org.springframework.core.style.ToStringCreator;
import org.springframework.util.ClassUtils;
import org.springframework.validation.Errors;
View
2  ...ovy/grails/commons/DefaultGrailsServiceClass.java → ...vy/org/grails/core/DefaultGrailsServiceClass.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.commons;
+package org.grails.core;
import grails.core.AbstractInjectableGrailsClass;
import grails.core.GrailsServiceClass;
View
2  ...oovy/grails/commons/DefaultGrailsTagLibClass.java → ...ovy/org/grails/core/DefaultGrailsTagLibClass.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.commons;
+package org.grails.core;
import grails.core.AbstractInjectableGrailsClass;
import grails.core.GrailsTagLibClass;
View
2  ...grails/commons/DefaultGrailsUrlMappingsClass.java → ...rg/grails/core/DefaultGrailsUrlMappingsClass.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.commons;
+package org.grails.core;
import grails.core.AbstractGrailsClass;
import grails.core.GrailsUrlMappingsClass;
View
3  ...commons/AnnotationDomainClassArtefactHandler.java → ...rtefact/AnnotationDomainClassArtefactHandler.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.commons;
+package org.grails.core.artefact;
import grails.core.GrailsClass;
import grails.core.GrailsDomainClass;
-import org.grails.core.DomainClassArtefactHandler;
import java.util.HashSet;
import java.util.Set;
View
103 ...ovy/grails/commons/ControllerArtefactHandler.java → ...ails/core/artefact/ControllerArtefactHandler.java
@@ -1,51 +1,52 @@
-/*
- * Copyright 2004-2005 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.codehaus.groovy.grails.commons;
-
-import grails.core.AbstractGrailsClass;
-import grails.core.ArtefactHandlerAdapter;
-import grails.core.GrailsClass;
-import grails.core.GrailsControllerClass;
-
-/**
- * Lookup controllers for uris.
- *
- * <p>This class is responsible for looking up controller classes for uris.</p>
- *
- * <p>Lookups are cached in non-development mode, and the cache size can be controlled using the grails.urlmapping.cache.maxsize config property.</p>
- *
- * @author Marc Palmer (marc@anyware.co.uk)
-*/
-public class ControllerArtefactHandler extends ArtefactHandlerAdapter {
-
- private static final GrailsClass NO_CONTROLLER = new AbstractGrailsClass(Object.class, "Controller") {};
-
- public static final String TYPE = "Controller";
- public static final String PLUGIN_NAME = "controllers";
-
- public ControllerArtefactHandler() {
- super(TYPE, GrailsControllerClass.class, DefaultGrailsControllerClass.class,
- DefaultGrailsControllerClass.CONTROLLER, false);
- }
-
-
- @Override
- public String getPluginName() {
- return PLUGIN_NAME;
- }
-
-
-}
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.grails.core.artefact;
+
+import grails.core.AbstractGrailsClass;
+import grails.core.ArtefactHandlerAdapter;
+import grails.core.GrailsClass;
+import grails.core.GrailsControllerClass;
+import org.grails.core.DefaultGrailsControllerClass;
+
+/**
+ * Lookup controllers for uris.
+ *
+ * <p>This class is responsible for looking up controller classes for uris.</p>
+ *
+ * <p>Lookups are cached in non-development mode, and the cache size can be controlled using the grails.urlmapping.cache.maxsize config property.</p>
+ *
+ * @author Marc Palmer (marc@anyware.co.uk)
+*/
+public class ControllerArtefactHandler extends ArtefactHandlerAdapter {
+
+ private static final GrailsClass NO_CONTROLLER = new AbstractGrailsClass(Object.class, "Controller") {};
+
+ public static final String TYPE = "Controller";
+ public static final String PLUGIN_NAME = "controllers";
+
+ public ControllerArtefactHandler() {
+ super(TYPE, GrailsControllerClass.class, DefaultGrailsControllerClass.class,
+ DefaultGrailsControllerClass.CONTROLLER, false);
+ }
+
+
+ @Override
+ public String getPluginName() {
+ return PLUGIN_NAME;
+ }
+
+
+}
View
4 ...y/org/grails/core/DomainClassArtefactHandler.java → ...ils/core/artefact/DomainClassArtefactHandler.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.core;
+package org.grails.core.artefact;
import grails.core.*;
import grails.persistence.Entity;
@@ -25,7 +25,7 @@
import java.util.concurrent.ConcurrentHashMap;
import grails.core.support.GrailsApplicationAware;
-import org.codehaus.groovy.grails.commons.DefaultGrailsDomainClass;
+import org.grails.core.DefaultGrailsDomainClass;
import org.grails.core.support.GrailsDomainConfigurationUtil;
import org.grails.validation.ConstraintEvalUtils;
View
90 ...groovy/grails/commons/ServiceArtefactHandler.java → .../grails/core/artefact/ServiceArtefactHandler.java
@@ -1,45 +1,45 @@
-/*
- * Copyright 2004-2005 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.codehaus.groovy.grails.commons;
-
-import grails.core.ArtefactHandlerAdapter;
-import grails.core.GrailsServiceClass;
-import org.grails.core.DomainClassArtefactHandler;
-
-/**
- * @author Marc Palmer (marc@anyware.co.uk)
- */
-public class ServiceArtefactHandler extends ArtefactHandlerAdapter {
-
- public static final String TYPE = "Service";
- public static final String PLUGIN_NAME = "services";
-
- public ServiceArtefactHandler() {
- super(TYPE, GrailsServiceClass.class, DefaultGrailsServiceClass.class,
- DefaultGrailsServiceClass.SERVICE, false);
- }
-
- @Override
- public String getPluginName() {
- return PLUGIN_NAME;
- }
-
- @SuppressWarnings("rawtypes")
- @Override
- public boolean isArtefactClass(Class clazz) {
- return super.isArtefactClass(clazz) && !DomainClassArtefactHandler.isDomainClass(clazz);
- }
-}
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.grails.core.artefact;
+
+import grails.core.ArtefactHandlerAdapter;
+import grails.core.GrailsServiceClass;
+import org.grails.core.DefaultGrailsServiceClass;
+
+/**
+ * @author Marc Palmer (marc@anyware.co.uk)
+ */
+public class ServiceArtefactHandler extends ArtefactHandlerAdapter {
+
+ public static final String TYPE = "Service";
+ public static final String PLUGIN_NAME = "services";
+
+ public ServiceArtefactHandler() {
+ super(TYPE, GrailsServiceClass.class, DefaultGrailsServiceClass.class,
+ DefaultGrailsServiceClass.SERVICE, false);
+ }
+
+ @Override
+ public String getPluginName() {
+ return PLUGIN_NAME;
+ }
+
+ @SuppressWarnings("rawtypes")
+ @Override
+ public boolean isArtefactClass(Class clazz) {
+ return super.isArtefactClass(clazz) && !DomainClassArtefactHandler.isDomainClass(clazz);
+ }
+}
View
199 .../groovy/grails/commons/TagLibArtefactHandler.java → ...g/grails/core/artefact/TagLibArtefactHandler.java
@@ -1,99 +1,100 @@
-/*
- * Copyright 2004-2005 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.codehaus.groovy.grails.commons;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import grails.core.ArtefactHandlerAdapter;
-import grails.core.ArtefactInfo;
-import grails.core.GrailsClass;
-import grails.core.GrailsTagLibClass;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Configures tag libraries within namespaces in Grails.
- *
- * @author Marc Palmer (marc@anyware.co.uk)
- * @author Graeme Rocher
- * @author a.shneyderman
- *
- * @since 0.5
-*/
-public class TagLibArtefactHandler extends ArtefactHandlerAdapter {
-
- private static Log LOG = LogFactory.getLog(TagLibArtefactHandler.class);
- public static final String PLUGIN_NAME = "groovyPages";
- public static final String TYPE = "TagLib";
-
- private Map<String, GrailsTagLibClass> tag2libMap = new HashMap<String, GrailsTagLibClass>();
- private Map<String, GrailsTagLibClass> namespace2tagLibMap = new HashMap<String, GrailsTagLibClass>();
-
- public TagLibArtefactHandler() {
- super(TYPE, GrailsTagLibClass.class, DefaultGrailsTagLibClass.class, DefaultGrailsTagLibClass.TAG_LIB);
- }
-
- @Override
- public String getPluginName() {
- return PLUGIN_NAME;
- }
-
- /**
- * Creates a map of tags (keyed on "${namespace}:${tagName}") to tag libraries.
- */
- @Override
- public void initialize(ArtefactInfo artefacts) {
- tag2libMap = new HashMap<String, GrailsTagLibClass>();
- for (GrailsClass aClass : artefacts.getGrailsClasses()) {
- GrailsTagLibClass taglibClass = (GrailsTagLibClass) aClass;
- String namespace = taglibClass.getNamespace();
- namespace2tagLibMap.put(namespace, taglibClass);
- for (Object o : taglibClass.getTagNames()) {
- String tagName = namespace + ":" + o;
- if (!tag2libMap.containsKey(tagName)) {
- tag2libMap.put(tagName, taglibClass);
- }
- else {
- GrailsTagLibClass current = tag2libMap.get(tagName);
- if (!taglibClass.equals(current)) {
- LOG.info("There are conflicting tags: " + taglibClass.getFullName() + "." +
- tagName + " vs. " + current.getFullName() + "." + tagName +
- ". The former will take precedence.");
- tag2libMap.put(tagName, taglibClass);
- }
- }
- }
- }
- }
-
- /**
- * Looks up a tag library by using either a full qualified tag name such as g:link or
- * via namespace such as "g".
- *
- * @param feature The tag name or namespace
- * @return A GrailsClass instance representing the tag library
- */
- @Override
- public GrailsClass getArtefactForFeature(Object feature) {
- final Object tagLib = tag2libMap.get(feature);
- if (tagLib!= null) {
- return (GrailsClass) tagLib;
- }
-
- return namespace2tagLibMap.get(feature);
- }
-}
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.grails.core.artefact;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import grails.core.ArtefactHandlerAdapter;
+import grails.core.ArtefactInfo;
+import grails.core.GrailsClass;
+import grails.core.GrailsTagLibClass;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.grails.core.DefaultGrailsTagLibClass;
+
+/**
+ * Configures tag libraries within namespaces in Grails.
+ *
+ * @author Marc Palmer (marc@anyware.co.uk)
+ * @author Graeme Rocher
+ * @author a.shneyderman
+ *
+ * @since 0.5
+*/
+public class TagLibArtefactHandler extends ArtefactHandlerAdapter {
+
+ private static Log LOG = LogFactory.getLog(TagLibArtefactHandler.class);
+ public static final String PLUGIN_NAME = "groovyPages";
+ public static final String TYPE = "TagLib";
+
+ private Map<String, GrailsTagLibClass> tag2libMap = new HashMap<String, GrailsTagLibClass>();
+ private Map<String, GrailsTagLibClass> namespace2tagLibMap = new HashMap<String, GrailsTagLibClass>();
+
+ public TagLibArtefactHandler() {
+ super(TYPE, GrailsTagLibClass.class, DefaultGrailsTagLibClass.class, DefaultGrailsTagLibClass.TAG_LIB);
+ }
+
+ @Override
+ public String getPluginName() {
+ return PLUGIN_NAME;
+ }
+
+ /**
+ * Creates a map of tags (keyed on "${namespace}:${tagName}") to tag libraries.
+ */
+ @Override
+ public void initialize(ArtefactInfo artefacts) {
+ tag2libMap = new HashMap<String, GrailsTagLibClass>();
+ for (GrailsClass aClass : artefacts.getGrailsClasses()) {
+ GrailsTagLibClass taglibClass = (GrailsTagLibClass) aClass;
+ String namespace = taglibClass.getNamespace();
+ namespace2tagLibMap.put(namespace, taglibClass);
+ for (Object o : taglibClass.getTagNames()) {
+ String tagName = namespace + ":" + o;
+ if (!tag2libMap.containsKey(tagName)) {
+ tag2libMap.put(tagName, taglibClass);
+ }
+ else {
+ GrailsTagLibClass current = tag2libMap.get(tagName);
+ if (!taglibClass.equals(current)) {
+ LOG.info("There are conflicting tags: " + taglibClass.getFullName() + "." +
+ tagName + " vs. " + current.getFullName() + "." + tagName +
+ ". The former will take precedence.");
+ tag2libMap.put(tagName, taglibClass);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Looks up a tag library by using either a full qualified tag name such as g:link or
+ * via namespace such as "g".
+ *
+ * @param feature The tag name or namespace
+ * @return A GrailsClass instance representing the tag library
+ */
+ @Override
+ public GrailsClass getArtefactForFeature(Object feature) {
+ final Object tagLib = tag2libMap.get(feature);
+ if (tagLib!= null) {
+ return (GrailsClass) tagLib;
+ }
+
+ return namespace2tagLibMap.get(feature);
+ }
+}
View
3  ...vy/grails/commons/UrlMappingsArtefactHandler.java → ...ils/core/artefact/UrlMappingsArtefactHandler.java
@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.commons;
+package org.grails.core.artefact;
import grails.core.ArtefactHandlerAdapter;
import grails.core.GrailsUrlMappingsClass;
+import org.grails.core.DefaultGrailsUrlMappingsClass;
/**
* A handler for UrlMappings.
View
2  ...ovy/grails/commons/cfg/ConfigurationHelper.groovy → ...vy/org/grails/core/cfg/ConfigurationHelper.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.commons.cfg
+package org.grails.core.cfg
import grails.util.Environment
import grails.util.Holder
View
2  ...ovy/grails/exceptions/DefaultErrorsPrinter.groovy → ...rails/core/exceptions/DefaultErrorsPrinter.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.exceptions
+package org.grails.core.exceptions
import org.codehaus.groovy.control.MultipleCompilationErrorsException
import org.codehaus.groovy.control.messages.SyntaxErrorMessage
View
2  ...ails/exceptions/GrailsConfigurationException.java → ...core/exceptions/GrailsConfigurationException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.exceptions;
+package org.grails.core.exceptions;
/**
* @author Graeme Rocher
View
2  ...oovy/grails/exceptions/GrailsDomainException.java → ...grails/core/exceptions/GrailsDomainException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.exceptions;
+package org.grails.core.exceptions;
/**
* Thrown when creation of the Grails domain from the Grails domain classes fails.
View
2  ...ain/groovy/grails/exceptions/GrailsException.java → ...y/org/grails/core/exceptions/GrailsException.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.exceptions;
+package org.grails.core.exceptions;
/**
* Base class for all Grails exceptions that are not recoverable.
View
4 ...ovy/grails/exceptions/GrailsRuntimeException.java → ...rails/core/exceptions/GrailsRuntimeException.java
@@ -13,9 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.exceptions;
-
-import grails.exceptions.GrailsException;
+package org.grails.core.exceptions;
/**
* Generic global runtime exception.
View
4 ...y/grails/exceptions/InvalidPropertyException.java → ...ils/core/exceptions/InvalidPropertyException.java
@@ -13,9 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.exceptions;
-
-import grails.exceptions.GrailsException;
+package org.grails.core.exceptions;
/**
* Thrown when a property of a Grails class is invalidated.
View
4 ...ails/exceptions/NewInstanceCreationException.java → ...core/exceptions/NewInstanceCreationException.java
@@ -13,9 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.exceptions;
-
-import grails.exceptions.GrailsException;
+package org.grails.core.exceptions;
/**
* Occurs when the creation of a new instance fails.
View
2  ...roovy/grails/support/GrailsByteArrayResource.java → ...y/org/grails/core/io/GrailsByteArrayResource.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support;
+package org.grails.core.io;
import java.io.IOException;
import java.net.URL;
View
2  ...ehaus/groovy/grails/support/MockFileResource.java → ...n/groovy/org/grails/core/io/MockFileResource.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support;
+package org.grails.core.io;
import java.io.UnsupportedEncodingException;
View
2  ...aus/groovy/grails/support/MockResourceLoader.java → ...groovy/org/grails/core/io/MockResourceLoader.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support;
+package org.grails.core.io;
import java.io.File;
View
2  ...oovy/grails/support/MockStringResourceLoader.java → .../org/grails/core/io/MockStringResourceLoader.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support;
+package org.grails.core.io;
import java.io.UnsupportedEncodingException;
import java.util.HashMap;
View
2  ...roovy/grails/support/SimpleMapResourceLoader.java → ...y/org/grails/core/io/SimpleMapResourceLoader.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support;
+package org.grails.core.io;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
View
2  ...s/groovy/grails/support/StaticResourceLoader.java → ...oovy/org/grails/core/io/StaticResourceLoader.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support;
+package org.grails.core.io;
import java.io.IOException;
View
4 grails-core/src/main/groovy/org/grails/core/lifecycle/ShutdownOperations.java
@@ -22,8 +22,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codehaus.groovy.grails.commons.ClassPropertyFetcher;
-import org.codehaus.groovy.grails.commons.cfg.ConfigurationHelper;
+import org.grails.core.util.ClassPropertyFetcher;
+import org.grails.core.cfg.ConfigurationHelper;
/**
* Operations that should be executed on shutdown.
View
2  ...g/codehaus/groovy/grails/support/ClassEditor.java → ...n/groovy/org/grails/core/support/ClassEditor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support;
+package org.grails.core.support;
import java.beans.PropertyEditorSupport;
View
2  ...support/GrailsApplicationDiscoveryStrategy.groovy → ...support/GrailsApplicationDiscoveryStrategy.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support
+package org.grails.core.support
import grails.core.GrailsApplication
import org.springframework.context.ApplicationContext
View
2  grails-core/src/main/groovy/org/grails/core/support/GrailsDomainConfigurationUtil.java
@@ -46,7 +46,7 @@
import java.util.TimeZone;
import grails.validation.Constrained;
-import org.codehaus.groovy.grails.commons.ClassPropertyFetcher;
+import org.grails.core.util.ClassPropertyFetcher;
import org.grails.core.io.support.GrailsFactoriesLoader;
import grails.validation.ConstraintsEvaluator;
import org.springframework.util.StringUtils;
View
2  ...pport/internal/tools/MetaClassChangeReporter.java → ...pport/internal/tools/MetaClassChangeReporter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support.internal.tools;
+package org.grails.core.support.internal.tools;
import groovy.lang.MetaClass;
import groovy.lang.MetaClassRegistryChangeEvent;
View
4 ...s/groovy/grails/commons/ClassPropertyFetcher.java → ...vy/org/grails/core/util/ClassPropertyFetcher.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.commons;
+package org.grails.core.util;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
@@ -86,7 +86,7 @@ public Object getReferenceInstance() {
return cpf;
}
- ClassPropertyFetcher(Class<?> clazz, ReferenceInstanceCallback callback) {
+ protected ClassPropertyFetcher(Class<?> clazz, ReferenceInstanceCallback callback) {
this.clazz = clazz;
this.callback = callback;
init();
View
2  ...roovy/grails/support/IncludeExcludeSupport.groovy → ...org/grails/core/util/IncludeExcludeSupport.groovy
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support
+package org.grails.core.util
import groovy.transform.CompileStatic
View
2  ...aus/groovy/grails/support/SoftThreadLocalMap.java → ...oovy/org/grails/core/util/SoftThreadLocalMap.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support;
+package org.grails.core.util;
import org.springframework.util.ConcurrentReferenceHashMap;
View
2  ...ovy/grails/support/CommandLineResourceLoader.java → ...grails/dev/support/CommandLineResourceLoader.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support;
+package org.grails.dev.support;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.FileSystemResource;
View
2  ...ovy/grails/support/DevelopmentResourceLoader.java → ...grails/dev/support/DevelopmentResourceLoader.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support;
+package org.grails.dev.support;
import grails.util.BuildSettings;
import grails.util.BuildSettingsHolder;
View
2  ...ovy/grails/support/DevelopmentShutdownHook.groovy → ...grails/dev/support/DevelopmentShutdownHook.groovy
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.support
+package org.grails.dev.support
import grails.build.logging.GrailsConsole
View
2  ...ns/support/ClassLoaderAwareBeanPostProcessor.java → ...ring/beans/ClassLoaderAwareBeanPostProcessor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.plugins.support;
+package org.grails.spring.beans;
import org.codehaus.groovy.grails.plugins.support.BeanPostProcessorAdapter;
import grails.core.support.ClassLoaderAware;
View
2  ...port/GrailsApplicationAwareBeanPostProcessor.java → ...eans/GrailsApplicationAwareBeanPostProcessor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.plugins.support;
+package org.grails.spring.beans;
import grails.core.GrailsApplication;
import grails.core.support.GrailsApplicationAware;
View
2  .../support/PluginManagerAwareBeanPostProcessor.java → ...ng/beans/PluginManagerAwareBeanPostProcessor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.plugins.support;
+package org.grails.spring.beans;
import org.codehaus.groovy.grails.plugins.GrailsPluginManager;
import org.codehaus.groovy.grails.plugins.PluginManagerAware;
View
2  grails-core/src/main/groovy/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.java
@@ -45,7 +45,7 @@
import org.codehaus.groovy.grails.plugins.GrailsPluginUtils;
import org.codehaus.groovy.grails.plugins.PluginManagerAware;
import grails.core.support.GrailsApplicationAware;
-import org.codehaus.groovy.grails.support.DevelopmentResourceLoader;
+import org.grails.dev.support.DevelopmentResourceLoader;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;