r1072 - xwiki/trunk
Ludovic Dubost
ludovic at users.forge.objectweb.org
Thu May 25 18:42:57 CEST 2006
Author: ludovic
Date: 2006-05-25 18:42:57 +0200 (Thu, 25 May 2006)
New Revision: 1072
Modified:
xwiki/trunk/xwiki.iml
xwiki/trunk/xwiki.iws
Log:
Updated intellij build which did not package the cache libs in the webapp
Modified: xwiki/trunk/xwiki.iml
===================================================================
--- xwiki/trunk/xwiki.iml 2006-05-23 02:38:54 UTC (rev 1071)
+++ xwiki/trunk/xwiki.iml 2006-05-25 16:42:57 UTC (rev 1072)
@@ -55,7 +55,7 @@
<setting name="EXPLODED_URL" value="file://$MODULE_DIR$/release/xwiki/web" />
<setting name="EXPLODED_ENABLED" value="true" />
<setting name="JAR_URL" value="file://$MODULE_DIR$/release/xwiki.war" />
- <setting name="JAR_ENABLED" value="false" />
+ <setting name="JAR_ENABLED" value="true" />
<setting name="SYNC_EXPLODED_DIR" value="true" />
<setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" />
<setting name="RUN_JASPER_VALIDATION" value="false" />
@@ -74,6 +74,10 @@
<attribute name="URI" value="/WEB-INF/classes" />
<url>file://$MODULE_DIR$/build/xwikibase_test</url>
</containerElement>
+ <containerElement type="library" level="project" name="cache">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib" />
+ </containerElement>
<containerElement type="library" level="project" name="Chart">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
Modified: xwiki/trunk/xwiki.iws
===================================================================
--- xwiki/trunk/xwiki.iws 2006-05-23 02:38:54 UTC (rev 1071)
+++ xwiki/trunk/xwiki.iws 2006-05-25 16:42:57 UTC (rev 1072)
@@ -747,93 +747,91 @@
</component>
<component name="FileEditorManager">
<leaf>
- <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">
+ <file leaf-file-name="OSCacheCache.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="15" column="85" selection-start="454" selection-end="454" vertical-scroll-proportion="0.029411765">
+ <state line="58" column="13" selection-start="2005" selection-end="2005" vertical-scroll-proportion="0.0543131">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiGroupServiceImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiGroupServiceImpl.java">
+ <file leaf-file-name="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="107" column="16" selection-start="4261" selection-end="4261" vertical-scroll-proportion="0.02866779">
+ <state line="148" column="17" selection-start="5995" selection-end="5995" vertical-scroll-proportion="0.6517572">
<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="XWikiMacrosMappingRenderer.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiMacrosMappingRenderer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="2702" column="55" selection-start="105790" selection-end="105790" vertical-scroll-proportion="0.7352941">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="147" column="13" selection-start="5791" selection-end="5791" vertical-scroll-proportion="0.7718121">
+ <folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="MacroMappingRenderTest.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/MacroMappingRenderTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="304" column="30" selection-start="6463" selection-end="6463" vertical-scroll-proportion="0.81112987">
+ <state line="115" column="20" selection-start="4737" selection-end="4737" vertical-scroll-proportion="0.88590604">
<folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="xwiki.cfg" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/xwiki.cfg">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="32" selection-start="1147" selection-end="1147" vertical-scroll-proportion="0.20067453">
+ <state line="42" column="42" selection-start="2155" selection-end="2155" vertical-scroll-proportion="0.68456376">
<folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="struts-config.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/struts-config.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="57" column="33" selection-start="1807" selection-end="1807" vertical-scroll-proportion="0.42664418">
+ <state line="331" column="40" selection-start="11110" selection-end="11110" vertical-scroll-proportion="1.4217253">
<folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="XWikiRequestProcessor.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/XWikiRequestProcessor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="4" selection-start="1952" selection-end="1952" vertical-scroll-proportion="0.47058824">
+ <state line="35" column="25" selection-start="1456" selection-end="1456" vertical-scroll-proportion="0.51342285">
<folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="StatusAction.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/StatusAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="64" selection-start="957" selection-end="957" vertical-scroll-proportion="0.02866779">
+ <state line="37" column="25" selection-start="1420" selection-end="1432" vertical-scroll-proportion="0.22683705">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiAction.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/XWikiAction.java">
+ <file leaf-file-name="PlainSocketImpl.class" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://C:/tools/jdk1.5.0_04/jre/lib/rt.jar!/java/net/PlainSocketImpl.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="204" column="55" selection-start="8470" selection-end="8470" vertical-scroll-proportion="0.02866779">
+ <state line="99" column="0" selection-start="4267" selection-end="4267" vertical-scroll-proportion="0.7013423">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiNotificationManager.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/XWikiNotificationManager.java">
+ <file leaf-file-name="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="97" column="60" selection-start="3550" selection-end="3550" vertical-scroll-proportion="0.62731874">
+ <state line="72" column="36" selection-start="2569" selection-end="2569" vertical-scroll-proportion="0.0543131">
<folding />
</state>
</provider>
@@ -899,9 +897,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/objects/BaseCollection.java" root0="SKIP_INSPECTION" />
<setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiStoreInterface.java" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java" root0="SKIP_INSPECTION" />
- <setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/BaseCollection.java" root0="SKIP_INSPECTION" />
<profiles file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiStoreInterface.java" profile_name="Default" is_active="false" />
</component>
<component name="InspectionManager">
@@ -948,8 +946,8 @@
<option name="ADD_LABEL_ON_UNIT_TEST_FAILED" value="true" />
</component>
<component name="ModuleEditorState">
- <option name="LAST_EDITED_MODULE_NAME" value="xwikibase" />
- <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
+ <option name="LAST_EDITED_MODULE_NAME" value="xwiki" />
+ <option name="LAST_EDITED_TAB_NAME" value="J2EE Build Settings" />
</component>
<component name="NamedScopeManager" />
<component name="PackagesPane">
@@ -1109,70 +1107,6 @@
<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>
@@ -1237,7 +1171,7 @@
<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="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\java\com\xpn\xwiki\web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -1247,40 +1181,6 @@
<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>
@@ -1313,7 +1213,7 @@
<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="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\web\WEB-INF" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -1367,14 +1267,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" />
@@ -1417,6 +1317,7 @@
<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" />
@@ -1434,41 +1335,16 @@
<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="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
- <option name="WORKING_DIRECTORY" />
+ <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="8080" />
- <option name="LOCAL" value="false" />
- <option name="OPEN_IN_BROWSER" value="true" />
- <option name="OPEN_IN_BROWSER_URL" value="/" />
- <option name="COMMON_VM_ARGUMENTS" value="" />
- <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" />
+ <option name="PORT" value="5005" />
</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" />
@@ -1481,22 +1357,6 @@
<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" />
@@ -1513,6 +1373,46 @@
<value defaultName="wholeProject" />
</option>
</configuration>
+ <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
+ <option name="WORKING_DIRECTORY" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="8080" />
+ <option name="LOCAL" value="false" />
+ <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>
+ <ConfigurationWrapper RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
+ </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>
<configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -1526,13 +1426,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>
- <RunnerSettings RunnerId="Run" />
- <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" />
@@ -1547,7 +1447,7 @@
<option name="PROGRAM_PARAMETERS" value="" />
</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" />
@@ -1584,6 +1484,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="" />
@@ -1596,34 +1497,8 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
- <configuration selected="true" default="false" name="XWiki.com" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="lanai.xpertnet.biz" />
- <option name="PORT" value="5005" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1409" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
- <RunnerSettings RunnerId="Profile ">
- <option name="myStartupWithAllocations" value="false" />
- <option name="myCPUStartup" value="" />
- <option name="myUsedMemoryThreshold" value="0" />
- <option name="myDontLaunchUI" value="false" />
- <option name="myCaptureMemoryOnExit" value="false" />
- <option name="myCaptureCPUOnExit" value="false" />
- <option name="mySnapshotsDir" value="" />
- <option name="myForceJVMTI" value="false" />
- <option name="myDisableAlloc" value="false" />
- <option name="myDisableCounts" value="false" />
- </RunnerSettings>
- <ConfigurationWrapper RunnerId="Debug" />
- </configuration>
<configuration selected="false" default="false" name="UtilTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1641,6 +1516,7 @@
<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" />
@@ -1658,9 +1534,8 @@
<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" />
@@ -1681,6 +1556,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="" />
@@ -1693,7 +1569,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="StoreHibernateTest" type="JUnit" factoryName="JUnit">
@@ -1715,6 +1590,7 @@
<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" />
@@ -1732,9 +1608,8 @@
<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" />
@@ -1787,6 +1662,7 @@
<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" />
@@ -1804,9 +1680,8 @@
<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" />
@@ -1827,6 +1702,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="" />
@@ -1839,7 +1715,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.testCommentReadPerfMultipleVersions" type="JUnit" factoryName="JUnit">
@@ -1861,6 +1736,7 @@
<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" />
@@ -1878,10 +1754,9 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Profile " />
- <ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="SearchTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1902,6 +1777,7 @@
<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" />
@@ -1919,9 +1795,8 @@
<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" />
@@ -1942,6 +1817,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="" />
@@ -1954,7 +1830,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">
@@ -1976,6 +1851,7 @@
<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" />
@@ -1993,9 +1869,8 @@
<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="ViewEditTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2016,6 +1891,7 @@
<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" />
@@ -2033,9 +1909,8 @@
<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" />
@@ -2088,6 +1963,7 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1069" />
<option name="TRANSPORT" value="0" />
@@ -2105,9 +1981,8 @@
<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="XWikiTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2128,6 +2003,7 @@
<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" />
@@ -2145,9 +2021,8 @@
<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" />
@@ -2168,6 +2043,7 @@
<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" />
@@ -2185,9 +2061,8 @@
<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" />
@@ -2208,6 +2083,7 @@
<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" />
@@ -2225,9 +2101,8 @@
<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" />
@@ -2248,6 +2123,7 @@
<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" />
@@ -2265,9 +2141,8 @@
<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" />
@@ -2288,6 +2163,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="" />
@@ -2300,7 +2176,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">
@@ -2322,6 +2197,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="" />
@@ -2334,7 +2210,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">
@@ -2356,6 +2231,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="" />
@@ -2368,7 +2244,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">
@@ -2390,6 +2265,7 @@
<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" />
@@ -2407,9 +2283,8 @@
<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" />
@@ -2426,6 +2301,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="" />
@@ -2438,7 +2314,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">
@@ -2456,6 +2331,7 @@
<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" />
@@ -2473,9 +2349,8 @@
<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" />
@@ -2492,6 +2367,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="" />
@@ -2504,7 +2380,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="Tomcat 5" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat">
@@ -2515,11 +2390,12 @@
<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">
+ <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="jar">
<option name="CONTEXT_PATH" value="/xwiki" />
<option name="MODULE_NAME" value="xwiki" />
<option name="DEPLOY" value="true" />
</J2EE_MODULE>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="3515" />
<option name="TRANSPORT" value="0" />
@@ -2537,8 +2413,7 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
- <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" />
@@ -2558,42 +2433,67 @@
<option name="IS_PREDEFINED" value="false" />
</EnvironmentVariables>
</ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
+ <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:\Program Files\Apache Software Foundation\Tomcat 5.0\bin\catalina.bat" />
+ <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:\Program Files\Apache Software Foundation\Tomcat 5.0\bin\catalina.bat" />
+ <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="Run">
+ <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:\bin\catalina.bat" />
+ <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:\bin\catalina.bat" />
+ <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>
- <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="XWiki.com" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="lanai.xpertnet.biz" />
+ <option name="PORT" value="5005" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="1409" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <RunnerSettings RunnerId="Profile ">
+ <option name="myStartupWithAllocations" value="false" />
+ <option name="myCPUStartup" value="" />
+ <option name="myUsedMemoryThreshold" value="0" />
+ <option name="myDontLaunchUI" value="false" />
+ <option name="myCaptureMemoryOnExit" value="false" />
+ <option name="myCaptureCPUOnExit" value="false" />
+ <option name="mySnapshotsDir" value="" />
+ <option name="myForceJVMTI" value="false" />
+ <option name="myDisableAlloc" value="false" />
+ <option name="myDisableCounts" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Debug" />
+ </configuration>
</component>
<component name="SQL">
<general confirmCommit="false" confirmRollback="false" confirmClose="false" />
@@ -2690,27 +2590,27 @@
<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.13349515" order="0" x="-87" y="100" width="469" height="491" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.18446602" order="0" x="-87" y="100" width="469" height="491" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.36842105" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.22168285" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32817337" order="9" />
<window_info id="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.5140962" order="8" />
+ <window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.14196567" order="8" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.27931595" order="1" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.2562893" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.42260063" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.15110683" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.50328946" order="3" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5140741" order="3" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.40038684" order="0" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="SQL" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5983471" order="10" />
<window_info id="Regex" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
- <window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="RegexPlugin" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.330033" order="11" />
+ <window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Struts Layout" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32979593" order="3" />
<window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33009708" order="3" />
<window_info id="Build" active="false" anchor="bottom" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.31544715" order="8" />
@@ -2836,111 +2736,107 @@
<option name="multicastPort" value="3274" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiVelocityRenderer.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="64" column="60" selection-start="2470" selection-end="2470" vertical-scroll-proportion="0.056478404">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="26" column="0" selection-start="1029" selection-end="1029" vertical-scroll-proportion="1.2209945">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/MacroMappingRenderTest.java">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/oscache.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="199" column="0" selection-start="9901" selection-end="9901" vertical-scroll-proportion="0.1764706">
+ <state line="43" column="21" selection-start="1427" selection-end="1448" vertical-scroll-proportion="0.035789475">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/XWikiNotificationInterface.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="134" selection-start="1304" selection-end="1430" vertical-scroll-proportion="0.40134907">
+ <state line="566" column="32" selection-start="17012" selection-end="17012" vertical-scroll-proportion="0.05704698">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/XWikiNotificationRule.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="26" column="17" selection-start="1014" selection-end="1014" vertical-scroll-proportion="0.17200674">
+ <state line="48" column="14" selection-start="1728" selection-end="1728" vertical-scroll-proportion="0.05704698">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/XWikiActionRule.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/Utils.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="25" selection-start="1690" selection-end="1690" vertical-scroll-proportion="0.59865093">
+ <state line="227" column="14" selection-start="8864" selection-end="8864" vertical-scroll-proportion="0.05704698">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/XWikiPageNotification.java">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/struts-config.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="15" column="85" selection-start="454" selection-end="454" vertical-scroll-proportion="0.029411765">
+ <state line="331" column="40" selection-start="11110" selection-end="11110" vertical-scroll-proportion="1.4217253">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/UsersClass.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/XWikiRequestProcessor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="64" selection-start="957" selection-end="957" vertical-scroll-proportion="0.02866779">
+ <state line="35" column="25" selection-start="1456" selection-end="1456" vertical-scroll-proportion="0.51342285">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/XWikiAction.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/StatusAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="204" column="55" selection-start="8470" selection-end="8470" vertical-scroll-proportion="0.02866779">
+ <state line="37" column="25" selection-start="1420" selection-end="1432" vertical-scroll-proportion="0.22683705">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/XWikiNotificationManager.java">
+ <entry file="jar://C:/tools/jdk1.5.0_04/jre/lib/rt.jar!/java/net/PlainSocketImpl.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="97" column="60" selection-start="3550" selection-end="3550" vertical-scroll-proportion="0.62731874">
+ <state line="99" column="0" selection-start="4267" selection-end="4267" vertical-scroll-proportion="0.7013423">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiGroupServiceImpl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/xwiki.hbm.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="107" column="16" selection-start="4261" selection-end="4261" vertical-scroll-proportion="0.02866779">
+ <state line="72" column="36" selection-start="2569" selection-end="2569" vertical-scroll-proportion="0.0543131">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="2702" column="55" selection-start="105790" selection-end="105790" vertical-scroll-proportion="0.7352941">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="58" column="13" selection-start="2005" selection-end="2005" vertical-scroll-proportion="0.0543131">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/plugin/charts/mocks/MockHttpServletRequest.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/XWikiAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="304" column="30" selection-start="6463" selection-end="6463" vertical-scroll-proportion="0.81112987">
+ <state line="148" column="17" selection-start="5995" selection-end="5995" vertical-scroll-proportion="0.6517572">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Object.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiMacrosMappingRenderer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="32" selection-start="1147" selection-end="1147" vertical-scroll-proportion="0.20067453">
+ <state line="147" column="13" selection-start="5791" selection-end="5791" vertical-scroll-proportion="0.7718121">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Collection.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/MacroMappingRenderTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="57" column="33" selection-start="1807" selection-end="1807" vertical-scroll-proportion="0.42664418">
+ <state line="115" column="20" selection-start="4737" selection-end="4737" vertical-scroll-proportion="0.88590604">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/web/templates/editprefs.vm">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/xwiki.cfg">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="4" selection-start="1952" selection-end="1952" vertical-scroll-proportion="0.47058824">
+ <state line="42" column="42" selection-start="2155" selection-end="2155" vertical-scroll-proportion="0.68456376">
<folding />
</state>
</provider>
More information about the Xwiki-notifications
mailing list