fix for failing test, changed some references to Invoker to use GroovySystem.metaClassRegistry instead

git-svn-id: https://svn.codehaus.org/grails/trunk@6277 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/commons/org/codehaus/groovy/grails/commons/GrailsMetaClassUtils.java

@@ -17,7 +17,6 @@
 import groovy.lang.*;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.codehaus.groovy.runtime.InvokerHelper;
 import org.codehaus.groovy.runtime.metaclass.ThreadManagedMetaBeanProperty;
 import org.springframework.beans.BeanUtils;
 
@@ -45,7 +44,7 @@ public class GrailsMetaClassUtils {
      * @return The registry
      */
     public static MetaClassRegistry getRegistry() {
-        return InvokerHelper.getInstance().getMetaRegistry();
+        return GroovySystem.getMetaClassRegistry();
     }
 
     /**

src/commons/org/codehaus/groovy/grails/commons/metaclass/ProxyMetaClass.java

@@ -14,8 +14,6 @@
  */
 package org.codehaus.groovy.grails.commons.metaclass;
 
-import org.codehaus.groovy.runtime.InvokerHelper;
-
 import groovy.lang.*;
 
 import java.beans.IntrospectionException;
@@ -60,7 +58,7 @@ public void setAdaptee(MetaClass adaptee) {
      * @throws java.beans.IntrospectionException When the class canot be introspected
      */
     public static ProxyMetaClass getInstance(Class theClass) throws IntrospectionException {
-        MetaClassRegistry metaRegistry = InvokerHelper.getInstance().getMetaRegistry();
+        MetaClassRegistry metaRegistry = GroovySystem.getMetaClassRegistry();
         MetaClass meta = metaRegistry.getMetaClass(theClass);
         ProxyMetaClass pmc =  new ProxyMetaClass(metaRegistry, theClass, meta);
         pmc.initialize();

src/persistence/org/codehaus/groovy/grails/orm/hibernate/GrailsHibernateDomainClass.java

@@ -14,6 +14,7 @@
  */
 package org.codehaus.groovy.grails.orm.hibernate;
 
+import groovy.lang.GroovySystem;
 import groovy.lang.MetaClass;
 import groovy.lang.MetaClassRegistry;
 import org.apache.commons.logging.Log;
@@ -27,7 +28,6 @@
 import org.codehaus.groovy.grails.commons.metaclass.ProxyMetaClass;
 import org.codehaus.groovy.grails.validation.GrailsDomainClassValidator;
 import org.codehaus.groovy.grails.validation.metaclass.ConstraintsEvaluatingDynamicProperty;
-import org.codehaus.groovy.runtime.InvokerHelper;
 import org.hibernate.EntityMode;
 import org.hibernate.MappingException;
 import org.hibernate.SessionFactory;
@@ -155,7 +155,7 @@ private void evaluateConstraints() {
 		};
 
 		interceptor.addDynamicProperty(new ConstraintsEvaluatingDynamicProperty());
-		MetaClassRegistry metaRegistry = InvokerHelper.getInstance().getMetaRegistry();
+		MetaClassRegistry metaRegistry = GroovySystem.getMetaClassRegistry();
 		MetaClass meta = metaRegistry.getMetaClass(instance.getClass());
 
 		try {

src/web/org/codehaus/groovy/grails/web/binding/GrailsDataBinder.java

@@ -263,10 +263,8 @@ protected void autoCreateIfPossible(MutablePropertyValues mpvs) {
                     if(bean.getPropertyValue(propertyName) == null) {
                         if(bean.isWritableProperty(propertyName)) {
                             try {
-                                MetaClass mc = InvokerHelper
-                                                    .getInstance()
-                                                    .getMetaRegistry()
-                                                    .getMetaClass(type);
+                                MetaClass mc = GroovySystem.getMetaClassRegistry()
+                                                             .getMetaClass(type);
                                 if(mc!=null) {
                                     Object created = mc.invokeStaticMethod(type,CreateDynamicMethod.METHOD_NAME, new Object[0]);
                                     bean.setPropertyValue(propertyName,created);

test/commons/org/codehaus/groovy/grails/validation/ConstraintsEvaluatingPropertyTests.java

@@ -3,6 +3,7 @@
 import groovy.lang.GroovyClassLoader;
 import junit.framework.TestCase;
 import org.codehaus.groovy.grails.commons.DefaultGrailsDomainClass;
+import org.codehaus.groovy.grails.commons.GrailsDomainClass;
 import org.codehaus.groovy.grails.validation.metaclass.ConstraintsEvaluatingDynamicProperty;
 
 import java.util.Collection;
@@ -17,10 +18,14 @@ public void testGet() throws Exception {
         GroovyClassLoader gcl = new GroovyClassLoader();
         Class groovyClass = gcl.parseClass("package org.codehaus.groovy.grails.validation\n" +
                 "class Test {\n" +
+                "   Long id\n"+  // WE NEED this even though GORM 2 doesn't, as we're not a "domain" class within grails-app
+                "   Long version\n"+ // WE NEED this even though GORM 2 doesn't, as we're not a "domain" class within grails-app
                 " String name\n" +
                 "}");
 
-        ConstraintsEvaluatingDynamicProperty cp = new ConstraintsEvaluatingDynamicProperty();
+        GrailsDomainClass domainClass = new DefaultGrailsDomainClass(groovyClass);
+
+        ConstraintsEvaluatingDynamicProperty cp = new ConstraintsEvaluatingDynamicProperty(domainClass.getPersistentProperties());
 
         Map constraints = (Map)cp.get(groovyClass.newInstance());
 
@@ -138,7 +143,7 @@ public void testInheritedConstraints() throws Exception {
                 "      name( size:5..20)\n" +
                 "   }" +
                 "}";
-        ensureConstraintsPresent(new String[] { classSource, descendentSource}, 1, 3); // Must have nullable and validator
+        ensureConstraintsPresent(new String[] { classSource, descendentSource}, 1, 2); // Must have nullable and validator
     }
 
     private void ensureConstraintsPresent(String[] classSource, int classIndexToTest, int constraintCount)