Permalink
Browse files

refactoring org.codehaus.* out of grails-plugin-converters

This is not complete as I still need to figure out which components in this subproject need shadow classes created in grails-compatibility.
  • Loading branch information...
1 parent e8f1068 commit a87acdf99bea93e580d31c16f3ca4dee3db650fe @jeffbrown jeffbrown committed Jun 27, 2014
Showing with 293 additions and 245 deletions.
  1. +15 −1 ...plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/plugins/web/api/ControllersApi.java
  2. +1 −1 grails-plugin-converters/build.gradle
  3. +13 −12 grails-plugin-converters/src/main/groovy/grails/converters/JSON.java
  4. +15 −11 grails-plugin-converters/src/main/groovy/grails/converters/XML.java
  5. +5 −2 ...ovy/org/{codehaus/groovy → }/grails/compiler/web/converters/ConvertersControllersTransformer.java
  6. +4 −2 ...n/groovy/org/{codehaus/groovy → }/grails/compiler/web/converters/ConvertersDomainTransformer.java
  7. +6 −6 .../src/main/groovy/org/{codehaus/groovy → }/grails/plugins/converters/ConvertersGrailsPlugin.groovy
  8. +2 −2 ...src/main/groovy/org/{codehaus/groovy → }/grails/plugins/converters/ConvertersPluginSupport.groovy
  9. +2 −2 ...verters/src/main/groovy/org/{codehaus/groovy → }/grails/plugins/converters/api/ConvertersApi.java
  10. +2 −2 ...ain/groovy/org/{codehaus/groovy → }/grails/plugins/converters/api/ConvertersControllersApi.groovy
  11. +1 −1 ...-converters/src/main/groovy/org/{codehaus/groovy → }/grails/web/converters/AbstractConverter.java
  12. +1 −1 ...vy/org/{codehaus/groovy → }/grails/web/converters/AbstractParsingParameterCreationListener.groovy
  13. +1 −1 ...rters/src/main/groovy/org/{codehaus/groovy → }/grails/web/converters/ConfigurableConverter.groovy
  14. +3 −3 ...s-plugin-converters/src/main/groovy/org/{codehaus/groovy → }/grails/web/converters/Converter.java
  15. +3 −2 ...ugin-converters/src/main/groovy/org/{codehaus/groovy → }/grails/web/converters/ConverterUtil.java
  16. +1 −1 ...ers/src/main/groovy/org/{codehaus/groovy → }/grails/web/converters/IncludeExcludeConverter.groovy
  17. +5 −4 ...y/org/{codehaus/groovy → }/grails/web/converters/configuration/ChainedConverterConfiguration.java
  18. +5 −4 ...n/groovy/org/{codehaus/groovy → }/grails/web/converters/configuration/ConverterConfiguration.java
  19. +4 −4 ...y/org/{codehaus/groovy → }/grails/web/converters/configuration/ConvertersConfigurationHolder.java
  20. +32 −30 .../{codehaus/groovy → }/grails/web/converters/configuration/ConvertersConfigurationInitializer.java
  21. +5 −4 ...y/org/{codehaus/groovy → }/grails/web/converters/configuration/DefaultConverterConfiguration.java
  22. +5 −4 ...org/{codehaus/groovy → }/grails/web/converters/configuration/ImmutableConverterConfiguration.java
  23. +3 −3 ...oovy/org/{codehaus/groovy → }/grails/web/converters/configuration/ObjectMarshallerRegisterer.java
  24. +1 −1 ...rs/src/main/groovy/org/{codehaus/groovy → }/grails/web/converters/configuration/configtest.groovy
  25. +1 −1 ...src/main/groovy/org/{codehaus/groovy → }/grails/web/converters/exceptions/ConverterException.java
  26. +3 −3 ...ain/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/ClosureObjectMarshaller.java
  27. +2 −2 ...y/org/{codehaus/groovy → }/grails/web/converters/marshaller/IncludeExcludePropertyMarshaller.java
  28. +1 −1 ...rc/main/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/NameAwareMarshaller.java
  29. +3 −3 ...s/src/main/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/ObjectMarshaller.java
  30. +3 −3 ...n/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/ProxyUnwrappingMarshaller.java
  31. +3 −3 ...c/main/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/json/ArrayMarshaller.java
  32. +3 −3 ...in/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/json/ByteArrayMarshaller.java
  33. +3 −3 ...n/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/json/CollectionMarshaller.java
  34. +3 −3 ...rc/main/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/json/DateMarshaller.java
  35. +1 −1 ...ovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/json/DeepDomainClassMarshaller.java
  36. +8 −4 .../groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/json/DomainClassMarshaller.java
  37. +3 −3 ...rc/main/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/json/EnumMarshaller.java
  38. +3 −3 ...ovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/json/GenericJavaBeanMarshaller.java
  39. +3 −3 ...n/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/json/GroovyBeanMarshaller.java
  40. +3 −3 ...org/{codehaus/groovy → }/grails/web/converters/marshaller/json/InstanceMethodBasedMarshaller.java
  41. +3 −3 ...oovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/json/JavascriptDateMarshaller.java
  42. +3 −3 ...src/main/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/json/MapMarshaller.java
  43. +3 −3 ...groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/json/ToStringBeanMarshaller.java
  44. +3 −3 ...vy/org/{codehaus/groovy → }/grails/web/converters/marshaller/json/ValidationErrorsMarshaller.java
  45. +5 −4 ...rc/main/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/xml/ArrayMarshaller.java
  46. +3 −3 ...oovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/xml/Base64ByteArrayMarshaller.java
  47. +4 −4 ...in/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/xml/CollectionMarshaller.java
  48. +4 −4 ...src/main/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/xml/DateMarshaller.java
  49. +1 −1 ...oovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/xml/DeepDomainClassMarshaller.java
  50. +7 −4 ...n/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/xml/DomainClassMarshaller.java
  51. +3 −3 ...src/main/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/xml/EnumMarshaller.java
  52. +3 −3 ...oovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/xml/GenericJavaBeanMarshaller.java
  53. +4 −3 ...in/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/xml/GroovyBeanMarshaller.java
  54. +3 −3 .../org/{codehaus/groovy → }/grails/web/converters/marshaller/xml/InstanceMethodBasedMarshaller.java
  55. +4 −4 .../src/main/groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/xml/MapMarshaller.java
  56. +3 −3 .../groovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/xml/ToStringBeanMarshaller.java
  57. +4 −4 ...ovy/org/{codehaus/groovy → }/grails/web/converters/marshaller/xml/ValidationErrorsMarshaller.java
  58. +1 −1 grails-plugin-converters/src/main/resources/META-INF/grails-plugin.xml
  59. +3 −2 ...roovy/org/{codehaus/groovy → }/grails/compiler/web/converters/ConvertersControllersApiSpec.groovy
  60. +3 −2 ...vy/org/{codehaus/groovy → }/grails/compiler/web/converters/ConvertersDomainTransformerSpec.groovy
  61. +1 −1 ...s/src/test/groovy/org/{codehaus/groovy → }/grails/plugins/converters/api/ConvertersApiSpec.groovy
  62. +3 −1 ...onverters/src/test/groovy/org/{codehaus/groovy → }/grails/web/converters/ConverterUtilSpec.groovy
  63. +4 −1 .../{codehaus/groovy → }/grails/web/converters/marshaller/json/ValidationErrorsMarshallerSpec.groovy
  64. +3 −3 grails-plugin-rest/src/main/groovy/grails/rest/render/json/JsonRenderer.groovy
  65. +3 −3 grails-plugin-rest/src/main/groovy/grails/rest/render/xml/XmlRenderer.groovy
  66. +2 −2 grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/VndErrorRenderingSpec.groovy
  67. +3 −3 grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/json/JsonRendererSpec.groovy
  68. +4 −4 ...-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRendererSpec.groovy
  69. +4 −4 grails-plugin-testing/src/main/groovy/grails/test/GrailsUnitTestCase.groovy
  70. +2 −2 grails-plugin-testing/src/main/groovy/grails/test/MockUtils.groovy
  71. +1 −1 grails-plugin-testing/src/main/groovy/grails/test/mixin/web/ControllerUnitTestMixin.groovy
  72. +3 −3 grails-plugin-testing/src/main/groovy/grails/test/runtime/ControllerTestPlugin.groovy
  73. +1 −1 grails-plugin-testing/src/main/groovy/grails/test/runtime/GrailsApplicationTestPlugin.groovy
  74. +1 −1 grails-test-suite-uber/src/test/groovy/grails/web/JSONBuilderTests.groovy
  75. +1 −1 ...rc/test/groovy/org/codehaus/groovy/grails/plugins/testing/GrailsMockHttpServletRequestSpec.groovy
  76. +2 −2 ...-uber/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalDomainClassXmlRendererSpec.groovy
  77. +3 −3 ...-web/src/test/groovy/org/codehaus/groovy/grails/web/converters/ConverterConfigurationTests.groovy
  78. +1 −0 ...est-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/converters/JSONConverterTests.groovy
  79. +1 −1 ...test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/converters/XMLConverterTests.groovy
  80. +1 −1 ...web/src/test/groovy/org/codehaus/groovy/grails/web/json/DomainClassCollectionRenderingSpec.groovy
  81. +1 −1 ...suite-web/src/test/groovy/org/codehaus/groovy/grails/web/mime/ContentFormatControllerTests.groovy
@@ -44,12 +44,14 @@
import groovy.text.Template;
import groovy.util.slurpersupport.GPathResult;
import groovy.xml.StreamingMarkupBuilder;
+
import org.grails.core.artefact.ControllerArtefactHandler;
import org.codehaus.groovy.grails.io.support.GrailsIOUtils;
import org.codehaus.groovy.grails.io.support.GrailsResourceUtils;
import org.codehaus.groovy.grails.io.support.IOUtils;
+
import grails.plugins.GrailsPlugin;
-import org.codehaus.groovy.grails.web.converters.Converter;
+
import org.codehaus.groovy.grails.web.json.JSONElement;
import org.codehaus.groovy.grails.web.metaclass.*;
import org.codehaus.groovy.grails.web.pages.GroovyPageTemplate;
@@ -58,21 +60,32 @@
import org.codehaus.groovy.grails.web.sitemesh.GrailsLayoutView;
import org.codehaus.groovy.grails.web.sitemesh.GroovyPageLayoutFinder;
import org.grails.core.artefact.DomainClassArtefactHandler;
+
import grails.core.GrailsDomainClassProperty;
+
import org.codehaus.groovy.grails.compiler.web.ControllerActionTransformer;
+
import grails.plugins.GrailsPluginManager;
import grails.web.databinding.DataBindingUtils;
+
import org.codehaus.groovy.grails.web.controllers.ControllerExceptionHandlerMetaData;
+
import grails.web.mapping.LinkGenerator;
+
import org.codehaus.groovy.grails.web.plugins.support.WebMetaUtils;
+
import grails.web.util.GrailsApplicationAttributes;
+
import org.grails.web.servlet.mvc.ActionResultTransformer;
import org.grails.web.servlet.mvc.GrailsWebRequest;
+
import grails.web.mapping.mvc.RedirectEventListener;
import grails.web.mapping.mvc.exceptions.CannotRedirectException;
+
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import org.codehaus.groovy.runtime.InvokerHelper;
import org.grails.web.api.CommonWebApi;
+import org.grails.web.converters.Converter;
import org.grails.web.servlet.mvc.exceptions.ControllerExecutionException;
import org.grails.web.support.ResourceAwareTemplateEngine;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -86,6 +99,7 @@
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.View;
import org.springframework.web.servlet.support.RequestDataValueProcessor;
+
import static org.codehaus.groovy.grails.web.metaclass.RenderDynamicMethod.*;
/**
* API for each controller in a Grails application.
@@ -4,5 +4,5 @@ dependencies {
compile project(":grails-web"),
project(':grails-plugin-domain-class')
- testRuntime project(":grails-compatibility")
+ // testRuntime project(":grails-compatibility")
}
@@ -32,16 +32,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.groovy.grails.io.support.GrailsIOUtils;
-import org.codehaus.groovy.grails.web.converters.AbstractConverter;
-import org.codehaus.groovy.grails.web.converters.Converter;
-import org.codehaus.groovy.grails.web.converters.ConverterUtil;
-import org.codehaus.groovy.grails.web.converters.IncludeExcludeConverter;
-import org.codehaus.groovy.grails.web.converters.configuration.ConverterConfiguration;
-import org.codehaus.groovy.grails.web.converters.configuration.ConvertersConfigurationHolder;
-import org.codehaus.groovy.grails.web.converters.configuration.DefaultConverterConfiguration;
-import org.codehaus.groovy.grails.web.converters.exceptions.ConverterException;
-import org.codehaus.groovy.grails.web.converters.marshaller.ClosureObjectMarshaller;
-import org.codehaus.groovy.grails.web.converters.marshaller.ObjectMarshaller;
import org.codehaus.groovy.grails.web.json.JSONArray;
import org.codehaus.groovy.grails.web.json.JSONElement;
import org.codehaus.groovy.grails.web.json.JSONException;
@@ -50,6 +40,17 @@
import org.codehaus.groovy.grails.web.json.JSONWriter;
import org.codehaus.groovy.grails.web.json.PathCapturingJSONWriterWrapper;
import org.codehaus.groovy.grails.web.json.PrettyPrintJSONWriter;
+import org.grails.web.converters.AbstractConverter;
+import org.grails.web.converters.Converter;
+import org.grails.web.converters.ConverterUtil;
+import org.grails.web.converters.IncludeExcludeConverter;
+import org.grails.web.converters.configuration.ConverterConfiguration;
+import org.grails.web.converters.configuration.ConvertersConfigurationHolder;
+import org.grails.web.converters.configuration.DefaultConverterConfiguration;
+import org.grails.web.converters.exceptions.ConverterException;
+import org.grails.web.converters.marshaller.ClosureObjectMarshaller;
+import org.grails.web.converters.marshaller.ObjectMarshaller;
+
import grails.web.mime.MimeType;
/**
@@ -124,7 +125,7 @@ private void finalizeRender(Writer out) {
* Directs the JSON Writer to the given Writer
*
* @param out the Writer
- * @throws org.codehaus.groovy.grails.web.converters.exceptions.ConverterException
+ * @throws org.grails.web.converters.exceptions.ConverterException
*
*/
public void render(Writer out) throws ConverterException {
@@ -333,7 +334,7 @@ public static Object parse(HttpServletRequest request) throws ConverterException
* Sets the Object which is later converted to JSON
*
* @param target the Object
- * @see org.codehaus.groovy.grails.web.converters.Converter
+ * @see org.grails.web.converters.Converter
*/
@Override
public void setTarget(Object target) {
@@ -19,31 +19,35 @@
import grails.util.GrailsWebUtil;
import groovy.lang.Closure;
import groovy.util.BuilderSupport;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.groovy.grails.io.support.IOUtils;
+
import grails.core.support.proxy.EntityProxyHandler;
import grails.core.support.proxy.ProxyHandler;
-import org.codehaus.groovy.grails.web.converters.AbstractConverter;
-import org.codehaus.groovy.grails.web.converters.Converter;
-import org.codehaus.groovy.grails.web.converters.ConverterUtil;
-import org.codehaus.groovy.grails.web.converters.IncludeExcludeConverter;
-import org.codehaus.groovy.grails.web.converters.configuration.ConverterConfiguration;
-import org.codehaus.groovy.grails.web.converters.configuration.ConvertersConfigurationHolder;
-import org.codehaus.groovy.grails.web.converters.configuration.DefaultConverterConfiguration;
-import org.codehaus.groovy.grails.web.converters.exceptions.ConverterException;
-import org.codehaus.groovy.grails.web.converters.marshaller.ClosureObjectMarshaller;
-import org.codehaus.groovy.grails.web.converters.marshaller.NameAwareMarshaller;
-import org.codehaus.groovy.grails.web.converters.marshaller.ObjectMarshaller;
import grails.web.mime.MimeType;
+
import org.codehaus.groovy.grails.web.pages.FastStringWriter;
+import org.grails.web.converters.AbstractConverter;
+import org.grails.web.converters.Converter;
+import org.grails.web.converters.ConverterUtil;
+import org.grails.web.converters.IncludeExcludeConverter;
+import org.grails.web.converters.configuration.ConverterConfiguration;
+import org.grails.web.converters.configuration.ConvertersConfigurationHolder;
+import org.grails.web.converters.configuration.DefaultConverterConfiguration;
+import org.grails.web.converters.exceptions.ConverterException;
+import org.grails.web.converters.marshaller.ClosureObjectMarshaller;
+import org.grails.web.converters.marshaller.NameAwareMarshaller;
+import org.grails.web.converters.marshaller.ObjectMarshaller;
import org.grails.web.xml.PrettyPrintXMLStreamWriter;
import org.grails.web.xml.StreamingMarkupWriter;
import org.grails.web.xml.XMLStreamWriter;
import org.springframework.util.Assert;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -13,19 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.compiler.web.converters;
+package org.grails.compiler.web.converters;
import java.net.URL;
import java.util.regex.Pattern;
import grails.web.controllers.ControllerMethod;
+
import org.codehaus.groovy.ast.AnnotationNode;
import org.codehaus.groovy.ast.ClassNode;
import org.grails.core.artefact.ControllerArtefactHandler;
import org.grails.compiler.injection.AbstractGrailsArtefactTransformer;
+import org.grails.plugins.converters.api.ConvertersControllersApi;
+
import grails.compiler.ast.AstTransformer;
+
import org.codehaus.groovy.grails.io.support.GrailsResourceUtils;
-import org.codehaus.groovy.grails.plugins.converters.api.ConvertersControllersApi;
/**
* Enhances controller classes with additional render methods specific to converters.
@@ -13,15 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.compiler.web.converters;
+package org.grails.compiler.web.converters;
import java.net.URL;
import org.grails.core.artefact.DomainClassArtefactHandler;
import org.grails.compiler.injection.AbstractGrailsArtefactTransformer;
+import org.grails.plugins.converters.api.ConvertersApi;
+
import grails.compiler.ast.AstTransformer;
+
import org.codehaus.groovy.grails.io.support.GrailsResourceUtils;
-import org.codehaus.groovy.grails.plugins.converters.api.ConvertersApi;
/**
* Adds the asType method to domain classes.
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.plugins.converters
+package org.grails.plugins.converters
import grails.converters.JSON
import grails.converters.XML
import grails.util.GrailsUtil
-import org.codehaus.groovy.grails.plugins.converters.api.ConvertersControllersApi
-import org.codehaus.groovy.grails.web.converters.configuration.ConvertersConfigurationInitializer
-import org.codehaus.groovy.grails.web.converters.configuration.ObjectMarshallerRegisterer
-import org.codehaus.groovy.grails.web.converters.marshaller.json.ValidationErrorsMarshaller as JsonErrorsMarshaller
-import org.codehaus.groovy.grails.web.converters.marshaller.xml.ValidationErrorsMarshaller as XmlErrorsMarshaller
+import org.grails.plugins.converters.api.ConvertersControllersApi
+import org.grails.web.converters.configuration.ConvertersConfigurationInitializer
+import org.grails.web.converters.configuration.ObjectMarshallerRegisterer
+import org.grails.web.converters.marshaller.json.ValidationErrorsMarshaller as JsonErrorsMarshaller
+import org.grails.web.converters.marshaller.xml.ValidationErrorsMarshaller as XmlErrorsMarshaller
/**
* Allows the "obj as XML" and "obj as JSON" syntax.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.plugins.converters
+package org.grails.plugins.converters
import grails.artefact.Enhanced
import grails.converters.JSON
@@ -26,7 +26,7 @@ import grails.core.GrailsApplication
import grails.core.GrailsDomainClass
import grails.util.GrailsMetaClassUtils
import org.grails.core.metaclass.MetaClassEnhancer
-import org.codehaus.groovy.grails.plugins.converters.api.ConvertersApi
+import org.grails.plugins.converters.api.ConvertersApi
import org.grails.datastore.mapping.validation.ValidationErrors
import org.springframework.context.ApplicationContext
import org.springframework.validation.BeanPropertyBindingResult
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.plugins.converters.api;
+package org.grails.plugins.converters.api;
-import org.codehaus.groovy.grails.web.converters.ConverterUtil;
+import org.grails.web.converters.ConverterUtil;
import org.grails.web.servlet.mvc.GrailsWebRequest;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.plugins.converters.api
+package org.grails.plugins.converters.api
import grails.converters.JSON
-import org.codehaus.groovy.grails.web.converters.Converter
+import org.grails.web.converters.Converter
import org.codehaus.groovy.grails.web.json.JSONArray
import org.codehaus.groovy.grails.web.json.JSONObject
import org.grails.web.servlet.mvc.GrailsWebRequest
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.converters;
+package org.grails.web.converters;
import org.codehaus.groovy.grails.web.pages.FastStringWriter;
import org.springframework.beans.BeanWrapper;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.converters
+package org.grails.web.converters
import org.grails.web.servlet.mvc.ParameterCreationListener
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.converters
+package org.grails.web.converters
/**
* Interface for converters that can be configured at runtime
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.converters;
+package org.grails.web.converters;
import groovy.lang.Closure;
@@ -23,8 +23,8 @@
import javax.servlet.http.HttpServletResponse;
-import org.codehaus.groovy.grails.web.converters.exceptions.ConverterException;
-import org.codehaus.groovy.grails.web.converters.marshaller.ObjectMarshaller;
+import org.grails.web.converters.exceptions.ConverterException;
+import org.grails.web.converters.marshaller.ObjectMarshaller;
/**
* Defines an Object that can convert an instance and render it to the
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.converters;
+package org.grails.web.converters;
import groovy.lang.Closure;
@@ -24,12 +24,13 @@
import java.util.Map;
import grails.core.GrailsDomainClassProperty;
-import org.codehaus.groovy.grails.web.converters.exceptions.ConverterException;
+
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import org.codehaus.groovy.runtime.NullObject;
import org.codehaus.groovy.runtime.ResourceGroovyMethods;
import org.codehaus.groovy.runtime.StringGroovyMethods;
import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import org.grails.web.converters.exceptions.ConverterException;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;
import org.springframework.context.ApplicationContext;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.converters
+package org.grails.web.converters
/**
* A converter capable of including/excluding properties on the target object
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.codehaus.groovy.grails.web.converters.configuration;
+package org.grails.web.converters.configuration;
import grails.util.Environment;
@@ -25,9 +25,10 @@
import grails.core.support.proxy.DefaultProxyHandler;
import grails.core.support.proxy.ProxyHandler;
-import org.codehaus.groovy.grails.web.converters.Converter;
-import org.codehaus.groovy.grails.web.converters.exceptions.ConverterException;
-import org.codehaus.groovy.grails.web.converters.marshaller.ObjectMarshaller;
+
+import org.grails.web.converters.Converter;
+import org.grails.web.converters.exceptions.ConverterException;
+import org.grails.web.converters.marshaller.ObjectMarshaller;
/**
* An immutable ConverterConfiguration which chains the lookup calls for ObjectMarshallers
Oops, something went wrong.

0 comments on commit a87acdf

Please sign in to comment.