Author: sdumitriu
Date: 2008-01-08 14:36:28 +0100 (Tue, 08 Jan 2008)
New Revision: 6663
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
Log:
XWIKI-1972: Upgrade to groovy-1.1-rc-1
Rollback the 1.2 branch
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
2008-01-08 11:16:24 UTC (rev 6662)
+++
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
2008-01-08 13:36:28 UTC (rev 6663)
@@ -42,7 +42,6 @@
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import org.codehaus.groovy.runtime.DefaultGroovyStaticMethods;
import org.codehaus.groovy.runtime.InvokerHelper;
-import org.codehaus.groovy.runtime.metaclass.MetaClassRegistryImpl;
import java.beans.Introspector;
import java.io.BufferedReader;
@@ -332,9 +331,9 @@
public static void flushCache()
{
// Clear up groovy registry
- MetaClassRegistry mcr = MetaClassRegistryImpl.getInstance(0);
+ MetaClassRegistry mcr = MetaClassRegistry.getIntance(0);
clearMetaClassRegistry(mcr);
- mcr = MetaClassRegistryImpl.getInstance(1);
+ mcr = MetaClassRegistry.getIntance(1);
clearMetaClassRegistry(mcr);
mcr = InvokerHelper.getInstance().getMetaRegistry();
clearMetaClassRegistry(mcr);
@@ -344,9 +343,9 @@
public static void removeClass(Class clazz)
{
// Clear up groovy registry
- MetaClassRegistry mcr = MetaClassRegistryImpl.getInstance(0);
+ MetaClassRegistry mcr = MetaClassRegistry.getIntance(0);
mcr.removeMetaClass(clazz);
- mcr = MetaClassRegistryImpl.getInstance(1);
+ mcr = MetaClassRegistry.getIntance(1);
mcr.removeMetaClass(clazz);
mcr = InvokerHelper.getInstance().getMetaRegistry();
mcr.removeMetaClass(clazz);
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
