Author: sdumitriu
Date: 2008-01-11 18:28:47 +0100 (Fri, 11 Jan 2008)
New Revision: 6782
Modified:
xwiki-platform/core/trunk/xwiki-core/pom.xml
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
Log:
XWIKI-1972: Upgrade to groovy-1.1-rc-1
Roolback on trunk, too, until we can fix a flushCache exception.
[misc] Remove a stack trace that appears when running the tests.
Modified: xwiki-platform/core/trunk/xwiki-core/pom.xml
===================================================================
--- xwiki-platform/core/trunk/xwiki-core/pom.xml 2008-01-11 14:01:44 UTC
(rev 6781)
+++ xwiki-platform/core/trunk/xwiki-core/pom.xml 2008-01-11 17:28:47 UTC
(rev 6782)
@@ -361,8 +361,8 @@
</dependency>
<dependency>
<groupId>groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>1.1-rc-1</version>
+ <artifactId>groovy-all-1.0-jsr</artifactId>
+ <version>06</version>
</dependency>
<dependency>
<groupId>picocontainer</groupId>
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
2008-01-11 14:01:44 UTC (rev 6781)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
2008-01-11 17:28:47 UTC (rev 6782)
@@ -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);
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
2008-01-11 14:01:44 UTC (rev 6781)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
2008-01-11 17:28:47 UTC (rev 6782)
@@ -80,7 +80,7 @@
try {
setHibUrl(XWiki.class.getClassLoader().getResource(path));
} catch (Exception ex2) {
- log.error("Failed setting the Hibernate configuration file
with any method, storage cannot be configured", ex2);
+ log.error("Failed setting the Hibernate configuration file
with any method, storage cannot be configured");
}
}
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
