r1068 - in xwiki/trunk: . lib
Ludovic Dubost
ludovic at users.forge.objectweb.org
Mon May 15 11:31:28 CEST 2006
Author: ludovic
Date: 2006-05-15 11:31:27 +0200 (Mon, 15 May 2006)
New Revision: 1068
Added:
xwiki/trunk/lib/groovy-all-1.0-jsr-05.jar
Removed:
xwiki/trunk/lib/groovy-all-1.0-jsr-04.jar
Modified:
xwiki/trunk/.classpath
xwiki/trunk/build.xml
xwiki/trunk/xwiki.ipr
xwiki/trunk/xwiki.iws
xwiki/trunk/xwikibase.iml
Log:
Updated intelliJ build for new clustering libs
Added groovy JSR 05 and updated all builds
Modified: xwiki/trunk/.classpath
===================================================================
--- xwiki/trunk/.classpath 2006-05-11 14:04:21 UTC (rev 1067)
+++ xwiki/trunk/.classpath 2006-05-15 09:31:27 UTC (rev 1068)
@@ -108,6 +108,6 @@
<classpathentry kind="lib" path="lib/jcr-1.0.jar"/>
<classpathentry kind="lib" path="lib/rome-0.7.jar"/>
<classpathentry kind="lib" path="lib/rome-fetcher-0.7.jar"/>
- <classpathentry kind="lib" path="lib/groovy-all-1.0-jsr-04.jar"/>
+ <classpathentry kind="lib" path="lib/groovy-all-1.0-jsr-05.jar"/>
<classpathentry kind="output" path="build/web/WEB-INF/classes"/>
</classpath>
Modified: xwiki/trunk/build.xml
===================================================================
--- xwiki/trunk/build.xml 2006-05-11 14:04:21 UTC (rev 1067)
+++ xwiki/trunk/build.xml 2006-05-15 09:31:27 UTC (rev 1068)
@@ -94,7 +94,7 @@
radeox.jar,
portlet.jar,
xmlrpc-1.2.jar,
- groovy-all-1.0-jsr-04.jar,
+ groovy-all-1.0-jsr-05.jar,
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,
@@ -113,8 +113,8 @@
<fileset id="libs.exo.fileset" dir="${lib.dir}"
includes="picocontainer-1.0.jar,exo-platform.commons.jar,exo-platform.container-2.0.jar,exo-platform.service.chart.api-2.0.jar,exo-platform.service.chart.impl-2.0.jar,exo-platform.service.common.api-2.0.jar,exo-platform.service.database.api-2.0.jar,exo-platform.service.database.impl-2.0.jar,exo-platform.service.organization.api-2.0.jar,exo-platform.service.organization.impl-2.0.jar,exo-platform.service.sercurity.api-2.0.jar,exo-platform.service.sercurity.impl-2.0.jar" />
-
+
<fileset id="libs.tests.fileset" dir="${lib.dir}"
includes="cactus-1.7.jar,cactus-ant-1.7.jar,aspectjrt-1.2.1.jar,httpunit-1.6.jar,junit-3.8.1.jar,nekohtml-0.9.1.jar,clover-1.3.9.jar,jmock-1.0.1.jar,jmock-cglib-1.0.1.jar,org.mortbay.jetty-5.1.3.jar" />
@@ -308,11 +308,11 @@
<target name="test.server.prepare" depends="release,prepare-tests">
<!-- Cactify the web-app archive -->
- <copy file="${resources.test.src.dir}/xwiki.cfg"
+ <copy file="${resources.test.src.dir}/xwiki.cfg"
tofile="${build.dir}/web/WEB-INF/xwiki.cfg" overwrite="true" />
- <copy file="${resources.test.src.dir}/hibernate-test.cfg.xml"
+ <copy file="${resources.test.src.dir}/hibernate-test.cfg.xml"
tofile="${build.dir}/web/WEB-INF/hibernate-test.cfg.xml" overwrite="true" />
- <war warfile="${test.warfile}" basedir="${build.dir}/web"
+ <war warfile="${test.warfile}" basedir="${build.dir}/web"
webxml="${main.src.dir}/web-test.xml" >
<classes dir="${tests.build.dir}"/>
<exclude name="**/web*.xml" />
@@ -470,11 +470,11 @@
<tarfileset dir="${basedir}" includes="license.txt,lgpl.txt" />
</tar>
</target>
-
+
<target name="standalone" depends="release">
<!-- unzip jetty archive into standalone release dir -->
<!-- exclude some jetty provided jar files in order to avoid clashes -->
- <!-- these jars are provided by xwiki -->
+ <!-- these jars are provided by xwiki -->
<unzip src="${standalone.jetty.archive}" dest="${release.dir}">
<patternset>
@@ -486,26 +486,26 @@
<move todir="${standalone.release.dir}">
<fileset dir="${release.dir}/${standalone.jetty.archive.dir}"/>
</move>
-
+
<!-- remove example webapps -->
<delete file="${standalone.release.dir}/webapps/javadoc.war"/>
<delete dir="${standalone.release.dir}/webapps/template"/>
-
+
<!-- explode xwiki war file into jetty/webapps -->
<mkdir dir="${standalone.release.dir}/webapps/xwiki"/>
<unwar src="${release.warfile}" dest="${standalone.release.dir}/webapps/xwiki"/>
-
+
<!-- replace configuration files with standalone version -->
<copy todir="${standalone.release.dir}/webapps/xwiki/WEB-INF" overwrite="true">
<fileset refid="standalone.config"/>
</copy>
-
+
<!-- install db bootstrap -->
<mkdir dir="${standalone.release.dir}/db"/>
<copy todir="${standalone.release.dir}/db">
<fileset refid="standalone.db.bootstrap" />
</copy>
-
+
<!-- install start/stop scripts -->
<copy todir="${standalone.release.dir}">
<fileset refid="standalone.scripts"/>
@@ -513,5 +513,21 @@
</target>
<target name="all" depends="release, test, doc, src.dist" />
+ <!-- groovy setup for import/export -->
+ <!-- copy commons-collection-3.1.jar, log4j-1.2.8.jar to the ant lib directory -->
+ <!-- uncomment this block to activate import/export -->
+ <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy"
+ classpath="${libs};./release/xwiki.jar" />
+ <!-- end of groovy settings -->
+ <target name="exportdb">
+ <groovy src="export.groovy" />
+ </target>
+
+ <target name="importdb">
+ <groovy src="import.groovy" />
+ </target>
+
+
+
</project>
Deleted: xwiki/trunk/lib/groovy-all-1.0-jsr-04.jar
===================================================================
(Binary files differ)
Added: xwiki/trunk/lib/groovy-all-1.0-jsr-05.jar
===================================================================
(Binary files differ)
Property changes on: xwiki/trunk/lib/groovy-all-1.0-jsr-05.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: xwiki/trunk/xwiki.ipr
===================================================================
--- xwiki/trunk/xwiki.ipr 2006-05-11 14:04:21 UTC (rev 1067)
+++ xwiki/trunk/xwiki.ipr 2006-05-15 09:31:27 UTC (rev 1068)
@@ -282,17 +282,12 @@
<root url="jar://$PROJECT_DIR$/lib/c3p0-0.8.4.5.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/hibernate-tools-2.1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/mysql-connector-java-3.1.7-bin.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/oscache-2.0.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/hibernate-3.0.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jta.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/hsqldb-1.7.3.jar!/" />
</CLASSES>
- <JAVADOC>
- <root url="file://C:/dev/java/hibernate/hibernate-3.0/doc/api" />
- </JAVADOC>
- <SOURCES>
- <root url="file://C:/dev/java/hibernate/hibernate-3.0/src" />
- </SOURCES>
+ <JAVADOC />
+ <SOURCES />
</library>
<library name="Velocity">
<CLASSES>
@@ -368,7 +363,7 @@
</library>
<library name="Groovy">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/groovy-all-1.0-jsr-04.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/groovy-all-1.0-jsr-05.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -474,6 +469,15 @@
<JAVADOC />
<SOURCES />
</library>
+ <library name="cache">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/jgroups-2.2.9.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/oscache-2.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/concurrent.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
</component>
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />
Modified: xwiki/trunk/xwiki.iws
===================================================================
--- xwiki/trunk/xwiki.iws 2006-05-11 14:04:21 UTC (rev 1067)
+++ xwiki/trunk/xwiki.iws 2006-05-15 09:31:27 UTC (rev 1068)
@@ -319,7 +319,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java" line="367" class="com.xpn.xwiki.XWiki" package="com.xpn.xwiki">
+ <breakpoint url="file://$PROJECT_DIR$/src/test/cactus/com/xpn/xwiki/test/ViewEditTest.java" line="2255" class="com.xpn.xwiki.test.ViewEditTest" package="com.xpn.xwiki.test">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -332,7 +332,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/test/cactus/com/xpn/xwiki/test/ViewEditTest.java" line="2255" class="com.xpn.xwiki.test.ViewEditTest" package="com.xpn.xwiki.test">
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java" line="1153" class="com.xpn.xwiki.doc.XWikiDocument" package="com.xpn.xwiki.doc">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -345,7 +345,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java" line="2509" class="com.xpn.xwiki.XWiki" package="com.xpn.xwiki">
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/packaging/Package.java" line="415" class="com.xpn.xwiki.plugin.packaging.Package" package="com.xpn.xwiki.plugin.packaging">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -358,7 +358,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java" line="1124" class="com.xpn.xwiki.doc.XWikiDocument" package="com.xpn.xwiki.doc">
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPlugin.java" line="356" class="com.xpn.xwiki.plugin.calendar.CalendarPlugin" package="com.xpn.xwiki.plugin.calendar">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -371,7 +371,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/packaging/Package.java" line="415" class="com.xpn.xwiki.plugin.packaging.Package" package="com.xpn.xwiki.plugin.packaging">
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPluginApi.java" line="182" class="com.xpn.xwiki.plugin.calendar.CalendarPluginApi" package="com.xpn.xwiki.plugin.calendar">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -384,7 +384,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPlugin.java" line="356" class="com.xpn.xwiki.plugin.calendar.CalendarPlugin" package="com.xpn.xwiki.plugin.calendar">
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPluginApi.java" line="145" class="com.xpn.xwiki.plugin.calendar.CalendarPluginApi" package="com.xpn.xwiki.plugin.calendar">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -397,7 +397,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPluginApi.java" line="182" class="com.xpn.xwiki.plugin.calendar.CalendarPluginApi" package="com.xpn.xwiki.plugin.calendar">
+ <breakpoint url="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/BackLinksSimpleTest.java" line="98" class="com.xpn.xwiki.test.BackLinksSimpleTest" package="com.xpn.xwiki.test">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -410,7 +410,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPluginApi.java" line="145" class="com.xpn.xwiki.plugin.calendar.CalendarPluginApi" package="com.xpn.xwiki.plugin.calendar">
+ <breakpoint url="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/plugin/query/QueryPluginTest.java" line="262" class="com.xpn.xwiki.test.plugin.query.QueryPluginTest" package="com.xpn.xwiki.test.plugin.query">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -423,6 +423,19 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/plugin/query/QueryPluginTest.java" line="80" class="com.xpn.xwiki.test.plugin.query.QueryPluginTest" package="com.xpn.xwiki.test.plugin.query">
+ <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>
@@ -734,95 +747,93 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="XWikiDocument.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java">
+ <file leaf-file-name="XWikiPageNotification.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/XWikiPageNotification.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1451" column="75" selection-start="48552" selection-end="48552" vertical-scroll-proportion="0.06007067">
+ <state line="15" column="85" selection-start="454" selection-end="454" vertical-scroll-proportion="0.029411765">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="UploadAction.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/UploadAction.java">
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state line="43" column="51" selection-start="1656" selection-end="1656" vertical-scroll-proportion="0.05704698">
+ <state line="107" column="16" selection-start="4261" selection-end="4261" vertical-scroll-proportion="0.02866779">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiHibernateAttachmentStore.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiHibernateAttachmentStore.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="157" column="0" selection-start="6044" selection-end="6044" vertical-scroll-proportion="0.06007067">
- <folding />
+ <state line="2702" column="55" selection-start="105790" selection-end="105790" vertical-scroll-proportion="0.7352941">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="CalendarPlugin.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPlugin.java">
+ <file leaf-file-name="MockHttpServletRequest.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/plugin/charts/mocks/MockHttpServletRequest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="353" column="33" selection-start="13449" selection-end="13449" vertical-scroll-proportion="0.8869258">
+ <state line="304" column="30" selection-start="6463" selection-end="6463" vertical-scroll-proportion="0.81112987">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ASTMethod.class" pinned="false" current="false" current-in-tab="false">
- <entry file="jar://$PROJECT_DIR$/lib/velocity-1.4.jar!/org/apache/velocity/runtime/parser/node/ASTMethod.class">
+ <file leaf-file-name="Object.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Object.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="17" column="0" selection-start="816" selection-end="816" vertical-scroll-proportion="0.96113074">
+ <state line="32" column="32" selection-start="1147" selection-end="1147" vertical-scroll-proportion="0.20067453">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="CalendarPluginApi.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPluginApi.java">
+ <file leaf-file-name="Collection.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Collection.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="164" column="48" selection-start="6892" selection-end="6892" vertical-scroll-proportion="0.96113074">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="57" column="33" selection-start="1807" selection-end="1807" vertical-scroll-proportion="0.42664418">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiAttachment.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java">
+ <file leaf-file-name="editprefs.vm" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/web/templates/editprefs.vm">
<provider selected="true" editor-type-id="text-editor">
- <state line="73" column="26" selection-start="2318" selection-end="2318" vertical-scroll-proportion="0.06007067">
+ <state line="50" column="4" selection-start="1952" selection-end="1952" vertical-scroll-proportion="0.47058824">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiAuthServiceImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiAuthServiceImpl.java">
+ <file leaf-file-name="UsersClass.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/UsersClass.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="193" column="60" selection-start="9172" selection-end="9172" vertical-scroll-proportion="0.06007067">
+ <state line="33" column="64" selection-start="957" selection-end="957" vertical-scroll-proportion="0.02866779">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Package.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/packaging/Package.java">
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state line="451" column="38" selection-start="16111" selection-end="16111" vertical-scroll-proportion="0.06007067">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="204" column="55" selection-start="8470" selection-end="8470" vertical-scroll-proportion="0.02866779">
+ <folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state line="667" column="24" selection-start="25345" selection-end="25345" vertical-scroll-proportion="0.06007067">
+ <state line="97" column="60" selection-start="3550" selection-end="3550" vertical-scroll-proportion="0.62731874">
<folding />
</state>
</provider>
@@ -888,9 +899,9 @@
<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/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" />
- <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" />
<profiles file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiStoreInterface.java" profile_name="Default" is_active="false" />
</component>
<component name="InspectionManager">
@@ -937,7 +948,7 @@
<option name="ADD_LABEL_ON_UNIT_TEST_FAILED" value="true" />
</component>
<component name="ModuleEditorState">
- <option name="LAST_EDITED_MODULE_NAME" value="xwiki" />
+ <option name="LAST_EDITED_MODULE_NAME" value="xwikibase" />
<option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
</component>
<component name="NamedScopeManager" />
@@ -1028,9 +1039,17 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="xwiki" />
+ <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>
@@ -1038,13 +1057,17 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="xwiki" />
+ <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\src\main\web" />
+ <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>
@@ -1052,17 +1075,21 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="xwiki" />
+ <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\src\main\web" />
+ <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\main\web\WEB-INF" />
+ <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>
@@ -1070,14 +1097,222 @@
<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_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\test\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\test\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\test\java\com\xpn\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_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_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\test\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\test\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>
+ <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\render" />
+ <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\plugin" />
+ <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\templates" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -1132,14 +1367,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" />
@@ -1182,27 +1417,27 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1345" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</tempConfiguration>
- <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.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -1211,15 +1446,57 @@
<option name="OPEN_IN_BROWSER" value="true" />
<option name="OPEN_IN_BROWSER_URL" value="/" />
<option name="COMMON_VM_ARGUMENTS" value="" />
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="3384" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</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="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="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
+ <configuration selected="false" default="true" type="Application" factoryName="Application">
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <module name="" />
+ </configuration>
<configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
<module name="xwiki" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1249,13 +1526,13 @@
<option name="MODULE_NAME" value="xwiki" />
<option name="DEPLOY" value="true" />
</J2EE_MODULE>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="3383" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="false" />
</RunnerSettings>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
@@ -1270,7 +1547,7 @@
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
@@ -1286,22 +1563,6 @@
</SHUTDOWN>
</ConfigurationWrapper>
</configuration>
- <configuration selected="false" default="true" 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="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
- <configuration selected="false" default="true" type="Application" factoryName="Application">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <module name="" />
- </configuration>
<configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -1315,80 +1576,6 @@
<option name="USE_WEBSPHERE51_LINEMAPPING_MODEL" value="false" />
<option name="LOCAL_PORT" value="80" />
</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="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="exploded">
- <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>
- <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>
- </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="" />
@@ -1397,6 +1584,18 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<module name="xwikibase" />
+ <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>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
@@ -1411,6 +1610,18 @@
<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">
@@ -1430,14 +1641,26 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1054" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="WikiWikiBaseRenderTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1458,6 +1681,18 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <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>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
@@ -1480,14 +1715,26 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1825" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="StoreHibernateCacheTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1508,6 +1755,18 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <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>
</configuration>
<configuration selected="false" default="false" name="ClassesTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1528,14 +1787,26 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1055" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="ObjectTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1556,16 +1827,28 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <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>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
- <configuration selected="false" default="false" name="StoreObjectHibernateTest" type="JUnit" factoryName="JUnit">
+ <configuration selected="false" default="false" name="StoreObjectHibernateTest.testCommentReadPerfMultipleVersions" 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.StoreObjectHibernateTest" />
- <option name="METHOD_NAME" value="testReadWriteObject" />
+ <option name="METHOD_NAME" value="testCommentReadPerf" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="" />
<option name="PARAMETERS" value="" />
@@ -1578,14 +1861,27 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="3983" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
+ <ConfigurationWrapper RunnerId="Profile " />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="SearchTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1606,14 +1902,26 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="2647" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="PluginTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1634,6 +1942,18 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <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>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
@@ -1656,16 +1976,28 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1377" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
- <configuration selected="true" default="false" name="ViewEditTest" type="JUnit" factoryName="JUnit">
+ <configuration selected="false" default="false" name="ViewEditTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -1684,14 +2016,26 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1336" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="StoreObjectRCSFileTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1712,15 +2056,27 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <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>
</configuration>
- <configuration selected="false" default="false" name="StoreTest" type="JUnit" factoryName="JUnit">
+ <configuration selected="true" 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="" />
- <option name="PACKAGE_NAME" value="com.xpn.xwiki.test" />
- <option name="MAIN_CLASS_NAME" value="com.xpn.xwiki.test.StoreTest" />
- <option name="METHOD_NAME" value="" />
- <option name="TEST_OBJECT" value="class" />
+ <option name="PACKAGE_NAME" value="com.xpn.xwiki.test.plugin.query" />
+ <option name="MAIN_CLASS_NAME" value="com.xpn.xwiki.test.plugin.query.QueryPluginTest" />
+ <option name="METHOD_NAME" value="testAttachments" />
+ <option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" value="" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/build/xwikibase_test" />
@@ -1732,7 +2088,25 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="1069" />
+ <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>
<RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="XWikiTest" type="JUnit" factoryName="JUnit">
@@ -1754,14 +2128,26 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1826" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="RadeoxRenderTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1782,14 +2168,26 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="2019" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="VelocityRenderTest.testCacheRenderer" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1810,14 +2208,26 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="2597" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="ServletVirtualTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1838,14 +2248,26 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1056" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="Servleti18nTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1866,6 +2288,18 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <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>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
@@ -1888,6 +2322,18 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <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>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
@@ -1910,6 +2356,18 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <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>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
@@ -1932,14 +2390,26 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="2833" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="AllServletTests" type="JUnit" factoryName="JUnit">
<module name="xwiki" />
@@ -1956,6 +2426,18 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <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>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
@@ -1974,14 +2456,26 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="3790" />
<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>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="Chart" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1998,9 +2492,108 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <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>
<RunnerSettings RunnerId="Run" />
<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="exploded">
+ <option name="CONTEXT_PATH" value="/xwiki" />
+ <option name="MODULE_NAME" value="xwiki" />
+ <option name="DEPLOY" value="true" />
+ </J2EE_MODULE>
+ <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>
+ <RunnerSettings RunnerId="Run" />
+ <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>
+ <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>
+ </configuration>
</component>
<component name="SQL">
<general confirmCommit="false" confirmRollback="false" confirmClose="false" />
@@ -2092,24 +2685,25 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="23" y="0" width="1257" height="736" extended-state="0" />
- <editor active="false" />
+ <frame x="-4" y="-4" width="1288" height="774" extended-state="6" />
+ <editor active="true" />
<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.18755187" 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.5031348" order="1" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.13349515" 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="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.2911184" order="9" />
+ <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="Inspection" active="false" anchor="bottom" auto_hide="false" inter