r1310 - in xwiki/trunk: . src/main/java/com/xpn/xwiki src/main/java/com/xpn/xwiki/api src/main/java/com/xpn/xwiki/plugin/query
Ludovic Dubost
ludovic at users.forge.objectweb.org
Tue Sep 12 22:42:12 CEST 2006
Author: ludovic
Date: 2006-09-12 22:42:11 +0200 (Tue, 12 Sep 2006)
New Revision: 1310
Modified:
xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/HibernateQuery.java
xwiki/trunk/xwiki.iml
xwiki/trunk/xwiki.ipr
xwiki/trunk/xwiki.iws
Log:
Optimizing import
Additional impl. of query generator
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-09-12 20:04:10 UTC (rev 1309)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-09-12 20:42:11 UTC (rev 1310)
@@ -49,6 +49,9 @@
import com.xpn.xwiki.objects.meta.MetaClass;
import com.xpn.xwiki.plugin.XWikiPluginInterface;
import com.xpn.xwiki.plugin.XWikiPluginManager;
+import com.xpn.xwiki.plugin.query.XWikiCriteria;
+import com.xpn.xwiki.plugin.query.QueryPlugin;
+import com.xpn.xwiki.plugin.query.XWikiQuery;
import com.xpn.xwiki.render.XWikiRenderingEngine;
import com.xpn.xwiki.render.XWikiVelocityRenderer;
import com.xpn.xwiki.render.groovy.XWikiGroovyRenderer;
@@ -4005,7 +4008,6 @@
}
- /*
public String displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria, XWikiContext context) throws XWikiException {
BaseClass bclass = getDocument(className, context).getxWikiClass();
PropertyClass pclass = (PropertyClass) bclass.get(fieldname);
@@ -4094,5 +4096,4 @@
}
}
}
- */
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java 2006-09-12 20:04:10 UTC (rev 1309)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java 2006-09-12 20:42:11 UTC (rev 1310)
@@ -32,6 +32,8 @@
import com.sun.image.codec.jpeg.JPEGImageEncoder;
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.plugin.query.XWikiQuery;
+import com.xpn.xwiki.plugin.query.XWikiCriteria;
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.objects.meta.MetaClass;
import com.xpn.xwiki.stats.api.XWikiStatsService;
@@ -1028,7 +1030,7 @@
public String convertUsername(String username) {
return xwiki.convertUsername(username, context);
}
- /*
+
public String displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria, XWikiContext context) throws XWikiException {
return xwiki.displaySearch(fieldname, className, prefix, criteria, context);
}
@@ -1045,10 +1047,8 @@
return xwiki.searchAsTable(query, context);
}
- public PropertyClass getPropertyClassFromName(String propPath) {
- return xwiki.getPropertyClassFromName(propPath, context);
+ public com.xpn.xwiki.api.PropertyClass getPropertyClassFromName(String propPath) {
+ return new PropertyClass(xwiki.getPropertyClassFromName(propPath, context), context);
}
- */
-
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/HibernateQuery.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/HibernateQuery.java 2006-09-12 20:04:10 UTC (rev 1309)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/HibernateQuery.java 2006-09-12 20:42:11 UTC (rev 1310)
@@ -36,13 +36,12 @@
import com.xpn.xwiki.util.Util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jackrabbit.core.query.*;
import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.core.query.*;
import org.hibernate.Query;
import org.hibernate.Session;
import java.util.*;
-
/** Query implementation for Hibernate */
public class HibernateQuery extends DefaultQuery {
private static final Log log = LogFactory.getLog(HibernateQuery.class);
@@ -130,7 +129,7 @@
jcl_xwiki_classes.put(qn_xwiki_attachment, XWikiAttachment.class);
}
- protected class XWikiHibernateQueryTranslator implements QueryNodeVisitor {
+ protected class XWikiHibernateQueryTranslator implements org.apache.jackrabbit.core.query.QueryNodeVisitor {
XWikiHibernateQueryTranslator(QueryNode node) {
super();
node.accept(this, null);
Modified: xwiki/trunk/xwiki.iml
===================================================================
--- xwiki/trunk/xwiki.iml 2006-09-12 20:04:10 UTC (rev 1309)
+++ xwiki/trunk/xwiki.iml 2006-09-12 20:42:11 UTC (rev 1310)
@@ -43,9 +43,9 @@
<orderEntry type="library" name="JCR" level="project" />
<orderEntry type="library" name="XML" level="project" />
<orderEntry type="library" name="cache" level="project" />
- <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
<orderEntry type="library" name="Tomcat 5.0" level="application" />
<orderEntry type="library" name="Jrcs" level="project" />
+ <orderEntry type="library" name="Tomcat" level="application_server_libraries" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
@@ -79,6 +79,10 @@
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
+ <containerElement type="library" level="project" name="Captcha">
+ <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" />
@@ -163,13 +167,8 @@
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/web-test.xml" optional="false" version="2.3" />
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/web.xml" optional="false" version="2.3" />
<deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/src/main/web/META-INF/context.xml" optional="false" version="5.x" />
- <deploymentDescriptor name="" url="file://$MODULE_DIR$/src/main/web/META-INF/context.xml" optional="false">
- <option name="DEFAULT_DIR" value="WEB-INF" />
- <option name="NAME" value="" />
- <option name="DESCRIPTION" value="" />
- </deploymentDescriptor>
<webroots>
<root url="file://$MODULE_DIR$/src/main/web" relative="/" />
</webroots>
Modified: xwiki/trunk/xwiki.ipr
===================================================================
--- xwiki/trunk/xwiki.ipr 2006-09-12 20:04:10 UTC (rev 1309)
+++ xwiki/trunk/xwiki.ipr 2006-09-12 20:42:11 UTC (rev 1310)
@@ -289,7 +289,7 @@
<module fileurl="file://$PROJECT_DIR$/xwikibase.iml" filepath="$PROJECT_DIR$/xwikibase.iml" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.5" />
+ <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" />
<component name="ProjectRunConfigurationManager" />
<component name="RegexPlugin">
<option name="pos1" value="92" />
Modified: xwiki/trunk/xwiki.iws
===================================================================
--- xwiki/trunk/xwiki.iws 2006-09-12 20:04:10 UTC (rev 1309)
+++ xwiki/trunk/xwiki.iws 2006-09-12 20:42:11 UTC (rev 1310)
@@ -361,7 +361,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java" line="4097" class="com.xpn.xwiki.XWiki" package="com.xpn.xwiki">
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java" line="4098" class="com.xpn.xwiki.XWiki" package="com.xpn.xwiki">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -374,7 +374,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java" line="4067" class="com.xpn.xwiki.XWiki" package="com.xpn.xwiki">
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java" line="4069" class="com.xpn.xwiki.XWiki" package="com.xpn.xwiki">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -728,19 +728,21 @@
</component>
<component name="FileEditorManager">
<leaf>
- <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="XWiki.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="84" column="25" selection-start="2421" selection-end="2428" vertical-scroll-proportion="0.027823241">
- <folding />
+ <state line="311" column="54" selection-start="12187" selection-end="12191" vertical-scroll-proportion="0.225">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWiki.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
+ <file leaf-file-name="XWiki.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="4096" column="6" selection-start="161877" selection-end="161877" vertical-scroll-proportion="1.1800327">
+ <state line="53" column="0" selection-start="1802" selection-end="1802" vertical-scroll-proportion="0.053125">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -748,37 +750,39 @@
</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="hibernate.cfg.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/hibernate.cfg.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="1050" column="6" selection-start="34026" selection-end="34026" vertical-scroll-proportion="1.1243863">
+ <state line="0" column="61" selection-start="38" selection-end="38" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="QueryGeneratorTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/plugin/query/QueryGeneratorTest.java">
+ <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="118" column="8" selection-start="5569" selection-end="5569" vertical-scroll-proportion="1.1800327">
- <folding />
+ <state line="27" column="56" selection-start="1087" selection-end="1087" vertical-scroll-proportion="0.053125">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="StringClass.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java">
+ <file leaf-file-name="log4j.properties" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/resources/log4j.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="94" column="0" selection-start="2973" selection-end="3142" vertical-scroll-proportion="0.43698853">
+ <state line="0" column="7" selection-start="7" selection-end="7" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ListClass.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/ListClass.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="308" column="36" selection-start="9414" selection-end="9414" vertical-scroll-proportion="0.027823241">
+ <state line="27" column="15" selection-start="1897" selection-end="1897" vertical-scroll-proportion="0.55737704">
<folding />
</state>
</provider>
@@ -787,7 +791,7 @@
<file leaf-file-name="ViewAction.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/ViewAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="13" selection-start="1133" selection-end="1133" vertical-scroll-proportion="0.1391162">
+ <state line="31" column="13" selection-start="1133" selection-end="1133" vertical-scroll-proportion="0.265625">
<folding />
</state>
</provider>
@@ -796,7 +800,7 @@
<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="80" column="0" selection-start="3054" selection-end="3054" vertical-scroll-proportion="0.027823241">
+ <state line="97" column="0" selection-start="3705" selection-end="3705" vertical-scroll-proportion="0.525">
<folding />
</state>
</provider>
@@ -805,7 +809,7 @@
<file leaf-file-name="web.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="98" selection-start="300" selection-end="300" vertical-scroll-proportion="0.027823241">
+ <state line="10" column="98" selection-start="300" selection-end="300" vertical-scroll-proportion="0.053125">
<folding />
</state>
</provider>
@@ -814,7 +818,7 @@
<file leaf-file-name="NumberClass.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/NumberClass.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="134" column="15" selection-start="4458" selection-end="4458" vertical-scroll-proportion="0.07528642">
+ <state line="134" column="15" selection-start="4458" selection-end="4458" vertical-scroll-proportion="0.14375">
<folding />
</state>
</provider>
@@ -881,8 +885,8 @@
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java" root0="SKIP_INSPECTION" />
- <setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/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/objects/BaseCollection.java" root0="SKIP_INSPECTION" />
</component>
<component name="InspectionManager">
<option name="AUTOSCROLL_TO_SOURCE" value="false" />
@@ -930,7 +934,7 @@
</component>
<component name="ModuleEditorState">
<option name="LAST_EDITED_MODULE_NAME" value="xwiki" />
- <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
+ <option name="LAST_EDITED_TAB_NAME" value="Web Module Settings" />
</component>
<component name="NamedScopeManager" />
<component name="PackagesPane">
@@ -1222,23 +1226,9 @@
<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" />
+ <option name="STATE" value="2" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" splitterProportion="0.5">
@@ -1286,14 +1276,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" />
@@ -1350,40 +1340,15 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="2646" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
</tempConfiguration>
- <configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local">
- <option name="WORKING_DIRECTORY" />
- <option name="HOST" value="localhost" />
- <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="" />
- <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="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- </configuration>
<configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -1397,13 +1362,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" />
@@ -1418,7 +1383,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" />
@@ -1434,22 +1399,6 @@
</SHUTDOWN>
</ConfigurationWrapper>
</configuration>
- <configuration selected="false" default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
- <configuration selected="false" default="true" type="Application" factoryName="Application">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <module name="" />
- </configuration>
<configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -1464,6 +1413,19 @@
<option name="SERVER_NAME" value="myserver" />
<option name="DOMAIN_NAME" value="mydomain" />
</configuration>
+ <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="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="" />
+ <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="JUnit" factoryName="JUnit">
<module name="xwiki" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1480,6 +1442,13 @@
<value defaultName="wholeProject" />
</option>
</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="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -1488,15 +1457,36 @@
<option name="OPEN_IN_BROWSER" value="true" />
<option name="OPEN_IN_BROWSER_URL" value="/" />
<option name="COMMON_VM_ARGUMENTS" value="" />
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="3384" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
</configuration>
+ <configuration selected="false" default="true" type="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="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ </configuration>
<configuration selected="false" default="false" name="UtilTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1526,14 +1516,14 @@
<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>
- <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" />
@@ -1600,14 +1590,14 @@
<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>
- <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" />
@@ -1672,14 +1662,14 @@
<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>
- <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" />
@@ -1746,15 +1736,15 @@
<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>
- <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Profile " />
- <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="SearchTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1787,14 +1777,14 @@
<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>
- <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" />
@@ -1861,14 +1851,14 @@
<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>
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="XMLRpcTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1901,14 +1891,14 @@
<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>
- <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" />
@@ -1973,14 +1963,14 @@
<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>
- <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" />
@@ -2013,14 +2003,14 @@
<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>
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="RadeoxHelperTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2053,14 +2043,14 @@
<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>
- <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" />
@@ -2093,15 +2083,15 @@
<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>
- <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Profile " />
- <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
</configuration>
<configuration selected="false" default="false" name="ServletVirtualTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2134,14 +2124,14 @@
<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>
- <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" />
@@ -2276,14 +2266,14 @@
<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>
- <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" />
@@ -2342,14 +2332,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="3790" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="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" />
@@ -2408,14 +2398,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="2054" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
+ <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" />
@@ -2442,12 +2432,12 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="3515" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
@@ -2463,7 +2453,7 @@
<option name="PROGRAM_PARAMETERS" value=" stop" />
</SHUTDOWN>
</ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
@@ -2483,7 +2473,7 @@
<option name="IS_PREDEFINED" value="false" />
</EnvironmentVariables>
</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" />
@@ -2529,12 +2519,12 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="3383" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
@@ -2550,7 +2540,7 @@
<option name="PROGRAM_PARAMETERS" value=" stop" />
</SHUTDOWN>
</ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
@@ -2565,7 +2555,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" />
@@ -2736,12 +2726,12 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-4" y="-4" width="1688" height="1024" extended-state="6" />
+ <frame x="-4" y="-4" width="1688" height="1024" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3409091" order="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.42359412" order="0" x="-87" y="100" width="469" height="491" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.2616137" 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.37191013" 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.41348314" order="15" />
@@ -2751,24 +2741,24 @@
<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="true" weight="0.26853934" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.46629214" 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.38651684" order="3" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.5955056" 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="Struts Layout" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32979593" order="3" />
+ <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="Palette" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="5" />
- <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="Struts Layout" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32979593" order="3" />
<window_info id="IDEtalk History" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="9" />
- <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="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="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="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3942857" order="7" />
<window_info id="Struts Console" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32979593" order="8" />
<window_info id="Tetris" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32979593" order="3" />
@@ -2903,113 +2893,117 @@
<option name="multicastPort" value="3274" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/PasswordClass.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="0" selection-start="1851" selection-end="1851" vertical-scroll-proportion="0.5157526">
+ <state line="85" column="4" selection-start="2778" selection-end="2778" vertical-scroll-proportion="0.03526971">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Document.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1911" column="94" selection-start="66548" selection-end="66548" vertical-scroll-proportion="0.569395">
+ <state line="84" column="25" selection-start="2421" selection-end="2428" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/BaseObject.java">
+ <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/plugin/query/QueryGeneratorTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="87" column="0" selection-start="3314" selection-end="3314" vertical-scroll-proportion="0.4483986">
+ <state line="118" column="8" selection-start="5569" selection-end="5569" vertical-scroll-proportion="1.2160393">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/ClassesTest.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="212" column="63" selection-start="10121" selection-end="10121" vertical-scroll-proportion="1.3913044">
+ <state line="94" column="0" selection-start="2973" selection-end="3142" vertical-scroll-proportion="0.43698853">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="85" column="4" selection-start="2778" selection-end="2778" vertical-scroll-proportion="0.03526971">
+ <state line="308" column="36" selection-start="9414" selection-end="9414" vertical-scroll-proportion="0.027823241">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/XWiki.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/ViewAction.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1050" column="6" selection-start="34026" selection-end="34026" vertical-scroll-proportion="1.1243863">
+ <state line="31" column="13" selection-start="1133" selection-end="1133" vertical-scroll-proportion="0.265625">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/plugin/query/QueryGeneratorTest.java">
+ <entry file="file://$PROJECT_DIR$/src/main/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="118" column="8" selection-start="5569" selection-end="5569" vertical-scroll-proportion="1.1800327">
+ <state line="10" column="98" selection-start="300" selection-end="300" vertical-scroll-proportion="0.053125">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/NumberClass.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="94" column="0" selection-start="2973" selection-end="3142" vertical-scroll-proportion="0.43698853">
+ <state line="134" column="15" selection-start="4458" selection-end="4458" vertical-scroll-proportion="0.14375">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java">
+ <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="308" column="36" selection-start="9414" selection-end="9414" vertical-scroll-proportion="0.027823241">
- <folding />
+ <state line="27" column="56" selection-start="1087" selection-end="1087" vertical-scroll-proportion="0.053125">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/ViewAction.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="13" selection-start="1133" selection-end="1133" vertical-scroll-proportion="0.1391162">
- <folding />
+ <state line="53" column="0" selection-start="1802" selection-end="1802" vertical-scroll-proportion="0.053125">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/XWikiAction.java">
+ <entry file="file://$PROJECT_DIR$/src/test/resources/log4j.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="80" column="0" selection-start="3054" selection-end="3054" vertical-scroll-proportion="0.027823241">
+ <state line="0" column="7" selection-start="7" selection-end="7" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/web.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/hibernate.cfg.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="98" selection-start="300" selection-end="300" vertical-scroll-proportion="0.027823241">
+ <state line="0" column="61" selection-start="38" selection-end="38" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/NumberClass.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="134" column="15" selection-start="4458" selection-end="4458" vertical-scroll-proportion="0.07528642">
+ <state line="97" column="0" selection-start="3705" selection-end="3705" vertical-scroll-proportion="0.525">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Document.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="84" column="25" selection-start="2421" selection-end="2428" vertical-scroll-proportion="0.027823241">
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="4096" column="6" selection-start="161877" selection-end="161877" vertical-scroll-proportion="1.1800327">
+ <state line="311" column="54" selection-start="12187" selection-end="12191" vertical-scroll-proportion="0.225">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/xwiki.cfg">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="27" column="15" selection-start="1897" selection-end="1897" vertical-scroll-proportion="0.55737704">
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
More information about the Xwiki-notifications
mailing list