r1154 - in xwiki/trunk: . src/main/java/com/xpn/xwiki src/main/java/com/xpn/xwiki/api src/main/java/com/xpn/xwiki/doc src/main/java/com/xpn/xwiki/stats/impl src/main/resources src/main/web/WEB-INF src/main/web/skins/xwiki10 src/main/web/templates
Ludovic Dubost
ludovic at users.forge.objectweb.org
Wed Aug 16 10:23:44 CEST 2006
Author: ludovic
Date: 2006-08-16 10:23:43 +0200 (Wed, 16 Aug 2006)
New Revision: 1154
Modified:
xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
xwiki/trunk/src/main/java/com/xpn/xwiki/api/Document.java
xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
xwiki/trunk/src/main/java/com/xpn/xwiki/stats/impl/XWikiStatsServiceImpl.java
xwiki/trunk/src/main/resources/ApplicationResources.properties
xwiki/trunk/src/main/resources/ApplicationResources_en.properties
xwiki/trunk/src/main/resources/ApplicationResources_fr.properties
xwiki/trunk/src/main/web/WEB-INF/version.properties
xwiki/trunk/src/main/web/skins/xwiki10/editwiki.vm
xwiki/trunk/src/main/web/skins/xwiki10/editwysiwyg.vm
xwiki/trunk/src/main/web/skins/xwiki10/layoutvars.vm
xwiki/trunk/src/main/web/skins/xwiki10/simpleedittoolbar.vm
xwiki/trunk/src/main/web/skins/xwiki10/skin.js
xwiki/trunk/src/main/web/templates/macros.vm
xwiki/trunk/xwiki.iws
Log:
New API to detect programmatic content. This will allow to set a warning if the user does not have programming rights.
Added public api to convert the username in case the login is an email (switchable using a setting in xwiki.cfg)
Fix getURL, getAttachment URL in document and xwiki to correctly set the database from doc.getDatabase to have correct cross wiki URLs (regression following previous changes)
Added a synchronize block in the stat service following a deadlock detected
Fix copy document to correctly set the database for cross wiki copying (regression following previous changes)
Added some strings in the resources
Readded title field on top of the editor field in wiki and wysiwyg mode. Having the field in a panel was confusing.
Removed showLeftPanel and showRightPanel settings for the user and for the space. It does not allow to specify to use the default setting (space or global wiki). We need a setting with 3 choices (default / yes / no)
Changes some styles in the simple edit toolbar
Added javascript function in xwiki.js to allow to check for advanced content (this allows to warn before switching from wiki to wysiwyg mode)
Added javascript function in xwiki.js used for rights management
Added includeInContext macro to be used instead of includeForm when we want the same include but without having the edit button switch to inline mode
Changes convertUsername to convert email to a unique wiki page name which does not show the email address
Added hasCentralizedAuthentication and modified getLocalUserName to point to the main wiki profile when xwiki.authentication.centralized=1
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-08-16 08:23:43 UTC (rev 1154)
@@ -2596,8 +2596,9 @@
if (reset) {
tdoc.setVersion("1.1");
}
- tdoc.setDatabase(context.getDatabase());
- saveDocument(tdoc, context);
+ if (targetWiki!=null)
+ tdoc.setDatabase(targetWiki);
+ saveDocument(tdoc, context);
if (!reset) {
if (sourceWiki != null)
@@ -2647,7 +2648,8 @@
if (reset) {
ttdoc.setVersion("1.1");
}
- ttdoc.setDatabase(context.getDatabase());
+ if (targetWiki!=null)
+ ttdoc.setDatabase(targetWiki);
saveDocument(ttdoc, context);
if (!reset) {
@@ -2684,7 +2686,9 @@
tdoc.setVersion("1.1");
}
- saveDocument(tdoc, context);
+ if (targetWiki!=null)
+ tdoc.setDatabase(targetWiki);
+ saveDocument(tdoc, context);
if (!reset) {
if (sourceWiki != null)
@@ -2905,44 +2909,26 @@
}
public String getURL(String fullname, String action, XWikiContext context) throws XWikiException {
- String database = context.getDatabase();
- try {
- fullname = Util.getName(fullname, context);
- XWikiDocument doc = new XWikiDocument();
- doc.setFullName(fullname, context);
+ XWikiDocument doc = new XWikiDocument();
+ doc.setFullName(fullname, context);
- URL url = context.getURLFactory().createURL(doc.getWeb(), doc.getName(), action, context);
- return context.getURLFactory().getURL(url, context);
- } finally {
- context.setDatabase(database);
- }
+ URL url = context.getURLFactory().createURL(doc.getWeb(), doc.getName(), action, null, null, doc.getDatabase(), context);
+ return context.getURLFactory().getURL(url, context);
}
public String getURL(String fullname, String action, String querystring, XWikiContext context) throws XWikiException {
- String database = context.getDatabase();
- try {
- fullname = Util.getName(fullname, context);
- XWikiDocument doc = new XWikiDocument();
- doc.setFullName(fullname, context);
+ XWikiDocument doc = new XWikiDocument();
+ doc.setFullName(fullname, context);
- URL url = context.getURLFactory().createURL(doc.getWeb(), doc.getName(),
- action, querystring, null, context);
- return context.getURLFactory().getURL(url, context);
- } finally {
- context.setDatabase(database);
- }
+ URL url = context.getURLFactory().createURL(doc.getWeb(), doc.getName(),
+ action, querystring, null, doc.getDatabase(), context);
+ return context.getURLFactory().getURL(url, context);
}
public String getAttachmentURL(String fullname, String filename, XWikiContext context) throws XWikiException {
- String database = context.getDatabase();
- try {
- fullname = Util.getName(fullname, context);
- XWikiDocument doc = new XWikiDocument();
- doc.setFullName(fullname, context);
- return doc.getAttachmentURL(filename, "download", context);
- } finally {
- context.setDatabase(database);
- }
+ XWikiDocument doc = new XWikiDocument();
+ doc.setFullName(fullname, context);
+ return doc.getAttachmentURL(filename, "download", context);
}
// Usefull date functions
@@ -3403,16 +3389,35 @@
}
}
+
+ public boolean hasCentralizedAuthentication(XWikiContext context) {
+ String bl = getXWikiPreference("authentication_centralized", "", context);
+ if ("1".equals(bl))
+ return true;
+ if ("0".equals(bl))
+ return false;
+ return "1".equals(Param("xwiki.authentication.centralized", "0"));
+ }
+
public String getLocalUserName(String user, XWikiContext context) {
- return getUserName(user.substring(user.indexOf(":") + 1), null, true, context);
+ if (hasCentralizedAuthentication(context))
+ return getUserName(user, null, true, context);
+ else
+ return getUserName(user.substring(user.indexOf(":") + 1), null, true, context);
}
public String getLocalUserName(String user, String format, XWikiContext context) {
- return getUserName(user.substring(user.indexOf(":") + 1), format, true, context);
+ if (hasCentralizedAuthentication(context))
+ return getUserName(user, format, true, context);
+ else
+ return getUserName(user.substring(user.indexOf(":") + 1), format, true, context);
}
public String getLocalUserName(String user, String format, boolean link, XWikiContext context) {
- return getUserName(user.substring(user.indexOf(":") + 1), format, link, context);
+ if (hasCentralizedAuthentication(context))
+ return getUserName(user, format, link, context);
+ else
+ return getUserName(user.substring(user.indexOf(":") + 1), format, link, context);
}
public String formatDate(Date date, String format, XWikiContext context) {
@@ -3867,7 +3872,16 @@
public String convertUsername(String username, XWikiContext context) {
if (username==null)
return null;
- if (context.getWiki().Param("xwiki.authentication.convertemail", "0").equals("1"))
+ if (context.getWiki().Param("xwiki.authentication.convertemail", "0").equals("1")&&(username.indexOf("@")!=-1)) {
+ String id = "" + username.hashCode();
+ id = id.replaceAll("-", "");
+ if (username.length()>1) {
+ int i1 = username.indexOf('@');
+ id = "" + username.charAt(0) + username.substring(i1+1,i1+2) + username.charAt(username.length()-1) + id;
+ }
+ return id;
+ }
+ else if (context.getWiki().Param("xwiki.authentication.convertemail", "0").equals("2"))
return username.replaceAll("[\\.\\@]", "_");
else
return username;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/Document.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/Document.java 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/Document.java 2006-08-16 08:23:43 UTC (rev 1154)
@@ -896,6 +896,10 @@
return doc.isAdvancedContent();
}
+ public boolean isProgrammaticContent() {
+ return doc.isProgrammaticContent();
+ }
+
public boolean removeObject(Object obj) {
return getDoc().removeObject(obj.getBaseObject());
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java 2006-08-16 08:23:43 UTC (rev 1154)
@@ -1052,5 +1052,9 @@
public Document createDocument() {
return new Document(new XWikiDocument(), context);
}
+
+ public String convertUsername(String username) {
+ return xwiki.convertUsername(username, context);
+ }
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2006-08-16 08:23:43 UTC (rev 1154)
@@ -52,9 +52,11 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.collections.ListUtils;
import org.apache.ecs.filter.CharacterFilter;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.tools.VelocityFormatter;
+import org.apache.oro.text.regex.MalformedPatternException;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Element;
@@ -501,27 +503,27 @@
}
public String getAttachmentURL(String filename, String action, XWikiContext context) {
- URL url = context.getURLFactory().createAttachmentURL(filename, getWeb(), getName(), action, null, context);
+ URL url = context.getURLFactory().createAttachmentURL(filename, getWeb(), getName(), action, null, getDatabase(), context);
return context.getURLFactory().getURL(url, context);
}
public String getAttachmentURL(String filename, String action, String querystring, XWikiContext context) {
- URL url = context.getURLFactory().createAttachmentURL(filename, getWeb(), getName(), action, querystring, context);
+ URL url = context.getURLFactory().createAttachmentURL(filename, getWeb(), getName(), action, querystring, getDatabase(), context);
return context.getURLFactory().getURL(url, context);
}
public String getAttachmentRevisionURL(String filename, String revision, XWikiContext context) {
- URL url = context.getURLFactory().createAttachmentRevisionURL(filename, getWeb(), getName(), revision, null, context);
+ URL url = context.getURLFactory().createAttachmentRevisionURL(filename, getWeb(), getName(), revision, null, getDatabase(), context);
return context.getURLFactory().getURL(url, context);
}
public String getAttachmentRevisionURL(String filename, String revision, String querystring, XWikiContext context) {
- URL url = context.getURLFactory().createAttachmentRevisionURL(filename, getWeb(), getName(), revision, querystring, context);
+ URL url = context.getURLFactory().createAttachmentRevisionURL(filename, getWeb(), getName(), revision, querystring, getDatabase(), context);
return context.getURLFactory().getURL(url, context);
}
public String getURL(String action, boolean redirect, XWikiContext context) {
- URL url = context.getURLFactory().createURL(getWeb(), getName(), action, redirect, context);
+ URL url = context.getURLFactory().createURL(getWeb(), getName(), action, null, null, getDatabase(), context);
if (redirect) {
if (url == null)
return null;
@@ -537,19 +539,19 @@
public String getURL(String action, String querystring, XWikiContext context) {
URL url = context.getURLFactory().createURL(getWeb(), getName(), action,
- querystring, null, context);
+ querystring, getDatabase(), context);
return context.getURLFactory().getURL(url, context);
}
public String getExternalURL(String action, XWikiContext context) {
URL url = context.getURLFactory().createExternalURL(getWeb(), getName(), action,
- null, null, context);
+ null, null, getDatabase(), context);
return url.toString();
}
public String getExternalURL(String action, String querystring, XWikiContext context) {
URL url = context.getURLFactory().createExternalURL(getWeb(), getName(), action,
- querystring, null, context);
+ querystring, null, getDatabase(), context);
return url.toString();
}
@@ -557,7 +559,7 @@
public String getParentURL(XWikiContext context) throws XWikiException {
XWikiDocument doc = new XWikiDocument();
doc.setFullName(getParent(), context);
- URL url = context.getURLFactory().createURL(doc.getWeb(), doc.getName(), context);
+ URL url = context.getURLFactory().createURL(doc.getWeb(), doc.getName(), "view", null, null, getDatabase(), context);
return context.getURLFactory().getURL(url, context);
}
@@ -1785,7 +1787,7 @@
public List getIncludedPages(XWikiContext context) {
try {
- String pattern = "#include(Topic|Form|Macros)\\(\"(.*?)\"\\)";
+ String pattern = "#include(Topic|InContext|Form|Macros|parseGroovyFromPage)\\([\"'](.*?)[\"']\\)";
List list = context.getUtil().getMatches(getContent(), pattern, 2);
for (int i = 0; i < list.size(); i++) {
try {
@@ -2548,17 +2550,40 @@
return newobject;
}
- public boolean isAdvancedContent() {
- String[] matches = { "<%" , "#set", "#include", "#if", "<form", "<input", "<script", "<style", "public class", "/* Advanced content */", "## Advanced content" };
+ public boolean isAdvancedContent() {
+ String[] matches = { "<%" , "#set", "#include", "#if", "public class", "/* Advanced content */", "## Advanced content", "/* Programmatic content */", "## Programmatic content" };
String content2 = content.toLowerCase();
for (int i=0;i<matches.length;i++) {
if (content2.indexOf(matches[i])!=-1)
return true;
}
+ String htmlregexp = "</?(html|body|img|a|i|b|embed|script|form|input|textarea|object|font|li|ul|ol|table|center|hr|br|p) ?([^>]*)>";
+ try {
+ Util util = new Util();
+ List list = util.getMatches(content2, htmlregexp, 1);
+ if (list.size()>0)
+ return true;
+ } catch (MalformedPatternException e) {
+ }
return false;
}
+ public boolean isProgrammaticContent() {
+ String[] matches = { "<%" , "$xwiki.xWiki", "$context.context", "$doc.document", "$xwiki.getXWiki()", "$context.getContext()",
+ "$doc.getDocument()", "WithProgrammingRights(", "/* Programmatic content */", "## Programmatic content",
+ "$xwiki.search(", "$xwiki.createUser", "$xwiki.createNewWiki", "$xwiki.addToAllGroup", "$xwiki.sendMessage",
+ "$xwiki.copyDocument", "$xwiki.copyWikiWeb", "$xwiki.parseGroovyFromString", "$doc.toXML()", "$doc.toXMLDocument()",
+ };
+ String content2 = content.toLowerCase();
+ for (int i=0;i<matches.length;i++) {
+ if (content2.indexOf(matches[i])!=-1)
+ return true;
+ }
+
+ return false;
+ }
+
public boolean removeObject(BaseObject bobj) {
Vector objects = getObjects(bobj.getClassName());
if (objects==null)
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/stats/impl/XWikiStatsServiceImpl.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/stats/impl/XWikiStatsServiceImpl.java 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/stats/impl/XWikiStatsServiceImpl.java 2006-08-16 08:23:43 UTC (rev 1154)
@@ -164,17 +164,19 @@
return;
// Let's save in the session the last elements view, saved
- if (!action.equals("download")) {
- HttpSession session = context.getRequest().getSession();
- Collection actions = (Collection) session.getAttribute("recent_" + action);
- if (actions==null) {
- actions = new CircularFifoBuffer(context.getWiki().getXWikiPreferenceAsInt("recent_visits_size", 20, context));
- session.setAttribute("recent_" + action, actions);
+ synchronized (this) {
+ if (!action.equals("download")) {
+ HttpSession session = context.getRequest().getSession();
+ Collection actions = (Collection) session.getAttribute("recent_" + action);
+ if (actions==null) {
+ actions = new CircularFifoBuffer(context.getWiki().getXWikiPreferenceAsInt("recent_visits_size", 20, context));
+ session.setAttribute("recent_" + action, actions);
+ }
+ String element = context.getDatabase() + ":" + doc.getFullName();
+ if (actions.contains(element))
+ actions.remove(element);
+ actions.add(element);
}
- String element = context.getDatabase() + ":" + doc.getFullName();
- if (actions.contains(element))
- actions.remove(element);
- actions.add(element);
}
// Let's check if this wiki should have statistics disabled
Modified: xwiki/trunk/src/main/resources/ApplicationResources.properties
===================================================================
--- xwiki/trunk/src/main/resources/ApplicationResources.properties 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/resources/ApplicationResources.properties 2006-08-16 08:23:43 UTC (rev 1154)
@@ -452,4 +452,6 @@
youcanclicktoedit=You can <a href="${doc.getURL("edit")}">edit this page</a> to create it.
showlinenumbers=Show Line Numbers
hidelinenumbers=Hide Line numbers
-print=Print
\ No newline at end of file
+print=Print
+wiki=Wiki
+WYSIWYG=WYSIWYG
Modified: xwiki/trunk/src/main/resources/ApplicationResources_en.properties
===================================================================
--- xwiki/trunk/src/main/resources/ApplicationResources_en.properties 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/resources/ApplicationResources_en.properties 2006-08-16 08:23:43 UTC (rev 1154)
@@ -452,4 +452,6 @@
youcanclicktoedit=You can <a href="${doc.getURL("edit")}">edit this page</a> to create it.
showlinenumbers=Show Line Numbers
hidelinenumbers=Hide Line numbers
-print=Print
\ No newline at end of file
+print=Print
+wiki=Wiki
+WYSIWYG=WYSIWYG
Modified: xwiki/trunk/src/main/resources/ApplicationResources_fr.properties
===================================================================
--- xwiki/trunk/src/main/resources/ApplicationResources_fr.properties 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/resources/ApplicationResources_fr.properties 2006-08-16 08:23:43 UTC (rev 1154)
@@ -298,4 +298,6 @@
youcanclicktoedit=Vous pouvez <a href="${doc.getURL("edit")}">editer</a> cette page pour l'ajouter.
showlinenumbers=Afficher les numéros de lignes
hidelinenumbers=Cacher les numéros de lignes
-print=Imprimer
\ No newline at end of file
+print=Imprimer
+wiki=Wiki
+WYSIWYG=WYSIWYG
Modified: xwiki/trunk/src/main/web/WEB-INF/version.properties
===================================================================
--- xwiki/trunk/src/main/web/WEB-INF/version.properties 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/web/WEB-INF/version.properties 2006-08-16 08:23:43 UTC (rev 1154)
@@ -1,2 +1,2 @@
-#Sun Aug 13 17:32:11 CEST 2006
-build.number=1116
+#Wed Aug 16 10:03:14 CEST 2006
+build.number=svn
Modified: xwiki/trunk/src/main/web/skins/xwiki10/editwiki.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/editwiki.vm 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/web/skins/xwiki10/editwiki.vm 2006-08-16 08:23:43 UTC (rev 1154)
@@ -6,6 +6,9 @@
<input type="hidden" name="template" value="$!request.template" />
<input type="hidden" name="xredirect" value="$!xredirect" />
<input type="hidden" name="language" value="$!tdoc.language" />
+<div id="xwikiedittitle">
+<label for="xwikidoctitleinput">$msg.get("titlefield"):</label><input type="text" id="xwikidoctitleinput" name="title" value="$!tdoc.title" size="80"/>
+</div>
<div id="xwikitext">
#template("simpleedittoolbar.vm")
<div id="xwikidoccontent">
@@ -14,4 +17,4 @@
</div>
</div>
##<div>$msg.get("parent"): <input type="text" name="parent" value="$!doc.parent" size="40" /></div>
-</form>
\ No newline at end of file
+</form>
Modified: xwiki/trunk/src/main/web/skins/xwiki10/editwysiwyg.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/editwysiwyg.vm 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/web/skins/xwiki10/editwysiwyg.vm 2006-08-16 08:23:43 UTC (rev 1154)
@@ -9,7 +9,9 @@
<input type="hidden" name="xredirect" value="$!xredirect" />
<input type="hidden" name="language" value="$!tdoc.language" />
<div id="xwikitext">
-#template("simpleedittoolbar.vm")
+<div id="xwikiedittitle">
+<label for="xwikidoctitleinput">$msg.get("titlefield"):</label><input type="text" id="xwikidoctitleinput" name="title" value="$!tdoc.title" size="80"/>
+</div>
<div id="xwikidoccontent">
$xwiki.getTextArea($tdoc.content)
</div>
@@ -91,4 +93,4 @@
alert("$msg.get('browsernoncompatible')");
}
</script>
-*#
\ No newline at end of file
+*#
Modified: xwiki/trunk/src/main/web/skins/xwiki10/layoutvars.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/layoutvars.vm 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/web/skins/xwiki10/layoutvars.vm 2006-08-16 08:23:43 UTC (rev 1154)
@@ -26,14 +26,8 @@
#set($blogwidth = 200)
##
##
-#set($showLeftPanels = $xwiki.getUserPreferenceFromCookie("showLeftPanels"))
+#set($showLeftPanels = $xwiki.getXWikiPreference("showLeftPanels"))
#if(!$showLeftPanels || $showLeftPanels == "" || $showLeftPanels == "default")
-#set($showLeftPanels = $xwiki.getUserPreference("showLeftPanels"))
-#end
-#if(!$showLeftPanels || $showLeftPanels == "" || $showLeftPanels == "default")
-#set($showLeftPanels = $xwiki.getWebPreference("showLeftPanels"))
-#end
-#if(!$showLeftPanels || $showLeftPanels == "" || $showLeftPanels == "default")
#set($showLeftPanels = "1")
#end
#if($showLeftPanels == "yes")
@@ -42,14 +36,8 @@
#if($showLeftPanels == "no")
#set($showLeftPanels = "0")
#end
-#set($showRightPanels = $xwiki.getUserPreferenceFromCookie("showRightPanels"))
+#set($showRightPanels = $xwiki.getXWikiPreference("showRightPanels"))
#if(!$showRightPanels || $showRightPanels == "" || $showRightPanels == "default")
-#set($showRightPanels = $xwiki.getUserPreference("showRightPanels"))
-#end
-#if(!$showRightPanels || $showRightPanels == "" || $showRightPanels == "default")
-#set($showRightPanels = $xwiki.getWebPreference("showRightPanels"))
-#end
-#if(!$showRightPanels || $showRightPanels == "" || $showRightPanels == "default")
#set($showRightPanels = "1")
#end
#if($showRightPanels == "yes")
@@ -99,4 +87,4 @@
#end
##
##
-##
\ No newline at end of file
+##
Modified: xwiki/trunk/src/main/web/skins/xwiki10/simpleedittoolbar.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/simpleedittoolbar.vm 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/web/skins/xwiki10/simpleedittoolbar.vm 2006-08-16 08:23:43 UTC (rev 1154)
@@ -1,8 +1,8 @@
<script type="text/javascript" src="$xwiki.getSkinFile("wikibits.js")"></script>
<script type="text/javascript">
// <!--
-document.writeln("<div id='simpleedittoolbar' class='layoutsubsection'>")
-document.writeln("<div class='rightmenu'><a href='$xwiki.getURL("Doc.SimpleEditorToolbar")' onclick=\"openURL('$xwiki.getURL("Doc.SimpleEditorToolbar", "view", "xpage=plain")'); return false;\">?<" + "/a><" + "/div>");
+// document.writeln("<div id='simpleedittoolbar' class='layoutsubsection'>")
+// document.writeln("<div class='rightmenu'><a href='$xwiki.getURL("Doc.SimpleEditorToolbar")' onclick=\"openURL('$xwiki.getURL("Doc.SimpleEditorToolbar", "view", "xpage=plain")'); return false;\">?<" + "/a><" + "/div>");
document.writeln("<div class='leftmenu'>");
addButton('$xwiki.getSkinFile("ed_format_bold.gif")','$msg.get("bold")','__','__','$msg.get("boldtext")');
addButton('$xwiki.getSkinFile("ed_format_italic.gif")','$msg.get("italics")','~~','~~','$msg.get("italicstext")');
@@ -13,7 +13,7 @@
addButton('$xwiki.getSkinFile("ed_image.gif")','$msg.get("img")','{image:','}','$msg.get("imgtext")');
addButton('$xwiki.getSkinFile("ed_about.gif")','$msg.get("sig")','\#sign("$context.user")','','$msg.get("sigtext")');
//addInfobox('$msg.get("simpleedittoolbardesc")','$msg.get("simpleedittoolbardesc2")');
+// document.writeln("<" + "/div>");
document.writeln("<" + "/div>");
-document.writeln("<" + "/div>");
// -->
</script>
Modified: xwiki/trunk/src/main/web/skins/xwiki10/skin.js
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/skin.js 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/web/skins/xwiki10/skin.js 2006-08-16 08:23:43 UTC (rev 1154)
@@ -126,3 +126,67 @@
this.status.innerHtml = 'updated';
}
};
+
+function checkAdvancedContent(message) {
+ result = false;
+ data = document.forms.edit.content.value;
+ myRE = new RegExp("</?(html|body|img|a|i|b|embed|script|form|input|textarea|object|font|li|ul|ol|table|center|hr|br|p) ?([^>]*)>", "ig")
+ results = data.match(myRE)
+ if (results&&results.length>0)
+ result = true;
+
+ myRE2 = new RegExp("(#set|#include|#if|#end|#for|## Advanced content|public class|/\* Advanced content \*/)", "ig")
+ results = data.match(myRE2)
+ if (results&&results.length>0)
+ result = true;
+
+ if (result==true)
+ return confirm(message);
+
+ return true;
+}
+
+var currentfield = "";
+function show(fieldname) {
+ if (currentfield!="")
+ document.getElementById(currentfield).style.display="none";
+ document.getElementById(fieldname).style.display="block";
+ currentfield = fieldname;
+}
+
+function addUser(form, prefix) {
+ var username = form[prefix + "newuser"].value;
+ var select = form[prefix + "users"][0];
+ if (username != null && username != "") {
+ length = select.options.length ;
+ dusername = username;
+ if (username.indexOf('.')==-1) {
+ xusername = "XWiki." + username;
+ }
+ else {
+ if (username.indexOf(":")==-1) {
+ dusername = username.substring(username.lastIndexOf(".")+1);
+ }
+ xusername = username
+ }
+ select.options[length] = new Option(dusername, xusername, true);
+ }
+}
+
+function addGroup(form, prefix) {
+ var groupname = form[prefix + "newgroup"].value;
+ var select = form[prefix + "groups"][0];
+ if (groupname != null && groupname != "") {
+ length = select.options.length ;
+ dgroupname = groupname;
+ if (groupname.indexOf('.')==-1) {
+ xgroupname = "XWiki." + groupname;
+ }
+ else {
+ if (groupname.indexOf(":")==-1)
+ dgroupname = groupname.substring(groupname.lastIndexOf(".")+1);
+ xgroupname = groupname
+ }
+ select.options[length] = new Option(dgroupname, xgroupname, true);
+ }
+}
Modified: xwiki/trunk/src/main/web/templates/macros.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/macros.vm 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/src/main/web/templates/macros.vm 2006-08-16 08:23:43 UTC (rev 1154)
@@ -14,6 +14,10 @@
$xwiki.includeForm($topic)
#end
+#macro( includeInContext $topic )
+$xwiki.includeForm($topic)
+#end
+
#macro( includeServlet $url)
<!-- including $url -->
$xwiki.invokeServletAndReturnAsString($url)
Modified: xwiki/trunk/xwiki.iws
===================================================================
--- xwiki/trunk/xwiki.iws 2006-08-15 16:41:12 UTC (rev 1153)
+++ xwiki/trunk/xwiki.iws 2006-08-16 08:23:43 UTC (rev 1154)
@@ -283,19 +283,6 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/rcs/Archive.java" line="256" class="org.suigeneris.jrcs.rcs.Archive" package="org.suigeneris.jrcs.rcs">
- <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://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/rcs/Archive.java" line="823" class="org.suigeneris.jrcs.rcs.Archive" package="org.suigeneris.jrcs.rcs">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
@@ -637,91 +624,93 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="StoreHibernateTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/StoreHibernateTest.java">
+ <file leaf-file-name="XWiki.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="27" column="46" selection-start="1058" selection-end="1058" vertical-scroll-proportion="0.17863397">
+ <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="StoreTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/StoreTest.java">
+ <file leaf-file-name="Util.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/util/Util.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="488" column="0" selection-start="23783" selection-end="23783" vertical-scroll-proportion="1.1138353">
+ <state line="244" column="25" selection-start="8151" selection-end="8151" vertical-scroll-proportion="0.3722287">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ToString.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/util/ToString.java">
+ <file leaf-file-name="XWiki.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="154" column="0" selection-start="5247" selection-end="5247" vertical-scroll-proportion="1.2329247">
+ <state line="1016" column="47" selection-start="32382" selection-end="32382" vertical-scroll-proportion="0.008168028">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Archive.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/rcs/Archive.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="850" column="67" selection-start="25004" selection-end="25004" vertical-scroll-proportion="0.44658494">
- <folding />
+ <state line="2574" column="61" selection-start="91999" selection-end="91999" vertical-scroll-proportion="0.54142356">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="XWiki.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
+ <file leaf-file-name="version.properties" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/version.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="1752" column="85" selection-start="65088" selection-end="65088" vertical-scroll-proportion="0.26795095">
+ <state line="1" column="16" selection-start="47" selection-end="47" vertical-scroll-proportion="0.01983664">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Phrases.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/rcs/Phrases.java">
+ <file leaf-file-name="Document.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Document.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="86" column="0" selection-start="3551" selection-end="3551" vertical-scroll-proportion="0.8931699">
+ <state line="892" column="72" selection-start="30653" selection-end="30653" vertical-scroll-proportion="0.20653442">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Node.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/rcs/Node.java">
+ <file leaf-file-name="macros.vm" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/web/templates/macros.vm">
<provider selected="true" editor-type-id="text-editor">
- <state line="742" column="0" selection-start="22808" selection-end="22808" vertical-scroll-proportion="0.18388791">
+ <state line="293" column="87" selection-start="8775" selection-end="8775" vertical-scroll-proportion="0.64608073">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Version.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/rcs/Version.java">
+ <file leaf-file-name="ApplicationResources.properties" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/ApplicationResources.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="165" column="0" selection-start="5277" selection-end="5277" vertical-scroll-proportion="0.30823117">
+ <state line="457" column="0" selection-start="15906" selection-end="15906" vertical-scroll-proportion="0.88098013">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Utils.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/Utils.java">
+ <file leaf-file-name="ApplicationResources_en.properties" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/ApplicationResources_en.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="112" column="4" selection-start="3940" selection-end="4041" vertical-scroll-proportion="0.48161122">
+ <state line="457" column="0" selection-start="15906" selection-end="15906" vertical-scroll-proportion="0.88098013">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Collection.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Collection.java">
+ <file leaf-file-name="ApplicationResources_fr.properties" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/ApplicationResources_fr.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="86" column="0" selection-start="2605" selection-end="2605" vertical-scroll-proportion="1.3222417">
+ <state line="284" column="47" selection-start="10258" selection-end="10258" vertical-scroll-proportion="0.504084">
<folding />
</state>
</provider>
@@ -787,9 +776,9 @@
<option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
</component>
<component name="HighlightingSettingsPerFile">
- <setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/BaseCollection.java" root0="SKIP_INSPECTION" />
<setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java" root0="SKIP_INSPECTION" />
<setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/store/XWikiStoreInterface.java" root0="SKIP_HIGHLIGHTING" />
+ <setting file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/objects/BaseCollection.java" root0="SKIP_INSPECTION" />
</component>
<component name="InspectionManager">
<option name="AUTOSCROLL_TO_SOURCE" value="false" />
@@ -927,21 +916,9 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
+ <option name="myItemId" value="xwiki" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -949,25 +926,13 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
+ <option name="myItemId" value="xwiki" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki" />
+ <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\test\resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -975,72 +940,18 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
+ <option name="myItemId" value="xwiki" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki" />
+ <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src" />
+ <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\web\WEB-INF" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\resources" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="xwiki" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\xwiki\src\main\web" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
@@ -1126,7 +1037,7 @@
</component>
<component name="RestoreUpdateTree" />
<component name="RunManager">
- <activeType name="JUnit" />
+ <activeType name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" />
<tempConfiguration selected="false" default="false" name="ChartingMacroTest" type="JUnit" factoryName="JUnit">
<module name="xwiki" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -1157,6 +1068,36 @@
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
</tempConfiguration>
+ <configuration selected="false" default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
+ <configuration selected="false" default="true" type="Application" factoryName="Application">
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <module name="" />
+ </configuration>
+ <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local">
+ <option name="WORKING_DIRECTORY" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="7001" />
+ <option name="LOCAL" value="true" />
+ <option name="OPEN_IN_BROWSER" value="true" />
+ <option name="OPEN_IN_BROWSER_URL" value="/" />
+ <option name="COMMON_VM_ARGUMENTS" value="" />
+ <option name="DOMAIN_PATH" value="" />
+ <option name="USER" value="weblogic" />
+ <option name="PASSWORD" value="weblogic" />
+ <option name="SERVER_NAME" value="myserver" />
+ <option name="DOMAIN_NAME" value="mydomain" />
+ </configuration>
<configuration selected="false" default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -1182,13 +1123,39 @@
<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" />
+ <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
+ <option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
+ <option name="PORT" value="8080" />
+ <option name="LOCAL" value="false" />
+ <option name="OPEN_IN_BROWSER" value="true" />
+ <option name="OPEN_IN_BROWSER_URL" value="/" />
+ <option name="COMMON_VM_ARGUMENTS" value="" />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="3384" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="false" />
+ </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
+ <ConfigurationWrapper RunnerId="Run" />
</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" />
+ <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>
+ </configuration>
<configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -1239,62 +1206,6 @@
</SHUTDOWN>
</ConfigurationWrapper>
</configuration>
- <configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
- <option name="WORKING_DIRECTORY" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="8080" />
- <option name="LOCAL" value="false" />
- <option name="OPEN_IN_BROWSER" value="true" />
- <option name="OPEN_IN_BROWSER_URL" value="/" />
- <option name="COMMON_VM_ARGUMENTS" value="" />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="3384" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
- </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" />
- <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>
- </configuration>
- <configuration selected="false" default="true" type="Application" factoryName="Application">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <module name="" />
- </configuration>
- <configuration selected="false" default="true" type="WebLogic Instance" factoryName="Local">
- <option name="WORKING_DIRECTORY" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="7001" />
- <option name="LOCAL" value="true" />
- <option name="OPEN_IN_BROWSER" value="true" />
- <option name="OPEN_IN_BROWSER_URL" value="/" />
- <option name="COMMON_VM_ARGUMENTS" value="" />
- <option name="DOMAIN_PATH" value="" />
- <option name="USER" value="weblogic" />
- <option name="PASSWORD" value="weblogic" />
- <option name="SERVER_NAME" value="myserver" />
- <option name="DOMAIN_NAME" value="mydomain" />
- </configuration>
<configuration selected="true" default="false" name="Tomcat 5" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -2506,14 +2417,14 @@
<window_info id="Project" active="false" anchor="left" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.33801955" order="0" x="-87" y="100" width="469" height="491" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3730337" order="1" />
<window_info id="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.41011235" order="15" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.2235955" order="15" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4006462" order="5" />
<window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.46596858" order="11" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="11" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="13" />
<window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.27931595" order="1" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.31348315" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.31348315" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.15110683" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="10" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.6011236" order="3" />
@@ -2665,109 +2576,109 @@
<option name="multicastPort" value="3274" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/XWiki.java">
+ <entry file="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/rcs/Archive.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1042" column="0" selection-start="33363" selection-end="33363" vertical-scroll-proportion="0.9791667">
+ <state line="277" column="47" selection-start="10085" selection-end="10085" vertical-scroll-proportion="0.01983664">
<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/stats/impl/XWikiStatsServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="159" column="0" selection-start="6482" selection-end="6482" vertical-scroll-proportion="0.9015151">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="176" column="32" selection-start="6781" selection-end="6781" vertical-scroll-proportion="0.6528418">
+ <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/web/XWikiServletURLFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="44" column="0" selection-start="962" selection-end="1054" vertical-scroll-proportion="0.37310606">
+ <state line="135" column="48" selection-start="4731" selection-end="4731" vertical-scroll-proportion="0.4639017">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Document.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/web/XWikiDefaultURLFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="418" column="34" selection-start="11716" selection-end="11716" vertical-scroll-proportion="0.8162879">
+ <state line="34" column="15" selection-start="1253" selection-end="1253" vertical-scroll-proportion="0.21820304">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Class.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/util/Util.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="31" selection-start="1251" selection-end="1251" vertical-scroll-proportion="0.2084063">
+ <state line="244" column="25" selection-start="8151" selection-end="8151" vertical-scroll-proportion="0.3722287">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Collection.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/ApplicationResources.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="86" column="0" selection-start="2605" selection-end="2605" vertical-scroll-proportion="1.3222417">
+ <state line="457" column="0" selection-start="15906" selection-end="15906" vertical-scroll-proportion="0.88098013">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/Utils.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/ApplicationResources_en.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="112" column="4" selection-start="3940" selection-end="4041" vertical-scroll-proportion="0.48161122">
+ <state line="457" column="0" selection-start="15906" selection-end="15906" vertical-scroll-proportion="0.88098013">
<folding />
</state>
</provider>
</entry>
- <entry file="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/rcs/Version.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/ApplicationResources_fr.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="165" column="0" selection-start="5277" selection-end="5277" vertical-scroll-proportion="0.30823117">
+ <state line="284" column="47" selection-start="10258" selection-end="10258" vertical-scroll-proportion="0.504084">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/StoreHibernateTest.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyFormAuthenticator.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="27" column="46" selection-start="1058" selection-end="1058" vertical-scroll-proportion="0.17863397">
+ <state line="68" column="44" selection-start="2532" selection-end="2532" vertical-scroll-proportion="0.026113672">
<folding />
</state>
</provider>
</entry>
- <entry file="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/rcs/Phrases.java">
+ <entry file="file://$PROJECT_DIR$/src/main/web/templates/macros.vm">
<provider selected="true" editor-type-id="text-editor">
- <state line="86" column="0" selection-start="3551" selection-end="3551" vertical-scroll-proportion="0.8931699">
+ <state line="293" column="87" selection-start="8775" selection-end="8775" vertical-scroll-proportion="0.64608073">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/com/xpn/xwiki/test/StoreTest.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="488" column="0" selection-start="23783" selection-end="23783" vertical-scroll-proportion="1.1138353">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/util/ToString.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/XWiki.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="154" column="0" selection-start="5247" selection-end="5247" vertical-scroll-proportion="1.2329247">
+ <state line="1016" column="47" selection-start="32382" selection-end="32382" vertical-scroll-proportion="0.008168028">
<folding />
</state>
</provider>
</entry>
- <entry file="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/rcs/Node.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/api/Document.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="742" column="0" selection-start="22808" selection-end="22808" vertical-scroll-proportion="0.18388791">
+ <state line="892" column="72" selection-start="30653" selection-end="30653" vertical-scroll-proportion="0.20653442">
<folding />
</state>
</provider>
</entry>
- <entry file="file://C:/dev/java/jrcs/src/java/org/suigeneris/jrcs/rcs/Archive.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="850" column="67" selection-start="25004" selection-end="25004" vertical-scroll-proportion="0.44658494">
- <folding />
+ <state line="2574" column="61" selection-start="91999" selection-end="91999" vertical-scroll-proportion="0.54142356">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/xpn/xwiki/XWiki.java">
+ <entry file="file://$PROJECT_DIR$/src/main/web/WEB-INF/version.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="1752" column="85" selection-start="65088" selection-end="65088" vertical-scroll-proportion="0.26795095">
+ <state line="1" column="16" selection-start="47" selection-end="47" vertical-scroll-proportion="0.01983664">
<folding />
</state>
</provider>
More information about the Xwiki-notifications
mailing list