r1117 - in xwiki/trunk: . src/main/java/com/xpn/xwiki src/main/java/com/xpn/xwiki/store
Ludovic Dubost
ludovic at users.forge.objectweb.org
Sat Aug 5 02:44:22 CEST 2006
Author: ludovic
Date: 2006-08-05 02:44:20 +0200 (Sat, 05 Aug 2006)
New Revision: 1117
Modified:
xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateAttachmentStore.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateVersioningStore.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiVersioningStoreInterface.java
xwiki/trunk/xwiki.iws
Log:
Fix wiki creation which would fail on copying preferences because getPrefsClass was called in updateschema
Fix some functions which could fail in multi wiki environment
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-08-03 18:10:08 UTC (rev 1116)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-08-05 00:44:20 UTC (rev 1117)
@@ -41,6 +41,7 @@
import com.xpn.xwiki.cache.impl.XWikiCacheListener;
import com.xpn.xwiki.doc.XWikiAttachment;
import com.xpn.xwiki.doc.XWikiDocument;
+import com.xpn.xwiki.doc.XWikiDocumentArchive;
import com.xpn.xwiki.notify.*;
import com.xpn.xwiki.objects.BaseObject;
import com.xpn.xwiki.objects.PropertyInterface;
@@ -235,6 +236,10 @@
}
public void updateDatabase(String appname, boolean force, XWikiContext context) throws HibernateException, XWikiException {
+ updateDatabase(appname, force, true, context);
+ }
+
+ public void updateDatabase(String appname, boolean force, boolean initClasses, XWikiContext context) throws HibernateException, XWikiException {
synchronized (appname) {
String database = context.getDatabase();
@@ -249,14 +254,16 @@
}
// Make sure these classes exists
- getPrefsClass(context);
- getUserClass(context);
- getGroupClass(context);
- getRightsClass(context);
- getCommentsClass(context);
- getSkinClass(context);
- getGlobalRightsClass(context);
- getPluginManager().virtualInit(context);
+ if (initClasses) {
+ getPrefsClass(context);
+ getUserClass(context);
+ getGroupClass(context);
+ getRightsClass(context);
+ getCommentsClass(context);
+ getSkinClass(context);
+ getGlobalRightsClass(context);
+ getPluginManager().virtualInit(context);
+ }
// Add initdone which will allow to
// bypass some initializations
@@ -2299,11 +2306,11 @@
}
public boolean copyDocument(String docname, String targetdocname, XWikiContext context) throws XWikiException {
- return copyDocument(docname, targetdocname, null, null, null, false, context);
+ return copyDocument(docname, targetdocname, null, null, null, true, context);
}
public boolean copyDocument(String docname, String targetdocname, String wikilanguage, XWikiContext context) throws XWikiException {
- return copyDocument(docname, targetdocname, null, null, wikilanguage, false, context);
+ return copyDocument(docname, targetdocname, null, null, wikilanguage, true, context);
}
public boolean copyDocument(String docname, String sourceWiki, String targetWiki, String wikilanguage, XWikiContext context) throws XWikiException {
@@ -2346,11 +2353,19 @@
// forget past versions
if (reset) {
tdoc.setVersion("1.1");
- // TODO: versioning change this
- // tdoc.setRCSArchive(null);
}
saveDocument(tdoc, context);
+ if (!reset) {
+ if (sourceWiki != null)
+ context.setDatabase(sourceWiki);
+ XWikiDocumentArchive txda = getVersioningStore().getXWikiDocumentArchive(sdoc, context);
+ if (targetWiki != null)
+ context.setDatabase(targetWiki);
+ txda.setId(tdoc.getId());
+ getVersioningStore().saveXWikiDocArchive(txda, true, context);
+ }
+
List attachlist = tdoc.getAttachmentList();
if (attachlist.size() > 0) {
for (int i = 0; i < attachlist.size(); i++) {
@@ -2388,10 +2403,19 @@
// forget past versions
if (reset) {
ttdoc.setVersion("1.1");
- // TODO: versioning change this
- // ttdoc.setRCSArchive(null);
}
saveDocument(ttdoc, context);
+
+ if (!reset) {
+ if (sourceWiki != null)
+ context.setDatabase(sourceWiki);
+ XWikiDocumentArchive txda = getVersioningStore().getXWikiDocumentArchive(sdoc, context);
+ if (targetWiki != null)
+ context.setDatabase(targetWiki);
+ txda.setId(ttdoc.getId());
+ getVersioningStore().saveXWikiDocArchive(txda, true, context);
+ }
+
}
} else {
// We want only one language in the end
@@ -2414,10 +2438,20 @@
// forget past versions
if (reset) {
tdoc.setVersion("1.1");
- // TODO: versioning change this
- // tdoc.setRCSArchive(null);
}
+
saveDocument(tdoc, context);
+
+ if (!reset) {
+ if (sourceWiki != null)
+ context.setDatabase(sourceWiki);
+ XWikiDocumentArchive txda = getVersioningStore().getXWikiDocumentArchive(sdoc, context);
+ if (targetWiki != null)
+ context.setDatabase(targetWiki);
+ txda.setId(tdoc.getId());
+ getVersioningStore().saveXWikiDocArchive(txda, true, context);
+ }
+
List attachlist = tdoc.getAttachmentList();
if (attachlist.size() > 0) {
for (int i = 0; i < attachlist.size(); i++) {
@@ -2559,7 +2593,7 @@
}
try {
- updateDatabase(wikiName, true, context);
+ updateDatabase(wikiName, true, false, context);
} catch (Exception e) {
log.error("Wiki creation (" + wikiName + "," + wikiUrl + "," + wikiAdmin + ") failed: " + "wiki database shema update threw exception", e);
return -6;
@@ -2577,11 +2611,12 @@
// Modify rights in user wiki
context.setDatabase(wikiName);
- XWikiDocument wikiprefdoc = getDocument("XWiki.XWikiPreferences", context);
+ /*XWikiDocument wikiprefdoc = getDocument("XWiki.XWikiPreferences", context);
wikiprefdoc.setStringValue("XWiki.XWikiGlobalRights", "users", wikiAdmin);
wikiprefdoc.setStringValue("XWiki.XWikiGlobalRights", "levels", "admin, edit");
wikiprefdoc.setIntValue("XWiki.XWikiGlobalRights", "allow", 1);
saveDocument(wikiprefdoc, context);
+ */
return 1;
} catch (Exception e) {
log.error("Wiki creation (" + wikiName + "," + wikiUrl + "," + wikiAdmin + ") failed: " + "wiki creation threw exception", e);
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateAttachmentStore.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateAttachmentStore.java 2006-08-03 18:10:08 UTC (rev 1116)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateAttachmentStore.java 2006-08-05 00:44:20 UTC (rev 1117)
@@ -3,6 +3,7 @@
import com.xpn.xwiki.doc.XWikiAttachment;
import com.xpn.xwiki.doc.XWikiAttachmentContent;
import com.xpn.xwiki.doc.XWikiAttachmentArchive;
+import com.xpn.xwiki.doc.XWikiDocumentArchive;
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.XWiki;
@@ -62,23 +63,33 @@
}
Session session = getSession(context);
+ String db = context.getDatabase();
+ String attachdb = (attachment.getDoc()==null) ? null : attachment.getDoc().getDatabase();
+ try {
+ if (attachdb!=null)
+ context.setDatabase(attachdb);
- Query query = session.createQuery("select attach.id from XWikiAttachmentContent as attach where attach.id = :id");
- query.setLong("id", content.getId());
- if (query.uniqueResult()==null)
- session.save(content);
- else
- session.update(content);
+ Query query = session.createQuery("select attach.id from XWikiAttachmentContent as attach where attach.id = :id");
+ query.setLong("id", content.getId());
+ if (query.uniqueResult()==null)
+ session.save(content);
+ else
+ session.update(content);
- query = session.createQuery("select attach.id from XWikiAttachmentArchive as attach where attach.id = :id");
- query.setLong("id", archive.getId());
- if (query.uniqueResult()==null)
- session.save(archive);
- else
- session.update(archive);
+ query = session.createQuery("select attach.id from XWikiAttachmentArchive as attach where attach.id = :id");
+ query.setLong("id", archive.getId());
+ if (query.uniqueResult()==null)
+ session.save(archive);
+ else
+ session.update(archive);
- if (parentUpdate)
- context.getWiki().getStore().saveXWikiDoc(attachment.getDoc(), context, true);
+ if (parentUpdate)
+ context.getWiki().getStore().saveXWikiDoc(attachment.getDoc(), context, true);
+
+ } finally {
+ context.setDatabase(db);
+ }
+
if (bTransaction) {
endTransaction(context, true);
}
@@ -104,12 +115,18 @@
}
Session session = getSession(context);
+ String db = context.getDatabase();
+ String attachdb = (attachment.getDoc()==null) ? null : attachment.getDoc().getDatabase();
+ try {
+ if (attachdb!=null)
+ context.setDatabase(attachdb);
+ XWikiAttachmentContent content = new XWikiAttachmentContent(attachment);
+ attachment.setAttachment_content(content);
+ session.load(content, new Long(content.getId()));
+ } finally {
+ context.setDatabase(db);
+ }
- XWikiAttachmentContent content = new XWikiAttachmentContent(attachment);
- attachment.setAttachment_content(content);
-
- session.load(content, new Long(content.getId()));
-
if (bTransaction)
endTransaction(context, false, false);
}
@@ -134,11 +151,19 @@
Session session = getSession(context);
- XWikiAttachmentArchive archive = new XWikiAttachmentArchive();
- archive.setAttachment(attachment);
- attachment.setAttachment_archive(archive);
+ String db = context.getDatabase();
+ String attachdb = (attachment.getDoc()==null) ? null : attachment.getDoc().getDatabase();
+ try {
+ if (attachdb!=null)
+ context.setDatabase(attachdb);
- session.load(archive, new Long(archive.getId()));
+ XWikiAttachmentArchive archive = new XWikiAttachmentArchive();
+ archive.setAttachment(attachment);
+ attachment.setAttachment_archive(archive);
+ session.load(archive, new Long(archive.getId()));
+ } finally {
+ context.setDatabase(db);
+ }
if (bTransaction)
endTransaction(context, false, false);
@@ -168,38 +193,49 @@
Session session = getSession(context);
- // Delete the three attachement entries
- try {
- loadAttachmentContent(attachment, context, false);
- } catch (Exception e) {
- if (log.isWarnEnabled())
- log.warn("Error loading attachment content when deleting attachment " + attachment.getFilename() + " of doc " + attachment.getDoc().getFullName());
- }
- try {
- session.delete(attachment.getAttachment_content());
- } catch (Exception e) {
- if (log.isWarnEnabled())
- log.warn("Error deleting attachment content " + attachment.getFilename() + " of doc " + attachment.getDoc().getFullName());
- }
- try {
- loadAttachmentContent(attachment, context, false);
- } catch(XWikiException e){
- if (log.isWarnEnabled())
- log.warn("Error loading attachment archive when deleting attachment " + attachment.getFilename() + " of doc " + attachment.getDoc().getFullName());
- }
+ String db = context.getDatabase();
+ String attachdb = (attachment.getDoc()==null) ? null : attachment.getDoc().getDatabase();
try {
- session.delete(attachment.getAttachment_archive());
- } catch (Exception e) {
- if (log.isWarnEnabled())
- log.warn("Error deleting attachment archive " + attachment.getFilename() + " of doc " + attachment.getDoc().getFullName());
- }
+ if (attachdb!=null)
+ context.setDatabase(attachdb);
- try {
- session.delete(attachment);
- } catch (Exception e) {
- if (log.isWarnEnabled())
- log.warn("Error deleting attachment meta data " + attachment.getFilename() + " of doc " + attachment.getDoc().getFullName());
+ // Delete the three attachement entries
+ try {
+ loadAttachmentContent(attachment, context, false);
+ } catch (Exception e) {
+ if (log.isWarnEnabled())
+ log.warn("Error loading attachment content when deleting attachment " + attachment.getFilename() + " of doc " + attachment.getDoc().getFullName());
+ }
+ try {
+ session.delete(attachment.getAttachment_content());
+ } catch (Exception e) {
+ if (log.isWarnEnabled())
+ log.warn("Error deleting attachment content " + attachment.getFilename() + " of doc " + attachment.getDoc().getFullName());
+ }
+ try {
+ loadAttachmentContent(attachment, context, false);
+ } catch(XWikiException e){
+ if (log.isWarnEnabled())
+ log.warn("Error loading attachment archive when deleting attachment " + attachment.getFilename() + " of doc " + attachment.getDoc().getFullName());
+ }
+
+ try {
+ session.delete(attachment.getAttachment_archive());
+ } catch (Exception e) {
+ if (log.isWarnEnabled())
+ log.warn("Error deleting attachment archive " + attachment.getFilename() + " of doc " + attachment.getDoc().getFullName());
+ }
+
+ try {
+ session.delete(attachment);
+ } catch (Exception e) {
+ if (log.isWarnEnabled())
+ log.warn("Error deleting attachment meta data " + attachment.getFilename() + " of doc " + attachment.getDoc().getFullName());
+ }
+
+ } finally {
+ context.setDatabase(db);
}
try {
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java 2006-08-03 18:10:08 UTC (rev 1116)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java 2006-08-05 00:44:20 UTC (rev 1117)
@@ -1440,9 +1440,13 @@
context.remove("links");
// call to RenderEngine and converting the list of links into a list of backlinks
- XWikiRenderer renderer = context.getWiki().getRenderingEngine().getRenderer("wiki");
- renderer.render(doc.getContent(), doc, doc, context);
-
+ try {
+ XWikiRenderer renderer = context.getWiki().getRenderingEngine().getRenderer("wiki");
+ renderer.render(doc.getContent(), doc, doc, context);
+ } catch (Exception e) {
+ // If the rendering fails lets forget backlinks without errors
+ }
+
List links = (List)context.get("links");
if (links != null){
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateVersioningStore.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateVersioningStore.java 2006-08-03 18:10:08 UTC (rev 1116)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateVersioningStore.java 2006-08-05 00:44:20 UTC (rev 1117)
@@ -16,7 +16,7 @@
import org.hibernate.ObjectNotFoundException;
/**
- * Created by IntelliJ IDEA.
+ * Created by IntelliJ IDEA.
* User: ludovic
* Date: 6 juin 2006
* Time: 21:32:07
@@ -67,7 +67,7 @@
public String getXWikiDocArchive(XWikiDocument doc, XWikiContext context) throws XWikiException {
try {
- XWikiDocumentArchive archivedoc = getDocumentArchive(doc, context);
+ XWikiDocumentArchive archivedoc = getXWikiDocumentArchive(doc, context);
return archivedoc.getArchive();
} catch (Exception e) {
Object[] args = { doc.getFullName() };
@@ -78,7 +78,7 @@
public Archive getXWikiDocRCSArchive(XWikiDocument doc, XWikiContext context) throws XWikiException {
try {
- XWikiDocumentArchive archivedoc = getDocumentArchive(doc, context);
+ XWikiDocumentArchive archivedoc = getXWikiDocumentArchive(doc, context);
return archivedoc.getRCSArchive();
} catch (Exception e) {
Object[] args = { doc.getFullName() };
@@ -87,7 +87,7 @@
}
}
- private XWikiDocumentArchive getDocumentArchive(XWikiDocument doc, XWikiContext context) throws XWikiException {
+ public XWikiDocumentArchive getXWikiDocumentArchive(XWikiDocument doc, XWikiContext context) throws XWikiException {
String key = ((doc.getDatabase()==null)?"xwiki":doc.getDatabase()) + ":" + doc.getFullName();
synchronized (key) {
XWikiDocumentArchive archivedoc = (XWikiDocumentArchive) context.getDocumentArchive(key);
@@ -218,7 +218,7 @@
}
Session session = getSession(context);
- XWikiDocumentArchive archivedoc = getDocumentArchive(doc, context);
+ XWikiDocumentArchive archivedoc = getXWikiDocumentArchive(doc, context);
archivedoc.resetArchive(doc.getFullName(), doc.getContent(), doc.getVersion());
saveXWikiDocArchive(archivedoc, bTransaction, context);
if (bTransaction) {
@@ -244,7 +244,7 @@
}
Session session = getSession(context);
- XWikiDocumentArchive archivedoc = getDocumentArchive(doc, context);
+ XWikiDocumentArchive archivedoc = getXWikiDocumentArchive(doc, context);
archivedoc.updateArchive(doc.getFullName(), text);
saveXWikiDocArchive(archivedoc, bTransaction, context);
if (bTransaction) {
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiVersioningStoreInterface.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiVersioningStoreInterface.java 2006-08-03 18:10:08 UTC (rev 1116)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiVersioningStoreInterface.java 2006-08-05 00:44:20 UTC (rev 1117)
@@ -16,4 +16,6 @@
public String getXWikiDocArchive(XWikiDocument doc, XWikiContext context) throws XWikiException;
public XWikiDocument loadXWikiDoc(XWikiDocument doc, String version, XWikiContext context) throws XWikiException;
public void resetRCSArchive(XWikiDocument doc, boolean bTransaction, XWikiContext context) throws XWikiException;
+
+ XWikiDocumentArchive getXWikiDocumentArchive(XWikiDocument doc, XWikiContext context) throws XWikiException;
}
Modified: xwiki/trunk/xwiki.iws
===================================================================
--- xwiki/trunk/xwiki.iws 2006-08-03 18:10:08 UTC (rev 1116)
+++ xwiki/trunk/xwiki.iws 2006-08-05 00:44:20 UTC (rev 1117)
@@ -517,7 +517,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="2775" class="com.xpn.xwiki.XWiki" package="com.xpn.xwiki">
+ <breakpoint url="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java" line="2810" 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" />
@@ -884,19 +884,21 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="BufferedResponse.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/includeservletasstring/BufferedResponse.java">
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="0" selection-start="1248" selection-end="1248" vertical-scroll-proportion="0.33480176">
- <folding />
+ <state line="260" column="83" selection-start="10590" selection-end="10590" vertical-scroll-proportion="0.72727275">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWiki.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
+ <file leaf-file-name="XWikiDocument.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="756" column="52" selection-start="29639" selection-end="29639" vertical-scroll-proportion="0.5770925">
+ <state line="824" column="71" selection-start="25609" selection-end="25609" vertical-scroll-proportion="0.43137255">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -904,21 +906,19 @@
</provider>
</entry>
</file>
- <file leaf-file-name="Attachment.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Attachment.java">
+ <file leaf-file-name="Page.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/xmlrpc/Page.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="7" selection-start="994" selection-end="994" vertical-scroll-proportion="0.29955947">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="54" column="27" selection-start="1975" selection-end="1975" vertical-scroll-proportion="0.18181819">
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiDocumentArchive.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java">
+ <file leaf-file-name="XWikiAttachment.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="65" column="0" selection-start="1854" selection-end="1854" vertical-scroll-proportion="0.7488987">
+ <state line="435" column="57" selection-start="13157" selection-end="13157" vertical-scroll-proportion="0.32976827">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -926,13 +926,11 @@
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiAttachmentArchive.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiAttachmentArchive.java">
+ <file leaf-file-name="XWikiHibernateAttachmentStore.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiHibernateAttachmentStore.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="0" selection-start="1040" selection-end="1040" vertical-scroll-proportion="0.29955947">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="62" column="93" selection-start="2248" selection-end="2248" vertical-scroll-proportion="0.33333334">
+ <folding />
</state>
</provider>
</entry>
@@ -940,7 +938,7 @@
<file leaf-file-name="XWikiHibernateStore.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="125" selection-start="1765" selection-end="1765" vertical-scroll-proportion="0.45102507">
+ <state line="118" column="58" selection-start="4310" selection-end="4310" vertical-scroll-proportion="0.23626374">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -951,7 +949,7 @@
<file leaf-file-name="XWikiCacheStore.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="131" column="19" selection-start="4765" selection-end="4765" vertical-scroll-proportion="0.6894273">
+ <state line="131" column="19" selection-start="4765" selection-end="4765" vertical-scroll-proportion="0.030303031">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -959,10 +957,10 @@
</provider>
</entry>
</file>
- <file leaf-file-name="XWikiHibernateVersioningStore.java" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="XWikiHibernateVersioningStore.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiHibernateVersioningStore.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="15" column="45" selection-start="574" selection-end="574" vertical-scroll-proportion="0.37444934">
+ <state line="89" column="43" selection-start="3541" selection-end="3541" vertical-scroll-proportion="0.4848485">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -973,7 +971,7 @@
<file leaf-file-name="XWikiGroupServiceImpl.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiGroupServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="66" column="0" selection-start="2667" selection-end="2667" vertical-scroll-proportion="0.28414097">
+ <state line="66" column="0" selection-start="2667" selection-end="2667" vertical-scroll-proportion="0.030303031">
<folding />
</state>
</provider>
@@ -982,7 +980,7 @@
<file leaf-file-name="XWikiContext.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWikiContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="291" column="47" selection-start="7378" selection-end="7378" vertical-scroll-proportion="1.4096916">
+ <state line="291" column="47" selection-start="7378" selection-end="7378" vertical-scroll-proportion="1.1836007">
<folding />
</state>
</provider>
@@ -1098,7 +1096,7 @@
</component>
<component name="ModuleEditorState">
<option name="LAST_EDITED_MODULE_NAME" value="xwikibase" />
- <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
+ <option name="LAST_EDITED_TAB_NAME" value="Paths" />
</component>
<component name="NamedScopeManager" />
<component name="PackagesPane">
@@ -1370,14 +1368,14 @@
<property name="RunManagerConfig.compileBeforeRunning" value="false" />
<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:\dev\java\webservices\alexa\com\amazon\api\alexa" />
<property name="cvs_file_history_flatOrder5" value="5" />
<property name="cvs_file_history_flatWidth5" value="92" />
- <property name="cvs_file_history_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" />
@@ -1421,7 +1419,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1434,58 +1431,9 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</tempConfiguration>
- <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
- <option name="WORKING_DIRECTORY" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="8080" />
- <option name="LOCAL" value="true" />
- <option name="OPEN_IN_BROWSER" value="true" />
- <option name="OPEN_IN_BROWSER_URL" value="/" />
- <option name="COMMON_VM_ARGUMENTS" value="" />
- <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="jar">
- <option name="CONTEXT_PATH" value="/" />
- <option name="MODULE_NAME" value="xwiki" />
- <option name="DEPLOY" value="true" />
- </J2EE_MODULE>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="3383" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
- <option name="USE_ENV_VARIABLES" value="true" />
- <STARTUP>
- <option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="" />
- </STARTUP>
- <SHUTDOWN>
- <option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="" />
- </SHUTDOWN>
- </ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
- <option name="USE_ENV_VARIABLES" value="true" />
- <STARTUP>
- <option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="" />
- </STARTUP>
- <SHUTDOWN>
- <option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="" />
- </SHUTDOWN>
- </ConfigurationWrapper>
- </configuration>
<configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -1500,6 +1448,15 @@
<option name="SERVER_NAME" value="myserver" />
<option name="DOMAIN_NAME" value="mydomain" />
</configuration>
+ <configuration selected="false" default="true" type="Application" factoryName="Application">
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <module name="" />
+ </configuration>
<configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -1508,31 +1465,15 @@
<option name="OPEN_IN_BROWSER" value="true" />
<option name="OPEN_IN_BROWSER_URL" value="/" />
<option name="COMMON_VM_ARGUMENTS" value="" />
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="3384" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="false" />
</RunnerSettings>
- <ConfigurationWrapper RunnerId="Run" />
+ <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
+ <ConfigurationWrapper RunnerId="Run" />
</configuration>
- <configuration selected="false" default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
- <configuration selected="false" default="true" type="Application" factoryName="Application">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <module name="" />
- </configuration>
<configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
<module name="xwiki" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1549,6 +1490,26 @@
<value defaultName="wholeProject" />
</option>
</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="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="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -1561,43 +1522,55 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration selected="false" default="true" type="#com.intellij.j2ee.web.jsr45.JSR45ConfigurationFactory" factoryName="Local">
+ <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
- <option name="PORT" value="80" />
+ <option name="PORT" value="8080" />
<option name="LOCAL" value="true" />
<option name="OPEN_IN_BROWSER" value="true" />
<option name="OPEN_IN_BROWSER_URL" value="/" />
<option name="COMMON_VM_ARGUMENTS" value="" />
- <option name="JSP_PACKAGE" value="" />
- <option name="VM_OPTS" value="" />
- <option name="USE_WEBSPHERE51_LINEMAPPING_MODEL" value="false" />
- <option name="LOCAL_PORT" value="80" />
- </configuration>
- <configuration selected="true" default="false" name="XWiki.com" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="lanai.xpertnet.biz" />
- <option name="PORT" value="5005" />
+ <J2EE_MODULE DEPLOYMENT_SOURCE_NAME="jar">
+ <option name="CONTEXT_PATH" value="/" />
+ <option name="MODULE_NAME" value="xwiki" />
+ <option name="DEPLOY" value="true" />
+ </J2EE_MODULE>
<RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1409" />
+ <option name="DEBUG_PORT" value="3383" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Profile ">
- <option name="myStartupWithAllocations" value="false" />
- <option name="myCPUStartup" value="" />
- <option name="myUsedMemoryThreshold" value="0" />
- <option name="myDontLaunchUI" value="false" />
- <option name="myCaptureMemoryOnExit" value="false" />
- <option name="myCaptureCPUOnExit" value="false" />
- <option name="mySnapshotsDir" value="" />
- <option name="myForceJVMTI" value="false" />
- <option name="myDisableAlloc" value="false" />
- <option name="myDisableCounts" value="false" />
- </RunnerSettings>
- <ConfigurationWrapper RunnerId="Debug" />
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
+ <option name="USE_ENV_VARIABLES" value="true" />
+ <STARTUP>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT" value="" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ </STARTUP>
+ <SHUTDOWN>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT" value="" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ </SHUTDOWN>
+ </ConfigurationWrapper>
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
+ <option name="USE_ENV_VARIABLES" value="true" />
+ <STARTUP>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT" value="" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ </STARTUP>
+ <SHUTDOWN>
+ <option name="USE_DEFAULT" value="true" />
+ <option name="SCRIPT" value="" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ </SHUTDOWN>
+ </ConfigurationWrapper>
</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" />
@@ -1612,12 +1585,6 @@
<option name="MODULE_NAME" value="xwiki" />
<option name="DEPLOY" value="true" />
</J2EE_MODULE>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="3515" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1630,25 +1597,26 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" 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>
<option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="C:\bin\catalina.bat" />
+ <option name="SCRIPT" value="C:\Program Files\Apache Software Foundation\Tomcat 5.0\bin\catalina.bat" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value=" run" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="C:\bin\catalina.bat" />
+ <option name="SCRIPT" value="C:\Program Files\Apache Software Foundation\Tomcat 5.0\bin\catalina.bat" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value=" stop" />
</SHUTDOWN>
- <EnvironmentVariables>
- <option name="NAME" value="LANG" />
- <option name="VALUE" value="fr_FR.ISO-8859-1" />
- <option name="IS_PREDEFINED" value="false" />
- </EnvironmentVariables>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
@@ -1670,20 +1638,25 @@
<option name="IS_PREDEFINED" value="false" />
</EnvironmentVariables>
</ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="C:\Program Files\Apache Software Foundation\Tomcat 5.0\bin\catalina.bat" />
+ <option name="SCRIPT" value="C:\bin\catalina.bat" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value=" run" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="C:\Program Files\Apache Software Foundation\Tomcat 5.0\bin\catalina.bat" />
+ <option name="SCRIPT" value="C:\bin\catalina.bat" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value=" stop" />
</SHUTDOWN>
+ <EnvironmentVariables>
+ <option name="NAME" value="LANG" />
+ <option name="VALUE" value="fr_FR.ISO-8859-1" />
+ <option name="IS_PREDEFINED" value="false" />
+ </EnvironmentVariables>
</ConfigurationWrapper>
</configuration>
<configuration selected="false" default="false" name="Tomcat 5.0 2" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat2">
@@ -1699,12 +1672,6 @@
<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="true" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1717,7 +1684,13 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" 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>
<option name="USE_DEFAULT" value="true" />
@@ -1747,7 +1720,7 @@
<option name="PROGRAM_PARAMETERS" value=" stop" />
</SHUTDOWN>
</ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
@@ -1763,6 +1736,31 @@
</SHUTDOWN>
</ConfigurationWrapper>
</configuration>
+ <configuration selected="true" default="false" name="XWiki.com" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="lanai.xpertnet.biz" />
+ <option name="PORT" value="5005" />
+ <RunnerSettings RunnerId="Profile ">
+ <option name="myStartupWithAllocations" value="false" />
+ <option name="myCPUStartup" value="" />
+ <option name="myUsedMemoryThreshold" value="0" />
+ <option name="myDontLaunchUI" value="false" />
+ <option name="myCaptureMemoryOnExit" value="false" />
+ <option name="myCaptureCPUOnExit" value="false" />
+ <option name="mySnapshotsDir" value="" />
+ <option name="myForceJVMTI" value="false" />
+ <option name="myDisableAlloc" value="false" />
+ <option name="myDisableCounts" value="false" />
+ </RunnerSettings>
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="1409" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <ConfigurationWrapper RunnerId="Debug" />
+ </configuration>
<configuration selected="false" default="false" name="UtilTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1780,12 +1778,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1054" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1798,8 +1790,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper 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" />
</configuration>
<configuration selected="false" default="false" name="WikiWikiBaseRenderTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1820,7 +1818,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1833,6 +1830,7 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="StoreTest" type="JUnit" factoryName="JUnit">
@@ -1854,12 +1852,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1825" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1872,8 +1864,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper 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" />
</configuration>
<configuration selected="false" default="false" name="StoreHibernateCacheTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1926,12 +1924,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1055" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1944,8 +1936,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper 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" />
</configuration>
<configuration selected="false" default="false" name="ObjectTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -1966,7 +1964,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -1979,6 +1976,7 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="StoreObjectHibernateTest" type="JUnit" factoryName="JUnit">
@@ -2000,12 +1998,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="3983" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2018,9 +2010,15 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
+ <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" />
</configuration>
<configuration selected="false" default="false" name="SearchTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2041,12 +2039,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="2647" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2059,8 +2051,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper 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" />
</configuration>
<configuration selected="false" default="false" name="PluginTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2081,7 +2079,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2094,9 +2091,10 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
- <configuration selected="false" default="false" name="UserTest" type="JUnit" factoryName="JUnit">
+ <configuration selected="true" default="false" name="UserTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -2115,12 +2113,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1377" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2133,10 +2125,16 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper 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" />
</configuration>
- <configuration selected="true" default="false" name="ViewEditTest" type="JUnit" factoryName="JUnit">
+ <configuration selected="false" default="false" name="ViewEditTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -2155,12 +2153,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1336" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2173,8 +2165,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper 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" />
</configuration>
<configuration selected="false" default="false" name="StoreObjectRCSFileTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2227,12 +2225,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1069" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2245,8 +2237,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper 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" />
</configuration>
<configuration selected="false" default="false" name="XWikiTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2267,12 +2265,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1826" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2285,8 +2277,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper 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" />
</configuration>
<configuration selected="false" default="false" name="RadeoxRenderTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2307,12 +2305,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="2019" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2325,8 +2317,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper 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" />
</configuration>
<configuration selected="false" default="false" name="VelocityRenderTest.testCacheRenderer" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2347,12 +2345,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="2597" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2365,9 +2357,15 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
+ <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" />
</configuration>
<configuration selected="false" default="false" name="ServletVirtualTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2388,12 +2386,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="1056" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2406,8 +2398,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper 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" />
</configuration>
<configuration selected="false" default="false" name="Servleti18nTest" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2428,7 +2426,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2441,6 +2438,7 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="ServletStatsTest" type="JUnit" factoryName="JUnit">
@@ -2462,7 +2460,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2475,6 +2472,7 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="StatsTest" type="JUnit" factoryName="JUnit">
@@ -2496,7 +2494,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2509,6 +2506,7 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="ServletAuthTest" type="JUnit" factoryName="JUnit">
@@ -2530,12 +2528,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="2833" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2548,8 +2540,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper 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" />
</configuration>
<configuration selected="false" default="false" name="AllServletTests" type="JUnit" factoryName="JUnit">
<module name="xwiki" />
@@ -2566,7 +2564,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2579,6 +2576,7 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="false" default="false" name="AllTests" type="JUnit" factoryName="JUnit">
@@ -2596,12 +2594,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="3790" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2614,8 +2606,14 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <ConfigurationWrapper 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" />
</configuration>
<configuration selected="false" default="false" name="Chart" type="JUnit" factoryName="JUnit">
<module name="xwikibase" />
@@ -2632,7 +2630,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2645,6 +2642,7 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
<configuration selected="true" default="false" name="Groovy Export" type="Application" factoryName="Application">
@@ -2655,7 +2653,6 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<module name="xwikibase" />
- <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Profile ">
<option name="myStartupWithAllocations" value="false" />
<option name="myCPUStartup" value="" />
@@ -2668,6 +2665,7 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</configuration>
</component>
@@ -2778,12 +2776,12 @@
</component>
<component name="ToolWindowManager">
<frame x="-4" y="-4" width="1688" height="1020" extended-state="6" />
- <editor active="false" />
+ <editor active="true" />
<layout>
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3409091" order="8" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.30877742" order="6" />
<window_info id="Project" active="false" anchor="left" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.3394608" 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.44204545" order="1" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39545456" 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.41136363" order="9" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4006462" order="5" />
@@ -2792,7 +2790,7 @@
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.27931595" order="1" />
- <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.41590908" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.29431817" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.15110683" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.48977274" order="3" />
@@ -2802,14 +2800,14 @@
<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="11" />
<window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
- <window_info id="Struts Layout" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32979593" order="3" />
+ <window_info id="RegexPlugin" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.330033" order="11" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
- <window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33009708" order="3" />
+ <window_info id="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="8" />
- <window_info id="Build" active="false" anchor="bottom" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.31544715" order="8" />
+ <window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33009708" order="3" />
<window_info id="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="8" />
<window_info id="Hibernate Tools" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3942857" order="3" />
<window_info id="Struts Console" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32979593" order="3" />
<window_info id="Tetris" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32979593" order="3" />
@@ -2944,127 +2942,123 @@
<option name="multicastPort" value="3274" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiVersioningStoreInterface.java">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/xwiki.cfg">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="7" selection-start="196" selection-end="196" vertical-scroll-proportion="0.22270742">
+ <state line="12" column="29" selection-start="1072" selection-end="1072" vertical-scroll-proportion="0.48128343">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Attachment.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="28" column="7" selection-start="994" selection-end="994" vertical-scroll-proportion="0.037444934">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/plugin/charts/mocks/MockStore.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="7" selection-start="1212" selection-end="1212" vertical-scroll-proportion="0.31497797">
+ <state line="65" column="0" selection-start="1854" selection-end="1854" vertical-scroll-proportion="0.037444934">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiAttachmentArchive.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="7" selection-start="1231" selection-end="1231" vertical-scroll-proportion="0.31497797">
+ <state line="28" column="0" selection-start="1040" selection-end="1040" vertical-scroll-proportion="0.03024911">
<folding>
<element signature="imports" expanded="true" />
</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/store/XWikiCacheStore.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="583" column="70" selection-start="17607" selection-end="17607" vertical-scroll-proportion="0.58810574">
+ <state line="131" column="19" selection-start="4765" selection-end="4765" vertical-scroll-proportion="0.030303031">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/xwiki.cfg">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiGroupServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="12" column="29" selection-start="1072" selection-end="1072" vertical-scroll-proportion="0.48128343">
+ <state line="66" column="0" selection-start="2667" selection-end="2667" vertical-scroll-proportion="0.030303031">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/includeservletasstring/BufferedResponse.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWikiContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="40" column="0" selection-start="1248" selection-end="1248" vertical-scroll-proportion="0.33480176">
+ <state line="291" column="47" selection-start="7378" selection-end="7378" vertical-scroll-proportion="1.1836007">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Attachment.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/includeservletasstring/BufferedResponse.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="7" selection-start="994" selection-end="994" vertical-scroll-proportion="0.29955947">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="40" column="0" selection-start="1248" selection-end="1248" vertical-scroll-proportion="0.037444934">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiAttachmentArchive.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="0" selection-start="1040" selection-end="1040" vertical-scroll-proportion="0.29955947">
+ <state line="435" column="57" selection-start="13157" selection-end="13157" vertical-scroll-proportion="0.32976827">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/xmlrpc/Page.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="125" selection-start="1765" selection-end="1765" vertical-scroll-proportion="0.45102507">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWikiContext.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="291" column="47" selection-start="7378" selection-end="7378" vertical-scroll-proportion="1.4096916">
+ <state line="54" column="27" selection-start="1975" selection-end="1975" vertical-scroll-proportion="0.18181819">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="65" column="0" selection-start="1854" selection-end="1854" vertical-scroll-proportion="0.7488987">
+ <state line="824" column="71" selection-start="25609" selection-end="25609" vertical-scroll-proportion="0.43137255">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="756" column="52" selection-start="29639" selection-end="29639" vertical-scroll-proportion="0.5770925">
+ <state line="118" column="58" selection-start="4310" selection-end="4310" vertical-scroll-proportion="0.23626374">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiHibernateAttachmentStore.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="131" column="19" selection-start="4765" selection-end="4765" vertical-scroll-proportion="0.6894273">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="62" column="93" selection-start="2248" selection-end="2248" vertical-scroll-proportion="0.33333334">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiGroupServiceImpl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiHibernateVersioningStore.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="66" column="0" selection-start="2667" selection-end="2667" vertical-scroll-proportion="0.28414097">
- <folding />
+ <state line="89" column="43" selection-start="3541" selection-end="3541" vertical-scroll-proportion="0.4848485">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiHibernateVersioningStore.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="15" column="45" selection-start="574" selection-end="574" vertical-scroll-proportion="0.37444934">
+ <state line="260" column="83" selection-start="10590" selection-end="10590" vertical-scroll-proportion="0.72727275">
<folding>
<element signature="imports" expanded="true" />
</folding>
More information about the Xwiki-notifications
mailing list