Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Reorganise artefact classes more logically

  • Loading branch information...
commit e2a2f8528320fa5ea1487fc1ebb6ae76618768eb 1 parent 4a39e03
@graemerocher graemerocher authored
Showing with 99 additions and 59 deletions.
  1. +2 −2 grails-compat/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsControllerClass.groovy
  2. +2 −2 grails-compat/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClass.groovy
  3. +2 −2 grails-compat/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassProperty.groovy
  4. +2 −2 grails-compat/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsServiceClass.groovy
  5. +2 −2 grails-compat/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsTagLibClass.groovy
  6. +2 −2 grails-compat/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsUrlMappingsClass.groovy
  7. +1 −1  grails-core/build.gradle
  8. +7 −0 grails-core/src/main/groovy/grails/core/ArtefactHandler.java
  9. +26 −0 grails-core/src/main/groovy/grails/core/ArtefactHandlerAdapter.java
  10. +6 −5 grails-core/src/main/groovy/grails/core/DefaultGrailsApplication.java
  11. +3 −0  grails-core/src/main/groovy/grails/core/GrailsServiceClass.java
  12. +0 −1  grails-core/src/main/groovy/org/grails/core/artefact/ControllerArtefactHandler.java
  13. +2 −1  grails-core/src/main/groovy/org/grails/core/{ → artefact}/DefaultGrailsControllerClass.java
  14. +2 −2 grails-core/src/main/groovy/org/grails/core/{ → artefact}/DefaultGrailsDomainClass.java
  15. +2 −2 grails-core/src/main/groovy/org/grails/core/{ → artefact}/DefaultGrailsDomainClassProperty.java
  16. +3 −1 grails-core/src/main/groovy/org/grails/core/{ → artefact}/DefaultGrailsServiceClass.java
  17. +2 −1  grails-core/src/main/groovy/org/grails/core/{ → artefact}/DefaultGrailsTagLibClass.java
  18. +0 −1  grails-core/src/main/groovy/org/grails/core/artefact/DomainClassArtefactHandler.java
  19. +0 −1  grails-core/src/main/groovy/org/grails/core/artefact/ServiceArtefactHandler.java
  20. +0 −1  grails-core/src/main/groovy/org/grails/core/artefact/TagLibArtefactHandler.java
  21. +1 −0  grails-core/src/main/resources/META-INF/grails.factories
  22. +1 −1  grails-plugin-codecs/src/main/resources/META-INF/grails.factories
  23. +1 −1  grails-plugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java
  24. +1 −1  ...ls-plugin-filters/src/test/groovy/org/codehaus/groovy/grails/web/filters/FilterToHandlerAdapterTests.groovy
  25. +1 −1  grails-plugin-testing/src/main/groovy/grails/test/MockUtils.groovy
  26. +1 −1  grails-plugin-testing/src/main/groovy/grails/test/mixin/web/UrlMappingsUnitTestMixin.groovy
  27. +1 −1  grails-plugin-testing/src/main/groovy/grails/test/runtime/ControllerTestPlugin.groovy
  28. +1 −1  grails-plugin-testing/src/main/groovy/org/grails/compiler/injection/test/TestForTransformation.java
  29. +1 −1  grails-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsGrailsPlugin.groovy
  30. +1 −1  grails-test-suite-uber/src/test/groovy/grails/validation/ConstrainedPropertyTests.java
  31. +1 −1  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/DefaultArtefactInfoTests.groovy
  32. +1 −1  ...-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassPropertyTests.groovy
  33. +1 −1  grails-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassTests.groovy
  34. +1 −1  ...s-test-suite-uber/src/test/groovy/org/codehaus/groovy/grails/commons/UrlMappingsArtefactHandlerTests.groovy
  35. +1 −1  ...st-suite-uber/src/test/groovy/org/codehaus/groovy/grails/validation/ConstraintsEvaluatingPropertyTests.java
  36. +1 −1  grails-test-suite-web/src/test/groovy/org/grails/web/taglib/JavascriptTagLibTests.groovy
  37. +1 −1  grails-test-suite-web/src/test/groovy/org/grails/web/taglib/LinkRenderingTagLib2Tests.groovy
  38. +1 −1  grails-test-suite-web/src/test/groovy/org/grails/web/taglib/LinkRenderingTagLibTests.groovy
  39. +1 −1  grails-test-suite-web/src/test/groovy/org/grails/web/taglib/NamespacedNamedUrlMappingTests.groovy
  40. +1 −1  grails-test-suite-web/src/test/groovy/org/grails/web/taglib/OverlappingReverseMappedLinkTests.groovy
  41. +1 −1  grails-test-suite-web/src/test/groovy/org/grails/web/taglib/RenderTagLibTests.groovy
  42. +1 −1  grails-web-gsp-taglib/src/main/groovy/org/grails/web/pages/StandaloneTagLibraryLookup.java
  43. +2 −1  ...ore → grails-web-url-mappings/src/main/groovy/grails/web/mapping/artefact}/GrailsUrlMappingsClass.java
  44. +2 −3 ...→ grails-web-url-mappings/src/main/groovy/grails/web/mapping}/artefact/UrlMappingsArtefactHandler.java
  45. +2 −2 grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingsHolderFactoryBean.java
  46. +3 −2 ...grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/artefact}/DefaultGrailsUrlMappingsClass.java
  47. +1 −0  grails-web-url-mappings/src/main/resources/META-INF/grails.factories
  48. +1 −1  grails-web/src/main/resources/META-INF/grails.factories
View
4 ...at/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsControllerClass.groovy
@@ -24,11 +24,11 @@ import groovy.transform.CompileStatic
* @author Graeme Rocher
* @author Steven Devijver
* @since 0.1
- * @deprecated Use {@link org.grails.core.DefaultGrailsControllerClass} instead
+ * @deprecated Use {@link org.grails.core.artefact.DefaultGrailsControllerClass} instead
*/
@Deprecated
@CompileStatic
-class DefaultGrailsControllerClass extends org.grails.core.DefaultGrailsControllerClass {
+class DefaultGrailsControllerClass extends org.grails.core.artefact.DefaultGrailsControllerClass {
DefaultGrailsControllerClass(Class<?> clazz) {
super(clazz)
View
4 ...compat/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClass.groovy
@@ -19,10 +19,10 @@ import groovy.transform.CompileStatic
/**
* @author Graeme Rocher
- * @deprecated Use {@link org.grails.core.DefaultGrailsDomainClass} instead
+ * @deprecated Use {@link org.grails.core.artefact.DefaultGrailsDomainClass} instead
*/
@CompileStatic
-class DefaultGrailsDomainClass extends org.grails.core.DefaultGrailsDomainClass {
+class DefaultGrailsDomainClass extends org.grails.core.artefact.DefaultGrailsDomainClass {
DefaultGrailsDomainClass(Class<?> clazz, Map<String, Object> defaultConstraints) {
super(clazz, defaultConstraints)
}
View
4 ...rc/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassProperty.groovy
@@ -21,11 +21,11 @@ import java.beans.PropertyDescriptor
/**
* @author Graeme Rocher
- * @deprecated Use {@link org.grails.core.DefaultGrailsDomainClassProperty} instead
+ * @deprecated Use {@link org.grails.core.artefact.DefaultGrailsDomainClassProperty} instead
*/
@Deprecated
@CompileStatic
-class DefaultGrailsDomainClassProperty extends org.grails.core.DefaultGrailsDomainClassProperty {
+class DefaultGrailsDomainClassProperty extends org.grails.core.artefact.DefaultGrailsDomainClassProperty {
DefaultGrailsDomainClassProperty(grails.core.GrailsDomainClass domainClass, PropertyDescriptor descriptor) {
super(domainClass, descriptor)
View
4 ...ompat/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsServiceClass.groovy
@@ -4,11 +4,11 @@ import groovy.transform.CompileStatic
/**
* @author Graeme Rocher
- * @deprecated Use {@link org.grails.core.DefaultGrailsServiceClass} instead
+ * @deprecated Use {@link DefaultGrailsServiceClass} instead
*/
@Deprecated
@CompileStatic
-class DefaultGrailsServiceClass extends org.grails.core.DefaultGrailsServiceClass {
+class DefaultGrailsServiceClass extends DefaultGrailsServiceClass {
DefaultGrailsServiceClass(Class<?> clazz) {
super(clazz)
}
View
4 ...compat/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsTagLibClass.groovy
@@ -17,9 +17,9 @@ package org.codehaus.groovy.grails.commons
/**
* @author Graeme Rocher
- * @deprecated Use {@link org.grails.core.DefaultGrailsTagLibClass} instead
+ * @deprecated Use {@link org.grails.core.artefact.DefaultGrailsTagLibClass} instead
*/
-class DefaultGrailsTagLibClass extends org.grails.core.DefaultGrailsTagLibClass {
+class DefaultGrailsTagLibClass extends org.grails.core.artefact.DefaultGrailsTagLibClass {
DefaultGrailsTagLibClass(Class<?> clazz) {
super(clazz)
View
4 ...t/src/main/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsUrlMappingsClass.groovy
@@ -18,11 +18,11 @@ package org.codehaus.groovy.grails.commons
import groovy.transform.CompileStatic
/**
- * @deprecated Use {@link org.grails.core.DefaultGrailsUrlMappingsClass} instead
+ * @deprecated Use {@link org.grails.web.mapping.artefact.DefaultGrailsUrlMappingsClass} instead
*/
@Deprecated
@CompileStatic
-class DefaultGrailsUrlMappingsClass extends org.grails.core.DefaultGrailsUrlMappingsClass {
+class DefaultGrailsUrlMappingsClass extends org.grails.web.mapping.artefact.DefaultGrailsUrlMappingsClass {
DefaultGrailsUrlMappingsClass(Class<?> clazz) {
super(clazz)
}
View
2  grails-core/build.gradle
@@ -7,7 +7,7 @@ dependencies {
compile( "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:${concurrentlinkedhashmapVersion}" ) {
exclude group: 'commons-logging', module:'commons-logging'
}
- compile("org.springframework.boot:spring-boot:1.1.0.M2")
+ compile("org.springframework.boot:spring-boot:1.1.4.RELEASE")
compile("org.springframework:spring-core:${springVersion}") {
exclude group: 'commons-logging', module:'commons-logging'
}
View
7 grails-core/src/main/groovy/grails/core/ArtefactHandler.java
@@ -15,6 +15,8 @@
*/
package grails.core;
+import org.codehaus.groovy.ast.ClassNode;
+
/**
* <p>The ArtefactHandler interface's purpose is to allow the analysis of conventions within a Grails application.
* An artefact is represented by the GrailsClass interface and this interface provides methods that allow artefacts to
@@ -44,6 +46,11 @@
String getType();
/**
+ * @param classNode The ClassNode instance
+ * @return True if the given ClassNode instance is an instance of the Artefact type
+ */
+ boolean isArtefact(ClassNode classNode);
+ /**
* <p>Called by the GrailsApplication whenever it needs to know if a given class
* is considered to be the kind of artefact represented by this handler.</p>
* <p>Typically you will check the name of the class and some other properties to see
View
26 grails-core/src/main/groovy/grails/core/ArtefactHandlerAdapter.java
@@ -20,9 +20,15 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Modifier;
+import java.net.MalformedURLException;
+import java.net.URI;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.ast.InnerClassNode;
+import org.grails.io.support.GrailsResourceUtils;
+import org.grails.io.support.UrlResource;
/**
* Adapter for the {@link grails.core.ArtefactHandler} interface
@@ -65,6 +71,26 @@ public String getType() {
return type;
}
+ @Override
+ public boolean isArtefact(ClassNode classNode) {
+ int modifiers = classNode.getModifiers();
+ URI uri = classNode.getModule().getContext().getSource().getURI();
+ if(uri == null) return false;
+ try {
+ if(!GrailsResourceUtils.isGrailsResource(new UrlResource(uri))) return false;
+ } catch (MalformedURLException e) {
+ return false;
+ }
+ if(classNode instanceof InnerClassNode) return false;
+
+ if(!classNode.isEnum() && !classNode.isInterface() && !Modifier.isAbstract(modifiers)) {
+ if(classNode.getName().endsWith(artefactSuffix)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public final boolean isArtefact(@SuppressWarnings("rawtypes") Class aClass) {
if (aClass == null) {
return false;
View
11 grails-core/src/main/groovy/grails/core/DefaultGrailsApplication.java
@@ -185,14 +185,15 @@ protected void initArtefactHandlers() {
registerArtefactHandler(tagLibArtefactHandler);
}
- final UrlMappingsArtefactHandler urlMappingsArtefactHandler = new UrlMappingsArtefactHandler();
- if (!hasArtefactHandler(urlMappingsArtefactHandler.getType())) {
- registerArtefactHandler(urlMappingsArtefactHandler);
+ List<org.codehaus.groovy.grails.commons.ArtefactHandler> legacyArtefactHandlers = GrailsFactoriesLoader.loadFactories(org.codehaus.groovy.grails.commons.ArtefactHandler.class, getClassLoader());
+
+ for (org.codehaus.groovy.grails.commons.ArtefactHandler artefactHandler : legacyArtefactHandlers) {
+ registerArtefactHandler(artefactHandler);
}
- List<org.codehaus.groovy.grails.commons.ArtefactHandler> additionalArtefactHandlers = GrailsFactoriesLoader.loadFactories(org.codehaus.groovy.grails.commons.ArtefactHandler.class, getClassLoader());
+ List<ArtefactHandler> additionalArtefactHandlers = GrailsFactoriesLoader.loadFactories(ArtefactHandler.class, getClassLoader());
- for (org.codehaus.groovy.grails.commons.ArtefactHandler artefactHandler : additionalArtefactHandlers) {
+ for (ArtefactHandler artefactHandler : additionalArtefactHandlers) {
registerArtefactHandler(artefactHandler);
}
View
3  grails-core/src/main/groovy/grails/core/GrailsServiceClass.java
@@ -15,7 +15,10 @@
*/
package grails.core;
+import grails.core.InjectableGrailsClass;
+
/**
+ * @author Graeme Rocher
* @author Steven Devijver
*/
public interface GrailsServiceClass extends InjectableGrailsClass {
View
1  grails-core/src/main/groovy/org/grails/core/artefact/ControllerArtefactHandler.java
@@ -19,7 +19,6 @@
import grails.core.ArtefactHandlerAdapter;
import grails.core.GrailsClass;
import grails.core.GrailsControllerClass;
-import org.grails.core.DefaultGrailsControllerClass;
/**
* Lookup controllers for uris.
View
3  ...ls/core/DefaultGrailsControllerClass.java → ...rtefact/DefaultGrailsControllerClass.java
@@ -13,11 +13,12 @@
* 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.GrailsControllerClass;
import grails.web.Action;
import groovy.lang.GroovyObject;
+import org.grails.core.AbstractInjectableGrailsClass;
import org.springframework.util.ReflectionUtils;
import java.lang.reflect.Method;
View
4 ...grails/core/DefaultGrailsDomainClass.java → ...re/artefact/DefaultGrailsDomainClass.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.ComponentCapableDomainClass;
import grails.core.GrailsDomainClass;
@@ -32,7 +32,7 @@
import java.util.Map;
import java.util.Set;
-import org.grails.core.artefact.DomainClassArtefactHandler;
+import org.grails.core.AbstractGrailsClass;
import org.grails.core.io.support.GrailsFactoriesLoader;
import org.grails.core.exceptions.GrailsDomainException;
import org.grails.core.exceptions.InvalidPropertyException;
View
4 ...ore/DefaultGrailsDomainClassProperty.java → ...act/DefaultGrailsDomainClassProperty.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.ComponentCapableDomainClass;
import grails.core.GrailsDomainClass;
@@ -31,7 +31,7 @@
import java.util.Set;
import grails.validation.Constrained;
-import org.grails.core.artefact.DomainClassArtefactHandler;
+import org.grails.core.AbstractGrailsClass;
import org.grails.core.io.support.GrailsFactoriesLoader;
import grails.validation.ConstraintsEvaluator;
import org.grails.core.support.GrailsDomainConfigurationUtil;
View
4 ...rails/core/DefaultGrailsServiceClass.java → ...e/artefact/DefaultGrailsServiceClass.java
@@ -13,11 +13,13 @@
* 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.GrailsServiceClass;
+import org.grails.core.AbstractInjectableGrailsClass;
/**
+ * @author Graeme Rocher
* @author Steven Devijver
*/
public class DefaultGrailsServiceClass extends AbstractInjectableGrailsClass implements GrailsServiceClass {
View
3  ...grails/core/DefaultGrailsTagLibClass.java → ...re/artefact/DefaultGrailsTagLibClass.java
@@ -13,10 +13,11 @@
* 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.GrailsTagLibClass;
import groovy.lang.Closure;
+import org.grails.core.AbstractInjectableGrailsClass;
import org.grails.core.artefact.TagLibArtefactHandler;
import java.beans.PropertyDescriptor;
View
1  grails-core/src/main/groovy/org/grails/core/artefact/DomainClassArtefactHandler.java
@@ -25,7 +25,6 @@
import java.util.concurrent.ConcurrentHashMap;
import grails.core.support.GrailsApplicationAware;
-import org.grails.core.DefaultGrailsDomainClass;
import org.grails.core.support.GrailsDomainConfigurationUtil;
import org.grails.validation.ConstraintEvalUtils;
View
1  grails-core/src/main/groovy/org/grails/core/artefact/ServiceArtefactHandler.java
@@ -17,7 +17,6 @@
import grails.core.ArtefactHandlerAdapter;
import grails.core.GrailsServiceClass;
-import org.grails.core.DefaultGrailsServiceClass;
/**
* @author Marc Palmer (marc@anyware.co.uk)
View
1  grails-core/src/main/groovy/org/grails/core/artefact/TagLibArtefactHandler.java
@@ -24,7 +24,6 @@
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.
View
1  grails-core/src/main/resources/META-INF/grails.factories
@@ -0,0 +1 @@
+grails.core.ArtefactHandler=org.grails.core.artefact.ServiceArtefactHandler
View
2  grails-plugin-codecs/src/main/resources/META-INF/grails.factories
@@ -1 +1 @@
-org.codehaus.groovy.grails.commons.ArtefactHandler=org.grails.commons.CodecArtefactHandler
+grails.core.ArtefactHandler=org.grails.commons.CodecArtefactHandler
View
2  ...ugin-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java
@@ -81,7 +81,7 @@
import org.codehaus.groovy.classgen.GeneratorContext;
import org.codehaus.groovy.control.SourceUnit;
import org.grails.core.artefact.ControllerArtefactHandler;
-import org.grails.core.DefaultGrailsControllerClass;
+import org.grails.core.artefact.DefaultGrailsControllerClass;
import grails.compiler.ast.AnnotatedClassInjector;
import grails.compiler.ast.AstTransformer;
import org.grails.compiler.injection.GrailsASTUtils;
View
2  ...src/test/groovy/org/codehaus/groovy/grails/web/filters/FilterToHandlerAdapterTests.groovy
@@ -4,7 +4,7 @@ import grails.web.CamelCaseUrlConverter
import grails.web.UrlConverter
import grails.core.DefaultGrailsApplication
-import org.grails.core.DefaultGrailsControllerClass
+import org.grails.core.artefact.DefaultGrailsControllerClass
import org.grails.plugins.web.filters.FilterToHandlerAdapter
import org.springframework.context.support.GenericApplicationContext
View
2  grails-plugin-testing/src/main/groovy/grails/test/MockUtils.groovy
@@ -34,7 +34,7 @@ import org.grails.web.converters.Converter
import org.grails.web.pages.GroovyPageBinding
import org.grails.web.taglib.GroovyPageAttributes
import org.grails.web.taglib.exceptions.GrailsTagException
-import org.grails.core.DefaultGrailsDomainClass
+import org.grails.core.artefact.DefaultGrailsDomainClass
import org.grails.core.artefact.DomainClassArtefactHandler
import org.grails.plugins.web.mime.FormatInterceptor
import org.grails.validation.ConstrainedPropertyBuilder
View
2  grails-plugin-testing/src/main/groovy/grails/test/mixin/web/UrlMappingsUnitTestMixin.groovy
@@ -23,7 +23,7 @@ import junit.framework.AssertionFailedError
import org.grails.core.artefact.ControllerArtefactHandler
import grails.core.GrailsControllerClass
-import org.grails.core.artefact.UrlMappingsArtefactHandler
+import grails.web.mapping.artefact.UrlMappingsArtefactHandler
import grails.web.mapping.UrlMappingInfo
import grails.web.mapping.UrlMappingsHolder
import org.grails.web.mapping.UrlMappingsHolderFactoryBean
View
2  grails-plugin-testing/src/main/groovy/grails/test/runtime/ControllerTestPlugin.groovy
@@ -29,7 +29,7 @@ import org.springframework.web.multipart.support.StandardServletMultipartResolve
import javax.servlet.ServletContext
import grails.core.GrailsApplication
-import org.grails.core.artefact.UrlMappingsArtefactHandler
+import grails.web.mapping.artefact.UrlMappingsArtefactHandler
import org.grails.plugins.CodecsGrailsPlugin
import org.grails.plugins.codecs.DefaultCodecLookup
import org.grails.plugins.converters.ConvertersGrailsPlugin
View
2  ...gin-testing/src/main/groovy/org/grails/compiler/injection/test/TestForTransformation.java
@@ -65,7 +65,7 @@
import org.grails.core.artefact.ControllerArtefactHandler;
import org.grails.core.artefact.ServiceArtefactHandler;
import org.grails.core.artefact.TagLibArtefactHandler;
-import org.grails.core.artefact.UrlMappingsArtefactHandler;
+import grails.web.mapping.artefact.UrlMappingsArtefactHandler;
import grails.web.servlet.context.GrailsWebApplicationContext;
import org.grails.compiler.injection.GrailsASTUtils;
import grails.compiler.ast.GrailsArtefactClassInjector;
View
2  ...rl-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsGrailsPlugin.groovy
@@ -22,7 +22,7 @@ import grails.web.HyphenatedUrlConverter
import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
import grails.core.GrailsApplication
-import org.grails.core.artefact.UrlMappingsArtefactHandler
+import grails.web.mapping.artefact.UrlMappingsArtefactHandler
import grails.core.support.GrailsApplicationAware
import org.grails.web.mapping.CachingLinkGenerator
import org.grails.web.mapping.DefaultLinkGenerator
View
2  grails-test-suite-uber/src/test/groovy/grails/validation/ConstrainedPropertyTests.java
@@ -17,7 +17,7 @@
import junit.framework.TestCase;
import org.grails.test.support.MockHibernatePluginHelper;
-import org.grails.core.DefaultGrailsDomainClass;
+import org.grails.core.artefact.DefaultGrailsDomainClass;
import org.grails.plugins.MockGrailsPluginManager;
import org.springframework.validation.BindException;
import org.springframework.validation.Errors;
View
2  ...e-uber/src/test/groovy/org/codehaus/groovy/grails/commons/DefaultArtefactInfoTests.groovy
@@ -1,7 +1,7 @@
package org.codehaus.groovy.grails.commons
import grails.core.DefaultArtefactInfo
-import org.grails.core.DefaultGrailsControllerClass
+import org.grails.core.artefact.DefaultGrailsControllerClass
/**
* @author Graeme Rocher
View
2  ...st/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassPropertyTests.groovy
@@ -2,7 +2,7 @@ package org.codehaus.groovy.grails.commons
import grails.core.GrailsDomainClass
import grails.core.GrailsDomainClassProperty
-import org.grails.core.DefaultGrailsDomainClass
+import org.grails.core.artefact.DefaultGrailsDomainClass
class DefaultGrailsDomainClassPropertyTests extends GroovyTestCase {
GrailsDomainClass parentClass
View
2  ...r/src/test/groovy/org/codehaus/groovy/grails/commons/DefaultGrailsDomainClassTests.groovy
@@ -3,7 +3,7 @@ package org.codehaus.groovy.grails.commons
import grails.core.DefaultGrailsApplication
import grails.core.GrailsDomainClass
import grails.core.GrailsDomainClassProperty
-import org.grails.core.DefaultGrailsDomainClass
+import org.grails.core.artefact.DefaultGrailsDomainClass
import org.grails.core.exceptions.InvalidPropertyException
import org.grails.core.support.GrailsDomainConfigurationUtil
View
2  ...src/test/groovy/org/codehaus/groovy/grails/commons/UrlMappingsArtefactHandlerTests.groovy
@@ -1,6 +1,6 @@
package org.codehaus.groovy.grails.commons
-import org.grails.core.artefact.UrlMappingsArtefactHandler
+import grails.web.mapping.artefact.UrlMappingsArtefactHandler
import org.springframework.core.io.ByteArrayResource
/**
View
2  ...test/groovy/org/codehaus/groovy/grails/validation/ConstraintsEvaluatingPropertyTests.java
@@ -12,7 +12,7 @@
import junit.framework.TestCase;
import org.grails.test.support.MockHibernatePluginHelper;
-import org.grails.core.DefaultGrailsDomainClass;
+import org.grails.core.artefact.DefaultGrailsDomainClass;
import org.grails.plugins.MockGrailsPluginManager;
public class ConstraintsEvaluatingPropertyTests extends TestCase {
View
2  grails-test-suite-web/src/test/groovy/org/grails/web/taglib/JavascriptTagLibTests.groovy
@@ -1,7 +1,7 @@
package org.grails.web.taglib
import grails.util.GrailsUtil
-import org.grails.core.artefact.UrlMappingsArtefactHandler
+import grails.web.mapping.artefact.UrlMappingsArtefactHandler
import org.grails.plugins.web.taglib.JavascriptProvider
import org.grails.plugins.web.taglib.JavascriptTagLib
import org.grails.core.io.MockStringResourceLoader
View
2  grails-test-suite-web/src/test/groovy/org/grails/web/taglib/LinkRenderingTagLib2Tests.groovy
@@ -1,6 +1,6 @@
package org.grails.web.taglib
-import org.grails.core.artefact.UrlMappingsArtefactHandler
+import grails.web.mapping.artefact.UrlMappingsArtefactHandler
class LinkRenderingTagLib2Tests extends AbstractGrailsTagTests {
View
2  grails-test-suite-web/src/test/groovy/org/grails/web/taglib/LinkRenderingTagLibTests.groovy
@@ -1,6 +1,6 @@
package org.grails.web.taglib
-import org.grails.core.artefact.UrlMappingsArtefactHandler
+import grails.web.mapping.artefact.UrlMappingsArtefactHandler
class LinkRenderingTagLibTests extends AbstractGrailsTagTests {
View
2  ...est-suite-web/src/test/groovy/org/grails/web/taglib/NamespacedNamedUrlMappingTests.groovy
@@ -1,6 +1,6 @@
package org.grails.web.taglib
-import org.grails.core.artefact.UrlMappingsArtefactHandler
+import grails.web.mapping.artefact.UrlMappingsArtefactHandler
class NamespacedNamedUrlMappingTests extends AbstractGrailsTagTests {
View
2  ...-suite-web/src/test/groovy/org/grails/web/taglib/OverlappingReverseMappedLinkTests.groovy
@@ -1,6 +1,6 @@
package org.grails.web.taglib
-import org.grails.core.artefact.UrlMappingsArtefactHandler
+import grails.web.mapping.artefact.UrlMappingsArtefactHandler
/**
* Some more tests for the behaviour of reverse linking from mappings.
View
2  grails-test-suite-web/src/test/groovy/org/grails/web/taglib/RenderTagLibTests.groovy
@@ -16,7 +16,7 @@
package org.grails.web.taglib
import grails.util.GrailsUtil
-import org.grails.core.artefact.UrlMappingsArtefactHandler
+import grails.web.mapping.artefact.UrlMappingsArtefactHandler
import org.grails.core.io.MockStringResourceLoader
import org.grails.web.pages.FastStringWriter
import org.grails.web.pages.GroovyPageBinding
View
2  grails-web-gsp-taglib/src/main/groovy/org/grails/web/pages/StandaloneTagLibraryLookup.java
@@ -8,7 +8,7 @@
import java.util.Map;
import java.util.Set;
-import org.grails.core.DefaultGrailsTagLibClass;
+import org.grails.core.artefact.DefaultGrailsTagLibClass;
import grails.core.GrailsTagLibClass;
import org.grails.plugins.web.taglib.RenderTagLib;
import org.grails.plugins.web.taglib.SitemeshTagLib;
View
3  ...y/grails/core/GrailsUrlMappingsClass.java → ...ping/artefact/GrailsUrlMappingsClass.java
@@ -13,8 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package grails.core;
+package grails.web.mapping.artefact;
+import grails.core.GrailsClass;
import groovy.lang.Closure;
import java.util.List;
View
5 .../artefact/UrlMappingsArtefactHandler.java → .../artefact/UrlMappingsArtefactHandler.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.core.artefact;
+package grails.web.mapping.artefact;
import grails.core.ArtefactHandlerAdapter;
-import grails.core.GrailsUrlMappingsClass;
-import org.grails.core.DefaultGrailsUrlMappingsClass;
+import org.grails.web.mapping.artefact.DefaultGrailsUrlMappingsClass;
/**
* A handler for UrlMappings.
View
4 ...web-url-mappings/src/main/groovy/org/grails/web/mapping/UrlMappingsHolderFactoryBean.java
@@ -18,7 +18,7 @@
import grails.core.GrailsApplication;
import grails.core.GrailsClass;
import grails.core.GrailsControllerClass;
-import grails.core.GrailsUrlMappingsClass;
+import grails.web.mapping.artefact.GrailsUrlMappingsClass;
import grails.web.mapping.UrlMappings;
import groovy.lang.Script;
@@ -32,7 +32,7 @@
import grails.plugins.GrailsPluginManager;
import grails.plugins.PluginManagerAware;
import grails.core.support.GrailsApplicationAware;
-import org.grails.core.artefact.UrlMappingsArtefactHandler;
+import grails.web.mapping.artefact.UrlMappingsArtefactHandler;
import org.grails.web.mapping.mvc.GrailsControllerUrlMappings;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.FactoryBean;
View
5 ...s/core/DefaultGrailsUrlMappingsClass.java → ...tefact/DefaultGrailsUrlMappingsClass.java
@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.grails.core;
+package org.grails.web.mapping.artefact;
-import grails.core.GrailsUrlMappingsClass;
+import grails.web.mapping.artefact.GrailsUrlMappingsClass;
import groovy.lang.Closure;
+import org.grails.core.AbstractGrailsClass;
import java.util.ArrayList;
import java.util.List;
View
1  grails-web-url-mappings/src/main/resources/META-INF/grails.factories
@@ -0,0 +1 @@
+grails.core.ArtefactHandler=grails.web.mapping.artefact.UrlMappingsArtefactHandler
View
2  grails-web/src/main/resources/META-INF/grails.factories
@@ -1 +1 @@
-org.codehaus.groovy.grails.commons.ArtefactHandler=org.grails.web.servlet.boostrap.BootstrapArtefactHandler
+grails.core.ArtefactHandler=org.grails.web.servlet.boostrap.BootstrapArtefactHandler
Please sign in to comment.
Something went wrong with that request. Please try again.