r1387 - in xwiki/trunk: . core core/src core/src/main src/main
Vincent Massol
vmassol at users.forge.objectweb.org
Fri Oct 13 15:57:11 CEST 2006
Author: vmassol
Date: 2006-10-13 15:57:10 +0200 (Fri, 13 Oct 2006)
New Revision: 1387
Added:
xwiki/trunk/core/
xwiki/trunk/core/pom.xml
xwiki/trunk/core/src/
xwiki/trunk/core/src/main/
xwiki/trunk/core/src/main/java/
xwiki/trunk/core/src/main/resources/
xwiki/trunk/pom.xml
Removed:
xwiki/trunk/src/main/java/
xwiki/trunk/src/main/resources/
Modified:
xwiki/trunk/build.xml
xwiki/trunk/xwiki.iml
xwiki/trunk/xwiki.ipr
xwiki/trunk/xwiki.iws
xwiki/trunk/xwikibase.iml
Log:
XWIKI-12: Reorganize directory structure to match Maven2 best practices and cleanup build
* Started creating the core/ module and added the first version of a m2 build.
* Please note that that the m2 is NOT working at this time as more work needs to be done to sort out the dependencies.
* I'm committing this to show to everyone the path I'm taking, to gather comments and possibly help too... :-)
Modified: xwiki/trunk/build.xml
===================================================================
--- xwiki/trunk/build.xml 2006-10-13 10:13:24 UTC (rev 1386)
+++ xwiki/trunk/build.xml 2006-10-13 13:57:10 UTC (rev 1387)
@@ -42,8 +42,6 @@
<property name="src.dir" value="${basedir}/src/" />
<property name="main.src.dir" value="${src.dir}/main/" />
- <property name="java.main.src.dir" value="${main.src.dir}/java/" />
- <property name="resources.main.src.dir" value="${main.src.dir}/resources/" />
<property name="web.main.src.dir" value="${main.src.dir}/web" />
<property name="test.src.dir" value="${src.dir}/test" />
@@ -51,6 +49,12 @@
<property name="resources.test.src.dir" value="${test.src.dir}/resources/" />
<property name="cactus.test.src.dir" value="${test.src.dir}/cactus" />
+ <property name="core.dir" value="${basedir}/core" />
+ <property name="core.src.dir" value="${core.dir}/src" />
+ <property name="core.main.src.dir" value="${core.src.dir}/main" />
+ <property name="core.java.main.src.dir" value="${core.main.src.dir}/java" />
+ <property name="core.resources.main.src.dir" value="${core.main.src.dir}/resources" />
+
<property name="lib.dir" value="${basedir}/lib" />
<property name="build.dir" value="${basedir}/build" />
@@ -257,7 +261,7 @@
<target name="xwiki.nonjava" depends="prepare">
<copy todir="${classes.dir}">
- <fileset dir="${resources.main.src.dir}" />
+ <fileset dir="${core.resources.main.src.dir}" />
</copy>
<copy todir="${build.dir}/web">
@@ -281,7 +285,7 @@
</target>
<target name="xwiki" depends="clover-yes, clover-no, xwiki.nonjava">
- <javac srcdir="${java.main.src.dir}"
+ <javac srcdir="${core.java.main.src.dir}"
destdir="${classes.dir}"
classpath="${libs}"
debug="on" optimize="on" deprecation="on"
@@ -297,7 +301,7 @@
<include name="**/*.class"/>
</fileset>
<!-- resources -->
- <fileset dir="${resources.main.src.dir}">
+ <fileset dir="${core.resources.main.src.dir}">
<include name="**/*"/>
</fileset>
</jar>
@@ -448,7 +452,7 @@
<target name="javadoc" depends="">
<mkdir dir="${javadoc.dir}" />
<javadoc packagenames="com.xpn.xwiki.*"
- sourcepath="${java.main.src.dir}"
+ sourcepath="${core.java.main.src.dir}"
destdir="${javadoc.dir}"
classpath="${libs}"
author="true"
@@ -589,6 +593,4 @@
<groovy src="import.groovy" />
</target>
-
-
</project>
Added: xwiki/trunk/core/pom.xml
===================================================================
--- xwiki/trunk/core/pom.xml 2006-10-13 10:13:24 UTC (rev 1386)
+++ xwiki/trunk/core/pom.xml 2006-10-13 13:57:10 UTC (rev 1387)
@@ -0,0 +1,137 @@
+<!--
+ *
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+-->
+
+<!-- NOTE: THIS IS A WORK IN PROGRESS. IT'S STILL MISSING SOME JARS FOR THE COMPILATION TO WORK -->
+<!-- ISSUES:
+
+radeox.jar : custom repackaging. Custom changes need to be brought to XWiki instead. Sergiu working on this.
+suigeneris.jrcs: doesn't exist on central repo. Is this something generic?
+jfreechart: I've used v 1.0.0 instead of 1.0.0-rc1 as in lib/. Is that ok? Note that ther's also a 1.0.2. Should we
+ upgrade to that?
+jackrabbit: problem with the jackrabbit POM including lots of dependencies which should probabyl be optional and
+ in addition there's a failed dep: jsr170:jcr:jar:1.0 (should be javax.jcr). Reported in
+ http://jira.codehaus.org/browse/MEV-453
+
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.xpn.xwiki</groupId>
+ <artifactId>xwiki</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </parent>
+ <artifactId>xwiki-core</artifactId>
+ <name>XWiki Core</name>
+ <packaging>jar</packaging>
+ <description>The main XWiki JAR</description>
+ <dependencies>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>ecs</groupId>
+ <artifactId>ecs</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlrpc</groupId>
+ <artifactId>xmlrpc-server</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>securityfilter</groupId>
+ <artifactId>securityfilter</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>1.0</version>
+ <!-- TODO: Should the scope be "provided"?
+ <scope>provided</scope-->
+ </dependency>
+ <dependency>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ <version>1.2.9</version>
+ </dependency>
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <!--dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>1.0.1</version>
+ </dependency-->
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+</project>
+
\ No newline at end of file
Property changes on: xwiki/trunk/core/pom.xml
___________________________________________________________________
Name: svn:keywords
+ "Author Date Id Revision"
Name: svn:eol-style
+ native
Copied: xwiki/trunk/core/src/main/java (from rev 1386, xwiki/trunk/src/main/java)
Copied: xwiki/trunk/core/src/main/resources (from rev 1386, xwiki/trunk/src/main/resources)
Added: xwiki/trunk/pom.xml
===================================================================
--- xwiki/trunk/pom.xml 2006-10-13 10:13:24 UTC (rev 1386)
+++ xwiki/trunk/pom.xml 2006-10-13 13:57:10 UTC (rev 1387)
@@ -0,0 +1,57 @@
+<!--
+ *
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.xpn.xwiki</groupId>
+ <artifactId>xwiki</artifactId>
+ <name>XWiki</name>
+ <packaging>pom</packaging>
+ <version>0.9-SNAPSHOT</version>
+ <url>http://xwiki.org</url>
+ <prerequisites>
+ <!-- It may work with previous versions of Maven but this hasn't been tested so for safety
+ we require Maven 2.0.4 -->
+ <maven>2.0.4</maven>
+ </prerequisites>
+ <inceptionYear>2004</inceptionYear>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.xwiki.org/</url>
+ </issueManagement>
+ <developers/>
+ <contributors/>
+ <dependencies/>
+ <organization>
+ <name>XWiki</name>
+ <url>http://xwiki.org/</url>
+ </organization>
+ <scm>
+ <connection>scm:svn:svn://svn.forge.objectweb.org/svnroot/xwiki/xwiki/trunk</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/xwiki/xwiki/trunk</developerConnection>
+ <url>http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/xwiki/</url>
+ </scm>
+ <modules>
+ <module>core</module>
+ </modules>
+</project>
+
\ No newline at end of file
Property changes on: xwiki/trunk/pom.xml
___________________________________________________________________
Name: svn:keywords
+ "Author Date Id Revision"
Name: svn:eol-style
+ native
Modified: xwiki/trunk/xwiki.iml
===================================================================
--- xwiki/trunk/xwiki.iml 2006-10-13 10:13:24 UTC (rev 1386)
+++ xwiki/trunk/xwiki.iml 2006-10-13 13:57:10 UTC (rev 1387)
@@ -2,7 +2,7 @@
<module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Tomcat Server">
<component name="AppServerSpecificValidatorsManager" />
<component name="ModuleRootManager" />
- <component name="NewModuleRootManager">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/xwiki" />
<exploded url="file://$MODULE_DIR$/release/xwiki/web" />
<exclude-exploded />
@@ -58,7 +58,8 @@
<setting name="JAR_URL" value="file://$MODULE_DIR$/release/xwiki.war" />
<setting name="JAR_ENABLED" value="true" />
<setting name="SYNC_EXPLODED_DIR" value="true" />
- <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
<setting name="RUN_JASPER_VALIDATION" value="false" />
</component>
<component name="WebModuleProperties">
@@ -66,7 +67,7 @@
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/classes" />
</containerElement>
- <containerElement type="library" level="project" name="Ant">
+ <containerElement type="library" name="Ant" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
@@ -75,95 +76,95 @@
<attribute name="URI" value="/WEB-INF/classes" />
<url>file://$MODULE_DIR$/build/xwikibase_test</url>
</containerElement>
- <containerElement type="library" level="project" name="cache">
+ <containerElement type="library" name="cache" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="Captcha">
+ <containerElement type="library" name="Captcha" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="Chart">
+ <containerElement type="library" name="Chart" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="Dom4J">
+ <containerElement type="library" name="Dom4J" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="ExoPlatform">
+ <containerElement type="library" name="ExoPlatform" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="fop">
+ <containerElement type="library" name="fop" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="Groovy">
+ <containerElement type="library" name="Groovy" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="Hibernate">
+ <containerElement type="library" name="Hibernate" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="Jakarta Commons">
+ <containerElement type="library" name="Jakarta Commons" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="JCR">
+ <containerElement type="library" name="JCR" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="JMock">
+ <containerElement type="library" name="JMock" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="Jrcs">
+ <containerElement type="library" name="Jrcs" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="LDAP">
+ <containerElement type="library" name="LDAP" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="Portlets">
+ <containerElement type="library" name="Portlets" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="Radeox">
+ <containerElement type="library" name="Radeox" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="RSS">
+ <containerElement type="library" name="RSS" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="SecurityFilter">
+ <containerElement type="library" name="SecurityFilter" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="Struts">
+ <containerElement type="library" name="Struts" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="Unit Tests">
+ <containerElement type="library" name="Unit Tests" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="Velocity">
+ <containerElement type="library" name="Velocity" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="WebServices">
+ <containerElement type="library" name="WebServices" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="XML">
+ <containerElement type="library" name="XML" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
- <containerElement type="library" level="project" name="XMLRPC">
+ <containerElement type="library" name="XMLRPC" level="project">
<attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib" />
</containerElement>
@@ -173,8 +174,6 @@
<root url="file://$MODULE_DIR$/src/main/web" relative="/" />
</webroots>
</component>
- <component name="WeblogicWebModuleProperties">
- <option name="IS_RUN_APPC" value="false" />
- </component>
+ <component name="WeblogicWebModuleProperties" />
</module>
Modified: xwiki/trunk/xwiki.ipr
===================================================================
--- xwiki/trunk/xwiki.ipr 2006-10-13 10:13:24 UTC (rev 1386)
+++ xwiki/trunk/xwiki.ipr 2006-10-13 13:57:10 UTC (rev 1387)
@@ -16,8 +16,6 @@
<component name="CodeStyleProjectProfileManger">
<option name="PROJECT_PROFILE" />
<option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
- <scopes />
- <profiles />
</component>
<component name="CodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS" />
@@ -25,7 +23,6 @@
</component>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
- <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
<option name="DEPLOY_AFTER_MAKE" value="2" />
<resourceExtensions>
<entry name=".+\.(properties|xml|html|dtd|tld|cfg|txt.1|txt.2|sxw|doc|vm|xsl)" />
@@ -100,21 +97,21 @@
<option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
<scopes />
<profiles>
- <profile version="1.0">
+ <profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
<used_levels>
<error>
<option name="myName" value="ERROR" />
- <option name="myVal" value="400" />
+ <option name="myVal" value="200" />
</error>
<warning>
<option name="myName" value="WARNING" />
- <option name="myVal" value="300" />
+ <option name="myVal" value="100" />
</warning>
<information>
<option name="myName" value="INFO" />
- <option name="myVal" value="200" />
+ <option name="myVal" value="100" />
</information>
<server>
<option name="myName" value="SERVER PROBLEM" />
@@ -146,6 +143,7 @@
<option name="OPTION_DEPRECATED_LIST" value="true" />
<option name="OTHER_OPTIONS" />
<option name="HEAP_SIZE" />
+ <option name="LOCALE" />
<option name="OPEN_IN_BROWSER" value="true" />
</component>
<component name="JikesSettings">
@@ -164,121 +162,121 @@
</component>
<component name="Palette2">
<group name="Swing">
- <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
- <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false">
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
- <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false">
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
- <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false">
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
- <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false">
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
- <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false">
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
- <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false">
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
- <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false">
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
- <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false">
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false">
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false">
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false">
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false">
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false">
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false">
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
- <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false">
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false">
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false">
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false">
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
- <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false">
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
- <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false">
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
- <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false">
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
- <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false">
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
- <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false">
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
- <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false">
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
- <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false">
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
- <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false">
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
@@ -307,13 +305,24 @@
</component>
<component name="StarteamVcsAdapter" />
<component name="UI designer component loader factory" />
- <component name="VssVcs" />
+ <component name="VssVcs">
+ <SourceSafePersistencyRemovedFolder>C:/dev/maven/trunks/plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/internal/execution</SourceSafePersistencyRemovedFolder>
+ <SourceSafePersistencyRemovedFolder>C:/dev/maven/trunks/plugins/maven-clover-plugin/src/it/notests/src/main/java/org/apache/maven/plugin/clover/samples/simple</SourceSafePersistencyRemovedFolder>
+ <SourceSafePersistencyRemovedFolder>C:/dev/maven/trunks/plugins/maven-clover-plugin/src/it/notest</SourceSafePersistencyRemovedFolder>
+ </component>
<component name="WebManager">
<option enabled="true" />
</component>
<component name="WebRootContainer">
<root url="file://$PROJECT_DIR$/src/web" name="xwiki" validate="false" />
</component>
+ <component name="com.intellij.jsf.UserDefinedFacesConfigs">
+ <option name="USER_DEFINED_CONFIGS">
+ <value>
+ <list size="0" />
+ </value>
+ </option>
+ </component>
<component name="libraryTable">
<library name="Jakarta Commons">
<CLASSES>
@@ -576,6 +585,7 @@
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />
<option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
+ <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
</component>
<UsedPathMacros />
</project>
Modified: xwiki/trunk/xwiki.iws
===================================================================
--- xwiki/trunk/xwiki.iws 2006-10-13 10:13:24 UTC (rev 1386)
+++ xwiki/trunk/xwiki.iws 2006-10-13 13:57:10 UTC (rev 1387)
@@ -3,6 +3,18 @@
<component name="AppServerRunManager" />
<component name="AspectsView" />
<component name="BookmarkManager" />
+ <component name="BuildServerSettings">
+ <option name="USER_ID" value="-1" />
+ <option name="USER_NAME" />
+ <option name="SERVER_URL" value="http://buildserver" />
+ <option name="HIDE_SUCCESSFUL" value="false" />
+ <option name="SHOW_MODIFIED_ONLY" value="false" />
+ <option name="ACTIVE_INSPECTIONS" value="false" />
+ <option name="LOGIN" value="" />
+ <option name="PERFORM_COMMIT" value="true" />
+ <option name="REQUEST_CONFIRMATON" value="false" />
+ <option name="STATUS_DIALOG_SPLITTER_PROPORTION" value="0.8" />
+ </component>
<component name="ChangeBrowserSettings">
<option name="MAIN_SPLITTER_PROPORTION" value="0.3" />
<option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" />
@@ -19,51 +31,7 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiGroupServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiGroupServiceImpl.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/SharedJavaGroupsBroadcastingListener.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWikiException.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWikiException.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/web/WEB-INF/hibernate.cfg.xml" afterPath="$PROJECT_DIR$/src/main/web/WEB-INF/hibernate.cfg.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/xmpp" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/xwiki.iws" afterPath="$PROJECT_DIR$/xwiki.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/XWiki.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/XWiki.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/ClusterSharedNotification.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Document.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Document.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.xml" afterPath="$PROJECT_DIR$/build.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/query/QueryPlugin.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/query/QueryPlugin.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/image/ImagePlugin.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/image/ImagePlugin.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWikiInterface.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWikiInterface.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/log4j.properties" afterPath="$PROJECT_DIR$/src/main/resources/log4j.properties" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiRenderer.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiRenderer.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/resources/hibernate-test.cfg.xml" afterPath="$PROJECT_DIR$/src/test/resources/hibernate-test.cfg.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStoreInterface.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStoreInterface.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/UsersClass.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/UsersClass.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/feed/FeedPlugin.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/feed/FeedPlugin.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/XWikiDefaultPlugin.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/XWikiDefaultPlugin.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/User.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/User.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/xwikibase.iml" afterPath="$PROJECT_DIR$/xwikibase.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/api/XWikiGroupService.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/api/XWikiGroupService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiRenderingEngine.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/XWikiRenderingEngine.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/XWikiPageNotification.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/notify/XWikiPageNotification.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/xwiki.iml" afterPath="$PROJECT_DIR$/xwiki.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/flickr/FlickrPlugin.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/flickr/FlickrPlugin.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/patches/OSCacheCache.diff" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/xwiki.ipr" afterPath="$PROJECT_DIR$/xwiki.ipr" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/GroupsClass.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/GroupsClass.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java" />
<change type="DELETED" beforePath="C:\dev\java\xwikisvn\xwiki\trunk\lib\oscache-2.3.2.jar" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/exo/ExoGroupServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/exo/ExoGroupServiceImpl.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/oscache-2.3.2M.jar" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/web/WEB-INF/oscache.properties" afterPath="$PROJECT_DIR$/src/main/web/WEB-INF/oscache.properties" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiRightServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiRightServiceImpl.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/api/XWikiCacheService.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/cache/api/XWikiCacheService.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/web/WEB-INF/version.properties" afterPath="$PROJECT_DIR$/src/main/web/WEB-INF/version.properties" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/groovy/XWikiGroovyRenderer.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/render/groovy/XWikiGroovyRenderer.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/XWikiPluginInterface.java" afterPath="$PROJECT_DIR$/src/main/java/com/xpn/xwiki/plugin/XWikiPluginInterface.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -83,6 +51,8 @@
<option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
<option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" />
<option name="COMPILE_DEPENDENT_FILES" value="false" />
+ <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
+ <option name="ASSERT_NOT_NULL" value="true" />
</component>
<component name="CoverageDataManager" />
<component name="Cvs2Configuration">
@@ -296,19 +266,6 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyFormAuthenticator.java" line="117" class="com.xpn.xwiki.user.impl.xwiki.MyFormAuthenticator" package="com.xpn.xwiki.user.impl.xwiki">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
<breakpoint url="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/plugin/query/QueryPluginTest.java" line="340" class="com.xpn.xwiki.test.plugin.query.QueryPluginTest" package="com.xpn.xwiki.test.plugin.query">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
@@ -322,97 +279,6 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiRightServiceImpl.java" line="189" class="com.xpn.xwiki.user.impl.xwiki.XWikiRightServiceImpl" package="com.xpn.xwiki.user.impl.xwiki">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java" line="359" class="com.xpn.xwiki.objects.classes.ListClass" package="com.xpn.xwiki.objects.classes">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java" line="359" class="com.xpn.xwiki.objects.classes.ListClass" package="com.xpn.xwiki.objects.classes">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java" line="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" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java" line="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" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java" line="120" class="com.xpn.xwiki.objects.classes.StringClass" package="com.xpn.xwiki.objects.classes">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/XWikiAction.java" line="80" class="com.xpn.xwiki.web.XWikiAction" package="com.xpn.xwiki.web">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
</line_breakpoints>
<breakpoint_any>
<breakpoint>
@@ -712,7 +578,16 @@
<component name="FavoritesManager">
<favorites_list name="xwiki" />
</component>
- <component name="FavoritesProjectViewPane" />
+ <component name="FavoritesProjectViewPane">
+ <subPane subId="xwiki">
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" />
+ <option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </component>
<component name="FavoritesViewImpl">
<favorites_list name="xwiki">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -728,97 +603,75 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="XWiki.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
+ <file leaf-file-name="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="311" column="54" selection-start="12187" selection-end="12191" vertical-scroll-proportion="0.225">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <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="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="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="53" column="0" selection-start="1802" selection-end="1802" vertical-scroll-proportion="0.053125">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <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="0" column="61" selection-start="38" selection-end="38" vertical-scroll-proportion="0.0">
+ <state line="10" column="98" selection-start="300" selection-end="300" vertical-scroll-proportion="0.022110553">
<folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <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="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="0" column="7" selection-start="7" selection-end="7" vertical-scroll-proportion="0.0">
+ <state line="25" column="19" selection-start="996" selection-end="996" vertical-scroll-proportion="0.5527638">
<folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/core/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="27" column="15" selection-start="1897" selection-end="1897" vertical-scroll-proportion="0.55737704">
+ <state line="133" column="0" selection-start="4459" selection-end="4459" vertical-scroll-proportion="0.801005">
<folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="XWiki.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/core/src/main/java/com/xpn/xwiki/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.265625">
- <folding />
+ <state line="33" column="9" selection-start="1116" selection-end="1116" vertical-scroll-proportion="-0.5836735">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </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="build.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="97" column="0" selection-start="3705" selection-end="3705" vertical-scroll-proportion="0.525">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="web.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/web.xml">
+ <file leaf-file-name="version.properties" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/version.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="10" column="98" selection-start="300" selection-end="300" vertical-scroll-proportion="0.053125">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <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">
+ <file leaf-file-name="web-test.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/web-test.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="134" column="15" selection-start="4458" selection-end="4458" vertical-scroll-proportion="0.14375">
+ <state line="114" column="20" selection-start="3826" selection-end="3826" vertical-scroll-proportion="0.022110553">
<folding />
</state>
</provider>
@@ -883,29 +736,21 @@
<option name="SORT_ALPHABETICALLY" value="false" />
<option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
</component>
- <component name="HighlightingSettingsPerFile">
- <setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java" root0="SKIP_INSPECTION" />
- <setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiStoreInterface.java" root0="SKIP_HIGHLIGHTING" />
- <setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/BaseCollection.java" root0="SKIP_INSPECTION" />
- </component>
+ <component name="HighlightingSettingsPerFile" />
<component name="InspectionManager">
<option name="AUTOSCROLL_TO_SOURCE" value="false" />
<option name="SPLITTER_PROPORTION" value="0.5" />
<option name="GROUP_BY_SEVERITY" value="false" />
+ <option name="FILTER_RESOLVED_ITEMS" value="true" />
<option name="ANALYZE_TEST_SOURCES" value="true" />
+ <option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" />
<option name="SCOPE_TYPE" value="1" />
<option name="CUSTOM_SCOPE_NAME" value="" />
- <profile name="Default" />
+ <option name="SHOW_ONLY_DIFF" value="false" />
+ <option name="myCurrentProfileName" value="Default" />
</component>
- <component name="J2EEProjectPane">
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.j2ee.module.view.nodes.J2EEProjectNodeDescriptor" />
- </PATH_ELEMENT>
- </PATH>
- <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" />
- </component>
+ <component name="InspectionPassRegistrar" />
+ <component name="J2EEProjectPane" />
<component name="JUnitProjectSettings">
<option name="TEST_RUNNER" value="UI" />
</component>
@@ -937,18 +782,7 @@
<option name="LAST_EDITED_TAB_NAME" value="Web Module Settings" />
</component>
<component name="NamedScopeManager" />
- <component name="PackagesPane">
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- </component>
+ <component name="PackagesPane" />
<component name="PerforceChangeBrowserSettings">
<option name="USE_CLIENT_FILTER" value="true" />
<option name="CLIENT" value="" />
@@ -971,14 +805,10 @@
<option name="ENABLED" value="true" />
<option name="USE_LOGIN" value="false" />
<option name="LOGIN_SILENTLY" value="false" />
- <option name="INTEGRATE_BRANCH_NAME" />
- <option name="INTEGRATE_CHANGELIST_NUM" value="-1" />
<option name="INTEGRATE_RUN_RESOLVE" value="true" />
<option name="INTEGRATE_REVERT_UNCHANGED" value="true" />
- <option name="INTEGRATE_CHANGE_LIST_NUMBER" value="" />
- <option name="INTEGRATE_CHANGE_LIST" value="false" />
- <option name="INTEGRATE_REVERSE" value="false" />
</component>
+ <component name="ProjectLevelMessagesProcessor" />
<component name="ProjectLevelVcsManager">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
@@ -994,251 +824,143 @@
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectPane">
- <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>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test\resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test\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\xwikisvn\xwiki\trunk\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\xwikisvn\xwiki\trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test\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\xwikisvn\xwiki\trunk\src\test\java\com\xpn\xwiki\test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test\java\com\xpn\xwiki\test\plugin\query" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\test\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\xwikisvn\xwiki\trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwikisvn\xwiki\trunk\src\main\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
+ <subPane>
+ <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>
+ <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\xwiki\trunks-devs\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\xwiki\trunks-devs\xwiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\xwiki\trunks-devs\xwiki\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\xwiki\trunks-devs\xwiki\src\test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="xwiki.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="xwikibase" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\xwiki\trunks-devs\xwiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\xwiki\trunks-devs\xwiki\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\xwiki\trunks-devs\xwiki\src\main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="xwiki.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="xwikibase" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\xwiki\trunks-devs\xwiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\xwiki\trunks-devs\xwiki\core" />
+ <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\xwiki\trunks-devs\xwiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\xwiki\trunks-devs\xwiki\core" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\xwiki\trunks-devs\xwiki\core\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\dev\xwiki\trunks-devs\xwiki\core\src\main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="xwiki.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="xwiki" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
</component>
<component name="ProjectReloadState">
- <option name="STATE" value="2" />
+ <option name="STATE" value="0" />
</component>
<component name="ProjectView">
- <navigator currentView="ProjectPane" splitterProportion="0.5">
+ <navigator currentView="ProjectPane" proportions="0.16666667" version="1" splitterProportion="0.5">
<flattenPackages PackagesPane="false" ProjectPane="false" />
- <showMembers ProjectPane="true" J2EEPane="true" />
+ <showMembers J2EEPane="true" ProjectPane="true" />
<showModules />
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
- <showStructure PackagesPane="false" ProjectPane="false" J2EEPane="false" />
+ <showStructure ProjectPane="false" J2EEPane="false" PackagesPane="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -1276,14 +998,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:\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_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" />
@@ -1311,9 +1033,8 @@
<option name="referencePos" value="0" />
</component>
<component name="RestoreUpdateTree" />
- <component name="RunManager">
- <activeType name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" />
- <tempConfiguration selected="true" default="false" name="QueryGeneratorTest" type="JUnit" factoryName="JUnit">
+ <component name="RunManager" selected="Application.Groovy Export">
+ <tempConfiguration default="false" name="QueryGeneratorTest" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="xwikibase" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -1328,6 +1049,11 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="2646" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1341,17 +1067,51 @@
<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>
- <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
+ <ConfigurationWrapper RunnerId="Run" />
</tempConfiguration>
- <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
+ <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+ <module name="xwiki" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ <method>
+ <option name="Make" value="true" />
+ </method>
+ </configuration>
+ <configuration 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 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 default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
+ <option name="WORKING_DIRECTORY" />
+ <option name="HOST" value="localhost" />
<option name="PORT" value="8080" />
<option name="LOCAL" value="true" />
<option name="OPEN_IN_BROWSER" value="true" />
@@ -1362,13 +1122,16 @@
<option name="MODULE_NAME" value="xwiki" />
<option name="DEPLOY" value="true" />
</J2EE_MODULE>
- <RunnerSettings RunnerId="Run" />
+ <option name="DEPLOY_TOMCAT_MANAGER" value="false" />
+ <option name="BASE_DIRECTORY_NAME" value="" />
+ <predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="3383" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="false" />
</RunnerSettings>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
@@ -1383,7 +1146,7 @@
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
@@ -1399,57 +1162,19 @@
</SHUTDOWN>
</ConfigurationWrapper>
</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.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" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
<option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" />
+ <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="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
+ <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="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
+ <configuration 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" />
@@ -1457,37 +1182,45 @@
<option name="OPEN_IN_BROWSER" value="true" />
<option name="OPEN_IN_BROWSER_URL" value="/" />
<option name="COMMON_VM_ARGUMENTS" value="" />
- <RunnerSettings RunnerId="Run" />
+ <option name="DEPLOY_TOMCAT_MANAGER" value="false" />
+ <option name="BASE_DIRECTORY_NAME" value="" />
+ <predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID&qu