Permalink
Browse files

added grails-web (not compiling yet), grails-hibernate now compiles fine

  • Loading branch information...
graemerocher committed Feb 17, 2011
1 parent fcae731 commit b2da1db26dbc43aea5c56b107ec526329186b92c
Showing with 27 additions and 427 deletions.
  1. 0 {src/java → grails-web/src/main/groovy}/grails/converters/JSON.java
  2. 0 {src/java → grails-web/src/main/groovy}/grails/converters/XML.java
  3. 0 {src/java → grails-web/src/main/groovy}/grails/converters/deep/JSON.java
  4. 0 {src/java → grails-web/src/main/groovy}/grails/converters/deep/XML.java
  5. 0 {src/java → grails-web/src/main/groovy}/grails/util/GrailsWebUtil.java
  6. 0 {src/java → grails-web/src/main/groovy}/grails/web/JSONBuilder.groovy
  7. 0 {src/java → grails-web/src/main/groovy}/grails/web/container/EmbeddableServer.java
  8. 0 {src/java → grails-web/src/main/groovy}/grails/web/container/EmbeddableServerFactory.java
  9. 0 .../java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/binding/BindEventListener.java
  10. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/binding/CurrencyEditor.java
  11. 0 ...s-web/src/main/groovy}/org/codehaus/groovy/grails/web/binding/DataBindingLazyMetaPropertyMap.java
  12. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/binding/DataBindingUtils.java
  13. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/binding/GrailsDataBinder.java
  14. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/binding/ListOrderedSet.java
  15. 0 ...va → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/binding/StructuredDateEditor.java
  16. 0 ... grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/binding/StructuredPropertyEditor.java
  17. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/binding/TimeZoneEditor.java
  18. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/binding/UriEditor.java
  19. 0 .../java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/context/GrailsConfigUtils.java
  20. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/context/GrailsContextLoader.java
  21. 0 ...ails-web/src/main/groovy}/org/codehaus/groovy/grails/web/context/GrailsContextLoaderListener.java
  22. 0 ...va → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/context/ServletContextHolder.java
  23. 0 ...va → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/converters/AbstractConverter.java
  24. 0 ...groovy}/org/codehaus/groovy/grails/web/converters/AbstractParsingParameterCreationListener.groovy
  25. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/converters/Converter.java
  26. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/converters/ConverterUtil.java
  27. 0 ...ain/groovy}/org/codehaus/groovy/grails/web/converters/JSONParsingParameterCreationListener.groovy
  28. 0 ...main/groovy}/org/codehaus/groovy/grails/web/converters/XMLParsingParameterCreationListener.groovy
  29. 0 ...roovy}/org/codehaus/groovy/grails/web/converters/configuration/ChainedConverterConfiguration.java
  30. 0 .../main/groovy}/org/codehaus/groovy/grails/web/converters/configuration/ConverterConfiguration.java
  31. 0 ...roovy}/org/codehaus/groovy/grails/web/converters/configuration/ConvertersConfigurationHolder.java
  32. 0 ...}/org/codehaus/groovy/grails/web/converters/configuration/ConvertersConfigurationInitializer.java
  33. 0 ...roovy}/org/codehaus/groovy/grails/web/converters/configuration/DefaultConverterConfiguration.java
  34. 0 ...ovy}/org/codehaus/groovy/grails/web/converters/configuration/ImmutableConverterConfiguration.java
  35. 0 ...n/groovy}/org/codehaus/groovy/grails/web/converters/configuration/ObjectMarshallerRegisterer.java
  36. 0 ...ls-web/src/main/groovy}/org/codehaus/groovy/grails/web/converters/configuration/configtest.groovy
  37. 0 ...web/src/main/groovy}/org/codehaus/groovy/grails/web/converters/exceptions/ConverterException.java
  38. 0 ...src/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/ClosureOjectMarshaller.java
  39. 0 ...eb/src/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/NameAwareMarshaller.java
  40. 0 ...s-web/src/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/ObjectMarshaller.java
  41. 0 .../main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/ProxyUnwrappingMarshaller.java
  42. 0 ...b/src/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/ArrayMarshaller.java
  43. 0 ...c/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/ByteArrayMarshaller.java
  44. 0 .../main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/CollectionMarshaller.java
  45. 0 ...eb/src/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/DateMarshaller.java
  46. 0 .../groovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/DeepDomainClassMarshaller.java
  47. 0 ...main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/DomainClassMarshaller.java
  48. 0 ...eb/src/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/EnumMarshaller.java
  49. 0 .../groovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/GenericJavaBeanMarshaller.java
  50. 0 .../main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/GroovyBeanMarshaller.java
  51. 0 ...ovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/InstanceMethodBasedMarshaller.java
  52. 0 ...n/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/JavascriptDateMarshaller.java
  53. 0 ...web/src/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/MapMarshaller.java
  54. 0 ...ain/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/ToStringBeanMarshaller.java
  55. 0 ...groovy}/org/codehaus/groovy/grails/web/converters/marshaller/json/ValidationErrorsMarshaller.java
  56. 0 ...eb/src/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/xml/ArrayMarshaller.java
  57. 0 ...n/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/xml/Base64ByteArrayMarshaller.java
  58. 0 ...c/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/xml/CollectionMarshaller.java
  59. 0 ...web/src/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/xml/DateMarshaller.java
  60. 0 ...n/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/xml/DeepDomainClassMarshaller.java
  61. 0 .../main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/xml/DomainClassMarshaller.java
  62. 0 ...web/src/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/xml/EnumMarshaller.java
  63. 0 ...n/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/xml/GenericJavaBeanMarshaller.java
  64. 0 ...c/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/xml/GroovyBeanMarshaller.java
  65. 0 ...oovy}/org/codehaus/groovy/grails/web/converters/marshaller/xml/InstanceMethodBasedMarshaller.java
  66. 0 ...-web/src/main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/xml/MapMarshaller.java
  67. 0 ...main/groovy}/org/codehaus/groovy/grails/web/converters/marshaller/xml/ToStringBeanMarshaller.java
  68. 0 .../groovy}/org/codehaus/groovy/grails/web/converters/marshaller/xml/ValidationErrorsMarshaller.java
  69. 0 ... → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/errors/GrailsExceptionResolver.java
  70. 0 ...ils-web/src/main/groovy}/org/codehaus/groovy/grails/web/errors/GrailsWrappedRuntimeException.java
  71. 0 ...java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/filters/GrailsFiltersClass.java
  72. 0 ... → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/filters/HiddenHttpMethodFilter.java
  73. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/filters/JavascriptLibraryFilters.groovy
  74. 0 ...eb/src/main/groovy}/org/codehaus/groovy/grails/web/i18n/ParamsAwareLocaleChangeInterceptor.groovy
  75. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/JSONArray.java
  76. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/JSONElement.java
  77. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/JSONException.java
  78. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/JSONObject.java
  79. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/JSONTokener.java
  80. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/JSONWriter.java
  81. 0 ...ails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/PathCapturingJSONWriterWrapper.java
  82. 0 ...java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/PrettyPrintJSONWriter.java
  83. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/parser/JSONParser.java
  84. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/parser/JsonParserConstants.java
  85. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/parser/JsonParserTokenManager.java
  86. 0 ...java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/parser/ParseException.java
  87. 0 ...va → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/parser/SimpleCharStream.java
  88. 0 ... → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/parser/StringUnmarshaller.java
  89. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/parser/Token.java
  90. 0 .../java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/parser/TokenMgrError.java
  91. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/json/parser/jsonparser.jj
  92. 0 ...java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/AbstractUrlMapping.java
  93. 0 ... → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/AbstractUrlMappingInfo.java
  94. 0 .../java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/DefaultUrlCreator.java
  95. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/DefaultUrlMappingData.java
  96. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/DefaultUrlMappingEvaluator.java
  97. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/DefaultUrlMappingInfo.java
  98. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/DefaultUrlMappingParser.java
  99. 0 ... grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/DefaultUrlMappingsHolder.java
  100. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/ForwardUrlMappingInfo.groovy
  101. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/RegexUrlMapping.java
  102. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/ResponseCodeMappingData.java
  103. 0 ... → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/ResponseCodeUrlMapping.java
  104. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/UrlCreator.java
  105. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/UrlCreatorCache.java
  106. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/UrlMapping.java
  107. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/UrlMappingData.java
  108. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/UrlMappingEvaluator.java
  109. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/UrlMappingInfo.java
  110. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/UrlMappingParser.java
  111. 0 .../java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/UrlMappingsHolder.java
  112. 0 ...ils-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/UrlMappingsHolderFactoryBean.java
  113. 0 ...s-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/exceptions/UrlMappingException.java
  114. 0 ... grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mapping/filter/UrlMappingsFilter.java
  115. 0 ...eb/src/main/groovy}/org/codehaus/groovy/grails/web/metaclass/AbstractDynamicControllerMethod.java
  116. 0 .../src/main/groovy}/org/codehaus/groovy/grails/web/metaclass/AbstractDynamicControllerProperty.java
  117. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/metaclass/BindDynamicMethod.java
  118. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/metaclass/ChainMethod.groovy
  119. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/metaclass/ControllerDynamicMethods.java
  120. 0 .../java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/metaclass/ForwardMethod.groovy
  121. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/metaclass/GetParamsDynamicProperty.java
  122. 0 ...ails-web/src/main/groovy}/org/codehaus/groovy/grails/web/metaclass/GetSessionDynamicProperty.java
  123. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/metaclass/RedirectDynamicMethod.java
  124. +6 −36 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/metaclass/RenderDynamicMethod.java
  125. 0 ... → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/metaclass/TagLibDynamicMethods.java
  126. 0 ...java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/metaclass/WithFormMethod.groovy
  127. 0 .../java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mime/AcceptHeaderParser.groovy
  128. 0 ... grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mime/DefaultAcceptHeaderParser.groovy
  129. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/mime/MimeType.groovy
  130. 0 .../groovy}/org/codehaus/groovy/grails/web/multipart/ContentLengthAwareCommonsMultipartResolver.java
  131. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/DefaultGroovyPagesUriService.java
  132. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/FastStringWriter.java
  133. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GSPResponseWriter.java
  134. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GSPWriter.java
  135. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPage.java
  136. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPageBinding.java
  137. 0 ...java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPageCompiler.groovy
  138. 0 ... → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPageCompilerTask.groovy
  139. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPageMetaInfo.java
  140. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPageOutputStack.java
  141. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPageParser.java
  142. 0 ... → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPageResourceLoader.java
  143. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPageScanner.java
  144. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPageTemplate.java
  145. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPageUtils.java
  146. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPageWritable.java
  147. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPagesServlet.java
  148. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPagesTemplateEngine.java
  149. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPagesUriService.java
  150. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/GroovyPagesUriSupport.java
  151. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/Reverse.java
  152. 0 ...java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/SitemeshPreprocessor.java
  153. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/Strip.java
  154. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/TagLibraryLookup.java
  155. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/Tokens.java
  156. 0 ...ls-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/exceptions/GroovyPagesException.java
  157. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/BodyContentImpl.java
  158. 0 ...ls-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/GroovyPagesJspFactory.groovy
  159. 0 ...ils-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/GroovyPagesPageContext.java
  160. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/JspTag.java
  161. 0 ...java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/JspTagImpl.groovy
  162. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/JspTagLib.java
  163. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/JspTagLibImpl.groovy
  164. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/JspWriterDelegate.java
  165. 0 ...grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/LocalEntityResolver.java
  166. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/PageContextFactory.groovy
  167. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/TagLibFactory.java
  168. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/TagLibraryResolver.groovy
  169. 0 .../java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/TldReader.groovy
  170. 0 ...ils-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/UncloseableInputStream.java
  171. 0 ...s-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/WebXmlTagLibraryReader.groovy
  172. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/web-app_2_2.dtd
  173. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/web-app_2_3.dtd
  174. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/web-app_2_4.xsd
  175. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/web-app_2_5.xsd
  176. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/web-jsptaglibrary_1_1.dtd
  177. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/web-jsptaglibrary_1_2.dtd
  178. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/web-jsptaglibrary_2_0.xsd
  179. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/pages/ext/jsp/web-jsptaglibrary_2_1.xsd
  180. 0 ... → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/plugins/support/WebMetaUtils.groovy
  181. 0 ...b/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/DefaultGrailsApplicationAttributes.java
  182. 0 ...va → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/ErrorHandlingServlet.java
  183. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/FlashScope.java
  184. 0 ...ails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/GrailsApplicationAttributes.java
  185. 0 ...s-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/GrailsControllerHandlerMapping.java
  186. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/GrailsDispatcherServlet.java
  187. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/GrailsFlashScope.java
  188. 0 ...va → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/GrailsRequestContext.java
  189. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/GrailsUrlPathHelper.java
  190. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/HttpHeaders.java
  191. 0 ...b/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/WebRequestDelegatingRequestContext.java
  192. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/WrappedResponseHolder.java
  193. 0 ...web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/filter/GrailsReloadServletFilter.java
  194. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/filter/ResourceCopier.java
  195. 0 ...web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/AbstractTokenResponseHandler.java
  196. 0 ...c/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/CommandObjectEnablingPostProcessor.java
  197. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/GrailsControllerHelper.java
  198. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/GrailsHttpSession.java
  199. 0 ... grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/GrailsParameterMap.groovy
  200. 0 ...ails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/GrailsUrlHandlerMapping.java
  201. 0 ...va → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/GrailsWebRequest.java
  202. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/GrailsWebRequestFilter.java
  203. 0 ...ls-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/ParameterCreationListener.java
  204. 0 .../src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/ParameterInitializationCallback.java
  205. 0 ...grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/RedirectEventListener.java
  206. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/SimpleGrailsController.java
  207. 0 ...web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/SimpleGrailsControllerHelper.java
  208. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/SynchronizerToken.groovy
  209. 0 ... grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/TokenResponseHandler.java
  210. 0 ...main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/CannotRedirectException.groovy
  211. 0 ...n/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/ControllerExecutionException.java
  212. 0 ...eb/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/GrailsMVCException.java
  213. 0 ...y}/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/IncompatibleParameterCountException.java
  214. 0 ...b/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/InvalidUriException.java
  215. 0 ...oovy}/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/NoClosurePropertyForURIException.java
  216. 0 ...ain/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/NoViewNameDefinedException.java
  217. 0 ...ain/groovy}/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/UnknownControllerException.java
  218. 0 ...roovy}/org/codehaus/groovy/grails/web/servlet/mvc/exceptions/UnsupportedReturnValueException.java
  219. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/view/GrailsViewResolver.java
  220. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/view/GroovyPageView.java
  221. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/servlet/view/NullView.java
  222. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/sitemesh/FactoryHolder.java
  223. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/sitemesh/GSPSitemeshPage.java
  224. 0 ...java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/sitemesh/Grails5535Factory.java
  225. 0 ...-web/src/main/groovy}/org/codehaus/groovy/grails/web/sitemesh/GrailsContentBufferingResponse.java
  226. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/sitemesh/GrailsHTMLPageParser.java
  227. +19 −13 ...ils-web/src/main/groovy}/org/codehaus/groovy/grails/web/sitemesh/GrailsLayoutDecoratorMapper.java
  228. 0 ...java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/sitemesh/GrailsNoDecorator.java
  229. 0 .../java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/sitemesh/GrailsPageFilter.java
  230. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/sitemesh/GrailsPageResponseWrapper.java
  231. 0 ...rails-web/src/main/groovy}/org/codehaus/groovy/grails/web/sitemesh/GrailsRoutablePrintWriter.java
  232. 0 ... grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/sitemesh/GrailsTokenizedHTMLPage.java
  233. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GrailsTag.java
  234. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GrailsTagRegistry.java
  235. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyCollectTag.java
  236. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyConditionalTag.java
  237. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyDefTag.java
  238. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyEachTag.java
  239. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyElseIfTag.java
  240. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyElseTag.java
  241. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyFindAllTag.java
  242. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyGrepTag.java
  243. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyIfTag.java
  244. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyPageAttributes.groovy
  245. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyPageTagBody.java
  246. 0 ...java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyPageTagWriter.java
  247. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovySyntaxTag.java
  248. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyUnlessTag.java
  249. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/GroovyWhileTag.java
  250. 0 ... grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/NamespacedTagDispatcher.groovy
  251. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/RenderInputTag.java
  252. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/RequestContextTag.java
  253. 0 ...ils-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/exceptions/GrailsTagException.java
  254. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspActionSubmitTag.java
  255. 0 .../java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspCheckboxTag.java
  256. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspCurrencySelectTag.java
  257. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspDatePickerTag.java
  258. 0 ...java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspEachErrorTag.java
  259. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspFormRemoteTag.java
  260. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspFormTag.java
  261. 0 ...java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspHasErrorsTag.java
  262. 0 ...ails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspInvokeGrailsTagLibTag.java
  263. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspLinkTag.java
  264. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspLocaleSelectTag.java
  265. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspMessageTag.java
  266. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspRemoteFunctionTag.java
  267. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspRemoteLinkTag.java
  268. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspRenderErrorsTag.java
  269. 0 ...va → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspRenderInputTag.java
  270. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspRenderTag.java
  271. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspSelectTag.java
  272. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspSubmitToRemoteTag.java
  273. 0 ...→ grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/taglib/jsp/JspTimeZoneSelectTag.java
  274. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/transform/LineNumber.java
  275. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/transform/LineNumberTransform.java
  276. 0 ...s-web/src/main/groovy}/org/codehaus/groovy/grails/web/util/BoundedCharsAsEncodedBytesCounter.java
  277. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/util/CodecPrintWriter.java
  278. 0 ...a → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/util/DebugHttpSessionListener.java
  279. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/util/GrailsPrintWriter.java
  280. 0 ...ava → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/util/IncludeResponseWrapper.java
  281. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/util/IncludedContent.java
  282. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/util/Log4jConfigListener.java
  283. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/util/StreamByteBuffer.java
  284. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/util/StreamCharBuffer.java
  285. 0 ...va → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/util/StringCharArrayAccessor.java
  286. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/util/TypeConvertingMap.groovy
  287. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/util/WebUtils.java
  288. 0 ... → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/xml/PrettyPrintXMLStreamWriter.java
  289. 0 .../java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/xml/StreamingMarkupWriter.java
  290. 0 {src/java → grails-web/src/main/groovy}/org/codehaus/groovy/grails/web/xml/XMLStreamWriter.java
  291. +2 −1 settings.gradle
  292. +0 −211 src/java/grails/util/JSonBuilder.java
  293. +0 −166 src/java/grails/util/OpenRicoBuilder.java
@@ -17,7 +17,6 @@
import grails.converters.JSON;
import grails.util.GrailsWebUtil;
-import grails.util.OpenRicoBuilder;
import grails.web.JSONBuilder;
import groovy.lang.Closure;
import groovy.lang.GroovyObject;
@@ -162,10 +161,7 @@ else if (argMap.containsKey(ARGUMENT_CONTENT_TYPE)) {
if (arguments[arguments.length - 1] instanceof Closure) {
Closure callable = (Closure) arguments[arguments.length - 1];
- if (BUILDER_TYPE_RICO.equals(argMap.get(ARGUMENT_BUILDER))) {
- renderView = renderRico(callable, response);
- }
- else if (BUILDER_TYPE_JSON.equals(argMap.get(ARGUMENT_BUILDER)) || isJSONResponse(response)) {
+ if (BUILDER_TYPE_JSON.equals(argMap.get(ARGUMENT_BUILDER)) || isJSONResponse(response)) {
renderView = renderJSON(callable, response);
}
else {
@@ -380,40 +376,14 @@ else if (target instanceof GroovyObject) {
@SuppressWarnings("deprecation")
private boolean renderJSON(Closure callable, HttpServletResponse response) {
boolean renderView = true;
- if (!useLegacyJSONBuilder) {
- JSONBuilder builder = new JSONBuilder();
- JSON json = builder.build( callable);
- json.render(response);
- renderView = false;
- }
- else {
- grails.util.JSonBuilder jsonBuilder;
- try {
- jsonBuilder = new grails.util.JSonBuilder(response);
- renderView = false;
- }
- catch (IOException e) {
- throw new ControllerExecutionException("I/O error executing render method for arguments [" +
- callable + "]: " + e.getMessage(), e);
- }
- jsonBuilder.invokeMethod("json", new Object[]{callable});
- }
+ JSONBuilder builder = new JSONBuilder();
+ JSON json = builder.build( callable);
+ json.render(response);
+ renderView = false;
return renderView;
}
- private boolean renderRico(Closure callable, HttpServletResponse response) {
- boolean renderView;
- OpenRicoBuilder orb;
- try {
- orb = new OpenRicoBuilder(response);
- renderView = false;
- }
- catch (IOException e) {
- throw new ControllerExecutionException("I/O error executing render method for arguments [" + callable + "]: " + e.getMessage(), e);
- }
- orb.invokeMethod("ajax", new Object[]{callable});
- return renderView;
- }
+
private boolean renderMarkup(Closure closure, HttpServletResponse response) {
boolean renderView;
@@ -17,6 +17,7 @@
import grails.util.Environment;
import grails.util.Metadata;
+import grails.util.PluginBuildSettings;
import groovy.lang.GroovyObject;
import java.io.IOException;
@@ -73,6 +74,7 @@
private ServletContext servletContext;
private WebApplicationContext applicationContext;
private GrailsPluginManager pluginManager;
+ private PluginBuildSettings pluginBuildSettings;
@Override
public void init(Config c, Properties properties, DecoratorMapper parentMapper) throws InstantiationException {
@@ -81,6 +83,7 @@ public void init(Config c, Properties properties, DecoratorMapper parentMapper)
applicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
if (applicationContext.containsBean(GrailsPluginManager.BEAN_NAME)) {
pluginManager = applicationContext.getBean(GrailsPluginManager.BEAN_NAME, GrailsPluginManager.class);
+ pluginBuildSettings = pluginManager.getPluginBuildSettings();
}
}
@@ -223,22 +226,25 @@ public String searchPluginViews(String name, ResourceLoader resourceLoader) {
private String searchPluginViewsInDevelopmentMode(String name) {
String pluginViewLocation = null;
- for (Resource resource : GrailsPluginUtils.getPluginDirectories()) {
- try {
- final String pathToLayoutInPlugin = "grails-app/views/layouts/"+name;
- final String absolutePathToResource = resource.getFile().getAbsolutePath();
- if (!absolutePathToResource.endsWith("/")) {
- resource = new FileSystemResource(absolutePathToResource + '/');
+ if(pluginBuildSettings != null) {
+ for (Resource resource : pluginBuildSettings.getPluginDirectories()) {
+ try {
+ final String pathToLayoutInPlugin = "grails-app/views/layouts/"+name;
+ final String absolutePathToResource = resource.getFile().getAbsolutePath();
+ if (!absolutePathToResource.endsWith("/")) {
+ resource = new FileSystemResource(absolutePathToResource + '/');
+ }
+ final Resource layoutPath = resource.createRelative(pathToLayoutInPlugin);
+ if (layoutPath.exists()) {
+ GrailsPluginInfo info = pluginBuildSettings.getPluginInfo(absolutePathToResource);
+ pluginViewLocation = GrailsResourceUtils.WEB_INF + "/plugins/" + info.getFullName() + '/' + pathToLayoutInPlugin;
+ }
}
- final Resource layoutPath = resource.createRelative(pathToLayoutInPlugin);
- if (layoutPath.exists()) {
- GrailsPluginInfo info = GrailsPluginUtils.getPluginBuildSettings().getPluginInfo(absolutePathToResource);
- pluginViewLocation = GrailsResourceUtils.WEB_INF + "/plugins/" + info.getFullName() + '/' + pathToLayoutInPlugin;
+ catch (IOException e) {
+ // ignore
}
}
- catch (IOException e) {
- // ignore
- }
+
}
return pluginViewLocation;
}