r1078 - in xwiki/trunk: . src/main/java/com/xpn/xwiki src/main/java/com/xpn/xwiki/cache/impl src/main/java/com/xpn/xwiki/render/groovy src/main/web/WEB-INF src/test/java/com/xpn/xwiki/test src/test/resources
Ludovic Dubost
ludovic at users.forge.objectweb.org
Thu Jun 1 13:31:33 CEST 2006
Author: ludovic
Date: 2006-06-01 13:31:32 +0200 (Thu, 01 Jun 2006)
New Revision: 1078
Added:
xwiki/trunk/src/test/resources/oscache-local.properties
xwiki/trunk/src/test/resources/oscache.properties
Modified:
xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/XWikiGroovyRenderer.java
xwiki/trunk/src/main/web/WEB-INF/oscache.properties
xwiki/trunk/src/test/java/com/xpn/xwiki/test/GroovyRenderTest.java
xwiki/trunk/xwiki.ipr
xwiki/trunk/xwiki.iws
Log:
Allow to read oscache.properties from test directory
Default oscache to not cluster
Modify groovy evaluation to not leave scripts in MetaClassRegistry to not have a memory leak
Implement Groovy test to measure memory leak
Cleanup imports in XWiki.java
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-05-30 04:21:55 UTC (rev 1077)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-06-01 11:31:32 UTC (rev 1078)
@@ -35,7 +35,6 @@
import com.xpn.xwiki.api.Document;
import com.xpn.xwiki.api.User;
import com.xpn.xwiki.cache.api.XWikiCacheService;
-import com.xpn.xwiki.cache.api.XWikiCacheNeedsRefreshException;
import com.xpn.xwiki.cache.impl.OSCacheService;
import com.xpn.xwiki.cache.impl.XWikiCacheListener;
import com.xpn.xwiki.doc.XWikiAttachment;
@@ -85,7 +84,6 @@
import org.securityfilter.filter.URLPatternMatcher;
import org.exoplatform.container.RootContainer;
import org.exoplatform.container.PortalContainer;
-import org.codehaus.groovy.control.CompilationFailedException;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -102,11 +100,9 @@
import java.net.URLEncoder;
import java.text.DateFormatSymbols;
import java.text.SimpleDateFormat;
-import java.text.NumberFormat;
import java.util.*;
import java.util.zip.ZipOutputStream;
-import groovy.lang.GroovyClassLoader;
public class XWiki implements XWikiDocChangeNotificationInterface, XWikiInterface {
private static final Log log = LogFactory.getLog(XWiki.class);
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java 2006-05-30 04:21:55 UTC (rev 1077)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java 2006-06-01 11:31:32 UTC (rev 1078)
@@ -1,6 +1,8 @@
package com.xpn.xwiki.cache.impl;
import java.io.InputStream;
+import java.io.File;
+import java.io.FileInputStream;
import java.lang.ref.WeakReference;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -51,8 +53,9 @@
public class OSCacheService implements XWikiCacheService, Runnable
{
private static final Log log = LogFactory.getLog(OSCacheService.class);
- private static final String PROPS_FILENAME = "/WEB-INF/oscache.properties";
- private static final String LOCAL_PROPS_FILENAME = "/WEB-INF/oscache-local.properties";
+ private static final String PROPS_FILENAME = "oscache.properties";
+ private static final String LOCAL_PROPS_FILENAME = "oscache-local.properties";
+ private static final String PROPS_PATH = "/WEB-INF/";
private XWiki xwiki;
private Properties cacheProperties;
@@ -134,7 +137,11 @@
try
{
- is = xwiki.getResourceAsStream(propertiesFilename);
+ File f = new File(propertiesFilename);
+ if (f.exists())
+ is = new FileInputStream(f);
+ else
+ is = xwiki.getResourceAsStream(PROPS_PATH + propertiesFilename);
props.load(is);
log.info("Properties loaded: " + propertiesFilename);
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java 2006-05-30 04:21:55 UTC (rev 1077)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java 2006-06-01 11:31:32 UTC (rev 1078)
@@ -50,6 +50,7 @@
import java.io.StringWriter;
import java.io.Writer;
import java.util.Map;
+import java.util.HashMap;
import org.codehaus.groovy.control.CompilationFailedException;
import org.codehaus.groovy.runtime.InvokerHelper;
@@ -68,11 +69,11 @@
* @see groovy.util.TemplateEngine#createTemplate(java.io.Reader)
*/
public Template createTemplate(Reader reader) throws CompilationFailedException, ClassNotFoundException, IOException {
- com.xpn.xwiki.render.groovy.GroovyTemplateEngine.SimpleTemplate template = new com.xpn.xwiki.render.groovy.GroovyTemplateEngine.SimpleTemplate();
- GroovyShell shell = new GroovyShell();
- String script = template.parse(reader);
- template.script = shell.parse(script);
- return template;
+ com.xpn.xwiki.render.groovy.GroovyTemplateEngine.SimpleTemplate template = new com.xpn.xwiki.render.groovy.GroovyTemplateEngine.SimpleTemplate();
+ GroovyShell shell = new GroovyShell();
+ String script = template.parse(reader);
+ template.script = shell.parse(script);
+ return template;
}
private static class SimpleTemplate implements Template {
@@ -81,6 +82,13 @@
private Binding binding;
private Map map;
+
+ public void finalize()
+ {
+ if (script!=null)
+ InvokerHelper.removeClass(script.getClass());
+ }
+
/**
* Set the binding for the template. Keys will be converted to Strings.
*
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/XWikiGroovyRenderer.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/XWikiGroovyRenderer.java 2006-05-30 04:21:55 UTC (rev 1077)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/XWikiGroovyRenderer.java 2006-06-01 11:31:32 UTC (rev 1078)
@@ -37,6 +37,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.codehaus.groovy.runtime.InvokerHelper;
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
@@ -90,7 +91,12 @@
return gcontext;
}
- private void prepareCache(XWikiContext context) {
+ public void initCache(XWikiContext context) {
+ cache = context.getWiki().getCacheService().newCache(100);
+ classCache = context.getWiki().getCacheService().newCache(100);
+ }
+
+ protected void prepareCache(XWikiContext context) {
if (cache==null) {
cache = context.getWiki().getCacheService().newCache(100);
}
@@ -117,10 +123,10 @@
template = (Template) cache.getFromCache(content);
}
} catch (XWikiCacheNeedsRefreshException e) {
+ cache.cancelUpdate(content);
template = engine.createTemplate(content);
cache.putInCache(content, template);
} finally {
- cache.cancelUpdate(content);
}
Writable writable = template.make(gcontext);
String result = writable.toString();
@@ -250,18 +256,20 @@
public Object parseGroovyFromString(String script, XWikiContext context) throws XWikiException {
prepareCache(context);
try {
+ CachedGroovyClass cgc;
Class gc;
try {
- gc = (Class) classCache.getFromCache(script);
+ cgc = (CachedGroovyClass) classCache.getFromCache(script);
+ gc = cgc.getGroovyClass();
}
catch (XWikiCacheNeedsRefreshException e) {
GroovyClassLoader gcl = new GroovyClassLoader();
gc = gcl.parseClass(script);
- classCache.putInCache(script, gc);
+ cgc = new CachedGroovyClass(gc);
+ classCache.putInCache(script, cgc);
} finally {
classCache.cancelUpdate(script);
}
-
return gc.newInstance();
} catch (Exception e) {
throw new XWikiException(XWikiException.MODULE_XWIKI_GROOVY,
@@ -269,4 +277,21 @@
"Failed compiling groovy script", e);
}
}
+
+ private class CachedGroovyClass {
+ protected Class cl;
+
+ public CachedGroovyClass(Class cl) {
+ this.cl = cl;
+ }
+
+ public Class getGroovyClass() {
+ return cl;
+ }
+
+ public void finalize() {
+ if (cl!=null)
+ InvokerHelper.removeClass(cl);
+ }
+ }
}
Modified: xwiki/trunk/src/main/web/WEB-INF/oscache.properties
===================================================================
--- xwiki/trunk/src/main/web/WEB-INF/oscache.properties 2006-05-30 04:21:55 UTC (rev 1077)
+++ xwiki/trunk/src/main/web/WEB-INF/oscache.properties 2006-06-01 11:31:32 UTC (rev 1078)
@@ -40,8 +40,7 @@
# com.opensymphony.oscache.extra.ScopeEventListenerImpl
# uncomment this to enable clustering
-#
-cache.event.listeners=com.opensymphony.oscache.plugins.clustersupport.JavaGroupsBroadcastingListener,com.xpn.xwiki.cache.impl.XWikiCacheListener
+#cache.event.listeners=com.opensymphony.oscache.plugins.clustersupport.JavaGroupsBroadcastingListener,com.xpn.xwiki.cache.impl.XWikiCacheListener
# CACHE PERSISTENCE CLASS
#
Modified: xwiki/trunk/src/test/java/com/xpn/xwiki/test/GroovyRenderTest.java
===================================================================
--- xwiki/trunk/src/test/java/com/xpn/xwiki/test/GroovyRenderTest.java 2006-05-30 04:21:55 UTC (rev 1077)
+++ xwiki/trunk/src/test/java/com/xpn/xwiki/test/GroovyRenderTest.java 2006-06-01 11:31:32 UTC (rev 1078)
@@ -23,12 +23,17 @@
package com.xpn.xwiki.test;
import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.XWiki;
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.render.XWikiRenderer;
import com.xpn.xwiki.render.XWikiRenderingEngine;
import com.xpn.xwiki.render.groovy.XWikiGroovyRenderer;
import com.xpn.xwiki.store.XWikiStoreInterface;
+import groovy.lang.MetaClassRegistry;
+import java.util.Map;
+
public class GroovyRenderTest extends HibernateTestCase {
public void testBasics() throws XWikiException {
@@ -65,6 +70,77 @@
AbstractRenderTest.renderTest(wikiengine, doc2, "IncludeTest", false, getXWikiContext());
}
+ public void cleanMem() {
+ Runtime rt = Runtime.getRuntime();
+ for (int i=0;i<5;i++) {
+ rt.gc();
+ rt.runFinalization();
+ rt.gc();
+ }
+}
+ public void testMemory() throws Exception {
+ XWikiRenderingEngine wikiengine = xwiki.getRenderingEngine();
+ getXWiki().setRightService(new GroovyTestRightService());
+ ((XWikiGroovyRenderer)wikiengine.getRenderer("groovy")).initCache(context);
+ int nbrenders = 500;
+ int nbtotal = 20;
+ String function = "def add(int a, int b) { c=0;\n";
+ for (int i=0;i<nbtotal;i++) {
+ function += "c = a+b+c;\n";
+ }
+ function += "return c }\n";
+
+ Runtime rt = Runtime.getRuntime();
+
+ // Make sure we load all stuff in memory
+ for (int i=0;i<10;i++) {
+ AbstractRenderTest.renderTest(wikiengine, "<% " + function + "println add(1,1)\n %>",
+ "" + (nbtotal*2), false, getXWikiContext());
+ }
+
+ ((XWikiGroovyRenderer)wikiengine.getRenderer("groovy")).initCache(context);
+ cleanMem();
+
+ long totalmem = rt.totalMemory();
+ long freemem = rt.freeMemory();
+ long overhead1 = totalmem - freemem;
+
+ System.out.println("Total: " + totalmem + " Free: " + freemem + " Overhead: " + overhead1);
+
+ for (int i=0;i<nbrenders;i++) {
+ AbstractRenderTest.renderTest(wikiengine, "<% " + function + "println add(1,1)\n %>",
+ "" + (nbtotal*2), false, getXWikiContext());
+ }
+
+ ((XWikiGroovyRenderer)wikiengine.getRenderer("groovy")).initCache(context);
+ cleanMem();
+
+ totalmem = rt.totalMemory();
+ freemem = rt.freeMemory();
+ long overhead2 = totalmem - freemem;
+
+ System.out.println("Total: " + totalmem + " Free: " + freemem + " Overhead: " + overhead2);
+ assertTrue("Memory consuption is too high: " + (overhead2-overhead1), (overhead2-overhead1) < 2000000);
+
+ for (int i=0;i<nbrenders;i++) {
+ AbstractRenderTest.renderTest(wikiengine, "<% " + function + "println add(" + i + ",1)\n %>",
+ "" + (nbtotal*(i+1)), false, getXWikiContext());
+ MetaClassRegistry mcr = MetaClassRegistry.getIntance(0);
+ Map map = (Map) XWiki.getPrivateField(mcr, "metaClasses");
+ System.out.println("Map size: " + map.size());
+ }
+
+ ((XWikiGroovyRenderer)wikiengine.getRenderer("groovy")).initCache(context);
+ cleanMem();
+
+ totalmem = rt.totalMemory();
+ freemem = rt.freeMemory();
+ long overhead3 = totalmem - freemem;
+
+ System.out.println("Total: " + totalmem + " Free: " + freemem + " Overhead: " + overhead3);
+ assertTrue("Memory consuption is too high: " + (overhead3-overhead2), (overhead3-overhead2) < 2000000);
+ }
+
/*
TODO: This fail is known to test
public void testWithFunctionInclude() throws Exception {
Added: xwiki/trunk/src/test/resources/oscache-local.properties
===================================================================
--- xwiki/trunk/src/test/resources/oscache-local.properties 2006-05-30 04:21:55 UTC (rev 1077)
+++ xwiki/trunk/src/test/resources/oscache-local.properties 2006-06-01 11:31:32 UTC (rev 1078)
@@ -0,0 +1,116 @@
+# This property file configures local-only caches
+# Clustered cache settings should be done in oscache.properties
+
+
+# CACHE IN MEMORY
+# If you want to disable memory caching, just uncomment this line.
+# cache.memory=false
+
+
+# CACHE KEY
+#
+# This is the key that will be used to store the cache in the application
+# and session scope.
+#
+# If you want to set the cache key to anything other than the default
+# uncomment this line and change the cache.key
+#
+cache.key=XWiki-Local
+
+
+# USE HOST DOMAIN NAME IN KEY
+#
+# Servers for multiple host domains may wish to add host name info to
+# the generation of the key. If this is true, then uncomment the
+# following line.
+#
+# cache.use.host.domain.in.key=true
+
+
+# CACHE LISTENERS
+#
+# These hook OSCache events and perform various actions such as logging
+# cache hits and misses, or broadcasting to other cache instances across a cluster.
+# See the documentation for further information.
+#
+# cache.event.listeners=com.opensymphony.oscache.plugins.clustersupport.JMSBroadcastingListener, \
+# com.opensymphony.oscache.extra.CacheEntryEventListenerImpl, \
+# com.opensymphony.oscache.extra.CacheMapAccessEventListenerImpl, \
+# com.opensymphony.oscache.extra.ScopeEventListenerImpl
+
+
+# CACHE PERSISTENCE CLASS
+#
+# Specify the class to use for persistence. If you use the supplied DiskPersistenceListener,
+# don't forget to supply the cache.path property to specify the location of the cache
+# directory.
+#
+# If a persistence class is not specified, OSCache will use memory caching only.
+#
+# cache.persistence.class=com.opensymphony.oscache.plugins.diskpersistence.DiskPersistenceListener
+
+# CACHE OVERFLOW PERSISTENCE
+# Use persistent cache in overflow or not. The default value is false, which means
+# the persistent cache will be used at all times for every entry. true is the recommended setting.
+#
+# cache.persistence.overflow.only=true
+
+# CACHE DIRECTORY
+#
+# This is the directory on disk where caches will be stored by the DiskPersistenceListener.
+# it will be created if it doesn't already exist. Remember that OSCache must have
+# write permission to this directory.
+#
+# Note: for Windows machines, this needs \ to be escaped
+# ie Windows:
+# cache.path=c:\\myapp\\cache
+# or *ix:
+# cache.path=/opt/myapp/cache
+#
+# cache.path=c:\\app\\cache
+
+
+# CACHE ALGORITHM
+#
+# Default cache algorithm to use. Note that in order to use an algorithm
+# the cache size must also be specified. If the cache size is not specified,
+# the cache algorithm will be Unlimited cache.
+#
+# cache.algorithm=com.opensymphony.oscache.base.algorithm.LRUCache
+# cache.algorithm=com.opensymphony.oscache.base.algorithm.FIFOCache
+# cache.algorithm=com.opensymphony.oscache.base.algorithm.UnlimitedCache
+
+# THREAD BLOCKING BEHAVIOR
+#
+# When a request is made for a stale cache entry, it is possible that another thread is already
+# in the process of rebuilding that entry. This setting specifies how OSCache handles the
+# subsequent 'non-building' threads. The default behaviour (cache.blocking=false) is to serve
+# the old content to subsequent threads until the cache entry has been updated. This provides
+# the best performance (at the cost of serving slightly stale data). When blocking is enabled,
+# threads will instead block until the new cache entry is ready to be served. Once the new entry
+# is put in the cache the blocked threads will be restarted and given the new entry.
+# Note that even if blocking is disabled, when there is no stale data available to be served
+# threads will block until the data is added to the cache by the thread that is responsible
+# for building the data.
+#
+# cache.blocking=false
+
+# CACHE SIZE
+#
+# Default cache size in number of items. If a size is specified but not
+# an algorithm, the cache algorithm used will be LRUCache.
+#
+cache.capacity=100000
+
+
+# CACHE UNLIMITED DISK
+# Use unlimited disk cache or not. The default value is false, which means
+# the disk cache will be limited in size to the value specified by cache.capacity.
+#
+# cache.unlimited.disk=false
+
+
+# JMS CLUSTER PROPERTIES
+# This cache is for non clustered caches only, cluster settings should be done in oscache-clustered.properties
+
+
Added: xwiki/trunk/src/test/resources/oscache.properties
===================================================================
--- xwiki/trunk/src/test/resources/oscache.properties 2006-05-30 04:21:55 UTC (rev 1077)
+++ xwiki/trunk/src/test/resources/oscache.properties 2006-06-01 11:31:32 UTC (rev 1078)
@@ -0,0 +1,143 @@
+# This property file configures caches that could be cluster enabled
+# Local-only cache settings should be done in oscache-local.properties
+# Uncomment cache.event.listeners to enable clustering
+
+# CACHE IN MEMORY
+# If you want to disable memory caching, just uncomment this line.
+# cache.memory=false
+
+
+# CACHE KEY
+#
+# This is the key that will be used to store the cache in the application
+# and session scope.
+#
+# If you want to set the cache key to anything other than the default
+# uncomment this line and change the cache.key
+#
+#
+cache.key=XWiki
+
+
+# USE HOST DOMAIN NAME IN KEY
+#
+# Servers for multiple host domains may wish to add host name info to
+# the generation of the key. If this is true, then uncomment the
+# following line.
+#
+# cache.use.host.domain.in.key=true
+
+
+# CACHE LISTENERS
+#
+# These hook OSCache events and perform various actions such as logging
+# cache hits and misses, or broadcasting to other cache instances across a cluster.
+# See the documentation for further information.
+#
+# cache.event.listeners=com.opensymphony.oscache.plugins.clustersupport.JMSBroadcastingListener, \
+# com.opensymphony.oscache.extra.CacheEntryEventListenerImpl, \
+# com.opensymphony.oscache.extra.CacheMapAccessEventListenerImpl, \
+# com.opensymphony.oscache.extra.ScopeEventListenerImpl
+
+# uncomment this to enable clustering
+# cache.event.listeners=com.opensymphony.oscache.plugins.clustersupport.JavaGroupsBroadcastingListener,com.xpn.xwiki.cache.impl.XWikiCacheListener
+
+# CACHE PERSISTENCE CLASS
+#
+# Specify the class to use for persistence. If you use the supplied DiskPersistenceListener,
+# don't forget to supply the cache.path property to specify the location of the cache
+# directory.
+#
+# If a persistence class is not specified, OSCache will use memory caching only.
+#
+# cache.persistence.class=com.opensymphony.oscache.plugins.diskpersistence.DiskPersistenceListener
+
+# CACHE OVERFLOW PERSISTENCE
+# Use persistent cache in overflow or not. The default value is false, which means
+# the persistent cache will be used at all times for every entry. true is the recommended setting.
+#
+# cache.persistence.overflow.only=true
+
+# CACHE DIRECTORY
+#
+# This is the directory on disk where caches will be stored by the DiskPersistenceListener.
+# it will be created if it doesn't already exist. Remember that OSCache must have
+# write permission to this directory.
+#
+# Note: for Windows machines, this needs \ to be escaped
+# ie Windows:
+# cache.path=c:\\myapp\\cache
+# or *ix:
+# cache.path=/opt/myapp/cache
+#
+# cache.path=c:\\app\\cache
+
+
+# CACHE ALGORITHM
+#
+# Default cache algorithm to use. Note that in order to use an algorithm
+# the cache size must also be specified. If the cache size is not specified,
+# the cache algorithm will be Unlimited cache.
+#
+# cache.algorithm=com.opensymphony.oscache.base.algorithm.LRUCache
+# cache.algorithm=com.opensymphony.oscache.base.algorithm.FIFOCache
+# cache.algorithm=com.opensymphony.oscache.base.algorithm.UnlimitedCache
+
+# THREAD BLOCKING BEHAVIOR
+#
+# When a request is made for a stale cache entry, it is possible that another thread is already
+# in the process of rebuilding that entry. This setting specifies how OSCache handles the
+# subsequent 'non-building' threads. The default behaviour (cache.blocking=false) is to serve
+# the old content to subsequent threads until the cache entry has been updated. This provides
+# the best performance (at the cost of serving slightly stale data). When blocking is enabled,
+# threads will instead block until the new cache entry is ready to be served. Once the new entry
+# is put in the cache the blocked threads will be restarted and given the new entry.
+# Note that even if blocking is disabled, when there is no stale data available to be served
+# threads will block until the data is added to the cache by the thread that is responsible
+# for building the data.
+#
+# cache.blocking=false
+
+# CACHE SIZE
+#
+# Default cache size in number of items. If a size is specified but not
+# an algorithm, the cache algorithm used will be LRUCache.
+#
+cache.capacity=10000
+
+
+# CACHE UNLIMITED DISK
+# Use unlimited disk cache or not. The default value is false, which means
+# the disk cache will be limited in size to the value specified by cache.capacity.
+#
+# cache.unlimited.disk=false
+
+
+# JMS CLUSTER PROPERTIES
+#
+# Configuration properties for JMS clustering. See the clustering documentation
+# for more information on these settings.
+#
+#cache.cluster.jms.topic.factory=java:comp/env/jms/TopicConnectionFactory
+#cache.cluster.jms.topic.name=java:comp/env/jms/OSCacheTopic
+#cache.cluster.jms.node.name=node1
+
+
+# JAVAGROUPS CLUSTER PROPERTIES
+#
+# Configuration properites for the JavaGroups clustering. Only one of these
+# should be specified. Default values (as shown below) will be used if niether
+# property is set. See the clustering documentation and the JavaGroups project
+# (www.javagroups.com) for more information on these settings.
+#
+#cache.cluster.properties=UDP(mcast_addr=231.12.21.132;mcast_port=45566;ip_ttl=32;\
+#mcast_send_buf_size=150000;mcast_recv_buf_size=80000):\
+#PING(timeout=2000;num_initial_members=3):\
+#MERGE2(min_interval=5000;max_interval=10000):\
+#FD_SOCK:VERIFY_SUSPECT(timeout=1500):\
+#pbcast.NAKACK(gc_lag=50;retransmit_timeout=300,600,1200,2400,4800;max_xmit_size=8192):\
+#UNICAST(timeout=300,600,1200,2400):\
+#pbcast.STABLE(desired_avg_gossip=20000):\
+#FRAG(frag_size=8096;down_thread=false;up_thread=false):\
+#pbcast.GMS(join_timeout=5000;join_retry_timeout=2000;shun=false;print_local_addr=true)
+#cache.cluster.multicast.ip=231.12.21.132
Modified: xwiki/trunk/xwiki.ipr
===================================================================
--- xwiki/trunk/xwiki.ipr 2006-05-30 04:21:55 UTC (rev 1077)
+++ xwiki/trunk/xwiki.ipr 2006-06-01 11:31:32 UTC (rev 1078)
@@ -366,7 +366,9 @@
<root url="jar://$PROJECT_DIR$/lib/groovy-all-1.0-jsr-05.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="file://D:/dev/java/groovy/groovy-1.0-jsr-04/src/main" />
+ </SOURCES>
</library>
<library name="fop">
<CLASSES>
Modified: xwiki/trunk/xwiki.iws
===================================================================
--- xwiki/trunk/xwiki.iws 2006-05-30 04:21:55 UTC (rev 1077)
+++ xwiki/trunk/xwiki.iws 2006-06-01 11:31:32 UTC (rev 1078)
@@ -747,91 +747,93 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="OSCacheCache.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java">
+ <file leaf-file-name="XWiki.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="58" column="13" selection-start="2005" selection-end="2005" vertical-scroll-proportion="0.0543131">
+ <state line="53" column="19" selection-start="1805" selection-end="1805" vertical-scroll-proportion="0.46896553">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiAction.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/XWikiAction.java">
+ <file leaf-file-name="XWiki.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="148" column="17" selection-start="5995" selection-end="5995" vertical-scroll-proportion="0.6517572">
- <folding />
+ <state line="484" column="0" selection-start="19821" selection-end="20058" vertical-scroll-proportion="1.0551724">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiMacrosMappingRenderer.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiMacrosMappingRenderer.java">
+ <file leaf-file-name="GroovyTemplateEngine.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="147" column="13" selection-start="5791" selection-end="5791" vertical-scroll-proportion="0.7718121">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="MacroMappingRenderTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/MacroMappingRenderTest.java">
+ <file leaf-file-name="XWikiMacrosMappingRenderer.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiMacrosMappingRenderer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="115" column="20" selection-start="4737" selection-end="4737" vertical-scroll-proportion="0.88590604">
+ <state line="85" column="20" selection-start="3375" selection-end="3666" vertical-scroll-proportion="1.1827586">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="xwiki.cfg" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/xwiki.cfg">
+ <file leaf-file-name="oscache.properties" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/oscache.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="42" selection-start="2155" selection-end="2155" vertical-scroll-proportion="0.68456376">
+ <state line="42" column="1" selection-start="1426" selection-end="1426" vertical-scroll-proportion="0.5275862">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="struts-config.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/struts-config.xml">
+ <file leaf-file-name="PropertyChangedRule.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/PropertyChangedRule.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="331" column="40" selection-start="11110" selection-end="11110" vertical-scroll-proportion="1.4217253">
+ <state line="28" column="54" selection-start="1122" selection-end="1135" vertical-scroll-proportion="0.35172415">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiRequestProcessor.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/XWikiRequestProcessor.java">
+ <file leaf-file-name="DocChangeRule.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/DocChangeRule.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="25" selection-start="1456" selection-end="1456" vertical-scroll-proportion="0.51342285">
+ <state line="51" column="13" selection-start="1755" selection-end="1755" vertical-scroll-proportion="1.2295082">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="StatusAction.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/StatusAction.java">
+ <file leaf-file-name="XWikiPluginManager.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/XWikiPluginManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="37" column="25" selection-start="1420" selection-end="1432" vertical-scroll-proportion="0.22683705">
+ <state line="192" column="0" selection-start="6293" selection-end="6293" vertical-scroll-proportion="1.0586207">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="PlainSocketImpl.class" pinned="false" current="false" current-in-tab="false">
- <entry file="jar://C:/tools/jdk1.5.0_04/jre/lib/rt.jar!/java/net/PlainSocketImpl.class">
+ <file leaf-file-name="XWikiPluginRenderer.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiPluginRenderer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="99" column="0" selection-start="4267" selection-end="4267" vertical-scroll-proportion="0.7013423">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="xwiki.hbm.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/xwiki.hbm.xml">
+ <file leaf-file-name="XWikiGroovyRenderer.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/groovy/XWikiGroovyRenderer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="72" column="36" selection-start="2569" selection-end="2569" vertical-scroll-proportion="0.0543131">
+ <state line="294" column="5" selection-start="10769" selection-end="10769" vertical-scroll-proportion="1.3482759">
<folding />
</state>
</provider>
@@ -947,7 +949,7 @@
</component>
<component name="ModuleEditorState">
<option name="LAST_EDITED_MODULE_NAME" value="xwiki" />
- <option name="LAST_EDITED_TAB_NAME" value="J2EE Build Settings" />
+ <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
</component>
<component name="NamedScopeManager" />
<component name="PackagesPane">
@@ -1012,10 +1014,6 @@
<option name="myItemId" value="xwiki.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1023,200 +1021,10 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\java\com\xpn\xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\java\com\xpn\xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\java\com\xpn\xwiki\web" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="xwiki" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\web" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\web" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\web\WEB-INF" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
@@ -1267,14 +1075,14 @@
<property name="RunManagerConfig.compileBeforeRunning" value="true" />
<property name="cvs_file_history_flatWidth6" value="91" />
<property name="cvs_file_history_flatOrder0" value="0" />
- <property name="cvs_file_history_treeOrder3" value="3" />
<property name="cvs_file_history_treeWidth4" value="141" />
+ <property name="cvs_file_history_treeOrder3" value="3" />
<property name="cvs_file_history_treeWidth6" value="140" />
<property name="last_opened_file_path" value="C:\dev\java\webservices\alexa\com\amazon\api\alexa" />
<property name="cvs_file_history_flatOrder5" value="5" />
<property name="cvs_file_history_flatWidth5" value="92" />
- <property name="cvs_file_history_treeOrder2" value="2" />
<property name="cvs_file_history_treeWidth3" value="141" />
+ <property name="cvs_file_history_treeOrder2" value="2" />
<property name="cvs_file_history_treeWidth5" value="141" />
<property name="cvs_file_history_flatOrder6" value="6" />
<property name="cvs_file_history_flatWidth0" value="140" />
@@ -1345,34 +1153,6 @@
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
</configuration>
- <configuration selected="false" default="true" type="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- </configuration>
- <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
- <module name="xwiki" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
- </configuration>
<configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -1399,19 +1179,21 @@
<option name="ALTERNATIVE_JRE_PATH" />
<module name="" />
</configuration>
- <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local">
- <option name="WORKING_DIRECTORY" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="7001" />
- <option name="LOCAL" value="true" />
- <option name="OPEN_IN_BROWSER" value="true" />
- <option name="OPEN_IN_BROWSER_URL" value="/" />
- <option name="COMMON_VM_ARGUMENTS" value="" />
- <option name="DOMAIN_PATH" value="" />
- <option name="USER" value="weblogic" />
- <option name="PASSWORD" value="weblogic" />
- <option name="SERVER_NAME" value="myserver" />
- <option name="DOMAIN_NAME" value="mydomain" />
+ <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
+ <module name="xwiki" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
</configuration>
<configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
@@ -1463,6 +1245,32 @@
</SHUTDOWN>
</ConfigurationWrapper>
</configuration>
+ <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local">
+ <option name="WORKING_DIRECTORY" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="7001" />
+ <option name="LOCAL" value="true" />
+ <option name="OPEN_IN_BROWSER" value="true" />
+ <option name="OPEN_IN_BROWSER_URL" value="/" />
+ <option name="COMMON_VM_ARGUMENTS" value="" />
+ <option name="DOMAIN_PATH" value="" />
+ <option name="USER" value="weblogic" />
+ <option name="PASSWORD" value="weblogic" />
+ <option name="SERVER_NAME" value="myserver" />
+ <option name="DOMAIN_NAME" value="mydomain" />
+ </configuration>
+ <configuration selected="false" default="true" type="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ </configuration>
<configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -1476,6 +1284,93 @@
<option name="USE_WEBSPHERE51_LINEMAPPING_MODEL" value="false" />
<option name="LOCAL_PORT" value="80" />
</configuration>
+ <configuration selected="true" default="false" name="Tomcat 5" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat">
+ <option name="WORKING_DIRECTORY" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="8080" />
+ <option name="LOCAL" value="true" />
+ <option name="OPEN_IN_BROWSER" value="false" />
+ <option name="OPEN_IN_BROWSER_URL" value="http://127.0.0.1:9080/" />
+ <option name="COMMON_VM_ARGUMENTS" value="-Dfile.encoding=iso-8859-1 -Xmx300m" />
+ <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="jar">
+ <option name="CONTEXT_PATH" value="/xwiki" />
+ <option name="MODULE_NAME" value="xwiki" />
+ <option name="DEPLOY" value="true" />
+ </J2EE_MODULE>
+ <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="3515" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
+ <RunnerSettings RunnerId="Profile ">
+ <option name="myStartupWithAllocations" value="false" />
+ <option name="myCPUStartup" value="" />
+ <option name="myUsedMemoryThreshold" value="0" />
+ <option name="myDontLaunchUI" value="false" />
+ <option name="myCaptureMemoryOnExit" value="false" />
+ <option name="myCaptureCPUOnExit" value="false" />
+ <option name="mySnapshotsDir" value="" />
+ <option name="myForceJVMTI" value="false" />
+ <option name="myDisableAlloc" value="false" />
+ <option name="myDisableCounts" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
+ <option name="USE_ENV_VARIABLES" value="true" />
+ <STARTUP>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT" value="C:\bin\catalina.bat" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" run" />
+ </STARTUP>
+ <SHUTDOWN>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT" value="C:\bin\catalina.bat" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" stop" />
+ </SHUTDOWN>
+ <EnvironmentVariables>
+ <option name="NAME" value="LANG" />
+ <option name="VALUE" value="fr_FR.ISO-8859-1" />
+ <option name="IS_PREDEFINED" value="false" />
+ </EnvironmentVariables>
+ </ConfigurationWrapper>
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
+ <option name="USE_ENV_VARIABLES" value="true" />
+ <STARTUP>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT" value="C:\bin\catalina.bat" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" run" />
+ </STARTUP>
+ <SHUTDOWN>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT" value="C:\bin\catalina.bat" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" stop" />
+ </SHUTDOWN>
+ <EnvironmentVariables>
+ <option name="NAME" value="LANG" />
+ <option name="VALUE" value="fr_FR.ISO-8859-1" />
+ <option name="IS_PREDEFINED" value="false" />
+ </EnvironmentVariables>
+ </ConfigurationWrapper>
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
+ <option name="USE_ENV_VARIABLES" value="true" />
+ <STARTUP>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT" value="C:\Program Files\Apache Software Foundation\Tomcat 5.0\bin\catalina.bat" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" run" />
+ </STARTUP>
+ <SHUTDOWN>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT" value="C:\Program Files\Apache Software Foundation\Tomcat 5.0\bin\catalina.bat" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" stop" />
+ </SHUTDOWN>
+ </ConfigurationWrapper>
+ </configuration>
<configuration selected="true" default="false" name="Groovy Export" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="groovy.lang.GroovyShell" />
<option name="VM_PARAMETERS" value="" />
@@ -1499,6 +1394,31 @@
</RunnerSettings>
<ConfigurationWrapper RunnerId="Run" />
</configuration>
+ <configuration selected="true" default="false" name="XWiki.com" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="lanai.xpertnet.biz" />
+ <option name="PORT" value="5005" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="1409" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <RunnerSettings RunnerId="Profile ">
+ <option name="myStartupWithAllocations" value="false" />
+ <option name="myCPUStartup" value="" />
+ <option name="myUsedMemoryThreshold" value="0" />
+ <option name="myDontLaunchUI" value="false" />
+ <option name="myCaptureMemoryOnExit" value="false" />
+ <option name="myCaptureCPUOnExit" value="false" />
+ <option name="mySnapshotsDir" value="" />
+ <option name="myForceJVMTI" value="false" />
+ <option name="myDisableAlloc" value="false" />
+ <option name="myDisableCounts" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Debug" />
+ </configuration>
<configuration selected="false" default="false" name="UtilTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1944,7 +1864,7 @@
<option name="myDisableCounts" value="false" />
</RunnerSettings>
</configuration>
- <configuration selected="true" default="false" name="BackLinksSimpleTest" type="JUnit" factoryName="JUnit">
+ <configuration selected="false" default="false" name="BackLinksSimpleTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -2064,13 +1984,13 @@
<ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
</configuration>
- <configuration selected="false" default="false" name="VelocityRenderTest.testCacheRenderer" type="JUnit" factoryName="JUnit">
+ <configuration selected="true" default="false" name="VelocityRenderTest.testCacheRenderer" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<option name="PACKAGE_NAME" value="com.xpn.xwiki.test" />
- <option name="MAIN_CLASS_NAME" value="com.xpn.xwiki.test.VelocityRenderTest" />
- <option name="METHOD_NAME" value="testCacheRenderer" />
+ <option name="MAIN_CLASS_NAME" value="com.xpn.xwiki.test.GroovyRenderTest" />
+ <option name="METHOD_NAME" value="testMemory" />
<option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" value="" />
<option name="PARAMETERS" value="" />
@@ -2103,6 +2023,7 @@
</RunnerSettings>
<ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
+ <ConfigurationWrapper RunnerId="Profile " />
</configuration>
<configuration selected="false" default="false" name="ServletVirtualTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2382,118 +2303,6 @@
</RunnerSettings>
<ConfigurationWrapper RunnerId="Run" />
</configuration>
- <configuration selected="true" default="false" name="Tomcat 5" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat">
- <option name="WORKING_DIRECTORY" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="8080" />
- <option name="LOCAL" value="true" />
- <option name="OPEN_IN_BROWSER" value="false" />
- <option name="OPEN_IN_BROWSER_URL" value="http://127.0.0.1:9080/" />
- <option name="COMMON_VM_ARGUMENTS" value="-Dfile.encoding=iso-8859-1 -Xmx300m" />
- <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="jar">
- <option name="CONTEXT_PATH" value="/xwiki" />
- <option name="MODULE_NAME" value="xwiki" />
- <option name="DEPLOY" value="true" />
- </J2EE_MODULE>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="3515" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
- <RunnerSettings RunnerId="Profile ">
- <option name="myStartupWithAllocations" value="false" />
- <option name="myCPUStartup" value="" />
- <option name="myUsedMemoryThreshold" value="0" />
- <option name="myDontLaunchUI" value="false" />
- <option name="myCaptureMemoryOnExit" value="false" />
- <option name="myCaptureCPUOnExit" value="false" />
- <option name="mySnapshotsDir" value="" />
- <option name="myForceJVMTI" value="false" />
- <option name="myDisableAlloc" value="false" />
- <option name="myDisableCounts" value="false" />
- </RunnerSettings>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
- <option name="USE_ENV_VARIABLES" value="true" />
- <STARTUP>
- <option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="C:\bin\catalina.bat" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value=" run" />
- </STARTUP>
- <SHUTDOWN>
- <option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="C:\bin\catalina.bat" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value=" stop" />
- </SHUTDOWN>
- <EnvironmentVariables>
- <option name="NAME" value="LANG" />
- <option name="VALUE" value="fr_FR.ISO-8859-1" />
- <option name="IS_PREDEFINED" value="false" />
- </EnvironmentVariables>
- </ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
- <option name="USE_ENV_VARIABLES" value="true" />
- <STARTUP>
- <option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="C:\bin\catalina.bat" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value=" run" />
- </STARTUP>
- <SHUTDOWN>
- <option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="C:\bin\catalina.bat" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value=" stop" />
- </SHUTDOWN>
- <EnvironmentVariables>
- <option name="NAME" value="LANG" />
- <option name="VALUE" value="fr_FR.ISO-8859-1" />
- <option name="IS_PREDEFINED" value="false" />
- </EnvironmentVariables>
- </ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
- <option name="USE_ENV_VARIABLES" value="true" />
- <STARTUP>
- <option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="C:\Program Files\Apache Software Foundation\Tomcat 5.0\bin\catalina.bat" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value=" run" />
- </STARTUP>
- <SHUTDOWN>
- <option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="C:\Program Files\Apache Software Foundation\Tomcat 5.0\bin\catalina.bat" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value=" stop" />
- </SHUTDOWN>
- </ConfigurationWrapper>
- </configuration>
- <configuration selected="true" default="false" name="XWiki.com" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="lanai.xpertnet.biz" />
- <option name="PORT" value="5005" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1409" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
- <RunnerSettings RunnerId="Profile ">
- <option name="myStartupWithAllocations" value="false" />
- <option name="myCPUStartup" value="" />
- <option name="myUsedMemoryThreshold" value="0" />
- <option name="myDontLaunchUI" value="false" />
- <option name="myCaptureMemoryOnExit" value="false" />
- <option name="myCaptureCPUOnExit" value="false" />
- <option name="mySnapshotsDir" value="" />
- <option name="myForceJVMTI" value="false" />
- <option name="myDisableAlloc" value="false" />
- <option name="myDisableCounts" value="false" />
- </RunnerSettings>
- <ConfigurationWrapper RunnerId="Debug" />
- </configuration>
</component>
<component name="SQL">
<general confirmCommit="false" confirmRollback="false" confirmClose="false" />
@@ -2585,22 +2394,22 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-4" y="-4" width="1288" height="774" extended-state="6" />
- <editor active="true" />
+ <frame x="0" y="0" width="1280" height="706" extended-state="1" />
+ <editor active="false" />
<layout>
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3409091" order="8" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.30877742" order="6" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.18446602" order="0" x="-87" y="100" width="469" height="491" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.36842105" order="1" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.29641694" order="0" x="-87" y="100" width="469" height="491" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.23666666" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.22168285" order="1" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32817337" order="9" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3275862" order="9" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4006462" order="5" />
- <window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.14196567" order="8" />
+ <window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.46596858" order="8" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.27931595" order="1" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.42260063" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.36851212" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.15110683" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5140741" order="3" />
@@ -2609,8 +2418,8 @@
<window_info id="SQL" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5983471" order="10" />
<window_info id="Regex" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
- <window_info id="RegexPlugin" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.330033" order="11" />
<window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
+ <window_info id="RegexPlugin" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.330033" order="11" />
<window_info id="Struts Layout" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32979593" order="3" />
<window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33009708" order="3" />
<window_info id="Build" active="false" anchor="bottom" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.31544715" order="8" />
@@ -2736,107 +2545,109 @@
<option name="multicastPort" value="3274" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiRightServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="0" selection-start="1029" selection-end="1029" vertical-scroll-proportion="1.2209945">
+ <state line="94" column="13" selection-start="3800" selection-end="3800" vertical-scroll-proportion="0.085">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/oscache.properties">
+ <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/GroovyRenderTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="43" column="21" selection-start="1427" selection-end="1448" vertical-scroll-proportion="0.035789475">
+ <state line="84" column="26" selection-start="3660" selection-end="3660" vertical-scroll-proportion="0.085">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java">
+ <entry file="file://$PROJECT_DIR$/src/main/web/META-INF/context.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="566" column="32" selection-start="17012" selection-end="17012" vertical-scroll-proportion="0.05704698">
+ <state line="0" column="0" selection-start="0" selection-end="68" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/AbstractRenderTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="14" selection-start="1728" selection-end="1728" vertical-scroll-proportion="0.05704698">
+ <state line="60" column="25" selection-start="2382" selection-end="2382" vertical-scroll-proportion="0.043147206">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/Utils.java">
+ <entry file="file://D:/dev/java/groovy/groovy-1.0-jsr-04/src/main/groovy/lang/MetaClassRegistry.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="227" column="14" selection-start="8864" selection-end="8864" vertical-scroll-proportion="0.05704698">
+ <state line="270" column="60" selection-start="10188" selection-end="10188" vertical-scroll-proportion="0.043147206">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/struts-config.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/XWikiPluginManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="331" column="40" selection-start="11110" selection-end="11110" vertical-scroll-proportion="1.4217253">
+ <state line="192" column="0" selection-start="6293" selection-end="6293" vertical-scroll-proportion="1.0586207">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/XWikiRequestProcessor.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiPluginRenderer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="25" selection-start="1456" selection-end="1456" vertical-scroll-proportion="0.51342285">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/StatusAction.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/groovy/XWikiGroovyRenderer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="37" column="25" selection-start="1420" selection-end="1432" vertical-scroll-proportion="0.22683705">
+ <state line="294" column="5" selection-start="10769" selection-end="10769" vertical-scroll-proportion="1.3482759">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://C:/tools/jdk1.5.0_04/jre/lib/rt.jar!/java/net/PlainSocketImpl.class">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="99" column="0" selection-start="4267" selection-end="4267" vertical-scroll-proportion="0.7013423">
+ <state line="53" column="19" selection-start="1805" selection-end="1805" vertical-scroll-proportion="0.46896553">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/xwiki.hbm.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="72" column="36" selection-start="2569" selection-end="2569" vertical-scroll-proportion="0.0543131">
- <folding />
+ <state line="484" column="0" selection-start="19821" selection-end="20058" vertical-scroll-proportion="1.0551724">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/PropertyChangedRule.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="58" column="13" selection-start="2005" selection-end="2005" vertical-scroll-proportion="0.0543131">
+ <state line="28" column="54" selection-start="1122" selection-end="1135" vertical-scroll-proportion="0.35172415">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/XWikiAction.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/DocChangeRule.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="148" column="17" selection-start="5995" selection-end="5995" vertical-scroll-proportion="0.6517572">
+ <state line="51" column="13" selection-start="1755" selection-end="1755" vertical-scroll-proportion="1.2295082">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiMacrosMappingRenderer.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="147" column="13" selection-start="5791" selection-end="5791" vertical-scroll-proportion="0.7718121">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/MacroMappingRenderTest.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiMacrosMappingRenderer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="115" column="20" selection-start="4737" selection-end="4737" vertical-scroll-proportion="0.88590604">
+ <state line="85" column="20" selection-start="3375" selection-end="3666" vertical-scroll-proportion="1.1827586">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/xwiki.cfg">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/oscache.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="42" selection-start="2155" selection-end="2155" vertical-scroll-proportion="0.68456376">
+ <state line="42" column="1" selection-start="1426" selection-end="1426" vertical-scroll-proportion="0.5275862">
<folding />
</state>
</provider>
More information about the Xwiki-notifications
mailing list