r1239 - in xwiki/trunk: . src/test/java/com/xpn/xwiki/test/plugin/query
Ludovic Dubost
ludovic at users.forge.objectweb.org
Tue Aug 29 01:51:27 CEST 2006
Author: ludovic
Date: 2006-08-29 01:51:24 +0200 (Tue, 29 Aug 2006)
New Revision: 1239
Modified:
xwiki/trunk/src/test/java/com/xpn/xwiki/test/plugin/query/QueryPluginTest.java
xwiki/trunk/xwiki.ipr
xwiki/trunk/xwiki.iws
Log:
Fix query plugin test
Modified: xwiki/trunk/src/test/java/com/xpn/xwiki/test/plugin/query/QueryPluginTest.java
===================================================================
--- xwiki/trunk/src/test/java/com/xpn/xwiki/test/plugin/query/QueryPluginTest.java 2006-08-28 23:02:37 UTC (rev 1238)
+++ xwiki/trunk/src/test/java/com/xpn/xwiki/test/plugin/query/QueryPluginTest.java 2006-08-28 23:51:24 UTC (rev 1239)
@@ -336,8 +336,8 @@
checkEquals(qf.getAttachment("Test.TestAttach2", "*", null).list(), new Object[]{attachment3});
testSearchXP("//Test/TestAttach2/attach/testfile1", new Object[]{attachment3});
checkEquals(qf.getAttachment("Test.TestAttach2", "testfile1", null).list(), new Object[]{attachment3});
- testSearchXP("//*/*/attach/testfile1", new Object[]{attachment1, attachment3});
- checkEquals(qf.getAttachment("*.*", "testfile1", null).list(), new Object[]{attachment1, attachment3});
+ testSearchXP("//*/*/attach/testfile1", new Object[]{attachment3, attachment1});
+ checkEquals(qf.getAttachment("*.*", "testfile1", null).list(), new Object[]{attachment3, attachment1});
testSearchXP("//Test/*[@author='Someone']/attach/*[@comment!='']", new Object[]{attachment2});
checkEquals(qf.getAttachment("Test.*[@author='Someone']", "*[@comment!='']", null).list(), new Object[]{attachment2});
// hb.endTransaction(getXWikiContext(), false);
Modified: xwiki/trunk/xwiki.ipr
===================================================================
--- xwiki/trunk/xwiki.ipr 2006-08-28 23:02:37 UTC (rev 1238)
+++ xwiki/trunk/xwiki.ipr 2006-08-28 23:51:24 UTC (rev 1239)
@@ -318,50 +318,49 @@
<library name="Jakarta Commons">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/ecs-1.4.2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.8.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/commons-fileupload-1.0.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/commons-pool-1.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/commons-net-1.1.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/oro-2.0.8.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/commons-logging-api-1.0.4.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/commons-httpclient-2.0.2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/commons-logging-1.0.4.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/commons-digester-1.6.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-codec-1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-beanutils-1.7.0.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/commons-collections-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-dbcp-1.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-lang-2.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/commons-collections-3.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/commons-httpclient-3.0.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/commons-discovery-0.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/commons-logging-adapters-1.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/commons-logging-1.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/commons-io-1.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/commons-digester-1.7.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/commons-logging-api-1.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/commons-fileupload-1.1.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/commons-net-1.4.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.13.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/slf4j-log4j12-1.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="Unit Tests">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/junit-3.8.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/cactus-1.7.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/nekohtml-0.9.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/aspectjrt-1.2.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/cactus-ant-1.7.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/httpunit-1.6.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/cactus-ant-1.7.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/cactus-1.7.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/junit-4.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/nekohtml-0.9.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="Hibernate">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/swarmcache.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/asm-util-1.5.3.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/ehcache-1.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/cglib-2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/odmg-3.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/asm-1.5.3.jar!/" />
- <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/jta.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/hsqldb-1.8.0.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/hibernate-3.0.3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/hibernate-3.2rc3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/cglib-2.1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -376,15 +375,15 @@
</library>
<library name="Struts">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/struts-1.2.4.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/struts-1.2.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="Ant">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/ant-1.6.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/antlr-2.7.5.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/ant-1.6.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -406,16 +405,13 @@
</library>
<library name="Portlets">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/portlet.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/portlet-api-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="ExoPlatform">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/picocontainer-1.0.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/jfreechart-1.0.0-rc1.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/jcommon-1.0.0-rc1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/exo-platform.service.database.impl-2.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/exo-platform.service.organization.impl-2.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/exo-platform.service.organization.api-2.0.jar!/" />
@@ -427,13 +423,18 @@
<root url="jar://$PROJECT_DIR$/lib/exo-platform.service.chart.api-2.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/exo-platform.service.sercurity.api-2.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/exo-platform.container-2.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/picocontainer-1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="XMLRPC">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/xmlrpc-1.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/xmlrpc-common-3.0rc1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/xmlrpc-client-3.0rc1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/xmlrpc-server-3.0rc1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/ws-commons-util-1.0.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/ws-commons-java5-1.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -450,11 +451,11 @@
<root url="jar://$PROJECT_DIR$/lib/jtidy.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jimi.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/avalon-framework-4.1.5.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/xalan-2.6.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/xml-apis-2.0.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fop-0.20.5.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/xerces-2.4.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/batik-all-1.6.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/xalan-2.7.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/xerces-2.7.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -476,8 +477,8 @@
</library>
<library name="Dom4J">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/dom4j-1.6.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jdom-1.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/dom4j-1.6.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -491,8 +492,8 @@
</library>
<library name="JMock">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/jmock-1.0.1.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/jmock-cglib-1.0.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/jmock-1.1.0RC1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/jmock-cglib-1.1.0RC1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -507,23 +508,22 @@
<root url="jar://$PROJECT_DIR$/lib/flickrapi-1.0a7.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/flipper.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/saaj-1.2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/wsdl4j-1.5.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/mail-1.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-discovery-0.2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/axis-1.2RC2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jaxrpc-1.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/ical4j-0.9.19M.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/axis-1.4.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/mail-1.4.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/wsdl4j-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="JCR">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/jackrabbit-1.0-SNAPSHOT.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/jackrabbit-api-1.0-SNAPSHOT.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/jackrabbit-commons-1.0-SNAPSHOT.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/jackrabbit-core-1.0-SNAPSHOT.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jcr-1.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/jackrabbit-jcr-commons-1.0.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/jackrabbit-core-1.0.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/graffito-jcr-mapping-1.0-a1-amelentev-dev.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -531,26 +531,25 @@
<library name="Chart">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/jfreechart-1.0.0-rc1.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/jcommon-1.0.0-rc1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/jcommon-1.0.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
<library name="XML">
<CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/jcommon-1.0.0-rc1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/xml-apis-2.0.2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/xalan-2.6.0.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/xerces-2.4.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/xalan-2.7.0.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/xerces-2.7.1.jar!/" />
</CLASSES>
<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/concurrent.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/oscache-2.3.2M.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/jgroups-2.2.9.3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/concurrent-1.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: xwiki/trunk/xwiki.iws
===================================================================
--- xwiki/trunk/xwiki.iws 2006-08-28 23:02:37 UTC (rev 1238)
+++ xwiki/trunk/xwiki.iws 2006-08-28 23:51:24 UTC (rev 1239)
@@ -283,7 +283,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/rcs/Archive.java" line="823" class="org.suigeneris.jrcs.rcs.Archive" package="org.suigeneris.jrcs.rcs">
+ <breakpoint url="file://$PROJECT_DIR$/src/test/cactus/com/xpn/xwiki/test/ViewEditTest.java" line="553" 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" />
@@ -296,7 +296,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/rcs/Archive.java" line="842" class="org.suigeneris.jrcs.rcs.Archive" package="org.suigeneris.jrcs.rcs">
+ <breakpoint url="file://$PROJECT_DIR$/src/test/cactus/com/xpn/xwiki/test/ServletVirtualTest.java" line="185" class="com.xpn.xwiki.test.ServletVirtualTest" package="com.xpn.xwiki.test">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -309,6 +309,32 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyFormAuthenticator.java" line="100" class="com.xpn.xwiki.user.impl.xwiki.MyFormAuthenticator" 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>
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyFormAuthenticator.java" line="119" class="com.xpn.xwiki.user.impl.xwiki.MyFormAuthenticator" 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>
@@ -624,93 +650,86 @@
</component>
<component name="FileEditorManager">
<leaf>
- <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="XWikiXmlRpcServlet.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/xmlrpc/XWikiXmlRpcServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="54" column="35" selection-start="1971" selection-end="1971" vertical-scroll-proportion="1.3430353">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Util.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/util/Util.java">
+ <file leaf-file-name="BaseRpcHandler.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/xmlrpc/BaseRpcHandler.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="244" column="25" selection-start="8151" selection-end="8151" vertical-scroll-proportion="0.3722287">
+ <state line="57" column="71" selection-start="2217" selection-end="2217" vertical-scroll-proportion="0.7068607">
<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/api/XWiki.java">
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state line="1016" column="47" selection-start="32382" selection-end="32382" vertical-scroll-proportion="0.008168028">
+ <state line="106" column="30" selection-start="3022" selection-end="3033" vertical-scroll-proportion="0.34095633">
<folding />
</state>
</provider>
</entry>
</file>
- <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="QueryPluginTest.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/plugin/query/QueryPluginTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="2574" column="61" selection-start="91999" selection-end="91999" vertical-scroll-proportion="0.54142356">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="version.properties" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/version.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1" column="16" selection-start="47" selection-end="47" vertical-scroll-proportion="0.01983664">
+ <state line="339" column="108" selection-start="18860" selection-end="18860" vertical-scroll-proportion="0.8025751">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Document.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Document.java">
+ <file leaf-file-name="QueryPlugin.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/query/QueryPlugin.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="892" column="72" selection-start="30653" selection-end="30653" vertical-scroll-proportion="0.20653442">
+ <state line="96" column="28" selection-start="3292" selection-end="3292" vertical-scroll-proportion="0.6632017">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="macros.vm" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/web/templates/macros.vm">
+ <file leaf-file-name="HibernateQuery.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/query/HibernateQuery.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="293" column="87" selection-start="8775" selection-end="8775" vertical-scroll-proportion="0.64608073">
- <folding />
+ <state line="47" column="111" selection-start="2027" selection-end="2027" vertical-scroll-proportion="0.9189189">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ApplicationResources.properties" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/ApplicationResources.properties">
+ <file leaf-file-name="xwiki.hbm.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/xwiki.hbm.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="457" column="0" selection-start="15906" selection-end="15906" vertical-scroll-proportion="0.88098013">
+ <state line="153" column="50" selection-start="5441" selection-end="5441" vertical-scroll-proportion="1.2162162">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ApplicationResources_en.properties" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/ApplicationResources_en.properties">
+ <file leaf-file-name="SecHibernateQuery.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/query/SecHibernateQuery.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="457" column="0" selection-start="15906" selection-end="15906" vertical-scroll-proportion="0.88098013">
- <folding />
+ <state line="39" column="57" selection-start="1476" selection-end="1476" vertical-scroll-proportion="0.67151767">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ApplicationResources_fr.properties" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/ApplicationResources_fr.properties">
+ <file leaf-file-name="XWikiXMLRPCRequest.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/xmlrpc/XWikiXMLRPCRequest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="284" column="47" selection-start="10258" selection-end="10258" vertical-scroll-proportion="0.504084">
+ <state line="31" column="8" selection-start="1108" selection-end="1108" vertical-scroll-proportion="0.3180873">
<folding />
</state>
</provider>
@@ -776,8 +795,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/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/store/XWikiStoreInterface.java" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/BaseCollection.java" root0="SKIP_INSPECTION" />
</component>
<component name="InspectionManager">
@@ -906,7 +925,7 @@
<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="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -916,9 +935,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\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>
<PATH>
<PATH_ELEMENT>
@@ -926,13 +953,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\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>
@@ -940,18 +975,50 @@
<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\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\xwiki\src\main\web\WEB-INF" />
+ <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_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\main\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="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>
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
@@ -1002,14 +1069,14 @@
<property name="RunManagerConfig.compileBeforeRunning" value="true" />
<property name="cvs_file_history_flatWidth6" value="91" />
<property name="cvs_file_history_flatOrder0" value="0" />
+ <property name="cvs_file_history_treeOrder3" value="3" />
<property name="cvs_file_history_treeWidth4" value="141" />
- <property name="cvs_file_history_treeOrder3" value="3" />
<property name="cvs_file_history_treeWidth6" value="140" />
<property name="last_opened_file_path" value="C:\Documents and Settings\ldubost\Mes documents" />
<property name="cvs_file_history_flatOrder5" value="5" />
<property name="cvs_file_history_flatWidth5" value="92" />
+ <property name="cvs_file_history_treeOrder2" value="2" />
<property name="cvs_file_history_treeWidth3" value="141" />
- <property name="cvs_file_history_treeOrder2" value="2" />
<property name="cvs_file_history_treeWidth5" value="141" />
<property name="cvs_file_history_flatOrder6" value="6" />
<property name="cvs_file_history_flatWidth0" value="140" />
@@ -1037,67 +1104,7 @@
</component>
<component name="RestoreUpdateTree" />
<component name="RunManager">
- <activeType name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" />
- <tempConfiguration selected="false" default="false" name="ChartingMacroTest" 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.MacroMappingRenderTest" />
- <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="ADDITIONAL_CLASS_PATH" />
- <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" />
- </tempConfiguration>
- <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="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>
+ <activeType name="JUnit" />
<configuration selected="false" default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -1110,18 +1117,55 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local">
+ <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
- <option name="PORT" value="80" />
+ <option name="PORT" value="8080" />
<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="JSP_PACKAGE" value="" />
- <option name="VM_OPTS" value="" />
- <option name="USE_WEBSPHERE51_LINEMAPPING_MODEL" value="false" />
- <option name="LOCAL_PORT" value="80" />
+ <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="jar">
+ <option name="CONTEXT_PATH" value="/" />
+ <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">
+ <option name="USE_ENV_VARIABLES" value="true" />
+ <STARTUP>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT" value="" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ </STARTUP>
+ <SHUTDOWN>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT" value="" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ </SHUTDOWN>
+ </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="" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ </STARTUP>
+ <SHUTDOWN>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT" value="" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ </SHUTDOWN>
+ </ConfigurationWrapper>
</configuration>
<configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
<option name="WORKING_DIRECTORY" />
@@ -1131,15 +1175,31 @@
<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="Run" />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
</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" />
@@ -1156,55 +1216,57 @@
<value defaultName="wholeProject" />
</option>
</configuration>
- <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
+ <configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
- <option name="PORT" value="8080" />
+ <option name="PORT" value="80" />
<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="" />
- <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="jar">
- <option name="CONTEXT_PATH" value="/" />
- <option name="MODULE_NAME" value="xwiki" />
- <option name="DEPLOY" value="true" />
- </J2EE_MODULE>
+ <option name="JSP_PACKAGE" value="" />
+ <option name="VM_OPTS" value="" />
+ <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="XWiki.com" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="lanai.xpertnet.biz" />
+ <option name="PORT" value="5005" />
+ <RunnerSettings RunnerId="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="Debug">
- <option name="DEBUG_PORT" value="3383" />
+ <option name="DEBUG_PORT" value="1409" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" 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="" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="" />
- </STARTUP>
- <SHUTDOWN>
- <option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="" />
- </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="" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="" />
- </STARTUP>
- <SHUTDOWN>
- <option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="" />
- </SHUTDOWN>
- </ConfigurationWrapper>
+ <ConfigurationWrapper RunnerId="Debug" />
</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" />
@@ -1219,11 +1281,7 @@
<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="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1236,8 +1294,12 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
+ <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" />
@@ -1272,7 +1334,7 @@
<option name="PROGRAM_PARAMETERS" value=" stop" />
</SHUTDOWN>
</ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
@@ -1306,11 +1368,7 @@
<option name="MODULE_NAME" value="xwiki" />
<option name="DEPLOY" value="true" />
</J2EE_MODULE>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="3383" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1323,8 +1381,12 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="3383" />
+ <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" />
@@ -1354,7 +1416,7 @@
<option name="PROGRAM_PARAMETERS" value=" stop" />
</SHUTDOWN>
</ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
@@ -1370,31 +1432,6 @@
</SHUTDOWN>
</ConfigurationWrapper>
</configuration>
- <configuration selected="true" default="false" name="XWiki.com" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="lanai.xpertnet.biz" />
- <option name="PORT" value="5005" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1409" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
- <RunnerSettings RunnerId="Profile ">
- <option name="myStartupWithAllocations" value="false" />
- <option name="myCPUStartup" value="" />
- <option name="myUsedMemoryThreshold" value="0" />
- <option name="myDontLaunchUI" value="false" />
- <option name="myCaptureMemoryOnExit" value="false" />
- <option name="myCaptureCPUOnExit" value="false" />
- <option name="mySnapshotsDir" value="" />
- <option name="myForceJVMTI" value="false" />
- <option name="myDisableAlloc" value="false" />
- <option name="myDisableCounts" value="false" />
- </RunnerSettings>
- <ConfigurationWrapper RunnerId="Debug" />
- </configuration>
<configuration selected="false" default="false" name="UtilTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1412,11 +1449,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1054" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1429,9 +1462,13 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="1054" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="WikiWikiBaseRenderTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1452,6 +1489,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1464,18 +1502,17 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
- <configuration selected="true" default="false" name="StoreTest" 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="" />
<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="testBadContentVersioningNotOk" />
- <option name="TEST_OBJECT" value="method" />
- <option name="VM_PARAMETERS" value="" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-Xmx256m" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/build/xwikibase_test" />
<option name="ADDITIONAL_CLASS_PATH">
@@ -1486,11 +1523,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1825" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1503,9 +1536,13 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="1825" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="StoreHibernateCacheTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1558,11 +1595,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1055" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1575,9 +1608,13 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="1055" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="ObjectTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1598,6 +1635,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1610,7 +1648,6 @@
<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">
@@ -1632,11 +1669,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="3983" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1649,10 +1682,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="3983" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Profile " />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Profile " />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="SearchTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1673,11 +1710,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="2647" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1690,9 +1723,13 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="2647" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="PluginTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1713,6 +1750,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1725,7 +1763,6 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="UserTest" type="JUnit" factoryName="JUnit">
@@ -1747,11 +1784,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1377" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1764,17 +1797,21 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="1377" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
- <configuration selected="false" default="false" name="ViewEditTest" type="JUnit" factoryName="JUnit">
+ <configuration selected="false" default="false" name="XMLRpcTest" 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.ViewEditTest" />
- <option name="METHOD_NAME" value="testViewRevNotOk" />
+ <option name="MAIN_CLASS_NAME" value="com.xpn.xwiki.test.XMLRpcTest" />
+ <option name="METHOD_NAME" value="testRollbackRevWithObjOk" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-Xmx400m -XX:MaxPermSize=256m" />
<option name="PARAMETERS" value="" />
@@ -1787,11 +1824,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1336" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1804,9 +1837,13 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="1336" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="StoreObjectRCSFileTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1859,11 +1896,7 @@
<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="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1876,9 +1909,13 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="1069" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="XWikiTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1899,11 +1936,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1826" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1916,9 +1949,13 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="1826" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="RadeoxHelperTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1939,11 +1976,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="2019" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1956,9 +1989,13 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="2019" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="VelocityRenderTest.testCacheRenderer" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1979,11 +2016,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="2597" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1996,10 +2029,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="2597" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Profile " />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Profile " />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="ServletVirtualTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2007,7 +2044,7 @@
<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.ServletVirtualTest" />
- <option name="METHOD_NAME" value="testVirtualView2" />
+ <option name="METHOD_NAME" value="testAuthForWikiOwner" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="" />
<option name="PARAMETERS" value="" />
@@ -2020,11 +2057,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1056" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2037,9 +2070,13 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="1056" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="Servleti18nTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2060,6 +2097,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2072,7 +2110,6 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="ServletStatsTest" type="JUnit" factoryName="JUnit">
@@ -2094,6 +2131,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2106,7 +2144,6 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="StatsTest" type="JUnit" factoryName="JUnit">
@@ -2128,6 +2165,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2140,7 +2178,6 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="ServletAuthTest" type="JUnit" factoryName="JUnit">
@@ -2162,11 +2199,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="2833" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2179,9 +2212,13 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="2833" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="AllServletTests" type="JUnit" factoryName="JUnit">
<module name="xwiki" />
@@ -2198,6 +2235,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2210,7 +2248,6 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="AllTests" type="JUnit" factoryName="JUnit">
@@ -2228,11 +2265,43 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <RunnerSettings RunnerId="Run" />
+ <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="Debug">
<option name="DEBUG_PORT" value="3790" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="false" />
</RunnerSettings>
+ <ConfigurationWrapper RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
+ </configuration>
+ <configuration selected="false" default="false" name="Chart" 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.plugin.charts.tests" />
+ <option name="MAIN_CLASS_NAME" value="com.xpn.xwiki.plugin.charts.tests.TableDataSourceTest" />
+ <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="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2245,16 +2314,14 @@
<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="Chart" type="JUnit" factoryName="JUnit">
+ <configuration selected="true" default="false" name="QueryPluginTest" 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.plugin.charts.tests" />
- <option name="MAIN_CLASS_NAME" value="com.xpn.xwiki.plugin.charts.tests.TableDataSourceTest" />
+ <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="" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="" />
@@ -2264,6 +2331,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2276,7 +2344,6 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="true" default="false" name="Groovy Export" type="Application" factoryName="Application">
@@ -2287,6 +2354,7 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<module name="xwikibase" />
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2299,7 +2367,6 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
</component>
@@ -2409,39 +2476,39 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-4" y="-4" width="1688" height="1024" extended-state="6" />
- <editor active="true" />
+ <frame x="0" y="0" width="1680" height="1016" extended-state="0" />
+ <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="18" />
<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="true" internal_type="docked" type="docked" visible="false" weight="0.33801955" 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.3730337" order="1" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.33783785" 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.37301588" 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.2235955" order="15" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.22335601" order="15" />
<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="11" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="11" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="13" />
<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.31348315" order="2" />
+ <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.40929705" 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="10" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.6011236" order="3" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.44331065" 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="10" />
<window_info id="SQL" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5983471" order="16" />
<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="RegexPlugin" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.330033" order="17" />
<window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="4" />
- <window_info id="RegexPlugin" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.330033" order="17" />
+ <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="5" />
- <window_info id="Struts Layout" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32979593" order="3" />
+ <window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33009708" order="6" />
<window_info id="IDEtalk History" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="9" />
- <window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33009708" order="6" />
+ <window_info id="Build" active="false" anchor="bottom" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.31544715" order="12" />
<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="12" />
<window_info id="Hibernate Tools" active="false" anchor="righ