February 2011 - xwiki-devs@xwiki.org

[xwiki-devs] [proposal] Deprecate the practice of using $xcontext.blah to call $xcontext.getBlah() in the templates.
by Caleb James DeLisle 27 Feb '11

27 Feb '11

When I was looking for places where hasProgrammingRights is called, I found calls to c.x.x.api.Context.get() in the templates. I discovered that there is code in the templates which implicitly calls $xcontext.get('something') by calling $xcontext.something where there is no function Context.getSomething(). Since this is so easy and there is no way to know that anything is wrong since Context.get() returns null if you don't have PR, I am proposing that we do away with the practice of implicitly referring to functions in $context entirely. I used the following command to find implicit context references and I have filled in the mappings which I determined manually user@debo8:~/wrk/xwiki.clone/xwiki/platform/web/trunk/standard/src/main/webapp/templates$ find ./ -name '*.vm' -exec grep '$xcontext\.[a-zA-Z0-9]*[^a-zA-Z0-9$]' {} \; | sed -n -e 's/\($xcontext\.[a-zA-Z0-9]*[^a-zA-Z0-9(]$/\n\1\n/p' | grep '^$xcontext' | sort $xcontext.action= $xcontext.action= $xcontext.action= $xcontext.action $xcontext.action $xcontext.action $xcontext.action $xcontext.action $xcontext.action $xcontext.action $xcontext.action, $xcontext.action, $xcontext.action, $xcontext.action, $xcontext.action, $xcontext.action, $xcontext.action, $xcontext.action, $xcontext.action, $xcontext.action, $xcontext.action, $xcontext.action, $xcontext.action. $xcontext.action) ^-- maps to Context.getAction() $xcontext.database $xcontext.database) $xcontext.database) $xcontext.database) $xcontext.database) $xcontext.database) $xcontext.database) ^-- maps to Context.getDatabase() $xcontext.language" $xcontext.language" $xcontext.language" ^-- maps to Context.getLanguage() $xcontext.tocData ^-- this line is broken entirely, it maps to context.get('tocData') but the line is: #set ($xcontext.tocData = $tocData) which is simply invalid and I can't even figure out what it would do. $xcontext.user $xcontext.user $xcontext.user $xcontext.user $xcontext.user $xcontext.user $xcontext.user $xcontext.user $xcontext.user $xcontext.user $xcontext.user $xcontext.user, $xcontext.user, $xcontext.user, $xcontext.user, $xcontext.user, $xcontext.user, $xcontext.user, $xcontext.user, $xcontext.user, $xcontext.user, $xcontext.user, $xcontext.user, $xcontext.user, $xcontext.user. $xcontext.user. $xcontext.user. $xcontext.user" $xcontext.user" $xcontext.user) $xcontext.user) $xcontext.user) $xcontext.user) $xcontext.user) ^-- Maps to $xcontext.getUser() $xcontext.wiki, $xcontext.wiki, $xcontext.wiki, ^-- Maps to $xcontext.get('wiki') I think this is the source of most of the messages and since it appears to be relatively new code, it convinces me that the $context.blah pattern is simply unsafe and should be abandoned at least for the xcontext object. I would like to fix these now and establish a best practice of avoiding the use of these in the future for $xcontext. I myself avoid this pattern entirely but I do not have a compelling reason to propose it as a best practice except for $context. WDYT? Caleb

3 3

[xwiki-devs] build failing on rendering module
by Vincent Massol 26 Feb '11

26 Feb '11

Hi Thomas, FYI the build is failing on the xwiki10 parser syntax tests (links3.test): junit.framework.ComparisonFailure: null Expected :[[http:~~/~~/reference>>reference]] [[*not bold*>>reference]] Actual :[[http:~~/~~/reference>>reference]] [[**not bold**>>reference]] at org.xwiki.rendering.scaffolding.RenderingTestCase.runTestInternal(RenderingTestCase.java:159) at org.xwiki.rendering.scaffolding.RenderingTestCase.runTest(RenderingTestCase.java:106) at org.jmock.core.VerifyingTestCase.runBare(VerifyingTestCase.java:39) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:24) Seems like non bold is transformed into bold now. Any ide? Thanks -Vincent

2 9

[xwiki-devs] [UX][Proposal] Add a list with keyboard shortcuts
by Ecaterina Moraru (Valica) 26 Feb '11

26 Feb '11

Hi, I've made a proposal on how to integrate keyboard shortcuts into UI http://incubator.myxwiki.org/xwiki/bin/view/Improvements/KeyboardShortcuts Thanks, Caty

6 7

26 Feb '11

Hi Sergiu, On Feb 26, 2011, at 12:00 AM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2011-02-26 00:00:44 +0100 (Sat, 26 Feb 2011) > New Revision: 34960 > > Added: > platform/core/trunk/xwiki-eventstream/ > platform/core/trunk/xwiki-eventstream/pom.xml > platform/core/trunk/xwiki-eventstream/src/ > platform/core/trunk/xwiki-eventstream/src/main/ > platform/core/trunk/xwiki-eventstream/src/main/java/ > platform/core/trunk/xwiki-eventstream/src/main/java/org/ > platform/core/trunk/xwiki-eventstream/src/main/java/org/xwiki/ > platform/core/trunk/xwiki-eventstream/src/main/java/org/xwiki/eventstream/ > platform/core/trunk/xwiki-eventstream/src/main/java/org/xwiki/eventstream/Event.java > platform/core/trunk/xwiki-eventstream/src/main/java/org/xwiki/eventstream/EventFactory.java > platform/core/trunk/xwiki-eventstream/src/main/java/org/xwiki/eventstream/EventGroup.java > platform/core/trunk/xwiki-eventstream/src/main/java/org/xwiki/eventstream/EventStream.java > platform/core/trunk/xwiki-eventstream/src/main/java/org/xwiki/eventstream/internal/ > platform/core/trunk/xwiki-eventstream/src/main/java/org/xwiki/eventstream/internal/DefaultEvent.java > platform/core/trunk/xwiki-eventstream/src/main/java/org/xwiki/eventstream/internal/DefaultEventFactory.java > platform/core/trunk/xwiki-eventstream/src/main/resources/ > platform/core/trunk/xwiki-eventstream/src/main/resources/META-INF/ > platform/core/trunk/xwiki-eventstream/src/main/resources/META-INF/components.txt > platform/core/trunk/xwiki-eventstream/src/test/ > platform/core/trunk/xwiki-eventstream/src/test/java/ > platform/core/trunk/xwiki-eventstream/src/test/java/org/ > platform/core/trunk/xwiki-eventstream/src/test/java/org/xwiki/ > platform/core/trunk/xwiki-eventstream/src/test/java/org/xwiki/eventstream/ > platform/core/trunk/xwiki-eventstream/src/test/java/org/xwiki/eventstream/EventAndFactoryTest.java > platform/core/trunk/xwiki-eventstream/src/test/java/org/xwiki/eventstream/EventGroupTest.java > Modified: > platform/core/trunk/pom.xml > Log: > XWIKI-6047: New EventStream component That was new to me. Was this discussed (it's possible I missed a mail on the list)? From the jira it seems this module is meant to be a replacement of the ActivityStream plugin, right? If so what's the strategy to replace it (timing, backward compat, etc)? There seems to be a notion of Event similar to that of the Observation module. Maybe Event is not the right term here seems the javadoc says "A recorded event that happened at some point in the wiki". Maybe something like ArchiveEvent, PastEvent, SavedEvent, etc And maybe these events should extend the Observation Event and add new fields (date, etc)? Or maybe it's better to not extend but have a field that is the original Observation Event object? Or maybe not and it's better to have no relationship to the Observation module to be independent? In any case this should probably be discussed/explained. Maybe the Obervation module should be split in one more submodule called xwiki-observation-store or xwiki-observation-history? It seems to me this could be about historizing the events sent by the Observation managed. To be honest, I haven't really thought about it enough (would need to load the code in my IDE). I find that this commit happens quite late in the release cycle (3 days before end of milestone) and would have warranted some earlier discussion. It's ok, I'm not asking to rollback, just saying that something this important from an architecture point of view should rather be done earlier and discussed. Thanks -Vincent

2 3

[xwiki-devs] XWiki Enterprise and XWiki Enterprise Manager 2.5.2, 2.6.2 and 2.7.1 Released
by Raluca Stavro 25 Feb '11

25 Feb '11

The XWiki development team is pleased to announce the release of XWiki Enterprise and XWiki Enterprise Manager 2.5.2, 2.6.2 and 2.7.1. These are the last releases on the 2.5 and 2.6 branches, but the 2.7 branch will continue to be maintained. Go grab 2.7.1 at http://www.xwiki.org/xwiki/bin/view/Main/Download , or browse http://forge.ow2.org/project/showfiles.php?group_id=170 for the other releases. The highlights of these releases are: * Cannot login with Safari 5 without selecting "remember me" * Better support for custom display of object properties * Fixed several PDF export and WYSIWYG issues * Support for Forgot Username & Password in private wikis * Fixed some bugs with XAR Import * New {{cache}} macro For more information, see the full release notes: XWiki Enterprise: * http://www.xwiki.org/xwiki/bin/view/ReleaseNotes/ReleaseNotesXWikiEnterpris… * http://www.xwiki.org/xwiki/bin/view/ReleaseNotes/ReleaseNotesXWikiEnterpris… * http://www.xwiki.org/xwiki/bin/view/ReleaseNotes/ReleaseNotesXWikiEnterpris… XWiki Enterprise Manager: * http://www.xwiki.org/xwiki/bin/view/ReleaseNotes/ReleaseNotesXEM252 * http://www.xwiki.org/xwiki/bin/view/ReleaseNotes/ReleaseNotesXEM262 * http://www.xwiki.org/xwiki/bin/view/ReleaseNotes/ReleaseNotesXEM271 Thanks -The XWiki dev team

1 0

Re: [xwiki-devs] [xwiki-notifications] r34925 - in platform: core/trunk/xwiki-core/src/main/resources web/trunk/standard/src/main/webapp/resources/uicomponents/search web/trunk/standard/src/main/webapp/templates xwiki-applications/trunk/search/src/main/resources/
by Jerome Velociter 25 Feb '11

25 Feb '11

On Fri, Feb 25, 2011 at 4:27 AM, jvelociter <platform-notifications(a)xwiki.org> wrote: > Author: jvelociter > Date: 2011-02-25 04:27:58 +0100 (Fri, 25 Feb 2011) > New Revision: 34925 > > Added: > platform/web/trunk/standard/src/main/webapp/resources/uicomponents/search/searchSuggest.js > platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestConfig.xml > platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestConfigSheet.xml > platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestLuceneService.xml > platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestSourceClass.xml > Modified: > platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources.properties > platform/web/trunk/standard/src/main/webapp/templates/javascript.vm > Log: > XASEARCH-22 Support for multi-sources live suggestions when typing in the search box > XWIKI-6044 Resources for the search suggest feature of search application > > First iteration on the "search suggest" feature. > > It's not completely finished, though it's functional. It's not activated by default yet, you can go and activate it in the administration in order to test. > > Remains to do : > > * Fully internationalize > * Improve suggestion display (show both document title AND document full name) > * Shortcut to open suggestions pages in edit mode (replace jump to page functionnality) > * Other tuning * Search on both name and title for the document name source * Fix the attachment name source that does not seem to work * Filter on blacklisted spaces for non-advanced users Jerome. > > Feedback very welcome. > > > > Modified: platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources.properties > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources.properties 2011-02-25 02:31:38 UTC (rev 34924) > +++ platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources.properties 2011-02-25 03:27:58 UTC (rev 34925) > @@ -2980,6 +2980,7 @@ > dashboard.actions.add.failed=Failed to add gadget: > > # Search application resources > +admin.searchsuggest=Search Suggest > admin.search=Search > admin.search.description=Choose the default search engine or configure the Lucene index. > search.admin.title=Search > > Added: platform/web/trunk/standard/src/main/webapp/resources/uicomponents/search/searchSuggest.js > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/resources/uicomponents/search/searchSuggest.js (rev 0) > +++ platform/web/trunk/standard/src/main/webapp/resources/uicomponents/search/searchSuggest.js 2011-02-25 03:27:58 UTC (rev 34925) > @@ -0,0 +1,213 @@ > +var XWiki = (function (XWiki) { > + > + /** > + * The search suggest hooks itself on the search input and provide live results as the user types. > + * Search form validation is not affected (user can still type enter and get to the regular search result page) > + */ > + XWiki.SearchSuggest = Class.create({ > + > + /** > + * Constructor. Prepares a light modal container on the same model as the modalPopup > + * and registers event listerners. > + */ > + initialize: function(searchInput, sources){ > + > + this.sources = sources; > + > + this.realSearchInput = $(searchInput); > + > + this.modalContainer = new Element('div', {'class': 'xdialog-modal-container'}).hide(); > + var screen = new Element('div', {'class': 'xdialog-screen'}).setStyle({ > + opacity : 0.35, > + backgroundColor : "#000000" > + }); > + this.modalContainer.insert(screen); > + this.modalContainer.insert(new Element('div', {'id' : 'searchSuggest'})); > + document.body.appendChild(this.modalContainer); > + > + document.observe("xwiki:suggest:clearSuggestions", this.onClearSuggestions.bindAsEventListener(this)); > + document.observe("xwiki:suggest:containerCreated", this.onSuggestContainerCreated.bindAsEventListener(this)); > + document.observe("xwiki:suggest:containerPrepared", this.onSuggestContainerPrepared.bindAsEventListener(this)); > + document.observe("xwiki:suggest:selected", this.onSuggestionSelected.bindAsEventListener(this)); > + > + this.createSuggest(); > + }, > + > + /** > + * Callback triggered when the original suggest clears its suggestions. > + */ > + onClearSuggestions: function(event){ > + if (event.memo.suggest == this.suggest) { > + this.modalContainer.hide(); > + this.devirtualizeSearchInput(); > + } > + }, > + > + /** > + * Callback triggered when the original suggest has prepared its results container. > + */ > + onSuggestContainerPrepared: function(event){ > + if (event.memo.suggest == this.suggest && event.memo.suggest == this.suggest) { > + this.modalContainer.show(); > + this.virtualizeSearchInput(); > + } > + }, > + > + /** > + * Callback triggered when a suggestion is selected. > + * Submits the form or go to a selected page according to selection. > + */ > + onSuggestionSelected: function(event) { > + if (event.memo.suggest = this.suggest) { > + event.stop(); > + this.onClearSuggestions(event); > + this.virtualSearchInput.value = event.memo.value; > + if (!event.memo.id) { > + // Submit form > + this.realSearchInput.up('form').submit(); > + } > + else { > + // Go to page > + window.location = event.memo.id;; > + } > + } > + }, > + > + /** > + * Creates the underlaying suggest widget. > + */ > + createSuggest: function() { > + // Create dummy suggestion node to hold the "Show all results" option > + var valueNode = new Element('div') > + .insert(new Element('span', {'class':'suggestId'})) > + .insert(new Element('span', {'class':'suggestValue'})) > + .insert(new Element('span', {'class':'suggestInfo'})) > + var allResultsNode = new XWiki.widgets.XList([ > + new XWiki.widgets.XListItem( "Show all results...", { > + 'containerClasses': 'suggestItem', > + 'classes': 'showAllResuts', > + 'eventCallbackScope' : this, > + 'noHighlight' : true, > + 'value' : valueNode > + } ), > + ], > + { > + 'classes' : 'suggestList', > + 'eventListeners' : { > + 'click': function(event){ > + this.devirtualizeSearchInput(); > + this.realSearchInput.up('form').submit(); > + }, > + 'mouseover':function(event){ > + this.suggest.clearHighlight(); > + this.suggest.iHighlighted = event.element(); > + event.element().addClassName('xhighlight'); > + } > + } > + }); > + this.suggest = new XWiki.widgets.Suggest( this.realSearchInput, { > + parentContainer: $('searchSuggest'), > + className: 'ajaxsuggest searchSuggest', > + fadeOnClear:false, > + align: "right", > + minchars: 3, > + sources : this.sources, > + insertBeforeSuggestions : new Element("div", {'class' : 'results'}).update(allResultsNode.getElement()) > + }); > + }, > + > + /** > + * Add a "virtual" search input on top of the original one, so that it appears on top of the modal container. > + */ > + virtualizeSearchInput: function(){ > + if (!this.isVirtual) { > + this.isVirtual = true; > + this.virtualSearchInput.value = this.realSearchInput.value; > + this.virtualSearchInput.show(); > + this.virtualSearchInput.focus(); > + this.suggest.setInputField(this.virtualSearchInput); > + } > + }, > + > + /** > + * Hides the virtual search input > + */ > + devirtualizeSearchInput: function(){ > + this.realSearchInput.value = this.virtualSearchInput.value; > + this.realSearchInput.focus(); > + this.suggest.setInputField(this.realSearchInput); > + this.isVirtual = false; > + }, > + > + /** > + * Callback triggered when the original suggest has created its results container. > + */ > + onSuggestContainerCreated: function(event){ > + if (event.memo.suggest == this.suggest) { > + var container = event.memo.container; > + this.modalContainer.show(); > + this.virtualSearchInput = this.realSearchInput.clone(); > + this.virtualSearchInput.id = this.realSearchInput.id + '-virtual'; > + this.virtualSearchInput.clonePosition(container, { setWidth : false }); > + $('searchSuggest').insert(this.virtualSearchInput); > + this.virtualSearchInput.setStyle({position : 'absolute'}); > + this.virtualSearchInput.setStyle({ > + top : (this.virtualSearchInput.cumulativeOffset().top - this.realSearchInput.getHeight()) + 'px', > + position:'absolute' > + }); > + > + if (Prototype.Browser.IE || Prototype.Browser.WebKit) { > + this.virtualSearchInput.observe("keydown", this.onKeyPress.bindAsEventListener(this)); > + } else { > + this.virtualSearchInput.observe("keypress", this.onKeyPress.bindAsEventListener(this)); > + } > + } > + }, > + > + /** > + * Callback triggered when a key has been typed on the virtual input. > + */ > + onKeyPress: function(event){ > + var key = event.keyCode; > + switch(key) { > + // Ignore special keys, which are treated in onKeyPress > + case Event.KEY_RETURN: > + if (!this.suggest.hasActiveSelection()) { > + this.devirtualizeSearchInput(); > + event.stop(); > + this.realSearchInput.up('form').submit(); > + } > + default: > + } > + } > + > + }); > + > + return XWiki; > + > +})(XWiki); > + > +document.observe("dom:loaded", function(){ > + > + var sources = [ > + ## Iterate over the sources defined in the configuration document, and create a source array to be passed to the > + ## search suggest contructor. > + #set($sourceDocument = $xwiki.getDocument("XWiki.SearchSuggestConfig")) > + #foreach($source in $sourceDocument.getObjects('XWiki.SearchSuggestSourceClass')) > + #if($source.getProperty('activated').value == 1) > + { > + name : "$escapetool.javascript($source.display('name','view'))", > + varname : 'input', > + script : "#evaluate($source.getProperty('url').value)&query=$source.getProperty('query').value&nb=$source.getProperty('resultsNumber').value&", > + icon : "#evaluate($source.getProperty('icon').value)", > + highlight: #if($source.getProperty('highlight').value == 1) true #else false #end > + }, > + #end > + #end > + null // Don't handle last coma. This is going to be compated anyway. > + ].compact() > + > + new XWiki.SearchSuggest($('headerglobalsearchinput'), sources); > + > +}); > + > > Modified: platform/web/trunk/standard/src/main/webapp/templates/javascript.vm > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/templates/javascript.vm 2011-02-25 02:31:38 UTC (rev 34924) > +++ platform/web/trunk/standard/src/main/webapp/templates/javascript.vm 2011-02-25 03:27:58 UTC (rev 34925) > @@ -21,6 +21,27 @@ > $xwiki.ssfx.use('uicomponents/widgets/notification.css', true) > $xwiki.jsfx.use('uicomponents/widgets/list/xlist.js') > $xwiki.jsfx.use('uicomponents/suggest/suggest.js') > +#if($xwiki.exists('XWiki.SearchSuggestConfig')) > + ## Hook to request the search suggest script if search suggest configuration is present. > + ## We can't just have it as a always-use SSX yet since we compute a hash to be sure to refresh > + ## the file when the configuration changes. > + ## Ideally, this code should be located in a interface extension, in the search application. > + #set($searchSuggestConfigDocument = $xwiki.getDocument('XWiki.SearchSuggestConfig')) > + #set($searchSuggestConfigObject = $searchSuggestConfigDocument.getObject('XWiki.SearchSuggestConfig')) > + #if($searchSuggestConfigObject.getProperty('activated').value == 1) > + #set($searchSuggestConfigHash = '') > + #foreach($source in $searchSuggestConfigDocument.getObjects('XWiki.SearchSuggestSourceClass')) > + #if($source.getProperty('activated').value == 1) > + #set($sourceId = "${source.get('name')}:${source.get('url')}:${source.get('highlight')}:${source.get('icon')}}") > + #set($searchSuggestConfigHash = "${searchSuggestConfigHash}|${sourceId}") > + #end > + #end > + $xwiki.jsfx.use('uicomponents/search/searchSuggest.js', { > + 'forceSkinAction' : true, > + 'h' : $searchSuggestConfigHash.hashCode() > + }) > + #end > +#end > <script type="text/javascript" src="$xwiki.getSkinFile("js/prototype/prototype.js")"></script> > <script type="text/javascript" src="$xwiki.getSkinFile("js/xwiki/xwiki.js", true)"></script> > <script type="text/javascript"> > > Added: platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestConfig.xml > =================================================================== > --- platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestConfig.xml (rev 0) > +++ platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestConfig.xml 2011-02-25 03:27:58 UTC (rev 34925) > @@ -0,0 +1,960 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<xwikidoc> > +<web>XWiki</web> > +<name>SearchSuggestConfig</name> > +<language></language> > +<defaultLanguage>en</defaultLanguage> > +<translation>0</translation> > +<parent>XWiki.SearchCode</parent> > +<creator>XWiki.Admin</creator> > +<author>XWiki.Admin</author> > +<customClass></customClass> > +<contentAuthor>XWiki.Admin</contentAuthor> > +<creationDate>1280310893000</creationDate> > +<date>1298601876000</date> > +<contentUpdateDate>1298601876000</contentUpdateDate> > +<version>1.1</version> > +<title>Search Suggest Configuration</title> > +<template></template> > +<defaultTemplate></defaultTemplate> > +<validationScript></validationScript> > +<comment></comment> > +<minorEdit>false</minorEdit> > +<syntaxId>xwiki/2.0</syntaxId> > +<hidden>false</hidden> > +<class> > +<name>XWiki.SearchSuggestConfig</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<activated> > +<disabled>0</disabled> > +<displayFormType>select</displayFormType> > +<name>activated</name> > +<number>1</number> > +<prettyName>activated</prettyName> > +<unmodifiable>0</unmodifiable> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</activated> > +</class> > +<object> > +<class> > +<name>XWiki.ConfigurableClass</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<codeToExecute> > +<disabled>0</disabled> > +<editor>---</editor> > +<name>codeToExecute</name> > +<number>7</number> > +<picker>0</picker> > +<prettyName>codeToExecute</prettyName> > +<rows>5</rows> > +<size>40</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> > +</codeToExecute> > +<configurationClass> > +<disabled>0</disabled> > +<name>configurationClass</name> > +<number>3</number> > +<picker>0</picker> > +<prettyName>configurationClass</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</configurationClass> > +<configureGlobally> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>configureGlobally</name> > +<number>4</number> > +<prettyName>configureGlobally</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</configureGlobally> > +<displayInSection> > +<disabled>0</disabled> > +<name>displayInSection</name> > +<number>1</number> > +<picker>0</picker> > +<prettyName>displayInSection</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</displayInSection> > +<heading> > +<disabled>0</disabled> > +<name>heading</name> > +<number>2</number> > +<picker>0</picker> > +<prettyName>heading</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</heading> > +<iconAttachment> > +<disabled>0</disabled> > +<name>iconAttachment</name> > +<number>8</number> > +<picker>0</picker> > +<prettyName>iconAttachment</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</iconAttachment> > +<linkPrefix> > +<disabled>0</disabled> > +<name>linkPrefix</name> > +<number>5</number> > +<picker>0</picker> > +<prettyName>linkPrefix</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</linkPrefix> > +<propertiesToShow> > +<cache>0</cache> > +<disabled>0</disabled> > +<displayType>input</displayType> > +<multiSelect>1</multiSelect> > +<name>propertiesToShow</name> > +<number>6</number> > +<picker>0</picker> > +<prettyName>propertiesToShow</prettyName> > +<relationalStorage>1</relationalStorage> > +<separator> </separator> > +<separators> ,|</separators> > +<size>20</size> > +<sort>none</sort> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<values></values> > +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> > +</propertiesToShow> > +</class> > +<name>XWiki.SearchSuggestConfig</name> > +<number>0</number> > +<className>XWiki.ConfigurableClass</className> > +<guid>322238f5-c742-43ed-81e0-ba169fc05653</guid> > +<property> > +<codeToExecute>[[Configure the suggest sources>>XWiki.SearchSuggestConfig]]</codeToExecute> > +</property> > +<property> > +<configurationClass>XWiki.SearchSuggestConfig</configurationClass> > +</property> > +<property> > +<configureGlobally>1</configureGlobally> > +</property> > +<property> > +<displayInSection>searchSuggest</displayInSection> > +</property> > +<property> > +<heading>Search Suggest</heading> > +</property> > +<property> > +<iconAttachment></iconAttachment> > +</property> > +<property> > +<linkPrefix></linkPrefix> > +</property> > +<property> > +<propertiesToShow> > +<value>activated</value> > +</propertiesToShow> > +</property> > +</object> > +<object> > +<class> > +<name>XWiki.SearchSuggestConfig</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<activated> > +<disabled>0</disabled> > +<displayFormType>select</displayFormType> > +<name>activated</name> > +<number>1</number> > +<prettyName>activated</prettyName> > +<unmodifiable>0</unmodifiable> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</activated> > +</class> > +<name>XWiki.SearchSuggestConfig</name> > +<number>0</number> > +<className>XWiki.SearchSuggestConfig</className> > +<guid>5faef1df-77ac-4bb3-9dda-8d38447b94e1</guid> > +<property> > +<activated>0</activated> > +</property> > +</object> > +<object> > +<class> > +<name>XWiki.SearchSuggestSourceClass</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<activated> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>activated</name> > +<number>7</number> > +<prettyName>activated</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</activated> > +<highlight> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>highlight</name> > +<number>6</number> > +<prettyName>highlight</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</highlight> > +<icon> > +<disabled>0</disabled> > +<name>icon</name> > +<number>5</number> > +<picker>0</picker> > +<prettyName>icon</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</icon> > +<name> > +<disabled>0</disabled> > +<name>name</name> > +<number>1</number> > +<picker>0</picker> > +<prettyName>name</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</name> > +<query> > +<disabled>0</disabled> > +<name>query</name> > +<number>3</number> > +<picker>0</picker> > +<prettyName>query</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</query> > +<resultsNumber> > +<disabled>0</disabled> > +<name>resultsNumber</name> > +<number>4</number> > +<picker>0</picker> > +<prettyName>resultsNumber</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</resultsNumber> > +<url> > +<disabled>0</disabled> > +<name>url</name> > +<number>2</number> > +<picker>0</picker> > +<prettyName>url</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</url> > +</class> > +<name>XWiki.SearchSuggestConfig</name> > +<number>0</number> > +<className>XWiki.SearchSuggestSourceClass</className> > +<guid>291d9c6d-b9b1-41b2-8aab-5f1cedba5ded</guid> > +<property> > +<activated>1</activated> > +</property> > +<property> > +<highlight>1</highlight> > +</property> > +<property> > +<icon>$xwiki.getSkinFile('icons/silk/page_white_text.gif')</icon> > +</property> > +<property> > +<name>Document name</name> > +</property> > +<property> > +<query>name:__INPUT__*</query> > +</property> > +<property> > +<resultsNumber>3</resultsNumber> > +</property> > +<property> > +<url>$xwiki.getURL('XWiki.SearchSuggestLuceneService', 'get', 'outputSyntax=plain')</url> > +</property> > +</object> > +<object> > +<class> > +<name>XWiki.SearchSuggestSourceClass</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<activated> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>activated</name> > +<number>7</number> > +<prettyName>activated</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</activated> > +<highlight> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>highlight</name> > +<number>6</number> > +<prettyName>highlight</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</highlight> > +<icon> > +<disabled>0</disabled> > +<name>icon</name> > +<number>5</number> > +<picker>0</picker> > +<prettyName>icon</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</icon> > +<name> > +<disabled>0</disabled> > +<name>name</name> > +<number>1</number> > +<picker>0</picker> > +<prettyName>name</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</name> > +<query> > +<disabled>0</disabled> > +<name>query</name> > +<number>3</number> > +<picker>0</picker> > +<prettyName>query</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</query> > +<resultsNumber> > +<disabled>0</disabled> > +<name>resultsNumber</name> > +<number>4</number> > +<picker>0</picker> > +<prettyName>resultsNumber</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</resultsNumber> > +<url> > +<disabled>0</disabled> > +<name>url</name> > +<number>2</number> > +<picker>0</picker> > +<prettyName>url</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</url> > +</class> > +<name>XWiki.SearchSuggestConfig</name> > +<number>1</number> > +<className>XWiki.SearchSuggestSourceClass</className> > +<guid>9c2ba119-f8b2-4652-b5ff-9d446cbdb9aa</guid> > +<property> > +<activated>1</activated> > +</property> > +<property> > +<highlight>0</highlight> > +</property> > +<property> > +<icon>$xwiki.getSkinFile('icons/silk/page_white_text.gif')</icon> > +</property> > +<property> > +<name>Document content</name> > +</property> > +<property> > +<query>__INPUT__*</query> > +</property> > +<property> > +<resultsNumber>3</resultsNumber> > +</property> > +<property> > +<url>$xwiki.getURL('XWiki.SearchSuggestLuceneService', 'get', 'outputSyntax=plain')</url> > +</property> > +</object> > +<object> > +<class> > +<name>XWiki.SearchSuggestSourceClass</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<activated> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>activated</name> > +<number>7</number> > +<prettyName>activated</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</activated> > +<highlight> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>highlight</name> > +<number>6</number> > +<prettyName>highlight</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</highlight> > +<icon> > +<disabled>0</disabled> > +<name>icon</name> > +<number>5</number> > +<picker>0</picker> > +<prettyName>icon</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</icon> > +<name> > +<disabled>0</disabled> > +<name>name</name> > +<number>1</number> > +<picker>0</picker> > +<prettyName>name</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</name> > +<query> > +<disabled>0</disabled> > +<name>query</name> > +<number>3</number> > +<picker>0</picker> > +<prettyName>query</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</query> > +<resultsNumber> > +<disabled>0</disabled> > +<name>resultsNumber</name> > +<number>4</number> > +<picker>0</picker> > +<prettyName>resultsNumber</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</resultsNumber> > +<url> > +<disabled>0</disabled> > +<name>url</name> > +<number>2</number> > +<picker>0</picker> > +<prettyName>url</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</url> > +</class> > +<name>XWiki.SearchSuggestConfig</name> > +<number>2</number> > +<className>XWiki.SearchSuggestSourceClass</className> > +<guid>40387571-e03f-4ffd-abda-61cf2a2b2b55</guid> > +<property> > +<activated>1</activated> > +</property> > +<property> > +<highlight>1</highlight> > +</property> > +<property> > +<icon>$xwiki.getSkinFile('icons/silk/attach.gif')</icon> > +</property> > +<property> > +<name>Attachment name</name> > +</property> > +<property> > +<query>name:__INPUT__* AND type:attachment</query> > +</property> > +<property> > +<resultsNumber>3</resultsNumber> > +</property> > +<property> > +<url>$xwiki.getURL('XWiki.SearchSuggestLuceneService', 'get', 'outputSyntax=plain')</url> > +</property> > +</object> > +<object> > +<class> > +<name>XWiki.SearchSuggestSourceClass</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<activated> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>activated</name> > +<number>7</number> > +<prettyName>activated</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</activated> > +<highlight> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>highlight</name> > +<number>6</number> > +<prettyName>highlight</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</highlight> > +<icon> > +<disabled>0</disabled> > +<name>icon</name> > +<number>5</number> > +<picker>0</picker> > +<prettyName>icon</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</icon> > +<name> > +<disabled>0</disabled> > +<name>name</name> > +<number>1</number> > +<picker>0</picker> > +<prettyName>name</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</name> > +<query> > +<disabled>0</disabled> > +<name>query</name> > +<number>3</number> > +<picker>0</picker> > +<prettyName>query</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</query> > +<resultsNumber> > +<disabled>0</disabled> > +<name>resultsNumber</name> > +<number>4</number> > +<picker>0</picker> > +<prettyName>resultsNumber</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</resultsNumber> > +<url> > +<disabled>0</disabled> > +<name>url</name> > +<number>2</number> > +<picker>0</picker> > +<prettyName>url</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</url> > +</class> > +<name>XWiki.SearchSuggestConfig</name> > +<number>3</number> > +<className>XWiki.SearchSuggestSourceClass</className> > +<guid>dbc05205-6333-4889-8613-83686f9288f6</guid> > +<property> > +<activated>1</activated> > +</property> > +<property> > +<highlight>0</highlight> > +</property> > +<property> > +<icon>$xwiki.getSkinFile('icons/silk/attach.gif')</icon> > +</property> > +<property> > +<name>Attachment content</name> > +</property> > +<property> > +<query>__INPUT__*AND type:attachment</query> > +</property> > +<property> > +<resultsNumber>3</resultsNumber> > +</property> > +<property> > +<url>$xwiki.getURL('XWiki.SearchSuggestLuceneService', 'get', 'outputSyntax=plain')</url> > +</property> > +</object> > +<object> > +<class> > +<name>XWiki.SearchSuggestSourceClass</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<activated> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>activated</name> > +<number>7</number> > +<prettyName>activated</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</activated> > +<highlight> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>highlight</name> > +<number>6</number> > +<prettyName>highlight</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</highlight> > +<icon> > +<disabled>0</disabled> > +<name>icon</name> > +<number>5</number> > +<picker>0</picker> > +<prettyName>icon</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</icon> > +<name> > +<disabled>0</disabled> > +<name>name</name> > +<number>1</number> > +<picker>0</picker> > +<prettyName>name</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</name> > +<query> > +<disabled>0</disabled> > +<name>query</name> > +<number>3</number> > +<picker>0</picker> > +<prettyName>query</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</query> > +<resultsNumber> > +<disabled>0</disabled> > +<name>resultsNumber</name> > +<number>4</number> > +<picker>0</picker> > +<prettyName>resultsNumber</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</resultsNumber> > +<url> > +<disabled>0</disabled> > +<name>url</name> > +<number>2</number> > +<picker>0</picker> > +<prettyName>url</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</url> > +</class> > +<name>XWiki.SearchSuggestConfig</name> > +<number>4</number> > +<className>XWiki.SearchSuggestSourceClass</className> > +<guid>1e881b2d-031c-42ba-bd2d-867fa72c7dab</guid> > +<property> > +<activated>0</activated> > +</property> > +<property> > +<highlight>0</highlight> > +</property> > +<property> > +<icon>$xwiki.getSkinFile('icons/silk/page_white_picture.gif')</icon> > +</property> > +<property> > +<name>Blog Posts</name> > +</property> > +<property> > +<query>__INPUT__* AND object:Blog.BlogPostClass</query> > +</property> > +<property> > +<resultsNumber>3</resultsNumber> > +</property> > +<property> > +<url>$xwiki.getURL('XWiki.SearchSuggestLuceneService', 'get', 'outputSyntax=plain')</url> > +</property> > +</object> > +<object> > +<class> > +<name>XWiki.SearchSuggestSourceClass</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<activated> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>activated</name> > +<number>7</number> > +<prettyName>activated</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</activated> > +<highlight> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>highlight</name> > +<number>6</number> > +<prettyName>highlight</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</highlight> > +<icon> > +<disabled>0</disabled> > +<name>icon</name> > +<number>5</number> > +<picker>0</picker> > +<prettyName>icon</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</icon> > +<name> > +<disabled>0</disabled> > +<name>name</name> > +<number>1</number> > +<picker>0</picker> > +<prettyName>name</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</name> > +<query> > +<disabled>0</disabled> > +<name>query</name> > +<number>3</number> > +<picker>0</picker> > +<prettyName>query</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</query> > +<resultsNumber> > +<disabled>0</disabled> > +<name>resultsNumber</name> > +<number>4</number> > +<picker>0</picker> > +<prettyName>resultsNumber</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</resultsNumber> > +<url> > +<disabled>0</disabled> > +<name>url</name> > +<number>2</number> > +<picker>0</picker> > +<prettyName>url</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</url> > +</class> > +<name>XWiki.SearchSuggestConfig</name> > +<number>5</number> > +<className>XWiki.SearchSuggestSourceClass</className> > +<guid>8cc7466d-c6be-4118-bb06-8f287a3bad92</guid> > +<property> > +<activated>1</activated> > +</property> > +<property> > +<highlight>0</highlight> > +</property> > +<property> > +<icon>$xwiki.getSkinFile('icons/silk/user.gif')</icon> > +</property> > +<property> > +<name>Users</name> > +</property> > +<property> > +<query>__INPUT__* AND object:XWiki.XWikiUsers</query> > +</property> > +<property> > +<resultsNumber>3</resultsNumber> > +</property> > +<property> > +<url>$xwiki.getURL('XWiki.SearchSuggestLuceneService', 'get', 'outputSyntax=plain')</url> > +</property> > +</object> > +<content>{{include document="XWiki.SearchSuggestConfigSheet" /}} > +</content></xwikidoc> > > Added: platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestConfigSheet.xml > =================================================================== > --- platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestConfigSheet.xml (rev 0) > +++ platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestConfigSheet.xml 2011-02-25 03:27:58 UTC (rev 34925) > @@ -0,0 +1,73 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<xwikidoc> > +<web>XWiki</web> > +<name>SearchSuggestConfigSheet</name> > +<language></language> > +<defaultLanguage>en</defaultLanguage> > +<translation>0</translation> > +<parent>XWiki.SearchSuggestConfig</parent> > +<creator>XWiki.Admin</creator> > +<author>XWiki.Admin</author> > +<customClass></customClass> > +<contentAuthor>XWiki.Admin</contentAuthor> > +<creationDate>1280310959000</creationDate> > +<date>1297439261000</date> > +<contentUpdateDate>1297439261000</contentUpdateDate> > +<version>1.1</version> > +<title></title> > +<template></template> > +<defaultTemplate></defaultTemplate> > +<validationScript></validationScript> > +<comment></comment> > +<minorEdit>false</minorEdit> > +<syntaxId>xwiki/2.0</syntaxId> > +<hidden>false</hidden> > +<object> > +<class> > +<name>XWiki.SheetClass</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<defaultEditMode> > +<disabled>0</disabled> > +<name>defaultEditMode</name> > +<number>1</number> > +<prettyName>Default Edit Mode</prettyName> > +<size>15</size> > +<unmodifiable>0</unmodifiable> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</defaultEditMode> > +</class> > +<name>XWiki.SearchSuggestConfigSheet</name> > +<number>0</number> > +<className>XWiki.SheetClass</className> > +<guid>933b2bea-9566-4352-83ed-0cd9b4fba530</guid> > +<property> > +<defaultEditMode>inline</defaultEditMode> > +</property> > +</object> > +<content>{{velocity}} > +=Search Suggest= > + > +#set($searchSuggestConfigClass = $xwiki.getDocument("XWiki.SearchSuggestConfig").xWikiClass) > +#set($searchSuggestSourceClassname = "XWiki.SearchSuggestSourceClass") > +#set($configObj = $doc.getObject($doc.fullName)) > +**$searchSuggestConfigClass.get("activated").prettyName**: $doc.display("activated") > + > +== Sources == > + > +A suggest source is a URL that takes 3 parameters: query, input and nb. The query parameter must contain a ~_~_INPUT~_~_ placeholder. This URL must process the query with the given user input and return the result in the XML format expected by the suggest component. > + > +|= Name |= URL |= Query |= Results Number |= Icon |= Highlight matches |= Activated > +#foreach($srcObj in $doc.getObjects($searchSuggestSourceClassname))| $doc.display('name', $srcObj) | $doc.display('url', $srcObj) | #if($context.action == 'view') {{{ #end $doc.display('query', $srcObj) #if($context.action == 'view') }}} #end | $doc.display('resultsNumber', $srcObj) | $doc.display('icon', $srcObj) | $doc.display('highlight', $srcObj) | $doc.display('activated', $srcObj) > +#end > + > + > +#if($context.display == 'edit') > +[[Add a new source>>$doc.getExternalURL('objectadd', "classname=${searchSuggestSourceClassname}&xredirect=${doc.getURL('inline')}")]] > +#end > +{{/velocity}}</content></xwikidoc> > > Added: platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestLuceneService.xml > =================================================================== > --- platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestLuceneService.xml (rev 0) > +++ platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestLuceneService.xml 2011-02-25 03:27:58 UTC (rev 34925) > @@ -0,0 +1,62 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<xwikidoc> > +<web>XWiki</web> > +<name>SearchSuggestLuceneService</name> > +<language></language> > +<defaultLanguage>en</defaultLanguage> > +<translation>0</translation> > +<parent>XWiki.SearchSuggestConfig</parent> > +<creator>XWiki.Admin</creator> > +<author>XWiki.Admin</author> > +<customClass></customClass> > +<contentAuthor>XWiki.Admin</contentAuthor> > +<creationDate>1280310630000</creationDate> > +<date>1280318001000</date> > +<contentUpdateDate>1280318001000</contentUpdateDate> > +<version>1.1</version> > +<title></title> > +<template></template> > +<defaultTemplate></defaultTemplate> > +<validationScript></validationScript> > +<comment></comment> > +<minorEdit>false</minorEdit> > +<syntaxId>xwiki/2.0</syntaxId> > +<hidden>false</hidden> > +<content>{{velocity}} > +#set($query = "$!request.query") > +#set($input = "$!request.input") > +#set($nb = "$!request.nb") > +#if($nb != '') > + #set($nb = $util.parseInt($nb) + 1) > +#else > + #set($nb = 6) > +#end > +#if($query != '' && $input != '') > + #set($query = $query.replaceAll('__INPUT__', $input)) > + #set($discard = $response.setContentType("text/xml")) > + <?xml version="1.0" encoding="UTF-8"?> > + #set($rawresults = $xwiki.lucene.getSearchResults($query, $util.null)) > + #set($results = $rawresults.getResults("0", "$nb")) > + <results> > + #foreach($item in $results) > + #set($itemfullname = "${item.wiki}:${item.space}.${item.name}") > + #set($itemdoc = $xwiki.getDocument($itemfullname)) > + #if($item.type == "attachment") > + #set($name = $item.filename) > + #set($url = $itemdoc.getAttachmentURL($name)) > + #else > + #set($name = $itemdoc.getDisplayTitle()) > + #set($url = $itemdoc.getURL()) > + #end > + <rs id="$url" info="$name">$name</rs> > + #end > + </results> > +#else > +{{info}} > +This service allows to retrieve search results for the suggest UI component. > +Examples: > +* [[$doc.getExternalURL('get', 'outputSyntax=plain&query=__INPUT__*&input=test')]] > +{{/info}} > +#end > +{{/velocity}} > +</content></xwikidoc> > > Added: platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestSourceClass.xml > =================================================================== > --- platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestSourceClass.xml (rev 0) > +++ platform/xwiki-applications/trunk/search/src/main/resources/XWiki/SearchSuggestSourceClass.xml 2011-02-25 03:27:58 UTC (rev 34925) > @@ -0,0 +1,122 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<xwikidoc> > +<web>XWiki</web> > +<name>SearchSuggestSourceClass</name> > +<language></language> > +<defaultLanguage></defaultLanguage> > +<translation>0</translation> > +<parent>XWiki.SearchSuggestConfig</parent> > +<creator>XWiki.Admin</creator> > +<author>XWiki.Admin</author> > +<customClass></customClass> > +<contentAuthor>XWiki.Admin</contentAuthor> > +<creationDate>1280310752000</creationDate> > +<date>1280318001000</date> > +<contentUpdateDate>1280318001000</contentUpdateDate> > +<version>1.1</version> > +<title></title> > +<template></template> > +<defaultTemplate></defaultTemplate> > +<validationScript></validationScript> > +<comment></comment> > +<minorEdit>false</minorEdit> > +<syntaxId>xwiki/2.0</syntaxId> > +<hidden>false</hidden> > +<class> > +<name>XWiki.SearchSuggestSourceClass</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<activated> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>activated</name> > +<number>7</number> > +<prettyName>activated</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</activated> > +<highlight> > +<defaultValue></defaultValue> > +<disabled>0</disabled> > +<displayFormType>checkbox</displayFormType> > +<displayType></displayType> > +<name>highlight</name> > +<number>6</number> > +<prettyName>highlight</prettyName> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</highlight> > +<icon> > +<disabled>0</disabled> > +<name>icon</name> > +<number>5</number> > +<picker>0</picker> > +<prettyName>icon</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</icon> > +<name> > +<disabled>0</disabled> > +<name>name</name> > +<number>1</number> > +<picker>0</picker> > +<prettyName>name</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</name> > +<query> > +<disabled>0</disabled> > +<name>query</name> > +<number>3</number> > +<picker>0</picker> > +<prettyName>query</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</query> > +<resultsNumber> > +<disabled>0</disabled> > +<name>resultsNumber</name> > +<number>4</number> > +<picker>0</picker> > +<prettyName>resultsNumber</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</resultsNumber> > +<url> > +<disabled>0</disabled> > +<name>url</name> > +<number>2</number> > +<picker>0</picker> > +<prettyName>url</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<validationMessage></validationMessage> > +<validationRegExp></validationRegExp> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</url> > +</class> > +<content>{{include document="XWiki.ClassSheet"/}} > +</content></xwikidoc> > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications >

1 0

[xwiki-devs] [VOTE] Make XWiki Rendering a top level project
by Vincent Massol 25 Feb '11

25 Feb '11

Hi devs, I'd like to make the XWiki Rendering module a top level project. Rationale ======== * Make it more visible in order to get more outside visibility/contributions (it'll have its own wiki and can be advertised separately from the rest, see below) * Ensure that we keep the rendering module independent from xwiki's core model * Prepare it for a potential (no plans yet) future step which would be to either merge it with some other projects (such as Eclipse's WikiText) or move it to a forge with more visibility should we want that * Allow releasing it separately from the rest of XWiki with minimal dependencies which means it would be possible to use an oldish version of XE with the latest rendering module, allowing to provide features on an older platform. * Allows better controlling backward compatibility * Allows better and cleaner documentation (since it would be on a wiki of its own) * This module has grown large and has a life of its own now that warrants being a top level project The only cons I can see is that it means one more module to release separately and thus a little bit more time during the release process but I don't think that's a good enough reason to not do it (compared to the listed advantages above). Implementation details ================== * Name: XWiki Rendering (I hesitated giving it a code name such a XWiki Babel but in the end I think using a descriptive name is more inline with other names we have and clearer for the end users - it also allows us to not change existing package names this not breaking backward compatibility) * SVN: http://svn.xwiki.org/svnroot/xwiki/rendering * JIRA: http://jira.xwiki.org/jira/browse/XRENDERING * Wiki: http://rendering.xwiki.org * Package: org.xwiki.rendering * Versioning strategy: Start at 3.0-SNAPSHOT and release XWiki Rendering 3.0 final just before we release XE 3.0 final. Then let it have its own life: 3.1, 3.2, etc, independently of platform/XE (although in practice it can be released at the same time as we release platform) * Directory structure: http://svn.xwiki.org/svnroot/xwiki/rendering/ |_ tags |_ branches |_ trunk |_ xwiki-rendering-api |_ xwiki-rendering-macros |_ (move here all macros that don't depend on XWiki's model - it's ok to depend on XWiki's WikiModel's interface though) |_ xwiki-rendering-standalone |_ xwiki-rendering-syntaxes |_ (all syntaxes submodules moved here) |_ xwiki-rendering-tests |_ xwiki-rendering-transformations |_ (all transformation submodules) * We leave in platform/xwiki-rendering/* the macros that depend on XWiki's model + the xwiki-rendering-xwiki module. * In the future, the idea will be to separate xwiki-rendering-api into several parts (rendering-block, rendering-renderers, etc) but that's a second step. I'm on holidays right now (for a week) but that's something I'd be keep on implementing on and off during this week should we agree on it. Here's my +1 Thanks -Vincent

6 11

[xwiki-devs] LDAP support
by Peter McLarty 25 Feb '11

25 Feb '11

Hi Having a discussion in our company about wiki's and LDAP support We had some issues getting LDAP working and a person made a comment that LDAP was not really a key focus and that some of the issues we encountered are in other classes that are used and therefore the problems are not in Xwiki Is there plans to improve Xwiki LDAP support and and will configuration come into the front end? Will its configuration be simplified? Cheers Peter

3 2

Re: [xwiki-devs] [xwiki-notifications] r34922 - platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest
by Sergiu Dumitriu 25 Feb '11

25 Feb '11

On 02/25/2011 02:07 AM, jvelociter (SVN) wrote: > Author: jvelociter > Date: 2011-02-25 02:07:18 +0100 (Fri, 25 Feb 2011) > New Revision: 34922 > > Modified: > platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js > Log: > XWIKI-6042 Allow to insert a node before the suggestion list(s) in the suggest widget > > + API to know wheter a suggestion is highlighted > > > Modified: platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js > =================================================================== > --- platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js 2011-02-24 23:33:57 UTC (rev 34921) > +++ platform/web/trunk/standard/src/main/webapp/resources/js/xwiki/suggest/ajaxSuggest.js 2011-02-25 01:07:18 UTC (rev 34922) > @@ -168,9 +169,6 @@ > > switch(key) { > case Event.KEY_RETURN: Why did you remove this? > - if(this.aSuggestions.length == 1) { > - this.highlightFirst(); > - } > this.setHighlightedValue(); > Event.stop(event); > break; -- Sergiu Dumitriu http://purl.org/net/sergiu/

2 1

Re: [xwiki-devs] [xwiki-notifications] r34917 - in contrib/sandbox/xwiki-extension-handler-xar/src: main/java/org/xwiki/extension/xar/internal/handler/packager/xml test/java/org/xwiki/extension/xar test/resources/repository/local
by Jerome Velociter 24 Feb '11

24 Feb '11

\o/ On Thu, Feb 24, 2011 at 5:08 PM, tmortagne <contrib-notifications(a)xwiki.org> wrote: > Author: tmortagne > Date: 2011-02-24 17:08:47 +0100 (Thu, 24 Feb 2011) > New Revision: 34917 > > Added: > contrib/sandbox/xwiki-extension-handler-xar/src/test/resources/repository/local/page.xml > Removed: > contrib/sandbox/xwiki-extension-handler-xar/src/main/java/org/xwiki/extension/xar/internal/handler/packager/xml/ClassHandler.java > contrib/sandbox/xwiki-extension-handler-xar/src/main/java/org/xwiki/extension/xar/internal/handler/packager/xml/ObjectHandler.java > Modified: > contrib/sandbox/xwiki-extension-handler-xar/src/main/java/org/xwiki/extension/xar/internal/handler/packager/xml/DocumentImporterHandler.java > contrib/sandbox/xwiki-extension-handler-xar/src/test/java/org/xwiki/extension/xar/XarExtensionHandlerTest.java > contrib/sandbox/xwiki-extension-handler-xar/src/test/resources/repository/local/test-1.0.xar > contrib/sandbox/xwiki-extension-handler-xar/src/test/resources/repository/local/test-2.0.xar > Log: > XWIKI-5557: Add extension manager xar handler > Yea ! first fully implemented version with install/commit/upgrade support (ok "upgrade" is maybe a lot to say ;)) > > Deleted: contrib/sandbox/xwiki-extension-handler-xar/src/main/java/org/xwiki/extension/xar/internal/handler/packager/xml/ClassHandler.java > =================================================================== > --- contrib/sandbox/xwiki-extension-handler-xar/src/main/java/org/xwiki/extension/xar/internal/handler/packager/xml/ClassHandler.java 2011-02-24 15:58:04 UTC (rev 34916) > +++ contrib/sandbox/xwiki-extension-handler-xar/src/main/java/org/xwiki/extension/xar/internal/handler/packager/xml/ClassHandler.java 2011-02-24 16:08:47 UTC (rev 34917) > @@ -1,37 +0,0 @@ > -/* > - * See the NOTICE file distributed with this work for additional > - * information regarding copyright ownership. > - * > - * This is free software; you can redistribute it and/or modify it > - * under the terms of the GNU Lesser General Public License as > - * published by the Free Software Foundation; either version 2.1 of > - * the License, or (at your option) any later version. > - * > - * This software is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with this software; if not, write to the Free > - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > - */ > -package org.xwiki.extension.xar.internal.handler.packager.xml; > - > -import org.xwiki.component.manager.ComponentManager; > - > -import com.xpn.xwiki.objects.classes.BaseClass; > - > -public class ClassHandler extends AbstractHandler > -{ > - public ClassHandler(ComponentManager componentManager, BaseClass xclass) > - { > - super(componentManager, xclass); > - } > - > - public BaseClass getObject() > - { > - return (BaseClass) getCurrentBean(); > - } > -} > > Modified: contrib/sandbox/xwiki-extension-handler-xar/src/main/java/org/xwiki/extension/xar/internal/handler/packager/xml/DocumentImporterHandler.java > =================================================================== > --- contrib/sandbox/xwiki-extension-handler-xar/src/main/java/org/xwiki/extension/xar/internal/handler/packager/xml/DocumentImporterHandler.java 2011-02-24 15:58:04 UTC (rev 34916) > +++ contrib/sandbox/xwiki-extension-handler-xar/src/main/java/org/xwiki/extension/xar/internal/handler/packager/xml/DocumentImporterHandler.java 2011-02-24 16:08:47 UTC (rev 34917) > @@ -19,6 +19,7 @@ > */ > package org.xwiki.extension.xar.internal.handler.packager.xml; > > +import org.dom4j.io.SAXContentHandler; > import org.xml.sax.Attributes; > import org.xml.sax.SAXException; > import org.xwiki.component.manager.ComponentLookupException; > @@ -26,7 +27,9 @@ > import org.xwiki.model.reference.DocumentReference; > > import com.xpn.xwiki.XWikiContext; > +import com.xpn.xwiki.XWikiException; > import com.xpn.xwiki.doc.XWikiDocument; > +import com.xpn.xwiki.objects.BaseObject; > > public class DocumentImporterHandler extends AbstractHandler > { > @@ -34,6 +37,11 @@ > > private boolean needSave = true; > > + /** > + * Avoid create a new SAXContentHandler for each object/class when the same can be used for all. > + */ > + public SAXContentHandler domBuilder = new SAXContentHandler(); > + > public DocumentImporterHandler(ComponentManager componentManager) > { > super(componentManager); > @@ -43,6 +51,7 @@ > } catch (ComponentLookupException e) { > setCurrentBean(new XWikiDocument()); > } > + > // skip useless known elements > this.skippedElements.add("version"); > this.skippedElements.add("minorEdit"); > @@ -99,10 +108,9 @@ > { > if (qName.equals("attachment")) { > setCurrentHandler(new AttachmentHandler(getComponentManager())); > - } else if (qName.equals("object")) { > - setCurrentHandler(new ObjectHandler(getComponentManager())); > - } else if (qName.equals("class")) { > - setCurrentHandler(new ClassHandler(getComponentManager(), getDocument().getXClass())); > + } else if (qName.equals("class") || qName.equals("object")) { > + this.domBuilder.startDocument(); > + setCurrentHandler(this.domBuilder); > } else { > super.startElementInternal(uri, localName, qName, attributes); > } > @@ -120,14 +128,25 @@ > > getDocument().getAttachmentList().add(handler.getAttachment()); > > - // TODO: add attachment to documentxwikidoc > + // TODO: add attachment to document > saveDocument("Import: add attachment"); > } else if (qName.equals("object")) { > - ObjectHandler handler = (ObjectHandler) getCurrentHandler(); > - getDocument().addXObject(handler.getObject()); > + try { > + BaseObject baseObject = new BaseObject(); > + baseObject.fromXML(this.domBuilder.getDocument().getRootElement()); > + getDocument().setXObject(baseObject.getNumber(), baseObject); > + } catch (XWikiException e) { > + throw new SAXException("Failed to parse object", e); > + } > > this.needSave = true; > } else if (qName.equals("class")) { > + try { > + getDocument().getXClass().fromXML(this.domBuilder.getDocument().getRootElement()); > + } catch (XWikiException e) { > + throw new SAXException("Failed to parse object", e); > + } > + > this.needSave = true; > } else { > super.endElementInternal(uri, localName, qName); > > Deleted: contrib/sandbox/xwiki-extension-handler-xar/src/main/java/org/xwiki/extension/xar/internal/handler/packager/xml/ObjectHandler.java > =================================================================== > --- contrib/sandbox/xwiki-extension-handler-xar/src/main/java/org/xwiki/extension/xar/internal/handler/packager/xml/ObjectHandler.java 2011-02-24 15:58:04 UTC (rev 34916) > +++ contrib/sandbox/xwiki-extension-handler-xar/src/main/java/org/xwiki/extension/xar/internal/handler/packager/xml/ObjectHandler.java 2011-02-24 16:08:47 UTC (rev 34917) > @@ -1,37 +0,0 @@ > -/* > - * See the NOTICE file distributed with this work for additional > - * information regarding copyright ownership. > - * > - * This is free software; you can redistribute it and/or modify it > - * under the terms of the GNU Lesser General Public License as > - * published by the Free Software Foundation; either version 2.1 of > - * the License, or (at your option) any later version. > - * > - * This software is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with this software; if not, write to the Free > - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > - */ > -package org.xwiki.extension.xar.internal.handler.packager.xml; > - > -import org.xwiki.component.manager.ComponentManager; > - > -import com.xpn.xwiki.objects.BaseObject; > - > -public class ObjectHandler extends AbstractHandler > -{ > - public ObjectHandler(ComponentManager componentManager) > - { > - super(componentManager, new BaseObject()); > - } > - > - public BaseObject getObject() > - { > - return (BaseObject) getCurrentBean(); > - } > -} > > Modified: contrib/sandbox/xwiki-extension-handler-xar/src/test/java/org/xwiki/extension/xar/XarExtensionHandlerTest.java > =================================================================== > --- contrib/sandbox/xwiki-extension-handler-xar/src/test/java/org/xwiki/extension/xar/XarExtensionHandlerTest.java 2011-02-24 15:58:04 UTC (rev 34916) > +++ contrib/sandbox/xwiki-extension-handler-xar/src/test/java/org/xwiki/extension/xar/XarExtensionHandlerTest.java 2011-02-24 16:08:47 UTC (rev 34917) > @@ -40,6 +40,9 @@ > import com.xpn.xwiki.XWiki; > import com.xpn.xwiki.XWikiContext; > import com.xpn.xwiki.doc.XWikiDocument; > +import com.xpn.xwiki.objects.BaseObject; > +import com.xpn.xwiki.objects.classes.BaseClass; > +import com.xpn.xwiki.objects.classes.NumberClass; > import com.xpn.xwiki.test.AbstractBridgedComponentTestCase; > > public class XarExtensionHandlerTest extends AbstractBridgedComponentTestCase > @@ -147,6 +150,11 @@ > Assert.assertEquals("Wrong content", "content", document.getContent()); > Assert.assertEquals("Wrong author", "XWiki.author", document.getAuthor()); > Assert.assertEquals("Wrong versions", "1.1", document.getVersion()); > + > + BaseClass baseClass = document.getXClass(); > + Assert.assertNotNull(baseClass.getField("property")); > + Assert.assertEquals("property", baseClass.getField("property").getName()); > + Assert.assertSame(NumberClass.class, baseClass.getField("property").getClass()); > } > > @Test > @@ -173,6 +181,11 @@ > Assert.assertEquals("Wrong content", "content 2", document.getContent()); > Assert.assertEquals("Wrong author", "XWiki.author", document.getAuthor()); > Assert.assertEquals("Wrong versions", "2.1", document.getVersion()); > + > + BaseClass baseClass = document.getXClass(); > + Assert.assertNotNull(baseClass.getField("property")); > + Assert.assertEquals("property", baseClass.getField("property").getName()); > + Assert.assertSame(NumberClass.class, baseClass.getField("property").getClass()); > } > > @Test > > Added: contrib/sandbox/xwiki-extension-handler-xar/src/test/resources/repository/local/page.xml > =================================================================== > --- contrib/sandbox/xwiki-extension-handler-xar/src/test/resources/repository/local/page.xml (rev 0) > +++ contrib/sandbox/xwiki-extension-handler-xar/src/test/resources/repository/local/page.xml 2011-02-24 16:08:47 UTC (rev 34917) > @@ -0,0 +1,166 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<xwikidoc> > +<web>space</web> > +<name>page</name> > +<language></language> > +<defaultLanguage>en</defaultLanguage> > +<translation>0</translation> > +<parent></parent> > +<creator>XWiki.creator</creator> > +<author>XWiki.author</author> > +<customClass></customClass> > +<contentAuthor>XWiki.contentAuthor</contentAuthor> > +<creationDate>1297952360000</creationDate> > +<date>1297952371000</date> > +<contentUpdateDate>1297952371000</contentUpdateDate> > +<version>1.1</version> > +<title></title> > +<template></template> > +<defaultTemplate></defaultTemplate> > +<validationScript></validationScript> > +<comment></comment> > +<minorEdit>false</minorEdit> > +<syntaxId>xwiki/2.0</syntaxId> > +<hidden>false</hidden> > +<class> > +<name>space.page</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<property> > +<disabled>0</disabled> > +<name>property</name> > +<number>1</number> > +<numberType>long</numberType> > +<prettyName>property</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<classType>com.xpn.xwiki.objects.classes.NumberClass</classType> > +</property> > +</class> > +<object> > +<class> > +<name>XWiki.StyleSheetExtension</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<cache> > +<cache>0</cache> > +<disabled>0</disabled> > +<displayType>select</displayType> > +<multiSelect>0</multiSelect> > +<name>cache</name> > +<number>5</number> > +<prettyName>Caching policy</prettyName> > +<relationalStorage>0</relationalStorage> > +<separator> </separator> > +<separators> ,|</separators> > +<size>1</size> > +<unmodifiable>0</unmodifiable> > +<values>long|short|default|forbid</values> > +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> > +</cache> > +<code> > +<disabled>0</disabled> > +<name>code</name> > +<number>2</number> > +<prettyName>Code</prettyName> > +<rows>20</rows> > +<size>50</size> > +<unmodifiable>0</unmodifiable> > +<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType> > +</code> > +<name> > +<disabled>0</disabled> > +<name>name</name> > +<number>1</number> > +<prettyName>Name</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<classType>com.xpn.xwiki.objects.classes.StringClass</classType> > +</name> > +<parse> > +<disabled>0</disabled> > +<displayFormType>select</displayFormType> > +<displayType>yesno</displayType> > +<name>parse</name> > +<number>4</number> > +<prettyName>Parse content</prettyName> > +<unmodifiable>0</unmodifiable> > +<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType> > +</parse> > +<use> > +<cache>0</cache> > +<disabled>0</disabled> > +<displayType>select</displayType> > +<multiSelect>0</multiSelect> > +<name>use</name> > +<number>3</number> > +<prettyName>Use this extension</prettyName> > +<relationalStorage>0</relationalStorage> > +<separator> </separator> > +<separators> ,|</separators> > +<size>1</size> > +<unmodifiable>0</unmodifiable> > +<values>onDemand=On demand|always=Always</values> > +<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType> > +</use> > +</class> > +<name>space.page</name> > +<number>0</number> > +<className>XWiki.StyleSheetExtension</className> > +<guid>8eaeac52-e2f2-47b2-87e1-bc6909597b39</guid> > +<property> > +<cache>long</cache> > +</property> > +<property> > +<code>some code</code> > +</property> > +<property> > +<name>name</name> > +</property> > +<property> > +<parse></parse> > +</property> > +<property> > +<use>onDemand</use> > +</property> > +</object> > +<object> > +<class> > +<name>space.page</name> > +<customClass></customClass> > +<customMapping></customMapping> > +<defaultViewSheet></defaultViewSheet> > +<defaultEditSheet></defaultEditSheet> > +<defaultWeb></defaultWeb> > +<nameField></nameField> > +<validationScript></validationScript> > +<property> > +<disabled>0</disabled> > +<name>property</name> > +<number>1</number> > +<numberType>long</numberType> > +<prettyName>property</prettyName> > +<size>30</size> > +<unmodifiable>0</unmodifiable> > +<classType>com.xpn.xwiki.objects.classes.NumberClass</classType> > +</property> > +</class> > +<name>space.page</name> > +<number>0</number> > +<className>space.page</className> > +<guid>e2167721-2a64-430c-9520-bac1c0ee68cb</guid> > +<property> > +<property>12</property> > +</property> > +</object> > +<content>content</content></xwikidoc> > > > Property changes on: contrib/sandbox/xwiki-extension-handler-xar/src/test/resources/repository/local/page.xml > ___________________________________________________________________ > Added: svn:mime-type > + text/plain > Added: svn:eol-style > + native > > Modified: contrib/sandbox/xwiki-extension-handler-xar/src/test/resources/repository/local/test-1.0.xar > =================================================================== > (Binary files differ) > > Modified: contrib/sandbox/xwiki-extension-handler-xar/src/test/resources/repository/local/test-2.0.xar > =================================================================== > (Binary files differ) > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications >

1 0