Nabble - gatewiki - commits

[gatewiki-commits] SF.net SVN: gatewiki:[1880] trunk/cow/grails-app

2009-11-24T00:28:35Z

Revision: 1880
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1880&view=rev
Author: nirajaswani
Date: 2009-11-24 08:28:34 +0000 (Tue, 24 Nov 2009)

Log Message:
-----------
subject prefix

Modified Paths:
--------------
trunk/cow/grails-app/conf/Config.groovy
trunk/cow/grails-app/controllers/ContactController.groovy

Modified: trunk/cow/grails-app/conf/Config.groovy
===================================================================
--- trunk/cow/grails-app/conf/Config.groovy 2009-11-24 00:46:51 UTC (rev 1879)
+++ trunk/cow/grails-app/conf/Config.groovy 2009-11-24 08:28:34 UTC (rev 1880)
@@ -175,6 +175,9 @@
title = "Contact Us"
heading =
"Please fill in the form and enter the characters from the image."
+ subject {
+ prefix = "" // prefix for the subject
+ }
}
}
}

Modified: trunk/cow/grails-app/controllers/ContactController.groovy
===================================================================
--- trunk/cow/grails-app/controllers/ContactController.groovy 2009-11-24 00:46:51 UTC (rev 1879)
+++ trunk/cow/grails-app/controllers/ContactController.groovy 2009-11-24 08:28:34 UTC (rev 1880)
@@ -83,11 +83,14 @@
List recipients = new ArrayList<String>(conf.contact.to)
recipients.add(params.email)

+ // attach prefix to subject
+ def sub = conf.contact.subject.prefix + params.subject
+
try {
sendMail {
to recipients.toArray()
from params.email
- subject params.subject
+ subject sub
body "From:" + params.name + "\n\n" + params.emailBody
}
} catch(Throwable e) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1879] trunk

2009-11-23T16:46:54Z

Revision: 1879
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1879&view=rev
Author: hcunningham
Date: 2009-11-24 00:46:51 +0000 (Tue, 24 Nov 2009)

Log Message:
-----------
added contact link;
wrapped the header links as suggested in valy layout;
added creative commons and copyright statement;
adjusted the contact page text

Modified Paths:
--------------
trunk/cow/grails-app/conf/Config.groovy
trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp

Modified: trunk/cow/grails-app/conf/Config.groovy
===================================================================
--- trunk/cow/grails-app/conf/Config.groovy 2009-11-23 19:01:01 UTC (rev 1878)
+++ trunk/cow/grails-app/conf/Config.groovy 2009-11-24 00:46:51 UTC (rev 1879)
@@ -172,9 +172,9 @@
bootstrapRegen = false // regenerate sandboxes on bootstrap?
wikiUpdateRegen = false // regenerate sandboxes on Wiki update?
contact {
- title = "Contact"
+ title = "Contact Us"
heading =
- "Please fill up the following form and enter the characters from the image below."
+ "Please fill in the form and enter the characters from the image."
}
}
}

Modified: trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp
===================================================================
--- trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp 2009-11-23 19:01:01 UTC (rev 1878)
+++ trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp 2009-11-24 00:46:51 UTC (rev 1879)
@@ -65,9 +65,6 @@


<div id="topLoginEtc">
- 
- <span id="topPageSpecific">${pageLinks}</span>
-

<g:if test="${(webRequest?.controllerName == 'page') || (webRequest?.controllerName == 'search')}">
@@ -108,6 +105,10 @@
(w/s mode) <g:link controller="admin">Admin</g:link>
</cow:isWorkstation>
<g:pageLink action="show" id="2" linkPath="gatewiki/cow/doc/gatewiki.html">Help</g:pageLink>
+
+ 
+ <br/>
+ <span id="topPageSpecific">${pageLinks}</span>
</div>


@@ -143,7 +144,8 @@
</li>
<li><a href="/download/">Download</a></li>
<li><a href="/documentation.html">Documentation</a></li>
- <li><a href="/people">About Us</a></li>
+ <li><a href="/people/">About Us</a></li>
+ <li><a href="/g8/contact">Contact</a></li>
</ul>
</div>
</div>
@@ -177,6 +179,21 @@
<td><a href="http://www.shef.ac.uk/dcs/"><image
src="/plugins/gau-0.1/images/sheffield-logo-small.png"/></a></td>
</tr></table>
+
+ <p>
+ <table align="right"><tr><td align="left"><font size="-2">
+ © The University of Sheffield, 1995-2010.
+ This work is licenced under the
+ <a rel="license" href="http://creativecommons.org/licenses/by-nd/2.0/uk/">Creative
+ Commons Attribution-No Derivative Licence</a>.
+ </font>
+ </td><td>
+ <a rel="license" href="http://creativecommons.org/licenses/by-nd/2.0/uk/">
+ <img alt="Creative Commons License" style="border-width:0"
+ src="http://i.creativecommons.org/l/by-nd/2.0/uk/88x31.png" />
+ </a>
+ </td></tr></table>
+ </p>
</div>



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1878] trunk/cow/grails-app

2009-11-23T11:01:01Z

Revision: 1878
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1878&view=rev
Author: nirajaswani
Date: 2009-11-23 19:01:01 +0000 (Mon, 23 Nov 2009)

Log Message:
-----------
now allows specifying comma separated list of emails - see the example in Config.groovy

Modified Paths:
--------------
trunk/cow/grails-app/conf/Config.groovy
trunk/cow/grails-app/controllers/ContactController.groovy

Modified: trunk/cow/grails-app/conf/Config.groovy
===================================================================
--- trunk/cow/grails-app/conf/Config.groovy 2009-11-23 18:29:03 UTC (rev 1877)
+++ trunk/cow/grails-app/conf/Config.groovy 2009-11-23 19:01:01 UTC (rev 1878)
@@ -358,7 +358,7 @@

//mail setting for contact page
/*
-gate.cow.contact.to = "<to address e.g. abc@...>"
+gate.cow.contact.to = ["address1", "address2", ...] // comma separate list
grails {
mail {
host = "<smtp host e.g. mailhost.dcs.shef.ac.uk>"

Modified: trunk/cow/grails-app/controllers/ContactController.groovy
===================================================================
--- trunk/cow/grails-app/controllers/ContactController.groovy 2009-11-23 18:29:03 UTC (rev 1877)
+++ trunk/cow/grails-app/controllers/ContactController.groovy 2009-11-23 19:01:01 UTC (rev 1878)
@@ -32,7 +32,7 @@
def showForm = true

// unless, to address is not provided
- if(!conf.contact.to) {
+ if(!conf.contact.to || conf.contact.to.isEmpty()) {
log.error("gate.cow.contact.to parameter missing. Please set it in " +
".cowrc.groovy and make sure other mail plugin settings are " +
"provided.")
@@ -78,9 +78,14 @@
// if the mail settings are not set, this could lead to several
// unexplained exceptions - printing them on server log
// but a nice message to the user
+
+ //copy all the recipients from from conf.contact.to address
+ List recipients = new ArrayList<String>(conf.contact.to)
+ recipients.add(params.email)
+
try {
sendMail {
- to conf.contact.to, params.email
+ to recipients.toArray()
from params.email
subject params.subject
body "From:" + params.name + "\n\n" + params.emailBody

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1877] trunk/cow/grails-app

2009-11-23T10:29:03Z

Revision: 1877
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1877&view=rev
Author: nirajaswani
Date: 2009-11-23 18:29:03 +0000 (Mon, 23 Nov 2009)

Log Message:
-----------
telling the truth to the user when contact service is not configured. Also added contact.title and the contact.heading variables in the config.groovy for the contact page

Modified Paths:
--------------
trunk/cow/grails-app/conf/Config.groovy
trunk/cow/grails-app/i18n/cow.properties

Modified: trunk/cow/grails-app/conf/Config.groovy
===================================================================
--- trunk/cow/grails-app/conf/Config.groovy 2009-11-23 18:28:30 UTC (rev 1876)
+++ trunk/cow/grails-app/conf/Config.groovy 2009-11-23 18:29:03 UTC (rev 1877)
@@ -171,6 +171,11 @@
wiki.updateInterval.default = null
bootstrapRegen = false // regenerate sandboxes on bootstrap?
wikiUpdateRegen = false // regenerate sandboxes on Wiki update?
+ contact {
+ title = "Contact"
+ heading =
+ "Please fill up the following form and enter the characters from the image below."
+ }
}
}

Modified: trunk/cow/grails-app/i18n/cow.properties
===================================================================
--- trunk/cow/grails-app/i18n/cow.properties 2009-11-23 18:28:30 UTC (rev 1876)
+++ trunk/cow/grails-app/i18n/cow.properties 2009-11-23 18:29:03 UTC (rev 1877)
@@ -69,7 +69,7 @@
cow.webflow.error=Exception occurred in web flow: {0}

#contact
-cow.contact.missingParameter.toAddress=This service is temporarily not available. Sorry for the inconvenience.
+cow.contact.missingParameter.toAddress=This service is not configured.
cow.contact.invalidCaptcha=Characters entered do not match the image.
cow.contact.success=Message Sent Successfully!
cow.contact.mailServerSettings=Error while sending email. Sorry for the inconvenience.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1876] trunk/site-plugins/gau/grails-app/views/layouts /cowguest.gsp

2009-11-23T10:28:30Z

Revision: 1876
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1876&view=rev
Author: hcunningham
Date: 2009-11-23 18:28:30 +0000 (Mon, 23 Nov 2009)

Log Message:
-----------
rel link to help, not abs

Modified Paths:
--------------
trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp

Modified: trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp
===================================================================
--- trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp 2009-11-23 17:45:54 UTC (rev 1875)
+++ trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp 2009-11-23 18:28:30 UTC (rev 1876)
@@ -107,7 +107,7 @@
<cow:isWorkstation>
(w/s mode) <g:link controller="admin">Admin</g:link>
</cow:isWorkstation>
- <g:pageLink action="show" id="2" linkPath="/gatewiki/cow/doc/gatewiki.html">Help</g:pageLink>
+ <g:pageLink action="show" id="2" linkPath="gatewiki/cow/doc/gatewiki.html">Help</g:pageLink>
</div>



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1875] trunk/cow/grails-app/controllers/ AdminController.groovy

2009-11-23T09:45:55Z

Revision: 1875
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1875&view=rev
Author: nirajaswani
Date: 2009-11-23 17:45:54 +0000 (Mon, 23 Nov 2009)

Log Message:
-----------
instead of using the localhost as hardcoded bit in the AdminController, using conf.gate.cow.solr.baseUrl - this should fix the problem of accessing files from the solr deploy which is only available locally

Modified Paths:
--------------
trunk/cow/grails-app/controllers/AdminController.groovy

Modified: trunk/cow/grails-app/controllers/AdminController.groovy
===================================================================
--- trunk/cow/grails-app/controllers/AdminController.groovy 2009-11-23 16:51:06 UTC (rev 1874)
+++ trunk/cow/grails-app/controllers/AdminController.groovy 2009-11-23 17:45:54 UTC (rev 1875)
@@ -61,11 +61,13 @@
// checking id for null value
if(checkIfIdIsNull()) return

- // address for the solr search
- def address = "http://localhost:" + request.getServerPort() +
- conf.gate.cow.solr.context + "/core" + params.id +
- "/admin/file/?file=schema.xml"
-
+ // solr config
+ def solrconf = conf.gate.cow.solr
+
+ // address to access the schema
+ def address =
+ "${solrconf.baseUrl}${solrconf.context}/core${params.id}/admin/file/?file=schema.xml"
+
// rendering xml
renderXml(address)
}
@@ -78,11 +80,13 @@
// checking id for null value
if(checkIfIdIsNull()) return

- // address for the solr search
- def address = "http://localhost:" + request.getServerPort() +
- conf.gate.cow.solr.context + "/core" + params.id +
- "/admin/stats.jsp"
-
+ // solr config
+ def solrconf = conf.gate.cow.solr
+
+ // address to access the stats page
+ def address =
+ "${solrconf.baseUrl}${solrconf.context}/core${params.id}/admin/stats.jsp"
+
// final url
def url = new URL(address)
String xmlText = url.text
@@ -103,11 +107,13 @@
// checking id for null value
if(checkIfIdIsNull()) return

- // address for the solr search
- def address = "http://localhost:" + request.getServerPort() +
- conf.gate.cow.solr.context + "/core" + params.id +
- "/admin/file/?file=solrconfig.xml"
+ // solr config
+ def solrconf = conf.gate.cow.solr

+ // address to access the solr config
+ def address =
+ "${solrconf.baseUrl}${solrconf.context}/core${params.id}/admin/file/?file=solrconfig.xml"
+
// rendering xml
renderXml(address)
}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1874] trunk/cow/grails-app

2009-11-23T08:51:08Z

Revision: 1874
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1874&view=rev
Author: nirajaswani
Date: 2009-11-23 16:51:06 +0000 (Mon, 23 Nov 2009)

Log Message:
-----------
if the indexing button pressed twice, it won't accept it if one is already being indexed and will print appropriate message on the screen. Added more messages to the cow.properties. Log for indexing now enabled - tells us details of what's going on in the background. Simplied code in the IndexingService

Modified Paths:
--------------
trunk/cow/grails-app/conf/Config.groovy
trunk/cow/grails-app/controllers/AdminController.groovy
trunk/cow/grails-app/i18n/cow.properties
trunk/cow/grails-app/jobs/IndexingJob.groovy
trunk/cow/grails-app/services/IndexingService.groovy

Modified: trunk/cow/grails-app/conf/Config.groovy
===================================================================
--- trunk/cow/grails-app/conf/Config.groovy 2009-11-20 15:39:43 UTC (rev 1873)
+++ trunk/cow/grails-app/conf/Config.groovy 2009-11-23 16:51:06 UTC (rev 1874)
@@ -231,7 +231,7 @@
def controllerLogger = { "grails.app.controller.${it}Controller" }
info logfile:['Wiki'].collect(controllerLogger)
debug logfile:[
- 'Page', 'SvnAuth'
+ 'Page', 'SvnAuth', 'Contact'
].collect(controllerLogger)

// grails services
@@ -254,6 +254,9 @@
'grails.app.job.WikiRegenerationJob']
error logfile:['grails.app.realm.CowDbRealm']

+ // solr, indexing job log
+ info logfile:['gate.cow.IndexingJob']
+
// subversion
warn logfile:'org.tmatesoft.svn.examples'

Modified: trunk/cow/grails-app/controllers/AdminController.groovy
===================================================================
--- trunk/cow/grails-app/controllers/AdminController.groovy 2009-11-20 15:39:43 UTC (rev 1873)
+++ trunk/cow/grails-app/controllers/AdminController.groovy 2009-11-23 16:51:06 UTC (rev 1874)
@@ -112,13 +112,13 @@
renderXml(address)
}

+
/**
* Perform indexing or delete the index for the given wikiArea.
* It expects parameters id and command, e.g.:
* indexWikiArea?id=1&command=index
*/
def indexWikiArea = {
-
// checking if solr is disabled
if(checkIfSolrIsDisabled()) return

@@ -147,29 +147,37 @@

// call the indexing service
if(params.command.equals("index")) {
- // before indexing, it should be deleted first
- // even if there's no index, the delete command returns true if there was
- // no obvious error/exception
- success = indexingService.delete(request, null, params.id, true)
+ // before indexing, it should be deleted first even if there's no index
+ // the delete command returns false only if there is something in the
+ // wiki area currently being indexed (and unless there's some exception)
+ success = indexingService.delete(null, params.id)

// if only it succeeded in deleting the index
if(success) {
- // last parameter indicates that the indexing should not be started
- // in an asynchronous mode
- success = indexingService.index(request, toIndex, params.id, true)
- msg = message(code: 'cow.index.submittedForIndexing')
+ // this will for sure succeed
+ success = indexingService.index(toIndex, params.id)
+ if(success)
+ msg = message(code: 'cow.index.submittedForIndexing')
+ else
+ msg = message(code: 'cow.index.error')
+ } else {
+ // say it is already in queue or something is being indexed in the
+ // submitted wiki area
+ msg = message(code: 'cow.index.alreadyInQueue')
}
} else if(params.command.equals("delete")) {
// the second parameter indicates that everything should be deleted
- // the last parameter indicates that the deletion should not be started
- // in an asynchronous mode
- success = indexingService.delete(request, null, params.id, true)
- msg = message(code: 'cow.index.submittedForDeletion')
+ success = indexingService.delete(null, params.id)
+ if(!success) {
+ // already in queue
+ msg = message(code: 'cow.index.alreadyInQueue')
+ } else {
+ msg = message(code: 'cow.index.submittedForDeletion')
+ }
+ } else {
+ // invalid command
+ msg = message(code: 'cow.index.invalidCommand')
}
-
- if(!success) {
- msg = message(code: 'cow.index.error')
- }

// render message
render g.render(template: "/message", model: [message: "<b>${msg}</b>"])
@@ -182,8 +190,11 @@
// checking if solr is disabled
if(checkIfSolrIsDisabled()) return

+ // ask IndexingJob to update us
+ def indexingJobs = IndexingJob.getIndexingStatus()
+
// returning model
- [indexingJobs:IndexingJob.getIndexingStatus()]
+ [indexingJobs:indexingJobs]
} // indexStatus

Modified: trunk/cow/grails-app/i18n/cow.properties
===================================================================
--- trunk/cow/grails-app/i18n/cow.properties 2009-11-20 15:39:43 UTC (rev 1873)
+++ trunk/cow/grails-app/i18n/cow.properties 2009-11-23 16:51:06 UTC (rev 1874)
@@ -54,9 +54,11 @@
cow.index.missingParameter.searchBox=searchBox parameter cannot be null or empty
cow.index.missingParameter.id=id parameter cannot be null or empty
cow.index.invalidIndexId=Invalid value for the index id
+cow.index.invalidCommand=Invalid value for the command parameter
cow.index.errorInHighlight=Could not retrieve a highlight for this match
cow.index.emptyIndex=No index available for this area of the site. Please ask your site administrator to index the area.
cow.index.errorInMatchingPrefix=Failed to match hit prefix; this probably means the sandbox was moved on disk and the index needs regenerating.
+cow.index.alreadyInQueue=Request could not be submitted as either the URL is already in queue or it is being indexed.

# Breadcrumbs
cow.areaTop.name=Home

Modified: trunk/cow/grails-app/jobs/IndexingJob.groovy
===================================================================
--- trunk/cow/grails-app/jobs/IndexingJob.groovy 2009-11-20 15:39:43 UTC (rev 1873)
+++ trunk/cow/grails-app/jobs/IndexingJob.groovy 2009-11-23 16:51:06 UTC (rev 1874)
@@ -23,7 +23,7 @@

// indexing is not scheduled
static boolean indexingScheduled = false
-
+
/**
* queue for indexing jobs.
*/
@@ -32,36 +32,51 @@
/** indicates that the items are being indexed */
static Map<String, List<IndexRequest>> beingIndexed

+ /** lock */
+ static String LOCK = "Index_Lock"
+
/**
* puts both queues, requeustsQueue and beingIndexed in a single map
* and returns
*/
static Map<String, List<IndexRequest>> getIndexingStatus() {
-
- // to return
- Map<String, List<IndexRequest>> toReturn =
+
+ synchronized(LOCK) {
+ // to return
+ Map<String, List<IndexRequest>> toReturn =
new HashMap<String, List<IndexRequest>>()
+ // ok first add the requestsQueue
+ if(requestsQueue != null) {
+ // deep clone the requestsQueue map, copying the lists rather than
+ // just copying the references to the lists
+ requestsQueue.each { k, v ->
+ toReturn[k] = v.collect { it }
+ }
+ } // if
+

- // ok first add the requestsQueue
- if(requestsQueue != null) {
- toReturn.putAll(requestsQueue)
- } // if
-
-
- // then beingIndexed
- if(beingIndexed != null) {
- synchronized(beingIndexed) {
+ // then beingIndexed
+ if(beingIndexed != null) {
for(String wikiId : beingIndexed.keySet()) {
+
+ if(beingIndexed.get(wikiId).isEmpty()) continue
+
+ // was there anything in the queue
List<IndexRequest> requestList = toReturn.get(wikiId)
+
+ // if not, create an empty list
if(requestList == null) {
requestList = new ArrayList<IndexRequest>()
toReturn.put(wikiId, requestList)
}
+
+ // entries from being indexed
requestList.addAll(beingIndexed.get(wikiId))
} //for
- } //synchronized
- } // if
- return toReturn
+ } // if
+ return toReturn
+ } // synchronized
+
} // getIndexingStatus

/**
@@ -72,54 +87,69 @@
* Url of the file/directory that should be indexed
* @param cmd
* (one of INDEX_CMD, DELETE_CMD, or UPDATE_CMD)
+ * @return true if the request is added to the queue. false if it is already
+ * in the queue or being indexed.
*/
- static void addToQueue(String wikiId, String url, int cmd, String cmdDesc) {
- // before adding it to the queue, need to check if it is already there
- // if so, we no longer need to add it there
- if(requestsQueue == null) {
- requestsQueue =
- Collections.synchronizedMap(new HashMap<String, List<IndexRequest>>())
- }
+ static boolean addToQueue(String wikiId, String url, int cmd, String cmdDesc) {
+ synchronized(LOCK) {
+
+ // before adding it to the queue, need to check if it is already there
+ // if so, we no longer need to add it there
+ if(requestsQueue == null) {
+ requestsQueue =
+ Collections.synchronizedMap(new HashMap<String, List<IndexRequest>>())
+ }
+
+ // obtain requests for the specified wikiId
+ List<IndexRequest> requests = requestsQueue.get(wikiId)
+ if(requests == null) {
+ requests = Collections.synchronizedList(new ArrayList<IndexRequest>())
+ requestsQueue.put(wikiId, requests)
+ } //if
+
+ def requestDeniedMessage = "Request to add " + wikiId + "=>" + url +
+ " to the indexing queue for " + cmdDesc + " is denied as it " +
+ " is alredy being indexed"

- // obtain requests for the specified wikiId
- List<IndexRequest> requests = requestsQueue.get(wikiId)
- if(requests == null) {
- requests = Collections.synchronizedList(new ArrayList<IndexRequest>())
- requestsQueue.put(wikiId, requests)
- } //if
+ // check if the url is already being indexed. If so, do nothing
+ if(isBeingIndexed(url, wikiId)) {
+ log.info(requestDeniedMessage)
+ return false
+ }

+ // check if command is for deletion of a wiki area
+ if(url == null) {
+ if(cmd == IndexingService.DELETE_CMD) {
+
+ // delete all previous requests for this wiki area
+ // we can't delete what is in progress, so won't change
+ // beingIndexed map
+ requests.clear();

-
- // check if command is for deletion of a wiki area
- if(url == null) {
- if(cmd == IndexingService.DELETE_CMD) {
- // delete all previous requests for this wiki area
- requests.clear();
- requestsQueue.put(wikiId, requests);
-
- // finally add the current delete request to queue
- requests.add(new IndexRequest(url:url, cmd:cmd,
- status:IndexRequest.IN_QUEUE_STATUS,
- cmdDescription:cmdDesc))
- // scheduleIndexing
- scheduleIndexing()
- return
- } else {
- log.info("Invalid request with url :" + url + " command : " + cmd);
- return;
+ // finally add the current delete request to queue
+ requests.add(new IndexRequest(url:url, cmd:cmd,
+ status:IndexRequest.IN_QUEUE_STATUS,
+ cmdDescription:cmdDesc))
+ // log
+ log.info(wikiId + " added to indexing queue for deletion")
+
+ // scheduleIndexing
+ scheduleIndexing()
+ return true
+ } else {
+ log.info("Invalid request with url :" + url + " command : " + cmd);
+ return false
+ }
}
- }

-
- // iterating so.. need to synchronized
- synchronized(requests) {
-
File toIndexFile = new File(new URL(url).toURI())

// if the command is for indexing
if(cmd == IndexingService.INDEX_CMD) {
for(int i=0;i<requests.size();i++) {
+
IndexRequest ir = requests.get(i);
+
// check if there is already a request that will index the current bit
// automatically
if(ir.url != null && ir.cmd == IndexingService.INDEX_CMD) {
@@ -128,10 +158,17 @@
if(toIndexFile.getAbsolutePath().startsWith(
compareWithFile.getAbsolutePath())) {
// no need to add the current request
+ log.info(requestDeniedMessage)
scheduleIndexing()
- return;
+ return false
}
- }
+ } else if(toIndexFile.getAbsolutePath().equals(
+ compareWithFile.getAbsolutePath())) {
+ // no need to add the current request
+ log.info(requestDeniedMessage)
+ scheduleIndexing()
+ return false
+ }
}
} // for
}//if
@@ -145,6 +182,8 @@
File compareWithFile = new File(new URL(ir.url).toURI())
if(compareWithFile.getAbsolutePath().startsWith(
toIndexFile.getAbsolutePath())) {
+ // log entry
+ log.info(wikiId + "=>" + ir.url + " deleted from the queue")
requests.remove(i)
i--
continue
@@ -153,16 +192,22 @@
}
} // for

+
+
// finally add it to the the queue
IndexRequest ir = new IndexRequest(url:url, cmd:cmd,
status:IndexRequest.IN_QUEUE_STATUS,
cmdDescription:cmdDesc)
// added content to requests
requests.add(ir)
- } // synchronized(requests)

- // scheduleIndexing
- scheduleIndexing()
+ // log entry
+ log.info(wikiId + "=>" + url + " added to queue for indexing")
+
+ // scheduleIndexing
+ scheduleIndexing()
+ } //synch
+ return true
}

/**
@@ -190,10 +235,66 @@
}
}

+ /**
+ * Method returns true if the given url is being indexed.
+ * It is possible that the given url gets indexed as a result of
+ * some other urls submitted earlier. If this is the case and if such a
+ * previously submitted url is being indexed, the method will return true.
+ * If the supplied url is null, call to the method is interpreted as a
+ * request to check if there's anything in the given wiki area that is
+ * being indexed.
+ */
+ static boolean isBeingIndexed(String url, String wikiId) {

+ // if not initialized
+ if(beingIndexed == null) {
+ return false
+ } // if
+
+
+ // if the url is null (i.e. is it a delete index for wiki area request?),
+ // is there anything in the supplied wiki area being indexed?
+ if(url == null) {
+ return beingIndexed.containsKey(wikiId)
+ }
+
+ // if nothing in beingIndex queue
+ List<IndexRequest> requests = beingIndexed.get(wikiId)
+ if(requests == null)
+ return false
+
+ // file conversion
+ File toIndexFile = new File(new URL(url).toURI())
+
+ for(int i=0;i<requests.size();i++) {
+ IndexRequest ir = requests.get(i);
+
+ // check if there is already a request that is indexing the current url
+ // automatically
+ if(ir.url != null && ir.cmd == IndexingService.INDEX_CMD) {
+ File compareWithFile = new File(new URL(ir.url).toURI())
+ if(compareWithFile.isDirectory()) {
+ if(toIndexFile.getAbsolutePath().startsWith(
+ compareWithFile.getAbsolutePath())) {
+ // yes it is
+ return true
+ }
+ } else if(toIndexFile.getAbsolutePath().equals(
+ compareWithFile.getAbsolutePath())) {
+ // yes it is
+ return true
+ }
+ }
+ } // for
+ return false
+ } //isBeingIndexed(String)
+
+
/** Execute an indexing job */
void execute(JobExecutionContext context) {
+
log.info("Indexing job:checking for candidates...")
+
// if not initialized
if(beingIndexed == null) {
beingIndexed =
@@ -202,7 +303,7 @@

// if there is something being indexed.. return
if(!beingIndexed.isEmpty()) {
- log.info("Indexing already in progress...")
+ log.info("Indexing already in progress... returning")
return
}

@@ -212,32 +313,37 @@

// if indexingService is available
if(indexingService) {
-
- // nothing found for indexing
- if(requestsQueue == null || requestsQueue.keySet().size() == 0) {
- log.info("found nothing to index...")
- return
- }

- // add items to this queue
- // copy document queue to a temporary object and free it up
- beingIndexed.putAll(requestsQueue);
- requestsQueue.clear();
-
List<String> deleteUrls = new ArrayList<String>()
List<String> indexUrls = new ArrayList<String>()
List<String> updateUrls = new ArrayList<String>()
-
- // store wiki ids in a temporary set
- Set<String> wikiIds = new HashSet<String>(beingIndexed.keySet());
+ Set<String> wikiIds = null

+ synchronized(LOCK) {
+ // nothing found for indexing
+ if(requestsQueue == null || requestsQueue.keySet().size() == 0) {
+ log.info("found nothing to index... returning")
+ return
+ }
+
+ // store wiki ids in a temporary set
+ wikiIds = new HashSet<String>(requestsQueue.keySet());
+
+ } // sync
+
// one wiki area at a time
for(String wikiId : wikiIds) {

- // obtain all requests for this wiki area
- List<IndexRequest> requests = beingIndexed.get(wikiId)
- synchronized(requests) {
- for(IndexRequest ir : requests) {
+ synchronized(LOCK) {
+ // obtain all requests for this wiki area
+ List<IndexRequest> requests = requestsQueue.get(wikiId)
+ requestsQueue.remove(wikiId)
+
+ beingIndexed.clear()
+ List<IndexRequest> inProgressList = new ArrayList<IndexRequest>()
+ inProgressList.addAll(requests)
+
+ for(IndexRequest ir : inProgressList) {

// update its status
ir.status = IndexRequest.IN_PROGRESS_STATUS
@@ -253,11 +359,17 @@
break
default:
updateUrls.add(ir.url)
- ir.cmdDescription = "Updation"
+ ir.cmdDescription = "Updating"
break
}
+ // taken from queue for indexing
+ log.info(wikiId + "=>" + ir.url + " picked up from queue for " +
+ ir.cmdDescription)
}
- }
+
+ requests.clear()
+ beingIndexed.put(wikiId, inProgressList)
+ } //synch

// calling in order: delete, index and update
if(deleteUrls.size() > 0) {
@@ -272,25 +384,20 @@

if(indexUrls.size() > 0) {
indexingService.callAnt(indexUrls, wikiId, IndexingService.INDEX_CMD);
- log.info("indexing "+indexUrls.size()+" documents from the index...")
}

if(updateUrls.size() > 0) {
indexingService.callAnt(updateUrls,wikiId,IndexingService.UPDATE_CMD);
- log.info("updating "+updateUrls.size()+" documents from the index...")
}

// empty all lists
deleteUrls.clear()
indexUrls.clear()
updateUrls.clear()
-
- // ok remove this wikiId
- beingIndexed.remove(wikiId)
+ beingIndexed.clear()
} // for

- beingIndexed.clear();
}//if
} // execute()
} // IndexingJob

Modified: trunk/cow/grails-app/services/IndexingService.groovy
===================================================================
--- trunk/cow/grails-app/services/IndexingService.groovy 2009-11-20 15:39:43 UTC (rev 1873)
+++ trunk/cow/grails-app/services/IndexingService.groovy 2009-11-23 16:51:06 UTC (rev 1874)
@@ -40,112 +40,52 @@
static final int UPDATE_CMD = 2

/**
- * Indexes the given url. If folder, it iterates through all documents
- * @param request web request object
+ * Adds the given url to the queue for indexing. If folder, it iterates
+ * through all documents
* @param urlToIndex (e.g. file://path-to-a-file-or-directory/)
* @param wikiId (e.g. 1 for help, 2 for main etc)
- * @param asynchronousMode executes method in a separate thread.
- * @return true if process finishes successfully. If asynchronousMode is set
- * to true, it will always return true.
+ * @return true if the url is added successfully. false if is already being
+ * indexed.
*/
- boolean index(
- ServletRequest request, String urlToIndex, String wikiId,
- boolean asynchronousMode
- ) {
- return executeAnt(request, urlToIndex, wikiId, INDEX_CMD, asynchronousMode)
+ boolean index(String urlToIndex, String wikiId) {
+ return addToQueue(urlToIndex, wikiId, INDEX_CMD)
} // index

/**
- * Indexes the given url. If folder, it iterates through all documents
- * @param request web request object
- * @param urlsToIndex (e.g. a list of urls to index.)
- * @param wikiId (e.g. 1 for help, 2 for main etc)
- * @param asynchronousMode executes method in a separate thread.
- * @return true if process finishes successfully. If asynchronousMode is set
- * to true, it will always return true.
- */
- boolean index(
- ServletRequest request, List<String> urlsToIndex, String wikiId,
- boolean asynchronousMode
- ) {
- return executeAnt(request, urlsToIndex, wikiId, INDEX_CMD, asynchronousMode)
- } // index
-
-
-
- /**
- * Deletes the url from Index. It <b>must not</b> be a directory url
- * @param request web request object
+ * Adds the given url to the queue for deletion. It <b>must not</b> be a
+ * directory url
* @param urlToRemove (e.g. file://path-to-a-file/, use * to delete all)
* @param wikiId (e.g. 1 for help, 2 for main etc)
- * @param asynchronousMode executes method in a separate thread.
- * @return true if process finishes successfully. If asynchronousMode is set
- * to true, it will always return true.
+ * @return true if the url is added successfully. false if it is being
+ * indexed or is already in the queue for deletion.
*/
- boolean delete(
- ServletRequest request, String urlToRemove, String wikiId,
- boolean asynchronousMode
- ) {
- return executeAnt(request, (String)urlToRemove, wikiId, DELETE_CMD,
- asynchronousMode)
+ boolean delete(String urlToRemove, String wikiId) {
+ return addToQueue((String)urlToRemove, wikiId, DELETE_CMD)
} // delete

/**
- * Update the URL in Index. It <b>must not </b> be a directory url
- * @param request web request object
+ * Adds the given url to the queue for updating. It <b>must not </b> be a
+ * directory url
* @param urlToUpdate (e.g. file://path-to-a-file/)
* @param wikiId (e.g. 1 for help, 2 for main etc)
- * @param asynchronousMode executes method in a separate thread.
- * @return true if process finishes successfully. If asynchronousMode is set
- * to true, it will always return true.
+ * @return true if the url is submitted successfully. false, if it is already
+ * being indexed.
*/
- boolean update(
- ServletRequest request, String urlToUpdate, String wikiId,
- boolean asynchronousMode
- ) {
- return executeAnt(request, urlToUpdate, wikiId, UPDATE_CMD,
- asynchronousMode)
+ boolean update(String urlToUpdate, String wikiId) {
+ return addToQueue(urlToUpdate, wikiId, UPDATE_CMD)
} // update

/**
- * Executes the ant command
- * @param request web request object
- * @param toIndex (e.g. file://path-to-a-sandbox/
- * @param wikiId (e.g. 1 for help, 2 for main etc)
- * @param command (one of INDEX_CMD, DELETE_CMD, or UPDATE_CMD)
- * @param asynchronousMode if set to true, execution starts in a separate
- * thread
- * @return true only if the process finishes successfully. If the process has
- * is started in the asynchronous mode, it will always return true.
- */
- boolean executeAnt(
- ServletRequest request, String toIndex, String wikiId, int command,
- boolean asynchronousMode
- ) {
-
- def urls = [] as List<String>;
- urls.add toIndex
-
- return executeAnt(request, urls, wikiId, command, asynchronousMode);
- } // executeAnt
-
- /**
- * Executes the ant command
- * @param request web request object
+ * Adds the request to queue
* @param toIndex (e.g. a list of file urls = file://path-to-a-sandbox/
* @param wikiId (one of INDEX_CMD, DELETE_CMD, or UPDATE_CMD)
* @param command (one of index, delete, or update)
- * @param asynchronousMode if set to true, execution starts in a separate
- * thread
- * @return true only if the process finishes successfully. If the process has
- * is started in the asynchronous mode, it will always return true.
+ * @return true if request is submitted successfully. False, if it is already
+ * being indexed or is in the queue.
*/
- boolean executeAnt(
- ServletRequest request, List<String> toIndex, String wikiId, int command,
- boolean asynchronousMode
- ) {
+ boolean addToQueue(String url, String wikiId, int command) {
// command description
String cmdDesc = "Indexing"
switch(command) {
@@ -156,21 +96,13 @@
cmdDesc = "Deletion"
break
default:
- cmdDesc = "Updation"
+ cmdDesc = "Updating"
break
}

- // should start a new thread?
- if(asynchronousMode) {
- // add all urls to the indexing queue
- for(String url : toIndex) {
- IndexingJob.addToQueue(wikiId, url, command, cmdDesc)
- }
- return true;
- } else {
- return callAnt(toIndex, wikiId, command);
- }
- } // executeAnt
+ // add the url to the queue
+ return IndexingJob.addToQueue(wikiId, url, command, cmdDesc)
+ } // addToQueue

/**
* calls the ant command

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1873] trunk/cow

2009-11-20T07:39:43Z

Revision: 1873
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1873&view=rev
Author: ian_roberts
Date: 2009-11-20 15:39:43 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Starting work on better directory listings and enabling deletion of files.
Styled the dir list to include icons for different types of files, including
distinguishing yam from non-yam HTMLs (this replaces the trailing Y on
yam-based HTMLs). Also include a checkbox against each file on which the
current user has delete permission. These checkboxes aren't attached to a form
or any server-side behaviour yet, that's next on the list.

Modified Paths:
--------------
trunk/cow/doc/acknowledgements.html
trunk/cow/doc/acknowledgements.yam
trunk/cow/grails-app/conf/Config.groovy
trunk/cow/grails-app/services/PageService.groovy
trunk/cow/grails-app/views/page/_dirList.gsp
trunk/cow/web-app/css/page.css

Added Paths:
-----------
trunk/cow/web-app/_images/filetypes/
trunk/cow/web-app/_images/filetypes/directory.png
trunk/cow/web-app/_images/filetypes/html+yam.png
trunk/cow/web-app/_images/filetypes/html.png
trunk/cow/web-app/_images/filetypes/image.png
trunk/cow/web-app/_images/filetypes/pdf.png
trunk/cow/web-app/_images/filetypes/unknown.png
trunk/cow/web-app/_images/filetypes/word.png

Modified: trunk/cow/doc/acknowledgements.html
===================================================================
--- trunk/cow/doc/acknowledgements.html 2009-11-20 10:59:33 UTC (rev 1872)
+++ trunk/cow/doc/acknowledgements.html 2009-11-20 15:39:43 UTC (rev 1873)
@@ -64,6 +64,8 @@
<li><a class="cow-url" href="http://www.springframework.org/">Spring</a></li>
<li><a class="cow-url" href="http://www.hibernate.org/">Hibernate</a></li>
<li><a class="cow-url" href="http://hsqldb.org/">Hypersonic</a></li>
+<li><a class="cow-url" href="http://led24.de/iconset/">LED icon set</a> for the icons used in directory
+ listings.</li>
</ul>

<p>...and lots of other <a class="cow-url" href="http://www.fsf.org">free and open source projects</a>.</p>
@@ -115,4 +117,4 @@
<p><em>...the strongest, in the existence of any social species, are those who are
the most social. In human terms, most ethical... There is no strength to be
gained from hurting one another. Only weakness.</em> (Ursula le Guin)</p>
-</body></html>
\ No newline at end of file
+</body></html>

Modified: trunk/cow/doc/acknowledgements.yam
===================================================================
--- trunk/cow/doc/acknowledgements.yam 2009-11-20 10:59:33 UTC (rev 1872)
+++ trunk/cow/doc/acknowledgements.yam 2009-11-20 15:39:43 UTC (rev 1873)
@@ -19,6 +19,8 @@
- %(http://www.springframework.org/, Spring)
- %(http://www.hibernate.org/, Hibernate)
- %(http://hsqldb.org/, Hypersonic)
+- %(http://led24.de/iconset/, LED icon set) for the icons used in directory
+ listings.

...and lots of other %(http://www.fsf.org,free and open source projects).

Modified: trunk/cow/grails-app/conf/Config.groovy
===================================================================
--- trunk/cow/grails-app/conf/Config.groovy 2009-11-20 10:59:33 UTC (rev 1872)
+++ trunk/cow/grails-app/conf/Config.groovy 2009-11-20 15:39:43 UTC (rev 1873)
@@ -252,7 +252,7 @@
info logfile:['grails.app.taglib.PageLinkTagLib',
'grails.app.bootstrap',
'grails.app.job.WikiRegenerationJob']
- debug logfile:['grails.app.realm.CowDbRealm']
+ error logfile:['grails.app.realm.CowDbRealm']

// subversion
warn logfile:'org.tmatesoft.svn.examples'

Modified: trunk/cow/grails-app/services/PageService.groovy
===================================================================
--- trunk/cow/grails-app/services/PageService.groovy 2009-11-20 10:59:33 UTC (rev 1872)
+++ trunk/cow/grails-app/services/PageService.groovy 2009-11-20 15:39:43 UTC (rev 1873)
@@ -729,7 +729,15 @@
return index
} // getIndexPage(File)

- /** Get a directory listing. If this is disallowed, returns null. */
+ /**
+ * Get a directory listing. If this is disallowed, returns null.
+ * Each item in the directory listing is a two-element list, the first
+ * element being the file name and the second element being a file type
+ * marker: ft_directory for directories, ft_htmlWithYam for HTML files that
+ * have a matching yam file, ft_<em>xxx</em> for a file whose extension
+ * following the last dot is <em>xxx</em>, and ft_unknown if this cannot be
+ * determined.
+ */
List getDirList(File pageFile, Wiki wiki) {
if(! wiki.directoryListingAllowed)
return null
@@ -742,14 +750,23 @@
pageFile.path.length() > wiki.path.length() &&
pageFile.path.startsWith(wiki.path)
)
- dirs << [ "..", false ]
+ dirs << [ "..", "ft_directory" ]
dirs.addAll(
FileUtils.dirList(pageFile).collect { f ->
- boolean yamExists =
- f.endsWith('.html') && new File(
+ String fileType = "ft_unknown"
+ if(new File(pageFile, f).isDirectory()) {
+ fileType = "ft_directory"
+ } else if(f.endsWith('.html') && new File(
pageFile.path + '/' + FileUtils.replaceFileSuffix(f, 'yam')
- ).exists()
- return [ f, yamExists ]
+ ).exists()) {
+ fileType = "ft_htmlWithYam"
+ } else {
+ int lastDot = f.lastIndexOf('.')
+ if(lastDot >= 0) {
+ fileType = "ft_${f.substring(lastDot + 1)}"
+ }
+ }
+ return [ f, fileType ]
}
)

Modified: trunk/cow/grails-app/views/page/_dirList.gsp
===================================================================
--- trunk/cow/grails-app/views/page/_dirList.gsp 2009-11-20 10:59:33 UTC (rev 1872)
+++ trunk/cow/grails-app/views/page/_dirList.gsp 2009-11-20 15:39:43 UTC (rev 1873)
@@ -1,13 +1,16 @@
<%@ page import="gate.util.FileUtils" %>
<h2>Directory: ${thisPage.pagePathDir.encodeAsHTML()}</h2>

-<ul>
+<ul class="dirList">
<g:each in="${thisPage.dirList}" var="dirEntry">
- <li>
+ <li class="${dirEntry[1]}">
+ <span class="deleteCheckbox">
+ <%-- Only show delete checkbox on files you are allowed to delete --%>
+ <cow:hasPermission wiki="${thisPage.wiki.id}" actions="delete" pagePath="${thisPage.pagePathDir + dirEntry[0]}">
+ <input type="checkbox" name="delete_${dirEntry[0]}"></input>
+ </cow:hasPermission>
+ </span>
<a href="${(dirEntry[0] - ~/\/$/).encodeAsURL()}">${dirEntry[0].encodeAsHTML()}</a>
- <g:if test="${dirEntry[1]}">
- <img src="${createLinkTo(dir:'_images',file:'yam-icon.png')}" alt="YAM" />
- </g:if>
</li>
</g:each>
</ul>

Added: trunk/cow/web-app/_images/filetypes/directory.png
===================================================================
(Binary files differ)

Property changes on: trunk/cow/web-app/_images/filetypes/directory.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

Added: trunk/cow/web-app/_images/filetypes/html+yam.png
===================================================================
(Binary files differ)

Property changes on: trunk/cow/web-app/_images/filetypes/html+yam.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

Added: trunk/cow/web-app/_images/filetypes/html.png
===================================================================
(Binary files differ)

Property changes on: trunk/cow/web-app/_images/filetypes/html.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

Added: trunk/cow/web-app/_images/filetypes/image.png
===================================================================
(Binary files differ)

Property changes on: trunk/cow/web-app/_images/filetypes/image.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

Added: trunk/cow/web-app/_images/filetypes/pdf.png
===================================================================
(Binary files differ)

Property changes on: trunk/cow/web-app/_images/filetypes/pdf.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

Added: trunk/cow/web-app/_images/filetypes/unknown.png
===================================================================
(Binary files differ)

Property changes on: trunk/cow/web-app/_images/filetypes/unknown.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

Added: trunk/cow/web-app/_images/filetypes/word.png
===================================================================
(Binary files differ)

Property changes on: trunk/cow/web-app/_images/filetypes/word.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

Modified: trunk/cow/web-app/css/page.css
===================================================================
--- trunk/cow/web-app/css/page.css 2009-11-20 10:59:33 UTC (rev 1872)
+++ trunk/cow/web-app/css/page.css 2009-11-20 15:39:43 UTC (rev 1873)
@@ -173,6 +173,50 @@
background-color: rgb(240, 240, 240);
}

+/* Directory listings */
+ul.dirList {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+}
+
+ul.dirList li {
+ padding-left: 20px;
+ background-position: center left;
+ background-repeat: no-repeat;
+ background-image: url(../_images/filetypes/unknown.png);
+}
+
+ul.dirList li.ft_html {
+ background-image: url(../_images/filetypes/html.png);
+}
+
+ul.dirList li.ft_htmlWithYam {
+ background-image: url(../_images/filetypes/html+yam.png);
+}
+
+ul.dirList li.ft_directory {
+ background-image: url(../_images/filetypes/directory.png);
+}
+
+ul.dirList li.ft_pdf {
+ background-image: url(../_images/filetypes/pdf.png);
+}
+
+ul.dirList li.ft_doc {
+ background-image: url(../_images/filetypes/word.png);
+}
+
+ul.dirList li.ft_gif,
+ul.dirList li.ft_jpg,
+ul.dirList li.ft_png {
+ background-image: url(../_images/filetypes/image.png);
+}
+
+ul.dirList li span.deleteCheckbox {
+ width: 20px;
+}
+
/* Menu support */
.menu, .menu ul {
list-style: none;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1872] trunk/cow/grails-app/conf/Config.groovy

2009-11-20T02:59:34Z

Revision: 1872
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1872&view=rev
Author: ian_roberts
Date: 2009-11-20 10:59:33 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Renamed the "props" variable (into which we load application.properties) to
avoid the name clash with the props config entry under grails.mail. This is
what was causing the problem with setting the JavaMail properties when the
grails.mail block is directly in Config.groovy rather than in .cowrc.groovy -
Groovy treats the 'props = [...]' assignment in the mail {} block as assigning
to the props global variable rather than setting the grails.mail.props config
entry.

The mail config is still commented out by default but will now work if simply
uncommented in Config.groovy as well as when moved to the external config file.

Modified Paths:
--------------
trunk/cow/grails-app/conf/Config.groovy

Modified: trunk/cow/grails-app/conf/Config.groovy
===================================================================
--- trunk/cow/grails-app/conf/Config.groovy 2009-11-20 10:19:23 UTC (rev 1871)
+++ trunk/cow/grails-app/conf/Config.groovy 2009-11-20 10:59:33 UTC (rev 1872)
@@ -28,21 +28,21 @@

// application.properties doesn't get loaded to grailsApplication.metadata
// before this, so load them here
-Properties props = new Properties()
+Properties grailsAppProperties = new Properties()
def propsStream = Config.class.getResourceAsStream('/application.properties')
if(propsStream) {
- props.load(propsStream)
+ grailsAppProperties.load(propsStream)
propsStream.close()
}
else {
println "Couldn't load application.properties from classpath, trying basedir"
new File(basedir, 'application.properties').withInputStream {
- props.load(it)
+ grailsAppProperties.load(it)
}
}
String dot = // don't use "." in the cow directory name on legacy systems
System.getProperty("os.name").toLowerCase().contains("windows") ? "" : "."
-String grailsVer = props.getProperty("app.grails.version")
+String grailsVer = grailsAppProperties.getProperty("app.grails.version")

// user directory is used for e.g. solr, sventon... note that basedir isn't
// always set in production mode. if you're running a separate container the
@@ -61,7 +61,7 @@
// gate.cow. ...
gate {
cow {
- version = props."app.version"
+ version = grailsAppProperties."app.version"
mode = cowMode
user.home = cowUserHome
data = "${user.home}/${dot}cowrc.d"
@@ -350,9 +350,6 @@

//mail setting for contact page
/*
-========================================
-*** MOVE THIS TO .cowrc.groovy *********
-========================================
gate.cow.contact.to = "<to address e.g. abc@...>"
grails {
mail {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1871] trunk/cow

2009-11-20T02:19:23Z

Revision: 1871
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1871&view=rev
Author: markagreenwood
Date: 2009-11-20 10:19:23 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
the startup and selenium tests now run on both http and https although I still haven't enabled forced redirection for the login page as this would still break the selenium tests

Modified Paths:
--------------
trunk/cow/build.xml
trunk/cow/scripts/RunSeleniumTests.groovy
trunk/cow/scripts/ServerStartTest.groovy

Modified: trunk/cow/build.xml
===================================================================
--- trunk/cow/build.xml 2009-11-19 22:05:20 UTC (rev 1870)
+++ trunk/cow/build.xml 2009-11-20 10:19:23 UTC (rev 1871)
@@ -439,7 +439,7 @@
overwrite="yes" />
<exec dir="." executable="${os.shell}" failonerror="${stop.build}">
<arg value='${os.shell.switches}' />
- <arg value="${grails-base} -Dserver.port=${gate.cow.server.port} -Dgate.cow.mode=@{mode} -Dtest.suite.prefix=@{test.suite.prefix} -Dgate.cow.user.home=${web.test.user.home} -Dratproxy=${use.ratproxy} test run-selenium-tests ${extra.webtest.args}" />
+ <arg value="${grails-base} -Dserver.port=${gate.cow.server.port} -Dserver.port.https=${gate.cow.server.port.https} -Dgate.cow.mode=@{mode} -Dtest.suite.prefix=@{test.suite.prefix} -Dgate.cow.user.home=${web.test.user.home} -Dratproxy=${use.ratproxy} test run-selenium-tests ${extra.webtest.args}" />
</exec>
<if>
<equals arg1="${use.ratproxy}" arg2="true"/>

Modified: trunk/cow/scripts/RunSeleniumTests.groovy
===================================================================
--- trunk/cow/scripts/RunSeleniumTests.groovy 2009-11-19 22:05:20 UTC (rev 1870)
+++ trunk/cow/scripts/RunSeleniumTests.groovy 2009-11-20 10:19:23 UTC (rev 1871)
@@ -71,7 +71,7 @@

target(runSelenium: "Run selenium tests, optionally starting a server") {
if (startServer) {
- depends(runApp)
+ depends(runAppHttps)
}

Ant.java(fork: "true", jar: "${basedir}/selenium/lib/selenium-server.jar",

Modified: trunk/cow/scripts/ServerStartTest.groovy
===================================================================
--- trunk/cow/scripts/ServerStartTest.groovy 2009-11-19 22:05:20 UTC (rev 1870)
+++ trunk/cow/scripts/ServerStartTest.groovy 2009-11-20 10:19:23 UTC (rev 1871)
@@ -48,5 +48,6 @@
}

target(runCow: "actually start up CoW") {
- depends(runApp)
+
+ depends(runAppHttps)
}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1868] trunk/cow/doc

2009-11-19T13:59:55Z

Revision: 1868
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1868&view=rev
Author: hcunningham
Date: 2009-11-19 21:59:54 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
link the other docs

Modified Paths:
--------------
trunk/cow/doc/gatewiki.html
trunk/cow/doc/gatewiki.yam

Modified: trunk/cow/doc/gatewiki.html
===================================================================
--- trunk/cow/doc/gatewiki.html 2009-11-19 18:09:36 UTC (rev 1867)
+++ trunk/cow/doc/gatewiki.html 2009-11-19 21:59:54 UTC (rev 1868)
@@ -472,7 +472,7 @@

<p>

-<table>
+<table border="1">
<tr><td> Title </td><td> First paragraph of the file. </td></tr>
<tr><td> Headings </td><td> <span class="cow-escape">%</span>1,<span class="cow-escape">%</span>2,etc.; <span class="cow-escape">%</span>1<span class="cow-escape">*</span> is unnumbered; follow with blank line </td></tr>
<tr><td> Bold, italic, teletype, underlined </td><td> <span class="cow-escape">*</span>...<span class="cow-escape">*</span>, <span class="cow-escape">_</span>...<span class="cow-escape">_</span>, <span class="cow-escape">^</span>...<span class="cow-escape">^</span>, <span class="cow-escape">_</span><span class="cow-escape">_</span>...<span class="cow-escape">_</span><span class="cow-escape">_</span> </td></tr>
@@ -776,7 +776,7 @@
%]
</pre>
<p>results in:</p>
-<table>
+<table border="1">
<tr><td> <b>header col 1</b> </td><td> <b>header col 2</b> </td></tr>
<tr><td> row 1 col 1 </td><td> col 2 </td></tr>
<tr><td> row 2 col 1 </td><td> col 2 </td></tr>
@@ -929,7 +929,10 @@
<p>The system has two modes, workstation and server; the former does no user
management, the latter uses JSecurity.</p>

+<p>There is API documentations etc. <a class="cow-url" href="index.html">linked from here</a>, and the top
+of the software documentation tree <a class="cow-url" href="../">is here</a>.</p>

+

<a class="cow-section-anchor" name="section-4.1."/><h2 class="cow-heading"><span class="cow-sec-number">4.1. </span>Roadmap</h2>

@@ -2063,7 +2066,7 @@

<p>The last two points can be summarised in this truth table</p>

-<table>
+<table border="1">
<tr><td>
</td><td>
</td><td><b>Include pattern</b>
@@ -2099,7 +2102,7 @@
</ul>

-<table>
+<table border="1">
<tr><td><b>Pattern</b>
</td><td><b>Note</b>
</td><td><b>Meaning as an include pattern</b>
@@ -2143,7 +2146,7 @@

<p><b>Some example pattern uses</b></p>

-<table>
+<table border="1">
<tr><td>Scenario
</td><td>Example use case
</td><td>Example include pattern
@@ -2224,7 +2227,7 @@
installation, there will be several pre-defined security objects that you can
use to get your installation up and running.</p>

-<table>
+<table border="1">
<tr><td><b>Type</b>
</td><td><b>Object</b>
</td><td><b>Description</b>
@@ -2644,7 +2647,7 @@
<p>Referencing events</p>
<ul>
<li>page or directory is
- <table>
+ <table border="1">
<tr><td> created </td><td> out-dates all linkers and includers </td></tr>
<tr><td> renamed </td><td> out-dates all linkers and includers </td></tr>
<tr><td> deleted </td><td> out-dates all linkers and includers </td></tr>
@@ -2718,12 +2721,12 @@
indication of how long it takes to do an <tt>svn st</tt> on the SALE tree (which is
more than 5Gb of data in more than 100,000 files.</p>

-<table>
+<table border="1">
<tr><td> <tt>svn st</tt> on the sale tree (from cold)
</td><td> <tt>svn st -u</tt> on sale (filesystem cached)
</td></tr>
<tr><td>
-<table>
+<table border="1">
<tr><td> First run </td><td> Tenth run </td></tr>
<tr><td>
<p>real 0m58.839s <br/>
@@ -2736,7 +2739,7 @@
</td></tr>
</table>
</td><td>
-<table>
+<table border="1">
<tr><td> First run </td><td> Tenth run </td></tr>
<tr><td>
<p>real 0m33.331s <br/>
@@ -3084,12 +3087,12 @@
<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>

<p>YAM has a plugin mechanism that involves writing a Java (or Groovy) class that
-implements <a class="cow-url" href="api/javadoc/index.html?gate/yam/YamPlugin.html">the YamPlugin
+implements <a class="cow-non-existant-url" href="api/javadoc/index.html?gate/yam/YamPlugin.html?m=1">the YamPlugin
interface</a>. Drop this class (which must be in the package <tt>gate.yam.plugins</tt>
into the classpath of the application hosting the YAM translator (e.g.
GATEWiki) and then you can make calls as described in the YAM documentation.</p>

-<p>See e.g. <a class="cow-url" href="api/javadoc/index.html?src-html/gate/yam/plugins/Twitter.html">the
+<p>See e.g. <a class="cow-non-existant-url" href="api/javadoc/index.html?src-html/gate/yam/plugins/Twitter.html?m=1">the
implementation of the Twitter plugin</a> for inspiration.</p>

<p>One of the things this is useful for is dropping snippets of HTML into YAM

Modified: trunk/cow/doc/gatewiki.yam
===================================================================
--- trunk/cow/doc/gatewiki.yam 2009-11-19 18:09:36 UTC (rev 1867)
+++ trunk/cow/doc/gatewiki.yam 2009-11-19 21:59:54 UTC (rev 1868)
@@ -330,7 +330,10 @@
The system has two modes, workstation and server; the former does no user
management, the latter uses JSecurity.

+There is API documentations etc. %(index.html, linked from here), and the top
+of the software documentation tree %(../, is here).

+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%2 Roadmap

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1867] trunk/cow/grails-app

2009-11-19T10:09:42Z

Revision: 1867
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1867&view=rev
Author: nirajaswani
Date: 2009-11-19 18:09:36 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
contact form

Modified Paths:
--------------
trunk/cow/grails-app/conf/Config.groovy
trunk/cow/grails-app/i18n/cow.properties

Added Paths:
-----------
trunk/cow/grails-app/controllers/ContactCommand.groovy
trunk/cow/grails-app/controllers/ContactController.groovy
trunk/cow/grails-app/views/contact/
trunk/cow/grails-app/views/contact/contact.gsp

Modified: trunk/cow/grails-app/conf/Config.groovy
===================================================================
--- trunk/cow/grails-app/conf/Config.groovy 2009-11-19 17:41:47 UTC (rev 1866)
+++ trunk/cow/grails-app/conf/Config.groovy 2009-11-19 18:09:36 UTC (rev 1867)
@@ -347,3 +347,20 @@
180000 // maxCaptchaStoreSize
)
}
+
+//mail setting for contact page
+/*
+========================================
+*** MOVE THIS TO .cowrc.groovy *********
+========================================
+gate.cow.contact.to = "<to address e.g. abc@...>"
+grails {
+ mail {
+ host = "<smtp host e.g. mailhost.dcs.shef.ac.uk>"
+ port = <smpt port e.g. 25>
+ username = "<username>"
+ password = "<password>"
+ props = ["mail.smtp.auth":"true"] // java mail properties
+ }
+}
+*/

Added: trunk/cow/grails-app/controllers/ContactCommand.groovy
===================================================================
--- trunk/cow/grails-app/controllers/ContactCommand.groovy (rev 0)
+++ trunk/cow/grails-app/controllers/ContactCommand.groovy 2009-11-19 18:09:36 UTC (rev 1867)
@@ -0,0 +1,30 @@
+/*
+ * ContactCommand.groovy
+ * Copyright (c) 1998-2008, The University of Sheffield.
+ *
+ * This code is from the GATE project (http://gate.ac.uk/) and is free
+ * software licenced under the GNU General Public License version 3. It is
+ * distributed without any warranty. For more details see COPYING.txt in the
+ * top level directory (or at http://gatewiki.sf.net/COPYING.txt).
+ */
+
+/*
+ * This class is instantiated each time a user is trying to contact. It
+ * contains all the constraints on contact form.
+ */
+
+
+class ContactCommand {
+
+ String name
+ String email
+ String subject
+ String emailBody
+
+ static constraints = {
+ name(blank: false, nullable: false)
+ email(email: true, nullable: false, blank: false)
+ subject(blank: false, nullable: false)
+ emailBody(blank: false, nullable: false)
+ }
+}

Property changes on: trunk/cow/grails-app/controllers/ContactCommand.groovy
___________________________________________________________________
Added: svn:eol-style
+ native

Added: trunk/cow/grails-app/controllers/ContactController.groovy
===================================================================
--- trunk/cow/grails-app/controllers/ContactController.groovy (rev 0)
+++ trunk/cow/grails-app/controllers/ContactController.groovy 2009-11-19 18:09:36 UTC (rev 1867)
@@ -0,0 +1,101 @@
+/*
+ * ContactController.groovy
+ * Copyright (c) 1998-2008, The University of Sheffield.
+ *
+ * This code is from the GATE project (http://gate.ac.uk/) and is free
+ * software licenced under the GNU General Public License version 3. It is
+ * distributed without any warranty. For more details see COPYING.txt in the
+ * top level directory (or at http://gatewiki.sf.net/COPYING.txt).
+ */
+
+
+import gate.cow.CowUtils
+
+/* A controller for contact page */
+class ContactController {
+
+ /** jcaptcha service */
+ def jcaptchaService
+
+ // get the config
+ Map conf = CowUtils.config.gate.cow
+
+ /** Display the contact form */
+ def index = {
+ // empty contact to begin with
+ def contactCmd
+
+ // no message
+ flash.message = ""
+
+ // form should be displayed
+ def showForm = true
+
+ // unless, to address is not provided
+ if(!conf.contact.to) {
+ log.error("gate.cow.contact.to parameter missing. Please set it in " +
+ ".cowrc.groovy and make sure other mail plugin settings are " +
+ "provided.")
+ flash.error = message(code: 'cow.contact.missingParameter.toAddress')
+ showForm = false
+ }
+
+ // render the contact page
+ render(view: "contact", model:[contactInfo:contactCmd, showForm:showForm])
+ }
+
+ /** Send email */
+ def send = {
+
+ // params into ContactCommand
+ ContactCommand contactCmd ->
+
+ // this is the model, showForm set to true, incase something is wrong
+ def model = [contactInfo: contactCmd, showForm:true]
+
+ // anythign wrong?
+ if(contactCmd.hasErrors()) {
+ render(view: "contact", model:model)
+ return
+ }
+
+ // has user provided correct captcha characters?
+ if(!jcaptchaService.validateResponse("image", session.id,
+ params.response)) {
+ flash.error = message(code: 'cow.contact.invalidCaptcha')
+ render(view: "contact", model:model)
+ return
+ }
+
+ // generating summary for the person trying to contact
+ def summary = "Message :<br>" +
+ "Your name : " + params.name + "<br>" +
+ "Your email : " + params.email + "<br>" +
+ "Subject : " + params.subject + "<br>" +
+ "Body : <br>" + params.emailBody
+
+ // sending email using grail's mail plugin
+ // if the mail settings are not set, this could lead to several
+ // unexplained exceptions - printing them on server log
+ // but a nice message to the user
+ try {
+ sendMail {
+ to conf.contact.to, params.email
+ from params.email
+ subject params.subject
+ body "From:" + params.name + "\n\n" + params.emailBody
+ }
+ } catch(Throwable e) {
+ StringWriter sw = new StringWriter();
+ e.printStackTrace(new PrintWriter(sw));
+ log.error("Problem sending email:" + sw.toString())
+ flash.error = message(code: 'cow.contact.mailServerSettings')
+ render(view: "contact", model:[showForm:false])
+ return
+ }
+
+ // print success message
+ flash.message = message(code: 'cow.contact.success')
+ render(view: "contact", model:[showForm:false, summary:summary])
+ }
+}

Property changes on: trunk/cow/grails-app/controllers/ContactController.groovy
___________________________________________________________________
Added: svn:eol-style
+ native

Modified: trunk/cow/grails-app/i18n/cow.properties
===================================================================
--- trunk/cow/grails-app/i18n/cow.properties 2009-11-19 17:41:47 UTC (rev 1866)
+++ trunk/cow/grails-app/i18n/cow.properties 2009-11-19 18:09:36 UTC (rev 1867)
@@ -65,3 +65,9 @@
cow.webflow.error.svn.auth=Subversion authentication error. Please ask your site administrator to check the authentication profile for this wiki.
cow.webflow.error.svn=Error accessing subversion repository: {0}
cow.webflow.error=Exception occurred in web flow: {0}
+
+#contact
+cow.contact.missingParameter.toAddress=This service is temporarily not available. Sorry for the inconvenience.
+cow.contact.invalidCaptcha=Characters entered do not match the image.
+cow.contact.success=Message Sent Successfully!
+cow.contact.mailServerSettings=Error while sending email. Sorry for the inconvenience.

Added: trunk/cow/grails-app/views/contact/contact.gsp
===================================================================
--- trunk/cow/grails-app/views/contact/contact.gsp (rev 0)
+++ trunk/cow/grails-app/views/contact/contact.gsp 2009-11-19 18:09:36 UTC (rev 1867)
@@ -0,0 +1,103 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <g:layoutLink id="${id}"/>
+ <g:cowTitle pageName="Contact" />
+ </head>
+ <body>
+
+ <g:if test="${flash.message}">
+ <div class="message">${flash.message}</div>
+ </g:if>
+ <g:hasErrors>
+ <div class="errors">
+ <g:renderErrors as="list" model="${[contactInfo:contactInfo]}"/>
+ </div>
+ </g:hasErrors>
+ <g:if test="${flash.error}">
+ <div class="errors">
+ <ul><li>${flash.error}</li></ul>
+ </div>
+ </g:if>
+
+ <div style="clear:both">
+ <g:if test="${showForm}">
+ <h1>${gate.cow.CowUtils.getConfig().gate.cow.contact.title}</h1>
+
+ <p>${gate.cow.CowUtils.getConfig().gate.cow.contact.heading}</p>
+ <hr/>
+
+ <g:form>
+ <table>
+ <tbody>
+ <tr class="prop">
+ <td valign="top" class="name">
+ <label for="name">Your name:</label>
+ </td>
+ <td valign="top"
+ class="value ${hasErrors(field:'name','errors')}">
+ <input type="text" id="name" name="name"
+ value="${fieldValue(bean:contactInfo,field:'name')}"
+ tabindex="1"/>
+ </td>
+ </tr>
+
+ <tr class="prop">
+ <td valign="top" class="name">
+ <label for="email">Your email address:</label>
+ </td>
+ <td valign="top"
+ class="value ${hasErrors(field:'email','errors')}">
+ <input type="text" id="email" name="email"
+ value="${fieldValue(bean:contactInfo,field:'email')}"
+ tabindex="2"/>
+ </td>
+ </tr>
+
+ <tr class="prop">
+ <td valign="top" class="name">
+ <label for="subject">Subject:</label>
+ </td>
+ <td valign="top"
+ class="value ${hasErrors(field:'subject','errors')}">
+ <input type="text" id="subject" name="subject"
+ value="${fieldValue(bean:contactInfo,field:'subject')}"
+ tabindex="3"/>
+ </td>
+ </tr>
+
+ <tr class="prop">
+ <td valign="top" class="name">
+ <label for="emailBody">Body:</label>
+ </td>
+ <td valign="top"
+ class="value ${hasErrors(field:'emailBody','errors')}">
+ <textarea rows="10" cols="60" id="emailBody" name="emailBody"
+ tabindex="4">${fieldValue(bean:contactInfo,field:'emailBody')}</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td/>
+ <td><jcaptcha:jpeg name="image"/></td>
+ </tr>
+ <tr>
+ <td>Enter the above characters:</td>
+ <td><input type="text" name="response" value=""
+ tabindex="5"/></td>
+ </tr>
+
+ <tr>
+ <td/>
+ <td><g:actionSubmit value="Send" tabindex="6"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </g:form>
+ </g:if>
+ <g:if test="${summary}">
+ <p>${summary}</p>
+ </g:if>
+ </div>
+ </body>
+</html>

Property changes on: trunk/cow/grails-app/views/contact/contact.gsp
___________________________________________________________________
Added: svn:eol-style
+ native

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1866] trunk/cow/selenium/tests/solr-indexing.html

2009-11-19T09:41:47Z

Revision: 1866
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1866&view=rev
Author: nirajaswani
Date: 2009-11-19 17:41:47 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
fix the selenium test for solr - not sure why it started failing though - could a / at the end make a difference? - has something changed in url mapping that doesn't allow this?

Modified Paths:
--------------
trunk/cow/selenium/tests/solr-indexing.html

Modified: trunk/cow/selenium/tests/solr-indexing.html
===================================================================
--- trunk/cow/selenium/tests/solr-indexing.html 2009-11-19 14:31:49 UTC (rev 1865)
+++ trunk/cow/selenium/tests/solr-indexing.html 2009-11-19 17:41:47 UTC (rev 1866)
@@ -43,7 +43,7 @@
</tr>
<tr>
<td>clickAndWait</td>
- <td>//a[contains(@href, '/g8/admin/administerIndex/2/')]</td>
+ <td>//a[contains(@href, '/g8/admin/administerIndex/2')]</td>
<td></td>
</tr>
<tr>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1865] trunk/cow/jmeter/get-index-html.jmx

2009-11-19T06:31:49Z

Revision: 1865
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1865&view=rev
Author: markagreenwood
Date: 2009-11-19 14:31:49 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
improved load testing project

Modified Paths:
--------------
trunk/cow/jmeter/get-index-html.jmx

Modified: trunk/cow/jmeter/get-index-html.jmx
===================================================================
--- trunk/cow/jmeter/get-index-html.jmx 2009-11-19 14:29:22 UTC (rev 1864)
+++ trunk/cow/jmeter/get-index-html.jmx 2009-11-19 14:31:49 UTC (rev 1865)
@@ -50,13 +50,11 @@
<stringProp name="HTTPSampler.embedded_url_re"></stringProp>
</HTTPSampler>
<hashTree>
- <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="200 Response Code" enabled="true">
- <collectionProp name="Asserion.test_strings">
- <stringProp name="49586">200</stringProp>
- </collectionProp>
- <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+ <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+ <collectionProp name="Asserion.test_strings"/>
+ <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
<boolProp name="Assertion.assume_success">false</boolProp>
- <intProp name="Assertion.test_type">8</intProp>
+ <intProp name="Assertion.test_type">2</intProp>
</ResponseAssertion>
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Content Check" enabled="true">
@@ -70,6 +68,38 @@
<hashTree/>
</hashTree>
</hashTree>
+ <ResultCollector guiclass="AssertionVisualizer" testclass="ResultCollector" testname="Assertion Results" enabled="true">
+ <boolProp name="ResultCollector.error_logging">true</boolProp>
+ <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>true</time>
+ <latency>true</latency>
+ <timestamp>true</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>false</samplerData>
+ <xml>true</xml>
+ <fieldNames>false</fieldNames>
+ <responseHeaders>false</responseHeaders>
+ <requestHeaders>false</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ </value>
+ </objProp>
+ <stringProp name="filename"></stringProp>
+ </ResultCollector>
+ <hashTree/>
<ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="true">
<boolProp name="ResultCollector.error_logging">false</boolProp>
<objProp>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1864] trunk/cow/selenium

2009-11-19T06:29:25Z

Revision: 1864
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1864&view=rev
Author: markagreenwood
Date: 2009-11-19 14:29:22 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
changed from *chrome to *firefox as it is supposed to handle SSL stuff better and *chrome is deprecated according to the selenium documentation

Modified Paths:
--------------
trunk/cow/selenium/test-selenium.properties.default
trunk/cow/selenium/test-selenium.properties.ubuntu

Modified: trunk/cow/selenium/test-selenium.properties.default
===================================================================
--- trunk/cow/selenium/test-selenium.properties.default 2009-11-19 13:45:35 UTC (rev 1863)
+++ trunk/cow/selenium/test-selenium.properties.default 2009-11-19 14:29:22 UTC (rev 1864)
@@ -2,4 +2,4 @@
# a new file called test-selenium.properties in the same directory, and set the
# values in there.

-browser=*chrome
+browser=*firefox

Modified: trunk/cow/selenium/test-selenium.properties.ubuntu
===================================================================
--- trunk/cow/selenium/test-selenium.properties.ubuntu 2009-11-19 13:45:35 UTC (rev 1863)
+++ trunk/cow/selenium/test-selenium.properties.ubuntu 2009-11-19 14:29:22 UTC (rev 1864)
@@ -1,4 +1,4 @@
# ubuntu-friendly setting - copy to test-selenium.properties
# (change the firefox version as appropriate)

-browser=*chrome /usr/lib/firefox-3.0.14/firefox
+browser=*firefox /usr/lib/firefox-3.0.14/firefox

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1862] trunk/cow/grails-app/i18n/cow.properties

2009-11-19T05:27:13Z

Revision: 1862
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1862&view=rev
Author: hcunningham
Date: 2009-11-19 13:27:13 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
changed "Top" to "Home"

Modified Paths:
--------------
trunk/cow/grails-app/i18n/cow.properties

Modified: trunk/cow/grails-app/i18n/cow.properties
===================================================================
--- trunk/cow/grails-app/i18n/cow.properties 2009-11-19 13:20:50 UTC (rev 1861)
+++ trunk/cow/grails-app/i18n/cow.properties 2009-11-19 13:27:13 UTC (rev 1862)
@@ -58,8 +58,8 @@
cow.index.emptyIndex=No index available for this area of the site. Please ask your site administrator to index the area.
cow.index.errorInMatchingPrefix=Failed to match hit prefix; this probably means the sandbox was moved on disk and the index needs regenerating.

-#breadcrumbs
-cow.areaTop.name=Top
+# Breadcrumbs
+cow.areaTop.name=Home

# Web flow errors
cow.webflow.error.svn.auth=Subversion authentication error. Please ask your site administrator to check the authentication profile for this wiki.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1861] trunk/cow/doc

2009-11-19T05:20:50Z

Revision: 1861
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1861&view=rev
Author: hcunningham
Date: 2009-11-19 13:20:50 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
backlogged docs jobs

Modified Paths:
--------------
trunk/cow/doc/cow-backlog.html
trunk/cow/doc/cow-backlog.yam

Modified: trunk/cow/doc/cow-backlog.html
===================================================================
--- trunk/cow/doc/cow-backlog.html 2009-11-19 13:18:45 UTC (rev 1860)
+++ trunk/cow/doc/cow-backlog.html 2009-11-19 13:20:50 UTC (rev 1861)
@@ -117,7 +117,8 @@
sins [HC]</li>
<li>migration: set up duplicate of existing apache server first then do janet
swap [IR, HC]</li>
- <li>get the hudson jobs to also do doc and to push the results [IR]</li>
+ <li>get the hudson jobs to also do doc and to push the results (and the test
+ results - see the links from cow/doc/index.html) [IR]</li>
<li>fix the doc build which currently runs out of RAM on YamFormatter.java
(use the grails doc target instead of groovydoc, and add more RAM / the
normal classpath)</li>

Modified: trunk/cow/doc/cow-backlog.yam
===================================================================
--- trunk/cow/doc/cow-backlog.yam 2009-11-19 13:18:45 UTC (rev 1860)
+++ trunk/cow/doc/cow-backlog.yam 2009-11-19 13:20:50 UTC (rev 1861)
@@ -44,7 +44,8 @@
sins [HC]
- migration: set up duplicate of existing apache server first then do janet
swap [IR, HC]
- - get the hudson jobs to also do doc and to push the results [IR]
+ - get the hudson jobs to also do doc and to push the results (and the test
+ results - see the links from cow/doc/index.html) [IR]
- fix the doc build which currently runs out of RAM on YamFormatter.java
(use the grails doc target instead of groovydoc, and add more RAM / the
normal classpath)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1860] trunk/cow/doc

2009-11-19T05:18:45Z

Revision: 1860
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1860&view=rev
Author: hcunningham
Date: 2009-11-19 13:18:45 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
backlogged docs jobs

Modified Paths:
--------------
trunk/cow/doc/cow-backlog.html
trunk/cow/doc/cow-backlog.yam

Modified: trunk/cow/doc/cow-backlog.html
===================================================================
--- trunk/cow/doc/cow-backlog.html 2009-11-19 12:34:20 UTC (rev 1859)
+++ trunk/cow/doc/cow-backlog.html 2009-11-19 13:18:45 UTC (rev 1860)
@@ -117,6 +117,10 @@
sins [HC]</li>
<li>migration: set up duplicate of existing apache server first then do janet
swap [IR, HC]</li>
+ <li>get the hudson jobs to also do doc and to push the results [IR]</li>
+ <li>fix the doc build which currently runs out of RAM on YamFormatter.java
+ (use the grails doc target instead of groovydoc, and add more RAM / the
+ normal classpath)</li>
</ul></li>
<li>some subset of misc bugs (below)</li>
<li>start doing a regen cron on gau-main-tree somewhere [HC]</li>

Modified: trunk/cow/doc/cow-backlog.yam
===================================================================
--- trunk/cow/doc/cow-backlog.yam 2009-11-19 12:34:20 UTC (rev 1859)
+++ trunk/cow/doc/cow-backlog.yam 2009-11-19 13:18:45 UTC (rev 1860)
@@ -44,6 +44,10 @@
sins [HC]
- migration: set up duplicate of existing apache server first then do janet
swap [IR, HC]
+ - get the hudson jobs to also do doc and to push the results [IR]
+ - fix the doc build which currently runs out of RAM on YamFormatter.java
+ (use the grails doc target instead of groovydoc, and add more RAM / the
+ normal classpath)
- some subset of misc bugs (below)
- start doing a regen cron on gau-main-tree somewhere [HC]
- tell grails to also run on https and get jetty to redirect logins there

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1859] trunk/cow/doc

2009-11-19T04:34:20Z

Revision: 1859
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1859&view=rev
Author: hcunningham
Date: 2009-11-19 12:34:20 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
some done tasks

Modified Paths:
--------------
trunk/cow/doc/cow-backlog.html
trunk/cow/doc/cow-backlog.yam
trunk/cow/doc/cow-done.html
trunk/cow/doc/cow-done.yam

Modified: trunk/cow/doc/cow-backlog.html
===================================================================
--- trunk/cow/doc/cow-backlog.html 2009-11-19 12:32:42 UTC (rev 1858)
+++ trunk/cow/doc/cow-backlog.html 2009-11-19 12:34:20 UTC (rev 1859)
@@ -69,7 +69,6 @@
<li>CSS the twitter div a little to make it different (diff colour? make the
URLs within it smaller to hide their ugliness?) [IR]</li>
</ul></li>
-<li>user guide to logging in, editing etc., revise <a class="cow-url" href="gatewiki.html">gatewiki.html</a> [HC]</li>
<li>buy a ssl certificate for <span class="cow-escape">*</span>.gate.ac.uk [HC]</li>
<li>analyse the security holes found by ratproxy [MG]</li>
<li>load testing [MG]</li>
@@ -88,8 +87,6 @@
the captcha setup) and allows sending of an email to gate.cow.</li>
</ul></li>
</ul></li>
-<li>frame the mailing list archives (sf, gmane, ...) on
- new-trunk/gau-main-tree/mail/archives.html (not a yam page, just html) [NA]</li>
<li>jape yamalyser [HC, NA]
<ul>
<li>fix tests for YamPrettyTranslator</li>

Modified: trunk/cow/doc/cow-backlog.yam
===================================================================
--- trunk/cow/doc/cow-backlog.yam 2009-11-19 12:32:42 UTC (rev 1858)
+++ trunk/cow/doc/cow-backlog.yam 2009-11-19 12:34:20 UTC (rev 1859)
@@ -13,7 +13,6 @@
- g8rs.net [HC, IR]
- CSS the twitter div a little to make it different (diff colour? make the
URLs within it smaller to hide their ugliness?) [IR]
-- user guide to logging in, editing etc., revise %(gatewiki.html) [HC]
- buy a ssl certificate for \*.gate.ac.uk [HC]
- analyse the security holes found by ratproxy [MG]
- load testing [MG]
@@ -26,8 +25,6 @@
- gate.cow.ContactController with a single default action which
- displays a captcha (see RegisterController and also Config.groovy for
the captcha setup) and allows sending of an email to gate.cow.
-- frame the mailing list archives (sf, gmane, ...) on
- new-trunk/gau-main-tree/mail/archives.html (not a yam page, just html) [NA]
- jape yamalyser [HC, NA]
- fix tests for YamPrettyTranslator
- switch on the old yam-html-yam test again

Modified: trunk/cow/doc/cow-done.html
===================================================================
--- trunk/cow/doc/cow-done.html 2009-11-19 12:32:42 UTC (rev 1858)
+++ trunk/cow/doc/cow-done.html 2009-11-19 12:34:20 UTC (rev 1859)
@@ -2409,5 +2409,8 @@
<li>upload of .zip of a directory claims to work but creates a zero-length
file for directories</li>
</ul></li>
+<li>frame the mailing list archives (sf, gmane, ...) on
+ new-trunk/gau-main-tree/mail/archives.html (not a yam page, just html) [NA]</li>
+<li>user guide to logging in, editing etc., revise <a class="cow-url" href="gatewiki.html">gatewiki.html</a> [HC]</li>
</ul>
</body></html>

Modified: trunk/cow/doc/cow-done.yam
===================================================================
--- trunk/cow/doc/cow-done.yam 2009-11-19 12:32:42 UTC (rev 1858)
+++ trunk/cow/doc/cow-done.yam 2009-11-19 12:34:20 UTC (rev 1859)
@@ -1665,3 +1665,6 @@
- upload of .tgz fails without message
- upload of .zip of a directory claims to work but creates a zero-length
file for directories
+- frame the mailing list archives (sf, gmane, ...) on
+ new-trunk/gau-main-tree/mail/archives.html (not a yam page, just html) [NA]
+- user guide to logging in, editing etc., revise %(gatewiki.html) [HC]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1858] trunk/cow/doc

2009-11-19T04:32:43Z

Revision: 1858
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1858&view=rev
Author: hcunningham
Date: 2009-11-19 12:32:42 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
updated the user guide

Modified Paths:
--------------
trunk/cow/doc/gatewiki.html
trunk/cow/doc/gatewiki.yam
trunk/cow/doc/yam/yam-summary.html
trunk/cow/doc/yam/yam-summary.yam
trunk/cow/doc/yam/yam-syntax.html
trunk/cow/doc/yam/yam-syntax.yam

Added Paths:
-----------
trunk/cow/doc/test-image.png

Modified: trunk/cow/doc/gatewiki.html
===================================================================
--- trunk/cow/doc/gatewiki.html 2009-11-19 11:19:09 UTC (rev 1857)
+++ trunk/cow/doc/gatewiki.html 2009-11-19 12:32:42 UTC (rev 1858)
@@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<meta name="generator" content="cow"/>
-<title>GATEWiki: Users and Developers Guide</title>
+<title>GATEWiki: User and Developer Guide</title>
<style type="text/css">
/*<![CDATA[*/

<a class="cow-section-anchor" name="section-1."/><h1 class="cow-heading"><span class="cow-sec-number">1. </span>Introduction</h1>

@@ -163,7 +169,7 @@
dreamt of saying. Wouldn't it be nice to be able to view your filesystem as a
website, to be able to edit from multiple machines with and without network
connections, to be able to have your own local copy and also share it with
-friends and colleagues, and to not have to worry about merging it all back
+friends and colleagues, and not have to worry about merging it all back
together?</p>

<p>GATEWiki, or CoW, is a "Controllable Wiki" and CMS that supports collaborative
@@ -175,40 +181,23 @@
<a class="cow-url" href="http://gate.ac.uk/">http://gate.ac.uk/</a>).</p>

<p>GATEWiki is based on <a class="cow-url" href="acknowledgements.html">Grails, Groovy, Subversion,
-Selenium and J2EE</a>, and is hosted on SourceForge in the
+Selenium and Java</a>, and is hosted on SourceForge in the
<a class="cow-url" href="http://www.sourceforge.net/projects/gatewiki">GATEWiki project</a>.</p>

-<p>Currently CoW includes:</p>

-<ul>
-<li>a wiki language with a JavaCC parser</li>
-<li>a CMS persistence and versioning backend using Subversion</li>
-<li>simple display and edit of wiki pages and other static content using
- <a class="cow-url" href="http://www.grails.org/">Grails</a></li>
-<li>a version of the Grails JSecurity plugin that includes editing
- of the user data and assigns permissions to wiki areas and directories</li>
-<li>user registration using the JCaptcha plugin</li>
-<li>webtests using <a class="cow-url" href="http://selenium.seleniumhq.org/">Selenium</a></li>
-<li>a minimal Hypersonic DB to store pointers to wiki areas and
- user/role/permission data)</li>
-</ul>
-
-<p>The system has two modes, workstation and server; the former does no user
-management, the latter uses JSecurity.</p>
-
-

<a class="cow-section-anchor" name="section-2."/><h1 class="cow-heading"><span class="cow-sec-number">2. </span>Overview</h1>

<p>Wikis are about allowing groups of people to create and edit sets of
interlinked web pages with minimal effort and minimal learning of software
conventions and features. Typically they achieve this by</p>
+
<ul>
<li>having an edit link from each page that runs a browser-based editor</li>
<li>allowing pages to be written in simple plain text with a small number of
formatting conventions (e.g. <b><span class="cow-escape">*</span>bold<span class="cow-escape">*</span></b>)</li>
<li>supporting creation of pages by directing links for non-existent pages to
- a create and edit page</li>
+ a create page</li>
<li>allowing multiple users to use the system simultaneously (and sometimes to
edit the same document simultaneously)</li>
</ul>
@@ -238,8 +227,10 @@
data in semantic repositories whose schema is user-defined and maintained</li>
</ul>

-<p>No available wiki in Java that we could find has good SVN support. Using SVN
-as a backend gives us:</p>
+<p>Why another wiki? When we started the work no available wiki in Java that we
+could find had good SVN support (and we have 55GB of data stored in our SVN
+repositories!). Using SVN as a backend gives us:</p>
+
<ul>
<li>off-line edit - simply checkout the pages and edit to your heart's content
while off-line</li>
@@ -248,7 +239,7 @@
difference between versions and so on</li>
<li>a stable and reliable versionning system that's been proved in production
use by 000,000s of developers</li>
-<li>concurrent editing</li>
+<li>concurrent editing without locking</li>
</ul>

<p>CoW is partly intended to be an experimental framework for a new type of
@@ -272,12 +263,74 @@

<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>

-<p><b>This is incomplete :-(</b></p>
+<p>In general using GATEWiki should be easy enough not to need a manual. To edit
+click the "edit" link, for example. A few things have some subtlety, though,
+and these are described here. A working knowledge of
+<a class="cow-url" href="http://subversion.tigris.org/">Subversion</a> will also help if you want to
+exploit the system to the full.</p>


-<a class="cow-section-anchor" name="section-3.1."/><h2 class="cow-heading"><span class="cow-sec-number">3.1. </span>Modes</h2>

+<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>
+
+
+<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>
+
+<p>A GATEWiki website sits on top of <b>a normal tree of files and directories</b>
+(for example on the <a class="cow-url" href="http://gate.ac.uk/">GATE.ac.uk site</a> this page lives in
+<tt>/gatewiki/cow/doc/gatewiki.html</tt>.</p>
+
+<p>When <b>editing and linking</b> pages or images or other files what you are doing
+is simple operations over the file tree. So, for example, if you wanted to
+<b>add an image</b> to this page, you would follow the "Directory" link, use
+"Upload" to add your image file to this directory, and then place it in this
+page by refering to it from here (perhaps by typing
+<tt><span class="cow-escape">%</span>image(your-new-image.png)</tt> during an
+<a class="cow-url" href="#editing">edit session</a>). If you later want to refer to it from a different
+site, for example, the image will be available on the GATEWiki server as
+<tt>/gatewiki/cow/doc/your-new-image.png</tt>.</p>
+
+<p>To <b>link to another page</b> in the same directory just use the file name, e.g.
+<a class="cow-url" href="index.html">this link is to "index.html"</a>.</p>
+
+<p>To <b>link to a directory</b> (which will be either a list of the files it
+contains, or the index.html file if it exists) just use the directory name,
+e.g. <a class="cow-url" href="yam/">this link is to the "yam" subdirectory</a>.</p>
+
+
+
+<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>
+
+<p>To <b>create a new page</b> first navigate to the directory where you want the file
+to be placed (click on the "Directory" link from any page in that directory).
+You can see directory name in two places:</p>
+
+<ul>
+<li>the URL that you're reading, e.g. in the URL
+ <a class="cow-url" href="http://gate.ac.uk/gatewiki/cow/doc/gatewiki.html">http://gate.ac.uk/gatewiki/cow/doc/gatewiki.html</a> the directory is
+ <tt>gatewiki/cow/doc</tt></li>
+<li>the list of breadcrumbs in the top bar (starting from "Home" and working
+ down to your current location, e.g. <tt>Home > gatewiki > cow > doc</tt></li>
+</ul>
+
+<p>From the directory view you can create a new wiki page or new directory using
+the "New page" dialog. If you give a ".html" file name you will create a new
+wiki page; if you give a "name-without-dots" you will create a new directory.
+(For other file types use "Upload" instead.)</p>
+
+<p>To <b>edit a page</b> simply click "Edit" from the page. You can use a normal
+word-processor style editor (the "rich editor") or a web form. In the latter
+case the text is written in <a class="cow-url" href="#yam">YAM, a very simple markup language</a>.</p>
+
+<p>To edit the directory tree off-line simply check out the tree from its
+repository (you'll need the location of this and the relevant permissions, of
+course).</p>
+
+
+
+<a class="cow-section-anchor" name="section-3.2."/><h2 class="cow-heading"><span class="cow-sec-number">3.2. </span>Modes</h2>
+
<p>CoW has two operational modes:</p>
<ul>
<li><b>Workstation mode</b>, where it runs on a personal machine and works off file
@@ -295,35 +348,7 @@
<p>When you use CoW on your own machine it will be in workstation mode; when
you're using it over the web on another machine it will be in server mode.</p>

-
-<a class="cow-section-anchor" name="section-3.2."/><h2 class="cow-heading"><span class="cow-sec-number">3.2. </span>Subversion versions</h2>

-<p>Wiki areas in CoW are subversion sandbox directories. There are many different
-versions of the subversion Java and command line tools, and each version is
-associated with a particular format of the control files under the <tt>.svn</tt>
-directory in the sandbox. Generally speaking, later versions of subversion
-tools can read sandboxes created by earlier versions, but in doing so they
-transparently "upgrade" the sandbox to the newer format. Once this happens in
-a particular sandbox, that sandbox will no longer be readable by the earlier
-version.</p>
-
-<p>CoW's subversion support is provided by the <a class="cow-url" href="http://svnkit.com">SVNKit</a>
-library, version 1.2.0, which works with the same working copy format as the
-1.5 series <tt>svn</tt> command-line tool. This means that:</p>
-
-<ul>
-<li>If you use CoW with a sandbox that was created by <tt>svn</tt> version 1.4 or
- earlier, that sandbox will no longer be usable by the 1.4 version
- command-line tools.</li>
-<li>If you use 1.6-series command-line tools on a sandbox, that sandbox will no
- longer be readable by CoW.</li>
-</ul>
-
-<p>If you intend to use CoW in workstation mode you must use a 1.5-series
-command-line client. If your command-line client is version 1.6 you will need
-to upgrade the <tt>svnkit</tt> JAR used by CoW to version 1.3.0 (which speaks the 1.6
-protocol).</p>
-

<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>

@@ -341,7 +366,8 @@
<li>edit an existing page and add a relative link to a non-existent wiki page
(the wiki will then link this to a "create new page" facility)</li>
<li>use the "new page" link from directory listings</li>
-<li>create new files under your wiki-managed SVN sandbox</li>
+<li>create new files under your wiki-managed SVN sandbox (which CoW will then
+ pull in via a periodic update)</li>
</ul>

<p>Dependent on the type of name you choose for your page (either <tt><span class="cow-escape">*</span>.html</tt> or a
@@ -367,17 +393,19 @@


-<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>

-<p>When you have permission to edit a page that you're viewing, two links will
-appear:</p>
+<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>

+<p>When you have permission to edit a page that you're viewing an edit link will
+appear. Two types of editor are available:</p>
+
<ol>
-<li>"Edit": this will start a WYSIWYG editor (FCK Edit)</li>
-<li>"(with form)": this will forward to a web form page to edit the wiki page
- with</li>
+<li>a WYSIWYG editor (FCK Edit)</li>
+<li>a web form page</li>
</ol>

+<p>To change between these types use the "Switch to..." button.</p>
+
<p>When using 1., you can generally ignore <a class="cow-url" href="yam/yam-syntax.html">YAM syntax</a>
and work like you do in a word processor - e.g. hit the "B" button to make
text bold, or the "<em>I</em>" button to make it italic, etc. When you're finished,
@@ -388,9 +416,20 @@

<p>When using 2. use <a class="cow-url" href="yam/yam-syntax.html">YAM syntax</a> (here's a short
<a class="cow-url" href="yam/yam-summary.html">summary</a>, which also appears below the form while
-editing), <a class="cow-url" href="#yam">and below</a>.</p>
+editing, <a class="cow-url" href="#yam">and below</a>).</p>

-<p>When doing a preview of an edit in the form editor (2.), clicking on a
+<p>In both cases when you finish an edit<span class="cow-footnote" name="footnote2"><sup><a href="#footnote2">2</a></sup></span> CoW will try and check in your changes to the parent repository. At
+this point it checks to see if another user has modified the same file while
+you've been editing it. If so, their changes and yours are merged; if the
+changes are in different parts of the file all is well and the merged file is
+then checked in. If, however, the changes are close together they are judged
+to be in conflict, and you will be returned to your edit session to resolve
+this conflict. To find the parts of the file where the problem exists search
+on "===="; here you will find indications of what was in your file and what
+was in the edit by the other user, and you can choose one or the other or both
+as you prefer.</p>
+
+<p><b>Note:</b> when doing a preview of an edit in the form editor (2.), clicking on a
relative link will start a new edit session on that page. If this is not
desired press "Cancel".</p>

@@ -401,127 +440,14 @@

<p>If you want to upload plain HTML, or a PNG image, or whatever, you can use the
"Upload" link which is visible in the directory view. You may upload trees of
-directories by first TGZing or ZIPing them. The upload dialogue allows you to
-choose whether or not to overwrite existing files.</p>
+directories by first TGZing or ZIPing them and requesting the "unpack" option.
+The upload dialogue allows you to choose whether or not to overwrite existing
+files.</p>


-<a class="cow-section-anchor" name="section-3.7."/><h2 class="cow-heading"><span class="cow-sec-number">3.7. </span>Create a new wiki space</h2>
+<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>

-<p>NEEDS UPDATING. currently only available to administrators, who should go to
-the top-level cow page and follow the links</p>
-
-<p>To create a new wiki space you can either:</p>
-<ul>
-<li>browse for an existing SVN sandbox</li>
-<li>get the wiki to create a new sandbox for you</li>
-</ul>
-
-<p>In the former case you can choose any existing SVN-controlled file tree and
-CoW will allow you to create, share and update YAM files in that tree.</p>
-
-
-
-<a class="cow-section-anchor" name="section-3.7.1."/><h3 class="cow-heading"><span class="cow-sec-number">3.7.1. </span>Authentication settings</h3>
-
-<p>When running in server mode, or when doing scheduled or one-off subversion
-updates (see below), CoW needs to communicate with the subversion repository
-(or repositories) underlying the wiki sandbox. If the repository is
-on the local filesystem (i.e. checked out using the <tt>file:</tt> protocol) this will
-work fine, but if the repository is remote (<tt>svn:</tt>, <tt>svn+ssh:</tt>, <tt>http:</tt> or
-<tt>https:</tt>) it may require authentication. Since the same authentication profile
-may be shared between several sandboxes (for example several repositories
-hosted on the same SSH server), configuring authentication is a two-step
-process. First you must create an authentication profile containing the user
-name and other credentials, and second you associate that profile with the
-relevant wiki area or areas.</p>
-
-<p>To manage the known authentication profiles, go to the main Admin home page and
-follow the "authentication profile" link at the bottom of the page. Each
-profile can hold any or all of the following data:</p>
-
-<ul>
-<li><b>username</b> If specified, all interactions with the server will use this
- username, and all subversion commits will have this name as their author. If
- unspecified, the user name currently logged into CoW will be used.</li>
-<li><b>password</b> The password used to authenticate to <tt>http:</tt> and <tt>https:</tt>
- repositories that request one, and also to SSH servers (for <tt>svn+ssh:</tt>)
- unless a private key (see below) is also provided.</li>
-<li>SSH-specific options:
- <ul>
- <li><b>port number</b> The port number on which to connect to the SSH server. The
- default is port 22, which works in the majority of cases.</li>
- <li><b>private key</b> If your SSH server authenticates using public/private key
- pairs then you should specify the private key (and its associated
- passphrase) here. The key file should be in the normal OpenSSH format.
- The public key goes in the <tt>authorized<span class="cow-escape">_</span>keys</tt> file on the server.</li>
- </ul></li>
-<li>HTTP/HTTPS-specific options
- <ul>
- <li><b>client certificate</b> If your HTTPS server requires the use of a client SSL
- certificate then you should specify it here (along with its associated
- passphrase). The certificate should be stored in PKCS#12 format including
- the corresponding private key.</li>
- <li><b>verify server certificates</b> Should we verify the validity of the
- certificates presented by the HTTPS server in the usual way, or just accept
- any certificate. The former is more secure but the latter may be necessary
- if your server uses self-signed certificates.</li>
- <li><b>force authentication</b> Normally a username and password are only passed to
- the server if it requests them (via a 401 status code). This option causes
- them to be passed in all requests, without waiting to be challenged. This
- may be required for servers that make some parts of the file tree available
- anonymously and other parts only to registered users.</li>
- </ul></li>
-</ul>
-
-<p>Note that the SSH <em>private key</em> option takes precedence over a username and
-password - even if a password is set it will not be sent to SSH servers, the
-key will be used instead.</p>
-
-<p>Once you have created and configured the authentication profile, you can attach
-it to the relevant wiki areas, either when the area is created or by editing
-the area definition (via the "Create and edit Wiki areas" link on the admin
-page).</p>
-
-<p><b>Limitations:</b> Each wiki area is associated with a single authentication
-profile so if the sandbox includes directories from other repositories (e.g.
-via <tt>svn:externals</tt>), all the different repositories must be accessible using
-the same profile. This limitation may be relaxed in a future version of
-CoW.</p>
-
-
-<a class="cow-section-anchor" name="section-3.7.2."/><h3 class="cow-heading"><span class="cow-sec-number">3.7.2. </span>Setting wiki regeneration</h3>
-
-<p>Wiki pages may refer to other wiki pages, via links and includes. They are
-therefore dependent on each other. When you change a page, the dependencies
-will also be updated. This may get out of sync (perhaps via a direct edit on
-disk, or some other route). You can therefore regenerate wiki dependencies via
-the admin interface. This is described further <a class="cow-url" href="#regen">below</a>.</p>
-
-
-
-<a class="cow-section-anchor" name="section-3.7.3."/><h3 class="cow-heading"><span class="cow-sec-number">3.7.3. </span>Setting wiki updates</h3>
-
-<p>A wiki is a working copy of an SVN repository, and so could get out of date
-with respect to the repository. You can update the wiki working copy from the
-admin interface (on the wiki admin page) in two ways:</p>
-
-<ul>
-<li>Set the update interval. The wiki working copy will be updated at this
- interval, in minutes. An empty value (null) means that the wiki working copy
- will never be updated. The default value for a new wiki is set in the wiki
- config file, and is currently null.</li>
-<li>Click the update button on the wiki admin page, to update now.</li>
-</ul>
-
-<p>If the wiki working copy is locked, then the update will be skipped. If there
-is a conflict, the update will fail. If the repository requires authentication
-this must have been set up as described above.</p>
-
-
-
-<a class="cow-section-anchor" name="section-3.8."/><h2 class="cow-heading"><span class="cow-sec-number">3.8. </span>Report a bug</h2>
-
<p>To report bugs, first please check that they've not been reported already!</p>

<p>Then add a report to
@@ -531,28 +457,28 @@


-<a class="cow-section-anchor" name="section-3.9."/><h2 class="cow-heading"><span class="cow-sec-number">3.9. </span>The YAM Markup Language <a name="yam"></a></h2>

+<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>
+
<p>CoW's underlying markup language is YAM (Yet Another Markup). You don't need
to use it - you can use the WYSIWYG editor instead - but if you're a
<a class="cow-url" href="http://www.vim.org/">Vim</a>-wielding old fossil like me you may like it. The
-syntax is about as light as they come; see below.</p>
+syntax is about as light as they come; next is a summary followed by a longer
+description.</p>


-<a class="cow-section-anchor" name="section-3.9.1."/><h3 class="cow-heading"><span class="cow-sec-number">3.9.1. </span>YAM Summary</h3>
+<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>

<p>

<table>
<tr><td> Title </td><td> First paragraph of the file. </td></tr>
-<tr><td> Single-line comment / notes </td><td> <span class="cow-escape">%</span><span class="cow-escape">%</span> ... </td></tr>
-<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>
<tr><td> Headings </td><td> <span class="cow-escape">%</span>1,<span class="cow-escape">%</span>2,etc.; <span class="cow-escape">%</span>1<span class="cow-escape">*</span> is unnumbered; follow with blank line </td></tr>
<tr><td> Bold, italic, teletype, underlined </td><td> <span class="cow-escape">*</span>...<span class="cow-escape">*</span>, <span class="cow-escape">_</span>...<span class="cow-escape">_</span>, <span class="cow-escape">^</span>...<span class="cow-escape">^</span>, <span class="cow-escape">_</span><span class="cow-escape">_</span>...<span class="cow-escape">_</span><span class="cow-escape">_</span> </td></tr>
<tr><td> Contents </td><td> <span class="cow-escape">%</span>contents </td></tr>
<tr><td> Horizontal lines </td><td> <span class="cow-escape">-</span>-- </td></tr>
-<tr><td> Tables </td><td> <span class="cow-escape">%</span>[ <span class="cow-escape">|</span> row 1 c 1 <span class="cow-escape">|</span> r 1 c 2 <span class="cow-escape">|</span> <span class="cow-escape">-</span>-- <span class="cow-escape">|</span> r 2 c 1 <span class="cow-escape">|</span> r 2 c 2 <span class="cow-escape">|</span> <span class="cow-escape">%</span>] </td></tr>
+<tr><td> Tables </td><td> <span class="cow-escape">%</span>[ <span class="cow-escape">|</span> row 1/column 1 <span class="cow-escape">|</span> r1/c2 <span class="cow-escape">|</span> <span class="cow-escape">-</span>-- <span class="cow-escape">|</span> r2/c1 <span class="cow-escape">|</span> r2/c2 <span class="cow-escape">|</span> <span class="cow-escape">%</span>] </td></tr>
<tr><td> Block quotation </td><td> <span class="cow-escape">%</span>"...<span class="cow-escape">%</span>" </td></tr>
<tr><td> Line break </td><td> <span class="cow-escape">%</span>br </td></tr>
<tr><td> Verbatim </td><td> <span class="cow-escape">%</span><...<span class="cow-escape">%</span>> </td></tr>
@@ -564,7 +490,7 @@
<tr><td> Escaping </td><td> <span class="cow-escape">\</span> </td></tr>
<tr><td> Links </td><td>
<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/>
-<span class="cow-escape">%</span>(<span class="cow-escape">h</span>ttp://thing.com/,link text)</p>
+<span class="cow-escape">%</span>(<span class="cow-escape">h</span>ttp://thing.com/, link text)</p>
</td></tr>
<tr><td> Anchors </td><td> <span class="cow-escape">%</span>#name (then link to it with "<span class="cow-escape">%</span>(#name)") </td></tr>
<tr><td> Images </td><td> <p><span class="cow-escape">%</span>image(file) or <br/>
@@ -575,6 +501,8 @@
<tr><td> Inclusion </td><td> <p><span class="cow-escape">%</span>include(file.yam) <br/>
<span class="cow-escape">%</span>include(level, useTitle, file.yam)</p> </td></tr>
<tr><td> Non-breaking space </td><td> <span class="cow-escape">%</span><span class="cow-escape">\</span> followed by space </td></tr>
+<tr><td> Single-line comment / notes </td><td> <span class="cow-escape">%</span><span class="cow-escape">%</span> ... </td></tr>
+<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>
<tr><td> Special characters </td><td> <p>(e.g. < or & in HTML) are <br/>
translated correctly in the output.</p> </td></tr>
<tr><td> Twitter </td><td> <span class="cow-escape">%</span>twitter(title=GATE News, account=GateAcUk, name=GATE, count=10) </td></tr>
@@ -584,27 +512,27 @@


-<a class="cow-section-anchor" name="section-3.9.2."/><h3 class="cow-heading"><span class="cow-sec-number">3.9.2. </span>YAM Syntax and Usage</h3>
+<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>

<p>

<div class="cow-contents"></div>


-<a class="cow-section-anchor" name="section-3.9.2.1."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.1. </span>Introduction</h4>
+<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>

<p>YAM (Yet Another Markup) is a simple wiki language used in
<a class="cow-url" href="http://gatewiki.sf.net/">GATEWiki</a>. The language syntax is described below.</p>


-<a class="cow-section-anchor" name="section-3.9.2.2."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.2. </span>Contents <a name="contents"></a></h4>
+<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>

<p>Contents listings like that above are generated by '<tt><span class="cow-escape">%</span>contents</tt>'</p>


-<a class="cow-section-anchor" name="section-3.9.2.3."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.3. </span>Bold, italic, underline and teletype <a name="bold"></a></h4>
+<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>

<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>

@@ -619,9 +547,9 @@


-<a class="cow-section-anchor" name="section-3.9.2.4."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.4. </span>Horizontal lines <a name="hr"></a></h4>
+<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>

-<p>Horizontal lines are indicated by 3 or more - signs at the start of a line.
+<p>Horizontal lines are indicated by 3 or more dashes at the start of a line.
For example:</p>
<pre>---</pre>
<p>and</p>
@@ -631,7 +559,7 @@


-<a class="cow-section-anchor" name="section-3.9.2.5."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.5. </span>Lists <a name="lists"></a></h4>
+<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>

<p>Unordered lists are indicated by '-' at the start of a line, and ordered
lists by '#'. Nesting is indicated by increased spacing preceding the item
@@ -655,6 +583,9 @@
<li>Back to the third item of the enclosing list</li>
</ul>

+<p>The precise size of the indentation of embedded lists doesn't matter, it just
+needs to be larger than that of the enclosing list.</p>
+
<p>Lists end when there is a blank line or where the next line of text is not
indented. For example:</p>
<pre>
@@ -679,7 +610,7 @@


-<a class="cow-section-anchor" name="section-3.9.2.6."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.6. </span>Verbatim output <a name="verbatim"></a></h4>
+<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>

<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>

@@ -692,20 +623,20 @@


-<a class="cow-section-anchor" name="section-3.9.2.7."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.7. </span>Footnotes <a name="footnotes"></a></h4>
+<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>

<p>Footnotes are like this:</p>
<pre>
%footnote(This is a footnote.)
</pre>
-<p>Becomes:<span class="cow-footnote" name="footnote2"><sup><a href="#footnote2">2</a></sup></span>.</p>
+<p>Becomes:<span class="cow-footnote" name="footnote3"><sup><a href="#footnote3">3</a></sup></span>.</p>

<p>The contents will be put in a section at the end of the document (HTML) or at
the bottom of the page (LaTeX), and linked by number from where they occured.</p>


-<a class="cow-section-anchor" name="section-3.9.2.8."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.8. </span>Escapes <a name="escapes"></a></h4>
+<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>

<p>To stop a special character from being interpreted, use a '<span class="cow-escape">\</span>'. For example,</p>
<pre> \--- </pre>
@@ -713,14 +644,14 @@


-<a class="cow-section-anchor" name="section-3.9.2.9."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.9. </span>Titles <a name="titles"></a></h4>
+<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>

<p>The title of a document is the first paragraph of the document, ending in one
or more blank lines. (Often this will be a single line of text.)</p>


-<a class="cow-section-anchor" name="section-3.9.2.10."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.10. </span>Headings <a name="headings"></a></h4>
+<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>

<p>Headings are lines starting with <tt>%1</tt> (for first level), <tt>%2</tt>, <tt>%3</tt> or <tt>%4</tt>
and are followed by one or more blank lines. For example, the heading for this
@@ -740,7 +671,7 @@


-<a class="cow-section-anchor" name="section-3.9.2.11."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.11. </span>Links and anchors <a name="links"></a></h4>
+<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>

<p>Links can be specified in three ways:</p>
<ol>
@@ -756,7 +687,8 @@
appears in plain text must be followed by a space, tab or newline. Sometimes,
you might need to follow a URL with something other than a space, tab, or
newline, for example when applying other formatting characters. To do this,
-use a bracketed form. e.g. to teletype a URL, <tt>=<span class="cow-escape">%</span>(<span class="cow-escape">h</span>ttp://gate.ac.uk/)=</tt>.</p>
+use a bracketed form. e.g. to teletype a URL, <span class="cow-escape">^</span><span class="cow-escape">%</span>(<span class="cow-escape">h</span>ttp://gate.ac.uk/)<span class="cow-escape">^</span>
+becomes <tt><a class="cow-url" href="http://gate.ac.uk/">http://gate.ac.uk/</a></tt>.</p>

<p>Anchors and labels are specified using '<tt><span class="cow-escape">%</span>#name</tt>'. For example,</p>
<pre>
@@ -779,13 +711,13 @@
<a class="cow-non-existant-url" href="../non-existant.html?m=1">../non-existant.html</a></p>

<p>A link to an existing file will be just link as normal, e.g. <br/></p>
-<pre> %(yam-lists.html) </pre>
+<pre> %(index.html) </pre>
<p>becomes: <br/>
-<a class="cow-non-existant-url" href="yam-lists.html?m=1">yam-lists.html</a></p>
+<a class="cow-url" href="index.html">index.html</a></p>


-<a class="cow-section-anchor" name="section-3.9.2.12."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.12. </span>Block quotations <a name="quotations"></a></h4>
+<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>

<p>Block quotations are enclosed in <span class="cow-escape">%</span>" marks. For example,</p>
<pre>
@@ -820,7 +752,7 @@


-<a class="cow-section-anchor" name="section-3.9.2.13."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.13. </span>Line breaks <a name="linebreaks"></a></h4>
+<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>

<p>Line breaks are indicated by <span class="cow-escape">%</span>br at the end of a line. For example:</p>
<pre>
@@ -831,7 +763,7 @@


-<a class="cow-section-anchor" name="section-3.9.2.14."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.14. </span>Tables <a name="tables"></a></h4>
+<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>

<p>Tables use square brackets, bars and dashes. For example:</p>
<pre>
@@ -850,12 +782,14 @@
<tr><td> row 2 col 1 </td><td> col 2 </td></tr>
</table>

+<p>To include a <span class="cow-escape">|</span> in normal text escape it like this: <tt><span class="cow-escape">\</span><span class="cow-escape">|</span></tt>.</p>
+
<p>(See also the note above about <a class="cow-url" href="#embedding-lists-in-tables">embedding lists
in tables</a>.)</p>


-<a class="cow-section-anchor" name="section-3.9.2.15."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.15. </span>Images <a name="images"></a></h4>
+<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>

<p>Images are like URLs:</p>
<ul>
@@ -869,7 +803,7 @@


-<a class="cow-section-anchor" name="section-3.9.2.16."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.16. </span>Citations <a name="citations"></a></h4>
+<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>

<p>Citations work like this: '<tt><span class="cow-escape">%</span>cite(Cun06a)</tt>' becomes <span class="cow-cite" keys="Cun06a"><a href="http://gate.ac.uk/sale/bib/main.html#XCun06a">Cun06a</a></span>. Multiple
cite keys should be separated by commas, e.g.: '<tt><span class="cow-escape">%</span>cite(Cun05a,Cun06a)</tt>'
@@ -877,26 +811,28 @@


-<a class="cow-section-anchor" name="section-3.9.2.17."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.17. </span>Inclusion <a name="inclusion"></a></h4>
+<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>

<p>A page can include another page like this:</p>
+
<pre>
%include(yam-first.yam)
</pre>

-<p>Results in the inclusion of all the text from <tt>yam-first.yam</tt> in this file.
-Note that headings in the included files are ignored by default (but see
-below).</p>
+<p>This results in the inclusion of all the text from <tt>yam-first.yam</tt> in this
+file.</p>

<p>An increment to be added to the heading level can be given as the first
argument.</p>

-<p>A "useTitle" flag can be given (after the increment if it exists) to cause
-inclusion of the title (as a heading).</p>
+<p>Note that the titles in the included files are ignored by default. A
+"useTitle" flag can be given (after the increment if it exists) to cause
+inclusion of the title (as a heading). For example: <tt><span class="cow-escape">%</span>include(1, useTitle,
+yam-first.yam)</tt>.</p>


-<a class="cow-section-anchor" name="section-3.9.2.18."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.18. </span>Non-breaking space <a name="nbsp"></a></h4>
+<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>

<p>Non-breaking spaces are added using <span class="cow-escape">%</span><span class="cow-escape">\</span> followed by space, e.g.</p>
<pre>
@@ -906,7 +842,7 @@


-<a class="cow-section-anchor" name="section-3.9.2.19."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.19. </span>Comments <a name="comments"></a></h4>
+<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>

<p>Single-line comments are created by two or more percents together, e.g.</p>
<pre>
@@ -927,7 +863,7 @@


-<a class="cow-section-anchor" name="section-3.9.2.20."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.20. </span>Plugins <a name="plugins"></a></h4>
+<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>

<p>YAM can be extended by the use of <b>plugins</b>. Creating plugins requires some
Java programming - see the developer guide for more details.</p>
@@ -943,7 +879,7 @@


-<a class="cow-section-anchor" name="section-3.9.2.21."/><h4 class="cow-heading"><span class="cow-sec-number">3.9.2.21. </span>Changes from version 3</h4>
+<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>

<p>YAM is currently in version 5. Since versions 3 and 4 these changes were made:</p>

@@ -975,6 +911,25 @@

<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>

+<p>Currently CoW includes:</p>
+
+<ul>
+<li>a wiki language with a JavaCC parser</li>
+<li>a CMS persistence and versioning backend using Subversion</li>
+<li>simple display and edit of wiki pages and other static content using
+ <a class="cow-url" href="http://www.grails.org/">Grails</a></li>
+<li>a version of the Grails JSecurity plugin that includes editing
+ of the user data and assigns permissions to wiki areas and directories</li>
+<li>user registration using the JCaptcha plugin</li>
+<li>webtests using <a class="cow-url" href="http://selenium.seleniumhq.org/">Selenium</a></li>
+<li>a minimal Hypersonic DB to store pointers to wiki areas and
+ user/role/permission data)</li>
+</ul>
+
+<p>The system has two modes, workstation and server; the former does no user
+management, the latter uses JSecurity.</p>
+
+

<a class="cow-section-anchor" name="section-4.1."/><h2 class="cow-heading"><span class="cow-sec-number">4.1. </span>Roadmap</h2>

@@ -1021,8 +976,132 @@


-<a class="cow-section-anchor" name="section-4.4."/><h2 class="cow-heading"><span class="cow-sec-number">4.4. </span>Building and testing CoW</h2>
+<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>

+<p>To create a new wiki space go to the Admin page and click through to wiki
+areas and select "New wiki". Then you can either:</p>
+
+<ul>
+<li>browse for an existing SVN sandbox</li>
+<li>get the wiki to create a new sandbox for you</li>
+</ul>
+
+<p>In the former case you can choose any existing SVN-controlled file tree and
+CoW will allow you to create, share and update YAM files in that tree.</p>
+
+<p>Note that each wiki area has its own sandbox. Two areas are special:</p>
+
+<ul>
+<li>area 1. is the help area, served from <tt>/help</tt> URLs</li>
+<li>area 2. is the main area, served from all other <tt>/</tt> URLs</li>
+</ul>
+
+<p>Other areas are served from <tt>/page/show/<area ID></tt> URLs.</p>
+
+
+
+<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>
+
+<p>When running in server mode, or when doing scheduled or one-off subversion
+updates (see below), CoW needs to communicate with the subversion repository
+(or repositories) underlying the wiki sandbox. If the repository is
+on the local filesystem (i.e. checked out using the <tt>file:</tt> protocol) this will
+work fine, but if the repository is remote (<tt>svn:</tt>, <tt>svn+ssh:</tt>, <tt>http:</tt> or
+<tt>https:</tt>) it may require authentication. Since the same authentication profile
+may be shared between several sandboxes (for example several repositories
+hosted on the same SSH server), configuring authentication is a two-step
+process. First you must create an authentication profile containing the user
+name and other credentials, and second you associate that profile with the
+relevant wiki area or areas.</p>
+
+<p>To manage the known authentication profiles, go to the main Admin home page and
+follow the "authentication profile" link at the bottom of the page. Each
+profile can hold any or all of the following data:</p>
+
+<ul>
+<li><b>username</b> If specified, all interactions with the server will use this
+ username, and all subversion commits will have this name as their author. If
+ unspecified, the user name currently logged into CoW will be used.</li>
+<li><b>password</b> The password used to authenticate to <tt>http:</tt> and <tt>https:</tt>
+ repositories that request one, and also to SSH servers (for <tt>svn+ssh:</tt>)
+ unless a private key (see below) is also provided.</li>
+<li>SSH-specific options:
+ <ul>
+ <li><b>port number</b> The port number on which to connect to the SSH server. The
+ default is port 22, which works in the majority of cases.</li>
+ <li><b>private key</b> If your SSH server authenticates using public/private key
+ pairs then you should specify the private key (and its associated
+ passphrase) here. The key file should be in the normal OpenSSH format.
+ The public key goes in the <tt>authorized<span class="cow-escape">_</span>keys</tt> file on the server.</li>
+ </ul></li>
+<li>HTTP/HTTPS-specific options
+ <ul>
+ <li><b>client certificate</b> If your HTTPS server requires the use of a client SSL
+ certificate then you should specify it here (along with its associated
+ passphrase). The certificate should be stored in PKCS#12 format including
+ the corresponding private key.</li>
+ <li><b>verify server certificates</b> Should we verify the validity of the
+ certificates presented by the HTTPS server in the usual way, or just accept
+ any certificate. The former is more secure but the latter may be necessary
+ if your server uses self-signed certificates.</li>
+ <li><b>force authentication</b> Normally a username and password are only passed to
+ the server if it requests them (via a 401 status code). This option causes
+ them to be passed in all requests, without waiting to be challenged. This
+ may be required for servers that make some parts of the file tree available
+ anonymously and other parts only to registered users.</li>
+ </ul></li>
+</ul>
+
+<p>Note that the SSH <em>private key</em> option takes precedence over a username and
+password - even if a password is set it will not be sent to SSH servers, the
+key will be used instead.</p>
+
+<p>Once you have created and configured the authentication profile, you can attach
+it to the relevant wiki areas, either when the area is created or by editing
+the area definition (via the "Create and edit Wiki areas" link on the admin
+page).</p>
+
+<p><b>Limitations:</b> Each wiki area is associated with a single authentication
+profile so if the sandbox includes directories from other repositories (e.g.
+via <tt>svn:externals</tt>), all the different repositories must be accessible using
+the same profile. This limitation may be relaxed in a future version of
+CoW.</p>
+
+
+
+<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>
+
+<p>Wiki pages may refer to other wiki pages, via links and includes. They are
+therefore dependent on each other. When you change a page, the dependencies
+will also be updated. This may get out of sync (perhaps via a direct edit on
+disk, or some other route). You can therefore regenerate wiki dependencies via
+the admin interface. This is described further <a class="cow-url" href="#regen">below</a>.</p>
+
+
+
+<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>
+
+<p>A wiki is a working copy of an SVN repository, and so could get out of date
+with respect to the repository. You can update the wiki working copy from the
+admin interface (on the wiki admin page) in two ways:</p>
+
+<ul>
+<li>Set the update interval. The wiki working copy will be updated at this
+ interval, in minutes. An empty value (null) means that the wiki working copy
+ will never be updated. The default value for a new wiki is set in the wiki
+ config file, and is currently null.</li>
+<li>Click the update button on the wiki admin page, to update now.</li>
+</ul>
+
+<p>If the wiki working copy is locked (e.g. by an update following an edit
+checkin), then the update will be skipped. If there is a conflict, the update
+will fail. If the repository requires authentication this must have been set
+up as described above.</p>
+
+
+
+<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>
+
<p>CoW is built with <a class="cow-url" href="http://ant.apache.org">ant</a>. For more documentation do
<tt>ant help</tt> in the cow directory. To run CoW see next section.</p>

@@ -1053,7 +1132,7 @@


-<a class="cow-section-anchor" name="section-4.4.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.4.1. </span>More about cruising</h3>
+<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>

<p>The <tt>cruise</tt> target does a clean build and runs the Grails unit tests and the
Java-only tests (for YAM etc.). Functional tests used to use Canoo (ant target
@@ -1086,7 +1165,7 @@


-<a class="cow-section-anchor" name="section-4.4.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.4.2. </span>Selenium tests</h3>
+<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>

<p>Functional testing of CoW uses <a class="cow-url" href="http://selenium.seleniumhq.org">Selenium</a>.
Selenium uses various bits of JavaScript magic to enable you to remote-control
@@ -1112,7 +1191,7 @@
Selenium supports various
<a class="cow-url" href="http://selenium.seleniumhq.org/about/platforms.html#browsers">different
browsers</a>, though the current CoW test suite is only known to work reliably
-on Firefox<span class="cow-footnote" name="footnote3"><sup><a href="#footnote3">3</a></sup></span>. The default configuration
+on Firefox<span class="cow-footnote" name="footnote4"><sup><a href="#footnote4">4</a></sup></span>. The default configuration
(specified in <tt>gatewiki/cow/selenium/test-selenium.properties.default</tt>) runs
the Firefox browser, and expects to find the <tt>firefox-bin</tt> executable on your
path (Linux) or for Firefox to be installed in the default location
@@ -1145,7 +1224,7 @@


-<a class="cow-section-anchor" name="section-4.4.2.1."/><h4 class="cow-heading"><span class="cow-sec-number">4.4.2.1. </span>Developing new tests</h4>
+<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>Developing new tests</h4>

<p>To develop a new selenium test it is easiest to use the Selenium IDE Firefox
plugin. Start up a test instance of CoW in the relevant mode using <tt>ant
@@ -1162,7 +1241,7 @@


-<a class="cow-section-anchor" name="section-4.4.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.4.3. </span>Upgrading to new Grails versions</h3>
+<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>

<ul>
<li>svn up && ant clean jar in grails</li>
@@ -1175,7 +1254,7 @@


-<a class="cow-section-anchor" name="section-4.4.4."/><h3 class="cow-heading"><span class="cow-sec-number">4.4.4. </span>Using the YAM Tests</h3>
+<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>

<p>The test suite uses a bunch of <tt>.yam</tt> and compiled <tt>.html</tt> files in
<tt>cow/test/resources</tt>. After running the tests the script
@@ -1208,7 +1287,7 @@


-<a class="cow-section-anchor" name="section-4.4.5."/><h3 class="cow-heading"><span class="cow-sec-number">4.4.5. </span>Grails/Spring/JSecurity and the upload function</h3>
+<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>

<p>There is currently a problem between Grails/Spring and the JSecurity plugin
when uploading a file that we hope will be solved in future updates.</p>
@@ -1220,9 +1299,43 @@


+<a class="cow-section-anchor" name="section-4.6."/><h2 class="cow-heading"><span class="cow-sec-number">4.6. </span>Subversion versions</h2>

-<p><a name="config"></a></p><a class="cow-section-anchor" name="section-4.5."/><h2 class="cow-heading"><span class="cow-sec-number">4.5. </span>Configuring CoW</h2>
+<p>(This note is only relevant to those using local copies of SVN tree. By the
+time you read this the version number have probably changed.)</p>

+<p>Wiki areas in CoW are subversion sandbox directories. There are many different
+versions of the subversion Java and command line tools, and each version is
+associated with a particular format of the control files under the <tt>.svn</tt>
+directory in the sandbox. Generally speaking, later versions of subversion
+tools can read sandboxes created by earlier versions, but in doing so they
+transparently "upgrade" the sandbox to the newer format. Once this happens in
+a particular sandbox, that sandbox will no longer be readable by the earlier
+version.</p>
+
+<p>CoW's subversion support is provided by the <a class="cow-url" href="http://svnkit.com">SVNKit</a>
+library. At the time of writing we are using version 1.2.0, which works with
+the same working copy format as the 1.5 series <tt>svn</tt> command-line tool. This
+means that, for example:</p>
+
+<ul>
+<li>If you use CoW with a sandbox that was created by <tt>svn</tt> version 1.4 or
+ earlier, that sandbox will no longer be usable by the 1.4 version
+ command-line tools.</li>
+<li>If you use 1.6-series command-line tools on a sandbox, that sandbox will no
+ longer be readable by CoW.</li>
+</ul>
+
+<p>If you intend to use CoW in workstation mode you must use a compatible, e.g.
+1.5-series command-line client. If your command-line client is version e.g.
+1.6 you will need to upgrade the <tt>svnkit</tt> JAR used by CoW to version 1.3.0
+(which speaks the 1.6 protocol).</p>
+
+
+
+
+<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>
+
<p>Configuration options in CoW are dealt with in the normal
<a class="cow-url" href="http://www.grails.org/">Grails</a> fashion in a file called <tt>Config.groovy</tt>; to
override these options create a file called <tt>.cowrc.groovy</tt> in your home
@@ -1253,14 +1366,14 @@


-<a class="cow-section-anchor" name="section-4.6."/><h2 class="cow-heading"><span class="cow-sec-number">4.6. </span>CoW's Data Area</h2>
+<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>

<p>CoW stores all user data in a directory called <tt>.cowrc.d</tt> (on <span class="cow-escape">*</span>NIX), which is
by default in the user's home directory.</p>


-<a class="cow-section-anchor" name="section-4.6.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.6.1. </span>SVN Config Directory</h3>
+<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>

<p>The <tt>svnconfig</tt> directory stores files related to how SVN works within CoW.
This is a standard SVN config directory (i.e. it is the same as
@@ -1273,10 +1386,10 @@


-<a class="cow-section-anchor" name="section-4.7."/><h2 class="cow-heading"><span class="cow-sec-number">4.7. </span>Deploying and Running CoW</h2>
+<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>


-<a class="cow-section-anchor" name="section-4.7.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.7.1. </span>Starting and stopping</h3>
+<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>

<p>The easiest way to run (or deploy) CoW is via Grails. If you're developing
then use Grails' <tt>run-app</tt>; for production use <tt>run-war</tt>. CoW's build file
@@ -1311,7 +1424,7 @@


-<a class="cow-section-anchor" name="section-4.7.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.7.2. </span>Portability of the .cowrc.d directory</h3>
+<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>

<p>If you want to move the data from a CoW installation into a different
location, you need to do two things:</p>
@@ -1331,7 +1444,7 @@


-<a class="cow-section-anchor" name="section-4.7.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.7.3. </span>Apache 2 virtual hosts and CoW proxying</h3>
+<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>

<p>This section describes running multiple websites (e.g. <tt><a class="cow-url" href="http://gate.ac.uk/">http://gate.ac.uk/</a></tt>
and <tt><a class="cow-url" href="http://gatecloud.net">http://gatecloud.net</a></tt>) on a single physical server using Apache
@@ -1432,7 +1545,7 @@



-<p><a name="deployment"></a></p><a class="cow-section-anchor" name="section-4.7.4."/><h3 class="cow-heading"><span class="cow-sec-number">4.7.4. </span>Production Deployment and Upgrade</h3>
+<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>

<p>When deploying GATEWiki these elements need to be born in mind:</p>

@@ -1502,7 +1615,7 @@



-<p><a name="runtime-dependencies"></a></p><a class="cow-section-anchor" name="section-4.7.5."/><h3 class="cow-heading"><span class="cow-sec-number">4.7.5. </span>Deployment and runtime dependencies</h3>
+<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>

<p>This note discusses two issues:</p>

@@ -1610,7 +1723,7 @@



-<p><a name="saving-space"></a></p><a class="cow-section-anchor" name="section-4.7.5.1."/><h4 class="cow-heading"><span class="cow-sec-number">4.7.5.1. </span>Saving space</h4>
+<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>

<p>At the time of writing we have the following raw sizes for the runtime
dependencies discussed above (total ~450M):</p>
@@ -1643,10 +1756,10 @@


-<a class="cow-section-anchor" name="section-4.8."/><h2 class="cow-heading"><span class="cow-sec-number">4.8. </span>Structure, Naming and Code Conventions</h2>
+<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>


-<a class="cow-section-anchor" name="section-4.8.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.8.1. </span>Naming and Other Code Conventions</h3>
+<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>

<p>GATEWiki uses the GATE coding conventions.</p>

@@ -1661,7 +1774,7 @@


-<a class="cow-section-anchor" name="section-4.8.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.8.2. </span>Structure</h3>
+<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>

<p>CoW is made up of the following components (and numerous 3rd party libraries):</p>

@@ -1677,7 +1790,7 @@


-<a class="cow-section-anchor" name="section-4.8.2.1."/><h4 class="cow-heading"><span class="cow-sec-number">4.8.2.1. </span>Main classes and Grails objects</h4>
+<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>

<p>The CoW webapp is organised around the concept of wiki/content areas, which
are file trees stored in SVN. What CoW then provides is </p>
@@ -1744,7 +1857,7 @@


-<a class="cow-section-anchor" name="section-4.9."/><h2 class="cow-heading"><span class="cow-sec-number">4.9. </span>Authentication and Authorisation</h2>
+<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>

<p><b>Important note:</b> a new GATE wiki installation has a default user,
scott. Scott is an adminstrator, he can do anything. He has the traditional
@@ -1761,7 +1874,7 @@


-<a class="cow-section-anchor" name="section-4.9.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.9.1. </span>Grails JSecurity plugin</h3>
+<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>

<p>Authentication and authorisation uses <a class="cow-url" href="http://grails.org/JSecurity+Plugin">the JSecurity plugin for Grails</a>. </p>

@@ -1788,7 +1901,7 @@


-<a class="cow-section-anchor" name="section-4.9.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.9.2. </span>Grails JCaptcha plugin</h3>
+<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>

<p>User registration attempts to prevent registration of bots, using
<a class="cow-url" href="http://grails.org/JCaptcha+Plugin">the JCaptcha plugin for Grails</a>:</p>
@@ -1802,7 +1915,7 @@


-<a class="cow-section-anchor" name="section-4.9.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.9.3. </span>Users, roles, permissions, actions</h3>
+<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>

<p>Security is based around users, roles, and permissions.</p>

@@ -1887,7 +2000,7 @@
thread</a> for a useful description of how permissions work.</p>


-<a class="cow-section-anchor" name="section-4.9.3.1."/><h4 class="cow-heading"><span class="cow-sec-number">4.9.3.1. </span>Directory level authorisation
+<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
<a name="dirauth"></a></h4>

<p>For actions of the page controller, Gatewiki permissions gives authorisation
@@ -2056,7 +2169,7 @@


-<a class="cow-section-anchor" name="section-4.9.3.2."/><h4 class="cow-heading"><span class="cow-sec-number">4.9.3.2. </span>Access to non-page controllers via CowPermission control</h4>
+<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>

<p>The SecurityFilter and the Jsecurity code give access to wiki pages via the
"page" controller. They are also configured at bootstrap to give some access
@@ -2082,7 +2195,7 @@


-<a class="cow-section-anchor" name="section-4.9.3.3."/><h4 class="cow-heading"><span class="cow-sec-number">4.9.3.3. </span>User and password constraints</h4>
+<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>

<p>Constraints on users are enforced by a UserCommand and PasswordCommand, which
are used in a couple of places. Together, they define more fields than
@@ -2092,7 +2205,7 @@


-<a class="cow-section-anchor" name="section-4.9.3.4."/><h4 class="cow-heading"><span class="cow-sec-number">4.9.3.4. </span>Security in workstation and server modes</h4>
+<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>

<ul>
<li>Security is turned on only for server mode.</li>
@@ -2105,7 +2218,7 @@


-<a class="cow-section-anchor" name="section-4.9.4."/><h3 class="cow-heading"><span class="cow-sec-number">4.9.4. </span>Pre-defined security objects</h3>
+<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>

<p>The above gives an abstract view of how security works. In a default GATE wiki
installation, there will be several pre-defined security objects that you can
@@ -2216,7 +2329,7 @@


-<a class="cow-section-anchor" name="section-4.9.5."/><h3 class="cow-heading"><span class="cow-sec-number">4.9.5. </span>Tag library</h3>
+<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>

<p>In addition to the tags defined by Jsecurity (<b>note</b> do not use jsec:
prinicipal, see below), the following are available in SecurityTagLib:</p>
@@ -2242,7 +2355,7 @@


-<a class="cow-section-anchor" name="section-4.9.6."/><h3 class="cow-heading"><span class="cow-sec-number">4.9.6. </span>Code dependencies between Jsecurity and GATE Wiki</h3>
+<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>

<p>There are very few! Of course, there are lots of pages specific to security
and its administration. But it shouldn't be too hard to tease these apart from
@@ -2263,7 +2376,7 @@


-<a class="cow-section-anchor" name="section-4.9.7."/><h3 class="cow-heading"><span class="cow-sec-number">4.9.7. </span>Known vulnerabilities and avoiding them</h3>
+<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>

<ul>
<li>Passwords are posted cleartext, This might not be a problem for most setups.
@@ -2284,7 +2397,7 @@



-<p><a name="site-specific"></a></p><a class="cow-section-anchor" name="section-4.10."/><h2 class="cow-heading"><span class="cow-sec-number">4.10. </span>Site- and Wiki-Specific Layout and Navigation</h2>
+<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>

<p>CoW's look and feel is a masterpiece of minimalist aesthetics, the like of
which is seldom seen in this age of extravagant waste, technological frenzy
@@ -2305,7 +2418,7 @@



-<p><a name="navigation"></a></p><a class="cow-section-anchor" name="section-4.10.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.10.1. </span>Navigation</h3>
+<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>

<p>Navigation that applies to the whole site or to a whole wiki area is probably
best put into a Grails layout plugin - see <a class="cow-url" href="#guest-layouts">replacing the
@@ -2352,7 +2465,7 @@


-<a class="cow-section-anchor" name="section-4.10.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.10.2. </span>Replacing the Main Page Layout <a name="guest-layouts"></a></h3>
+<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>

<p>If you want to replace the entire look of the site (or a particular wiki
area), then you need to create a Grails plugin and supply a Sitemesh layout,
@@ -2411,7 +2524,7 @@


-<a class="cow-section-anchor" name="section-4.10.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.10.3. </span>Changing the Title or Logo</h3>
+<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>

<p>If you want to replace change a few small things like the name of the site
(which gets put in the page titles) or the main logo, then you just need to
@@ -2439,7 +2552,7 @@



-<p><a name="raw-html"></a></p><a class="cow-section-anchor" name="section-4.10.4."/><h3 class="cow-heading"><span class="cow-sec-number">4.10.4. </span>Dealing with non-native HTML pages</h3>
+<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>

<p>Non-native HTML pages are those which are not generated from YAM markup, i.e.
are not really managed by CoW as wiki pages. CoW will serve any old HTML page
@@ -2507,7 +2620,7 @@



-<p><a name="regen"></a></p><a class="cow-section-anchor" name="section-4.11."/><h2 class="cow-heading"><span class="cow-sec-number">4.11. </span>Referencing and regeneration</h2>
+<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>

<p>The problem is that a create/rename/delete/modify operation on a .yam should
be cascaded through any files that link to or include it. The relevant data
@@ -2554,13 +2667,13 @@
</ul>

<p>The current design is to use YamFile.generate.</p>
-<a class="cow-section-anchor" name="section-4.11.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.11.1. </span>Serialization</h3>
+<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>

<p>Dependencies are serialized to the directory conf.gate.cow.dbs, one file per
wiki. They are serialized on shutdown and periodically during uptime. Periodic
serialization is carried out (once a minute) by DependenciesJob. They are
deserialized lazily, as required.</p>
-<a class="cow-section-anchor" name="section-4.11.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.11.2. </span>Regeneration</h3>
+<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>

<p>Dependencies for a single wiki are regenerated on four occasions:</p>

@@ -2579,7 +2692,7 @@


-<a class="cow-section-anchor" name="section-4.11.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.11.3. </span>Speed of Running SVN Status</h3>
+<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>

<p>As noted above, YAM files managed by the wiki can be changed in several ways:</p>
<ul>
@@ -2649,7 +2762,7 @@


-<a class="cow-section-anchor" name="section-4.12."/><h2 class="cow-heading"><span class="cow-sec-number">4.12. </span>Sourceforge notes</h2>
+<a class="cow-section-anchor" name="section-4.14."/><h2 class="cow-heading"><span class="cow-sec-number">4.14. </span>Sourceforge notes</h2>

<ul>
<li><a class="cow-url" href="http://sf.net/projects/gatewiki/">the Sourceforge project</a></li>
@@ -2669,7 +2782,7 @@


-<a class="cow-section-anchor" name="section-4.13."/><h2 class="cow-heading"><span class="cow-sec-number">4.13. </span>Grails MVC notes</h2>
+<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>

<ul>
<li>A request that hits the application context path (e.g. "cow") is first
@@ -2686,7 +2799,7 @@


-<a class="cow-section-anchor" name="section-4.14."/><h2 class="cow-heading"><span class="cow-sec-number">4.14. </span>IntelliJ notes</h2>
+<a class="cow-section-anchor" name="section-4.16."/><h2 class="cow-heading"><span class="cow-sec-number">4.16. </span>IntelliJ notes</h2>

<ul>
<li>download the IDEA from
@@ -2727,7 +2840,7 @@



-<p><a name="search"></a></p><a class="cow-section-anchor" name="section-4.15."/><h2 class="cow-heading"><span class="cow-sec-number">4.15. </span>Search infrastructure</h2>
+<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>

<p>CoW uses a combination of Nutch and Solr for indexing and search of wiki
areas.</p>
@@ -2746,10 +2859,10 @@


-<a class="cow-section-anchor" name="section-4.15.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.15.1. </span>Installation</h3>
+<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>


-<a class="cow-section-anchor" name="section-4.15.1.1."/><h4 class="cow-heading"><span class="cow-sec-number">4.15.1.1. </span>Directory structure</h4>
+<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>

<ul>
<li>Nutch and Solr are checked into <tt>gatewiki/nutch-solr</tt></li>
@@ -2815,7 +2928,7 @@


-<a class="cow-section-anchor" name="section-4.15.1.2."/><h4 class="cow-heading"><span class="cow-sec-number">4.15.1.2. </span>Enabling Solr</h4>
+<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>

<p>By default Solr is disabled. To tell CoW to run Solr (when being run via
Grails) set gate.CoW.solr.run to true in the config. Also make sure that the
@@ -2823,11 +2936,11 @@


-<a class="cow-section-anchor" name="section-4.15.2."/><h3 class="cow-heading"><span class="cow-sec-number">4.15.2. </span>Indexing wikis/individual files from CoW</h3>
+<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>



-<p><a name="indexing"></a></p><a class="cow-section-anchor" name="section-4.15.2.1."/><h4 class="cow-heading"><span class="cow-sec-number">4.15.2.1. </span>Indexing individual Wiki areas</h4>
+<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>

<ul>
<li>Login as someone with administration rights.</li>
@@ -2844,7 +2957,7 @@


-<a class="cow-section-anchor" name="section-4.15.2.2."/><h4 class="cow-heading"><span class="cow-sec-number">4.15.2.2. </span>Indexing individual files</h4>
+<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>

<p>Whenever a file is created, uploaded or edited, it is queued for indexing. One
of the quartz jobs is dedicated for the indexing purpose only. It runs every
@@ -2853,7 +2966,7 @@


-<a class="cow-section-anchor" name="section-4.15.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.15.3. </span>Searching</h3>
+<a class="cow-section-anchor" name="section-4.17.3."/><h3 class="cow-heading"><span class="cow-sec-number">4.17.3. </span>Searching</h3>

<p>A search box is provided at the top right corner of the page that allows
searching within a wiki area that the current page belongs to. In other
@@ -2876,13 +2989,13 @@
filtered out and not included in the search result.</p>



@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1857] trunk/cow

2009-11-19T03:19:09Z

Revision: 1857
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1857&view=rev
Author: markagreenwood
Date: 2009-11-19 11:19:09 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
added a simple JMeter testfor performing load testing

Added Paths:
-----------
trunk/cow/jmeter/
trunk/cow/jmeter/get-index-html.jmx

Added: trunk/cow/jmeter/get-index-html.jmx
===================================================================
--- trunk/cow/jmeter/get-index-html.jmx (rev 0)
+++ trunk/cow/jmeter/get-index-html.jmx 2009-11-19 11:19:09 UTC (rev 1857)
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jmeterTestPlan version="1.2" properties="2.1">
+ <hashTree>
+ <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="CoW Index Page" enabled="true">
+ <stringProp name="TestPlan.comments"></stringProp>
+ <boolProp name="TestPlan.functional_mode">false</boolProp>
+ <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+ <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="TestPlan.user_define_classpath"></stringProp>
+ </TestPlan>
+ <hashTree>
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Thread Group" enabled="true">
+ <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+ <boolProp name="LoopController.continue_forever">false</boolProp>
+ <stringProp name="LoopController.loops">1</stringProp>
+ </elementProp>
+ <stringProp name="ThreadGroup.num_threads">1000</stringProp>
+ <stringProp name="ThreadGroup.ramp_time">10</stringProp>
+ <longProp name="ThreadGroup.start_time">1258624994000</longProp>
+ <longProp name="ThreadGroup.end_time">1258624994000</longProp>
+ <boolProp name="ThreadGroup.scheduler">false</boolProp>
+ <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+ <stringProp name="ThreadGroup.duration"></stringProp>
+ <stringProp name="ThreadGroup.delay"></stringProp>
+ </ThreadGroup>
+ <hashTree>
+ <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" testname="HTTP Request" enabled="true">
+ <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="HTTPSampler.domain">127.0.0.1</stringProp>
+ <stringProp name="HTTPSampler.port">8080</stringProp>
+ <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+ <stringProp name="HTTPSampler.response_timeout"></stringProp>
+ <stringProp name="HTTPSampler.protocol"></stringProp>
+ <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+ <stringProp name="HTTPSampler.path">index.html</stringProp>
+ <stringProp name="HTTPSampler.method">GET</stringProp>
+ <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
+ <boolProp name="HTTPSampler.auto_redirects">true</boolProp>
+ <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+ <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+ <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
+ <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
+ <stringProp name="HTTPSampler.mimetype"></stringProp>
+ <boolProp name="HTTPSampler.image_parser">true</boolProp>
+ <boolProp name="HTTPSampler.monitor">false</boolProp>
+ <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+ </HTTPSampler>
+ <hashTree>
+ <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="200 Response Code" enabled="true">
+ <collectionProp name="Asserion.test_strings">
+ <stringProp name="49586">200</stringProp>
+ </collectionProp>
+ <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+ <boolProp name="Assertion.assume_success">false</boolProp>
+ <intProp name="Assertion.test_type">8</intProp>
+ </ResponseAssertion>
+ <hashTree/>
+ <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Content Check" enabled="true">
+ <collectionProp name="Asserion.test_strings">
+ <stringProp name="1400880054">Welcome to your new wiki</stringProp>
+ </collectionProp>
+ <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
+ <boolProp name="Assertion.assume_success">false</boolProp>
+ <intProp name="Assertion.test_type">2</intProp>
+ </ResponseAssertion>
+ <hashTree/>
+ </hashTree>
+ </hashTree>
+ <ResultCollector guiclass="GraphVisualizer" testclass="ResultCollector" testname="Graph Results" enabled="true">
+ <boolProp name="ResultCollector.error_logging">false</boolProp>
+ <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>true</time>
+ <latency>true</latency>
+ <timestamp>true</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>false</samplerData>
+ <xml>true</xml>
+ <fieldNames>false</fieldNames>
+ <responseHeaders>false</responseHeaders>
+ <requestHeaders>false</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ </value>
+ </objProp>
+ <stringProp name="filename"></stringProp>
+ </ResultCollector>
+ <hashTree/>
+ <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+ <boolProp name="ResultCollector.error_logging">false</boolProp>
+ <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>true</time>
+ <latency>true</latency>
+ <timestamp>true</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>false</samplerData>
+ <xml>true</xml>
+ <fieldNames>false</fieldNames>
+ <responseHeaders>false</responseHeaders>
+ <requestHeaders>false</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ </value>
+ </objProp>
+ <stringProp name="filename"></stringProp>
+ </ResultCollector>
+ <hashTree/>
+ </hashTree>
+ </hashTree>
+</jmeterTestPlan>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1856] trunk/cow/bin/cow-init.sh

2009-11-19T03:04:17Z

Revision: 1856
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1856&view=rev
Author: hcunningham
Date: 2009-11-19 11:04:14 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
refresh stacktrace.log on restart

Modified Paths:
--------------
trunk/cow/bin/cow-init.sh

Modified: trunk/cow/bin/cow-init.sh
===================================================================
--- trunk/cow/bin/cow-init.sh 2009-11-19 10:56:41 UTC (rev 1855)
+++ trunk/cow/bin/cow-init.sh 2009-11-19 11:04:14 UTC (rev 1856)
@@ -51,6 +51,8 @@
# Again if you're running multiple copies try e.g. COW_USER_HOME instead
LOGFILE="$COW_HOME/cow.log"
[ -f $LOGFILE ] && mv $LOGFILE ${LOGFILE}.previous
+STACKTRACE="${COW_HOME}/stacktrace.log"
+[ -f $STACKTRACE ] && mv $STACKTRACE ${STACKTRACE}.previous

# The location of ant (1.7 or later)
ANT_HOME=/opt/ant-1.7

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1855] trunk/site-plugins/gau/grails-app/views/layouts /cowguest.gsp

2009-11-19T02:56:41Z

Revision: 1855
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1855&view=rev
Author: hcunningham
Date: 2009-11-19 10:56:41 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
link to the updating copy of gatewiki help in the main area instead of the distrib help docs

Modified Paths:
--------------
trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp

Modified: trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp
===================================================================
--- trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp 2009-11-18 23:05:15 UTC (rev 1854)
+++ trunk/site-plugins/gau/grails-app/views/layouts/cowguest.gsp 2009-11-19 10:56:41 UTC (rev 1855)
@@ -107,7 +107,7 @@
<cow:isWorkstation>
(w/s mode) <g:link controller="admin">Admin</g:link>
</cow:isWorkstation>
- <g:pageLink action="show" id="1" linkPath="doc/gatewiki.html">Help</g:pageLink>
+ <g:pageLink action="show" id="2" linkPath="/gatewiki/cow/doc/gatewiki.html">Help</g:pageLink>
</div>



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1854] trunk/cow/grails-app/controllers/WikiController .groovy

2009-11-18T15:05:16Z

Revision: 1854
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1854&view=rev
Author: hcunningham
Date: 2009-11-18 23:05:15 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
dont tell the world we regenerated when we didnt

Modified Paths:
--------------
trunk/cow/grails-app/controllers/WikiController.groovy

Modified: trunk/cow/grails-app/controllers/WikiController.groovy
===================================================================
--- trunk/cow/grails-app/controllers/WikiController.groovy 2009-11-18 22:42:44 UTC (rev 1853)
+++ trunk/cow/grails-app/controllers/WikiController.groovy 2009-11-18 23:05:15 UTC (rev 1854)
@@ -144,9 +144,11 @@
}

// if configd, regenerate the wiki - paths etc may have changed
+ String regenMessage = ""
if(CowUtils.config.gate.cow.wikiUpdateRegen) {
log.info("regenerating ${wiki.id} on update")
dependenciesService.regenerate(wiki)
+ regenMessage = ", and regenerated"
} else {
log.info("not regenerating updated wiki ${wiki.id}, conf is false")
}
@@ -157,7 +159,8 @@
WikiRegenerationJob.scheduleWikiRegeneration(wiki)
UpdateJob.scheduleUpdate(wiki)

- flash.message = "Wiki ${params.id.encodeAsHTML()} updated, and regenerated"
+ flash.message =
+ "Wiki ${params.id.encodeAsHTML()} updated${regenMessage}"
redirect(action:show,id:wiki.id)
} else {
render(view:'edit',model:[wiki:wiki, layouts:layoutsForWiki(wiki)])

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1853] trunk/nutch-solr/solr-app/doc/solr-query-syntax .html

2009-11-18T14:42:45Z

Revision: 1853
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1853&view=rev
Author: hcunningham
Date: 2009-11-18 22:42:44 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
checking in the results of the last regeneration
(manually, with server shut down)

Modified Paths:
--------------
trunk/nutch-solr/solr-app/doc/solr-query-syntax.html

Modified: trunk/nutch-solr/solr-app/doc/solr-query-syntax.html
===================================================================
--- trunk/nutch-solr/solr-app/doc/solr-query-syntax.html 2009-11-18 22:35:53 UTC (rev 1852)
+++ trunk/nutch-solr/solr-app/doc/solr-query-syntax.html 2009-11-18 22:42:44 UTC (rev 1853)
@@ -50,7 +50,7 @@
query terms are <b>case-insenstive</b>. In other words, the terms <em>GATE</em>, <em>GaTe</em> and
<em>gate</em> would return the same results. </p>

-<table border="1">
+<table>
<tr><td> <b>Query Type</b> </td><td> <b>Example</b> </td><td> <b>Description</b> </td></tr>
<tr><td> Simple Unquoted Query </td><td> General Architecture
</td><td> <p>Returns a set of documents with both the terms <em>General</em> and <em>Architecture</em>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1852] trunk/cow

2009-11-18T14:35:53Z

Revision: 1852
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1852&view=rev
Author: hcunningham
Date: 2009-11-18 22:35:53 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------

fixing the dependencies test that I broke with the checkin that stops regenerations on
wiki change (by making the selenium server config set the options true; also correct
wrong call to config from WikiController).

also: fix an exception thrown by the YAM translator in case of null parse tree

Modified Paths:
--------------
trunk/cow/grails-app/controllers/WikiController.groovy
trunk/cow/selenium/cowrc.server
trunk/cow/src/java/gate/yam/YamCommand.java
trunk/cow/src/java/gate/yam/translate/AbstractTranslator.java

Modified: trunk/cow/grails-app/controllers/WikiController.groovy
===================================================================
--- trunk/cow/grails-app/controllers/WikiController.groovy 2009-11-18 19:13:12 UTC (rev 1851)
+++ trunk/cow/grails-app/controllers/WikiController.groovy 2009-11-18 22:35:53 UTC (rev 1852)
@@ -144,11 +144,11 @@
}

// if configd, regenerate the wiki - paths etc may have changed
- if(conf.gate.cow.wikiUpdateRegen) {
- log.info("regenerating ${w.id} on update")
+ if(CowUtils.config.gate.cow.wikiUpdateRegen) {
+ log.info("regenerating ${wiki.id} on update")
dependenciesService.regenerate(wiki)
} else {
- log.info("not regenerating updated wiki ${w.id}, conf is false")
+ log.info("not regenerating updated wiki ${wiki.id}, conf is false")
}

// Reschedule regeneration and update according to the values set. We

Modified: trunk/cow/selenium/cowrc.server
===================================================================
--- trunk/cow/selenium/cowrc.server 2009-11-18 19:13:12 UTC (rev 1851)
+++ trunk/cow/selenium/cowrc.server 2009-11-18 22:35:53 UTC (rev 1852)
@@ -1 +1,5 @@
// add any Config.groovy overrides for the server tests here
+
+// we need these as the dependencies tests expect them
+gate.cow.bootstrapRegen = true // regenerate sandboxes on bootstrap?
+gate.cow.wikiUpdateRegen = true // regenerate sandboxes on Wiki update?

Modified: trunk/cow/src/java/gate/yam/YamCommand.java
===================================================================
--- trunk/cow/src/java/gate/yam/YamCommand.java 2009-11-18 19:13:12 UTC (rev 1851)
+++ trunk/cow/src/java/gate/yam/YamCommand.java 2009-11-18 22:35:53 UTC (rev 1852)
@@ -134,6 +134,8 @@
/** Print errors and warnings from parsing. */
public String printErrors(YamParseTree parseTree) {
StringBuffer buf = new StringBuffer();
+ if(parseTree == null)
+ return "null parse tree in YamCommand.printErrors(YPT)\n";
List errors = parseTree.getErrors();
List warnings = parseTree.getWarnings();
if(errors.size() == 0 && warnings.size() == 0)

Modified: trunk/cow/src/java/gate/yam/translate/AbstractTranslator.java
===================================================================
--- trunk/cow/src/java/gate/yam/translate/AbstractTranslator.java 2009-11-18 19:13:12 UTC (rev 1851)
+++ trunk/cow/src/java/gate/yam/translate/AbstractTranslator.java 2009-11-18 22:35:53 UTC (rev 1852)
@@ -280,7 +280,9 @@
// start is the predicate name; args list has the args
String predName = node.getStart();
List argsList = node.getArgsList();
- if(predName == null) throw new GateException("predName is null");
+ if(predName == null) throw new GateException(
+ "predName is null: " + ((SimpleNode) node).getImage()
+ );
if(argsList == null) throw new GateException("argsList is null");
node.setStart(null);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1851] trunk/cow/grails-app

2009-11-18T11:13:12Z

Revision: 1851
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1851&view=rev
Author: hcunningham
Date: 2009-11-18 19:13:12 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
checking in totally untested code
to stop it regenerating on changes to Wiki. planning to blame mark somehow if
it goes pear-shaped.

Modified Paths:
--------------
trunk/cow/grails-app/conf/BootStrap.groovy
trunk/cow/grails-app/conf/Config.groovy
trunk/cow/grails-app/controllers/WikiController.groovy

Modified: trunk/cow/grails-app/conf/BootStrap.groovy
===================================================================
--- trunk/cow/grails-app/conf/BootStrap.groovy 2009-11-18 18:35:39 UTC (rev 1850)
+++ trunk/cow/grails-app/conf/BootStrap.groovy 2009-11-18 19:13:12 UTC (rev 1851)
@@ -157,6 +157,8 @@
if(conf.gate.cow.bootstrapRegen) {
log.info("scheduling regeneration of ${w.id}")
WikiRegenerationJob.scheduleWikiRegeneration(w)
+ } else {
+ log.info("not regenerating wiki ${w.id}, bootstrapRegen is false")
}

// schedule update: we use the wiki id as the quartz job name (and

Modified: trunk/cow/grails-app/conf/Config.groovy
===================================================================
--- trunk/cow/grails-app/conf/Config.groovy 2009-11-18 18:35:39 UTC (rev 1850)
+++ trunk/cow/grails-app/conf/Config.groovy 2009-11-18 19:13:12 UTC (rev 1851)
@@ -170,6 +170,7 @@
}
wiki.updateInterval.default = null
bootstrapRegen = false // regenerate sandboxes on bootstrap?
+ wikiUpdateRegen = false // regenerate sandboxes on Wiki update?
}
}

Modified: trunk/cow/grails-app/controllers/WikiController.groovy
===================================================================
--- trunk/cow/grails-app/controllers/WikiController.groovy 2009-11-18 18:35:39 UTC (rev 1850)
+++ trunk/cow/grails-app/controllers/WikiController.groovy 2009-11-18 19:13:12 UTC (rev 1851)
@@ -143,8 +143,13 @@
}
}

- // Regenerate the wiki - paths etc may have changed
- dependenciesService.regenerate(wiki)
+ // if configd, regenerate the wiki - paths etc may have changed
+ if(conf.gate.cow.wikiUpdateRegen) {
+ log.info("regenerating ${w.id} on update")
+ dependenciesService.regenerate(wiki)
+ } else {
+ log.info("not regenerating updated wiki ${w.id}, conf is false")
+ }

// Reschedule regeneration and update according to the values set. We
// use the wiki id as the quartz job name and will use this name

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1850] trunk/cow/application.properties

2009-11-18T10:35:39Z

Revision: 1850
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1850&view=rev
Author: nirajaswani
Date: 2009-11-18 18:35:39 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
mail plugin for contact page

Modified Paths:
--------------
trunk/cow/application.properties

Modified: trunk/cow/application.properties
===================================================================
--- trunk/cow/application.properties 2009-11-18 16:50:25 UTC (rev 1849)
+++ trunk/cow/application.properties 2009-11-18 18:35:39 UTC (rev 1850)
@@ -4,6 +4,7 @@
plugins.jcaptcha=1.0
app.grails.version=1.1.1
plugins.hibernate=1.1.1
-plugins.quartz=0.4.1
+plugins.quartz=0.4.1
+plugins.mail=0.9
app.name=cow
plugins.jsecurity=0.4.1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1849] trunk/cow/doc

2009-11-18T08:50:25Z

Revision: 1849
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1849&view=rev
Author: hcunningham
Date: 2009-11-18 16:50:25 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
finished first draft of the content; backlogged logging idea for tracing svn probs

Modified Paths:
--------------
trunk/cow/doc/cow-backlog.html
trunk/cow/doc/cow-backlog.yam
trunk/cow/doc/index.html

Modified: trunk/cow/doc/cow-backlog.html
===================================================================
--- trunk/cow/doc/cow-backlog.html 2009-11-18 15:47:00 UTC (rev 1848)
+++ trunk/cow/doc/cow-backlog.html 2009-11-18 16:50:25 UTC (rev 1849)
@@ -68,7 +68,6 @@
<ul>
<li>CSS the twitter div a little to make it different (diff colour? make the
URLs within it smaller to hide their ugliness?) [IR]</li>
- <li>finish off first draft of the content [HC]</li>
</ul></li>
<li>user guide to logging in, editing etc., revise <a class="cow-url" href="gatewiki.html">gatewiki.html</a> [HC]</li>
<li>buy a ssl certificate for <span class="cow-escape">*</span>.gate.ac.uk [HC]</li>
@@ -117,24 +116,18 @@
</ul></li>
<li>g8rs.net [HC, IR]
<ul>
- <li>need roles and perms for:
- gate-extras safe safe-patents sale/internal sam sins
- [HC]</li>
- </ul></li>
-</ul>
-
-
-
-
- <ul>
+ <li>need roles and perms for: gate-extras safe safe-patents sale/internal sam
+ sins [HC]</li>
<li>migration: set up duplicate of existing apache server first then do janet
swap [IR, HC]</li>
- </ul>
-<ul>
+ </ul></li>
<li>some subset of misc bugs (below)</li>
<li>start doing a regen cron on gau-main-tree somewhere [HC]</li>
<li>tell grails to also run on https and get jetty to redirect logins there
[IR/MG]</li>
+<li>quartz jobs and perhaps also webflows should log their start/end times, and
+ put something characteristic in all their log messages; then we'll be able
+ to grep individual jobs/flows out of the log</li>
</ul>

<ul>

Modified: trunk/cow/doc/cow-backlog.yam
===================================================================
--- trunk/cow/doc/cow-backlog.yam 2009-11-18 15:47:00 UTC (rev 1848)
+++ trunk/cow/doc/cow-backlog.yam 2009-11-18 16:50:25 UTC (rev 1849)
@@ -13,7 +13,6 @@
- g8rs.net [HC, IR]
- CSS the twitter div a little to make it different (diff colour? make the
URLs within it smaller to hide their ugliness?) [IR]
- - finish off first draft of the content [HC]
- user guide to logging in, editing etc., revise %(gatewiki.html) [HC]
- buy a ssl certificate for \*.gate.ac.uk [HC]
- analyse the security holes found by ratproxy [MG]
@@ -44,19 +43,17 @@
- uploads go directly into the sandbox - they should go via staging, at
least in server mode.
- g8rs.net [HC, IR]
- - need roles and perms for:
- gate-extras safe safe-patents sale/internal sam sins
- [HC]
-
-
-
-
+ - need roles and perms for: gate-extras safe safe-patents sale/internal sam
+ sins [HC]
- migration: set up duplicate of existing apache server first then do janet
swap [IR, HC]
- some subset of misc bugs (below)
- start doing a regen cron on gau-main-tree somewhere [HC]
- tell grails to also run on https and get jetty to redirect logins there
[IR/MG]
+- quartz jobs and perhaps also webflows should log their start/end times, and
+ put something characteristic in all their log messages; then we'll be able
+ to grep individual jobs/flows out of the log

- misc bugs / minor features [all]
- make a page containing a table with two rows, one of which is empty. Save

Modified: trunk/cow/doc/index.html
===================================================================
--- trunk/cow/doc/index.html 2009-11-18 15:47:00 UTC (rev 1848)
+++ trunk/cow/doc/index.html 2009-11-18 16:50:25 UTC (rev 1849)
@@ -62,9 +62,9 @@

<p>Test results (available when you've built and run the tests)</p>
<ul>
-<li><a class="cow-url" href="../test/reports/index.html">JUnit tests</a></li>
+<li><a class="cow-non-existant-url" href="../test/reports/index.html?m=1">JUnit tests</a></li>
<li><a class="cow-url" href="../selenium/results.html">Selenium functional tests</a></li>
-<li><a class="cow-non-existant-url" href="../logfile.txt?m=1">the log file</a></li>
+<li><a class="cow-url" href="../logfile.txt">the log file</a></li>
</ul>

<!--
@@ -77,8 +77,8 @@

<p>APIs</p>
<ul>
-<li><a class="cow-url" href="api/javadoc/index.html">Java API</a> (<a class="cow-url" href="api/javadoc/constant-values.html">constants</a>)</li>
-<li><a class="cow-url" href="api/gapi/index.html">Groovy API</a></li>
+<li><a class="cow-non-existant-url" href="api/javadoc/index.html?m=1">Java API</a> (<a class="cow-non-existant-url" href="api/javadoc/constant-values.html?m=1">constants</a>)</li>
+<li><a class="cow-non-existant-url" href="api/gapi/index.html?m=1">Groovy API</a></li>
</ul>

<p>Mailing lists</p>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1848] trunk/cow/doc

2009-11-18T07:47:03Z

Revision: 1848
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1848&view=rev
Author: hcunningham
Date: 2009-11-18 15:47:00 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
more

Modified Paths:
--------------
trunk/cow/doc/cow-backlog.html
trunk/cow/doc/cow-backlog.yam
trunk/cow/doc/gatewiki.html
trunk/cow/doc/index.yam

Modified: trunk/cow/doc/cow-backlog.html
===================================================================
--- trunk/cow/doc/cow-backlog.html 2009-11-18 14:00:11 UTC (rev 1847)
+++ trunk/cow/doc/cow-backlog.html 2009-11-18 15:47:00 UTC (rev 1848)
@@ -117,11 +117,20 @@
</ul></li>
<li>g8rs.net [HC, IR]
<ul>
- <li>need roles and perms for: gate-extras safe safe-patents sale/internal sam
- sins [HC]</li>
+ <li>need roles and perms for:
+ gate-extras safe safe-patents sale/internal sam sins
+ [HC]</li>
+ </ul></li>
+</ul>
+
+
+
+
+ <ul>
<li>migration: set up duplicate of existing apache server first then do janet
swap [IR, HC]</li>
- </ul></li>
+ </ul>
+<ul>
<li>some subset of misc bugs (below)</li>
<li>start doing a regen cron on gau-main-tree somewhere [HC]</li>
<li>tell grails to also run on https and get jetty to redirect logins there

Modified: trunk/cow/doc/cow-backlog.yam
===================================================================
--- trunk/cow/doc/cow-backlog.yam 2009-11-18 14:00:11 UTC (rev 1847)
+++ trunk/cow/doc/cow-backlog.yam 2009-11-18 15:47:00 UTC (rev 1848)
@@ -44,8 +44,13 @@
- uploads go directly into the sandbox - they should go via staging, at
least in server mode.
- g8rs.net [HC, IR]
- - need roles and perms for: gate-extras safe safe-patents sale/internal sam
- sins [HC]
+ - need roles and perms for:
+ gate-extras safe safe-patents sale/internal sam sins
+ [HC]
+
+
+
+
- migration: set up duplicate of existing apache server first then do janet
swap [IR, HC]
- some subset of misc bugs (below)

Modified: trunk/cow/doc/gatewiki.html
===================================================================
--- trunk/cow/doc/gatewiki.html 2009-11-18 14:00:11 UTC (rev 1847)
+++ trunk/cow/doc/gatewiki.html 2009-11-18 15:47:00 UTC (rev 1848)
@@ -544,7 +544,7 @@

<p>

-<table border="1">
+<table>
<tr><td> Title </td><td> First paragraph of the file. </td></tr>
<tr><td> Single-line comment / notes </td><td> <span class="cow-escape">%</span><span class="cow-escape">%</span> ... </td></tr>
<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>
@@ -844,7 +844,7 @@
%]
</pre>
<p>results in:</p>
-<table border="1">
+<table>
<tr><td> <b>header col 1</b> </td><td> <b>header col 2</b> </td></tr>
<tr><td> row 1 col 1 </td><td> col 2 </td></tr>
<tr><td> row 2 col 1 </td><td> col 2 </td></tr>
@@ -1950,7 +1950,7 @@

<p>The last two points can be summarised in this truth table</p>

-<table border="1">
+<table>
<tr><td>
</td><td>
</td><td><b>Include pattern</b>
@@ -1986,7 +1986,7 @@
</ul>

-<table border="1">
+<table>
<tr><td><b>Pattern</b>
</td><td><b>Note</b>
</td><td><b>Meaning as an include pattern</b>
@@ -2030,7 +2030,7 @@

<p><b>Some example pattern uses</b></p>

-<table border="1">
+<table>
<tr><td>Scenario
</td><td>Example use case
</td><td>Example include pattern
@@ -2111,7 +2111,7 @@
installation, there will be several pre-defined security objects that you can
use to get your installation up and running.</p>

-<table border="1">
+<table>
<tr><td><b>Type</b>
</td><td><b>Object</b>
</td><td><b>Description</b>
@@ -2531,7 +2531,7 @@
<p>Referencing events</p>
<ul>
<li>page or directory is
- <table border="1">
+ <table>
<tr><td> created </td><td> out-dates all linkers and includers </td></tr>
<tr><td> renamed </td><td> out-dates all linkers and includers </td></tr>
<tr><td> deleted </td><td> out-dates all linkers and includers </td></tr>
@@ -2605,12 +2605,12 @@
indication of how long it takes to do an <tt>svn st</tt> on the SALE tree (which is
more than 5Gb of data in more than 100,000 files.</p>

-<table border="1">
+<table>
<tr><td> <tt>svn st</tt> on the sale tree (from cold)
</td><td> <tt>svn st -u</tt> on sale (filesystem cached)
</td></tr>
<tr><td>
-<table border="1">
+<table>
<tr><td> First run </td><td> Tenth run </td></tr>
<tr><td>
<p>real 0m58.839s <br/>
@@ -2623,7 +2623,7 @@
</td></tr>
</table>
</td><td>
-<table border="1">
+<table>
<tr><td> First run </td><td> Tenth run </td></tr>
<tr><td>
<p>real 0m33.331s <br/>
@@ -2971,12 +2971,12 @@
<p><a name="extending-yam"></a></p><a class="cow-section-anchor" name="section-4.17."/><h2 class="cow-heading"><span class="cow-sec-number">4.17. </span>Extending YAM with Plugins</h2>

<p>YAM has a plugin mechanism that involves writing a Java (or Groovy) class that
-implements <a class="cow-non-existant-url" href="api/javadoc/index.html?gate/yam/YamPlugin.html?m=1">the YamPlugin
+implements <a class="cow-url" href="api/javadoc/index.html?gate/yam/YamPlugin.html">the YamPlugin
interface</a>. Drop this class (which must be in the package <tt>gate.yam.plugins</tt>
into the classpath of the application hosting the YAM translator (e.g.
GATEWiki) and then you can make calls as described in the YAM documentation.</p>

-<p>See e.g. <a class="cow-non-existant-url" href="api/javadoc/index.html?src-html/gate/yam/plugins/Twitter.html?m=1">the
+<p>See e.g. <a class="cow-url" href="api/javadoc/index.html?src-html/gate/yam/plugins/Twitter.html">the
implementation of the Twitter plugin</a> for inspiration.</p>

<p>One of the things this is useful for is dropping snippets of HTML into YAM

Modified: trunk/cow/doc/index.yam
===================================================================
--- trunk/cow/doc/index.yam 2009-11-18 14:00:11 UTC (rev 1847)
+++ trunk/cow/doc/index.yam 2009-11-18 15:47:00 UTC (rev 1848)
@@ -2,7 +2,7 @@

%image(gslidy/gate-logo-colour.png, GATE, 426, 263, right)

-%(acknowledgements.html,Acknowledgements)
+%(acknowledgements.html, Acknowledgements)

Manuals
- %(gatewiki.html, User and Developer Manual)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1847] trunk/cow/scripts/_Events.groovy

2009-11-18T06:00:11Z

Revision: 1847
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1847&view=rev
Author: markagreenwood
Date: 2009-11-18 14:00:11 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
strengthed the logic so that if the secure port isn't specified we don't try and use it

Modified Paths:
--------------
trunk/cow/scripts/_Events.groovy

Modified: trunk/cow/scripts/_Events.groovy
===================================================================
--- trunk/cow/scripts/_Events.groovy 2009-11-18 13:45:52 UTC (rev 1846)
+++ trunk/cow/scripts/_Events.groovy 2009-11-18 14:00:11 UTC (rev 1847)
@@ -73,7 +73,7 @@
}
}

- if (it.getPort() != securePort) {
+ if (securePort != null && it.getPort() != securePort) {
println "Setting ${securePort} as confidential port for connector ${it}"
it.setConfidentialPort(securePort)
}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1846] trunk/cow

2009-11-18T05:45:52Z

Revision: 1846
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1846&view=rev
Author: markagreenwood
Date: 2009-11-18 13:45:52 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
added the ability to force authorization requests to be handled via https instead of http -- it is disabled for now as the selenium tests would fail because of the self sign certificate used by grails. Once we get our own certificate from a known authority we should be able to turn this on by default

Modified Paths:
--------------
trunk/cow/application.properties
trunk/cow/build.xml
trunk/cow/scripts/_Events.groovy
trunk/cow/src/templates/war/web.xml

Modified: trunk/cow/application.properties
===================================================================
--- trunk/cow/application.properties 2009-11-18 12:02:59 UTC (rev 1845)
+++ trunk/cow/application.properties 2009-11-18 13:45:52 UTC (rev 1846)
@@ -1,9 +1,9 @@
-#utf-8
-#Sat Nov 14 22:10:08 GMT 2009
-app.version=1.0-snapshot
-app.grails.version=1.1.1
-plugins.jcaptcha=1.0
-plugins.hibernate=1.1.1
-plugins.jsecurity=0.4.1
-app.name=cow
-plugins.quartz=0.4.1
+#utf-8
+#Wed Nov 18 11:00:01 GMT 2009
+app.version=1.0-snapshot
+plugins.jcaptcha=1.0
+app.grails.version=1.1.1
+plugins.hibernate=1.1.1
+plugins.quartz=0.4.1
+app.name=cow
+plugins.jsecurity=0.4.1

Modified: trunk/cow/build.xml
===================================================================
--- trunk/cow/build.xml 2009-11-18 12:02:59 UTC (rev 1845)
+++ trunk/cow/build.xml 2009-11-18 13:45:52 UTC (rev 1846)
@@ -25,6 +25,7 @@
<property name="jetty.shutdown.key" value="15jj46zfdl7uo" />
<property file="application.properties" />
<property name="gate.cow.server.port" value="8080" />
+ <property name="gate.cow.server.port.https" value="8443" />


+ 
</web-app>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1845] trunk/grails/bin/startGrails.bat

2009-11-18T04:03:00Z

Revision: 1845
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1845&view=rev
Author: markagreenwood
Date: 2009-11-18 12:02:59 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
fixed a known bug in grails 1.1.1 that stops it from ever starting up under windows

Modified Paths:
--------------
trunk/grails/bin/startGrails.bat

Modified: trunk/grails/bin/startGrails.bat
===================================================================
--- trunk/grails/bin/startGrails.bat 2009-11-17 21:19:43 UTC (rev 1844)
+++ trunk/grails/bin/startGrails.bat 2009-11-18 12:02:59 UTC (rev 1845)
@@ -127,7 +127,7 @@
if "%JAVA_OPTS%" == "" set JAVA_OPTS="-Xmx512m"
set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name="%PROGNAME%"
set JAVA_OPTS=%JAVA_OPTS% -Dgrails.home="%GRAILS_HOME%"
-set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version="1.1.1-SNAPSHOT"
+set JAVA_OPTS=%JAVA_OPTS% -Dgrails.version="1.1.1"
set JAVA_OPTS=%JAVA_OPTS% -Dbase.dir="."
set JAVA_OPTS=%JAVA_OPTS% -Dtools.jar="%TOOLS_JAR%"
set JAVA_OPTS=%JAVA_OPTS% -Dgroovy.starter.conf="%STARTER_CONF%"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1844] trunk/cow/doc

2009-11-17T13:19:44Z

Revision: 1844
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1844&view=rev
Author: hcunningham
Date: 2009-11-17 21:19:43 +0000 (Tue, 17 Nov 2009)

Log Message:
-----------
anchor for nav section

Modified Paths:
--------------
trunk/cow/doc/gatewiki.html
trunk/cow/doc/gatewiki.yam

Modified: trunk/cow/doc/gatewiki.html
===================================================================
--- trunk/cow/doc/gatewiki.html 2009-11-17 17:39:11 UTC (rev 1843)
+++ trunk/cow/doc/gatewiki.html 2009-11-17 21:19:43 UTC (rev 1844)
@@ -548,7 +548,7 @@
<tr><td> Title </td><td> First paragraph of the file. </td></tr>
<tr><td> Single-line comment / notes </td><td> <span class="cow-escape">%</span><span class="cow-escape">%</span> ... </td></tr>
<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>
-<tr><td> Headings </td><td> <span class="cow-escape">%</span>1,¬≠<span class="cow-escape">%</span>2,¬≠etc.; <span class="cow-escape">%</span>1<span class="cow-escape">*</span> is unnumbered; follow with blank line </td></tr>
+<tr><td> Headings </td><td> <span class="cow-escape">%</span>1,<span class="cow-escape">%</span>2,etc.; <span class="cow-escape">%</span>1<span class="cow-escape">*</span> is unnumbered; follow with blank line </td></tr>
<tr><td> Bold, italic, teletype, underlined </td><td> <span class="cow-escape">*</span>...<span class="cow-escape">*</span>, <span class="cow-escape">_</span>...<span class="cow-escape">_</span>, <span class="cow-escape">^</span>...<span class="cow-escape">^</span>, <span class="cow-escape">_</span><span class="cow-escape">_</span>...<span class="cow-escape">_</span><span class="cow-escape">_</span> </td></tr>
<tr><td> Contents </td><td> <span class="cow-escape">%</span>contents </td></tr>
<tr><td> Horizontal lines </td><td> <span class="cow-escape">-</span>-- </td></tr>
@@ -2304,8 +2304,9 @@


-<a class="cow-section-anchor" name="section-4.10.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.10.1. </span>Navigation</h3>

+<p><a name="navigation"></a></p><a class="cow-section-anchor" name="section-4.10.1."/><h3 class="cow-heading"><span class="cow-sec-number">4.10.1. </span>Navigation</h3>
+
<p>Navigation that applies to the whole site or to a whole wiki area is probably
best put into a Grails layout plugin - see <a class="cow-url" href="#guest-layouts">replacing the
main layout</a> below. In other cases, e.g. navigation that is different for

Modified: trunk/cow/doc/gatewiki.yam
===================================================================
--- trunk/cow/doc/gatewiki.yam 2009-11-17 17:39:11 UTC (rev 1843)
+++ trunk/cow/doc/gatewiki.yam 2009-11-17 21:19:43 UTC (rev 1844)
@@ -1606,6 +1606,7 @@

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%#navigation
%3 Navigation

Navigation that applies to the whole site or to a whole wiki area is probably

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits

[gatewiki-commits] SF.net SVN: gatewiki:[1843] trunk/cow/lib/jaxen-1.1.jar

2009-11-17T09:39:11Z

Revision: 1843
http://gatewiki.svn.sourceforge.net/gatewiki/?rev=1843&view=rev
Author: hcunningham
Date: 2009-11-17 17:39:11 +0000 (Tue, 17 Nov 2009)

Log Message:
-----------
added lib needed by jsp converter

Added Paths:
-----------
trunk/cow/lib/jaxen-1.1.jar

Added: trunk/cow/lib/jaxen-1.1.jar
===================================================================
(Binary files differ)

Property changes on: trunk/cow/lib/jaxen-1.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
gatewiki-commits mailing list
gatewiki-commits@...
https://lists.sourceforge.net/lists/listinfo/gatewiki-commits