r1110 - in xwiki/trunk: . lib src/main/java/com/xpn/xwiki/cache/impl
Ludovic Dubost
ludovic at users.forge.objectweb.org
Tue Aug 1 14:32:06 CEST 2006
Author: ludovic
Date: 2006-08-01 14:32:05 +0200 (Tue, 01 Aug 2006)
New Revision: 1110
Added:
xwiki/trunk/lib/rome-0.8.jar
Removed:
xwiki/trunk/lib/rome-0.7.jar
Modified:
xwiki/trunk/build.xml
xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java
xwiki/trunk/xwiki.ipr
xwiki/trunk/xwiki.iws
Log:
Fixed call to getGroupService which would call initCache at each request
Update to rome-0.8
Modified: xwiki/trunk/build.xml
===================================================================
--- xwiki/trunk/build.xml 2006-07-31 21:51:27 UTC (rev 1109)
+++ xwiki/trunk/build.xml 2006-08-01 12:32:05 UTC (rev 1110)
@@ -98,7 +98,7 @@
xalan-2.6.0.jar,xerces.jar-2.4.0,xml-apis-2.0.2,jimi.jar,avalon-framework-4.1.5.jar,fop-0.20.5.jar,jtidy.jar,
batik-all-1.6.jar,
ldap.jar,
- rome-0.7.jar,rome-fetcher-0.7.jar,jdom-1.0.jar,
+ rome-0.8.jar,rome-fetcher-0.7.jar,jdom-1.0.jar,
axis-1.2RC2.jar,jaxrpc-1.1.jar,saaj-1.2.jar,wsdl4j-1.5.jar,commons-discovery-0.2.jar,googleapi.jar,googleadwords.jar,alexa.jar,terraservice.jar,ipresolver.jar,flipper.jar,
mail-1.3.2.jar,ical4j-0.9.19M.jar,flickrapi-1.0a7.jar,
jackrabbit-1.0-SNAPSHOT.jar,jackrabbit-api-1.0-SNAPSHOT.jar,jackrabbit-commons-1.0-SNAPSHOT.jar,jackrabbit-core-1.0-SNAPSHOT.jar,jcr-1.0.jar,
Deleted: xwiki/trunk/lib/rome-0.7.jar
===================================================================
(Binary files differ)
Added: xwiki/trunk/lib/rome-0.8.jar
===================================================================
(Binary files differ)
Property changes on: xwiki/trunk/lib/rome-0.8.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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-07-31 21:51:27 UTC (rev 1109)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java 2006-08-01 12:32:05 UTC (rev 1110)
@@ -88,7 +88,7 @@
public XWikiCache newCache(String cacheName, Properties props) throws XWikiException
{
- OSCacheCache cc = new OSCacheCache(mergeProperties(props, localCacheProperties));
+ OSCacheCache cc = new OSCacheCache(mergeProperties(props, cacheProperties));
cc.setName(cacheName);
initCache(cc);
return cc;
@@ -96,27 +96,34 @@
public XWikiCache newLocalCache(Properties props) throws XWikiException
{
- OSCacheCache cc = new OSCacheCache(mergeProperties(props, cacheProperties));
+ OSCacheCache cc = new OSCacheCache(mergeProperties(props, localCacheProperties));
initCache(cc);
return cc;
}
public XWikiCache newCache(String cacheName, Properties props, int capacity) throws XWikiException {
- OSCacheCache cc = new OSCacheCache(mergeProperties(props, localCacheProperties), capacity);
+ OSCacheCache cc = new OSCacheCache(mergeProperties(props, cacheProperties), capacity);
cc.setName(cacheName);
initCache(cc);
return cc;
}
public XWikiCache newLocalCache(Properties props, int capacity) throws XWikiException {
- OSCacheCache cc = new OSCacheCache(mergeProperties(props, cacheProperties), capacity);
+ OSCacheCache cc = new OSCacheCache(mergeProperties(props, localCacheProperties), capacity);
initCache(cc);
return cc;
}
private Properties mergeProperties(Properties props, Properties sourceProps) {
- Properties targetProps = (Properties) sourceProps.clone();
- Enumeration en = props.keys();
+ Properties targetProps = new Properties();
+
+ Enumeration en = sourceProps.keys();
+ while (en.hasMoreElements()) {
+ Object key = en.nextElement();
+ Object value = sourceProps.get(key);
+ targetProps.put(key, value);
+ }
+ en = props.keys();
while (en.hasMoreElements()) {
Object key = en.nextElement();
Object value = props.get(key);
Modified: xwiki/trunk/xwiki.ipr
===================================================================
--- xwiki/trunk/xwiki.ipr 2006-07-31 21:51:27 UTC (rev 1109)
+++ xwiki/trunk/xwiki.ipr 2006-08-01 12:32:05 UTC (rev 1110)
@@ -470,8 +470,8 @@
</library>
<library name="RSS">
<CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/rome-0.8.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/rome-fetcher-0.7.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/rome-0.7.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: xwiki/trunk/xwiki.iws
===================================================================
--- xwiki/trunk/xwiki.iws 2006-07-31 21:51:27 UTC (rev 1109)
+++ xwiki/trunk/xwiki.iws 2006-08-01 12:32:05 UTC (rev 1110)
@@ -517,6 +517,71 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/HibernateCustomMappingTest.java" line="355" class="com.xpn.xwiki.test.HibernateCustomMappingTest" package="com.xpn.xwiki.test">
+ <option name="ENABLED" value="true" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java" line="159" class="com.xpn.xwiki.cache.impl.OSCacheCache" package="com.xpn.xwiki.cache.impl">
+ <option name="ENABLED" value="true" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java" line="2775" class="com.xpn.xwiki.XWiki" package="com.xpn.xwiki">
+ <option name="ENABLED" value="true" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java" line="90" class="com.xpn.xwiki.cache.impl.OSCacheService" package="com.xpn.xwiki.cache.impl">
+ <option name="ENABLED" value="true" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiGroupServiceImpl.java" line="66" class="com.xpn.xwiki.user.impl.xwiki.XWikiGroupServiceImpl" package="com.xpn.xwiki.user.impl.xwiki">
+ <option name="ENABLED" value="true" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
</line_breakpoints>
<breakpoint_any>
<breakpoint>
@@ -832,93 +897,93 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="XWiki.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state line="361" column="144" selection-start="14271" selection-end="14271" vertical-scroll-proportion="0.28735632">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="136" column="46" selection-start="4073" selection-end="4073" vertical-scroll-proportion="1.1846154">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiNotificationManager.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/XWikiNotificationManager.java">
+ <file leaf-file-name="XWikiGroupServiceImpl.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiGroupServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="88" column="60" selection-start="3130" selection-end="3130" vertical-scroll-proportion="0.5614035">
+ <state line="66" column="0" selection-start="2628" selection-end="2628" vertical-scroll-proportion="0.78205127">
<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="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="53" column="20" selection-start="2117" selection-end="2117" vertical-scroll-proportion="0.021711366">
- <folding />
+ <state line="2775" column="0" selection-start="108566" selection-end="108566" vertical-scroll-proportion="0.37866667">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiGroupServiceImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiGroupServiceImpl.java">
+ <file leaf-file-name="XWikiRightServiceImpl.java" pinned="false" current="false" current-in-tab="false">
+ <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="51" column="55" selection-start="2047" selection-end="2047" vertical-scroll-proportion="0.021303259">
+ <state line="339" column="0" selection-start="14007" selection-end="14007" vertical-scroll-proportion="0.33333334">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="DocObjectChangedRule.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/DocObjectChangedRule.java">
+ <file leaf-file-name="OSCacheService.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="61" column="0" selection-start="2023" selection-end="2211" vertical-scroll-proportion="0.48370928">
+ <state line="90" column="0" selection-start="3269" selection-end="3269" vertical-scroll-proportion="0.33333334">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiHibernateStore.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java">
+ <file leaf-file-name="XWikiCacheStore.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="63" column="31" selection-start="2242" selection-end="2273" vertical-scroll-proportion="0.1302682">
+ <state line="78" column="42" selection-start="3060" selection-end="3060" vertical-scroll-proportion="0.9066667">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiCacheStore.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java">
+ <file leaf-file-name="ImagePlugin.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/image/ImagePlugin.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="118" column="13" selection-start="4372" selection-end="4372" vertical-scroll-proportion="0.021711366">
+ <state line="99" column="65" selection-start="3496" selection-end="3496" vertical-scroll-proportion="1.0102564">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiCache.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/api/XWikiCache.java">
+ <file leaf-file-name="oscache.properties" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/oscache.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="17" selection-start="963" selection-end="963" vertical-scroll-proportion="0.106516294">
+ <state line="112" column="22" selection-start="4339" selection-end="4343" vertical-scroll-proportion="0.50769234">
<folding />
</state>
</provider>
</entry>
</file>
- <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="oscache-local.properties" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/oscache-local.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="192" column="13" selection-start="5559" selection-end="5559" vertical-scroll-proportion="0.7531328">
+ <state line="106" column="27" selection-start="3944" selection-end="3944" vertical-scroll-proportion="1.4230769">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="CacheEntry.class" pinned="false" current="false" current-in-tab="false">
- <entry file="jar://$PROJECT_DIR$/lib/oscache-2.3.2M.jar!/com/opensymphony/oscache/base/CacheEntry.class">
+ <file leaf-file-name="XWikiCache.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/api/XWikiCache.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="13" selection-start="1352" selection-end="1352" vertical-scroll-proportion="0.56390977">
+ <state line="25" column="17" selection-start="963" selection-end="963" vertical-scroll-proportion="0.21794872">
<folding />
</state>
</provider>
@@ -984,8 +1049,8 @@
<option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
</component>
<component name="HighlightingSettingsPerFile">
+ <setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java" root0="SKIP_INSPECTION" />
<setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiStoreInterface.java" root0="SKIP_HIGHLIGHTING" />
- <setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java" root0="SKIP_INSPECTION" />
<setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/BaseCollection.java" root0="SKIP_INSPECTION" />
</component>
<component name="InspectionManager">
@@ -1099,7 +1164,137 @@
<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>
+ <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\xwikisvn\xwiki\trunk" />
+ <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\xwikisvn\xwiki\trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\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\xwikisvn\xwiki\trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test\resources" />
+ <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\xwikisvn\xwiki\trunk" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\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="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\xwikisvn\xwiki\trunk\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\xwikisvn\xwiki\trunk\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\xwikisvn\xwiki\trunk\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" />
@@ -1150,14 +1345,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_treeWidth4" value="141" />
<property name="cvs_file_history_treeOrder3" value="3" />
- <property name="cvs_file_history_treeWidth4" value="141" />
<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_treeWidth3" value="141" />
<property name="cvs_file_history_treeOrder2" value="2" />
- <property name="cvs_file_history_treeWidth3" value="141" />
<property name="cvs_file_history_treeWidth5" value="141" />
<property name="cvs_file_history_flatOrder6" value="6" />
<property name="cvs_file_history_flatWidth0" value="140" />
@@ -1186,17 +1381,17 @@
<component name="RestoreUpdateTree" />
<component name="RunManager">
<activeType name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" />
- <tempConfiguration selected="true" default="false" name="XMLRpcTest" type="JUnit" factoryName="JUnit">
- <module name="xwikibase" />
+ <tempConfiguration selected="true" default="false" name="GroovyRenderTest" type="JUnit" factoryName="JUnit">
+ <module name="xwiki" />
<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.XMLRpcTest" />
+ <option name="MAIN_CLASS_NAME" value="com.xpn.xwiki.test.GroovyRenderTest" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="" />
<option name="PARAMETERS" value="" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/build/xwikibase_test" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ADDITIONAL_CLASS_PATH" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
@@ -1214,13 +1409,7 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1345" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</tempConfiguration>
<configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
@@ -1457,7 +1646,7 @@
</RunnerSettings>
<ConfigurationWrapper RunnerId="Run" />
</configuration>
- <configuration selected="false" default="false" name="StoreTest.testExists" type="JUnit" factoryName="JUnit">
+ <configuration selected="false" default="false" name="StoreTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -2563,39 +2752,39 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="34" y="3" width="1631" height="991" extended-state="0" />
- <editor active="true" />
+ <frame x="-4" y="-4" width="1688" height="1020" extended-state="6" />
+ <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.16253968" 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.32528734" order="1" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.27267158" 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.44204545" 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.32314923" order="9" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4125" 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.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.3560517" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.36818182" 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.39318183" order="3" />
+ <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.48863637" order="3" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.40038684" order="0" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="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="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<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="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="Aspects" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
+ <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<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="Palette" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
+ <window_info id="IDEtalk History" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<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="IDEtalk History" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
+ <window_info id="Struts Assistant" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" 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" />
- <window_info id="Struts Assistant" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Hibernate Tools" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3942857" order="3" />
<window_info id="Struts Console" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32979593" order="3" />
<window_info id="Tetris" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32979593" order="3" />
@@ -2603,8 +2792,8 @@
<window_info id="ConsoleMavenPlugin" active="true" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.3295082" order="12" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="4" />
<window_info id="IDE talk" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.17290886" order="3" />
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="7" />
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
</layout>
</component>
<component name="VCS.FileViewConfiguration">
@@ -2730,110 +2919,112 @@
<option name="multicastPort" value="3274" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/plugin/charts/mocks/MockServletContext.java">
+ <entry file="jar://C:/Program Files/Java/jdk1.5.0_07/jre/lib/rt.jar!/sun/reflect/DelegatingMethodAccessorImpl.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="92" column="51" selection-start="2313" selection-end="2313" vertical-scroll-proportion="0.9359606">
+ <state line="10" column="0" selection-start="371" selection-end="371" vertical-scroll-proportion="0.3180873">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/XWikiPageNotification.java">
+ <entry file="jar://C:/Program Files/Java/jdk1.5.0_07/src.zip!/java/lang/reflect/Method.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="13" selection-start="13" selection-end="13" vertical-scroll-proportion="0.0">
+ <state line="584" column="0" selection-start="23298" selection-end="23298" vertical-scroll-proportion="0.27620968">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/DocChangeRule.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiRenderingEngine.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="19" selection-start="1016" selection-end="1016" vertical-scroll-proportion="0.204">
+ <state line="82" column="75" selection-start="3298" selection-end="3298" vertical-scroll-proportion="0.67053366">
<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/render/groovy/XWikiGroovyRenderer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="97" column="36" selection-start="3741" selection-end="3741" vertical-scroll-proportion="0.362">
+ <state line="104" column="48" selection-start="3475" selection-end="3475" vertical-scroll-proportion="0.9466357">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/xwiki.cfg">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/feed/FeedPlugin.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="16" column="38" selection-start="1157" selection-end="1157" vertical-scroll-proportion="0.37632135">
- <folding />
+ <state line="206" column="60" selection-start="7350" selection-end="7350" vertical-scroll-proportion="0.47948718">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/XWikiNotificationManager.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/api/XWikiCache.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="88" column="60" selection-start="3130" selection-end="3130" vertical-scroll-proportion="0.5614035">
+ <state line="25" column="17" selection-start="963" selection-end="963" vertical-scroll-proportion="0.21794872">
<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/cache/impl/OSCacheCache.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="53" column="20" selection-start="2117" selection-end="2117" vertical-scroll-proportion="0.021711366">
+ <state line="136" column="46" selection-start="4073" selection-end="4073" vertical-scroll-proportion="1.1846154">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/image/ImagePlugin.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="118" column="13" selection-start="4372" selection-end="4372" vertical-scroll-proportion="0.021711366">
+ <state line="99" column="65" selection-start="3496" selection-end="3496" vertical-scroll-proportion="1.0102564">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/api/XWikiCache.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="25" column="17" selection-start="963" selection-end="963" vertical-scroll-proportion="0.106516294">
+ <state line="78" column="42" selection-start="3060" selection-end="3060" vertical-scroll-proportion="0.9066667">
<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/web/WEB-INF/oscache.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="192" column="13" selection-start="5559" selection-end="5559" vertical-scroll-proportion="0.7531328">
+ <state line="112" column="22" selection-start="4339" selection-end="4343" vertical-scroll-proportion="0.50769234">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$PROJECT_DIR$/lib/oscache-2.3.2M.jar!/com/opensymphony/oscache/base/CacheEntry.class">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/oscache-local.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="13" selection-start="1352" selection-end="1352" vertical-scroll-proportion="0.56390977">
+ <state line="106" column="27" selection-start="3944" selection-end="3944" vertical-scroll-proportion="1.4230769">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiGroupServiceImpl.java">
+ <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="51" column="55" selection-start="2047" selection-end="2047" vertical-scroll-proportion="0.021303259">
+ <state line="339" column="0" selection-start="14007" selection-end="14007" vertical-scroll-proportion="0.33333334">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/DocObjectChangedRule.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="61" column="0" selection-start="2023" selection-end="2211" vertical-scroll-proportion="0.48370928">
- <folding />
+ <state line="2775" column="0" selection-start="108566" selection-end="108566" vertical-scroll-proportion="0.37866667">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="63" column="31" selection-start="2242" selection-end="2273" vertical-scroll-proportion="0.1302682">
+ <state line="90" column="0" selection-start="3269" selection-end="3269" vertical-scroll-proportion="0.33333334">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiGroupServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="361" column="144" selection-start="14271" selection-end="14271" vertical-scroll-proportion="0.28735632">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="66" column="0" selection-start="2628" selection-end="2628" vertical-scroll-proportion="0.78205127">
+ <folding />
</state>
</provider>
</entry>
More information about the Xwiki-notifications
mailing list