November 2008 - xwiki-devs@xwiki.org

[xwiki-devs] checkin - checkout
by Paul Libbrecht 11 Nov '08

11 Nov '08

Hello fellow developers, The usage of a bunch of command-line tools for checking-out the (XML of) xwiki pages and checking them in would be really useful. The xar approach is not really practical: there's no merge, it's problematic when it gets big, and it still doesn't have a command-line to integrate within a build-flow. I am convinced it would be easy, for example, to use the XEclipse code to make checkout, update, and checkin ant-tasks or command-line tools. Did anyone try? thanks in advance paul

3 5

Re: [xwiki-devs] [xwiki-notifications] r14068 - in sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/plugin/officeimporter: filter transformer utils
by Sergiu Dumitriu 10 Nov '08

10 Nov '08

asiri (SVN) wrote: You should use StringUtils.stripEnd and stripStart for this. > Added: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/plugin/officeimporter/utils/ImporterUtils.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/plugin/officeimporter/utils/ImporterUtils.java (rev 0) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/plugin/officeimporter/utils/ImporterUtils.java 2008-11-10 12:09:35 UTC (rev 14068) > @@ -0,0 +1,36 @@ > +package com.xpn.xwiki.plugin.officeimporter.utils; > + > +/** > + * Utility methods common for office importer. > + * > + * @version $Id$ > + * @since 1.7M1 > + */ > +public abstract class ImporterUtils > +{ > + public static String leftTrim(String s) > + { > + String content = s.trim(); > + if (content.equals("")) { > + return ""; > + } else { > + int index = s.indexOf(content); > + if(index == 0) { > + return s; > + } else { > + return s.substring(index); > + } > + } > + } > + > + public static String rightTrim(String s) > + { > + String content = s.trim(); > + if (content.equals("")) { > + return ""; > + } else { > + int index = s.indexOf(content); > + return s.substring(0, index + content.length()); > + } > + } > +} > -- Sergiu Dumitriu http://purl.org/net/sergiu/

3 2

Re: [xwiki-devs] [xwiki-notifications] r14068 - in sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/plugin/officeimporter: filter transformer utils
by Vincent Massol 10 Nov '08

10 Nov '08

Hi Asiri, For trimming please use: * Commons Lang: http://commons.apache.org/lang/api/org/apache/commons/lang/StringUtils.html… * If you want the exact list of whitespaces for HTML, see http://www.w3.org/TR/html4/struct/text.html#h-9.1 * You can also use \s in Regex It really depends what chars you want removed but your implementation isn't correct I'm sure. Thanks -Vincent On Nov 10, 2008, at 1:09 PM, asiri (SVN) wrote: > Author: asiri > Date: 2008-11-10 13:09:35 +0100 (Mon, 10 Nov 2008) > New Revision: 14068 > > Added: > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/HtmlTableFilter.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/utils/ImporterUtils.java > Modified: > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/HtmlListFilter.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/transformer/HtmlToXWikiTwoZeroTransformer.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/transformer/HtmlToXWikiXhtmlTransformer.java > Log: > XAOFFICE-1 : Develop the initial feature set for office-importer > plugin. > > * Completing list support and table support, need to test and make > few more adjustments. > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/filter/HtmlListFilter.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/HtmlListFilter.java 2008-11-10 11:32:32 > UTC (rev 14067) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/HtmlListFilter.java 2008-11-10 12:09:35 > UTC (rev 14068) > @@ -5,11 +5,15 @@ > import org.w3c.dom.NodeList; > > import com.xpn.xwiki.plugin.officeimporter.utils.ImporterContext; > +import com.xpn.xwiki.plugin.officeimporter.utils.ImporterUtils; > > /** > - * This is a temporary filter until we have a clear solution to the > issue at > - * http://jira.xwiki.org/jira/browse/XWIKI-2812. The problem occurs > when the first child of a > - * {@code <li>} tag is a {@code <p>} tag. > + * Presently xwiki rendering module doesn't support complex list > items. Because of this reason this > + * temporary filter is used to rip off any complex formatting > elements present in html lists. The > + * JIRA issue is located at http://jira.xwiki.org/jira/browse/XWIKI-2812 > . > + * > + * @version $Id$ > + * @since 1.7M1 > */ > public class HtmlListFilter implements HtmlFilter > { > @@ -21,13 +25,23 @@ > NodeList listItems = document.getElementsByTagName("li"); > for (int i = 0; i < listItems.getLength(); i++) { > Node listItem = listItems.item(i); > - Node firstChild = listItem.getFirstChild(); > - if (firstChild != null && > firstChild.getNodeName().equals("p")) { > - NodeList grandChildren = firstChild.getChildNodes(); > - while (grandChildren.getLength() > 0) { > - listItem.insertBefore(grandChildren.item(0), > firstChild); > + Node counter = listItem.getFirstChild(); > + while (counter != null) { > + if (counter.getNodeType() == Node.TEXT_NODE) { > + String trimmed = > ImporterUtils.leftTrim(counter.getTextContent()); > + counter.setTextContent(trimmed); > + if (trimmed.equals("")) { > + counter = counter.getNextSibling(); > + continue; > + } > + } else if (counter.getNodeName().equals("p")) { > + NodeList children = counter.getChildNodes(); > + while (children.getLength() > 0) { > + listItem.insertBefore(children.item(0), > counter); > + } > + listItem.removeChild(counter); > } > - listItem.removeChild(firstChild); > + break; > } > } > } > > Added: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/filter/HtmlTableFilter.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/ > HtmlTableFilter.java (rev 0) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/HtmlTableFilter.java 2008-11-10 > 12:09:35 UTC (rev 14068) > @@ -0,0 +1,65 @@ > +package com.xpn.xwiki.plugin.officeimporter.filter; > + > +import org.w3c.dom.Document; > +import org.w3c.dom.Node; > +import org.w3c.dom.NodeList; > + > +import com.xpn.xwiki.plugin.officeimporter.utils.ImporterContext; > +import com.xpn.xwiki.plugin.officeimporter.utils.ImporterUtils; > + > +/** > + * Presently xwiki rendering module doesn't support complex table > cell items. This filter is used to > + * rip-off or modify html tables so that they can be rendered > properly. The corresponding JIRA issue > + * is located at http://jira.xwiki.org/jira/browse/XWIKI-2804. > + * > + * @version $Id$ > + * @since 1.7M1 > + */ > +public class HtmlTableFilter implements HtmlFilter > +{ > + /** > + * {@inheritDoc} > + */ > + public void filter(Document document, ImporterContext context) > + { > + NodeList cellItems = document.getElementsByTagName("td"); > + for (int i = 0; i < cellItems.getLength(); i++) { > + Node cellItem = cellItems.item(i); > + Node counter = cellItem.getFirstChild(); > + while (counter != null) { > + if (counter.getNodeType() == Node.TEXT_NODE) { > + String trimmed = > ImporterUtils.leftTrim(counter.getTextContent()); > + counter.setTextContent(trimmed); > + if (trimmed.equals("")) { > + counter = counter.getNextSibling(); > + continue; > + } > + } else if (counter.getNodeName().equals("p")) { > + NodeList children = counter.getChildNodes(); > + while (children.getLength() > 0) { > + cellItem.insertBefore(children.item(0), > counter); > + } > + cellItem.removeChild(counter); > + } > + break; > + } > + counter = cellItem.getLastChild(); > + while (counter != null) { > + if (counter.getNodeType() == Node.TEXT_NODE) { > + String trimmed = > ImporterUtils.rightTrim(counter.getTextContent()); > + counter.setTextContent(trimmed); > + if (trimmed.equals("")) { > + counter = counter.getPreviousSibling(); > + continue; > + } > + } > + break; > + } > + // Fill all empty cells with an empty character > (space / tab). > + // This is because the current xwiki 2.0 syntax doesn't > handle empty cells correctly. > + if (cellItem.getTextContent().equals("")) { > + cellItem.setTextContent("-"); > + } > + } > + } > +} > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/transformer/ > HtmlToXWikiTwoZeroTransformer.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/transformer/HtmlToXWikiTwoZeroTransformer.java > 2008-11-10 11:32:32 UTC (rev 14067) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/transformer/HtmlToXWikiTwoZeroTransformer.java > 2008-11-10 12:09:35 UTC (rev 14068) > @@ -23,6 +23,7 @@ > import com.xpn.xwiki.plugin.officeimporter.filter.HtmlLinkFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.HtmlListFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.HtmlStyleFilter; > +import com.xpn.xwiki.plugin.officeimporter.filter.HtmlTableFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.ImageTagFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.TagRemoveFilter; > import com.xpn.xwiki.plugin.officeimporter.utils.ImporterContext; > @@ -50,6 +51,7 @@ > filterList.add(new ImageTagFilter()); > filterList.add(new HtmlLinkFilter()); > filterList.add(new HtmlListFilter()); > + filterList.add(new HtmlTableFilter()); > } > > /** > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/transformer/ > HtmlToXWikiXhtmlTransformer.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/transformer/HtmlToXWikiXhtmlTransformer.java > 2008-11-10 11:32:32 UTC (rev 14067) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/transformer/HtmlToXWikiXhtmlTransformer.java > 2008-11-10 12:09:35 UTC (rev 14068) > @@ -13,6 +13,7 @@ > import com.xpn.xwiki.plugin.officeimporter.filter.HtmlLinkFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.HtmlListFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.HtmlStyleFilter; > +import com.xpn.xwiki.plugin.officeimporter.filter.HtmlTableFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.ImageTagFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.TagRemoveFilter; > import com.xpn.xwiki.plugin.officeimporter.utils.ImporterContext; > @@ -41,6 +42,7 @@ > filterList.add(new ImageTagFilter()); > filterList.add(new HtmlLinkFilter()); > filterList.add(new HtmlListFilter()); > + filterList.add(new HtmlTableFilter()); > } > > /** > > Added: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/utils/ImporterUtils.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/utils/ > ImporterUtils.java (rev 0) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/utils/ImporterUtils.java 2008-11-10 12:09:35 > UTC (rev 14068) > @@ -0,0 +1,36 @@ > +package com.xpn.xwiki.plugin.officeimporter.utils; > + > +/** > + * Utility methods common for office importer. > + * > + * @version $Id$ > + * @since 1.7M1 > + */ > +public abstract class ImporterUtils > +{ > + public static String leftTrim(String s) > + { > + String content = s.trim(); > + if (content.equals("")) { > + return ""; > + } else { > + int index = s.indexOf(content); > + if(index == 0) { > + return s; > + } else { > + return s.substring(index); > + } > + } > + } > + > + public static String rightTrim(String s) > + { > + String content = s.trim(); > + if (content.equals("")) { > + return ""; > + } else { > + int index = s.indexOf(content); > + return s.substring(0, index + content.length()); > + } > + } > +}

1 0

Re: [xwiki-devs] [xwiki-notifications] r14062 - in platform: core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx xwiki-plugins/trunk/skinx/src/main/java/com/xpn/xwiki/plugin/skinx
by Sergiu Dumitriu 10 Nov '08

10 Nov '08

jvelociter (SVN) wrote: > Author: jvelociter > Date: 2008-11-09 20:00:37 +0100 (Sun, 09 Nov 2008) > New Revision: 14062 > > Added: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/ > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/AbstractSxAction.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/CssExtension.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/Extension.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/JsExtension.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/SxCompressor.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/SxDocumentSource.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/SxResourceSource.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/SxSource.java > platform/xwiki-plugins/trunk/skinx/src/main/java/com/xpn/xwiki/plugin/skinx/CssResourceSkinExtensionPlugin.java > platform/xwiki-plugins/trunk/skinx/src/main/java/com/xpn/xwiki/plugin/skinx/JsResourceSkinExtensionPlugin.java > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/JsxAction.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/SsxAction.java > Log: > XSKINX-12 Ability to load extension files from JAR resources > You forgot to modify this one to support resource extensions: > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/SsxAction.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/SsxAction.java 2008-11-08 18:00:54 UTC (rev 14061) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/SsxAction.java 2008-11-09 19:00:37 UTC (rev 14062) > @@ -20,23 +20,20 @@ > */ > package com.xpn.xwiki.web; > > -import java.io.IOException; > -import java.io.StringReader; > -import java.io.StringWriter; > -import java.util.Date; > +import javax.servlet.http.HttpServletResponse; > > -import org.apache.commons.lang.BooleanUtils; > -import org.apache.commons.lang.StringUtils; > import org.apache.commons.logging.Log; > import org.apache.commons.logging.LogFactory; > > -import com.xpn.xwiki.XWiki; > import com.xpn.xwiki.XWikiContext; > import com.xpn.xwiki.XWikiException; > -import com.xpn.xwiki.doc.XWikiDocument; > -import com.xpn.xwiki.objects.BaseObject; > -import com.yahoo.platform.yui.compressor.CssCompressor; > > +import com.xpn.xwiki.web.sx.AbstractSxAction; > +import com.xpn.xwiki.web.sx.CssExtension; > +import com.xpn.xwiki.web.sx.Extension; > +import com.xpn.xwiki.web.sx.SxDocumentSource; > +import com.xpn.xwiki.web.sx.SxSource; > + > /** > * <p> > * Action for serving css skin extensions. > @@ -45,22 +42,11 @@ > * @version $Id$ > * @since 1.4M2 > */ > -public class SsxAction extends XWikiAction > +public class SsxAction extends AbstractSxAction > { > - enum CachePolicies > - { > - LONG, SHORT, DEFAULT, FORBID > - } > - > - protected static final long LONG_CACHE_DURATION = 30 * 24 * 3600 * 1000L; > - > - protected static final long SHORT_CACHE_DURATION = 1 * 24 * 3600 * 1000L; > - > /** Logging helper. */ > private static final Log LOG = LogFactory.getLog(SsxAction.class); > - > - public static final String SSX_CLASS_NAME = "XWiki.StyleSheetExtension"; > - > + > /** > * {@inheritDoc} > * > @@ -69,77 +55,25 @@ > @Override > public String render(XWikiContext context) throws XWikiException > { > - XWiki xwiki = context.getWiki(); > - XWikiRequest request = context.getRequest(); > - XWikiResponse response = context.getResponse(); > - XWikiDocument doc = context.getDoc(); > - > - if (doc.isNew()) { > - response.setStatus(404); > + if (context.getDoc().isNew()) { > + context.getResponse().setStatus(HttpServletResponse.SC_NOT_FOUND); > return "docdoesnotexist"; > } > > - CachePolicies finalCache = CachePolicies.LONG; > - StringBuilder resultBuilder = new StringBuilder(); > + SxSource sxSource; > > - if (doc.getObjects(SSX_CLASS_NAME) != null) { > - for (BaseObject sxObj : doc.getObjects(SSX_CLASS_NAME)) { > - String sxContent = sxObj.getLargeStringValue("code"); > - int parse = sxObj.getIntValue("parse"); > - try { > - CachePolicies cache = > - CachePolicies.valueOf(StringUtils.upperCase(StringUtils.defaultIfEmpty(sxObj > - .getStringValue("cache"), "LONG"))); > - if (cache.compareTo(finalCache) > 0) { > - finalCache = cache; > - } > - } catch (Exception ex) { > - LOG.warn(String.format("JSX object [%s#%s] has an invalid cache policy: [%s]", doc.getFullName(), > - sxObj.getStringValue("name"), sxObj.getStringValue("cache"))); > - } > + Extension sxType = new CssExtension(); > > - if (parse == 1) { > - sxContent = xwiki.getRenderingEngine().interpretText(sxContent, doc, context); > - } > - // Also add a newline, in case the different object contents don't end with a blank > - // line, and could cause syntax errors when concatenated. > - resultBuilder.append(sxContent + "\n"); > - } > - } > + sxSource = new SxDocumentSource(context, sxType); > > - String result = resultBuilder.toString(); > - > - response.setContentType("text/css; charset=UTF-8"); > - response.setDateHeader("Last-Modified", doc.getDate().getTime()); > - if (finalCache != CachePolicies.FORBID) { > - response.setHeader("Cache-Control", "public"); > - } > - > - if (finalCache == CachePolicies.LONG) { > - // Cache for one month (30 days) > - response.setDateHeader("Expires", (new Date()).getTime() + LONG_CACHE_DURATION); > - } else if (finalCache == CachePolicies.SHORT) { > - // Cache for one day > - response.setDateHeader("Expires", (new Date()).getTime() + SHORT_CACHE_DURATION); > - } else if (finalCache == CachePolicies.FORBID) { > - response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate"); > - } > - if (BooleanUtils.toBoolean(StringUtils.defaultIfEmpty(request.get("minify"), "true"))) { > - try { > - CssCompressor compressor = new CssCompressor(new StringReader(result)); > - StringWriter out = new StringWriter(); > - compressor.compress(out, -1); > - result = out.toString(); > - } catch (IOException ex) { > - LOG.warn(String.format("Exception compressing the SSX code for [%s]", doc.getFullName()), ex); > - } > - } > - try { > - response.setContentLength(result.getBytes("UTF-8").length); > - response.getOutputStream().write(result.getBytes("UTF-8")); > - } catch (IOException ex) { > - LOG.warn("Failed to send SSX content: " + ex.getMessage()); > - } > + super.renderExtension(sxSource, sxType, context); > return null; > } -- Sergiu Dumitriu http://purl.org/net/sergiu/

2 1

[xwiki-devs] Selecting a tool to manage localization
by Ludovic Dubost 10 Nov '08

10 Nov '08

Hi team, I wrore a report about the different localization strategies we could have for XWiki comparing: - a simple tool Jean-Vincent wrote - an L10N app I started to build - using launchpad.net http://dev.xwiki.org/xwiki/bin/view/Drafts/Selecting+a+tool+for+managing+Lo… Please review and add requirements if you see requirements that have not been listed. I think we need to look at the applications and evaluate them in more details, especially to see of launchpad.net could work for us. Let's discuss. Ludovic -- Ludovic Dubost Blog: http://blog.ludovic.org/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost

7 16

[xwiki-devs] Blog terminology
by Sergiu Dumitriu 09 Nov '08

09 Nov '08

What is the best term: 1. blog post 2. blog article 3. blog entry Others? -- Sergiu Dumitriu http://purl.org/net/sergiu/

9 13

[xwiki-devs] Rewriting the comments plug-in into a component
by Florin Ciubotaru 07 Nov '08

07 Nov '08

Hi devs, We currently have a comments plug-in that is written for a custom core. This plug-in enables us to have hierarchical comments and several storage implementations. The issue I encounter when rewriting it to a plexus component is that I cannot make it independent from the core. I need both read and write access to the storage, and I could not find a bridge to it. All I can do is retrieve data, with org.xwiki.bridge.DocumentAccessBridge and org.xwiki.bridge.DocumentModelBridge, but not write data. Does anybody know how can I write a component that needs read/write access to the storage without using XWiki,XWikiDocument and XWikiContext classes? Thanks, Florin Ciubotaru

5 7

Re: [xwiki-devs] [xwiki-notifications] r14000 - platform/core/trunk/xwiki-localization/src/main/java/org/xwiki/localization/internal
by Vincent Massol 07 Nov '08

07 Nov '08

Sergiu, I don't understand this. You're doing a synchronization on an object that's recreated every time the method is called so it'll always have a different location in memory and there's no risk of contention. Thanks -Vincent On Nov 6, 2008, at 7:38 AM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2008-11-06 07:38:49 +0100 (Thu, 06 Nov 2008) > New Revision: 14000 > > Modified: > platform/core/trunk/xwiki-localization/src/main/java/org/xwiki/ > localization/internal/PulledDocumentsBundle.java > platform/core/trunk/xwiki-localization/src/main/java/org/xwiki/ > localization/internal/PulledFilesBundle.java > platform/core/trunk/xwiki-localization/src/main/java/org/xwiki/ > localization/internal/StaticDocumentsBundle.java > Log: > XWIKI-2811: Possible threading issues in the localization component > Fixed. > > > Modified: platform/core/trunk/xwiki-localization/src/main/java/org/ > xwiki/localization/internal/PulledDocumentsBundle.java > =================================================================== > --- platform/core/trunk/xwiki-localization/src/main/java/org/xwiki/ > localization/internal/PulledDocumentsBundle.java 2008-11-06 06:31:12 > UTC (rev 13999) > +++ platform/core/trunk/xwiki-localization/src/main/java/org/xwiki/ > localization/internal/PulledDocumentsBundle.java 2008-11-06 06:38:49 > UTC (rev 14000) > @@ -63,17 +63,19 @@ > List<String> documentNames = (List<String>) > this.execution.getContext().getProperty(PULLED_CONTEXT_KEY); > if (documentNames != null) { > Properties props; > - for (String documentName : documentNames) { > - try { > - // The document names should contain the wiki > prefix already. > - props = getDocumentBundle(documentName, > language); > - if (props.containsKey(key)) { > - translation = props.getProperty(key); > - // The first translation found is returned. > - break; > + synchronized (documentNames) { > + for (String documentName : documentNames) { > + try { > + // The document names should contain the > wiki prefix already. > + props = getDocumentBundle(documentName, > language); > + if (props.containsKey(key)) { > + translation = props.getProperty(key); > + // The first translation found is > returned. > + break; > + } > + } catch (Exception ex) { > + getLogger().warn("Cannot load document > bundle: [{0}]", documentName); > } > - } catch (Exception ex) { > - getLogger().warn("Cannot load document bundle: > [{0}]", documentName); > } > } > } > @@ -102,7 +104,9 @@ > documentNames = new ArrayList<String>(); > > this.execution.getContext().setProperty(PULLED_CONTEXT_KEY, > documentNames); > } > - documentNames.add(documentName); > + synchronized (documentNames) { > + documentNames.add(documentName); > + } > } > } > > > Modified: platform/core/trunk/xwiki-localization/src/main/java/org/ > xwiki/localization/internal/PulledFilesBundle.java > =================================================================== > --- platform/core/trunk/xwiki-localization/src/main/java/org/xwiki/ > localization/internal/PulledFilesBundle.java 2008-11-06 06:31:12 UTC > (rev 13999) > +++ platform/core/trunk/xwiki-localization/src/main/java/org/xwiki/ > localization/internal/PulledFilesBundle.java 2008-11-06 06:38:49 UTC > (rev 14000) > @@ -54,16 +54,18 @@ > List<String> fileNames = (List<String>) > this.execution.getContext().getProperty(PULLED_CONTEXT_KEY); > if (fileNames != null) { > Properties props; > - for (String fileName : fileNames) { > - try { > - props = getFileBundle(fileName, language); > - if (props.containsKey(key)) { > - translation = props.getProperty(key); > - // The first translation found is returned. > - break; > + synchronized (fileNames) { > + for (String fileName : fileNames) { > + try { > + props = getFileBundle(fileName, language); > + if (props.containsKey(key)) { > + translation = props.getProperty(key); > + // The first translation found is > returned. > + break; > + } > + } catch (Exception e) { > + getLogger().warn("Cannot load resource > bundle: [{0}]", fileName); > } > - } catch (Exception e) { > - getLogger().warn("Cannot load resource bundle: > [{0}]", fileName); > } > } > } > @@ -86,7 +88,9 @@ > fileNames = new ArrayList<String>(); > > this.execution.getContext().setProperty(PULLED_CONTEXT_KEY, > fileNames); > } > - fileNames.add(bundleLocation); > + synchronized (fileNames) { > + fileNames.add(bundleLocation); > + } > } > } > } > > Modified: platform/core/trunk/xwiki-localization/src/main/java/org/ > xwiki/localization/internal/StaticDocumentsBundle.java > =================================================================== > --- platform/core/trunk/xwiki-localization/src/main/java/org/xwiki/ > localization/internal/StaticDocumentsBundle.java 2008-11-06 06:31:12 > UTC (rev 13999) > +++ platform/core/trunk/xwiki-localization/src/main/java/org/xwiki/ > localization/internal/StaticDocumentsBundle.java 2008-11-06 06:38:49 > UTC (rev 14000) > @@ -111,7 +111,9 @@ > String oldBundleNames = > StringUtils.join(this.staticBundleNames.remove(wiki), JOIN_SEPARATOR); > String newBundleNames = > StringUtils.join(this.getStaticDocumentBundles(wiki), JOIN_SEPARATOR); > if (!StringUtils.equals(oldBundleNames, > newBundleNames)) { > - this.staticBundles.remove(wiki); > + synchronized (this.staticBundles) { > + this.staticBundles.remove(wiki); > + } > } > } > }

2 2

Re: [xwiki-devs] [xwiki-notifications] r13997 - platform/pom/trunk
by Vincent Massol 07 Nov '08

07 Nov '08

Hi Sergiu, On Nov 6, 2008, at 7:22 AM, sdumitriu (SVN) wrote: > Author: sdumitriu > Date: 2008-11-06 07:22:48 +0100 (Thu, 06 Nov 2008) > New Revision: 13997 > > Modified: > platform/pom/trunk/pom.xml > Log: > [misc] > Lock down another maven plugin version > Declare a default version for the shared test dependency > > > Modified: platform/pom/trunk/pom.xml > =================================================================== > --- platform/pom/trunk/pom.xml 2008-11-06 06:08:51 UTC (rev 13996) > +++ platform/pom/trunk/pom.xml 2008-11-06 06:22:48 UTC (rev 13997) > @@ -171,6 +171,7 @@ > <dependency> > <groupId>com.xpn.xwiki.platform.tools</groupId> > <artifactId>xwiki-verification-resources</artifactId> > + <version>${platform.tool.verification.version}</ > version> I don't think this is right. There should be no version specified IMO since this parent POM can be used by any module and some modules will want to use a different version. WDYT? Thanks -Vincent > </dependency> > </dependencies> > <configuration> > @@ -271,6 +272,12 @@ > </plugin> > <plugin> > <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-plugin-plugin</artifactId> > +  > + <version>2.3</version> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-site-plugin</artifactId> >  > <version>2.0-beta-6</version> > @@ -396,6 +403,7 @@ > <properties> >  > <xwiki.checkstyle.skip>false</xwiki.checkstyle.skip> > + <platform.tool.verification.version>1.12-SNAPSHOT</ > platform.tool.verification.version> > </properties> > <profiles> > <profile>

3 4

[xwiki-devs] XWiki usable for this + how to go on about component development
by Ion Tichy 07 Nov '08

07 Nov '08

Hi, we wish to use xwiki in a large project and find it difficult to see if the component architeture suits us. We need to hook into the login process (effectively logging users in through our own authentication process). Can this be done using a 'plugin' or 'component' for xwiki? Also: we need to intercept the page creation process and update our local indexes with certain things when a user saves a page. Can this be done throuh a plugin/component? How would one go on about setting an eclipse project up, where a component can be developed and debugged? Do I need to check out the entire Wiki into the Eclipse workspace? -- View this message in context: http://n2.nabble.com/XWiki-usable-for-this-%2B-how-to-go-on-about-component… Sent from the XWiki- Dev mailing list archive at Nabble.com.

5 8