tag:old.nabble.com,2006:forum-28143Nabble - gatewiki2009-12-17T04:10:38Z<a href="http://gatewiki.sourceforge.net/" target="_top" rel="nofollow">CoW</a> (Controllable Wiki) is a wiki/CMS system based on <a href="http://grails.codehaus.org/" target="_top" rel="nofollow">Grails</a> and <a href="http://subversion.tigris.org/" target="_top" rel="nofollow">Subversion</a> written by the <a href="http://gate.ac.uk/" target="_top" rel="nofollow">GATE team</a>.tag:old.nabble.com,2006:post-26827132[gatewiki-commits] SF.net SVN: gatewiki:[2124] trunk/cow/doc2009-12-17T04:10:38Z2009-12-17T04:10:38Zgate-projectRevision: 2124
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2124&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2124&view=rev</a><br>Author: gate-project
<br>Date: 2009-12-17 12:10:38 +0000 (Thu, 17 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>[hamish] edit buggette
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/doc/cow-backlog.html
<br> trunk/cow/doc/cow-backlog.yam
<br><br>Modified: trunk/cow/doc/cow-backlog.html
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.html 2009-12-17 12:08:15 UTC (rev 2123)
<br>+++ trunk/cow/doc/cow-backlog.html 2009-12-17 12:10:38 UTC (rev 2124)
<br>@@ -69,6 +69,12 @@
<br> <li>restrict file uploads so users can't upload raw HTML in a location they
<br> wouldn't be allowed to view it.</li>
<br> </ul></li>
<br>+<li>edit flow [IR]
<br>+ <ul>
<br>+ <li>in cases where a previous failed edit is present, and there is also a
<br>+ conflict on update, it seems that edit flow fails to resolve the conflict
<br>+ and therefore prevents saving</li>
<br>+ </ul></li>
<br> <li>jape yamalyser [HC, NA]
<br> <ul>
<br> <li>fix issues identified in cow/doc/<span class="cow-escape">*</span>.yam [NA]</li>
<br><br>Modified: trunk/cow/doc/cow-backlog.yam
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.yam 2009-12-17 12:08:15 UTC (rev 2123)
<br>+++ trunk/cow/doc/cow-backlog.yam 2009-12-17 12:10:38 UTC (rev 2124)
<br>@@ -16,6 +16,10 @@
<br> staging, at least in server mode.
<br> - restrict file uploads so users can't upload raw HTML in a location they
<br> wouldn't be allowed to view it.
<br>+- edit flow [IR]
<br>+ - in cases where a previous failed edit is present, and there is also a
<br>+ conflict on update, it seems that edit flow fails to resolve the conflict
<br>+ and therefore prevents saving
<br> - jape yamalyser [HC, NA]
<br> - fix issues identified in cow/doc/\*.yam [NA]
<br> - do the TODO in PageService.saveEdit [HC]
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>This SF.Net email is sponsored by the Verizon Developer Community
<br>Take advantage of Verizon's best-in-class app development support
<br>A streamlined, 14 day to market process makes app distribution fast and easy
<br>Join now and get one step closer to millions of Verizon customers
<br><a href="http://p.sf.net/sfu/verizon-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/verizon-dev2dev</a>
<br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26827132&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26827102[gatewiki-commits] SF.net SVN: gatewiki:[2123] trunk/cow/doc2009-12-17T04:08:15Z2009-12-17T04:08:15Zgate-projectRevision: 2123
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2123&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2123&view=rev</a><br>Author: gate-project
<br>Date: 2009-12-17 12:08:15 +0000 (Thu, 17 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>[hamish] done task
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/doc/cow-backlog.html
<br> trunk/cow/doc/cow-backlog.yam
<br><br>Modified: trunk/cow/doc/cow-backlog.html
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.html 2009-12-17 11:52:41 UTC (rev 2122)
<br>+++ trunk/cow/doc/cow-backlog.html 2009-12-17 12:08:15 UTC (rev 2123)
<br>@@ -1,8 +1,7 @@
<br>-<?xml version="1.0" encoding="utf-8"?>
<br>+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
<br>+ "<a href="http://www.w3.org/TR/html4/strict.dtd" target="_top" rel="nofollow">http://www.w3.org/TR/html4/strict.dtd</a>">
<br> <!-- AUTOGENERATED FILE: ALL EDITS WILL BE LOST!!! -->
<br>-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
<br>- "<a href="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" target="_top" rel="nofollow">http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</a>">
<br>-<html xmlns="<a href="http://www.w3.org/1999/xhtml" target="_top" rel="nofollow">http://www.w3.org/1999/xhtml</a>" lang="en" xml:lang="en">
<br>+<html lang="en">
<br> <head>
<br> <meta name="generator" content="cow"/>
<br> <title>CoW Backlog</title>
<br>@@ -57,16 +56,11 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-1."/><h1 class="cow-heading"><span class="cow-sec-number">1. </span>Roadmap (version 1.1, early 2010)</h1>
<br>+<a class="cow-section-anchor" name="section-1."></a><h1 class="cow-heading"><span class="cow-sec-number">1. </span>Roadmap (version 1.1, early 2010)</h1>
<br>
<br> <p>TODO: reprioritise, pull in any pressing stuff from future tasks</p>
<br>
<br> <ul>
<br>-<li>cache the twitter</li>
<br>-<li>webflows [IR]
<br>- <ul>
<br>- <li>selenium test for delete flow</li>
<br>- </ul></li>
<br> <li>upload and newpage flows [IR]
<br> <ul>
<br> <li>upload of an empty file fails without a message</li>
<br>@@ -79,6 +73,7 @@
<br> <ul>
<br> <li>fix issues identified in cow/doc/<span class="cow-escape">*</span>.yam [NA]</li>
<br> <li>do the TODO in PageService.saveEdit [HC]</li>
<br>+ <li>put back the "switch to wysiwyg" in edit.gsp</li>
<br> </ul></li>
<br> <li>when dependencies regeneration is triggered for a file containing includes,
<br> the regeneration seems to be run with includes turned off (e.g. edit the
<br>@@ -92,11 +87,12 @@
<br> <li>prioritise user guide and top-level htmls in solr results</li>
<br> <li>group similar pages in solr results</li>
<br> </ul></li>
<br>+<li>cache the twitter</li>
<br> </ul>
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-2."/><h1 class="cow-heading"><span class="cow-sec-number">2. </span>Future Tasks</h1>
<br>+<a class="cow-section-anchor" name="section-2."></a><h1 class="cow-heading"><span class="cow-sec-number">2. </span>Future Tasks</h1>
<br>
<br> <ul>
<br> <li>we should rethink how we preview non-YAM HTML files. At the moment we inject
<br>@@ -479,13 +475,13 @@
<br> </ul>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-3."/><h1 class="cow-heading"><span class="cow-sec-number">3. </span>Completed Tasks</h1>
<br>+<a class="cow-section-anchor" name="section-3."></a><h1 class="cow-heading"><span class="cow-sec-number">3. </span>Completed Tasks</h1>
<br>
<br> <p><a class="cow-url" href="cow-done.html">A list of completed tasks is here.</a></p>
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4."/><h1 class="cow-heading"><span class="cow-sec-number">4. </span>About this Document</h1>
<br>+<a class="cow-section-anchor" name="section-4."></a><h1 class="cow-heading"><span class="cow-sec-number">4. </span>About this Document</h1>
<br>
<br> <p>
<br> <p>This document contains the list of features, functions, technologies,
<br><br>Modified: trunk/cow/doc/cow-backlog.yam
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.yam 2009-12-17 11:52:41 UTC (rev 2122)
<br>+++ trunk/cow/doc/cow-backlog.yam 2009-12-17 12:08:15 UTC (rev 2123)
<br>@@ -10,9 +10,6 @@
<br>
<br> TODO: reprioritise, pull in any pressing stuff from future tasks
<br>
<br>-- cache the twitter
<br>-- webflows [IR]
<br>- - selenium test for delete flow
<br> - upload and newpage flows [IR]
<br> - upload of an empty file fails without a message
<br> - uploads and newpage go directly into the sandbox - they should go via
<br>@@ -22,6 +19,7 @@
<br> - jape yamalyser [HC, NA]
<br> - fix issues identified in cow/doc/\*.yam [NA]
<br> - do the TODO in PageService.saveEdit [HC]
<br>+ - put back the "switch to wysiwyg" in edit.gsp
<br> - when dependencies regeneration is triggered for a file containing includes,
<br> the regeneration seems to be run with includes turned off (e.g. edit the
<br> download page on g8rs.net, then look at /narrative.html - this now has the
<br>@@ -32,6 +30,7 @@
<br> should just message instead
<br> - prioritise user guide and top-level htmls in solr results
<br> - group similar pages in solr results
<br>+- cache the twitter
<br>
<br>
<br> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>This SF.Net email is sponsored by the Verizon Developer Community
<br>Take advantage of Verizon's best-in-class app development support
<br>A streamlined, 14 day to market process makes app distribution fast and easy
<br>Join now and get one step closer to millions of Verizon customers
<br><a href="http://p.sf.net/sfu/verizon-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/verizon-dev2dev</a>
<br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26827102&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26826915[gatewiki-commits] SF.net SVN: gatewiki:[2122] trunk/cow/doc2009-12-17T03:52:41Z2009-12-17T03:52:41Zgate-projectRevision: 2122
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2122&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2122&view=rev</a><br>Author: gate-project
<br>Date: 2009-12-17 11:52:41 +0000 (Thu, 17 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>[hamish] a done task
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/doc/cow-done.html
<br> trunk/cow/doc/cow-done.yam
<br><br>Modified: trunk/cow/doc/cow-done.html
<br>===================================================================
<br>--- trunk/cow/doc/cow-done.html 2009-12-16 14:14:46 UTC (rev 2121)
<br>+++ trunk/cow/doc/cow-done.html 2009-12-17 11:52:41 UTC (rev 2122)
<br>@@ -2557,5 +2557,8 @@
<br> <li>merge in stuff from gate-server/html that has been added since the branch to
<br> gau-main-tree (e.g. the projects dir has had new stuff...) [VT] [done -
<br> nothing needed]</li>
<br>-</ul>
<br>-</body></html>
<br>+<li>webflows [IR]
<br>+ <ul>
<br>+ <li>selenium test for delete flow</li>
<br>+ </ul></li>
<br>+</ul></body></html>
<br><br>Modified: trunk/cow/doc/cow-done.yam
<br>===================================================================
<br>--- trunk/cow/doc/cow-done.yam 2009-12-16 14:14:46 UTC (rev 2121)
<br>+++ trunk/cow/doc/cow-done.yam 2009-12-17 11:52:41 UTC (rev 2122)
<br>@@ -1780,3 +1780,5 @@
<br> - merge in stuff from gate-server/html that has been added since the branch to
<br> gau-main-tree (e.g. the projects dir has had new stuff...) [VT] [done -
<br> nothing needed]
<br>+- webflows [IR]
<br>+ - selenium test for delete flow
<br>\ No newline at end of file
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>This SF.Net email is sponsored by the Verizon Developer Community
<br>Take advantage of Verizon's best-in-class app development support
<br>A streamlined, 14 day to market process makes app distribution fast and easy
<br>Join now and get one step closer to millions of Verizon customers
<br><a href="http://p.sf.net/sfu/verizon-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/verizon-dev2dev</a>
<br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26826915&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26811696[gatewiki-commits] SF.net SVN: gatewiki:[2121] trunk/cow/selenium2009-12-16T06:14:46Z2009-12-16T06:14:46Zian_robertsRevision: 2121
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2121&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2121&view=rev</a><br>Author: ian_roberts
<br>Date: 2009-12-16 14:14:46 +0000 (Wed, 16 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Added a selenium test for the delete flow.
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/selenium/server-suite.html
<br><br>Added Paths:
<br>-----------
<br> trunk/cow/selenium/tests/delete.html
<br><br>Modified: trunk/cow/selenium/server-suite.html
<br>===================================================================
<br>--- trunk/cow/selenium/server-suite.html 2009-12-16 14:14:06 UTC (rev 2120)
<br>+++ trunk/cow/selenium/server-suite.html 2009-12-16 14:14:46 UTC (rev 2121)
<br>@@ -15,6 +15,7 @@
<br> <tr><td><a href="tests/dependencies.html">dependencies</a></td></tr>
<br> <tr><td><a href="tests/svn-update.html">svn update</a></td></tr>
<br> <tr><td><a href="tests/directory-security.html">directory-security</a></td></tr>
<br>+<tr><td><a href="tests/delete.html">delete</a></td></tr>
<br> </tbody></table>
<br> </body>
<br> </html>
<br><br>Added: trunk/cow/selenium/tests/delete.html
<br>===================================================================
<br>--- trunk/cow/selenium/tests/delete.html (rev 0)
<br>+++ trunk/cow/selenium/tests/delete.html 2009-12-16 14:14:46 UTC (rev 2121)
<br>@@ -0,0 +1,1013 @@
<br>+<?xml version="1.0" encoding="UTF-8"?>
<br>+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "<a href="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" target="_top" rel="nofollow">http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</a>">
<br>+<html xmlns="<a href="http://www.w3.org/1999/xhtml" target="_top" rel="nofollow">http://www.w3.org/1999/xhtml</a>" xml:lang="en" lang="en">
<br>+<head profile="<a href="http://selenium-ide.openqa.org/profiles/test-case" target="_top" rel="nofollow">http://selenium-ide.openqa.org/profiles/test-case</a>">
<br>+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<br>+<link rel="selenium.base" href="" />
<br>+<title>delete</title>
<br>+</head>
<br>+<body>
<br>+<table cellpadding="1" cellspacing="1" border="1">
<br>+<thead>
<br>+<tr><td rowspan="1" colspan="3">delete</td></tr>
<br>+</thead><tbody>
<br>+
<br>+<!--admin user details, stored for later use-->
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>scott</td>
<br>+ <td>adminUsername</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>tiger</td>
<br>+ <td>adminPassword</td>
<br>+</tr>
<br>+
<br>+<!--wiki details, stored for later use-->
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>Delete flow tests</td>
<br>+ <td>wikiName</td>
<br>+</tr>
<br>+
<br>+<!-- Define some test users, stored for later use-->
<br>+<!-- This use will not be allowed to delete anything -->
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>javascript{'user' + (new Date()).getTime() + "1"}</td>
<br>+ <td>noDeleteUser</td>
<br>+</tr>
<br>+<!-- This user will be able to delete in all dirs except a privileged one -->
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>javascript{'user' + (new Date()).getTime() + "2"}</td>
<br>+ <td>normalUser</td>
<br>+</tr>
<br>+<!-- This user will be able to delete in all directories-->
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>javascript{'user' + (new Date()).getTime() + "3"}</td>
<br>+ <td>privilegedUser</td>
<br>+</tr>
<br>+
<br>+<!-- This action set will contain just the delete action -->
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>javascript{'actions' + (new Date()).getTime() + "3"}</td>
<br>+ <td>deleteActions</td>
<br>+</tr>
<br>+
<br>+<!--Test users will share the same details-->
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>Test</td>
<br>+ <td>userFirstName</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>User</td>
<br>+ <td>userLastName</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26811696&i=0" target="_top" rel="nofollow">test@...</a></td>
<br>+ <td>userEmail</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>1password4WTU</td>
<br>+ <td>userPassword</td>
<br>+</tr>
<br>+
<br>+<!-- Define some directory names, stored for later use-->
<br>+<!-- This directory will be deletable by normal users and privileged users-->
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>normal</td>
<br>+ <td>normalDir</td>
<br>+</tr>
<br>+<!-- This directory will be deletable by privileged users only-->
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>privileged</td>
<br>+ <td>privilegedDir</td>
<br>+</tr>
<br>+
<br>+<!-- Define some role names, stored for later use-->
<br>+<!-- This role can delete in the normal dir but not the privileged dir-->
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>javascript{'role' + (new Date()).getTime() + "1"}</td>
<br>+ <td>normalRole</td>
<br>+</tr>
<br>+<!-- This role can access everything-->
<br>+<tr>
<br>+ <td>store</td>
<br>+ <td>javascript{'role' + (new Date()).getTime() + "3"}</td>
<br>+ <td>privilegedRole</td>
<br>+</tr>
<br>+
<br>+
<br>+<!-- Ensure logged out -->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/auth/signOut</td>
<br>+ <td></td>
<br>+</tr>
<br>+<!--Log in as admin-->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>username</td>
<br>+ <td>${adminUsername}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>password</td>
<br>+ <td>${adminPassword}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Sign in']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>verifyTextPresent</td>
<br>+ <td>CoW</td>
<br>+ <td></td>
<br>+</tr>
<br>+<!--Create a new wiki-->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/admin/</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>link=Wiki areas</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>link=New Wiki</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>click</td>
<br>+ <td>createNewSandbox</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>description</td>
<br>+ <td>${wikiName}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Create']</td>
<br>+ <td></td>
<br>+</tr>
<br>+
<br>+<!--store the new wiki's id-->
<br>+<tr>
<br>+ <td>storeText</td>
<br>+ <td>//td[preceding-sibling::td = 'Id:']</td>
<br>+ <td>wikiID</td>
<br>+</tr>
<br>+
<br>+<!--make sure the new wiki works-->
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>link=Browse area</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>verifyTextPresent</td>
<br>+ <td>Directory</td>
<br>+ <td></td>
<br>+</tr>
<br>+
<br>+<!-- Create a directory for normal access -->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/page/show/${wikiID}</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>click</td>
<br>+ <td>link=New page</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>waitForElementPresent</td>
<br>+ <td>newpageName</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>newpageName</td>
<br>+ <td>${normalDir}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>click</td>
<br>+ <td>_eventId_submitName</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>waitForElementPresent</td>
<br>+ <td>_eventId_create</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>_eventId_create</td>
<br>+ <td></td>
<br>+</tr>
<br>+
<br>+<!-- Create a directory for privileged access -->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/page/show/${wikiID}</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>click</td>
<br>+ <td>link=New page</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>waitForElementPresent</td>
<br>+ <td>newpageName</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>newpageName</td>
<br>+ <td>${privilegedDir}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>click</td>
<br>+ <td>_eventId_submitName</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>waitForElementPresent</td>
<br>+ <td>_eventId_create</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>_eventId_create</td>
<br>+ <td></td>
<br>+</tr>
<br>+
<br>+
<br>+<!--create delete action set -->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecActionList/create</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>name</td>
<br>+ <td>${deleteActions}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>actions</td>
<br>+ <td>delete</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Create']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>regexp:^JsecActionList \d+ created$</td>
<br>+</tr>
<br>+
<br>+<!--create normal access role -->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecRole/create</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>name</td>
<br>+ <td>${normalRole}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Create']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>regexp:^JsecRole \d+ created$</td>
<br>+</tr>
<br>+<!--store the normal role's id-->
<br>+<tr>
<br>+ <td>storeText</td>
<br>+ <td>//td[preceding-sibling::td = 'Id:']</td>
<br>+ <td>normalRoleID</td>
<br>+</tr>
<br>+
<br>+<!--create normal access permission for this role-->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecRolePermissionRel/create</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>role.id</td>
<br>+ <td>${normalRole}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>wikiId</td>
<br>+ <td>${wikiID}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>includeDir</td>
<br>+ <td>.*</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>excludeDir</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>controllerName.id</td>
<br>+ <td>page</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>actions.id</td>
<br>+ <td>Read</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Create']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>regexp:^JsecRolePermissionRel \d+ created$</td>
<br>+</tr>
<br>+
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecRolePermissionRel/create</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>role.id</td>
<br>+ <td>${normalRole}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>wikiId</td>
<br>+ <td>${wikiID}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>includeDir</td>
<br>+ <td>.*</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>excludeDir</td>
<br>+ <td>.*${privilegedDir}\/\z</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>controllerName.id</td>
<br>+ <td>page</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>actions.id</td>
<br>+ <td>${deleteActions}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Create']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>regexp:^JsecRolePermissionRel \d+ created$</td>
<br>+</tr>
<br>+
<br>+<!--create privileged access role -->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecRole/create</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>name</td>
<br>+ <td>${privilegedRole}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Create']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>regexp:^JsecRole \d+ created$</td>
<br>+</tr>
<br>+<!--store the privileged role's id-->
<br>+<tr>
<br>+ <td>storeText</td>
<br>+ <td>//td[preceding-sibling::td = 'Id:']</td>
<br>+ <td>privilegedRoleID</td>
<br>+</tr>
<br>+<!--create privileged access permission for this role-->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecRolePermissionRel/create</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>role.id</td>
<br>+ <td>${privilegedRole}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>wikiId</td>
<br>+ <td>${wikiID}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>includeDir</td>
<br>+ <td>.*</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>excludeDir</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>controllerName.id</td>
<br>+ <td>page</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>actions.id</td>
<br>+ <td>Read</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Create']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>regexp:^JsecRolePermissionRel \d+ created$</td>
<br>+</tr>
<br>+
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecRolePermissionRel/create</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>role.id</td>
<br>+ <td>${privilegedRole}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>wikiId</td>
<br>+ <td>${wikiID}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>includeDir</td>
<br>+ <td>.*</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>excludeDir</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>controllerName.id</td>
<br>+ <td>page</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>actions.id</td>
<br>+ <td>${deleteActions}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Create']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>regexp:^JsecRolePermissionRel \d+ created$</td>
<br>+</tr>
<br>+
<br>+
<br>+<!--create normal user-->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecUser/list</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecUser/create</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>username</td>
<br>+ <td>${normalUser}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>firstname</td>
<br>+ <td>${userFirstName}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>lastname</td>
<br>+ <td>${userLastName}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>email</td>
<br>+ <td>${userEmail}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>password</td>
<br>+ <td>${userPassword}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>repeatPassword</td>
<br>+ <td>${userPassword}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Create']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>regexp:^JsecUser \d+ created$</td>
<br>+</tr>
<br>+<!--store the normal user's id-->
<br>+<tr>
<br>+ <td>storeText</td>
<br>+ <td>//td[preceding-sibling::td = 'Id:']</td>
<br>+ <td>normalUserID</td>
<br>+</tr>
<br>+<!--add external user to appropriate role-->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecUserRoleMappings/listByUser/${normalUserID}</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>id2</td>
<br>+ <td>label=${normalRole}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>add</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>User ${normalUser} (${userFirstName} ${userLastName}) added to role ${normalRole}</td>
<br>+</tr>
<br>+
<br>+
<br>+
<br>+<!--create privileged user-->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecUser/list</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecUser/create</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>username</td>
<br>+ <td>${privilegedUser}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>firstname</td>
<br>+ <td>${userFirstName}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>lastname</td>
<br>+ <td>${userLastName}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>email</td>
<br>+ <td>${userEmail}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>password</td>
<br>+ <td>${userPassword}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>repeatPassword</td>
<br>+ <td>${userPassword}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Create']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>regexp:^JsecUser \d+ created$</td>
<br>+</tr>
<br>+<!--store the privileged user's id-->
<br>+<tr>
<br>+ <td>storeText</td>
<br>+ <td>//td[preceding-sibling::td = 'Id:']</td>
<br>+ <td>privilegedUserID</td>
<br>+</tr>
<br>+<!--add privileged user to appropriate role-->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecUserRoleMappings/listByUser/${privilegedUserID}</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>select</td>
<br>+ <td>id2</td>
<br>+ <td>label=${privilegedRole}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>add</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>User ${privilegedUser} (${userFirstName} ${userLastName}) added to role ${privilegedRole}</td>
<br>+</tr>
<br>+
<br>+
<br>+<!--Log out of admin and in as the normal user-->
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>link=Log out</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertLocation</td>
<br>+ <td>*/g8/auth/login?*</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>username</td>
<br>+ <td>${normalUser}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>password</td>
<br>+ <td>${userPassword}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Sign in']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<!-- Try to delete something including the privileged directory -->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/page/show/${wikiID}/?type=dir</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>verifyTextPresent</td>
<br>+ <td>Directory:</td>
<br>+ <td></td>
<br>+</tr>
<br>+<!-- Check that we don't get a delete checkbox for directories we can't delete -->
<br>+<tr>
<br>+ <td>verifyElementNotPresent</td>
<br>+ <td>//input[@name = 'filesToDelete' and @value = '${privilegedDir}/']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<!-- Pretend to be malicious - try and delete it anyway -->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/page/delete/${wikiID}/?filesToDelete=${privilegedDir}/</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>verifyTextPresent</td>
<br>+ <td>Confirm deletion</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>_eventId_confirm</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>verifyTextPresent</td>
<br>+ <td>You do not have permission to delete</td>
<br>+ <td></td>
<br>+</tr>
<br>+
<br>+
<br>+<!--Log out, and in as the privileged user-->
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>link=Log out</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertLocation</td>
<br>+ <td>*/g8/auth/login?*</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>username</td>
<br>+ <td>${privilegedUser}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>password</td>
<br>+ <td>${userPassword}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Sign in']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<!-- Try to delete something including the privileged directory -->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/page/show/${wikiID}/?type=dir</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>verifyTextPresent</td>
<br>+ <td>Directory:</td>
<br>+ <td></td>
<br>+</tr>
<br>+<!-- This time we do have a checkbox for the privileged dir -->
<br>+<tr>
<br>+ <td>verifyElementPresent</td>
<br>+ <td>//input[@name = 'filesToDelete' and @value = '${privilegedDir}/']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>check</td>
<br>+ <td>//input[@name = 'filesToDelete' and @value = '${privilegedDir}/']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>check</td>
<br>+ <td>//input[@name = 'filesToDelete' and @value = '${normalDir}/']</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>delete</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>verifyTextPresent</td>
<br>+ <td>Confirm deletion</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>_eventId_confirm</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>verifyTextPresent</td>
<br>+ <td>Successfully deleted</td>
<br>+ <td></td>
<br>+</tr>
<br>+<!-- Check that the privileged dir has actually gone -->
<br>+<tr>
<br>+ <td>verifyElementNotPresent</td>
<br>+ <td>//a[href = '${privilegedDir}']</td>
<br>+ <td></td>
<br>+</tr>
<br>+
<br>+<!--Clean up: log back in as admin-->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/auth/signOut</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>username</td>
<br>+ <td>${adminUsername}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>type</td>
<br>+ <td>password</td>
<br>+ <td>${adminPassword}</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>clickAndWait</td>
<br>+ <td>//input[@value='Sign in']</td>
<br>+ <td></td>
<br>+</tr>
<br>+
<br>+
<br>+
<br>+
<br>+<!--Delete the temp users-->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecUser/show/${normalUserID}</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>click</td>
<br>+ <td>_action_Delete</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertConfirmation</td>
<br>+ <td>Are you sure?</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>waitForPageToLoad</td>
<br>+ <td>10000</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>JsecUser ${normalUserID} deleted</td>
<br>+</tr>
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecUser/show/${privilegedUserID}</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>click</td>
<br>+ <td>_action_Delete</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertConfirmation</td>
<br>+ <td>Are you sure?</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>waitForPageToLoad</td>
<br>+ <td>10000</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>JsecUser ${privilegedUserID} deleted</td>
<br>+</tr>
<br>+
<br>+
<br>+<!--Delete the temp roles (this deletes the permissions too)-->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecRole/show/${normalRoleID}</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>click</td>
<br>+ <td>_action_Delete</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertConfirmation</td>
<br>+ <td>regexp:^This role is currently unused.\s*Definitely delete\?$</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>waitForPageToLoad</td>
<br>+ <td>10000</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/jsecRole/show/${privilegedRoleID}</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>click</td>
<br>+ <td>_action_Delete</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertConfirmation</td>
<br>+ <td>regexp:^This role is currently unused.\s*Definitely delete\?$</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>waitForPageToLoad</td>
<br>+ <td>10000</td>
<br>+ <td></td>
<br>+</tr>
<br>+
<br>+
<br>+<!--Delete the temp wiki-->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/wiki/show/${wikiID}</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>click</td>
<br>+ <td>_action_Delete</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertConfirmation</td>
<br>+ <td>Are you sure?</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>waitForPageToLoad</td>
<br>+ <td>10000</td>
<br>+ <td></td>
<br>+</tr>
<br>+<tr>
<br>+ <td>assertText</td>
<br>+ <td>//div[@class='body']/div[@class='message']</td>
<br>+ <td>Wiki ${wikiID} deleted</td>
<br>+</tr>
<br>+
<br>+<!--Log out-->
<br>+<tr>
<br>+ <td>open</td>
<br>+ <td>/g8/auth/signOut</td>
<br>+ <td></td>
<br>+</tr>
<br>+
<br>+</tbody></table>
<br>+</body>
<br>+</html>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>This SF.Net email is sponsored by the Verizon Developer Community
<br>Take advantage of Verizon's best-in-class app development support
<br>A streamlined, 14 day to market process makes app distribution fast and easy
<br>Join now and get one step closer to millions of Verizon customers
<br><a href="http://p.sf.net/sfu/verizon-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/verizon-dev2dev</a>
<br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26811696&i=1" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26811683[gatewiki-commits] SF.net SVN: gatewiki:[2120] trunk/cow/grails-app2009-12-16T06:14:06Z2009-12-16T06:14:06Zian_robertsRevision: 2120
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2120&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2120&view=rev</a><br>Author: ian_roberts
<br>Date: 2009-12-16 14:14:06 +0000 (Wed, 16 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Check directory permissions by matching the directory name both with and
<br>without a trailing slash against the regular expressions. If either the slash
<br>or no-slash versions match the regex we assume a match. This means you can
<br>write your directory regex to match either form (either deliberately or
<br>accidentally) and it will protect the right things.
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/grails-app/taglib/SecurityTagLib.groovy
<br> trunk/cow/grails-app/utils/gate/cow/CowPermission.groovy
<br><br>Modified: trunk/cow/grails-app/taglib/SecurityTagLib.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/taglib/SecurityTagLib.groovy 2009-12-16 10:30:32 UTC (rev 2119)
<br>+++ trunk/cow/grails-app/taglib/SecurityTagLib.groovy 2009-12-16 14:14:06 UTC (rev 2120)
<br>@@ -169,7 +169,7 @@
<br> if(lastDir == -1) {
<br> pagePathDir = ""
<br> } else {
<br>- pagePathDir = pagePath?.substring(0,lastDir)
<br>+ pagePathDir = pagePath?.substring(0,lastDir + 1)
<br> }
<br> }
<br> }
<br><br>Modified: trunk/cow/grails-app/utils/gate/cow/CowPermission.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/utils/gate/cow/CowPermission.groovy 2009-12-16 10:30:32 UTC (rev 2119)
<br>+++ trunk/cow/grails-app/utils/gate/cow/CowPermission.groovy 2009-12-16 14:14:06 UTC (rev 2120)
<br>@@ -184,22 +184,34 @@
<br> (this.wiki.equals(WILDCARD)
<br> | reqd.wiki.equals(this.wiki))
<br>
<br>- // check the directory - we use match, not find, a pattern. The
<br>- // whole regexp must match the path. We apply a pattern for all
<br>- // directories to include, and then a pattern for all driectories to
<br>- // exclude.
<br>+ // check the directory - we use match, not find, a pattern. The whole
<br>+ // regexp must match the path. We apply a pattern for all directories
<br>+ // to include, and then a pattern for all driectories to exclude. We
<br>+ // check the required directory against the patterns both with and
<br>+ // without a trailing slash
<br>+ //
<br>+ // remove any trailing slashes from the required dir
<br>+ def requiredDirNoSlash = reqd.requiredDir.replaceAll(/\/+$/, '')
<br>+ // if we're not looking at the root dir then add a trailing slash
<br>+ // (the root of a wiki area is always the empty string, not a slash
<br>+ // on its own)
<br>+ def requiredDirWithSlash = requiredDirNoSlash ?
<br>+ requiredDirNoSlash + '/' :
<br>+ requiredDirNoSlash
<br>
<br> // If includeDir is null or empty string nothing will be included
<br> implies = implies &&
<br> this.includeDir != null &&
<br> !this.includeDir.equals("") &&
<br>- reqd.requiredDir ==~ /${this.includeDir}/
<br>+ (requiredDirNoSlash ==~ this.includeDir ||
<br>+ requiredDirWithSlash ==~ this.includeDir)
<br>
<br> // If exlcudeDir is null or empty string nothing will be excluded
<br> implies = implies &&
<br> !(this.excludeDir != null &&
<br> !this.excludeDir.equals("") &&
<br>- reqd.requiredDir ==~ /${this.excludeDir}/)
<br>+ (requiredDirNoSlash ==~ this.excludeDir ||
<br>+ requiredDirWithSlash ==~ this.excludeDir))
<br>
<br> // old style pre regexp: implies = implies &&
<br> // reqd.dirRegex.startsWith(this.dirRegex)
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>This SF.Net email is sponsored by the Verizon Developer Community
<br>Take advantage of Verizon's best-in-class app development support
<br>A streamlined, 14 day to market process makes app distribution fast and easy
<br>Join now and get one step closer to millions of Verizon customers
<br><a href="http://p.sf.net/sfu/verizon-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/verizon-dev2dev</a>
<br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26811683&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26809099[gatewiki-commits] SF.net SVN: gatewiki:[2119] trunk/cow/doc2009-12-16T02:30:33Z2009-12-16T02:30:33Zhcunningham-2Revision: 2119
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2119&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2119&view=rev</a><br>Author: hcunningham
<br>Date: 2009-12-16 10:30:32 +0000 (Wed, 16 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>more user-level documentation
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/doc/cow-backlog.html
<br> trunk/cow/doc/cow-backlog.yam
<br> trunk/cow/doc/gatewiki.html
<br> trunk/cow/doc/gatewiki.yam
<br><br>Modified: trunk/cow/doc/cow-backlog.html
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.html 2009-12-16 09:43:21 UTC (rev 2118)
<br>+++ trunk/cow/doc/cow-backlog.html 2009-12-16 10:30:32 UTC (rev 2119)
<br>@@ -62,9 +62,10 @@
<br> <p>TODO: reprioritise, pull in any pressing stuff from future tasks</p>
<br>
<br> <ul>
<br>+<li>cache the twitter</li>
<br> <li>webflows [IR]
<br> <ul>
<br>- <li>add delete flow (operating on the selected files in directory view)</li>
<br>+ <li>selenium test for delete flow</li>
<br> </ul></li>
<br> <li>upload and newpage flows [IR]
<br> <ul>
<br><br>Modified: trunk/cow/doc/cow-backlog.yam
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.yam 2009-12-16 09:43:21 UTC (rev 2118)
<br>+++ trunk/cow/doc/cow-backlog.yam 2009-12-16 10:30:32 UTC (rev 2119)
<br>@@ -10,8 +10,9 @@
<br>
<br> TODO: reprioritise, pull in any pressing stuff from future tasks
<br>
<br>+- cache the twitter
<br> - webflows [IR]
<br>- - add delete flow (operating on the selected files in directory view)
<br>+ - selenium test for delete flow
<br> - upload and newpage flows [IR]
<br> - upload of an empty file fails without a message
<br> - uploads and newpage go directly into the sandbox - they should go via
<br><br>Modified: trunk/cow/doc/gatewiki.html
<br>===================================================================
<br>--- trunk/cow/doc/gatewiki.html 2009-12-16 09:43:21 UTC (rev 2118)
<br>+++ trunk/cow/doc/gatewiki.html 2009-12-16 10:30:32 UTC (rev 2119)
<br>@@ -1,7 +1,8 @@
<br>-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
<br>- "<a href="http://www.w3.org/TR/html4/strict.dtd" target="_top" rel="nofollow">http://www.w3.org/TR/html4/strict.dtd</a>">
<br>+<?xml version="1.0" encoding="utf-8"?>
<br> <!-- AUTOGENERATED FILE: ALL EDITS WILL BE LOST!!! -->
<br>-<html lang="en">
<br>+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
<br>+ "<a href="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" target="_top" rel="nofollow">http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</a>">
<br>+<html xmlns="<a href="http://www.w3.org/1999/xhtml" target="_top" rel="nofollow">http://www.w3.org/1999/xhtml</a>" lang="en" xml:lang="en">
<br> <head>
<br> <meta name="generator" content="cow"/>
<br> <title>GATEWiki: User and Developer Guide</title>
<br>@@ -44,10 +45,11 @@
<br> <body bgcolor="#FFFFFF" text="#000000">
<br> <h1 class="cow-title-heading">GATEWiki: User and Developer Guide</h1>
<br>
<br>-<p><img src="larson.png" alt="A Larson Cartoon" width="307" height="404" align="right" border="0"></p>
<br>+<p><img src="larson.png" alt="A Larson Cartoon" width="307" height="404" align="right" border="0"/></p>
<br>
<br>-<p><img src="gslidy/gate-logo-colour.png" alt="GATE" width="426" height="263" align="right" border="0"></p>
<br>+<!--%% %image(gslidy/gate-logo-colour.png, GATE, 426, 263, right, 0)-->
<br>
<br>+
<br> <p><b>In a hurry?</b> See <a class="cow-url" href="#quick">the quick start section</a>.</p>
<br>
<br> <div class="cow-contents"><h2 class="cow-heading">Contents</h2>
<br>@@ -58,11 +60,15 @@
<br> <li> <a href="#section-3.1.">3.1. Quick Start</a></li>
<br> <li> <a href="#section-3.1.1.">3.1.1. Files, directories and links</a></li>
<br> <li> <a href="#section-3.1.2.">3.1.2. Creating and editing pages</a></li>
<br>+<li> <a href="#section-3.1.3.">3.1.3. Deleting and copying</a></li>
<br>+<li> <a href="#section-3.1.4.">3.1.4. Upload other types of files</a></li>
<br>+<li> <a href="#section-3.1.5.">3.1.5. Finding things</a></li>
<br>+<li> <a href="#section-3.1.6.">3.1.6. Raw HTML pages vs. wiki pages</a></li>
<br> <li> <a href="#section-3.2.">3.2. Modes</a></li>
<br> <li> <a href="#section-3.3.">3.3. Register, Log in</a></li>
<br> <li> <a href="#section-3.4.">3.4. Create a new wiki page or directory</a></li>
<br> <li> <a href="#section-3.5.">3.5. Edit a wiki page</a></li>
<br>-<li> <a href="#section-3.6.">3.6. Upload other types of files</a></li>
<br>+<li> <a href="#section-3.6.">3.6. Searching</a></li>
<br> <li> <a href="#section-3.7.">3.7. Report a bug</a></li>
<br> <li> <a href="#section-3.8.">3.8. The YAM Markup Language</a></li>
<br> <li> <a href="#section-3.8.1.">3.8.1. YAM Summary</a></li>
<br>@@ -152,9 +158,8 @@
<br> <li> <a href="#section-4.17.2.">4.17.2. Indexing wikis/individual files from CoW</a></li>
<br> <li> <a href="#section-4.17.2.1.">4.17.2.1. Indexing individual Wiki areas</a></li>
<br> <li> <a href="#section-4.17.2.2.">4.17.2.2. Indexing individual files</a></li>
<br>-<li> <a href="#section-4.17.3.">4.17.3. Searching</a></li>
<br>-<li> <a href="#section-4.17.4.">4.17.4. Testing</a></li>
<br>-<li> <a href="#section-4.17.5.">4.17.5. Debugging</a></li>
<br>+<li> <a href="#section-4.17.3.">4.17.3. Testing</a></li>
<br>+<li> <a href="#section-4.17.4.">4.17.4. Debugging</a></li>
<br> <li> <a href="#section-4.18.">4.18. SVN Browsing</a></li>
<br> <li> <a href="#section-4.18.1.">4.18.1. Notes on Sventon in CoW</a></li>
<br> <li> <a href="#section-4.19.">4.19. Extending YAM with Plugins</a></li>
<br>@@ -162,7 +167,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-1."></a><h1 class="cow-heading"><span class="cow-sec-number">1. </span>Introduction</h1>
<br>+<a class="cow-section-anchor" name="section-1."/><h1 class="cow-heading"><span class="cow-sec-number">1. </span>Introduction</h1>
<br>
<br> <p>Files and directories, documents and folders, disks and memory sticks, laptops
<br> and games machines, TV time-shifters and corporate IT systems. Data data
<br>@@ -187,7 +192,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-2."></a><h1 class="cow-heading"><span class="cow-sec-number">2. </span>Overview</h1>
<br>+<a class="cow-section-anchor" name="section-2."/><h1 class="cow-heading"><span class="cow-sec-number">2. </span>Overview</h1>
<br>
<br> <p>Wikis are about allowing groups of people to create and edit sets of
<br> interlinked web pages with minimal effort and minimal learning of software
<br>@@ -262,7 +267,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="users"></a></p><a class="cow-section-anchor" name="section-3."></a><h1 class="cow-heading"><span class="cow-sec-number">3. </span>Information for Users</h1>
<br>+<p><a name="users"></a></p><a class="cow-section-anchor" name="section-3."/><h1 class="cow-heading"><span class="cow-sec-number">3. </span>Information for Users</h1>
<br>
<br> <p>In general using GATEWiki should be easy enough not to need a manual. To edit
<br> click the "edit" link, for example. A few things have some subtlety, though,
<br>@@ -273,10 +278,10 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="quick"></a></p><a class="cow-section-anchor" name="section-3.1."></a><h2 class="cow-heading"><span class="cow-sec-number">3.1. </span>Quick Start</h2>
<br>+<p><a name="quick"></a></p><a class="cow-section-anchor" name="section-3.1."/><h2 class="cow-heading"><span class="cow-sec-number">3.1. </span>Quick Start</h2>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-3.1.1."></a><h3 class="cow-heading"><span class="cow-sec-number">3.1.1. </span>Files, directories and links</h3>
<br>+<a class="cow-section-anchor" name="section-3.1.1."/><h3 class="cow-heading"><span class="cow-sec-number">3.1.1. </span>Files, directories and links</h3>
<br>
<br> <p>A GATEWiki website sits on top of <b>a normal tree of files and directories</b>
<br> (for example on the <a class="cow-url" href="<a href="http://gate.ac.uk/" target="_top" rel="nofollow">http://gate.ac.uk/</a>">GATE.ac.uk site</a> this page lives in
<br>@@ -301,7 +306,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-3.1.2."></a><h3 class="cow-heading"><span class="cow-sec-number">3.1.2. </span>Creating and editing pages</h3>
<br>+<a class="cow-section-anchor" name="section-3.1.2."/><h3 class="cow-heading"><span class="cow-sec-number">3.1.2. </span>Creating and editing pages</h3>
<br>
<br> <p>To <b>create a new page</b> first navigate to the directory where you want the file
<br> to be placed (click on the "Directory" link from any page in that directory).
<br>@@ -330,8 +335,93 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-3.2."></a><h2 class="cow-heading"><span class="cow-sec-number">3.2. </span>Modes</h2>
<br>
<br>+<p><a name="delete"></a></p><a class="cow-section-anchor" name="section-3.1.3."/><h3 class="cow-heading"><span class="cow-sec-number">3.1.3. </span>Deleting and copying</h3>
<br>+
<br>+<p>Files and directories (and their contents) can be <b>deleted</b> via the directory
<br>+view: follow the "Directory" link from any page, tick the checkbox(es) of the
<br>+entries you want to remove, then hit the "Delete selected" button at the foot
<br>+of the page.</p>
<br>+
<br>+<p><b>Copying</b> (and renaming) of wiki pages is more convoluted at present (and
<br>+copying of directories is not supported). To copy a page first edit it, copy
<br>+the text to the clipboard, then create a new file, edit it and paste the
<br>+contents of the old file. (To do a rename simply perform this process and then
<br>+delete the old file.)</p>
<br>+
<br>+<p><b>Don't</b> use the WYSIWYG editor for copying - just use the form editor
<br>+(otherwise you're liable to lose all the formatting of the page).</p>
<br>+
<br>+<p>(One reason we haven't made copying easier (yet) is that you can also use any
<br>+<a class="cow-url" href="<a href="http://subversion.tigris.org/" target="_top" rel="nofollow">http://subversion.tigris.org/</a>">Subversion</a> client, of which there are
<br>+legion.)</p>
<br>+
<br>+
<br>+<!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>+
<br>+<p><a name="upload"></a></p><a class="cow-section-anchor" name="section-3.1.4."/><h3 class="cow-heading"><span class="cow-sec-number">3.1.4. </span>Upload other types of files</h3>
<br>+
<br>+<p>If you want to upload plain HTML, or a PNG image, or whatever, you can use the
<br>+"Upload" link which is visible in the directory view. You may upload trees of
<br>+directories by first TGZing or ZIPing them and requesting the "unpack" option.
<br>+The upload dialogue allows you to choose whether or not to overwrite existing
<br>+files.</p>
<br>+
<br>+
<br>+<!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>+
<br>+<p><a name="dir-view"></a></p><a class="cow-section-anchor" name="section-3.1.5."/><h3 class="cow-heading"><span class="cow-sec-number">3.1.5. </span>Finding things</h3>
<br>+
<br>+<p>In the usual way GATEWiki supports <b>search</b> via the "Search" box: just type
<br>+your keywords and press the button. For more sophisticated queries, see the
<br>+search syntax description at the foot of the search results page or the
<br>+<a class="cow-url" href="#searching">section on searching</a>.</p>
<br>+
<br>+<p>In keeping with our everything-is-a-directory-tree philosophy, another way to
<br>+see <b>what files live where</b> etc. is via the directory view.</p>
<br>+
<br>+<p>When you're logged in (and have permission) each page has a "Directory" link
<br>+leading to the directory view, which is just like a files and folders browser
<br>+on your desktop. The type of each entry is indicated by an icon:</p>
<br>+
<br>+<ul>
<br>+<li><img src="../web-app/_images/filetypes/directory.png"/> directory</li>
<br>+<li><img src="../web-app/_images/filetypes/html+yam.png"/> wiki page (in <a class="cow-url" href="#yam">YAM</a>)</li>
<br>+<li><img src="../web-app/_images/filetypes/pdf.png"/> PDF</li>
<br>+<li><img src="../web-app/_images/filetypes/html.png"/> raw HTML file (see
<br>+ <a class="cow-url" href="#raw-html">below</a>)</li>
<br>+<li><img src="../web-app/_images/filetypes/image.png"/> image</li>
<br>+<li><img src="../web-app/_images/filetypes/word.png"/> word processor</li>
<br>+<li><img src="../web-app/_images/filetypes/unknown.png"/> other</li>
<br>+</ul>
<br>+
<br>+<p>Directory view also provides access to the <b><a class="cow-url" href="#upload">upload</a></b> and
<br>+<b><a class="cow-url" href="#delete">delete</a></b> functions.</p>
<br>+
<br>+
<br>+<!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>+
<br>+<p><a name="raw-html"></a></p><a class="cow-section-anchor" name="section-3.1.6."/><h3 class="cow-heading"><span class="cow-sec-number">3.1.6. </span>Raw HTML pages vs. wiki pages</h3>
<br>+
<br>+<p>When you create a new web page in GATEWiki two files are added:</p>
<br>+
<br>+<ul>
<br>+<li>a <tt>.html</tt> file that will be served to web browsers when they follow a link
<br>+ to the page</li>
<br>+<li>a <tt>.yam</tt> file that contains the source text, in <a class="cow-url" href="#yam">YAM format</a></li>
<br>+</ul>
<br>+
<br>+<p>In general you can simply ignore this - edit and delete operations, for
<br>+example, work transparently on your pages. However, GATEWiki also supports raw
<br>+HTML files, which have no YAM source. Again editing and so on is transparent,
<br>+but because HTML presents more of a security risk the permissions associated
<br>+with these pages are often different from ordinary wiki pages - hence the
<br>+different icon for these pages in <a class="cow-url" href="#dir-view">directory view</a>, for example.</p>
<br>+
<br>+
<br>+<!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>+<a class="cow-section-anchor" name="section-3.2."/><h2 class="cow-heading"><span class="cow-sec-number">3.2. </span>Modes</h2>
<br>+
<br> <p>CoW has two operational modes:</p>
<br> <ul>
<br> <li><b>Workstation mode</b>, where it runs on a personal machine and works off file
<br>@@ -351,7 +441,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-3.3."></a><h2 class="cow-heading"><span class="cow-sec-number">3.3. </span>Register, Log in</h2>
<br>+<a class="cow-section-anchor" name="section-3.3."/><h2 class="cow-heading"><span class="cow-sec-number">3.3. </span>Register, Log in</h2>
<br>
<br> <p>When CoW is running in server mode, it is necessary to create an account and
<br> to log in before being allowed to edit pages. Some pages will also not be
<br>@@ -360,7 +450,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-3.4."></a><h2 class="cow-heading"><span class="cow-sec-number">3.4. </span>Create a new wiki page or directory</h2>
<br>+<a class="cow-section-anchor" name="section-3.4."/><h2 class="cow-heading"><span class="cow-sec-number">3.4. </span>Create a new wiki page or directory</h2>
<br>
<br> <p>To create a new wiki page you can either:</p>
<br> <ul>
<br>@@ -395,7 +485,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="editing"></a></p><a class="cow-section-anchor" name="section-3.5."></a><h2 class="cow-heading"><span class="cow-sec-number">3.5. </span>Edit a wiki page</h2>
<br>+<p><a name="editing"></a></p><a class="cow-section-anchor" name="section-3.5."/><h2 class="cow-heading"><span class="cow-sec-number">3.5. </span>Edit a wiki page</h2>
<br>
<br> <p>When you have permission to edit a page that you're viewing an edit link will
<br> appear. Two types of editor are available:</p>
<br>@@ -438,17 +528,31 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="upload"></a></p><a class="cow-section-anchor" name="section-3.6."></a><h2 class="cow-heading"><span class="cow-sec-number">3.6. </span>Upload other types of files</h2>
<br>+<p><a name="searching"></a></p><a class="cow-section-anchor" name="section-3.6."/><h2 class="cow-heading"><span class="cow-sec-number">3.6. </span>Searching</h2>
<br>
<br>-<p>If you want to upload plain HTML, or a PNG image, or whatever, you can use the
<br>-"Upload" link which is visible in the directory view. You may upload trees of
<br>-directories by first TGZing or ZIPing them and requesting the "unpack" option.
<br>-The upload dialogue allows you to choose whether or not to overwrite existing
<br>-files.</p>
<br>+<p>A search box is provided at the top right corner of the page that allows
<br>+searching within a wiki area that the current page belongs to. In other
<br>+words, if a page belongs to the Help section, results are retrieved only from
<br>+the Help section. Information on Solr query syntax is available at
<br>+<a class="cow-url" href="<a href="http://wiki.apache.org/solr/SolrQuerySyntax" target="_top" rel="nofollow">http://wiki.apache.org/solr/SolrQuerySyntax</a>"><a href="http://wiki.apache.org/solr/SolrQuerySyntax" target="_top" rel="nofollow">http://wiki.apache.org/solr/SolrQuerySyntax</a></a></p>
<br>
<br>+<p>Given a query, if it succeeds, maximum of 10 results are shown on a single
<br>+page. User can navigate through different page links at the top or bottom of
<br>+the search results to jump to a different sets of results. A search result
<br>+comprises of the following:</p>
<br>
<br>+<ul>
<br>+<li>title of the document</li>
<br>+<li>link to the document</li>
<br>+<li>text snippet with matching terms highlighted</li>
<br>+</ul>
<br>+
<br>+<p>Hits from pages which the current user doesn't have permission to view are
<br>+filtered out and not included in the search result.</p>
<br>+
<br>+
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-3.7."></a><h2 class="cow-heading"><span class="cow-sec-number">3.7. </span>Report a bug</h2>
<br>+<a class="cow-section-anchor" name="section-3.7."/><h2 class="cow-heading"><span class="cow-sec-number">3.7. </span>Report a bug</h2>
<br>
<br> <p>To report bugs, first please check that they've not been reported already!</p>
<br>
<br>@@ -460,7 +564,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="yam"></a></p><a class="cow-section-anchor" name="section-3.8."></a><h2 class="cow-heading"><span class="cow-sec-number">3.8. </span>The YAM Markup Language</h2>
<br>+<p><a name="yam"></a></p><a class="cow-section-anchor" name="section-3.8."/><h2 class="cow-heading"><span class="cow-sec-number">3.8. </span>The YAM Markup Language</h2>
<br>
<br> <p>CoW's underlying markup language is YAM (Yet Another Markup). You don't need
<br> to use it - you can use the WYSIWYG editor instead - but if you're a
<br>@@ -470,7 +574,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-3.8.1."></a><h3 class="cow-heading"><span class="cow-sec-number">3.8.1. </span>YAM Summary</h3>
<br>+<a class="cow-section-anchor" name="section-3.8.1."/><h3 class="cow-heading"><span class="cow-sec-number">3.8.1. </span>YAM Summary</h3>
<br>
<br> <p>
<br>
<br>@@ -484,28 +588,28 @@
<br> <tr><td> Block quotation </td><td> <span class="cow-escape">%</span>"...<span class="cow-escape">%</span>" </td></tr>
<br> <tr><td> Line break </td><td> <span class="cow-escape">%</span>br </td></tr>
<br> <tr><td> Verbatim </td><td> <span class="cow-escape">%</span><...<span class="cow-escape">%</span>> </td></tr>
<br>-<tr><td> Lists </td><td> <p><span class="cow-escape">-</span> item 1 <br>
<br>-<span class="cow-escape">-</span> item 2 <br>
<br>-<span class="cow-escape">#</span> numbered item 1 <br>
<br>+<tr><td> Lists </td><td> <p><span class="cow-escape">-</span> item 1 <br/>
<br>+<span class="cow-escape">-</span> item 2 <br/>
<br>+<span class="cow-escape">#</span> numbered item 1 <br/>
<br> (for nesting use indentation)</p> </td></tr>
<br> <tr><td> Footnote </td><td> <span class="cow-escape">%</span>footnote(...) </td></tr>
<br> <tr><td> Escaping </td><td> <span class="cow-escape">\</span> </td></tr>
<br> <tr><td> Links </td><td>
<br>-<p><span class="cow-escape">h</span>ttp://thing.com/ or <span class="cow-escape">%</span>(<span class="cow-escape">h</span>ttp://thing.com/) or <br>
<br>+<p><span class="cow-escape">h</span>ttp://thing.com/ or <span class="cow-escape">%</span>(<span class="cow-escape">h</span>ttp://thing.com/) or <br/>
<br> <span class="cow-escape">%</span>(<span class="cow-escape">h</span>ttp://thing.com/, link text)</p>
<br> </td></tr>
<br> <tr><td> Anchors </td><td> <span class="cow-escape">%</span>#name (then link to it with "<span class="cow-escape">%</span>(#name)") </td></tr>
<br>-<tr><td> Images </td><td> <p><span class="cow-escape">%</span>image(file) or <br>
<br>-<span class="cow-escape">%</span>image(file, alt tag, width, height, position, border) <br>
<br>+<tr><td> Images </td><td> <p><span class="cow-escape">%</span>image(file) or <br/>
<br>+<span class="cow-escape">%</span>image(file, alt tag, width, height, position, border) <br/>
<br> (second and subsequent arguments are optional)</p>
<br> </td></tr>
<br> <tr><td> Citations </td><td> <span class="cow-escape">%</span>cite(citekey,citekey,...) </td></tr>
<br>-<tr><td> Inclusion </td><td> <p><span class="cow-escape">%</span>include(file.yam) <br>
<br>+<tr><td> Inclusion </td><td> <p><span class="cow-escape">%</span>include(file.yam) <br/>
<br> <span class="cow-escape">%</span>include(level, useTitle, file.yam)</p> </td></tr>
<br> <tr><td> Non-breaking space </td><td> <span class="cow-escape">%</span><span class="cow-escape">\</span> followed by space </td></tr>
<br> <tr><td> Single-line comment / notes </td><td> <span class="cow-escape">%</span><span class="cow-escape">%</span> ... </td></tr>
<br> <tr><td> Multi-line comment / notes </td><td> %<span class="cow-escape">/</span><span class="cow-escape">*</span> ... %<span class="cow-escape">*</span>/ </td></tr>
<br>-<tr><td> Special characters </td><td> <p>(e.g. < or & in HTML) are <br>
<br>+<tr><td> Special characters </td><td> <p>(e.g. < or & in HTML) are <br/>
<br> translated correctly in the output.</p> </td></tr>
<br> <tr><td> Twitter </td><td> <span class="cow-escape">%</span>twitter(title=GATE News, account=GateAcUk, name=GATE, count=10) </td></tr>
<br> <tr><td> Google </td><td> <span class="cow-escape">%</span>google(siteip=gate.ac.uk) </td></tr>
<br>@@ -514,27 +618,27 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-3.8.2."></a><h3 class="cow-heading"><span class="cow-sec-number">3.8.2. </span>YAM Syntax and Usage</h3>
<br>+<a class="cow-section-anchor" name="section-3.8.2."/><h3 class="cow-heading"><span class="cow-sec-number">3.8.2. </span>YAM Syntax and Usage</h3>
<br>
<br> <p>
<br>
<br> <div class="cow-contents"></div>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.1."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.1. </span>Introduction</h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.1."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.1. </span>Introduction</h4>
<br>
<br> <p>YAM (Yet Another Markup) is a simple wiki language used in
<br> <a class="cow-url" href="<a href="http://gatewiki.sf.net/" target="_top" rel="nofollow">http://gatewiki.sf.net/</a>">GATEWiki</a>. The language syntax is described below.</p>
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.2."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.2. </span>Contents <a name="contents"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.2."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.2. </span>Contents <a name="contents"></a></h4>
<br>
<br> <p>Contents listings like that above are generated by '<tt><span class="cow-escape">%</span>contents</tt>'</p>
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.3."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.3. </span>Bold, italic, underline and teletype <a name="bold"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.3."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.3. </span>Bold, italic, underline and teletype <a name="bold"></a></h4>
<br>
<br> <p>Bold text is contained in stars: <span class="cow-escape">*</span>this is bold<span class="cow-escape">*</span> becomes <b>this is bold</b>.</p>
<br>
<br>@@ -549,7 +653,7 @@
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.4."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.4. </span>Horizontal lines <a name="hr"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.4."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.4. </span>Horizontal lines <a name="hr"></a></h4>
<br>
<br> <p>Horizontal lines are indicated by 3 or more dashes at the start of a line.
<br> For example:</p>
<br>@@ -557,11 +661,11 @@
<br> <p>and</p>
<br> <pre>---------------------------</pre>
<br> <p>both result in:
<br>-<hr></p>
<br>+<hr/></p>
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.5."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.5. </span>Lists <a name="lists"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.5."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.5. </span>Lists <a name="lists"></a></h4>
<br>
<br> <p>Unordered lists are indicated by '-' at the start of a line, and ordered
<br> lists by '#'. Nesting is indicated by increased spacing preceding the item
<br>@@ -612,7 +716,7 @@
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.6."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.6. </span>Verbatim output <a name="verbatim"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.6."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.6. </span>Verbatim output <a name="verbatim"></a></h4>
<br>
<br> <p>Verbatim output starts with '<span class="cow-escape">%</span><span class="cow-escape"><</span>' and ends with '<span class="cow-escape">%</span>>'. For example:</p>
<br>
<br>@@ -625,7 +729,7 @@
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.7."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.7. </span>Footnotes <a name="footnotes"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.7."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.7. </span>Footnotes <a name="footnotes"></a></h4>
<br>
<br> <p>Footnotes are like this:</p>
<br> <pre>
<br>@@ -638,7 +742,7 @@
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.8."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.8. </span>Escapes <a name="escapes"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.8."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.8. </span>Escapes <a name="escapes"></a></h4>
<br>
<br> <p>To stop a special character from being interpreted, use a '<span class="cow-escape">\</span>'. For example,</p>
<br> <pre> \--- </pre>
<br>@@ -646,14 +750,14 @@
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.9."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.9. </span>Titles <a name="titles"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.9."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.9. </span>Titles <a name="titles"></a></h4>
<br>
<br> <p>The title of a document is the first paragraph of the document, ending in one
<br> or more blank lines. (Often this will be a single line of text.)</p>
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.10."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.10. </span>Headings <a name="headings"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.10."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.10. </span>Headings <a name="headings"></a></h4>
<br>
<br> <p>Headings are lines starting with <tt>%1</tt> (for first level), <tt>%2</tt>, <tt>%3</tt> or <tt>%4</tt>
<br> and are followed by one or more blank lines. For example, the heading for this
<br>@@ -673,7 +777,7 @@
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.11."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.11. </span>Links and anchors <a name="links"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.11."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.11. </span>Links and anchors <a name="links"></a></h4>
<br>
<br> <p>Links can be specified in three ways:</p>
<br> <ol>
<br>@@ -707,19 +811,19 @@
<br> plain text must be followed by a space, tab or newline.</p>
<br>
<br> <p>A relative link to a non-existant file will be rendered as a link to the host
<br>-application's "create" page, e.g. <br></p>
<br>+application's "create" page, e.g. <br/></p>
<br> <pre> %(../non-existant.html) </pre>
<br>-<p>becomes: <br>
<br>+<p>becomes: <br/>
<br> <a class="cow-non-existant-url" href="../non-existant.html?m=1">../non-existant.html</a></p>
<br>
<br>-<p>A link to an existing file will be just link as normal, e.g. <br></p>
<br>+<p>A link to an existing file will be just link as normal, e.g. <br/></p>
<br> <pre> %(index.html) </pre>
<br>-<p>becomes: <br>
<br>+<p>becomes: <br/>
<br> <a class="cow-url" href="index.html">index.html</a></p>
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.12."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.12. </span>Block quotations <a name="quotations"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.12."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.12. </span>Block quotations <a name="quotations"></a></h4>
<br>
<br> <p>Block quotations are enclosed in <span class="cow-escape">%</span>" marks. For example,</p>
<br> <pre>
<br>@@ -754,18 +858,18 @@
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.13."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.13. </span>Line breaks <a name="linebreaks"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.13."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.13. </span>Line breaks <a name="linebreaks"></a></h4>
<br>
<br> <p>Line breaks are indicated by <span class="cow-escape">%</span>br at the end of a line. For example:</p>
<br> <pre>
<br> This line is broken %br in two.
<br> </pre>
<br>-<p>becomes: <br>
<br>-This line is broken <br> in two.</p>
<br>+<p>becomes: <br/>
<br>+This line is broken <br/> in two.</p>
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.14."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.14. </span>Tables <a name="tables"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.14."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.14. </span>Tables <a name="tables"></a></h4>
<br>
<br> <p>Tables use square brackets, bars and dashes. For example:</p>
<br> <pre>
<br>@@ -791,21 +895,21 @@
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.15."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.15. </span>Images <a name="images"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.15."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.15. </span>Images <a name="images"></a></h4>
<br>
<br> <p>Images are like URLs:</p>
<br> <ul>
<br>-<li>'<tt><span class="cow-escape">%</span>image(test-image.png)</tt>' will become <img src="test-image.png"></li>
<br>-<li>'<tt><span class="cow-escape">%</span>image(test-image.png, a test image)</tt>' will become <img src="test-image.png" alt="a test image"> (the text becomes the "alt" attribute of the image)</li>
<br>+<li>'<tt><span class="cow-escape">%</span>image(test-image.png)</tt>' will become <img src="test-image.png"/></li>
<br>+<li>'<tt><span class="cow-escape">%</span>image(test-image.png, a test image)</tt>' will become <img src="test-image.png" alt="a test image"/> (the text becomes the "alt" attribute of the image)</li>
<br> </ul>
<br>
<br> <p>You can also specify an ALT tag, width and height, position and border width:
<br> '<tt><span class="cow-escape">%</span>image(test-image.png, ALT tag, 500, 500, left, 0)</tt>' becomes
<br>-<img src="test-image.png" alt="ALT tag" width="200" height="200" align="top" border="0"></p>
<br>+<img src="test-image.png" alt="ALT tag" width="200" height="200" align="top" border="0"/></p>
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.16."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.16. </span>Citations <a name="citations"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.16."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.16. </span>Citations <a name="citations"></a></h4>
<br>
<br> <p>Citations work like this: '<tt><span class="cow-escape">%</span>cite(Cun06a)</tt>' becomes <span class="cow-cite" keys="Cun06a"><a href="<a href="http://gate.ac.uk/sale/bib/main.html#XCun06a" target="_top" rel="nofollow">http://gate.ac.uk/sale/bib/main.html#XCun06a</a>">Cun06a</a></span>. Multiple
<br> cite keys should be separated by commas, e.g.: '<tt><span class="cow-escape">%</span>cite(Cun05a,Cun06a)</tt>'
<br>@@ -813,7 +917,7 @@
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.17."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.17. </span>Inclusion <a name="inclusion"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.17."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.17. </span>Inclusion <a name="inclusion"></a></h4>
<br>
<br> <p>A page can include another page like this:</p>
<br>
<br>@@ -834,7 +938,7 @@
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.18."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.18. </span>Non-breaking space <a name="nbsp"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.18."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.18. </span>Non-breaking space <a name="nbsp"></a></h4>
<br>
<br> <p>Non-breaking spaces are added using <span class="cow-escape">%</span><span class="cow-escape">\</span> followed by space, e.g.</p>
<br> <pre>
<br>@@ -844,13 +948,13 @@
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.19."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.19. </span>Comments <a name="comments"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.19."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.19. </span>Comments <a name="comments"></a></h4>
<br>
<br> <p>Single-line comments are created by two or more percents together, e.g.</p>
<br> <pre>
<br> This is not commented %% but this is
<br> </pre>
<br>-<p>becomes: <br>
<br>+<p>becomes: <br/>
<br> This is not commented </p><!-- but this is-->
<br>
<br>
<br>@@ -859,13 +963,13 @@
<br> This is not commented %/* but this is
<br> and this is too %*/
<br> </pre>
<br>-<p>becomes: <br>
<br>+<p>becomes: <br/>
<br> This is not commented </p><!-- but this is
<br> and this is too -->
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.20."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.20. </span>Plugins <a name="plugins"></a></h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.20."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.20. </span>Plugins <a name="plugins"></a></h4>
<br>
<br> <p>YAM can be extended by the use of <b>plugins</b>. Creating plugins requires some
<br> Java programming - see the developer guide for more details.</p>
<br>@@ -873,15 +977,15 @@
<br> <p>Plugins bundled with GATEWiki:</p>
<br>
<br> <ul>
<br>-<li><b>Twitter.</b> <br> Adds a list of Twitter updates to a page. Example usage:
<br>+<li><b>Twitter.</b> <br/> Adds a list of Twitter updates to a page. Example usage:
<br> <tt><span class="cow-escape">%</span>twitter(title=GATE News, account=GateAcUk, name=GATE, count=10)</tt></li>
<br>-<li><b>Google.</b> <br> Adds a Google site search box. Example usage:
<br>+<li><b>Google.</b> <br/> Adds a Google site search box. Example usage:
<br> <tt><span class="cow-escape">%</span>google(siteip=gate.ac.uk)</tt></li>
<br> </ul>
<br>
<br>
<br> <!----------------------------------------------------------------------------->
<br>-<a class="cow-section-anchor" name="section-3.8.2.21."></a><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.21. </span>Changes from version 3</h4>
<br>+<a class="cow-section-anchor" name="section-3.8.2.21."/><h4 class="cow-heading"><span class="cow-sec-number">3.8.2.21. </span>Changes from version 3</h4>
<br>
<br> <p>YAM is currently in version 5. Since versions 3 and 4 these changes were made:</p>
<br>
<br>@@ -910,7 +1014,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="developers"></a></p><a class="cow-section-anchor" name="section-4."></a><h1 class="cow-heading"><span class="cow-sec-number">4. </span>Information for Developers and Administrators</h1>
<br>+<p><a name="developers"></a></p><a class="cow-section-anchor" name="section-4."/><h1 class="cow-heading"><span class="cow-sec-number">4. </span>Information for Developers and Administrators</h1>
<br>
<br> <p>Currently CoW includes:</p>
<br>
<br>@@ -935,7 +1039,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.1."></a><h2 class="cow-heading"><span class="cow-sec-number">4.1. </span>Roadmap</h2>
<br>+<a class="cow-section-anchor" name="section-4.1."/><h2 class="cow-heading"><span class="cow-sec-number">4.1. </span>Roadmap</h2>
<br>
<br> <p>The development roadmap, currently active tasks list and wish-list is recorded
<br> in the <a class="cow-url" href="cow-backlog.html">backlog document</a>.</p>
<br>@@ -943,7 +1047,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="checkout"></a></p><a class="cow-section-anchor" name="section-4.2."></a><h2 class="cow-heading"><span class="cow-sec-number">4.2. </span>Checking out the code</h2>
<br>+<p><a name="checkout"></a></p><a class="cow-section-anchor" name="section-4.2."/><h2 class="cow-heading"><span class="cow-sec-number">4.2. </span>Checking out the code</h2>
<br>
<br> <p>To check out CoW from Subversion first decide if you want to check out a copy
<br> of GWT and Grails HEAD while you're at it. If so do this:</p>
<br>@@ -966,7 +1070,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="modes"></a></p><a class="cow-section-anchor" name="section-4.3."></a><h2 class="cow-heading"><span class="cow-sec-number">4.3. </span>Selecting Modes</h2>
<br>+<p><a name="modes"></a></p><a class="cow-section-anchor" name="section-4.3."/><h2 class="cow-heading"><span class="cow-sec-number">4.3. </span>Selecting Modes</h2>
<br>
<br> <p>To select the mode (see above) use</p>
<br> <ul>
<br>@@ -980,7 +1084,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.4."></a><h2 class="cow-heading"><span class="cow-sec-number">4.4. </span>Create a new wiki space</h2>
<br>+<a class="cow-section-anchor" name="section-4.4."/><h2 class="cow-heading"><span class="cow-sec-number">4.4. </span>Create a new wiki space</h2>
<br>
<br> <p>To create a new wiki space go to the Admin page and click through to wiki
<br> areas and select "New wiki". Then you can either:</p>
<br>@@ -1004,7 +1108,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.4.1."></a><h3 class="cow-heading"><span class="cow-sec-number">4.4.1. </span>Authentication settings</h3>
<br>+<a class="cow-section-anchor" name="section-4.4.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.4.1. </span>Authentication settings</h3>
<br>
<br> <p>When running in server mode, or when doing scheduled or one-off subversion
<br> updates (see below), CoW needs to communicate with the subversion repository
<br>@@ -1073,7 +1177,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.4.2."></a><h3 class="cow-heading"><span class="cow-sec-number">4.4.2. </span>Setting wiki regeneration</h3>
<br>+<a class="cow-section-anchor" name="section-4.4.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.4.2. </span>Setting wiki regeneration</h3>
<br>
<br> <p>Wiki pages may refer to other wiki pages, via links and includes. They are
<br> therefore dependent on each other. When you change a page, the dependencies
<br>@@ -1083,7 +1187,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.4.3."></a><h3 class="cow-heading"><span class="cow-sec-number">4.4.3. </span>Setting wiki updates</h3>
<br>+<a class="cow-section-anchor" name="section-4.4.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.4.3. </span>Setting wiki updates</h3>
<br>
<br> <p>A wiki is a working copy of an SVN repository, and so could get out of date
<br> with respect to the repository. You can update the wiki working copy from the
<br>@@ -1104,7 +1208,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.5."></a><h2 class="cow-heading"><span class="cow-sec-number">4.5. </span>Building and testing CoW</h2>
<br>+<a class="cow-section-anchor" name="section-4.5."/><h2 class="cow-heading"><span class="cow-sec-number">4.5. </span>Building and testing CoW</h2>
<br>
<br> <p>CoW is built with <a class="cow-url" href="<a href="http://ant.apache.org" target="_top" rel="nofollow">http://ant.apache.org</a>">ant</a>. For more documentation do
<br> <tt>ant help</tt> in the cow directory. To run CoW see next section.</p>
<br>@@ -1136,7 +1240,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.5.1."></a><h3 class="cow-heading"><span class="cow-sec-number">4.5.1. </span>More about cruising</h3>
<br>+<a class="cow-section-anchor" name="section-4.5.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.5.1. </span>More about cruising</h3>
<br>
<br> <p>The <tt>cruise</tt> target does a clean build and runs the Grails unit tests and the
<br> Java-only tests (for YAM etc.). Functional tests used to use Canoo (ant target
<br>@@ -1169,7 +1273,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.5.2."></a><h3 class="cow-heading"><span class="cow-sec-number">4.5.2. </span>Selenium tests</h3>
<br>+<a class="cow-section-anchor" name="section-4.5.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.5.2. </span>Selenium tests</h3>
<br>
<br> <p>Functional testing of CoW uses <a class="cow-url" href="<a href="http://selenium.seleniumhq.org" target="_top" rel="nofollow">http://selenium.seleniumhq.org</a>">Selenium</a>.
<br> Selenium uses various bits of JavaScript magic to enable you to remote-control
<br>@@ -1227,7 +1331,7 @@
<br> </ul>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.5.2.1."></a><h4 class="cow-heading"><span class="cow-sec-number">4.5.2.1. </span>Firefox Profiles</h4>
<br>+<a class="cow-section-anchor" name="section-4.5.2.1."/><h4 class="cow-heading"><span class="cow-sec-number">4.5.2.1. </span>Firefox Profiles</h4>
<br>
<br> <p>The Selenium tests are run using a custom Firefox profile that allows us to
<br> pre-configure certain settings without changing the default user profile.
<br>@@ -1240,7 +1344,7 @@
<br> can be found <a class="cow-url" href="../selenium/profile/instructions.html">here</a>.</p>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.5.2.2."></a><h4 class="cow-heading"><span class="cow-sec-number">4.5.2.2. </span>Developing new tests</h4>
<br>+<a class="cow-section-anchor" name="section-4.5.2.2."/><h4 class="cow-heading"><span class="cow-sec-number">4.5.2.2. </span>Developing new tests</h4>
<br>
<br> <p>To develop a new selenium test it is easiest to use the Selenium IDE Firefox
<br> plugin. Start up a test instance of CoW in the relevant mode using <tt>ant
<br>@@ -1257,7 +1361,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.5.3."></a><h3 class="cow-heading"><span class="cow-sec-number">4.5.3. </span>Upgrading to new Grails versions</h3>
<br>+<a class="cow-section-anchor" name="section-4.5.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.5.3. </span>Upgrading to new Grails versions</h3>
<br>
<br> <ul>
<br> <li>svn up && ant clean jar in grails</li>
<br>@@ -1270,7 +1374,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.5.4."></a><h3 class="cow-heading"><span class="cow-sec-number">4.5.4. </span>Using the YAM Tests</h3>
<br>+<a class="cow-section-anchor" name="section-4.5.4."/><h3 class="cow-heading"><span class="cow-sec-number">4.5.4. </span>Using the YAM Tests</h3>
<br>
<br> <p>The test suite uses a bunch of <tt>.yam</tt> and compiled <tt>.html</tt> files in
<br> <tt>cow/test/resources</tt>. After running the tests the script
<br>@@ -1303,7 +1407,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.5.5."></a><h3 class="cow-heading"><span class="cow-sec-number">4.5.5. </span>Grails/Spring/JSecurity and the upload function</h3>
<br>+<a class="cow-section-anchor" name="section-4.5.5."/><h3 class="cow-heading"><span class="cow-sec-number">4.5.5. </span>Grails/Spring/JSecurity and the upload function</h3>
<br>
<br> <p>There is currently a problem between Grails/Spring and the JSecurity plugin
<br> when uploading a file that we hope will be solved in future updates.</p>
<br>@@ -1315,7 +1419,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.6."></a><h2 class="cow-heading"><span class="cow-sec-number">4.6. </span>Subversion versions</h2>
<br>+<a class="cow-section-anchor" name="section-4.6."/><h2 class="cow-heading"><span class="cow-sec-number">4.6. </span>Subversion versions</h2>
<br>
<br> <p>(This note is only relevant to those using local copies of SVN tree. By the
<br> time you read this the version number have probably changed.)</p>
<br>@@ -1350,7 +1454,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="config"></a></p><a class="cow-section-anchor" name="section-4.7."></a><h2 class="cow-heading"><span class="cow-sec-number">4.7. </span>Configuring CoW</h2>
<br>+<p><a name="config"></a></p><a class="cow-section-anchor" name="section-4.7."/><h2 class="cow-heading"><span class="cow-sec-number">4.7. </span>Configuring CoW</h2>
<br>
<br> <p>Configuration options in CoW are dealt with in the normal
<br> <a class="cow-url" href="<a href="http://www.grails.org/" target="_top" rel="nofollow">http://www.grails.org/</a>">Grails</a> fashion in a file called <tt>Config.groovy</tt>; to
<br>@@ -1382,21 +1486,21 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="robots"></a></p><a class="cow-section-anchor" name="section-4.7.1."></a><h3 class="cow-heading"><span class="cow-sec-number">4.7.1. </span>Serving robots.txt</h3>
<br>+<p><a name="robots"></a></p><a class="cow-section-anchor" name="section-4.7.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.7.1. </span>Serving robots.txt</h3>
<br>
<br> <p>To change the default <tt>/robots.txt</tt> (which does nothing) set
<br> <tt>gate.cow.robots</tt>.</p>
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.8."></a><h2 class="cow-heading"><span class="cow-sec-number">4.8. </span>CoW's Data Area</h2>
<br>+<a class="cow-section-anchor" name="section-4.8."/><h2 class="cow-heading"><span class="cow-sec-number">4.8. </span>CoW's Data Area</h2>
<br>
<br> <p>CoW stores all user data in a directory called <tt>.cowrc.d</tt> (on <span class="cow-escape">*</span>NIX), which is
<br> by default in the user's home directory.</p>
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.8.1."></a><h3 class="cow-heading"><span class="cow-sec-number">4.8.1. </span>SVN Config Directory</h3>
<br>+<a class="cow-section-anchor" name="section-4.8.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.8.1. </span>SVN Config Directory</h3>
<br>
<br> <p>The <tt>svnconfig</tt> directory stores files related to how SVN works within CoW.
<br> This is a standard SVN config directory (i.e. it is the same as
<br>@@ -1409,10 +1513,10 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.9."></a><h2 class="cow-heading"><span class="cow-sec-number">4.9. </span>Deploying and Running CoW</h2>
<br>+<a class="cow-section-anchor" name="section-4.9."/><h2 class="cow-heading"><span class="cow-sec-number">4.9. </span>Deploying and Running CoW</h2>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.9.1."></a><h3 class="cow-heading"><span class="cow-sec-number">4.9.1. </span>Starting and stopping</h3>
<br>+<a class="cow-section-anchor" name="section-4.9.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.9.1. </span>Starting and stopping</h3>
<br>
<br> <p>The easiest way to run (or deploy) CoW is via Grails. If you're developing
<br> then use Grails' <tt>run-app</tt>; for production use <tt>run-war</tt>. CoW's build file
<br>@@ -1447,7 +1551,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.9.2."></a><h3 class="cow-heading"><span class="cow-sec-number">4.9.2. </span>Portability of the .cowrc.d directory</h3>
<br>+<a class="cow-section-anchor" name="section-4.9.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.9.2. </span>Portability of the .cowrc.d directory</h3>
<br>
<br> <p>If you want to move the data from a CoW installation into a different
<br> location, you need to do two things:</p>
<br>@@ -1467,7 +1571,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.9.3."></a><h3 class="cow-heading"><span class="cow-sec-number">4.9.3. </span>Apache 2 virtual hosts and CoW proxying</h3>
<br>+<a class="cow-section-anchor" name="section-4.9.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.9.3. </span>Apache 2 virtual hosts and CoW proxying</h3>
<br>
<br> <p>This section describes running multiple websites (e.g. <tt><a class="cow-url" href="<a href="http://gate.ac.uk/" target="_top" rel="nofollow">http://gate.ac.uk/</a>"><a href="http://gate.ac.uk/" target="_top" rel="nofollow">http://gate.ac.uk/</a></a></tt>
<br> and <tt><a class="cow-url" href="<a href="http://gatecloud.net" target="_top" rel="nofollow">http://gatecloud.net</a>"><a href="http://gatecloud.net" target="_top" rel="nofollow">http://gatecloud.net</a></a></tt>) on a single physical server using Apache
<br>@@ -1568,7 +1672,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="deployment"></a></p><a class="cow-section-anchor" name="section-4.9.4."></a><h3 class="cow-heading"><span class="cow-sec-number">4.9.4. </span>Production Deployment and Upgrade</h3>
<br>+<p><a name="deployment"></a></p><a class="cow-section-anchor" name="section-4.9.4."/><h3 class="cow-heading"><span class="cow-sec-number">4.9.4. </span>Production Deployment and Upgrade</h3>
<br>
<br> <p>When deploying GATEWiki these elements need to be born in mind:</p>
<br>
<br>@@ -1638,7 +1742,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="runtime-dependencies"></a></p><a class="cow-section-anchor" name="section-4.9.5."></a><h3 class="cow-heading"><span class="cow-sec-number">4.9.5. </span>Deployment and runtime dependencies</h3>
<br>+<p><a name="runtime-dependencies"></a></p><a class="cow-section-anchor" name="section-4.9.5."/><h3 class="cow-heading"><span class="cow-sec-number">4.9.5. </span>Deployment and runtime dependencies</h3>
<br>
<br> <p>This note discusses two issues:</p>
<br>
<br>@@ -1746,7 +1850,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="saving-space"></a></p><a class="cow-section-anchor" name="section-4.9.5.1."></a><h4 class="cow-heading"><span class="cow-sec-number">4.9.5.1. </span>Saving space</h4>
<br>+<p><a name="saving-space"></a></p><a class="cow-section-anchor" name="section-4.9.5.1."/><h4 class="cow-heading"><span class="cow-sec-number">4.9.5.1. </span>Saving space</h4>
<br>
<br> <p>At the time of writing we have the following raw sizes for the runtime
<br> dependencies discussed above (total ~450M):</p>
<br>@@ -1779,10 +1883,10 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.10."></a><h2 class="cow-heading"><span class="cow-sec-number">4.10. </span>Structure, Naming and Code Conventions</h2>
<br>+<a class="cow-section-anchor" name="section-4.10."/><h2 class="cow-heading"><span class="cow-sec-number">4.10. </span>Structure, Naming and Code Conventions</h2>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.10.1."></a><h3 class="cow-heading"><span class="cow-sec-number">4.10.1. </span>Naming and Other Code Conventions</h3>
<br>+<a class="cow-section-anchor" name="section-4.10.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.10.1. </span>Naming and Other Code Conventions</h3>
<br>
<br> <p>GATEWiki uses the GATE coding conventions.</p>
<br>
<br>@@ -1797,7 +1901,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.10.2."></a><h3 class="cow-heading"><span class="cow-sec-number">4.10.2. </span>Structure</h3>
<br>+<a class="cow-section-anchor" name="section-4.10.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.10.2. </span>Structure</h3>
<br>
<br> <p>CoW is made up of the following components (and numerous 3rd party libraries):</p>
<br>
<br>@@ -1813,7 +1917,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.10.2.1."></a><h4 class="cow-heading"><span class="cow-sec-number">4.10.2.1. </span>Main classes and Grails objects</h4>
<br>+<a class="cow-section-anchor" name="section-4.10.2.1."/><h4 class="cow-heading"><span class="cow-sec-number">4.10.2.1. </span>Main classes and Grails objects</h4>
<br>
<br> <p>The CoW webapp is organised around the concept of wiki/content areas, which
<br> are file trees stored in SVN. What CoW then provides is </p>
<br>@@ -1880,7 +1984,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.11."></a><h2 class="cow-heading"><span class="cow-sec-number">4.11. </span>Authentication and Authorisation</h2>
<br>+<a class="cow-section-anchor" name="section-4.11."/><h2 class="cow-heading"><span class="cow-sec-number">4.11. </span>Authentication and Authorisation</h2>
<br>
<br> <p><b>Important note:</b> a new GATE wiki installation has a default user,
<br> scott. Scott is an adminstrator, he can do anything. He has the traditional
<br>@@ -1897,7 +2001,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.11.1."></a><h3 class="cow-heading"><span class="cow-sec-number">4.11.1. </span>Grails JSecurity plugin</h3>
<br>+<a class="cow-section-anchor" name="section-4.11.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.11.1. </span>Grails JSecurity plugin</h3>
<br>
<br> <p>Authentication and authorisation uses <a class="cow-url" href="<a href="http://grails.org/JSecurity+Plugin" target="_top" rel="nofollow">http://grails.org/JSecurity+Plugin</a>">the JSecurity plugin for Grails</a>. </p>
<br>
<br>@@ -1924,7 +2028,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.11.2."></a><h3 class="cow-heading"><span class="cow-sec-number">4.11.2. </span>Grails JCaptcha plugin</h3>
<br>+<a class="cow-section-anchor" name="section-4.11.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.11.2. </span>Grails JCaptcha plugin</h3>
<br>
<br> <p>User registration attempts to prevent registration of bots, using
<br> <a class="cow-url" href="<a href="http://grails.org/JCaptcha+Plugin" target="_top" rel="nofollow">http://grails.org/JCaptcha+Plugin</a>">the JCaptcha plugin for Grails</a>:</p>
<br>@@ -1938,7 +2042,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.11.3."></a><h3 class="cow-heading"><span class="cow-sec-number">4.11.3. </span>Users, roles, permissions, actions</h3>
<br>+<a class="cow-section-anchor" name="section-4.11.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.11.3. </span>Users, roles, permissions, actions</h3>
<br>
<br> <p>Security is based around users, roles, and permissions.</p>
<br>
<br>@@ -2023,7 +2127,7 @@
<br> thread</a> for a useful description of how permissions work.</p>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.11.3.1."></a><h4 class="cow-heading"><span class="cow-sec-number">4.11.3.1. </span>Directory level authorisation
<br>+<a class="cow-section-anchor" name="section-4.11.3.1."/><h4 class="cow-heading"><span class="cow-sec-number">4.11.3.1. </span>Directory level authorisation
<br> <a name="dirauth"></a></h4>
<br>
<br> <p>For actions of the page controller, Gatewiki permissions gives authorisation
<br>@@ -2192,7 +2296,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.11.3.2."></a><h4 class="cow-heading"><span class="cow-sec-number">4.11.3.2. </span>Access to non-page controllers via CowPermission control</h4>
<br>+<a class="cow-section-anchor" name="section-4.11.3.2."/><h4 class="cow-heading"><span class="cow-sec-number">4.11.3.2. </span>Access to non-page controllers via CowPermission control</h4>
<br>
<br> <p>The SecurityFilter and the Jsecurity code give access to wiki pages via the
<br> "page" controller. They are also configured at bootstrap to give some access
<br>@@ -2218,7 +2322,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.11.3.3."></a><h4 class="cow-heading"><span class="cow-sec-number">4.11.3.3. </span>User and password constraints</h4>
<br>+<a class="cow-section-anchor" name="section-4.11.3.3."/><h4 class="cow-heading"><span class="cow-sec-number">4.11.3.3. </span>User and password constraints</h4>
<br>
<br> <p>Constraints on users are enforced by a UserCommand and PasswordCommand, which
<br> are used in a couple of places. Together, they define more fields than
<br>@@ -2228,7 +2332,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.11.3.4."></a><h4 class="cow-heading"><span class="cow-sec-number">4.11.3.4. </span>Security in workstation and server modes</h4>
<br>+<a class="cow-section-anchor" name="section-4.11.3.4."/><h4 class="cow-heading"><span class="cow-sec-number">4.11.3.4. </span>Security in workstation and server modes</h4>
<br>
<br> <ul>
<br> <li>Security is turned on only for server mode.</li>
<br>@@ -2241,7 +2345,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.11.4."></a><h3 class="cow-heading"><span class="cow-sec-number">4.11.4. </span>Pre-defined security objects</h3>
<br>+<a class="cow-section-anchor" name="section-4.11.4."/><h3 class="cow-heading"><span class="cow-sec-number">4.11.4. </span>Pre-defined security objects</h3>
<br>
<br> <p>The above gives an abstract view of how security works. In a default GATE wiki
<br> installation, there will be several pre-defined security objects that you can
<br>@@ -2352,7 +2456,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.11.5."></a><h3 class="cow-heading"><span class="cow-sec-number">4.11.5. </span>Tag library</h3>
<br>+<a class="cow-section-anchor" name="section-4.11.5."/><h3 class="cow-heading"><span class="cow-sec-number">4.11.5. </span>Tag library</h3>
<br>
<br> <p>In addition to the tags defined by Jsecurity (<b>note</b> do not use jsec:
<br> prinicipal, see below), the following are available in SecurityTagLib:</p>
<br>@@ -2378,7 +2482,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.11.6."></a><h3 class="cow-heading"><span class="cow-sec-number">4.11.6. </span>Code dependencies between Jsecurity and GATE Wiki</h3>
<br>+<a class="cow-section-anchor" name="section-4.11.6."/><h3 class="cow-heading"><span class="cow-sec-number">4.11.6. </span>Code dependencies between Jsecurity and GATE Wiki</h3>
<br>
<br> <p>There are very few! Of course, there are lots of pages specific to security
<br> and its administration. But it shouldn't be too hard to tease these apart from
<br>@@ -2399,7 +2503,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.11.7."></a><h3 class="cow-heading"><span class="cow-sec-number">4.11.7. </span>Known vulnerabilities and avoiding them</h3>
<br>+<a class="cow-section-anchor" name="section-4.11.7."/><h3 class="cow-heading"><span class="cow-sec-number">4.11.7. </span>Known vulnerabilities and avoiding them</h3>
<br>
<br> <ul>
<br> <li>Passwords are posted cleartext, This might not be a problem for most setups.
<br>@@ -2420,7 +2524,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="site-specific"></a></p><a class="cow-section-anchor" name="section-4.12."></a><h2 class="cow-heading"><span class="cow-sec-number">4.12. </span>Site- and Wiki-Specific Layout and Navigation</h2>
<br>+<p><a name="site-specific"></a></p><a class="cow-section-anchor" name="section-4.12."/><h2 class="cow-heading"><span class="cow-sec-number">4.12. </span>Site- and Wiki-Specific Layout and Navigation</h2>
<br>
<br> <p>CoW's look and feel is a masterpiece of minimalist aesthetics, the like of
<br> which is seldom seen in this age of extravagant waste, technological frenzy
<br>@@ -2441,7 +2545,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="navigation"></a></p><a class="cow-section-anchor" name="section-4.12.1."></a><h3 class="cow-heading"><span class="cow-sec-number">4.12.1. </span>Navigation</h3>
<br>+<p><a name="navigation"></a></p><a class="cow-section-anchor" name="section-4.12.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.12.1. </span>Navigation</h3>
<br>
<br> <p>Navigation that applies to the whole site or to a whole wiki area is probably
<br> best put into a Grails layout plugin - see <a class="cow-url" href="#guest-layouts">replacing the
<br>@@ -2488,7 +2592,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.12.2."></a><h3 class="cow-heading"><span class="cow-sec-number">4.12.2. </span>Replacing the Main Page Layout <a name="guest-layouts"></a></h3>
<br>+<a class="cow-section-anchor" name="section-4.12.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.12.2. </span>Replacing the Main Page Layout <a name="guest-layouts"></a></h3>
<br>
<br> <p>If you want to replace the entire look of the site (or a particular wiki
<br> area), then you need to create a Grails plugin and supply a Sitemesh layout,
<br>@@ -2547,7 +2651,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.12.3."></a><h3 class="cow-heading"><span class="cow-sec-number">4.12.3. </span>Changing the Title or Logo</h3>
<br>+<a class="cow-section-anchor" name="section-4.12.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.12.3. </span>Changing the Title or Logo</h3>
<br>
<br> <p>If you want to replace change a few small things like the name of the site
<br> (which gets put in the page titles) or the main logo, then you just need to
<br>@@ -2575,7 +2679,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="raw-html"></a></p><a class="cow-section-anchor" name="section-4.12.4."></a><h3 class="cow-heading"><span class="cow-sec-number">4.12.4. </span>Dealing with non-native HTML pages</h3>
<br>+<p><a name="raw-html"></a></p><a class="cow-section-anchor" name="section-4.12.4."/><h3 class="cow-heading"><span class="cow-sec-number">4.12.4. </span>Dealing with non-native HTML pages</h3>
<br>
<br> <p>Non-native HTML pages are those which are not generated from YAM markup, i.e.
<br> are not really managed by CoW as wiki pages. CoW will serve any old HTML page
<br>@@ -2614,9 +2718,9 @@
<br> <p>Each wiki area has two regular expressions for this purpose:</p>
<br>
<br> <ul>
<br>-<li><b>include directory pattern</b>: <br> this specifies directories that are allowed
<br>+<li><b>include directory pattern</b>: <br/> this specifies directories that are allowed
<br> to serve non-native HTMLs</li>
<br>-<li><b>exclude directory pattern</b>: <br> this specifies directories that are
<br>+<li><b>exclude directory pattern</b>: <br/> this specifies directories that are
<br> restricted from serving non-native HTMLs</li>
<br> </ul>
<br>
<br>@@ -2633,7 +2737,7 @@
<br> permission to see a non-native HTML file if the directory to which the
<br> non-native file belongs is granted access by at least one of the two options.</p>
<br>
<br>-<p><b>To iframe or not to iframe?</b> <br> In general the resultant page contains an
<br>+<p><b>To iframe or not to iframe?</b> <br/> In general the resultant page contains an
<br> iframe that pulls in the raw HTML page. This is good for things like Javadocs
<br> etcc., but in some cases you may want to just serve the body of the page
<br> instead (e.g. the GATE user guide). If a file called <tt>.cow:no-iframe</tt> is
<br>@@ -2643,7 +2747,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="regen"></a></p><a class="cow-section-anchor" name="section-4.13."></a><h2 class="cow-heading"><span class="cow-sec-number">4.13. </span>Referencing and regeneration</h2>
<br>+<p><a name="regen"></a></p><a class="cow-section-anchor" name="section-4.13."/><h2 class="cow-heading"><span class="cow-sec-number">4.13. </span>Referencing and regeneration</h2>
<br>
<br> <p>The problem is that a create/rename/delete/modify operation on a .yam should
<br> be cascaded through any files that link to or include it. The relevant data
<br>@@ -2690,13 +2794,13 @@
<br> </ul>
<br>
<br> <p>The current design is to use YamFile.generate.</p>
<br>-<a class="cow-section-anchor" name="section-4.13.1."></a><h3 class="cow-heading"><span class="cow-sec-number">4.13.1. </span>Serialization</h3>
<br>+<a class="cow-section-anchor" name="section-4.13.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.13.1. </span>Serialization</h3>
<br>
<br> <p>Dependencies are serialized to the directory conf.gate.cow.dbs, one file per
<br> wiki. They are serialized on shutdown and periodically during uptime. Periodic
<br> serialization is carried out (once a minute) by DependenciesJob. They are
<br> deserialized lazily, as required.</p>
<br>-<a class="cow-section-anchor" name="section-4.13.2."></a><h3 class="cow-heading"><span class="cow-sec-number">4.13.2. </span>Regeneration</h3>
<br>+<a class="cow-section-anchor" name="section-4.13.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.13.2. </span>Regeneration</h3>
<br>
<br> <p>Dependencies for a single wiki are regenerated on four occasions:</p>
<br>
<br>@@ -2715,7 +2819,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.13.3."></a><h3 class="cow-heading"><span class="cow-sec-number">4.13.3. </span>Speed of Running SVN Status</h3>
<br>+<a class="cow-section-anchor" name="section-4.13.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.13.3. </span>Speed of Running SVN Status</h3>
<br>
<br> <p>As noted above, YAM files managed by the wiki can be changed in several ways:</p>
<br> <ul>
<br>@@ -2749,12 +2853,12 @@
<br> <table>
<br> <tr><td> First run </td><td> Tenth run </td></tr>
<br> <tr><td>
<br>-<p>real 0m58.839s <br>
<br>-user 0m5.236s <br>
<br>+<p>real 0m58.839s <br/>
<br>+user 0m5.236s <br/>
<br> sys 0m3.576s</p>
<br> </td><td>
<br>-<p>real 0m2.380s <br>
<br>-user 0m1.604s <br>
<br>+<p>real 0m2.380s <br/>
<br>+user 0m1.604s <br/>
<br> sys 0m0.504s</p>
<br> </td></tr>
<br> </table>
<br>@@ -2762,12 +2866,12 @@
<br> <table>
<br> <tr><td> First run </td><td> Tenth run </td></tr>
<br> <tr><td>
<br>-<p>real 0m33.331s <br>
<br>-user 0m3.772s <br>
<br>+<p>real 0m33.331s <br/>
<br>+user 0m3.772s <br/>
<br> sys 0m0.852s</p>
<br> </td><td>
<br>-<p>real 0m31.082s <br>
<br>-user 0m3.280s <br>
<br>+<p>real 0m31.082s <br/>
<br>+user 0m3.280s <br/>
<br> sys 0m0.972s</p>
<br> </td></tr>
<br> </table>
<br>@@ -2785,7 +2889,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.14."></a><h2 class="cow-heading"><span class="cow-sec-number">4.14. </span>Sourceforge notes</h2>
<br>+<a class="cow-section-anchor" name="section-4.14."/><h2 class="cow-heading"><span class="cow-sec-number">4.14. </span>Sourceforge notes</h2>
<br>
<br> <ul>
<br> <li><a class="cow-url" href="<a href="http://sf.net/projects/gatewiki/" target="_top" rel="nofollow">http://sf.net/projects/gatewiki/</a>">the Sourceforge project</a></li>
<br>@@ -2805,7 +2909,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.15."></a><h2 class="cow-heading"><span class="cow-sec-number">4.15. </span>Grails MVC notes</h2>
<br>+<a class="cow-section-anchor" name="section-4.15."/><h2 class="cow-heading"><span class="cow-sec-number">4.15. </span>Grails MVC notes</h2>
<br>
<br> <ul>
<br> <li>A request that hits the application context path (e.g. "cow") is first
<br>@@ -2822,7 +2926,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.16."></a><h2 class="cow-heading"><span class="cow-sec-number">4.16. </span>IntelliJ notes</h2>
<br>+<a class="cow-section-anchor" name="section-4.16."/><h2 class="cow-heading"><span class="cow-sec-number">4.16. </span>IntelliJ notes</h2>
<br>
<br> <ul>
<br> <li>download the IDEA from
<br>@@ -2863,7 +2967,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="search"></a></p><a class="cow-section-anchor" name="section-4.17."></a><h2 class="cow-heading"><span class="cow-sec-number">4.17. </span>Search infrastructure</h2>
<br>+<p><a name="search"></a></p><a class="cow-section-anchor" name="section-4.17."/><h2 class="cow-heading"><span class="cow-sec-number">4.17. </span>Search infrastructure</h2>
<br>
<br> <p>CoW uses a combination of Nutch and Solr for indexing and search of wiki
<br> areas.</p>
<br>@@ -2882,10 +2986,10 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.17.1."></a><h3 class="cow-heading"><span class="cow-sec-number">4.17.1. </span>Installation</h3>
<br>+<a class="cow-section-anchor" name="section-4.17.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.17.1. </span>Installation</h3>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.17.1.1."></a><h4 class="cow-heading"><span class="cow-sec-number">4.17.1.1. </span>Directory structure</h4>
<br>+<a class="cow-section-anchor" name="section-4.17.1.1."/><h4 class="cow-heading"><span class="cow-sec-number">4.17.1.1. </span>Directory structure</h4>
<br>
<br> <ul>
<br> <li>Nutch and Solr are checked into <tt>gatewiki/nutch-solr</tt></li>
<br>@@ -2951,7 +3055,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.17.1.2."></a><h4 class="cow-heading"><span class="cow-sec-number">4.17.1.2. </span>Enabling Solr</h4>
<br>+<a class="cow-section-anchor" name="section-4.17.1.2."/><h4 class="cow-heading"><span class="cow-sec-number">4.17.1.2. </span>Enabling Solr</h4>
<br>
<br> <p>By default Solr is disabled. To tell CoW to run Solr (when being run via
<br> Grails) set gate.CoW.solr.run to true in the config. Also make sure that the
<br>@@ -2959,11 +3063,11 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.17.2."></a><h3 class="cow-heading"><span class="cow-sec-number">4.17.2. </span>Indexing wikis/individual files from CoW</h3>
<br>+<a class="cow-section-anchor" name="section-4.17.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.17.2. </span>Indexing wikis/individual files from CoW</h3>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="indexing"></a></p><a class="cow-section-anchor" name="section-4.17.2.1."></a><h4 class="cow-heading"><span class="cow-sec-number">4.17.2.1. </span>Indexing individual Wiki areas</h4>
<br>+<p><a name="indexing"></a></p><a class="cow-section-anchor" name="section-4.17.2.1."/><h4 class="cow-heading"><span class="cow-sec-number">4.17.2.1. </span>Indexing individual Wiki areas</h4>
<br>
<br> <ul>
<br> <li>Login as someone with administration rights.</li>
<br>@@ -2980,7 +3084,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.17.2.2."></a><h4 class="cow-heading"><span class="cow-sec-number">4.17.2.2. </span>Indexing individual files</h4>
<br>+<a class="cow-section-anchor" name="section-4.17.2.2."/><h4 class="cow-heading"><span class="cow-sec-number">4.17.2.2. </span>Indexing individual files</h4>
<br>
<br> <p>Whenever a file is created, uploaded or edited, it is queued for indexing. One
<br> of the quartz jobs is dedicated for the indexing purpose only. It runs every
<br>@@ -2989,36 +3093,13 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.17.3."></a><h3 class="cow-heading"><span class="cow-sec-number">4.17.3. </span>Searching</h3>
<br>+<a class="cow-section-anchor" name="section-4.17.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.17.3. </span>Testing</h3>
<br>
<br>-<p>A search box is provided at the top right corner of the page that allows
<br>-searching within a wiki area that the current page belongs to. In other
<br>-words, if a page belongs to the Help section, results are retrieved only from
<br>-the Help section. Information on Solr query syntax is available at
<br>-<a class="cow-url" href="<a href="http://wiki.apache.org/solr/SolrQuerySyntax" target="_top" rel="nofollow">http://wiki.apache.org/solr/SolrQuerySyntax</a>"><a href="http://wiki.apache.org/solr/SolrQuerySyntax" target="_top" rel="nofollow">http://wiki.apache.org/solr/SolrQuerySyntax</a></a></p>
<br>-
<br>-<p>Given a query, if it succeeds, maximum of 10 results are shown on a single
<br>-page. User can navigate through different page links at the top or bottom of
<br>-the search results to jump to a different sets of results. A search result
<br>-comprises of the following:</p>
<br>-
<br>-<ul>
<br>-<li>title of the document</li>
<br>-<li>link to the document</li>
<br>-<li>text snippet with matching terms highlighted</li>
<br>-</ul>
<br>-
<br>-<p>Hits from pages which the current user doesn't have permission to view are
<br>-filtered out and not included in the search result.</p>
<br>-
<br>-<!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.17.4."></a><h3 class="cow-heading"><span class="cow-sec-number">4.17.4. </span>Testing</h3>
<br>-
<br> <p>There is now a separate test suite (<tt>selenium/solr-suite.html</tt>) for testing solr
<br> indexing and searching functionalities. Please note that running selenium tests
<br> does not test the solr functionalities. Instead, please use the
<br> <tt>test-selenium-solr</tt> ant target to invoke the solr tests.</p>
<br>-<a class="cow-section-anchor" name="section-4.17.5."></a><h3 class="cow-heading"><span class="cow-sec-number">4.17.5. </span>Debugging</h3>
<br>+<a class="cow-section-anchor" name="section-4.17.4."/><h3 class="cow-heading"><span class="cow-sec-number">4.17.4. </span>Debugging</h3>
<br>
<br> <p>If you get no results for your queries, the first thing to make sure is that you
<br> have followed all the right procedure for indexing respective wiki area. Please
<br>@@ -3061,7 +3142,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="svn-browsing"></a></p><a class="cow-section-anchor" name="section-4.18."></a><h2 class="cow-heading"><span class="cow-sec-number">4.18. </span>SVN Browsing</h2>
<br>+<p><a name="svn-browsing"></a></p><a class="cow-section-anchor" name="section-4.18."/><h2 class="cow-heading"><span class="cow-sec-number">4.18. </span>SVN Browsing</h2>
<br>
<br> <p>GATEWiki layers on top of SVN in order to take advantage of SVN's mature and
<br> sophisticated support for collaborative concurrent editing, versionning,
<br>@@ -3076,7 +3157,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4.18.1."></a><h3 class="cow-heading"><span class="cow-sec-number">4.18.1. </span>Notes on Sventon in CoW</h3>
<br>+<a class="cow-section-anchor" name="section-4.18.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.18.1. </span>Notes on Sventon in CoW</h3>
<br>
<br> <p>CoW uses an unpacked version of Sventon's <tt>svn.war</tt> with an additional config
<br> file which:</p>
<br>@@ -3104,7 +3185,7 @@
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>
<br>-<p><a name="extending-yam"></a></p><a class="cow-section-anchor" name="section-4.19."></a><h2 class="cow-heading"><span class="cow-sec-number">4.19. </span>Extending YAM with Plugins</h2>
<br>+<p><a name="extending-yam"></a></p><a class="cow-section-anchor" name="section-4.19."/><h2 class="cow-heading"><span class="cow-sec-number">4.19. </span>Extending YAM with Plugins</h2>
<br>
<br> <p>YAM has a plugin mechanism that involves writing a Java (or Groovy) class that
<br> implements <a class="cow-non-existant-url" href="api/javadoc/index.html?gate/yam/YamPlugin.html?m=1">the YamPlugin
<br>@@ -3123,21 +3204,21 @@
<br> <h1 class="cow-heading">Footnotes</h1>
<br> <p><ol>
<br> <li>
<br>-<a class="cow-footnote-anchor" name="footnote1"></a>
<br>+<a class="cow-footnote-anchor" name="footnote1"/>
<br> <span class="cow-footnote-text" name="footnote1">SVN: the
<br> Subversion version control system.</span>
<br> </li>
<br> <li>
<br>-<a class="cow-footnote-anchor" name="footnote2"></a>
<br>+<a class="cow-footnote-anchor" name="footnote2"/>
<br> <span class="cow-footnote-text" name="footnote2">Except when in workstation
<br> mode.</span>
<br> </li>
<br> <li>
<br>-<a class="cow-footnote-anchor" name="footnote3"></a>
<br>+<a class="cow-footnote-anchor" name="footnote3"/>
<br> <span class="cow-footnote-text" name="footnote3">This is a footnote.</span>
<br> </li>
<br> <li>
<br>-<a class="cow-footnote-anchor" name="footnote4"></a>
<br>+<a class="cow-footnote-anchor" name="footnote4"/>
<br> <span class="cow-footnote-text" name="footnote4">The file upload test needs to programatically fill in a
<br> file upload form field and this is only possible in a special "elevated
<br> privileges" mode using the *firefox launcher</span>
<br><br>Modified: trunk/cow/doc/gatewiki.yam
<br>===================================================================
<br>--- trunk/cow/doc/gatewiki.yam 2009-12-16 09:43:21 UTC (rev 2118)
<br>+++ trunk/cow/doc/gatewiki.yam 2009-12-16 10:30:32 UTC (rev 2119)
<br>@@ -2,7 +2,7 @@
<br>
<br> %image(larson.png, A Larson Cartoon, 307, 404, right, 0)
<br>
<br>-%image(gslidy/gate-logo-colour.png, GATE, 426, 263, right, 0)
<br>+%%%% %image(gslidy/gate-logo-colour.png, GATE, 426, 263, right, 0)
<br>
<br> *In a hurry?* See %(#quick, the quick start section).
<br>
<br>@@ -167,6 +167,88 @@
<br>
<br>
<br> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br>+%#delete
<br>+%3 Deleting and copying
<br>+
<br>+Files and directories (and their contents) can be *deleted* via the directory
<br>+view: follow the "Directory" link from any page, tick the checkbox(es) of the
<br>+entries you want to remove, then hit the "Delete selected" button at the foot
<br>+of the page.
<br>+
<br>+*Copying* (and renaming) of wiki pages is more convoluted at present (and
<br>+copying of directories is not supported). To copy a page first edit it, copy
<br>+the text to the clipboard, then create a new file, edit it and paste the
<br>+contents of the old file. (To do a rename simply perform this process and then
<br>+delete the old file.)
<br>+
<br>+*Don't* use the WYSIWYG editor for copying - just use the form editor
<br>+(otherwise you're liable to lose all the formatting of the page).
<br>+
<br>+(One reason we haven't made copying easier (yet) is that you can also use any
<br>+%(<a href="http://subversion.tigris.org/" target="_top" rel="nofollow">http://subversion.tigris.org/</a>, Subversion) client, of which there are
<br>+legion.)
<br>+
<br>+
<br>+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br>+%#upload
<br>+%3 Upload other types of files
<br>+
<br>+If you want to upload plain HTML, or a PNG image, or whatever, you can use the
<br>+"Upload" link which is visible in the directory view. You may upload trees of
<br>+directories by first TGZing or ZIPing them and requesting the "unpack" option.
<br>+The upload dialogue allows you to choose whether or not to overwrite existing
<br>+files.
<br>+
<br>+
<br>+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br>+%#dir-view
<br>+%3 Finding things
<br>+
<br>+In the usual way GATEWiki supports *search* via the "Search" box: just type
<br>+your keywords and press the button. For more sophisticated queries, see the
<br>+search syntax description at the foot of the search results page or the
<br>+%(#searching, section on searching).
<br>+
<br>+In keeping with our everything-is-a-directory-tree philosophy, another way to
<br>+see *what files live where* etc. is via the directory view.
<br>+
<br>+When you're logged in (and have permission) each page has a "Directory" link
<br>+leading to the directory view, which is just like a files and folders browser
<br>+on your desktop. The type of each entry is indicated by an icon:
<br>+
<br>+- %image(../web-app/_images/filetypes/directory.png) directory
<br>+- %image(../web-app/_images/filetypes/html+yam.png) wiki page (in %(#yam,
<br>+ YAM))
<br>+- %image(../web-app/_images/filetypes/pdf.png) PDF
<br>+- %image(../web-app/_images/filetypes/html.png) raw HTML file (see
<br>+ %(#raw-html, below))
<br>+- %image(../web-app/_images/filetypes/image.png) image
<br>+- %image(../web-app/_images/filetypes/word.png) word processor
<br>+- %image(../web-app/_images/filetypes/unknown.png) other
<br>+
<br>+Directory view also provides access to the *%(#upload, upload)* and
<br>+*%(#delete, delete)* functions.
<br>+
<br>+
<br>+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br>+%#raw-html
<br>+%3 Raw HTML pages vs. wiki pages
<br>+
<br>+When you create a new web page in GATEWiki two files are added:
<br>+
<br>+- a ^.html^ file that will be served to web browsers when they follow a link
<br>+ to the page
<br>+- a ^.yam^ file that contains the source text, in %(#yam, YAM format)
<br>+
<br>+In general you can simply ignore this - edit and delete operations, for
<br>+example, work transparently on your pages. However, GATEWiki also supports raw
<br>+HTML files, which have no YAM source. Again editing and so on is transparent,
<br>+but because HTML presents more of a security risk the permissions associated
<br>+with these pages are often different from ordinary wiki pages - hence the
<br>+different icon for these pages in %(#dir-view, directory view), for example.
<br>+
<br>+
<br>+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br> %2 Modes
<br>
<br> CoW has two operational modes:
<br>@@ -267,16 +349,28 @@
<br>
<br>
<br> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br>-%#upload
<br>-%2 Upload other types of files
<br>+%#searching
<br>+%2 Searching
<br>
<br>-If you want to upload plain HTML, or a PNG image, or whatever, you can use the
<br>-"Upload" link which is visible in the directory view. You may upload trees of
<br>-directories by first TGZing or ZIPing them and requesting the "unpack" option.
<br>-The upload dialogue allows you to choose whether or not to overwrite existing
<br>-files.
<br>+A search box is provided at the top right corner of the page that allows
<br>+searching within a wiki area that the current page belongs to. In other
<br>+words, if a page belongs to the Help section, results are retrieved only from
<br>+the Help section. Information on Solr query syntax is available at
<br>+<a href="http://wiki.apache.org/solr/SolrQuerySyntax" target="_top" rel="nofollow">http://wiki.apache.org/solr/SolrQuerySyntax</a><br>
<br>+Given a query, if it succeeds, maximum of 10 results are shown on a single
<br>+page. User can navigate through different page links at the top or bottom of
<br>+the search results to jump to a different sets of results. A search result
<br>+comprises of the following:
<br>
<br>+- title of the document
<br>+- link to the document
<br>+- text snippet with matching terms highlighted
<br>+
<br>+Hits from pages which the current user doesn't have permission to view are
<br>+filtered out and not included in the search result.
<br>+
<br>+
<br> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br> %2 Report a bug
<br>
<br>@@ -2239,27 +2333,6 @@
<br>
<br>
<br> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br>-%3 Searching
<br>-
<br>-A search box is provided at the top right corner of the page that allows
<br>-searching within a wiki area that the current page belongs to. In other
<br>-words, if a page belongs to the Help section, results are retrieved only from
<br>-the Help section. Information on Solr query syntax is available at
<br>-<a href="http://wiki.apache.org/solr/SolrQuerySyntax" target="_top" rel="nofollow">http://wiki.apache.org/solr/SolrQuerySyntax</a><br>-
<br>-Given a query, if it succeeds, maximum of 10 results are shown on a single
<br>-page. User can navigate through different page links at the top or bottom of
<br>-the search results to jump to a different sets of results. A search result
<br>-comprises of the following:
<br>-
<br>-- title of the document
<br>-- link to the document
<br>-- text snippet with matching terms highlighted
<br>-
<br>-Hits from pages which the current user doesn't have permission to view are
<br>-filtered out and not included in the search result.
<br>-
<br>-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br> %3 Testing
<br>
<br> There is now a separate test suite (^selenium/solr-suite.html^) for testing solr
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>This SF.Net email is sponsored by the Verizon Developer Community
<br>Take advantage of Verizon's best-in-class app development support
<br>A streamlined, 14 day to market process makes app distribution fast and easy
<br>Join now and get one step closer to millions of Verizon customers
<br><a href="http://p.sf.net/sfu/verizon-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/verizon-dev2dev</a>
<br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26809099&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26808609[gatewiki-commits] SF.net SVN: gatewiki:[2118] trunk/cow/doc/non-yam-edit-notes.yam2009-12-16T01:43:21Z2009-12-16T01:43:21Zhcunningham-2Revision: 2118
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2118&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2118&view=rev</a><br>Author: hcunningham
<br>Date: 2009-12-16 09:43:21 +0000 (Wed, 16 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>removed old stuff
<br><br>Removed Paths:
<br>-------------
<br> trunk/cow/doc/non-yam-edit-notes.yam
<br><br>Deleted: trunk/cow/doc/non-yam-edit-notes.yam
<br>===================================================================
<br>--- trunk/cow/doc/non-yam-edit-notes.yam 2009-12-15 15:14:49 UTC (rev 2117)
<br>+++ trunk/cow/doc/non-yam-edit-notes.yam 2009-12-16 09:43:21 UTC (rev 2118)
<br>@@ -1,144 +0,0 @@
<br>-Non-YAM editing
<br>-
<br>-
<br>-The below gets some of the way, by:
<br>-
<br>-- having a y flag in the view models and the URLs that encode the flow between
<br>- show/edit/preview/save
<br>-- conditional logic in the actions that deals with the presence/absence of the
<br>- .yam
<br>-
<br>-BUT: the logic gets pretty messy in the controller.
<br>-
<br>-So I gave up for now...
<br>-
<br>-%<
<br>-Index: grails-app/controllers/WikiController.groovy
<br>-===================================================================
<br>---- grails-app/controllers/WikiController.groovy (revision 197)
<br>-+++ grails-app/controllers/WikiController.groovy (working copy)
<br>-@@ -104,11 +104,12 @@
<br>- String body = FileUtils.getBody(pageFile)
<br>- Map model = [body: body, requestPath: requestPath]
<br>- YamFile yam = YamFile.get(wikiPage.fsr)
<br>-- if (yam) model.put("editLink", "${wiki.id}${requestPath}")
<br>-+ if (yam) model.put("isYam", "1")
<br>-+ model.put("editLink", "${wiki.id}${requestPath}")
<br>- if (wiki.directoryListingAllowed)
<br>-- model.put(// d=1: directory = true (so it doesn't bounce back to show)
<br>-+ model.put( // d=1: directory = true (so it doesn't bounce back to show)
<br>- "dirsLink", "${wiki.id}${wikiPage.requestPathDir}?d=1"
<br>-- )
<br>-+ )
<br>- model.put("editAllowed", AcegiHelper.editAllowed(params))
<br>-
<br>- return model
<br>-@@ -132,6 +133,7 @@
<br>-
<br>- // process wiki page
<br>- WikiPage wikiPage = new WikiPage(wiki, sandboxManager, params, request)
<br>-+ String yamFlag = ""
<br>- if (!wikiPage.valid) {
<br>- return wikiPage.badPage(this) // construction failed
<br>- } else if (wikiPage.mimeType != "text/html") { // not HTML
<br>-@@ -140,13 +142,18 @@
<br>- } else { // return model with the current page text etc.
<br>- String pageText = ""
<br>- if(params.f == "1") { // using fck edit
<br>-- // regenerate to a temp file with YamFile.setDoIncludes(false)
<br>-- File tempFile = File.createTempFile("cow-fck-edit-", ".yam")
<br>-- String tempFilePath = tempFile.path
<br>-- tempFile.withWriter { writer -> writer << wikiPage.dotYamFile.text }
<br>-- YamFile yam = generate(tempFilePath, wikiPage, false)
<br>-- pageText =
<br>-- new File(FileUtils.replaceFileSuffix(tempFile, "html")).text
<br>-+ if(params.y == "1") { // it was a yam file
<br>-+ // regenerate to a temp file with YamFile.setDoIncludes(false)
<br>-+ File tempFile = File.createTempFile("cow-fck-edit-", ".yam")
<br>-+ String tempFilePath = tempFile.path
<br>-+ tempFile.withWriter { writer -> writer << wikiPage.dotYamFile.text }
<br>-+ YamFile yam = generate(tempFilePath, wikiPage, false)
<br>-+ pageText =
<br>-+ new File(FileUtils.replaceFileSuffix(tempFile, "html")).text
<br>-+ yamFlag = "&y=1"
<br>-+ } else { // doing a plain html file
<br>-+ pageText = wikiPage.fsr.file.text
<br>-+ }
<br>- } else { // using html form edit
<br>- YamFile yam = YamFile.get(wikiPage.fsr)
<br>- pageText = yam?.location?.file?.text
<br>-@@ -156,7 +163,7 @@
<br>- def model = [
<br>- wiki: wiki,
<br>- requestPath: wikiPage.requestPath,
<br>-- previewLink: "${wiki.id}${wikiPage.requestPath}?preview=1",
<br>-+ previewLink: "${wiki.id}${wikiPage.requestPath}?preview=1${yamFlag}",
<br>- pageText: pageText,
<br>- syntax: YamHelp.syntax()
<br>- ]
<br>-@@ -183,6 +190,7 @@
<br>- // get and verify the Wiki instance (will redirect if problems)
<br>- Wiki wiki = verifyWiki()
<br>- if (!wiki) return null
<br>-+// TODO deal with non-yam html edits here
<br>-
<br>- // create a wiki page object (or redirect) and get the request path
<br>- WikiPage wikiPage = new WikiPage(wiki, sandboxManager, params, request)
<br>-@@ -215,10 +223,9 @@
<br>- model: [
<br>- preview: 1, wiki: wiki, body: body,
<br>- editedTextPath: tempFilePath, requestPath: requestPath,
<br>-- // saveLink:"${wiki.id}${wikiPage.requestPath}"
<br>- saveLink: "${wiki.id}${requestPath}"
<br>-- ]
<br>-- )
<br>-+ ]
<br>-+ )
<br>- } // preview
<br>-
<br>- /** Save an edit. */
<br>-Index: grails-app/views/layouts/wiki.gsp
<br>-===================================================================
<br>---- grails-app/views/layouts/wiki.gsp (revision 193)
<br>-+++ grails-app/views/layouts/wiki.gsp (working copy)
<br>-@@ -76,11 +76,17 @@
<br>-
<br>- <!-- show stuff -->
<br>- <g:if test="${editAllowed && editLink}">
<br>-- <span class="pageLink">
<br>-- <g:link action="edit" id="${editLink}?f=1">Edit</g:link>
<br>-- </span> <span class="pageLink">
<br>-- <g:link action="edit" id="${editLink}">(with form)</g:link>
<br>-- </span>
<br>-+ <g:if test="${isYam}">
<br>-+ <span class="pageLink"> <g:link action="edit" id="${editLink}?f=1,y=1">Edit</g:link> </span>
<br>-+ </g:if>
<br>-+ <g:else>
<br>-+ <span class="pageLink"> <g:link action="edit" id="${editLink}?f=1">Edit</g:link> </span>
<br>-+ </g:else>
<br>-+ <g:if test="${isYam}">
<br>-+ <span class="pageLink">
<br>-+ <g:link action="edit" id="${editLink}">(with form)</g:link>
<br>-+ </span>
<br>-+ </g:if>
<br>- </g:if>
<br>- <g:if test="${dirsLink}">
<br>- <span class="pageLink">
<br>-Index: grails-app/views/wiki/edit.gsp
<br>-===================================================================
<br>---- grails-app/views/wiki/edit.gsp (revision 193)
<br>-+++ grails-app/views/wiki/edit.gsp (working copy)
<br>-@@ -20,12 +20,6 @@
<br>- <g:richTextEditor name="editedtext" value="${pageText}" toolbar="Default" basepath="js/fckeditor/" height="500" />
<br>- </g:form>
<br>- <hr>
<br>--<!--
<br>-- <g:form controller="wiki" action="preview" id="${previewLink}&f=1"
<br>-- method="post" enctype="multipart/form-data" height="250">
<br>-- <fck:editor name="editedtext" height="250">${pageText}</fck:editor>
<br>-- </g:form>
<br>---->
<br>- </g:if>
<br>- <g:elseif test="${useFck != 1}">
<br>- <g:form controller="wiki" action="preview" id="${previewLink}" method="post">
<br>-%>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>This SF.Net email is sponsored by the Verizon Developer Community
<br>Take advantage of Verizon's best-in-class app development support
<br>A streamlined, 14 day to market process makes app distribution fast and easy
<br>Join now and get one step closer to millions of Verizon customers
<br><a href="http://p.sf.net/sfu/verizon-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/verizon-dev2dev</a>
<br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26808609&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26796386[gatewiki-commits] SF.net SVN: gatewiki:[2117] trunk/nutch-solr2009-12-15T07:14:49Z2009-12-15T07:14:49ZnirajaswaniRevision: 2117
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2117&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2117&view=rev</a><br>Author: nirajaswani
<br>Date: 2009-12-15 15:14:49 +0000 (Tue, 15 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>after reading several posts and tutorials on indexing optimization, trying to hit better settings for indexing with solr and crawling with nutch - it took 5 hours to crawl (less than half of the time recorded in the last experiment). Asking solr to use compound file format for indexing - which could make solr bit slow at indexing, but atleast, it will make sure the searching is faster. On the other hand, with more memory given to the indexing process, we can now safely increase the number of threads to reduce the time it takes for crawling. Also reduced the mergeFactor (the parameter used for deciding how many file descriptors could be opened at a time) and increased the ramBufferSizeMB (the parameter used for caching files and results). Finally, added a solr command for optimizing the index - aparantly, this is the first step that should be taken for avoiding too many open files problem - hopefully, we won't see this error again (atleast when solr is responsible for it)
<br><br>Modified Paths:
<br>--------------
<br> trunk/nutch-solr/lib/nutch-wrapper.jar
<br> trunk/nutch-solr/nutch-config/nutch-site.xml
<br> trunk/nutch-solr/solr-app/multicore/conf/solrconfig.xml
<br> trunk/nutch-solr/solr-app/solr/conf/solrconfig.xml
<br> trunk/nutch-solr/src/java/gate/solr/SolrIndexer.java
<br><br>Modified: trunk/nutch-solr/lib/nutch-wrapper.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch-config/nutch-site.xml
<br>===================================================================
<br>--- trunk/nutch-solr/nutch-config/nutch-site.xml 2009-12-15 01:20:10 UTC (rev 2116)
<br>+++ trunk/nutch-solr/nutch-config/nutch-site.xml 2009-12-15 15:14:49 UTC (rev 2117)
<br>@@ -96,40 +96,7 @@
<br> is turned off).</description>
<br> </property>
<br>
<br>-
<br> <property>
<br>- <name>indexer.mergeFactor</name>
<br>- <value>50</value>
<br>- <description>The factor that determines the frequency of Lucene segment
<br>- merges. This must not be less than 2, higher values increase indexing
<br>- speed but lead to increased RAM usage, and increase the number of
<br>- open file handles (which may lead to "Too many open files" errors).
<br>- NOTE: the "segments" here have nothing to do with Nutch segments, they
<br>- are a low-level data unit used by Lucene.
<br>- </description>
<br>-</property>
<br>-
<br>-<property>
<br>- <name>indexer.minMergeDocs</name>
<br>- <value>200</value>
<br>- <description>This number determines the minimum number of Lucene
<br>- Documents buffered in memory between Lucene segment merges. Larger
<br>- values increase indexing speed and increase RAM usage.
<br>- </description>
<br>-</property>
<br>-
<br>-<property>
<br>- <name>indexer.maxMergeDocs</name>
<br>- <value>1000</value>
<br>- <description>This number determines the maximum number of Lucene
<br>- Documents to be merged into a new Lucene segment. Larger values
<br>- increase batch indexing speed and reduce the number of Lucene segments,
<br>- which reduces the number of open file handles; however, this also
<br>- decreases incremental indexing performance.
<br>- </description>
<br>-</property>
<br>-
<br>-<property>
<br> <name>db.max.inlinks</name>
<br> <value>100000</value>
<br> <description>Maximum number of Inlinks per URL to be kept in LinkDb.
<br>@@ -147,5 +114,4 @@
<br> </description>
<br> </property>
<br>
<br>-
<br> </configuration>
<br><br>Modified: trunk/nutch-solr/solr-app/multicore/conf/solrconfig.xml
<br>===================================================================
<br>--- trunk/nutch-solr/solr-app/multicore/conf/solrconfig.xml 2009-12-15 01:20:10 UTC (rev 2116)
<br>+++ trunk/nutch-solr/solr-app/multicore/conf/solrconfig.xml 2009-12-15 15:14:49 UTC (rev 2117)
<br>@@ -20,6 +20,46 @@
<br>
<br> <updateHandler class="solr.DirectUpdateHandler2" />
<br> <dataDir>${coreDataDir}</dataDir>
<br>+
<br>+ <indexDefaults>
<br>+ <useCompoundFile>true</useCompoundFile>
<br>+ <mergeFactor>10</mergeFactor>
<br>+ <ramBufferSizeMB>256</ramBufferSizeMB>
<br>+ <maxMergeDocs>2147483647</maxMergeDocs>
<br>+ <maxFieldLength>100000</maxFieldLength>
<br>+ <writeLockTimeout>1000</writeLockTimeout>
<br>+ <commitLockTimeout>10000</commitLockTimeout>
<br>+ <lockType>single</lockType>
<br>+ </indexDefaults>
<br>+
<br>+ <mainIndex>
<br>+ <!-- options specific to the main on-disk lucene index -->
<br>+ <!-- setting the following parameter to true, makes indexing slower
<br>+ but good for avoiding too many open files exception -->
<br>+ <useCompoundFile>true</useCompoundFile>
<br>+
<br>+ <!-- default value is 32 but lets increase it to speed up indexing.
<br>+ higher the value, more the documents will be indexed -->
<br>+ <ramBufferSizeMB>256</ramBufferSizeMB>
<br>+
<br>+ <!-- This tells how many segments should be kept -->
<br>+ <mergeFactor>10</mergeFactor>
<br>+
<br>+ <!-- maximum docs in a single segment (after merging) -->
<br>+ <maxMergeDocs>2147483647</maxMergeDocs>
<br>+
<br>+ <!-- max length of a field -->
<br>+ <maxFieldLength>100000</maxFieldLength>
<br>+
<br>+ <!-- If true, unlock any held write or commit locks on startup.
<br>+ This defeats the locking mechanism that allows multiple
<br>+ processes to safely access a lucene index, and should be
<br>+ used with care.
<br>+ This is not needed if lock type is 'none' or 'single'
<br>+ -->
<br>+ <unlockOnStartup>false</unlockOnStartup>
<br>+ </mainIndex>
<br>+
<br>
<br> <query>
<br>
<br><br>Modified: trunk/nutch-solr/solr-app/solr/conf/solrconfig.xml
<br>===================================================================
<br>--- trunk/nutch-solr/solr-app/solr/conf/solrconfig.xml 2009-12-15 01:20:10 UTC (rev 2116)
<br>+++ trunk/nutch-solr/solr-app/solr/conf/solrconfig.xml 2009-12-15 15:14:49 UTC (rev 2117)
<br>@@ -34,7 +34,7 @@
<br>
<br> <indexDefaults>
<br> <!-- Values here affect all index writers and act as a default unless overridden. -->
<br>- <useCompoundFile>false</useCompoundFile>
<br>+ <useCompoundFile>true</useCompoundFile>
<br>
<br> <mergeFactor>10</mergeFactor>
<br> <!--
<br>@@ -48,7 +48,7 @@
<br> If both ramBufferSizeMB and maxBufferedDocs is set, then Lucene will flush based on whichever limit is hit first.
<br>
<br> -->
<br>- <ramBufferSizeMB>32</ramBufferSizeMB>
<br>+ <ramBufferSizeMB>256</ramBufferSizeMB>
<br> <maxMergeDocs>2147483647</maxMergeDocs>
<br> <maxFieldLength>10000</maxFieldLength>
<br> <writeLockTimeout>1000</writeLockTimeout>
<br><br>Modified: trunk/nutch-solr/src/java/gate/solr/SolrIndexer.java
<br>===================================================================
<br>--- trunk/nutch-solr/src/java/gate/solr/SolrIndexer.java 2009-12-15 01:20:10 UTC (rev 2116)
<br>+++ trunk/nutch-solr/src/java/gate/solr/SolrIndexer.java 2009-12-15 15:14:49 UTC (rev 2117)
<br>@@ -136,7 +136,52 @@
<br> return true;
<br> } // deleteByQuery(String, int)
<br>
<br>+
<br> /**
<br>+ * Removes documents that match the given query
<br>+ *
<br>+ * @param query
<br>+ * search query to be used for obtaining a list of documents
<br>+ * @param coreId
<br>+ * core that holds the given file
<br>+ * @return true if file is deleted successfully, false otherwise
<br>+ */
<br>+ public boolean optimize(int coreId) {
<br>+
<br>+ try {
<br>+
<br>+ // Send data
<br>+ URL url = new URL(solrUrl + "/core" + coreId + "/update");
<br>+ URLConnection conn = url.openConnection();
<br>+ conn.setDoOutput(true);
<br>+ conn.setRequestProperty("Content-type", "text/xml");
<br>+ conn.setRequestProperty("charset", "utf-8");
<br>+ OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
<br>+ System.out.println("******************optimizing");
<br>+ wr.write("<optimize/>");
<br>+ wr.flush();
<br>+
<br>+ // Get the response
<br>+ BufferedReader rd =
<br>+ new BufferedReader(new InputStreamReader(conn.getInputStream()));
<br>+ String line;
<br>+ while((line = rd.readLine()) != null) {
<br>+ System.out.println(line);
<br>+ }
<br>+
<br>+ wr.close();
<br>+ rd.close();
<br>+ }
<br>+ catch(Exception e) {
<br>+ e.printStackTrace();
<br>+ return false;
<br>+ }
<br>+
<br>+ // successful
<br>+ return true;
<br>+ } // deleteByQuery(String, int)
<br>+
<br>+ /**
<br> * Removes the file from solr index and then adds it using nutch
<br> *
<br> * @param fileUrls
<br>@@ -214,7 +259,7 @@
<br> filteringRegexs.append("\n+").append(aFileUrl).append(".*/$");
<br>
<br> depth = "70";
<br>- threads = "20";
<br>+ threads = "30";
<br> }
<br>
<br> // and the file itself that user has asked for indexing
<br>@@ -290,6 +335,7 @@
<br> String query =
<br> new File(new URL(fileUrls.get(0)).toURI()).getAbsolutePath();
<br> deleteByQuery(query, coreId);
<br>+ optimize(coreId);
<br> }
<br> }
<br> catch(Exception e) {
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26796386&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26787954[gatewiki-commits] SF.net SVN: gatewiki:[2116] trunk/cow/doc2009-12-14T17:20:10Z2009-12-14T17:20:10Zgate-projectRevision: 2116
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2116&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2116&view=rev</a><br>Author: gate-project
<br>Date: 2009-12-15 01:20:10 +0000 (Tue, 15 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>[nirajaswani] added credits for the mail plugin for grails, apache solr and apache nutch
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/doc/acknowledgements.html
<br> trunk/cow/doc/acknowledgements.yam
<br><br>Modified: trunk/cow/doc/acknowledgements.html
<br>===================================================================
<br>--- trunk/cow/doc/acknowledgements.html 2009-12-14 11:36:29 UTC (rev 2115)
<br>+++ trunk/cow/doc/acknowledgements.html 2009-12-15 01:20:10 UTC (rev 2116)
<br>@@ -54,11 +54,14 @@
<br> <li><a class="cow-url" href="<a href="http://grails.org/JSecurity+Plugin" target="_top" rel="nofollow">http://grails.org/JSecurity+Plugin</a>">the JSecurity plugin for Grails</a></li>
<br> <li><a class="cow-url" href="<a href="http://grails.org/JCaptcha+Plugin" target="_top" rel="nofollow">http://grails.org/JCaptcha+Plugin</a>">the JCaptcha plugin for Grails</a></li>
<br> <li><a class="cow-url" href="<a href="http://grails.codehaus.org/Quartz+plugin" target="_top" rel="nofollow">http://grails.codehaus.org/Quartz+plugin</a>">the Quartz plugin for Grails</a></li>
<br>+<li><a class="cow-url" href="<a href="http://www.grails.org/Mail+plugin" target="_top" rel="nofollow">http://www.grails.org/Mail+plugin</a>">the Mail plugin for Grails</a></li>
<br> <li><a class="cow-url" href="<a href="http://groovy.codehaus.org/" target="_top" rel="nofollow">http://groovy.codehaus.org/</a>">Groovy</a></li>
<br> <li><a class="cow-url" href="<a href="https://javacc.dev.java.net/" target="_top" rel="nofollow">https://javacc.dev.java.net/</a>">JavaCC</a></li>
<br> <li><a class="cow-url" href="<a href="http://seleniumhq.org/" target="_top" rel="nofollow">http://seleniumhq.org/</a>">Selenium</a></li>
<br> <li><a class="cow-url" href="<a href="http://webtest.canoo.com/" target="_top" rel="nofollow">http://webtest.canoo.com/</a>">the Canoo Webtest plugin for Grails</a></li>
<br> <li><a class="cow-url" href="<a href="http://ant.apache.org/" target="_top" rel="nofollow">http://ant.apache.org/</a>">Apache Ant</a></li>
<br>+<li><a class="cow-url" href="<a href="http://lucene.apache.org/solr/" target="_top" rel="nofollow">http://lucene.apache.org/solr/</a>">Apache Solr</a></li>
<br>+<li><a class="cow-url" href="<a href="http://lucene.apache.org/nutch/" target="_top" rel="nofollow">http://lucene.apache.org/nutch/</a>">Apache Nutch</a></li>
<br> <li><a class="cow-url" href="<a href="http://java.sun.com" target="_top" rel="nofollow">http://java.sun.com</a>">Java</a></li>
<br> <li><a class="cow-url" href="<a href="http://www.springframework.org/" target="_top" rel="nofollow">http://www.springframework.org/</a>">Spring</a></li>
<br> <li><a class="cow-url" href="<a href="http://www.hibernate.org/" target="_top" rel="nofollow">http://www.hibernate.org/</a>">Hibernate</a></li>
<br><br>Modified: trunk/cow/doc/acknowledgements.yam
<br>===================================================================
<br>--- trunk/cow/doc/acknowledgements.yam 2009-12-14 11:36:29 UTC (rev 2115)
<br>+++ trunk/cow/doc/acknowledgements.yam 2009-12-15 01:20:10 UTC (rev 2116)
<br>@@ -10,11 +10,14 @@
<br> - %(<a href="http://grails.org/JSecurity+Plugin" target="_top" rel="nofollow">http://grails.org/JSecurity+Plugin</a>, the JSecurity plugin for Grails)
<br> - %(<a href="http://grails.org/JCaptcha+Plugin" target="_top" rel="nofollow">http://grails.org/JCaptcha+Plugin</a>, the JCaptcha plugin for Grails)
<br> - %(<a href="http://grails.codehaus.org/Quartz+plugin" target="_top" rel="nofollow">http://grails.codehaus.org/Quartz+plugin</a>, the Quartz plugin for Grails)
<br>+- %(<a href="http://www.grails.org/Mail+plugin" target="_top" rel="nofollow">http://www.grails.org/Mail+plugin</a>, the Mail plugin for Grails)
<br> - %(<a href="http://groovy.codehaus.org/" target="_top" rel="nofollow">http://groovy.codehaus.org/</a>, Groovy)
<br> - %(<a href="https://javacc.dev.java.net/" target="_top" rel="nofollow">https://javacc.dev.java.net/</a>, JavaCC)
<br> - %(<a href="http://seleniumhq.org/" target="_top" rel="nofollow">http://seleniumhq.org/</a>, Selenium)
<br> - %(<a href="http://webtest.canoo.com/,the" target="_top" rel="nofollow">http://webtest.canoo.com/,the</a> Canoo Webtest plugin for Grails)
<br> - %(<a href="http://ant.apache.org/" target="_top" rel="nofollow">http://ant.apache.org/</a>, Apache Ant)
<br>+- %(<a href="http://lucene.apache.org/solr/" target="_top" rel="nofollow">http://lucene.apache.org/solr/</a>, Apache Solr)
<br>+- %(<a href="http://lucene.apache.org/nutch/" target="_top" rel="nofollow">http://lucene.apache.org/nutch/</a>, Apache Nutch)
<br> - %(<a href="http://java.sun.com" target="_top" rel="nofollow">http://java.sun.com</a>, Java)
<br> - %(<a href="http://www.springframework.org/" target="_top" rel="nofollow">http://www.springframework.org/</a>, Spring)
<br> - %(<a href="http://www.hibernate.org/" target="_top" rel="nofollow">http://www.hibernate.org/</a>, Hibernate)
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26787954&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26776424[gatewiki-commits] SF.net SVN: gatewiki:[2115] trunk/cow/doc2009-12-14T03:36:30Z2009-12-14T03:36:30Zhcunningham-2Revision: 2115
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2115&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2115&view=rev</a><br>Author: hcunningham
<br>Date: 2009-12-14 11:36:29 +0000 (Mon, 14 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>some backlog for next year
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/doc/cow-backlog.html
<br> trunk/cow/doc/cow-backlog.yam
<br><br>Modified: trunk/cow/doc/cow-backlog.html
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.html 2009-12-11 13:40:55 UTC (rev 2114)
<br>+++ trunk/cow/doc/cow-backlog.html 2009-12-14 11:36:29 UTC (rev 2115)
<br>@@ -1,7 +1,8 @@
<br>-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
<br>- "<a href="http://www.w3.org/TR/html4/strict.dtd" target="_top" rel="nofollow">http://www.w3.org/TR/html4/strict.dtd</a>">
<br>+<?xml version="1.0" encoding="utf-8"?>
<br> <!-- AUTOGENERATED FILE: ALL EDITS WILL BE LOST!!! -->
<br>-<html lang="en">
<br>+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
<br>+ "<a href="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" target="_top" rel="nofollow">http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</a>">
<br>+<html xmlns="<a href="http://www.w3.org/1999/xhtml" target="_top" rel="nofollow">http://www.w3.org/1999/xhtml</a>" lang="en" xml:lang="en">
<br> <head>
<br> <meta name="generator" content="cow"/>
<br> <title>CoW Backlog</title>
<br>@@ -56,7 +57,7 @@
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-1."></a><h1 class="cow-heading"><span class="cow-sec-number">1. </span>Roadmap (version 1.1, early 2010)</h1>
<br>+<a class="cow-section-anchor" name="section-1."/><h1 class="cow-heading"><span class="cow-sec-number">1. </span>Roadmap (version 1.1, early 2010)</h1>
<br>
<br> <p>TODO: reprioritise, pull in any pressing stuff from future tasks</p>
<br>
<br>@@ -82,11 +83,19 @@
<br> the regeneration seems to be run with includes turned off (e.g. edit the
<br> download page on g8rs.net, then look at /narrative.html - this now has the
<br> includes not processed). [AR]</li>
<br>+<li>bar admin edit on readonly dir (or at least message) [IR]</li>
<br>+<li>search [NA]
<br>+ <ul>
<br>+ <li>a query to solr like "tokenisation NOT" generates a server error; it
<br>+ should just message instead</li>
<br>+ <li>prioritise user guide and top-level htmls in solr results</li>
<br>+ <li>group similar pages in solr results</li>
<br>+ </ul></li>
<br> </ul>
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-2."></a><h1 class="cow-heading"><span class="cow-sec-number">2. </span>Future Tasks</h1>
<br>+<a class="cow-section-anchor" name="section-2."/><h1 class="cow-heading"><span class="cow-sec-number">2. </span>Future Tasks</h1>
<br>
<br> <ul>
<br> <li>we should rethink how we preview non-YAM HTML files. At the moment we inject
<br>@@ -469,13 +478,13 @@
<br> </ul>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-3."></a><h1 class="cow-heading"><span class="cow-sec-number">3. </span>Completed Tasks</h1>
<br>+<a class="cow-section-anchor" name="section-3."/><h1 class="cow-heading"><span class="cow-sec-number">3. </span>Completed Tasks</h1>
<br>
<br> <p><a class="cow-url" href="cow-done.html">A list of completed tasks is here.</a></p>
<br>
<br>
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-4."></a><h1 class="cow-heading"><span class="cow-sec-number">4. </span>About this Document</h1>
<br>+<a class="cow-section-anchor" name="section-4."/><h1 class="cow-heading"><span class="cow-sec-number">4. </span>About this Document</h1>
<br>
<br> <p>
<br> <p>This document contains the list of features, functions, technologies,
<br><br>Modified: trunk/cow/doc/cow-backlog.yam
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.yam 2009-12-11 13:40:55 UTC (rev 2114)
<br>+++ trunk/cow/doc/cow-backlog.yam 2009-12-14 11:36:29 UTC (rev 2115)
<br>@@ -25,6 +25,12 @@
<br> the regeneration seems to be run with includes turned off (e.g. edit the
<br> download page on g8rs.net, then look at /narrative.html - this now has the
<br> includes not processed). [AR]
<br>+- bar admin edit on readonly dir (or at least message) [IR]
<br>+- search [NA]
<br>+ - a query to solr like "tokenisation NOT" generates a server error; it
<br>+ should just message instead
<br>+ - prioritise user guide and top-level htmls in solr results
<br>+ - group similar pages in solr results
<br>
<br>
<br> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26776424&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26744467[gatewiki-commits] SF.net SVN: gatewiki:[2114] trunk/cow/src/java/gate/yam/format/YamFormatter .java2009-12-11T05:40:55Z2009-12-11T05:40:55ZnirajaswaniRevision: 2114
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2114&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2114&view=rev</a><br>Author: nirajaswani
<br>Date: 2009-12-11 13:40:55 +0000 (Fri, 11 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>fixed several bugs related to new lines.
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/src/java/gate/yam/format/YamFormatter.java
<br><br>Modified: trunk/cow/src/java/gate/yam/format/YamFormatter.java
<br>===================================================================
<br>--- trunk/cow/src/java/gate/yam/format/YamFormatter.java 2009-12-11 12:48:51 UTC (rev 2113)
<br>+++ trunk/cow/src/java/gate/yam/format/YamFormatter.java 2009-12-11 13:40:55 UTC (rev 2114)
<br>@@ -118,7 +118,7 @@
<br> catch(Exception e) {
<br> throw new RuntimeException(e);
<br> }
<br>- // TODO
<br>+ // TODO uncomment the following line
<br> // formatDocument(doc, content);
<br> } // normalise(Document)
<br>
<br>@@ -181,15 +181,15 @@
<br> // from the original document content
<br> int contentCopiedTill = 0;
<br>
<br>- // position where the new lines (as part of Edit annotations formatting)
<br>+ // position where the blank lines (as part of Edit annotations formatting)
<br> // should be added or removed from
<br>- int nlPosition = 0;
<br>+ int blPosition = 0;
<br>
<br> /*
<br>- *Keeps track of how many nls were added at the end of the last
<br>- *seen annotation.
<br>+ * Keeps track of how many *blank* lines were preserved at the end of the
<br>+ * last seen annotation.
<br> */
<br>- int nlsAdded = 0;
<br>+ int blsPreserved = 0;
<br>
<br> /*
<br> * Some Edit annotations have wrap annotations inside them.
<br>@@ -202,31 +202,41 @@
<br> * When sorted, they appear in the following order
<br> * Wrap, Edit, Wrap, Wrap
<br> *
<br>- * New lines need to be added/removed before/after the Edit annotations
<br>- * based on the number of new lines are already there.
<br>- * In the above example, newlines should be added before the first Wrap
<br>+ * Blank lines need to be added/removed before/after the Edit annotations
<br>+ * based on the number of blank lines are already there.
<br>+ * In the above example, blank lines should be added before the first Wrap
<br> * annotation as well as after the last Wrap annotation. However the
<br>- * information about how many new lines are already there is in the Edit
<br>+ * information about how many blank lines are already there is in the Edit
<br> * annotation. When we get to the last Wrap annotation we would need to
<br> * have access to the Edit annotation.
<br> *
<br> * The following variable is useful for remembering the last seen Edit
<br> * annotation's offsets. When we reach at the last Wrap annotation
<br> * in the above sequence, whose endOffset is equal to the last seen Edit
<br>- * annotation's end offset, we add new lines.
<br>+ * annotation's end offset, we add blank lines.
<br> */
<br> Annotation lastEditAnnotation = null;
<br>
<br>+ /*
<br>+ * In case Edit annotation E2 follows another Edit annotation E1 and incase
<br>+ * the E1's preference for blank lines after it is not equal to the E2's
<br>+ * preference for blank lines before it, we choose the higher value.
<br>+ * The following variable is used for remembering the preference of E1's
<br>+ * blank lines after the E1 annotation. Later, this is used when deciding
<br>+ * the number of blank lines to preserve before the E2.
<br>+ */
<br>+ int minBLsToPreserve = 0;
<br>+
<br> // processing one annotation at time
<br> for(Annotation currentAnnotation : annotationsToProcess) {
<br>-
<br>+
<br> // offsets
<br> int startOffset = currentAnnotation.getStartNode().getOffset().intValue();
<br> int endOffset = currentAnnotation.getEndNode().getOffset().intValue();
<br>-
<br>+
<br> /*
<br> * before we add any further content,
<br>- * check if we need to add new lines for the lastEditAnnotation.
<br>+ * check if we need to add blank lines for the lastEditAnnotation.
<br> * This happens when 1) we come across a wrap annotation that has same
<br> * end offset as the end offset of the lastEditAnnotation (this condition
<br> * is checked later when the Wrap annotation is processed) and
<br>@@ -238,8 +248,12 @@
<br> lastEditAnnotation.getEndNode().getOffset().intValue();
<br>
<br> if(startOffset >= lastEditAnnotationEndOffset) {
<br>- nlsAdded = nlsAfterAnnotation(formattedBuffer, lastEditAnnotation,
<br>+ blsPreserved = blsAfterAnnotation(formattedBuffer, lastEditAnnotation,
<br> formattedBuffer.length());
<br>+
<br>+ // at least this many nls must be preserved
<br>+ minBLsToPreserve = blsPreserved;
<br>+
<br> lastEditAnnotation = null;
<br> }
<br> }
<br>@@ -247,19 +261,31 @@
<br> // see if there's any content not annotated in the document (e.g. verbatim
<br> // tables etc? copy the text over to the new string
<br> int numCharsToCopy = startOffset - contentCopiedTill;
<br>+
<br> if(numCharsToCopy > 0) {
<br>+
<br>+ // content to copy
<br>+ String contentToCopy = content.substring(contentCopiedTill, startOffset);
<br>+
<br>+ // if the content we added does not have only new AND/OR blank lines in
<br>+ // it
<br>+ if(contentToCopy.replaceAll("\n","").length() > 0) {
<br>+ minBLsToPreserve = 0;
<br>+ }
<br>+
<br> // copying from original content to the new content
<br>- formattedBuffer.append(
<br>- content.substring(contentCopiedTill, startOffset));
<br>-
<br>+ formattedBuffer.append(contentToCopy);
<br>+
<br> // contents copied till the startOffset of the current annotation
<br> contentCopiedTill = startOffset;
<br>+
<br>+ // if need be, where to add blank lines to or remove from
<br>+ blPosition = formattedBuffer.length();
<br>
<br>- // if need be, where to add new lines to or remove from
<br>- nlPosition = formattedBuffer.length();
<br>-
<br>- // at the end of string copy, we don't have any nls added
<br>- nlsAdded = 0;
<br>+ // the content we are adding could be ending with a new line that
<br>+ // results into a new blank line. Therefore we need to count how many
<br>+ // blank lines are there after our addition
<br>+ blsPreserved = countTrailingBLs(formattedBuffer);
<br> }
<br>
<br> // if it is a wrap annotation
<br>@@ -275,30 +301,29 @@
<br> // wrap the content
<br> wrap(wrapRange, 0, wrapRange.length(), indentLevel, 79);
<br>
<br>- // if need be, where to add new lines
<br>- nlPosition = formattedBuffer.length();
<br>+ // if need be, where to add blank lines
<br>+ blPosition = formattedBuffer.length();
<br>
<br> // append the wrapped text
<br> formattedBuffer.append(wrapRange);
<br>
<br> // if the endoffset of the wrap annotation is same as the
<br> // endoffset of the last edit annotation, this is where we
<br>- // add new lines
<br>+ // add blank lines
<br> if(lastEditAnnotation != null) {
<br> int lastEditAnnotationEndOffset =
<br> lastEditAnnotation.getEndNode().getOffset().intValue();
<br>-
<br>+
<br> // only if the current wrap annotation ends at the same place
<br> // where the edit annotation ended
<br> if(lastEditAnnotationEndOffset == endOffset) {
<br>- nlsAdded = nlsAfterAnnotation(formattedBuffer, lastEditAnnotation,
<br>+ blsPreserved = blsAfterAnnotation(formattedBuffer, lastEditAnnotation,
<br> formattedBuffer.length());
<br>+ minBLsToPreserve = blsPreserved;
<br> lastEditAnnotation = null;
<br> } else if(endOffset > lastEditAnnotationEndOffset) {
<br> log.error("Overlapping " + WRAP_AT +
<br> " annotation found at position "+startOffset);
<br>- /*throw new RuntimeException("Overlapping " + WRAP_AT +
<br>- " annotation found at position "+startOffset);*/
<br> }
<br> }
<br>
<br>@@ -307,16 +332,19 @@
<br>
<br> } else if(currentAnnotation.getType().equals(EDIT_AT)) {
<br>
<br>- // add new lines before the annotation here
<br>- nlsBeforeAnnotation(formattedBuffer, currentAnnotation, nlPosition,
<br>- nlsAdded);
<br>+ // add blank lines before the annotation here
<br>+ blsBeforeAnnotation(formattedBuffer, currentAnnotation, blPosition,
<br>+ blsPreserved, minBLsToPreserve);
<br>
<br>- //reset nlsAdded
<br>- nlsAdded = 0;
<br>+ //reset blsPreserved
<br>+ blsPreserved = 0;
<br>
<br>+ // reset this variable as well
<br>+ minBLsToPreserve = 0;
<br>+
<br> // remember last seen edit annotation
<br> lastEditAnnotation = currentAnnotation;
<br>- }
<br>+ } //else if
<br>
<br> }// for
<br>
<br>@@ -326,11 +354,38 @@
<br> }
<br>
<br> // replacing the original content with the new one
<br>- content.replace(0, content.length(), formattedBuffer.toString());
<br>+ // remove any leading and trailing spaces in the formattedBuffer
<br>+ content.replace(0, content.length(), formattedBuffer.toString().trim());
<br>
<br> } // formatDocument(Document, StringBuilder)
<br>
<br>+
<br> /**
<br>+ * This method counts the number of consecutive *blank* lines appearing
<br>+ * at the end of the content parameter.
<br>+ *
<br>+ * @param content
<br>+ * @return number of BLs
<br>+ */
<br>+ private static int countTrailingBLs(StringBuilder content) {
<br>+ // empty content
<br>+ if(content.length() == 0) return 0;
<br>+
<br>+ int i = content.length() - 1;
<br>+ char ch = content.charAt(i);
<br>+ int nlCounter = 0;
<br>+ while(ch == '\n') {
<br>+ nlCounter++;
<br>+ i--;
<br>+ if(i < 0) break;
<br>+ ch = content.charAt(i);
<br>+ }
<br>+
<br>+ if(nlCounter == 0) return 0;
<br>+ else return nlCounter - 1;
<br>+ } //countTrailingBLs(StringBuilder)
<br>+
<br>+ /**
<br> * This method counts the indentLevel by looking for white-spaces
<br> * at the start of the first line.
<br> *
<br>@@ -362,18 +417,19 @@
<br> } // calculateIndentLevel(StringBuilder)
<br>
<br> /**
<br>- * Removes new lines where more than desired and adds where too few
<br>+ * Removes blank lines where more than desired and adds where too few
<br> *
<br> * @param content
<br>- * content of the document that should be formatted for new lines
<br>+ * content of the document that should be formatted for blank lines
<br> * @param a
<br>- * Edit annotation which contains information about new lines
<br>+ * Edit annotation which contains information about blank lines
<br> * before and after the annotations (as counted in the original
<br> * document).
<br> * @param insertAt
<br>- * position where the nls should be added or removed
<br>+ * position where the bls should be added or removed
<br>+ * @return number of blank lines preserved at the end of the annotation
<br> */
<br>- private static int nlsAfterAnnotation(StringBuilder content, Annotation a,
<br>+ private static int blsAfterAnnotation(StringBuilder content, Annotation a,
<br> int insertAt) {
<br>
<br> // type of the edit annotation we're editing
<br>@@ -404,31 +460,33 @@
<br> }
<br> }
<br>
<br>- // how many newlines were there already after the current annotation
<br>+ // how many blank lines were there already after the current annotation
<br> return numBlankLinesAfter;
<br>- } // nlsAfterAnnotation(StringBuilder, Annotation, int)
<br>+ } // blsAfterAnnotation(StringBuilder, Annotation, int)
<br>
<br> /**
<br>- * Removes new lines where more than desired and adds where too few
<br>+ * Removes blank lines where more than desired and adds where too few
<br> *
<br> * @param content
<br>- * content of the document that should be formatted for new lines
<br>+ * content of the document that should be formatted for blank lines
<br> * @param a
<br>- * Edit annotation which contains information about new lines
<br>+ * Edit annotation which contains information about blank lines
<br> * before and after the annotations (as counted in the original
<br> * document).
<br> * @param insertAt
<br> * position where the nls should be added or removed
<br>- * @param nlsToPreserve
<br>- * number of new lines must be preserved
<br>+ * @param blsToPreserve
<br>+ * number of blank lines must be preserved
<br>+ * @param minBLsToPreserve
<br>+ * minimum number of blank lines to preserve before the annotation a
<br> */
<br>- private static void nlsBeforeAnnotation(StringBuilder content, Annotation a,
<br>- int insertAt, int nlsToPreserve) {
<br>+ private static void blsBeforeAnnotation(StringBuilder content, Annotation a,
<br>+ int insertAt, int blsPreserved, int minBLsToPreserve) {
<br>
<br> // type of the edit annotation we're editing
<br> String aType = (String)a.getFeatures().get("type");
<br>
<br>- // obtain the information about desired min/max/norm new lines for this
<br>+ // obtain the information about desired min/max/norm blank lines for this
<br> // annotation type
<br> SpacesTable spaceTable = spacesTable.get(aType);
<br>
<br>@@ -438,15 +496,6 @@
<br> throw new RuntimeException("could not recognize " + EDIT_AT
<br> + " with type " + aType);
<br>
<br>- // number of blank lines before the current annotation
<br>- int numBlankLinesBefore =
<br>- (Integer)a.getFeatures().get(NUM_BLANK_LINES_BEFORE_FEATURE_NAME);
<br>-
<br>- // these many nls are already there.
<br>- // nlsAlready there give us the number of spaces added as a result of
<br>- // previous Edit annotation
<br>- numBlankLinesBefore += nlsToPreserve;
<br>-
<br> // normal spaces for this annotation
<br> int normSpacesBefore = spaceTable.getNormSpacesBefore();
<br>
<br>@@ -454,21 +503,21 @@
<br> // while processing SectionHead, say we added/left 2 new lines after it;
<br> // now while processing Paragraph, it says that there should be 1 nl before;
<br> // we take the value whichever is the larger
<br>- if(nlsToPreserve > normSpacesBefore) {
<br>- normSpacesBefore = nlsToPreserve;
<br>+ if(minBLsToPreserve > normSpacesBefore) {
<br>+ normSpacesBefore = minBLsToPreserve;
<br> }
<br>
<br> // nls before the current annotation should be edited only
<br> // if it is not between the min and max desired spaces
<br>- if(numBlankLinesBefore < spaceTable.getMinSpacesBefore()) {
<br>- int nlToAdd = normSpacesBefore - numBlankLinesBefore;
<br>+ if(blsPreserved < spaceTable.getMinSpacesBefore()) {
<br>+ int nlToAdd = normSpacesBefore - blsPreserved;
<br> insertNL(content, nlToAdd, insertAt-1);
<br>- } else if(numBlankLinesBefore > spaceTable.getMaxSpacesBefore()) {
<br>- int nlToRemove = numBlankLinesBefore - normSpacesBefore;
<br>+ } else if(blsPreserved > spaceTable.getMaxSpacesBefore()) {
<br>+ int nlToRemove = blsPreserved - normSpacesBefore;
<br> removeNL(content, nlToRemove, insertAt-1, true);
<br> }
<br>
<br>- } // nlsBeforeAnnotation(StringBuilder, Annotation, int, int)
<br>+ } // blsBeforeAnnotation(StringBuilder, Annotation, int, int, int)
<br>
<br> /**
<br> * Removes new lines (represented by nlToRemove) at the specified position
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26744467&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26743768[gatewiki-commits] SF.net SVN: gatewiki:[2113] trunk/cow/grails-app/services/PageService. groovy2009-12-11T04:48:51Z2009-12-11T04:48:51Zian_robertsRevision: 2113
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2113&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2113&view=rev</a><br>Author: ian_roberts
<br>Date: 2009-12-11 12:48:51 +0000 (Fri, 11 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Forgot about workstation mode... Now only does a repository delete and update
<br>in server mode; workstation mode just schedules files for deletion in the
<br>sandbox.
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/grails-app/services/PageService.groovy
<br><br>Modified: trunk/cow/grails-app/services/PageService.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/services/PageService.groovy 2009-12-11 12:06:25 UTC (rev 2112)
<br>+++ trunk/cow/grails-app/services/PageService.groovy 2009-12-11 12:48:51 UTC (rev 2113)
<br>@@ -751,14 +751,21 @@
<br>
<br> filesToDelete.addAll(yamsToDelete)
<br>
<br>- // delete the files from the repository
<br>- sandbox.deleteFromRepository(
<br>- (filesToDelete.collect {
<br>- sandbox.getRepositoryURL(new File(directory, it))
<br>- }) as SVNURL[], "PageService.deleteFiles called by user ${flow.user}")
<br>- // update the files in the sandbox
<br>- filesToDelete.each {
<br>- sandbox.update(new File(directory, it), SVNRevision.HEAD, true)
<br>+ if(conf.mode == "server") {
<br>+ // delete the files from the repository
<br>+ sandbox.deleteFromRepository(
<br>+ (filesToDelete.collect {
<br>+ sandbox.getRepositoryURL(new File(directory, it))
<br>+ }) as SVNURL[], "PageService.deleteFiles called by user ${flow.user}")
<br>+ // update the files in the sandbox
<br>+ filesToDelete.each {
<br>+ sandbox.update(new File(directory, it), SVNRevision.HEAD, true)
<br>+ }
<br>+ } else {
<br>+ // workstation mode, just schedule for deletion
<br>+ filesToDelete.each {
<br>+ sandbox.delete(new File(directory, it), false)
<br>+ }
<br> }
<br>
<br> return true
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26743768&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26743099[gatewiki-commits] SF.net SVN: gatewiki:[2112] trunk/cow/web-app/css/page.css2009-12-11T04:06:26Z2009-12-11T04:06:26Zian_robertsRevision: 2112
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2112&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2112&view=rev</a><br>Author: ian_roberts
<br>Date: 2009-12-11 12:06:25 +0000 (Fri, 11 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Playing with CSS positioning to get all the file names and icons in a directory
<br>listing to line up vertically, with their delete checkboxes (if any) to the
<br>left of the icon.
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/web-app/css/page.css
<br><br>Modified: trunk/cow/web-app/css/page.css
<br>===================================================================
<br>--- trunk/cow/web-app/css/page.css 2009-12-11 12:05:22 UTC (rev 2111)
<br>+++ trunk/cow/web-app/css/page.css 2009-12-11 12:06:25 UTC (rev 2112)
<br>@@ -230,8 +230,9 @@
<br> }
<br>
<br> ul.dirList li {
<br>- padding-left: 20px;
<br>- background-position: center left;
<br>+ position: relative;
<br>+ padding: 2px 0 2px 42px;
<br>+ background-position: 22px center;
<br> background-repeat: no-repeat;
<br> background-image: url(../_images/filetypes/unknown.png);
<br> }
<br>@@ -263,7 +264,9 @@
<br> }
<br>
<br> ul.dirList li span.deleteCheckbox {
<br>- width: 20px;
<br>+ display: block;
<br>+ position: absolute;
<br>+ left: 0;
<br> }
<br>
<br> /* Menu support */
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26743099&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26743090[gatewiki-commits] SF.net SVN: gatewiki:[2111] trunk/cow/grails-app2009-12-11T04:05:22Z2009-12-11T04:05:22Zian_robertsRevision: 2111
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2111&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2111&view=rev</a><br>Author: ian_roberts
<br>Date: 2009-12-11 12:05:22 +0000 (Fri, 11 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Moved the logic to check whether user has "show" permission for each entry in a
<br>directory listing into the controller, so removing the duplicated code from the
<br>dirList template. Also don't show a delete checkbox for '..'.
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/grails-app/controllers/PageController.groovy
<br> trunk/cow/grails-app/views/page/_dirList.gsp
<br><br>Modified: trunk/cow/grails-app/controllers/PageController.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/controllers/PageController.groovy 2009-12-10 15:58:16 UTC (rev 2110)
<br>+++ trunk/cow/grails-app/controllers/PageController.groovy 2009-12-11 12:05:22 UTC (rev 2111)
<br>@@ -87,7 +87,11 @@
<br> return [:]
<br> } else if(thisPage.isDirNoIndex || params.type == "dir") { // dir listing
<br> if(thisPage.wiki.directoryListingAllowed) {
<br>- thisPage.dirList = pageService.getDirList(pageFile, thisPage.wiki)
<br>+ thisPage.dirList = pageService.getDirList(pageFile, thisPage.wiki).findAll {
<br>+ // only include entries the user is allowed to see
<br>+ securityService.checkPermission("page", "show", "${thisPage.wiki.id}",
<br>+ thisPage.pagePathDir + it[0])
<br>+ }
<br> pageBody = renderTemplate("dirList", [ thisPage : thisPage ])
<br> pageLinks = renderTemplate("dirLinks", [ thisPage : thisPage ])
<br> // TODO what is this doing here? shouldn't it be in PS.analyse?
<br><br>Modified: trunk/cow/grails-app/views/page/_dirList.gsp
<br>===================================================================
<br>--- trunk/cow/grails-app/views/page/_dirList.gsp 2009-12-10 15:58:16 UTC (rev 2110)
<br>+++ trunk/cow/grails-app/views/page/_dirList.gsp 2009-12-11 12:05:22 UTC (rev 2111)
<br>@@ -5,34 +5,19 @@
<br> <form action="${g.pageURI(controller:'page', action:'delete', id:thisPage.wiki.id, linkPath:thisPage.pagePathDir)}" method="POST">
<br> <ul class="dirList">
<br> <g:each in="${thisPage.dirList}" var="dirEntry">
<br>- <g:if test="${dirEntry[1] != 'ft_directory'}">
<br>- <!-- WARNING: duplicated code branch follows -->
<br>- <li class="${dirEntry[1]}">
<br>- <span class="deleteCheckbox">
<br>+ <li class="${dirEntry[1]}">
<br>+ <span class="deleteCheckbox">
<br>+ <%-- do not show a delete checkbox for parent directory --%>
<br>+ <g:if test="${dirEntry[0] != '..'}">
<br> <%-- Only show delete checkbox on files you are allowed to delete --%>
<br> <cow:hasPermission wiki="${thisPage.wiki.id}" actions="delete" pagePath="${thisPage.pagePathDir + dirEntry[0]}">
<br> <g:set var="someDeletes" value="${true}" />
<br> <input type="checkbox" name="filesToDelete" value="${dirEntry[0].encodeAsHTML()}"></input>
<br> </cow:hasPermission>
<br>- </span>
<br>- <a href="${(dirEntry[0] - ~/\/$/).encodeAsURL()}">${dirEntry[0].encodeAsHTML()}</a>
<br>- </li>
<br>- </g:if>
<br>- <g:else>
<br>- <cow:hasPermission wiki="${thisPage.wiki.id}" actions="show" pagePathDir="${thisPage.pagePathDir + dirEntry[0]}">
<br>- <!-- WARNING: duplicated code branch follows -->
<br>- <li class="${dirEntry[1]}">
<br>- <span class="deleteCheckbox">
<br>- <%-- Only show delete checkbox on files you are allowed to delete --%>
<br>- <cow:hasPermission wiki="${thisPage.wiki.id}" actions="delete" pagePath="${thisPage.pagePathDir + dirEntry[0]}">
<br>- <g:set var="someDeletes" value="${true}" />
<br>- <input type="checkbox" name="filesToDelete" value="${dirEntry[0].encodeAsHTML()}"></input>
<br>- </cow:hasPermission>
<br>- </span>
<br>- <a href="${(dirEntry[0] - ~/\/$/).encodeAsURL()}">${dirEntry[0].encodeAsHTML()}</a>
<br>- </li>
<br>- </cow:hasPermission>
<br>- </g:else>
<br>+ </g:if>
<br>+ </span>
<br>+ <a href="${(dirEntry[0] - ~/\/$/).encodeAsURL()}">${dirEntry[0].encodeAsHTML()}</a>
<br>+ </li>
<br> </g:each>
<br> </ul>
<br>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26743090&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26729804[gatewiki-commits] SF.net SVN: gatewiki:[2110] trunk/cow/grails-app2009-12-10T07:58:17Z2009-12-10T07:58:17Zian_robertsRevision: 2110
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2110&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2110&view=rev</a><br>Author: ian_roberts
<br>Date: 2009-12-10 15:58:16 +0000 (Thu, 10 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Delete flow.
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/grails-app/controllers/PageController.groovy
<br> trunk/cow/grails-app/i18n/cow.properties
<br> trunk/cow/grails-app/services/PageService.groovy
<br> trunk/cow/grails-app/views/page/_dirList.gsp
<br><br>Added Paths:
<br>-----------
<br> trunk/cow/grails-app/views/page/_deletedFiles.gsp
<br> trunk/cow/grails-app/views/page/_forbiddenFiles.gsp
<br> trunk/cow/grails-app/views/page/delete/confirm.gsp
<br> trunk/cow/grails-app/views/page/delete/errorExit.gsp
<br> trunk/cow/grails-app/views/page/delete/normalExit.gsp
<br><br>Modified: trunk/cow/grails-app/controllers/PageController.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/controllers/PageController.groovy 2009-12-10 12:47:15 UTC (rev 2109)
<br>+++ trunk/cow/grails-app/controllers/PageController.groovy 2009-12-10 15:58:16 UTC (rev 2110)
<br>@@ -777,7 +777,13 @@
<br>
<br> Map thisPage = pageService.analyse(params)
<br> flow.asMap().putAll(thisPage)
<br>- flow.filesToDelete = params.filesToDelete
<br>+ flow.user = (securityService.username) ?: new File(conf.user.home).name
<br>+ // flatten trick to work with either a single String or a List
<br>+ flow.filesToDelete = [params.filesToDelete].flatten()
<br>+ if(!flow.filesToDelete) {
<br>+ flow.message = g.message(code:'cow.delete.nothing.selected')
<br>+ return error()
<br>+ }
<br> }
<br> on("success") { log.debug("triage -> confirm") }.to "confirm"
<br> on("error") { log.debug("triage -> errorExit") }.to "errorExit"
<br>@@ -791,7 +797,13 @@
<br>
<br> doDelete {
<br> action {
<br>- if(!pageService.deleteFiles(flow)) {
<br>+ if(pageService.deleteFiles(flow)) {
<br>+ flow.message = g.render(template:'deletedFiles', model:[flow:flow])
<br>+ return success()
<br>+ } else {
<br>+ if(flow.forbiddenFiles) {
<br>+ flow.errMessage = g.render(template:'forbiddenFiles', model:[flow:flow])
<br>+ }
<br> return error()
<br> }
<br> }
<br><br>Modified: trunk/cow/grails-app/i18n/cow.properties
<br>===================================================================
<br>--- trunk/cow/grails-app/i18n/cow.properties 2009-12-10 12:47:15 UTC (rev 2109)
<br>+++ trunk/cow/grails-app/i18n/cow.properties 2009-12-10 15:58:16 UTC (rev 2110)
<br>@@ -18,6 +18,9 @@
<br> cow.new.page.title=New page name
<br> cow.raw.html.disallowed=You do not have permission to view this (raw HTML) file - please contact your site administrator.
<br> cow.staging.file.modified=Previous failed edit detected. The text you are editing may not match what you saw on the wiki page. If you click cancel, the failed edit will be abandoned and you can edit again to get a fresh copy of the page.
<br>+cow.delete.nothing.selected=No files selected for deletion
<br>+cow.delete.forbidden.dirs=You do not have permission to delete the following\:
<br>+cow.delete.successful=Successfully deleted\:
<br>
<br> # SvnAuthController messages
<br> cow.svnauth.password.set=A password is set
<br><br>Modified: trunk/cow/grails-app/services/PageService.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/services/PageService.groovy 2009-12-10 12:47:15 UTC (rev 2109)
<br>+++ trunk/cow/grails-app/services/PageService.groovy 2009-12-10 15:58:16 UTC (rev 2110)
<br>@@ -717,6 +717,83 @@
<br> } // createDirectory(Map, Sandbox)
<br>
<br> /**
<br>+ * Attempt to delete a set of files, checking (recursively) whether the user
<br>+ * has permission to do so. Returns false on failure, setting
<br>+ * flow.errMessage.
<br>+ */
<br>+ boolean deleteFiles(flow) throws SVNException {
<br>+ File directory = flow.pageFileDir
<br>+ List filesToDelete = flow.filesToDelete
<br>+
<br>+ List forbiddenFiles = []
<br>+ filesToDelete.each { f ->
<br>+ findForbiddenFiles(flow.wiki, "page", "delete", new File(directory, f), forbiddenFiles)
<br>+ }
<br>+
<br>+ if(forbiddenFiles) {
<br>+ flow.forbiddenFiles = forbiddenFiles
<br>+ return false
<br>+ }
<br>+
<br>+ // get the sandbox for the current wiki area
<br>+ Sandbox sandbox = sandboxManager.getSandbox(flow.wiki.path)
<br>+
<br>+ List yamsToDelete = []
<br>+ filesToDelete.each { name ->
<br>+ // for HTML files, delete the corresponding .yam as well, if one exists
<br>+ if(name.endsWith('.html')) {
<br>+ File yamFile = new File(directory, name.substring(0, name.lastIndexOf('.')) + '.yam')
<br>+ if(yamFile.isFile()) {
<br>+ yamsToDelete << yamFile.name
<br>+ }
<br>+ }
<br>+ }
<br>+
<br>+ filesToDelete.addAll(yamsToDelete)
<br>+
<br>+ // delete the files from the repository
<br>+ sandbox.deleteFromRepository(
<br>+ (filesToDelete.collect {
<br>+ sandbox.getRepositoryURL(new File(directory, it))
<br>+ }) as SVNURL[], "PageService.deleteFiles called by user ${flow.user}")
<br>+ // update the files in the sandbox
<br>+ filesToDelete.each {
<br>+ sandbox.update(new File(directory, it), SVNRevision.HEAD, true)
<br>+ }
<br>+
<br>+ return true
<br>+ }
<br>+
<br>+ /**
<br>+ * Determine whether the current user has the requested permission on the
<br>+ * given file and (if the File represents a directory) all its descendants.
<br>+ * If the user does <b>not</b> have permission on the given file then the
<br>+ * file is added to the forbiddenFiles list. Otherwise if the File
<br>+ * represents a directory this method is called recursively for all the
<br>+ * directory's immediate subdirectories (excluding .svn). Note that if the
<br>+ * user does not have the required permission on this file its subdirectories
<br>+ * are not scanned.
<br>+ */
<br>+ private void findForbiddenFiles(wiki, controllerName, actions, File f, List forbiddenFiles) {
<br>+ // check self
<br>+ def path = f.absolutePath - wiki.path
<br>+ if(path.startsWith('/')) {
<br>+ path = path - '/'
<br>+ }
<br>+
<br>+ if(!securityService.checkPermission(controllerName, actions, "${wiki.id}", path)) {
<br>+ forbiddenFiles << f
<br>+ } else if(f.isDirectory()) {
<br>+ // recurse for children (except for ., .. and .svn)
<br>+ f.eachDir { subDir ->
<br>+ if(subDir.name != '.svn' && subDir.name != '.' && subDir.name != '..') {
<br>+ findForbiddenFiles(wiki, controllerName, actions, subDir, forbiddenFiles)
<br>+ }
<br>+ }
<br>+ }
<br>+ }
<br>+
<br>+ /**
<br> * Create a new YAM page. Returns false on error and sets
<br> * thisPage.errMessage.
<br> */
<br>@@ -905,6 +982,9 @@
<br> /** Tasks related to Dependencies. */
<br> def dependenciesService
<br>
<br>+ /** Security service, used for permission checks. */
<br>+ def securityService
<br>+
<br> /** get the spring message resource bundle */
<br> def messageSource
<br>
<br><br>Added: trunk/cow/grails-app/views/page/_deletedFiles.gsp
<br>===================================================================
<br>--- trunk/cow/grails-app/views/page/_deletedFiles.gsp (rev 0)
<br>+++ trunk/cow/grails-app/views/page/_deletedFiles.gsp 2009-12-10 15:58:16 UTC (rev 2110)
<br>@@ -0,0 +1,6 @@
<br>+<g:message code="cow.delete.successful" />
<br>+<ul>
<br>+ <g:each in="${flow.filesToDelete}">
<br>+ <li>${it}</li>
<br>+ </g:each>
<br>+</ul>
<br><br>Modified: trunk/cow/grails-app/views/page/_dirList.gsp
<br>===================================================================
<br>--- trunk/cow/grails-app/views/page/_dirList.gsp 2009-12-10 12:47:15 UTC (rev 2109)
<br>+++ trunk/cow/grails-app/views/page/_dirList.gsp 2009-12-10 15:58:16 UTC (rev 2110)
<br>@@ -1,6 +1,8 @@
<br> <%@ page import="gate.util.FileUtils" %>
<br> <h2>Directory: ${thisPage.pagePathDir.encodeAsHTML()}</h2>
<br>
<br>+<g:set var="someDeletes" value="${false}" />
<br>+<form action="${g.pageURI(controller:'page', action:'delete', id:thisPage.wiki.id, linkPath:thisPage.pagePathDir)}" method="POST">
<br> <ul class="dirList">
<br> <g:each in="${thisPage.dirList}" var="dirEntry">
<br> <g:if test="${dirEntry[1] != 'ft_directory'}">
<br>@@ -9,7 +11,8 @@
<br> <span class="deleteCheckbox">
<br> <%-- Only show delete checkbox on files you are allowed to delete --%>
<br> <cow:hasPermission wiki="${thisPage.wiki.id}" actions="delete" pagePath="${thisPage.pagePathDir + dirEntry[0]}">
<br>- <input type="checkbox" name="delete_${dirEntry[0]}"></input>
<br>+ <g:set var="someDeletes" value="${true}" />
<br>+ <input type="checkbox" name="filesToDelete" value="${dirEntry[0].encodeAsHTML()}"></input>
<br> </cow:hasPermission>
<br> </span>
<br> <a href="${(dirEntry[0] - ~/\/$/).encodeAsURL()}">${dirEntry[0].encodeAsHTML()}</a>
<br>@@ -22,7 +25,8 @@
<br> <span class="deleteCheckbox">
<br> <%-- Only show delete checkbox on files you are allowed to delete --%>
<br> <cow:hasPermission wiki="${thisPage.wiki.id}" actions="delete" pagePath="${thisPage.pagePathDir + dirEntry[0]}">
<br>- <input type="checkbox" name="delete_${dirEntry[0]}"></input>
<br>+ <g:set var="someDeletes" value="${true}" />
<br>+ <input type="checkbox" name="filesToDelete" value="${dirEntry[0].encodeAsHTML()}"></input>
<br> </cow:hasPermission>
<br> </span>
<br> <a href="${(dirEntry[0] - ~/\/$/).encodeAsURL()}">${dirEntry[0].encodeAsHTML()}</a>
<br>@@ -31,3 +35,8 @@
<br> </g:else>
<br> </g:each>
<br> </ul>
<br>+
<br>+<g:if test="${someDeletes}">
<br>+ <p><g:submitButton name="delete" value="Delete selected" /></p>
<br>+</g:if>
<br>+</form>
<br><br>Added: trunk/cow/grails-app/views/page/_forbiddenFiles.gsp
<br>===================================================================
<br>--- trunk/cow/grails-app/views/page/_forbiddenFiles.gsp (rev 0)
<br>+++ trunk/cow/grails-app/views/page/_forbiddenFiles.gsp 2009-12-10 15:58:16 UTC (rev 2110)
<br>@@ -0,0 +1,6 @@
<br>+<g:message code="cow.delete.forbidden.dirs" />
<br>+<ul>
<br>+ <g:each in="${flow.forbiddenFiles}">
<br>+ <li>${it.absolutePath - flow.wiki.path}</li>
<br>+ </g:each>
<br>+</ul>
<br><br>Added: trunk/cow/grails-app/views/page/delete/confirm.gsp
<br>===================================================================
<br>--- trunk/cow/grails-app/views/page/delete/confirm.gsp (rev 0)
<br>+++ trunk/cow/grails-app/views/page/delete/confirm.gsp 2009-12-10 15:58:16 UTC (rev 2110)
<br>@@ -0,0 +1,28 @@
<br>+<html>
<br>+ <head>
<br>+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<br>+ <g:layoutLink id="${id}"/>
<br>+ <g:cowTitle pageName="Delete files" />
<br>+ </head>
<br>+ <body>
<br>+ <h1>Confirm deletion</h1>
<br>+
<br>+ <g:render template="/messages" model="${pageScope.variables}" />
<br>+
<br>+ <form action="${pageURI(action:'delete', id:id, linkPath:pagePath)}" method="post">
<br>+ <input type="hidden" name="execution" value="${request['flowExecutionKey']}" id="execution" />
<br>+
<br>+ <p>You selected the following files to delete:</p>
<br>+ <ul>
<br>+ <g:each in="${filesToDelete}">
<br>+ <li>${it.encodeAsHTML()}</li>
<br>+ </g:each>
<br>+ </ul>
<br>+
<br>+ <p>Are you sure?
<br>+ <g:submitButton name="confirm" value="Yes" />
<br>+ <g:submitButton name="cancel" value="No" />
<br>+ </p>
<br>+ </form>
<br>+ </body>
<br>+</html>
<br><br>Added: trunk/cow/grails-app/views/page/delete/errorExit.gsp
<br>===================================================================
<br>--- trunk/cow/grails-app/views/page/delete/errorExit.gsp (rev 0)
<br>+++ trunk/cow/grails-app/views/page/delete/errorExit.gsp 2009-12-10 15:58:16 UTC (rev 2110)
<br>@@ -0,0 +1,7 @@
<br>+<%
<br>+ flash.message = message
<br>+ flash.errMessage = errMessage
<br>+ g.handleWebFlowException(exception:rootCauseException)
<br>+ response.sendRedirect(pageURI(action:'show', id:id, linkPath:pagePathDir, query:'type=dir'))
<br>+
<br>+%>
<br><br>Added: trunk/cow/grails-app/views/page/delete/normalExit.gsp
<br>===================================================================
<br>--- trunk/cow/grails-app/views/page/delete/normalExit.gsp (rev 0)
<br>+++ trunk/cow/grails-app/views/page/delete/normalExit.gsp 2009-12-10 15:58:16 UTC (rev 2110)
<br>@@ -0,0 +1,5 @@
<br>+<%
<br>+ flash.message = message
<br>+ flash.errMessage = errMessage
<br>+ response.sendRedirect(pageURI(action:'show', id:id, linkPath:pagePath, query:'type=dir'))
<br>+%>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26729804&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26726666[gatewiki-commits] SF.net SVN: gatewiki:[2109] trunk/cow/grails-app/controllers/ ContactController.groovy2009-12-10T04:47:17Z2009-12-10T04:47:17Zhcunningham-2Revision: 2109
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2109&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2109&view=rev</a><br>Author: hcunningham
<br>Date: 2009-12-10 12:47:15 +0000 (Thu, 10 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>do not copy the recipient on the emails
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/grails-app/controllers/ContactController.groovy
<br><br>Modified: trunk/cow/grails-app/controllers/ContactController.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/controllers/ContactController.groovy 2009-12-10 12:43:28 UTC (rev 2108)
<br>+++ trunk/cow/grails-app/controllers/ContactController.groovy 2009-12-10 12:47:15 UTC (rev 2109)
<br>@@ -89,7 +89,6 @@
<br>
<br> //copy all the recipients from from conf.contact.to address
<br> List recipients = new ArrayList<String>(conf.contact.to)
<br>- recipients.add(params.email)
<br>
<br> // attach prefix to subject
<br> def sub = conf.contact.subject.prefix + params.subject
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26726666&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26726627[gatewiki-commits] SF.net SVN: gatewiki:[2108] trunk/cow/application.properties2009-12-10T04:43:41Z2009-12-10T04:43:41Zhcunningham-2Revision: 2108
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2108&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2108&view=rev</a><br>Author: hcunningham
<br>Date: 2009-12-10 12:43:28 +0000 (Thu, 10 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>now on 1.1 snapshots
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/application.properties
<br><br>Modified: trunk/cow/application.properties
<br>===================================================================
<br>--- trunk/cow/application.properties 2009-12-10 12:39:02 UTC (rev 2107)
<br>+++ trunk/cow/application.properties 2009-12-10 12:43:28 UTC (rev 2108)
<br>@@ -2,7 +2,7 @@
<br> #Thu Dec 03 10:55:00 GMT 2009
<br> app.name=cow
<br> app.grails.version=1.1.1
<br>-app.version=1.0
<br>+app.version=1.1-snapshot
<br> plugins.hibernate=1.1.1
<br> plugins.jcaptcha=1.0
<br> plugins.jsecurity=0.4.1
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26726627&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26726556[gatewiki-commits] SF.net SVN: gatewiki:[2107] branches/gatewiki-1.0/2009-12-10T04:39:02Z2009-12-10T04:39:02Zhcunningham-2Revision: 2107
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2107&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2107&view=rev</a><br>Author: hcunningham
<br>Date: 2009-12-10 12:39:02 +0000 (Thu, 10 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>tagging the 1.0 version
<br><br>Added Paths:
<br>-----------
<br> branches/gatewiki-1.0/
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26726556&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26696465[gatewiki-commits] SF.net SVN: gatewiki:[2106] trunk/cow/web-app/css/page.css2009-12-08T08:20:51Z2009-12-08T08:20:51Zhcunningham-2Revision: 2106
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2106&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2106&view=rev</a><br>Author: hcunningham
<br>Date: 2009-12-08 16:20:51 +0000 (Tue, 08 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>restore bold of top-level menu fonts
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/web-app/css/page.css
<br><br>Modified: trunk/cow/web-app/css/page.css
<br>===================================================================
<br>--- trunk/cow/web-app/css/page.css 2009-12-08 16:06:25 UTC (rev 2105)
<br>+++ trunk/cow/web-app/css/page.css 2009-12-08 16:20:51 UTC (rev 2106)
<br>@@ -329,7 +329,8 @@
<br>
<br> .menu li {
<br> position: relative;
<br>- font: bold Verdana,Arial,sans-serif;
<br>+ font-family: Verdana,Arial,sans-serif;
<br>+ font-weight: bold;
<br> }
<br>
<br> /* Treat links nested in a <b> tag as submenus, to make it easier to define
<br>@@ -358,7 +359,8 @@
<br> }
<br>
<br> .menu ul ul li {
<br>- font: normal Verdana,Arial,sans-serif;
<br>+ font-family: Verdana,Arial,sans-serif;
<br>+ font-weight: normal;
<br> z-index: 300;
<br> }
<br>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26696465&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26696218[gatewiki-commits] SF.net SVN: gatewiki:[2105] trunk/cow/web-app/css/page.css2009-12-08T08:06:25Z2009-12-08T08:06:25Zhcunningham-2Revision: 2105
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2105&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2105&view=rev</a><br>Author: hcunningham
<br>Date: 2009-12-08 16:06:25 +0000 (Tue, 08 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>remove absolute size from menu fonts
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/web-app/css/page.css
<br><br>Modified: trunk/cow/web-app/css/page.css
<br>===================================================================
<br>--- trunk/cow/web-app/css/page.css 2009-12-08 15:38:45 UTC (rev 2104)
<br>+++ trunk/cow/web-app/css/page.css 2009-12-08 16:06:25 UTC (rev 2105)
<br>@@ -329,7 +329,7 @@
<br>
<br> .menu li {
<br> position: relative;
<br>- font: bold 14px Verdana,Arial,sans-serif;
<br>+ font: bold Verdana,Arial,sans-serif;
<br> }
<br>
<br> /* Treat links nested in a <b> tag as submenus, to make it easier to define
<br>@@ -358,7 +358,7 @@
<br> }
<br>
<br> .menu ul ul li {
<br>- font: normal 14px Verdana,Arial,sans-serif;
<br>+ font: normal Verdana,Arial,sans-serif;
<br> z-index: 300;
<br> }
<br>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26696218&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26695769[gatewiki-commits] SF.net SVN: gatewiki:[2104] trunk/cow/doc2009-12-08T07:38:45Z2009-12-08T07:38:45Zhcunningham-2Revision: 2104
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2104&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2104&view=rev</a><br>Author: hcunningham
<br>Date: 2009-12-08 15:38:45 +0000 (Tue, 08 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>last of the 1.0 jobs gone :-)
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/doc/cow-backlog.html
<br> trunk/cow/doc/cow-backlog.yam
<br> trunk/cow/doc/cow-done.html
<br> trunk/cow/doc/cow-done.yam
<br><br>Modified: trunk/cow/doc/cow-backlog.html
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.html 2009-12-08 15:37:03 UTC (rev 2103)
<br>+++ trunk/cow/doc/cow-backlog.html 2009-12-08 15:38:45 UTC (rev 2104)
<br>@@ -48,24 +48,15 @@
<br>
<br> <div class="cow-contents"><h2 class="cow-heading">Contents</h2>
<br> <p><ul>
<br>-<li><a href="#section-1.">1. Roadmap (version 1.1)</a></li>
<br>+<li><a href="#section-1.">1. Roadmap (version 1.1, early 2010)</a></li>
<br> <li><a href="#section-2.">2. Future Tasks</a></li>
<br> <li><a href="#section-3.">3. Completed Tasks</a></li>
<br> <li><a href="#section-4.">4. About this Document</a></li>
<br> </ul></p></div>
<br>
<br>
<br>-<ul>
<br>-<li>the redirect on gate.ac.uk/wiki assumes that we will leave JSP wiki running,
<br>- but this is probably confusing and not a good idea now that we moved all the
<br>- pages? redirect to /wiki instead? [IR]</li>
<br>-<li>merge in stuff from gate-server/html that has been added since the branch to
<br>- gau-main-tree (e.g. the projects dir has had new stuff...) [VT]</li>
<br>-</ul>
<br>-
<br>-
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br>-<a class="cow-section-anchor" name="section-1."></a><h1 class="cow-heading"><span class="cow-sec-number">1. </span>Roadmap (version 1.1)</h1>
<br>+<a class="cow-section-anchor" name="section-1."></a><h1 class="cow-heading"><span class="cow-sec-number">1. </span>Roadmap (version 1.1, early 2010)</h1>
<br>
<br> <p>TODO: reprioritise, pull in any pressing stuff from future tasks</p>
<br>
<br><br>Modified: trunk/cow/doc/cow-backlog.yam
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.yam 2009-12-08 15:37:03 UTC (rev 2103)
<br>+++ trunk/cow/doc/cow-backlog.yam 2009-12-08 15:38:45 UTC (rev 2104)
<br>@@ -5,15 +5,8 @@
<br> %contents
<br>
<br>
<br>-- the redirect on gate.ac.uk/wiki assumes that we will leave JSP wiki running,
<br>- but this is probably confusing and not a good idea now that we moved all the
<br>- pages? redirect to /wiki instead? [IR]
<br>-- merge in stuff from gate-server/html that has been added since the branch to
<br>- gau-main-tree (e.g. the projects dir has had new stuff...) [VT]
<br>-
<br>-
<br> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br>-%1 Roadmap (version 1.1)
<br>+%1 Roadmap (version 1.1, early 2010)
<br>
<br> TODO: reprioritise, pull in any pressing stuff from future tasks
<br>
<br><br>Modified: trunk/cow/doc/cow-done.html
<br>===================================================================
<br>--- trunk/cow/doc/cow-done.html 2009-12-08 15:37:03 UTC (rev 2103)
<br>+++ trunk/cow/doc/cow-done.html 2009-12-08 15:38:45 UTC (rev 2104)
<br>@@ -2554,5 +2554,8 @@
<br> query</li>
<br> </ul></li>
<br> </ul></li>
<br>+<li>merge in stuff from gate-server/html that has been added since the branch to
<br>+ gau-main-tree (e.g. the projects dir has had new stuff...) [VT] [done -
<br>+ nothing needed]</li>
<br> </ul>
<br> </body></html>
<br><br>Modified: trunk/cow/doc/cow-done.yam
<br>===================================================================
<br>--- trunk/cow/doc/cow-done.yam 2009-12-08 15:37:03 UTC (rev 2103)
<br>+++ trunk/cow/doc/cow-done.yam 2009-12-08 15:38:45 UTC (rev 2104)
<br>@@ -1777,3 +1777,6 @@
<br> - 4 pages only appeat in the gmane search: 5045, 5810, 5879, 6212
<br> - so there are at least 14 pages which are (possibly) relevant to the
<br> query
<br>+- merge in stuff from gate-server/html that has been added since the branch to
<br>+ gau-main-tree (e.g. the projects dir has had new stuff...) [VT] [done -
<br>+ nothing needed]
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26695769&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26695741[gatewiki-commits] SF.net SVN: gatewiki:[2103] trunk/site-plugins/gau/grails-app/views/layouts /cowguest.gsp2009-12-08T07:37:03Z2009-12-08T07:37:03Zhcunningham-2Revision: 2103
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2103&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2103&view=rev</a><br>Author: hcunningham
<br>Date: 2009-12-08 15:37:03 +0000 (Tue, 08 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>submenu under wiki
<br><br>Modified Paths:
<br>--------------
<br> trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp
<br><br>Modified: trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp
<br>===================================================================
<br>--- trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp 2009-12-08 13:59:13 UTC (rev 2102)
<br>+++ trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp 2009-12-08 15:37:03 UTC (rev 2103)
<br>@@ -153,7 +153,12 @@
<br> <ul>
<br> <li><a href="/userguide/">User guide</a></li>
<br> <li><a href="/mail/">Mailing list</a></li>
<br>- <li><a href="/wiki/">Wiki</a></li>
<br>+ <li><b><a href="/wiki/">Wiki</a></b>
<br>+ <ul>
<br>+ <li><a href="/wiki/jape-repository/">JAPE tips</a>
<br>+ <li><a href="/wiki/code-repository/">Example code</a>
<br>+ </ul>
<br>+ </li>
<br> <li><a href="/demos/developer-videos/">Screencams</a></li>
<br> <li><a href="/gate/doc/plugins.html">Core plugins</a></li>
<br> <li><a href="/sale/gate-flyer/2009/gate-flyer-4-page.pdf">Brochure</a></li>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26695741&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26694292[gatewiki-commits] SF.net SVN: gatewiki:[2102] trunk/cow/web-app/css/page.css2009-12-08T05:59:13Z2009-12-08T05:59:13ZmarkagreenwoodRevision: 2102
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2102&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2102&view=rev</a><br>Author: markagreenwood
<br>Date: 2009-12-08 13:59:13 +0000 (Tue, 08 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>added the banner classes from the old gate css file so that legacy content will be displayed correctly even if we don't use an iframe
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/web-app/css/page.css
<br><br>Modified: trunk/cow/web-app/css/page.css
<br>===================================================================
<br>--- trunk/cow/web-app/css/page.css 2009-12-08 13:14:09 UTC (rev 2101)
<br>+++ trunk/cow/web-app/css/page.css 2009-12-08 13:59:13 UTC (rev 2102)
<br>@@ -397,3 +397,31 @@
<br> #twitter_div {
<br> background: #EDEDED;
<br> }
<br>+
<br>+/* the following banner styles are from the old gate site so that we
<br>+ * can display legacy non-yam html in a similar style to before.
<br>+ * I'm guessing that once we have updated these pages to YAM then
<br>+ * these could be removed
<br>+ */
<br>+
<br>+div.banner {
<br>+ border: none;
<br>+ margin-right: 0px;
<br>+ margin-left: 0px;
<br>+ padding: 0.09em;
<br>+ text-align: center;
<br>+ font-weight: bold;
<br>+}
<br>+div.banner a:link, div.banner {
<br>+ background: #A0D0F0;
<br>+ color: #000000;
<br>+}
<br>+div.banner a:active {
<br>+ background: #000000;
<br>+ color: #FFFFFF;
<br>+}
<br>+div.banner a:hover {
<br>+ background: #000000;
<br>+ color: #FFFFFF;
<br>+}
<br>+
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26694292&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26693715[gatewiki-commits] SF.net SVN: gatewiki:[2101] trunk/cow/doc2009-12-08T05:14:10Z2009-12-08T05:14:10Zgate-projectRevision: 2101
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2101&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2101&view=rev</a><br>Author: gate-project
<br>Date: 2009-12-08 13:14:09 +0000 (Tue, 08 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>[nirajaswani] moved security related backlog item under the cow security header and added a new backlog item for nutch
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/doc/cow-backlog.html
<br> trunk/cow/doc/cow-backlog.yam
<br><br>Modified: trunk/cow/doc/cow-backlog.html
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.html 2009-12-08 11:40:29 UTC (rev 2100)
<br>+++ trunk/cow/doc/cow-backlog.html 2009-12-08 13:14:09 UTC (rev 2101)
<br>@@ -98,8 +98,6 @@
<br> <a class="cow-section-anchor" name="section-2."></a><h1 class="cow-heading"><span class="cow-sec-number">2. </span>Future Tasks</h1>
<br>
<br> <ul>
<br>-<li>we need to look at the SecurityService.groovy code to remove any redundant code.
<br>- Also we need to merge the three methods isPermitted, anonAllowed and checkForPermission some way.</li>
<br> <li>we should rethink how we preview non-YAM HTML files. At the moment we inject
<br> the head section into the preview page which means we can end up replacing values
<br> for base target and href which cause weird security problems</li>
<br>@@ -337,7 +335,13 @@
<br> directories). This could be changed to (a) allow a list of regular
<br> expressions on each permission and (b) use the easier ant syntax, rather
<br> than java regexp syntax.</li>
<br>+ <li>We need to look at the SecurityService.groovy code to remove any
<br>+ redundant code. Also we need to merge the three methods isPermitted,
<br>+ anonAllowed and checkForPermission some way.</li>
<br> </ul></li>
<br>+</ul>
<br>+
<br>+<ul>
<br> <li>[GATE.ac.uk] "what we do page" <DD,VT> (or: MIMIR search):
<br> <ul>
<br> <li>A JSP that displays Di/Wim's taxonomy and allows users to select one or
<br>@@ -465,9 +469,14 @@
<br> <li>CowPermission(Wiki 1, directory "", controller [page, search], actions
<br> [Read])</li>
<br> </ul></li>
<br>+<li>[CoW] nutch-solr
<br>+ <ul>
<br>+ <li>Upgrade to nutch version 1.0 failed due to some hadoop configuration problem.
<br>+ The problem occurs when trying to upload a huge amount of crawled data to the
<br>+ solr webapp.</li>
<br>+ </ul></li>
<br> </ul>
<br>
<br>-
<br> <!--%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%-->
<br> <a class="cow-section-anchor" name="section-3."></a><h1 class="cow-heading"><span class="cow-sec-number">3. </span>Completed Tasks</h1>
<br>
<br><br>Modified: trunk/cow/doc/cow-backlog.yam
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.yam 2009-12-08 11:40:29 UTC (rev 2100)
<br>+++ trunk/cow/doc/cow-backlog.yam 2009-12-08 13:14:09 UTC (rev 2101)
<br>@@ -37,8 +37,6 @@
<br> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br> %1 Future Tasks
<br>
<br>-- we need to look at the SecurityService.groovy code to remove any redundant code.
<br>- Also we need to merge the three methods isPermitted, anonAllowed and checkForPermission some way.
<br> - we should rethink how we preview non-YAM HTML files. At the moment we inject
<br> the head section into the preview page which means we can end up replacing values
<br> for base target and href which cause weird security problems
<br>@@ -227,6 +225,10 @@
<br> directories). This could be changed to (a) allow a list of regular
<br> expressions on each permission and (b) use the easier ant syntax, rather
<br> than java regexp syntax.
<br>+ - We need to look at the SecurityService.groovy code to remove any
<br>+ redundant code. Also we need to merge the three methods isPermitted,
<br>+ anonAllowed and checkForPermission some way.
<br>+
<br> - [GATE.ac.uk] "what we do page" <DD,VT> (or: MIMIR search):
<br> - A JSP that displays Di/Wim's taxonomy and allows users to select one or
<br> more concepts
<br>@@ -326,8 +328,11 @@
<br> defined over sets of controllers, in the same way we do for actions:
<br> - CowPermission(Wiki 1, directory "", controller [page, search], actions
<br> [Read])
<br>+- [CoW] nutch-solr
<br>+ - Upgrade to nutch version 1.0 failed due to some hadoop configuration problem.
<br>+ The problem occurs when trying to upload a huge amount of crawled data to the
<br>+ solr webapp.
<br>
<br>-
<br> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br> %1 Completed Tasks
<br>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26693715&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26692599[gatewiki-commits] SF.net SVN: gatewiki:[2100] trunk2009-12-08T03:40:30Z2009-12-08T03:40:30ZnirajaswaniRevision: 2100
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2100&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2100&view=rev</a><br>Author: nirajaswani
<br>Date: 2009-12-08 11:40:29 +0000 (Tue, 08 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>reverting back to developer version of nutch. Reverting back as I could not upload crawled and indexed data over to solr web-apps when using the released version 1.0. It could be due to improper integration and will be done in future. This is now in the backlog. Added a parameter in the Config.groovy to specify the amount of RAM the external nutch process should use
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/grails-app/conf/Config.groovy
<br> trunk/cow/grails-app/services/IndexingService.groovy
<br> trunk/nutch-solr/lib/nutch-wrapper.jar
<br> trunk/nutch-solr/nutch/plugins/clustering-carrot2/clustering-carrot2.jar
<br> trunk/nutch-solr/nutch/plugins/creativecommons/creativecommons.jar
<br> trunk/nutch-solr/nutch/plugins/feed/feed.jar
<br> trunk/nutch-solr/nutch/plugins/field-basic/field-basic.jar
<br> trunk/nutch-solr/nutch/plugins/field-boost/field-boost.jar
<br> trunk/nutch-solr/nutch/plugins/index-anchor/index-anchor.jar
<br> trunk/nutch-solr/nutch/plugins/index-basic/index-basic.jar
<br> trunk/nutch-solr/nutch/plugins/index-more/index-more.jar
<br> trunk/nutch-solr/nutch/plugins/language-identifier/language-identifier.jar
<br> trunk/nutch-solr/nutch/plugins/lib-http/lib-http.jar
<br> trunk/nutch-solr/nutch/plugins/lib-parsems/lib-parsems.jar
<br> trunk/nutch-solr/nutch/plugins/lib-regex-filter/lib-regex-filter.jar
<br> trunk/nutch-solr/nutch/plugins/microformats-reltag/microformats-reltag.jar
<br> trunk/nutch-solr/nutch/plugins/nutch-extensionpoints/nutch-extensionpoints.jar
<br> trunk/nutch-solr/nutch/plugins/ontology/ontology.jar
<br> trunk/nutch-solr/nutch/plugins/parse-ext/parse-ext.jar
<br> trunk/nutch-solr/nutch/plugins/parse-html/parse-html.jar
<br> trunk/nutch-solr/nutch/plugins/parse-js/parse-js.jar
<br> trunk/nutch-solr/nutch/plugins/parse-msexcel/parse-msexcel.jar
<br> trunk/nutch-solr/nutch/plugins/parse-mspowerpoint/parse-mspowerpoint.jar
<br> trunk/nutch-solr/nutch/plugins/parse-msword/parse-msword.jar
<br> trunk/nutch-solr/nutch/plugins/parse-oo/parse-oo.jar
<br> trunk/nutch-solr/nutch/plugins/parse-pdf/parse-pdf.jar
<br> trunk/nutch-solr/nutch/plugins/parse-rss/parse-rss.jar
<br> trunk/nutch-solr/nutch/plugins/parse-swf/parse-swf.jar
<br> trunk/nutch-solr/nutch/plugins/parse-text/parse-text.jar
<br> trunk/nutch-solr/nutch/plugins/parse-zip/parse-zip.jar
<br> trunk/nutch-solr/nutch/plugins/protocol-file/protocol-file.jar
<br> trunk/nutch-solr/nutch/plugins/protocol-ftp/protocol-ftp.jar
<br> trunk/nutch-solr/nutch/plugins/protocol-http/protocol-http.jar
<br> trunk/nutch-solr/nutch/plugins/protocol-httpclient/protocol-httpclient.jar
<br> trunk/nutch-solr/nutch/plugins/query-basic/query-basic.jar
<br> trunk/nutch-solr/nutch/plugins/query-custom/query-custom.jar
<br> trunk/nutch-solr/nutch/plugins/query-more/query-more.jar
<br> trunk/nutch-solr/nutch/plugins/query-site/query-site.jar
<br> trunk/nutch-solr/nutch/plugins/query-url/query-url.jar
<br> trunk/nutch-solr/nutch/plugins/response-json/response-json.jar
<br> trunk/nutch-solr/nutch/plugins/response-xml/response-xml.jar
<br> trunk/nutch-solr/nutch/plugins/scoring-link/scoring-link.jar
<br> trunk/nutch-solr/nutch/plugins/scoring-opic/scoring-opic.jar
<br> trunk/nutch-solr/nutch/plugins/subcollection/subcollection.jar
<br> trunk/nutch-solr/nutch/plugins/summary-basic/summary-basic.jar
<br> trunk/nutch-solr/nutch/plugins/summary-lucene/summary-lucene.jar
<br> trunk/nutch-solr/nutch/plugins/tld/tld.jar
<br> trunk/nutch-solr/nutch/plugins/urlfilter-automaton/urlfilter-automaton.jar
<br> trunk/nutch-solr/nutch/plugins/urlfilter-domain/urlfilter-domain.jar
<br> trunk/nutch-solr/nutch/plugins/urlfilter-prefix/urlfilter-prefix.jar
<br> trunk/nutch-solr/nutch/plugins/urlfilter-regex/urlfilter-regex.jar
<br> trunk/nutch-solr/nutch/plugins/urlfilter-suffix/urlfilter-suffix.jar
<br> trunk/nutch-solr/nutch/plugins/urlfilter-validator/urlfilter-validator.jar
<br> trunk/nutch-solr/nutch/plugins/urlnormalizer-basic/urlnormalizer-basic.jar
<br> trunk/nutch-solr/nutch/plugins/urlnormalizer-pass/urlnormalizer-pass.jar
<br> trunk/nutch-solr/nutch/plugins/urlnormalizer-regex/urlnormalizer-regex.jar
<br> trunk/nutch-solr/src/java/gate/solr/NutchCrawler.java
<br><br>Added Paths:
<br>-----------
<br> trunk/nutch-solr/nutch/nutch-2009-02-26_04-01-15.jar
<br> trunk/nutch-solr/nutch/nutch-2009-02-26_04-01-15.job
<br> trunk/nutch-solr/nutch/nutch-2009-02-26_04-01-15.war
<br><br>Removed Paths:
<br>-------------
<br> trunk/nutch-solr/nutch/nutch-1.0.jar
<br> trunk/nutch-solr/nutch/nutch-1.0.job
<br> trunk/nutch-solr/nutch/nutch-1.0.war
<br> trunk/nutch-solr/nutch/plugins/hadoop/
<br><br>Modified: trunk/cow/grails-app/conf/Config.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/conf/Config.groovy 2009-12-08 11:14:55 UTC (rev 2099)
<br>+++ trunk/cow/grails-app/conf/Config.groovy 2009-12-08 11:40:29 UTC (rev 2100)
<br>@@ -115,6 +115,7 @@
<br> logFile =
<br> "${sysUserDir}/../nutch-solr/solr-app/multicore/conf/logging.properties"
<br> baseUrl = "<a href="http://localhost:" target="_top" rel="nofollow">http://localhost:</a>" + System.getProperty("server.port")
<br>+ indexingRam = "2048m" // 2GB ram for solr
<br> }
<br> guest {
<br> layout.dir = "layouts/" //directory with layouts gsp in it
<br><br>Modified: trunk/cow/grails-app/services/IndexingService.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/services/IndexingService.groovy 2009-12-08 11:14:55 UTC (rev 2099)
<br>+++ trunk/cow/grails-app/services/IndexingService.groovy 2009-12-08 11:40:29 UTC (rev 2100)
<br>@@ -171,7 +171,7 @@
<br> classpath:classpath, classname:"gate.solr.SolrIndexer", fork:"true",
<br> resultproperty: "nutch-indexing-exit-code"
<br> ) {
<br>- jvmarg(value:"-Xmx1512m")
<br>+ jvmarg(value:"-Xmx" + conf.gate.cow.solr.indexingRam)
<br> arg(value:cmd)
<br> arg(value:solrUrl)
<br> arg(value:wikiId)
<br><br>Modified: trunk/nutch-solr/lib/nutch-wrapper.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Deleted: trunk/nutch-solr/nutch/nutch-1.0.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Deleted: trunk/nutch-solr/nutch/nutch-1.0.job
<br>===================================================================
<br>(Binary files differ)
<br><br>Deleted: trunk/nutch-solr/nutch/nutch-1.0.war
<br>===================================================================
<br>(Binary files differ)
<br><br>Added: trunk/nutch-solr/nutch/nutch-2009-02-26_04-01-15.jar
<br>===================================================================
<br>(Binary files differ)
<br><br><br>Property changes on: trunk/nutch-solr/nutch/nutch-2009-02-26_04-01-15.jar
<br>___________________________________________________________________
<br>Added: svn:mime-type
<br> + application/octet-stream
<br><br>Added: trunk/nutch-solr/nutch/nutch-2009-02-26_04-01-15.job
<br>===================================================================
<br>(Binary files differ)
<br><br><br>Property changes on: trunk/nutch-solr/nutch/nutch-2009-02-26_04-01-15.job
<br>___________________________________________________________________
<br>Added: svn:mime-type
<br> + application/octet-stream
<br><br>Added: trunk/nutch-solr/nutch/nutch-2009-02-26_04-01-15.war
<br>===================================================================
<br>(Binary files differ)
<br><br><br>Property changes on: trunk/nutch-solr/nutch/nutch-2009-02-26_04-01-15.war
<br>___________________________________________________________________
<br>Added: svn:mime-type
<br> + application/octet-stream
<br><br>Modified: trunk/nutch-solr/nutch/plugins/clustering-carrot2/clustering-carrot2.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/creativecommons/creativecommons.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/feed/feed.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/field-basic/field-basic.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/field-boost/field-boost.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/index-anchor/index-anchor.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/index-basic/index-basic.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/index-more/index-more.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/language-identifier/language-identifier.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/lib-http/lib-http.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/lib-parsems/lib-parsems.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/lib-regex-filter/lib-regex-filter.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/microformats-reltag/microformats-reltag.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/nutch-extensionpoints/nutch-extensionpoints.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/ontology/ontology.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/parse-ext/parse-ext.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/parse-html/parse-html.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/parse-js/parse-js.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/parse-msexcel/parse-msexcel.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/parse-mspowerpoint/parse-mspowerpoint.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/parse-msword/parse-msword.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/parse-oo/parse-oo.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/parse-pdf/parse-pdf.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/parse-rss/parse-rss.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/parse-swf/parse-swf.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/parse-text/parse-text.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/parse-zip/parse-zip.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/protocol-file/protocol-file.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/protocol-ftp/protocol-ftp.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/protocol-http/protocol-http.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/protocol-httpclient/protocol-httpclient.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/query-basic/query-basic.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/query-custom/query-custom.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/query-more/query-more.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/query-site/query-site.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/query-url/query-url.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/response-json/response-json.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/response-xml/response-xml.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/scoring-link/scoring-link.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/scoring-opic/scoring-opic.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/subcollection/subcollection.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/summary-basic/summary-basic.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/summary-lucene/summary-lucene.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/tld/tld.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/urlfilter-automaton/urlfilter-automaton.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/urlfilter-domain/urlfilter-domain.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/urlfilter-prefix/urlfilter-prefix.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/urlfilter-regex/urlfilter-regex.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/urlfilter-suffix/urlfilter-suffix.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/urlfilter-validator/urlfilter-validator.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/urlnormalizer-basic/urlnormalizer-basic.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/urlnormalizer-pass/urlnormalizer-pass.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/nutch/plugins/urlnormalizer-regex/urlnormalizer-regex.jar
<br>===================================================================
<br>(Binary files differ)
<br><br>Modified: trunk/nutch-solr/src/java/gate/solr/NutchCrawler.java
<br>===================================================================
<br>--- trunk/nutch-solr/src/java/gate/solr/NutchCrawler.java 2009-12-08 11:14:55 UTC (rev 2099)
<br>+++ trunk/nutch-solr/src/java/gate/solr/NutchCrawler.java 2009-12-08 11:40:29 UTC (rev 2100)
<br>@@ -47,7 +47,7 @@
<br>
<br> /* Perform complete crawling given a set of root urls. */
<br> public static void main(String args[]) throws Exception {
<br>- System.out.println("Using Fetcher: new version*************************");
<br>+ System.out.println("Using Fetcher2 implementation");
<br> if (args.length < 1) {
<br> System.out.println("Usage: NutchCrawler " +
<br> "<urlDir> [-dir d] [-threads n] [-depth i] [-topN N]");
<br>@@ -104,10 +104,10 @@
<br> Generator generator = new Generator(conf);
<br>
<br> // using fetcher2 implementation
<br>- //Fetcher2 fetcher = new Fetcher2(conf);
<br>+ Fetcher2 fetcher = new Fetcher2(conf);
<br>
<br> // Fetcher 1 implementation
<br>- Fetcher fetcher = new Fetcher(conf);
<br>+ //Fetcher fetcher = new Fetcher(conf);
<br>
<br> // segmenter parser
<br> ParseSegment parseSegment = new ParseSegment(conf);
<br>@@ -132,7 +132,7 @@
<br> fetcher.fetch(segment, threads, true);
<br>
<br> // parse it, if needed
<br>- if (!Fetcher.isParsing(job)) {
<br>+ if (!Fetcher2.isParsing(job)) {
<br> parseSegment.parse(segment);
<br> }
<br>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26692599&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26692268[gatewiki-commits] SF.net SVN: gatewiki:[2099] trunk/cow/grails-app/services/PageService. groovy2009-12-08T03:14:55Z2009-12-08T03:14:55ZmarkagreenwoodRevision: 2099
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2099&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2099&view=rev</a><br>Author: markagreenwood
<br>Date: 2009-12-08 11:14:55 +0000 (Tue, 08 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>removed some code left over from debugging the vanishing blank lines problem
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/grails-app/services/PageService.groovy
<br><br>Modified: trunk/cow/grails-app/services/PageService.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/services/PageService.groovy 2009-12-08 11:11:08 UTC (rev 2098)
<br>+++ trunk/cow/grails-app/services/PageService.groovy 2009-12-08 11:14:55 UTC (rev 2099)
<br>@@ -680,7 +680,6 @@
<br> */
<br> void overwrite(Map flow, File editFile, String text) {
<br> text = text.replace('\r\n', '\n')
<br>- if (text.charAt(0) == '\n') text = "\n"+text;
<br> if(
<br> flow.editType == conf.page.NON_YAM_HTML_EDIT ||
<br> flow.editType == conf.page.PLAIN_TEXT_EDIT
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26692268&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26692220[gatewiki-commits] SF.net SVN: gatewiki:[2098] trunk/cow/grails-app2009-12-08T03:11:08Z2009-12-08T03:11:08ZmarkagreenwoodRevision: 2098
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2098&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2098&view=rev</a><br>Author: markagreenwood
<br>Date: 2009-12-08 11:11:08 +0000 (Tue, 08 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>make sure we replace the starting newline character with a double new line when ever we pass the yam source backwards and forwards otherwise we seem to lose the blank lines which is a problem for files like leftBar.html which need to have blank lines at the top to stop the first line becoming a title
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/grails-app/controllers/PageController.groovy
<br> trunk/cow/grails-app/services/PageService.groovy
<br><br>Modified: trunk/cow/grails-app/controllers/PageController.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/controllers/PageController.groovy 2009-12-07 17:47:35 UTC (rev 2097)
<br>+++ trunk/cow/grails-app/controllers/PageController.groovy 2009-12-08 11:11:08 UTC (rev 2098)
<br>@@ -466,7 +466,12 @@
<br> /** Display the preview view state. */
<br> preview {
<br> on("back") {
<br>+
<br>+ //we need the same fix here as we do when saving the files otherwise we lose the blank lines
<br> flow.editInput = flow.editOutput
<br>+ flow.editInput.replace('\r\n', '\n')
<br>+ if (flow.editInput.charAt(0) == '\r') flow.editInput = "\n"+flow.editInput
<br>+
<br> flow.commitMessage = params.commitMessage
<br> }.to "edit"
<br> on("save") {
<br><br>Modified: trunk/cow/grails-app/services/PageService.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/services/PageService.groovy 2009-12-07 17:47:35 UTC (rev 2097)
<br>+++ trunk/cow/grails-app/services/PageService.groovy 2009-12-08 11:11:08 UTC (rev 2098)
<br>@@ -680,6 +680,7 @@
<br> */
<br> void overwrite(Map flow, File editFile, String text) {
<br> text = text.replace('\r\n', '\n')
<br>+ if (text.charAt(0) == '\n') text = "\n"+text;
<br> if(
<br> flow.editType == conf.page.NON_YAM_HTML_EDIT ||
<br> flow.editType == conf.page.PLAIN_TEXT_EDIT
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Return on Information:
<br>Google Enterprise Search pays you back
<br>Get the facts.
<br><a href="http://p.sf.net/sfu/google-dev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/google-dev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26692220&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26681054[gatewiki-commits] SF.net SVN: gatewiki:[2097] trunk/site-plugins/gau/grails-app/views/layouts /cowguest.gsp2009-12-07T09:47:35Z2009-12-07T09:47:35Zhcunningham-2Revision: 2097
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2097&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2097&view=rev</a><br>Author: hcunningham
<br>Date: 2009-12-07 17:47:35 +0000 (Mon, 07 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>added a submenu for documentation
<br><br>Modified Paths:
<br>--------------
<br> trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp
<br><br>Modified: trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp
<br>===================================================================
<br>--- trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp 2009-12-07 17:38:32 UTC (rev 2096)
<br>+++ trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp 2009-12-07 17:47:35 UTC (rev 2097)
<br>@@ -149,7 +149,18 @@
<br> </ul>
<br> </li>
<br> <li><a href="/download/">Download</a></li>
<br>- <li><a href="/documentation.html">Documentation</a></li>
<br>+ <li><b><a href="/documentation.html">Documentation</a></b>
<br>+ <ul>
<br>+ <li><a href="/userguide/">User guide</a></li>
<br>+ <li><a href="/mail/">Mailing list</a></li>
<br>+ <li><a href="/wiki/">Wiki</a></li>
<br>+ <li><a href="/demos/developer-videos/">Screencams</a></li>
<br>+ <li><a href="/gate/doc/plugins.html">Core plugins</a></li>
<br>+ <li><a href="/sale/gate-flyer/2009/gate-flyer-4-page.pdf">Brochure</a></li>
<br>+ <li><a href="/gate/doc/javadoc/index.html">Javadocs</a></li>
<br>+ <li><a href="/documentation.html">Docs summary</a></b>
<br>+ </ul>
<br>+ </li>
<br> <li><a href="/people/">About Us</a></li>
<br> <li><a href="/g8/contact">Contact</a></li>
<br> </ul>
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26681054&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26680917[gatewiki-commits] SF.net SVN: gatewiki:[2096] trunk/cow/doc2009-12-07T09:38:33Z2009-12-07T09:38:33Zgate-projectRevision: 2096
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2096&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2096&view=rev</a><br>Author: gate-project
<br>Date: 2009-12-07 17:38:32 +0000 (Mon, 07 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>[nirajaswani] added a backlog time for reviewing the methods of SecurityService.groovy
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/doc/cow-backlog.html
<br> trunk/cow/doc/cow-backlog.yam
<br><br>Modified: trunk/cow/doc/cow-backlog.html
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.html 2009-12-07 17:30:47 UTC (rev 2095)
<br>+++ trunk/cow/doc/cow-backlog.html 2009-12-07 17:38:32 UTC (rev 2096)
<br>@@ -98,6 +98,8 @@
<br> <a class="cow-section-anchor" name="section-2."></a><h1 class="cow-heading"><span class="cow-sec-number">2. </span>Future Tasks</h1>
<br>
<br> <ul>
<br>+<li>we need to look at the SecurityService.groovy code to remove any redundant code.
<br>+ Also we need to merge the three methods isPermitted, anonAllowed and checkForPermission some way.</li>
<br> <li>we should rethink how we preview non-YAM HTML files. At the moment we inject
<br> the head section into the preview page which means we can end up replacing values
<br> for base target and href which cause weird security problems</li>
<br>@@ -150,6 +152,9 @@
<br> (alternatively the arrow area should open the submenu)... difficult: perhaps
<br> buy valy a new phone?! or WAP-style tailoring of CSS to different devices,
<br> and while we're at it add skins?!</li>
<br>+<li>directories: an anonymous has permissions to browse directories (at the moment, via ?dir,
<br>+ as the link is disabled). we could implement permissions for directory
<br>+ browsing, implementing a specific controller and/or action.</li>
<br> </ul>
<br>
<br> <ul>
<br><br>Modified: trunk/cow/doc/cow-backlog.yam
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.yam 2009-12-07 17:30:47 UTC (rev 2095)
<br>+++ trunk/cow/doc/cow-backlog.yam 2009-12-07 17:38:32 UTC (rev 2096)
<br>@@ -37,6 +37,8 @@
<br> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<br> %1 Future Tasks
<br>
<br>+- we need to look at the SecurityService.groovy code to remove any redundant code.
<br>+ Also we need to merge the three methods isPermitted, anonAllowed and checkForPermission some way.
<br> - we should rethink how we preview non-YAM HTML files. At the moment we inject
<br> the head section into the preview page which means we can end up replacing values
<br> for base target and href which cause weird security problems
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26680917&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26680787[gatewiki-commits] SF.net SVN: gatewiki:[2095] trunk/cow/grails-app/services/SecurityService. groovy2009-12-07T09:30:47Z2009-12-07T09:30:47ZnirajaswaniRevision: 2095
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2095&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2095&view=rev</a><br>Author: nirajaswani
<br>Date: 2009-12-07 17:30:47 +0000 (Mon, 07 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>reverting back the changes made to SecurityService as asked by Angus - description in the backlog
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/grails-app/services/SecurityService.groovy
<br><br>Modified: trunk/cow/grails-app/services/SecurityService.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/services/SecurityService.groovy 2009-12-07 16:21:12 UTC (rev 2094)
<br>+++ trunk/cow/grails-app/services/SecurityService.groovy 2009-12-07 17:30:47 UTC (rev 2095)
<br>@@ -27,7 +27,11 @@
<br> */
<br> boolean isPermitted(CowPermission requiredPerm) {
<br> def subject = SecurityUtils.getSubject()
<br>- return subject.isPermitted(requiredPerm)
<br>+ if(subject.authenticated) {
<br>+ return subject.isPermitted(requiredPerm)
<br>+ } else {
<br>+ return false
<br>+ }
<br> }
<br>
<br> /**
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26680787&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26679676[gatewiki-commits] SF.net SVN: gatewiki:[2094] trunk/cow/doc/cow-backlog.yam2009-12-07T08:21:12Z2009-12-07T08:21:12Zangus_robertsRevision: 2094
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2094&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2094&view=rev</a><br>Author: angus_roberts
<br>Date: 2009-12-07 16:21:12 +0000 (Mon, 07 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>note on directory browsing under future tasks
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/doc/cow-backlog.yam
<br><br>Modified: trunk/cow/doc/cow-backlog.yam
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.yam 2009-12-07 15:20:11 UTC (rev 2093)
<br>+++ trunk/cow/doc/cow-backlog.yam 2009-12-07 16:21:12 UTC (rev 2094)
<br>@@ -87,6 +87,9 @@
<br> (alternatively the arrow area should open the submenu)... difficult: perhaps
<br> buy valy a new phone?! or WAP-style tailoring of CSS to different devices,
<br> and while we're at it add skins?!
<br>+- directories: an anonymous has permissions to browse directories (at the moment, via ?dir,
<br>+ as the link is disabled). we could implement permissions for directory
<br>+ browsing, implementing a specific controller and/or action.
<br>
<br> - add exclusions for / and /help to HtmlTranslator so that links to these
<br> areas are not considered to be missing pages [HC]
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26679676&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26678727[gatewiki-commits] SF.net SVN: gatewiki:[2093] trunk/cow/grails-app/controllers/ SearchController.groovy2009-12-07T07:20:11Z2009-12-07T07:20:11ZnirajaswaniRevision: 2093
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2093&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2093&view=rev</a><br>Author: nirajaswani
<br>Date: 2009-12-07 15:20:11 +0000 (Mon, 07 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>check if the anon user has permission to see a hit
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/grails-app/controllers/SearchController.groovy
<br><br>Modified: trunk/cow/grails-app/controllers/SearchController.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/controllers/SearchController.groovy 2009-12-07 14:21:29 UTC (rev 2092)
<br>+++ trunk/cow/grails-app/controllers/SearchController.groovy 2009-12-07 15:20:11 UTC (rev 2093)
<br>@@ -317,9 +317,11 @@
<br> new CowPermission(params.id, directory, "page", "show")
<br> // if permission denied continue with the next document
<br> // TODO check if this could be optimized
<br>- if(!securityService.isPermitted(requiredPerm)) {
<br>- continue
<br>- }
<br>+ if(!securityService.anonAllowed(requiredPerm) &&
<br>+ !securityService.isPermitted(requiredPerm)) {
<br>+ // user not allowed to see this
<br>+ continue;
<br>+ }
<br> } else {
<br> // this is an invalid hit, it must start with wikipath
<br> // throwing it away
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26678727&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26677919[gatewiki-commits] SF.net SVN: gatewiki:[2092] trunk/cow/doc2009-12-07T06:21:29Z2009-12-07T06:21:29Zgate-projectRevision: 2092
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2092&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2092&view=rev</a><br>Author: gate-project
<br>Date: 2009-12-07 14:21:29 +0000 (Mon, 07 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>[mark] updated the item about the contact controller
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/doc/cow-backlog.html
<br> trunk/cow/doc/cow-backlog.yam
<br><br>Modified: trunk/cow/doc/cow-backlog.html
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.html 2009-12-07 14:04:12 UTC (rev 2091)
<br>+++ trunk/cow/doc/cow-backlog.html 2009-12-07 14:21:29 UTC (rev 2092)
<br>@@ -102,7 +102,8 @@
<br> the head section into the preview page which means we can end up replacing values
<br> for base target and href which cause weird security problems</li>
<br> <li>the DB entry for the controller "contact" should be created as part of the
<br>- JSec stuff in bootstrap, and anonymous given read access</li>
<br>+ JSec stuff in bootstrap, and anonymous given complete access not just read otherwise they
<br>+ won't be able to access the send action</li>
<br> <li>edit of /gate/doc/index.html throws some exceptions to the log (to do with
<br> illegal state when writing the images to the response)</li>
<br> <li>allow serving of robots.txt on password-protected sites</li>
<br><br>Modified: trunk/cow/doc/cow-backlog.yam
<br>===================================================================
<br>--- trunk/cow/doc/cow-backlog.yam 2009-12-07 14:04:12 UTC (rev 2091)
<br>+++ trunk/cow/doc/cow-backlog.yam 2009-12-07 14:21:29 UTC (rev 2092)
<br>@@ -41,7 +41,8 @@
<br> the head section into the preview page which means we can end up replacing values
<br> for base target and href which cause weird security problems
<br> - the DB entry for the controller "contact" should be created as part of the
<br>- JSec stuff in bootstrap, and anonymous given read access
<br>+ JSec stuff in bootstrap, and anonymous given complete access not just read otherwise they
<br>+ won't be able to access the send action
<br> - edit of /gate/doc/index.html throws some exceptions to the log (to do with
<br> illegal state when writing the images to the response)
<br> - allow serving of robots.txt on password-protected sites
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26677919&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26677708[gatewiki-commits] SF.net SVN: gatewiki:[2091] trunk/cow/grails-app/services/SecurityService. groovy2009-12-07T06:04:12Z2009-12-07T06:04:12ZnirajaswaniRevision: 2091
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2091&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2091&view=rev</a><br>Author: nirajaswani
<br>Date: 2009-12-07 14:04:12 +0000 (Mon, 07 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>subject.isPermitted(requiredPerm) should be called even for anonymous users and therefore no need for subject.authenticated
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/grails-app/services/SecurityService.groovy
<br><br>Modified: trunk/cow/grails-app/services/SecurityService.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/services/SecurityService.groovy 2009-12-07 14:01:25 UTC (rev 2090)
<br>+++ trunk/cow/grails-app/services/SecurityService.groovy 2009-12-07 14:04:12 UTC (rev 2091)
<br>@@ -27,11 +27,7 @@
<br> */
<br> boolean isPermitted(CowPermission requiredPerm) {
<br> def subject = SecurityUtils.getSubject()
<br>- if (subject.authenticated) {
<br>- return subject.isPermitted(requiredPerm)
<br>- } else {
<br>- return false;
<br>- }
<br>+ return subject.isPermitted(requiredPerm)
<br> }
<br>
<br> /**
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26677708&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>tag:old.nabble.com,2006:post-26677663[gatewiki-commits] SF.net SVN: gatewiki:[2090] trunk/cow/grails-app/controllers/PageController .groovy2009-12-07T06:01:25Z2009-12-07T06:01:25Zian_robertsRevision: 2090
<br> <a href="http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2090&view=rev" target="_top" rel="nofollow">http://gatewiki.svn.sourceforge.net/gatewiki/?rev=2090&view=rev</a><br>Author: ian_roberts
<br>Date: 2009-12-07 14:01:25 +0000 (Mon, 07 Dec 2009)
<br><br>Log Message:
<br>-----------
<br>Close the input stream properly when serving binaries.
<br><br>Modified Paths:
<br>--------------
<br> trunk/cow/grails-app/controllers/PageController.groovy
<br><br>Modified: trunk/cow/grails-app/controllers/PageController.groovy
<br>===================================================================
<br>--- trunk/cow/grails-app/controllers/PageController.groovy 2009-12-07 13:21:27 UTC (rev 2089)
<br>+++ trunk/cow/grails-app/controllers/PageController.groovy 2009-12-07 14:01:25 UTC (rev 2090)
<br>@@ -130,7 +130,9 @@
<br> pageTree = renderBreadCrumb(thisPage.id, thisPage.pageFile)
<br> } else { // non-text content, serve directly to the response
<br> response.contentType = thisPage.mimeType
<br>- response.outputStream << new FileInputStream(pageFile)
<br>+ pageFile.withInputStream { stream ->
<br>+ response.outputStream << stream
<br>+ }
<br> return [ : ]
<br> }
<br> thisPage.putAll( // add navigation div contents to the model
<br><br><br>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
<br><br>------------------------------------------------------------------------------
<br>Join us December 9, 2009 for the Red Hat Virtual Experience,
<br>a free event focused on virtualization and cloud computing.
<br>Attend in-depth sessions from your desk. Your couch. Anywhere.
<br><a href="http://p.sf.net/sfu/redhat-sfdev2dev" target="_top" rel="nofollow">http://p.sf.net/sfu/redhat-sfdev2dev</a><br>_______________________________________________
<br>gatewiki-commits mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26677663&i=0" target="_top" rel="nofollow">gatewiki-commits@...</a>
<br><a href="https://lists.sourceforge.net/lists/listinfo/gatewiki-commits" target="_top" rel="nofollow">https://lists.sourceforge.net/lists/listinfo/gatewiki-commits</a><br><p>From forum: <a href="http://old.nabble.com/gatewiki---commits-f28145.html" embed="fixTarget[28145]" target="_top" >gatewiki - commits</a></p>