- xwiki-devs@xwiki.org - lists.xwiki.org

Re: [xwiki-commits] r2972 - xwiki/trunk
by Vincent Massol 24 Apr '07

24 Apr '07

Hi Sergiu, Just to let you know it's dangerous to depend on a snapshot version as it means anytime they update their snapshot we'll get the update so our build can start to fail at any time. Also, we cannot release XWiki if we have snapshot versions (at least that's the maven strategy and maven will even prevent you from doing a release) so we'll need to fix before we release 1.1 B1. I see Hibernate has used some timestamped versions, maybe we could do the same or use their versions: http://repo1.maven.org/maven2/org/hibernate/jtidy/ Thanks -Vincent On Apr 24, 2007, at 4:25 AM, Sergiu Dumitriu wrote: > Author: sdumitriu > Date: 2007-04-24 04:25:11 +0200 (Tue, 24 Apr 2007) > New Revision: 2972 > > Modified: > xwiki/trunk/pom.xml > Log: > Adding the JTidy maven repository to the list of known repos. > > > > Modified: xwiki/trunk/pom.xml > =================================================================== > --- xwiki/trunk/pom.xml 2007-04-24 01:57:38 UTC (rev 2971) > +++ xwiki/trunk/pom.xml 2007-04-24 02:25:11 UTC (rev 2972) > @@ -55,6 +55,14 @@ > <enabled>true</enabled> > </releases> > </repository> > + <repository> > + <id>jtidy</id> > + <name>JTidy Maven2 Remote Repository</name> > + <url>http://jtidy.sourceforge.net/snapshots/</url> > + <releases> > + <enabled>true</enabled> > + </releases> > + </repository> > </repositories> > </project> > > \ No newline at end of file

1 3

Re: [xwiki-commits] r2970 - xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/user/impl/xwiki
by Vincent Massol 24 Apr '07

24 Apr '07

Ludovic, Do we already have an issue associated with this? Thanks -Vincent On Apr 24, 2007, at 3:39 AM, Ludovic Dubost wrote: > Author: ludovic > Date: 2007-04-24 03:38:37 +0200 (Tue, 24 Apr 2007) > New Revision: 2970 > > Modified: > xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/user/ > impl/xwiki/MyPersistentLoginManager.java > Log: > Fixed regression on cleanup impacting rememberme cookie > > > Modified: xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/ > user/impl/xwiki/MyPersistentLoginManager.java > =================================================================== > --- xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/user/ > impl/xwiki/MyPersistentLoginManager.java 2007-04-24 01:36:29 UTC > (rev 2969) > +++ xwiki/branches/XWIKI_1_0/core/src/main/java/com/xpn/xwiki/user/ > impl/xwiki/MyPersistentLoginManager.java 2007-04-24 01:38:37 UTC > (rev 2970) > @@ -38,7 +38,7 @@ > * Class responsible for remembering the login information between > requests. It uses (encrypted) > * cookies for this. The encryption key is stored in xwiki.cfg, > xwiki.authentication.encryptionKey > * parameter. > - * > + * > * The cookies used are: > * <dl>> > * <dt>username</dt> > @@ -54,7 +54,7 @@ > * xwiki.authentication.useip . The secret parameter is specified in > * xwiki.authentication.validationKey</dd> > * </dl> > - * > + * > * @version $Id: $ > */ > public class MyPersistentLoginManager extends > DefaultPersistentLoginManager > @@ -97,7 +97,7 @@ > > /** > * Setter for the {@link #cookieDomains} parameter. > - * > + * > * @param cdlist The new value for {@link #cookieDomains}. > * @see #cookieDomains > */ > @@ -108,7 +108,7 @@ > > /** > * Setter for the {@link #cookiePath} parameter. > - * > + * > * @param cp The new value for {@link #cookiePath}. > * @see #cookiePath > */ > @@ -119,7 +119,7 @@ > > /** > * Setup a cookie: expiration date, path, domain + send it to > the response. > - * > + * > * @param cookie The cookie to setup. > * @param sessionCookie Whether the cookie is only for this > session, or for a longer period. > * @param cookieDomain The domain for which the cookie is set. > @@ -140,7 +140,7 @@ > > /** > * Remember a specific login using cookies. > - * > + * > * @param request The servlet request. > * @param response The servlet response. > * @param username The username that's being remembered. > @@ -177,7 +177,7 @@ > setupCookie(passwdCookie, sessionCookie, cookieDomain, > response); > > // Remember me > - Cookie rememberCookie = new Cookie(COOKIE_REMEMBERME, > sessionCookie + ""); > + Cookie rememberCookie = new Cookie(COOKIE_REMEMBERME, ! > sessionCookie + ""); > setupCookie(rememberCookie, sessionCookie, cookieDomain, > response); > > if (protection.equals(PROTECTION_ALL) || protection.equals > (PROTECTION_VALIDATION)) { > @@ -202,7 +202,7 @@ > /** > * Sets the maximum age for cookies. The maximum age is > configured in xwiki.cfg using the > * xwiki.authentication.cookielife parameter (number of days). > The default age is 14 days. > - * > + * > * @param cookie The cookie for which the expiration date is > configured. > */ > private void setMaxAge(Cookie cookie) > @@ -218,7 +218,7 @@ > > /** > * Adds a cookie to the response. > - * > + * > * @param response The servlet response. > * @param cookie The cookie to be sent. > */ > @@ -235,7 +235,7 @@ > * Compute the actual domain the cookie is supposed to be set > for. Search through the list of > * generalized domains for a partial match. If no match is > found, then no specific domain is > * used, which means that the cookie will be valid only for > the requested domain. > - * > + * > * @param request The servlet request. > * @return The configured domain generalization that matches > the request, or null if no match is > * found. > @@ -261,10 +261,10 @@ > /** > * Get validation hash for the specified parameters. The hash > includes a secret password, and > * optionally binds the cookie to the requester's IP. > - * > + * > * The hash secret is configured using the > xwiki.authentication.validationKey parameter. The IP > * binding is enabled using the xwiki.authentication.useip > parameter. > - * > + * > * @param username The remembered username. > * @param password The remembered password. > * @param clientIP The client IP of the request. > @@ -319,7 +319,7 @@ > /** > * Encrypt a string. The encryption is password-based. The > password can be configured using the > * xwiki.authentication.encryptionKey parameter. > - * > + * > * @param clearText The text to be encrypted. > * @return clearText, encrypted. > * @todo Optimize this code by creating the Cipher only once. > @@ -351,7 +351,7 @@ > > /** > * Forget a login by removing the authentication cookies. > - * > + * > * @param request The servlet request. > * @param response The servlet response. > */ > @@ -369,7 +369,7 @@ > * Given an array of cookies and a name, this method tries to > find and return the cookie from > * the array that has the given name. If there is no cookie > matching the name in the array, null > * is returned. > - * > + * > * @param cookies The list of cookies sent by the client. > * @param cookieName The name of the cookie to be retrieved. > * @return The requested cookie, or null if no cookie with the > given name was found. > @@ -389,7 +389,7 @@ > > /** > * Remove a cookie. > - * > + * > * @param request The servlet request. > * @param response The servlet response. > * @param cookieName The name of the cookie that must be removed. > @@ -411,7 +411,7 @@ > > /** > * Check if a text is supposed to be an affirmative value > ("true", "yes" or "1"). > - * > + * > * @param text The text to check. > * @return true if the text is one of "true", "yes" or "1", > false otherwise. > */ > > > > -- > You receive this message as a subscriber of the xwiki- > commits(a)objectweb.org mailing list. > To unsubscribe: mailto:[email protected] > For general help: mailto:[email protected]?subject=help > ObjectWeb mailing lists service home page: http://www.objectweb.org/ > wws

1 0

Code macro
by shivshan 23 Apr '07

23 Apr '07

Hi Anybody know what syntax other than Java & XML are supported by the code macro? I will update this page if i get any information. http://www.xwiki.org/xwiki/bin/view/Code/CodeMacro Thanks Shiva -- View this message in context: http://www.nabble.com/Code-macro-tf3633000.html#a10144576 Sent from the XWiki- Dev mailing list archive at Nabble.com.

2 2

[JIRA] Moving all 1.1 tasks to Future?
by Vincent Massol 23 Apr '07

23 Apr '07

Hi, We have lots of jira tasks scheduled for 1.1 but I don't think that's right. According to our new strategy we're only scheduling issues that we know we want to do in a given release. I think we've used 1.1 in the past as a way to say "later". But we have "future" for this now. So I'd like to move all the tasks in 1.1 into "Future" if that's ok with you. Let me know. Note: We also need to continue moving the issues that have no "fix for" set (unscheduled issues). There are 76 of these. Thanks -Vincent

2 2

Re: [xwiki-commits] r2916 - in xwiki/trunk/web/standard/src/main/webapp: skins/albatross skins/dodo skins/finch templates
by Vincent Massol 23 Apr '07

23 Apr '07

Hi Ludovic, You cannot do this as XWIKI-1000 is already closed (in B6)! So your change won't appear in the release notes of whatever version comes next You need a new JIRA issue for this. Thanks -Vincent PS: Ludovic, I think we really ought to talk about JIRA because if we do not all agree on how to use it, it's going to be a mess. I'm trying my best to maintain a consistent usage of it but I need everyone's help for that. I have the feeling that some of us do not agree or understand with the practices that we have set forth (proposed/votes for most of them). That's fine but in that case we need to discuss them openly and revisit them. I'd rather we all argeed on something than playing the "police" every time which is not a nice role to play... :) On Apr 20, 2007, at 11:49 PM, Ludovic Dubost wrote: > Author: ludovic > Date: 2007-04-20 23:49:55 +0200 (Fri, 20 Apr 2007) > New Revision: 2916 > > Added: > xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdfhtmlheader.vm > xwiki/trunk/web/standard/src/main/webapp/skins/dodo/ > pdfhtmlheader.vm > xwiki/trunk/web/standard/src/main/webapp/skins/finch/ > pdfhtmlheader.vm > xwiki/trunk/web/standard/src/main/webapp/templates/pdfhtmlheader.vm > Modified: > xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdf.vm > xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm > xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm > xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm > Log: > XWIKI-1000 missing pdf templates for improvements > > Modified: xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdf.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdf.vm > 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdf.vm > 2007-04-20 21:49:55 UTC (rev 2916) > @@ -1,20 +1,32 @@ > -#template("xwiki.vm") > -#template("httpheader.vm") > -#template("pdfheader.vm") > -<div id="xwikicontent"> > -$cdoc.getRenderedContent() > -</div> > -#if ($request.get("comments")=="1") > -#template("comments2.vm") > -#end > -#if ($request.get("attachments")=="1") > -<div id="xwikiattachments"> > -#foreach ($attach in $doc.attachmentList) > -#if ($attach.isImage()) > -<img src="$doc.getAttachmentURL("${attach.filename}", "download")" > alt="${attach.filename}" /> > -<br /> > -#end > -#end > -</div> > -#end > -#template("pdffooter.vm") > +#template("xwiki.vm") > +$doc.use("XWiki.PDFClass") > +#template("pdfhtmlheader.vm") > +#set($pdfheader = $doc.display("header")) > +#if($pdfheader=="") > +#template("pdfheader.vm") > +#else > +$pdfheader > +#end > +<div id="xwikicontent"> > +$cdoc.getRenderedContent() > +</div> > +#if ($request.get("comments")=="1") > +#template("comments2.vm") > +#end > +#if ($request.get("attachments")=="1") > +<div id="xwikiattachments"> > +#foreach ($attach in $doc.attachmentList) > +#if ($attach.isImage()) > +<img src="$doc.getAttachmentURL("${attach.filename}", "download")" > alt="${attach.filename}" /> > +<br /> > +#end > +#end > +</div> > +#end > +$doc.use("XWiki.PDFClass") > +#set($pdffooter = $doc.display("footer")) > +#if($pdffooter=="") > +#template("pdffooter.vm") > +#else > +$pdffooter > +#end > \ No newline at end of file > > Added: xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdfhtmlheader.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdfhtmlheader.vm 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdfhtmlheader.vm 2007-04-20 21:49:55 UTC (rev 2916) > @@ -0,0 +1,24 @@ > +<?xml version="1.0" encoding="$xwiki.encoding" ?> > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" > + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> > +<html xmlns="http://www.w3.org/1999/xhtml"> > +<head> > +<title> > +$doc.use("XWiki.PDFClass") > +#set($title = $doc.display("title")) > +#if((!$title)||($title=="")) > +#set( $title = $!xwiki.getWebPreference("title")) > +#if ( $title != "") > +$xwiki.parseContent($title) > +#else > +XWiki - $!doc.web - $!doc.displayTitle > +#end > +#else > +$title > +#end > +</title> > +<meta http-equiv="Content-Type" content="text/html; charset= > $xwiki.encoding" /> > +</head> > +<body id="body" class="${context.action}body"> > +<div id="xwikimaincontainer"> > +<div id="xwikimaincontainerinner"> > > Modified: xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm > 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm > 2007-04-20 21:49:55 UTC (rev 2916) > @@ -1,6 +1,12 @@ > #template("xwiki.vm") > -#template("httpheader.vm") > +$doc.use("XWiki.PDFClass") > +#template("pdfhtmlheader.vm") > +#set($pdfheader = $doc.display("header")) > +#if($pdfheader=="") > #template("pdfheader.vm") > +#else > +$pdfheader > +#end > <div id="xwikicontent"> > $cdoc.getRenderedContent() > </div> > @@ -17,4 +23,10 @@ > #end > </div> > #end > +$doc.use("XWiki.PDFClass") > +#set($pdffooter = $doc.display("footer")) > +#if($pdffooter=="") > #template("pdffooter.vm") > +#else > +$pdffooter > +#end > \ No newline at end of file > > Added: xwiki/trunk/web/standard/src/main/webapp/skins/dodo/ > pdfhtmlheader.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/dodo/ > pdfhtmlheader.vm 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/dodo/ > pdfhtmlheader.vm 2007-04-20 21:49:55 UTC (rev 2916) > @@ -0,0 +1,24 @@ > +<?xml version="1.0" encoding="$xwiki.encoding" ?> > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" > + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> > +<html xmlns="http://www.w3.org/1999/xhtml"> > +<head> > +<title> > +$doc.use("XWiki.PDFClass") > +#set($title = $doc.display("title")) > +#if((!$title)||($title=="")) > +#set( $title = $!xwiki.getWebPreference("title")) > +#if ( $title != "") > +$xwiki.parseContent($title) > +#else > +XWiki - $!doc.web - $!doc.displayTitle > +#end > +#else > +$title > +#end > +</title> > +<meta http-equiv="Content-Type" content="text/html; charset= > $xwiki.encoding" /> > +</head> > +<body id="body" class="${context.action}body"> > +<div id="xwikimaincontainer"> > +<div id="xwikimaincontainerinner"> > > Modified: xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm > 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm > 2007-04-20 21:49:55 UTC (rev 2916) > @@ -1,20 +1,32 @@ > -#template("xwiki.vm") > -#template("httpheader.vm") > -#template("pdfheader.vm") > -<div id="xwikicontent"> > -$cdoc.getRenderedContent() > -</div> > -#if ($request.get("comments")=="1") > -#template("comments2.vm") > -#end > -#if ($request.get("attachments")=="1") > -<div id="xwikiattachments"> > -#foreach ($attach in $doc.attachmentList) > -#if ($attach.isImage()) > -<img src="$doc.getAttachmentURL("${attach.filename}", "download")" > alt="${attach.filename}" /> > -<br /> > -#end > -#end > -</div> > -#end > -#template("pdffooter.vm") > +#template("xwiki.vm") > +$doc.use("XWiki.PDFClass") > +#template("pdfhtmlheader.vm") > +#set($pdfheader = $doc.display("header")) > +#if($pdfheader=="") > +#template("pdfheader.vm") > +#else > +$pdfheader > +#end > +<div id="xwikicontent"> > +$cdoc.getRenderedContent() > +</div> > +#if ($request.get("comments")=="1") > +#template("comments2.vm") > +#end > +#if ($request.get("attachments")=="1") > +<div id="xwikiattachments"> > +#foreach ($attach in $doc.attachmentList) > +#if ($attach.isImage()) > +<img src="$doc.getAttachmentURL("${attach.filename}", "download")" > alt="${attach.filename}" /> > +<br /> > +#end > +#end > +</div> > +#end > +$doc.use("XWiki.PDFClass") > +#set($pdffooter = $doc.display("footer")) > +#if($pdffooter=="") > +#template("pdffooter.vm") > +#else > +$pdffooter > +#end > \ No newline at end of file > > Added: xwiki/trunk/web/standard/src/main/webapp/skins/finch/ > pdfhtmlheader.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/finch/ > pdfhtmlheader.vm 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/finch/ > pdfhtmlheader.vm 2007-04-20 21:49:55 UTC (rev 2916) > @@ -0,0 +1,24 @@ > +<?xml version="1.0" encoding="$xwiki.encoding" ?> > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" > + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> > +<html xmlns="http://www.w3.org/1999/xhtml"> > +<head> > +<title> > +$doc.use("XWiki.PDFClass") > +#set($title = $doc.display("title")) > +#if((!$title)||($title=="")) > +#set( $title = $!xwiki.getWebPreference("title")) > +#if ( $title != "") > +$xwiki.parseContent($title) > +#else > +XWiki - $!doc.web - $!doc.displayTitle > +#end > +#else > +$title > +#end > +</title> > +<meta http-equiv="Content-Type" content="text/html; charset= > $xwiki.encoding" /> > +</head> > +<body id="body" class="${context.action}body"> > +<div id="xwikimaincontainer"> > +<div id="xwikimaincontainerinner"> > > Modified: xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm > 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm > 2007-04-20 21:49:55 UTC (rev 2916) > @@ -1,6 +1,12 @@ > #template("xwiki.vm") > -#template("httpheader.vm") > +$doc.use("XWiki.PDFClass") > +#template("pdfhtmlheader.vm") > +#set($pdfheader = $doc.display("header")) > +#if($pdfheader=="") > #template("pdfheader.vm") > +#else > +$pdfheader > +#end > <div id="xwikicontent"> > $cdoc.getRenderedContent() > </div> > @@ -17,4 +23,10 @@ > #end > </div> > #end > +$doc.use("XWiki.PDFClass") > +#set($pdffooter = $doc.display("footer")) > +#if($pdffooter=="") > #template("pdffooter.vm") > +#else > +$pdffooter > +#end > \ No newline at end of file > > Added: xwiki/trunk/web/standard/src/main/webapp/templates/ > pdfhtmlheader.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/templates/ > pdfhtmlheader.vm 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/templates/ > pdfhtmlheader.vm 2007-04-20 21:49:55 UTC (rev 2916) > @@ -0,0 +1,24 @@ > +<?xml version="1.0" encoding="$xwiki.encoding" ?> > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" > + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> > +<html xmlns="http://www.w3.org/1999/xhtml"> > +<head> > +<title> > +$doc.use("XWiki.PDFClass") > +#set($title = $doc.display("title")) > +#if((!$title)||($title=="")) > +#set( $title = $!xwiki.getWebPreference("title")) > +#if ( $title != "") > +$xwiki.parseContent($title) > +#else > +XWiki - $!doc.web - $!doc.displayTitle > +#end > +#else > +$title > +#end > +</title> > +<meta http-equiv="Content-Type" content="text/html; charset= > $xwiki.encoding" /> > +</head> > +<body id="body" class="${context.action}body"> > +<div id="xwikimaincontainer"> > +<div id="xwikimaincontainerinner"> > > > > -- > You receive this message as a subscriber of the xwiki- > commits(a)objectweb.org mailing list. > To unsubscribe: mailto:[email protected] > For general help: mailto:[email protected]?subject=help > ObjectWeb mailing lists service home page: http://www.objectweb.org/ > wws

2 1

What's left for the final 1.0 release?
by Vincent Massol 23 Apr '07

23 Apr '07

Hi everyone, As release manager of the 1.0 version I'd like everyone's input on any important pending issues that you may know and that would need to be in the 1.0 release. As you've seen we've released RC1 yesterday. We'd now like to release the 1.0 version in one or two weeks depending on issues that need to be fixed. I've already listed one issue in JIRA for 1.0: * XWIKI-1107: XML content inside {code} macro is rendered in the WYSIWYG editor http://jira.xwiki.org/jira/browse/XWIKI-1107 Any other? Thanks -Vincent

4 5

[Proposal] Separate xwiki configuration from the XWiki WAR
by Vincent Massol 21 Apr '07

21 Apr '07

Hi, For XWiki 1.1 I'd like to separate XWiki's configuration files from the generated WAR. What I mean by configuration files: xwiki.cfg, hibernate.cfg.xml, xwiki.hbm, feeds.hbm and possibly some others. Rationale: 1) It would be nice to release different already made configurations for XWiki: for HSQLDB, for MySQL, for Oracle, with a minimal list of plugins configured, with all plugins enabled, with virtual wiki set up, etc. It's going to be way better to release a single WAR that is the same for all configs and a set of config files separately. This also makes it much easier in the build process. 2) It's currently a little bit of a pain for users when they upgrade their xwiki installation to a newer version. They have to remember to save their config files, to unpack the XWiki WAR, modify the configuration files, etc. What if an upgrade was a simple as dropping the new WAR file in the webapps/ directory of your servlet container? :) Thus I'd like to propose the following strategy: * XWiki looks for where the config files are stored using the following algorithm: 1) first it checks if a system property has been defined (say for example "xwiki.configuration.directory") 1) if not, it checks if a location has been specified in the web.xml file (as an init parameter) 2) if not found, it checks if the files can be found at the root of the classpath (e.g. "/xwiki.cfg") * The standalone distribution contains an already configured directory structure which uses the system property strategy for finding the configuration directory. <further future - but not too far as it's the best solution I think> We should propose a configuration wizard application which is in charge of generating xwiki configuration files. I propose the following distribution channels: - as a webapp wizard configured on xwiki.org. Users use forms to select what they want (which plugin, virtual wiki or not, etc). It generate the files that can be downloaded by the users. Actually this can even be implemented as a XWiki Application... ;-) Eating our dog food they said... - as a webapp wizard released inside the default WAR and that is activated automatically if no configuration is found, i.e. the first time XWiki is started. This is really by far the best I believe. </further future> WDYT? Thanks -Vincent

2 5

Re: [xwiki-commits] r2916 - in xwiki/trunk/web/standard/src/main/webapp: skins/albatross skins/dodo skins/finch templates
by Vincent Massol 21 Apr '07

21 Apr '07

Hi Ludovic, Is this for RC2 or even 1.0.1? Thanks -Vincent On Apr 20, 2007, at 11:49 PM, Ludovic Dubost wrote: > Author: ludovic > Date: 2007-04-20 23:49:55 +0200 (Fri, 20 Apr 2007) > New Revision: 2916 > > Added: > xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdfhtmlheader.vm > xwiki/trunk/web/standard/src/main/webapp/skins/dodo/ > pdfhtmlheader.vm > xwiki/trunk/web/standard/src/main/webapp/skins/finch/ > pdfhtmlheader.vm > xwiki/trunk/web/standard/src/main/webapp/templates/pdfhtmlheader.vm > Modified: > xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdf.vm > xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm > xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm > xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm > Log: > XWIKI-1000 missing pdf templates for improvements > > Modified: xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdf.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdf.vm > 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/albatross/pdf.vm > 2007-04-20 21:49:55 UTC (rev 2916) > @@ -1,20 +1,32 @@ > -#template("xwiki.vm") > -#template("httpheader.vm") > -#template("pdfheader.vm") > -<div id="xwikicontent"> > -$cdoc.getRenderedContent() > -</div> > -#if ($request.get("comments")=="1") > -#template("comments2.vm") > -#end > -#if ($request.get("attachments")=="1") > -<div id="xwikiattachments"> > -#foreach ($attach in $doc.attachmentList) > -#if ($attach.isImage()) > -<img src="$doc.getAttachmentURL("${attach.filename}", "download")" > alt="${attach.filename}" /> > -<br /> > -#end > -#end > -</div> > -#end > -#template("pdffooter.vm") > +#template("xwiki.vm") > +$doc.use("XWiki.PDFClass") > +#template("pdfhtmlheader.vm") > +#set($pdfheader = $doc.display("header")) > +#if($pdfheader=="") > +#template("pdfheader.vm") > +#else > +$pdfheader > +#end > +<div id="xwikicontent"> > +$cdoc.getRenderedContent() > +</div> > +#if ($request.get("comments")=="1") > +#template("comments2.vm") > +#end > +#if ($request.get("attachments")=="1") > +<div id="xwikiattachments"> > +#foreach ($attach in $doc.attachmentList) > +#if ($attach.isImage()) > +<img src="$doc.getAttachmentURL("${attach.filename}", "download")" > alt="${attach.filename}" /> > +<br /> > +#end > +#end > +</div> > +#end > +$doc.use("XWiki.PDFClass") > +#set($pdffooter = $doc.display("footer")) > +#if($pdffooter=="") > +#template("pdffooter.vm") > +#else > +$pdffooter > +#end > \ No newline at end of file > > Added: xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdfhtmlheader.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdfhtmlheader.vm 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/albatross/ > pdfhtmlheader.vm 2007-04-20 21:49:55 UTC (rev 2916) > @@ -0,0 +1,24 @@ > +<?xml version="1.0" encoding="$xwiki.encoding" ?> > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" > + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> > +<html xmlns="http://www.w3.org/1999/xhtml"> > +<head> > +<title> > +$doc.use("XWiki.PDFClass") > +#set($title = $doc.display("title")) > +#if((!$title)||($title=="")) > +#set( $title = $!xwiki.getWebPreference("title")) > +#if ( $title != "") > +$xwiki.parseContent($title) > +#else > +XWiki - $!doc.web - $!doc.displayTitle > +#end > +#else > +$title > +#end > +</title> > +<meta http-equiv="Content-Type" content="text/html; charset= > $xwiki.encoding" /> > +</head> > +<body id="body" class="${context.action}body"> > +<div id="xwikimaincontainer"> > +<div id="xwikimaincontainerinner"> > > Modified: xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm > 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/dodo/pdf.vm > 2007-04-20 21:49:55 UTC (rev 2916) > @@ -1,6 +1,12 @@ > #template("xwiki.vm") > -#template("httpheader.vm") > +$doc.use("XWiki.PDFClass") > +#template("pdfhtmlheader.vm") > +#set($pdfheader = $doc.display("header")) > +#if($pdfheader=="") > #template("pdfheader.vm") > +#else > +$pdfheader > +#end > <div id="xwikicontent"> > $cdoc.getRenderedContent() > </div> > @@ -17,4 +23,10 @@ > #end > </div> > #end > +$doc.use("XWiki.PDFClass") > +#set($pdffooter = $doc.display("footer")) > +#if($pdffooter=="") > #template("pdffooter.vm") > +#else > +$pdffooter > +#end > \ No newline at end of file > > Added: xwiki/trunk/web/standard/src/main/webapp/skins/dodo/ > pdfhtmlheader.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/dodo/ > pdfhtmlheader.vm 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/dodo/ > pdfhtmlheader.vm 2007-04-20 21:49:55 UTC (rev 2916) > @@ -0,0 +1,24 @@ > +<?xml version="1.0" encoding="$xwiki.encoding" ?> > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" > + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> > +<html xmlns="http://www.w3.org/1999/xhtml"> > +<head> > +<title> > +$doc.use("XWiki.PDFClass") > +#set($title = $doc.display("title")) > +#if((!$title)||($title=="")) > +#set( $title = $!xwiki.getWebPreference("title")) > +#if ( $title != "") > +$xwiki.parseContent($title) > +#else > +XWiki - $!doc.web - $!doc.displayTitle > +#end > +#else > +$title > +#end > +</title> > +<meta http-equiv="Content-Type" content="text/html; charset= > $xwiki.encoding" /> > +</head> > +<body id="body" class="${context.action}body"> > +<div id="xwikimaincontainer"> > +<div id="xwikimaincontainerinner"> > > Modified: xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm > 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/finch/pdf.vm > 2007-04-20 21:49:55 UTC (rev 2916) > @@ -1,20 +1,32 @@ > -#template("xwiki.vm") > -#template("httpheader.vm") > -#template("pdfheader.vm") > -<div id="xwikicontent"> > -$cdoc.getRenderedContent() > -</div> > -#if ($request.get("comments")=="1") > -#template("comments2.vm") > -#end > -#if ($request.get("attachments")=="1") > -<div id="xwikiattachments"> > -#foreach ($attach in $doc.attachmentList) > -#if ($attach.isImage()) > -<img src="$doc.getAttachmentURL("${attach.filename}", "download")" > alt="${attach.filename}" /> > -<br /> > -#end > -#end > -</div> > -#end > -#template("pdffooter.vm") > +#template("xwiki.vm") > +$doc.use("XWiki.PDFClass") > +#template("pdfhtmlheader.vm") > +#set($pdfheader = $doc.display("header")) > +#if($pdfheader=="") > +#template("pdfheader.vm") > +#else > +$pdfheader > +#end > +<div id="xwikicontent"> > +$cdoc.getRenderedContent() > +</div> > +#if ($request.get("comments")=="1") > +#template("comments2.vm") > +#end > +#if ($request.get("attachments")=="1") > +<div id="xwikiattachments"> > +#foreach ($attach in $doc.attachmentList) > +#if ($attach.isImage()) > +<img src="$doc.getAttachmentURL("${attach.filename}", "download")" > alt="${attach.filename}" /> > +<br /> > +#end > +#end > +</div> > +#end > +$doc.use("XWiki.PDFClass") > +#set($pdffooter = $doc.display("footer")) > +#if($pdffooter=="") > +#template("pdffooter.vm") > +#else > +$pdffooter > +#end > \ No newline at end of file > > Added: xwiki/trunk/web/standard/src/main/webapp/skins/finch/ > pdfhtmlheader.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/skins/finch/ > pdfhtmlheader.vm 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/skins/finch/ > pdfhtmlheader.vm 2007-04-20 21:49:55 UTC (rev 2916) > @@ -0,0 +1,24 @@ > +<?xml version="1.0" encoding="$xwiki.encoding" ?> > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" > + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> > +<html xmlns="http://www.w3.org/1999/xhtml"> > +<head> > +<title> > +$doc.use("XWiki.PDFClass") > +#set($title = $doc.display("title")) > +#if((!$title)||($title=="")) > +#set( $title = $!xwiki.getWebPreference("title")) > +#if ( $title != "") > +$xwiki.parseContent($title) > +#else > +XWiki - $!doc.web - $!doc.displayTitle > +#end > +#else > +$title > +#end > +</title> > +<meta http-equiv="Content-Type" content="text/html; charset= > $xwiki.encoding" /> > +</head> > +<body id="body" class="${context.action}body"> > +<div id="xwikimaincontainer"> > +<div id="xwikimaincontainerinner"> > > Modified: xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm > 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/templates/pdf.vm > 2007-04-20 21:49:55 UTC (rev 2916) > @@ -1,6 +1,12 @@ > #template("xwiki.vm") > -#template("httpheader.vm") > +$doc.use("XWiki.PDFClass") > +#template("pdfhtmlheader.vm") > +#set($pdfheader = $doc.display("header")) > +#if($pdfheader=="") > #template("pdfheader.vm") > +#else > +$pdfheader > +#end > <div id="xwikicontent"> > $cdoc.getRenderedContent() > </div> > @@ -17,4 +23,10 @@ > #end > </div> > #end > +$doc.use("XWiki.PDFClass") > +#set($pdffooter = $doc.display("footer")) > +#if($pdffooter=="") > #template("pdffooter.vm") > +#else > +$pdffooter > +#end > \ No newline at end of file > > Added: xwiki/trunk/web/standard/src/main/webapp/templates/ > pdfhtmlheader.vm > =================================================================== > --- xwiki/trunk/web/standard/src/main/webapp/templates/ > pdfhtmlheader.vm 2007-04-20 19:49:33 UTC (rev 2915) > +++ xwiki/trunk/web/standard/src/main/webapp/templates/ > pdfhtmlheader.vm 2007-04-20 21:49:55 UTC (rev 2916) > @@ -0,0 +1,24 @@ > +<?xml version="1.0" encoding="$xwiki.encoding" ?> > +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" > + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> > +<html xmlns="http://www.w3.org/1999/xhtml"> > +<head> > +<title> > +$doc.use("XWiki.PDFClass") > +#set($title = $doc.display("title")) > +#if((!$title)||($title=="")) > +#set( $title = $!xwiki.getWebPreference("title")) > +#if ( $title != "") > +$xwiki.parseContent($title) > +#else > +XWiki - $!doc.web - $!doc.displayTitle > +#end > +#else > +$title > +#end > +</title> > +<meta http-equiv="Content-Type" content="text/html; charset= > $xwiki.encoding" /> > +</head> > +<body id="body" class="${context.action}body"> > +<div id="xwikimaincontainer"> > +<div id="xwikimaincontainerinner"> > > > > -- > You receive this message as a subscriber of the xwiki- > commits(a)objectweb.org mailing list. > To unsubscribe: mailto:[email protected] > For general help: mailto:[email protected]?subject=help > ObjectWeb mailing lists service home page: http://www.objectweb.org/ > wws

1 0

Costumized Lucene Search Page
by Michael Guntli 20 Apr '07

20 Apr '07

With RC1 lucene seems to work again, so i have costumized the existing search form from jkraemer (http://www.jkraemer.net/static/maven/xwiki/plugins/lucene-plugin/install.ht…) But keep attention: it's just a quick&dirty example to display the results in a table ;-) As im not very familiar with velocity, the code is quite ugly! (for example i didn't find a while loop to output the number of stars for score-quality, so i did it with if, if, if..) it still has some bugs: * if you search for a regular expression (e.g. win*), then the query for the next page will be win</strong> * non wiki-documents and non-attachments will be hidden from the results, so it could happen that you see an empty page with a link to the next results (that's because searchresults.hitcount returns all results, also the hidden ones..) * many more.. * icons are hard-coded.. (/skins/lgs/*.png) You can get the icons for free from famfamfam: http://www.famfamfam.com/lab/icons/silk/ --------------------------- Searchform.vm: 1 Search #set($query = $request.getParameter("text")) #if(!$query) #set($query = "") #end #warning("This is the new lucene search engine.\\ If you experience any problems, try to use the default xwiki [Search>WebSearch?text=$query]..") #set($itemsPerPage = "30") #set($doRebuild = $request.getParameter("rebuild")) #if($doRebuild=="yes") #set($lucene = $xwiki.getPlugin("lucene")) #if($lucene) #set($documentCount = $lucene.rebuildIndex($xwiki,$context)) #if(${documentCount}>=0) Started index rebuild with $documentCount documents. Will take some time depending on the number of pages/attachments. #else Index rebuild failed. #end #end #else #if($xwiki.hasAdminRights()) [rebuild Index>${doc.web}.${doc.name}?rebuild=yes] #end #end {pre} <form action="$doc.name" method="post"> <input type="text" name="text" value="$query" /> <input type="submit" value="Search"/> </form> {/pre} #if($query != "") #set($lucene = $xwiki.getPlugin("lucene")) #if($lucene) #set($wikinames = "xwiki") #set($languages = "default,en,de") #set($firstIndex = $request.getParameter("firstIndex")) #if(!$firstIndex) #set($firstIndex = "1") #end #set($searchresults = $lucene.getSearchResults($query, $wikinames, $languages, $xwiki)) #set($results = $searchresults.getResults($firstIndex,$itemsPerPage)) #if($results.size()>0) #set($lastIndex=$searchresults.getEndIndex($firstIndex, $itemsPerPage)) #if($searchresults.hitcount==1) ##{pre} $msg.get("oneresult"):{/pre} #else ##{pre}$msg.get("results") $firstIndex - $lastIndex $msg.get("of") ${searchresults.hitcount}:{/pre} #if($searchresults.hasPrevious($firstIndex)) [previous page>${doc.web}.${doc.name}?text=$query&firstIndex=$searchresults.getPreviousIndex($firstIndex,$itemsPerPage)] #end #if($searchresults.hasNext($firstIndex,$itemsPerPage)) [next page>${doc.web}.${doc.name}?text=$query&firstIndex=$searchresults.getNextIndex($firstIndex,$itemsPerPage)] #end #end <table width="100%" class="grid" cellSpacing=0 cellpadding="5" border="1"> <tr> <th>Result</th> <th width="100">Date</th> <th width="150">Last Author</th> <th width="100">Score</th> </tr> #foreach($result in $results) #if($result.type=='wikipage') <tr> #if($xwiki.isVirtual()) <td align=left>[${result.wiki}:${result.web}.${result.name}]</td> #else <td align=left>[${result.web}.${result.name}]</td> #end <td>$xwiki.formatDate($result.date, "d. MMM yyyy")</td> <td>$xwiki.getUserName($result.author)</td> <td> #set($resval=$result.score*100) #if($resval>10) /xwiki/skins/lgs/16-star-hot.png #end #if($resval>25) /xwiki/skins/lgs/16-star-hot.png #end #if($resval>50) /xwiki/skins/lgs/16-star-hot.png #end #if($resval>70) /xwiki/skins/lgs/16-star-hot.png #end #if($resval>90) /xwiki/skins/lgs/16-star-hot.png #end ${resval}% </td> </tr> #elseif($result.type=='attachment') <tr> <td align=left> ${result.url} /xwiki/skins/lgs/disk.png ${result.filename} \\ Attachment of [${result.web}.${result.name}]</td> <td>$xwiki.formatDate($result.date, "d. MMM yyyy")</td> <td>$xwiki.getUserName($result.author)</td> <td> #set($resval=$result.score*100) #if($resval>10) /xwiki/skins/lgs/16-star-hot.png #end #if($resval>25) /xwiki/skins/lgs/16-star-hot.png #end #if($resval>50) /xwiki/skins/lgs/16-star-hot.png #end #if($resval>70) /xwiki/skins/lgs/16-star-hot.png #end #if($resval>90) /xwiki/skins/lgs/16-star-hot.png #end ${resval}% </td> </tr> #end </tr> #end #else $msg.get("noresults") #end </table> \\ #else lucene plugin not found #end #end -- View this message in context: http://www.nabble.com/Costumized-Lucene-Search-Page-tf3605463.html#a10073014 Sent from the XWiki- Dev mailing list archive at Nabble.com.

5 8

XWikiAuthServiceImpl - Redundant replaceAll ?
by Pablo Oliveira 20 Apr '07

20 Apr '07

Hi all, In user/impl/xwiki/XWikiAuthServiceImpl.java i read: protected String findUser(String susername2, XWikiContext context) throws XWikiException { String susername = susername2.replaceAll(" ", ""); susername = susername.replaceAll(" ", ""); [...] Why are we calling replaceAll method called twice ? It seems useless, what have I missed ? Thanks, Pablo

3 4