January 2009 - xwiki-devs@xwiki.org

[xwiki-devs] [VOTE] Move xwiki-core-rest to trunk
by Fabio Mancinelli 11 Jan '09

11 Jan '09

Dear all, I've finished to refactor the rest subsystem and I propose to move it to the trunk for inclusion in 1.8M1. It doesn't support all the URIs of the API (see http://dev.xwiki.org/xwiki/bin/view/Design/RestfulAPI for details) but still I think it's good to have it included. Here it is my +1 -Fabio

4 12

Re: [xwiki-devs] [xwiki-notifications] r15310 - platform/xwiki-applications/trunk/officeimporter/src/main/resources/Import
by Vincent Massol 11 Jan '09

11 Jan '09

Asiri, On Jan 11, 2009, at 9:50 AM, asiri (SVN) wrote: > Author: asiri > Date: 2009-01-11 09:50:50 +0100 (Sun, 11 Jan 2009) > New Revision: 15310 > > Modified: > platform/xwiki-applications/trunk/officeimporter/src/main/ > resources/Import/Importer.xml > platform/xwiki-applications/trunk/officeimporter/src/main/ > resources/Import/WebHome.xml > Log: > XWIKI-3083: Develop the initial feature set for the Office Importer > module > > * Minor improvement to office importer UI. > > Modified: platform/xwiki-applications/trunk/officeimporter/src/main/ > resources/Import/Importer.xml > =================================================================== > --- platform/xwiki-applications/trunk/officeimporter/src/main/ > resources/Import/Importer.xml 2009-01-11 08:46:30 UTC (rev 15309) > +++ platform/xwiki-applications/trunk/officeimporter/src/main/ > resources/Import/Importer.xml 2009-01-11 08:50:50 UTC (rev 15310) > @@ -56,7 +56,7 @@ > </property> > </object> > <content> > -1 Office Importer > +<h1>Office Importer</h1> I've already changed that from h1 to wiki syntax. Why are you changing it again? Thanks -Vincent > > ## Check the space > #if(!$request.targetSpace || $request.targetSpace=="") > #error("Missing target space name. Please [go > back>Import.WebHome] and correct it.") > > Modified: platform/xwiki-applications/trunk/officeimporter/src/main/ > resources/Import/WebHome.xml > =================================================================== > --- platform/xwiki-applications/trunk/officeimporter/src/main/ > resources/Import/WebHome.xml 2009-01-11 08:46:30 UTC (rev 15309) > +++ platform/xwiki-applications/trunk/officeimporter/src/main/ > resources/Import/WebHome.xml 2009-01-11 08:50:50 UTC (rev 15310) > @@ -56,7 +56,7 @@ > </property> > </object> > <content> > -1 Office Importer > +<h1>Office Importer</h1> > <form action='$xwiki.getURL("Import.Importer","view")' > enctype="multipart/form-data" method="post"> > {table}<p>Document|<input id="filepath" type="file" > name="filePath" value="" size="40"/></p> > <p>Target Space|<input name="targetSpace" type="textarea"/ > ></p>

2 1

Re: [xwiki-devs] [xwiki-notifications] r15292 - in platform: core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/internal core/trunk/xwiki-officeimporter/src/ma
by Asiri Rathnayake 11 Jan '09

11 Jan '09

Hi Sergiu, On Sun, Jan 11, 2009 at 8:41 AM, Sergiu Dumitriu <sergiu(a)xwiki.com> wrote: > asiri (SVN) wrote: > > Author: asiri > > Date: 2009-01-10 19:37:55 +0100 (Sat, 10 Jan 2009) > > New Revision: 15292 > > > > Added: > > > platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/internal/OfficeImporterVelocityBridge.java > > Modified: > > > platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/OfficeImporter.java > > > platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/internal/OfficeImporterVelocityContextInitializer.java > > > platform/core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus/components.xml > > > platform/xwiki-applications/trunk/officeimporter/src/main/resources/Import/Importer.xml > > Log: > > XWIKI-3083: Develop the initial feature set for the Office Importer > module > > > > * Added error reporting support. > > * Error messages need to be improved. > > > > Modified: > platform/core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus/components.xml > > =================================================================== > > --- > platform/core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus/components.xml > 2009-01-10 17:42:24 UTC (rev 15291) > > +++ > platform/core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus/components.xml > 2009-01-10 18:37:55 UTC (rev 15292) > > @@ -96,6 +96,7 @@ > > <role-hint>htmltopresentation</role-hint> > > <field-name>htmlToPresentationTransformer</field-name> > > </requirement> > > + <instantiation-strategy>singleton</instantiation-strategy> > > </requirements> > > </component> > >  > > @@ -104,7 +105,7 @@ > > <role-hint>officeimporter</role-hint> > > > <implementation>org.xwiki.officeimporter.internal.OfficeImporterVelocityContextInitializer > > </implementation> > > - <instantiation-strategy>singleton</instantiation-strategy> > > + <instantiation-strategy>per-lookup</instantiation-strategy> > > No, you should leave it as a singleton, since the context initializer > does not hold any state. It will be invoked manually for each request by > another component in the velocity module. > So the initialize() method is invoked on every request, got it. Thanks. - Asiri > > > <requirements> > > <requirement> > > <role>org.xwiki.officeimporter.OfficeImporter</role> > > > > > -- > Sergiu Dumitriu > http://purl.org/net/sergiu/ > _______________________________________________ > devs mailing list > devs(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/devs >

2 1

[xwiki-devs] Office Importer application comments
by Vincent Massol 11 Jan '09

11 Jan '09

Hi, Some comments: * I don't think the Import space name is a good one for the office importer. I'd rather not create a new space and move the 2 pages in the XWiki space (my preference right now, otherwise users will be able to edit the pages by default unless we provide a WebPreferences and it makes securing the wiki harder) or use something like OfficeImporter (less good IMO). * Navigating to the Importer page shows error messages. I think that page should not be shown and be hidden so that users don't navigate to it. It could also be moved to the XWiki space for now. * We need a link from the top menu. It think that should be real quick to add for 1.8M1 * it's a little buggy right now but I have commented why in the jira issue: http://jira.xwiki.org/jira/browse/XWIKI-3083 WDYT? Thanks -Vincent http://xwiki.com http://xwiki.org http://massol.net

2 4

Re: [xwiki-devs] [xwiki-notifications] r15301 - platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter
by Sergiu Dumitriu 11 Jan '09

11 Jan '09

asiri (SVN) wrote: > Author: asiri > Date: 2009-01-11 06:57:24 +0100 (Sun, 11 Jan 2009) > New Revision: 15301 > > Modified: > platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/OfficeImporterContext.java > Log: > XWIKI-3083: Develop the initial feature set for the Office Importer module > > * Minor refactoring. > > Modified: platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/OfficeImporterContext.java > =================================================================== > --- platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/OfficeImporterContext.java 2009-01-11 05:09:39 UTC (rev 15300) > +++ platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/OfficeImporterContext.java 2009-01-11 05:57:24 UTC (rev 15301) > @@ -24,6 +24,8 @@ > import java.util.Map; > > import org.xwiki.bridge.DocumentAccessBridge; > +import org.xwiki.rendering.parser.Syntax; > +import org.xwiki.rendering.parser.SyntaxType; > > import com.artofsolving.jodconverter.DefaultDocumentFormatRegistry; > import com.artofsolving.jodconverter.DocumentFormat; > @@ -39,6 +41,11 @@ > public class OfficeImporterContext > { > /** > + * Default document syntax id. > + */ > + private static final String DEFAULT_SYNTAX_ID = new Syntax(SyntaxType.XWIKI, "1.0").toIdString(); Why 1.0? Shouldn't we chose 2.0 as the default? -- Sergiu Dumitriu http://purl.org/net/sergiu/

2 1

Re: [xwiki-devs] [xwiki-notifications] r15292 - in platform: core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/internal core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus xwiki-applications/trunk/officeimporter/src/main/resources/Import
by Sergiu Dumitriu 11 Jan '09

11 Jan '09

asiri (SVN) wrote: > Author: asiri > Date: 2009-01-10 19:37:55 +0100 (Sat, 10 Jan 2009) > New Revision: 15292 > > Added: > platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/internal/OfficeImporterVelocityBridge.java > Modified: > platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/OfficeImporter.java > platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter/internal/OfficeImporterVelocityContextInitializer.java > platform/core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus/components.xml > platform/xwiki-applications/trunk/officeimporter/src/main/resources/Import/Importer.xml > Log: > XWIKI-3083: Develop the initial feature set for the Office Importer module > > * Added error reporting support. > * Error messages need to be improved. > > Modified: platform/core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus/components.xml > =================================================================== > --- platform/core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus/components.xml 2009-01-10 17:42:24 UTC (rev 15291) > +++ platform/core/trunk/xwiki-officeimporter/src/main/resources/META-INF/plexus/components.xml 2009-01-10 18:37:55 UTC (rev 15292) > @@ -96,6 +96,7 @@ > <role-hint>htmltopresentation</role-hint> > <field-name>htmlToPresentationTransformer</field-name> > </requirement> > + <instantiation-strategy>singleton</instantiation-strategy> > </requirements> > </component> >  > @@ -104,7 +105,7 @@ > <role-hint>officeimporter</role-hint> > <implementation>org.xwiki.officeimporter.internal.OfficeImporterVelocityContextInitializer > </implementation> > - <instantiation-strategy>singleton</instantiation-strategy> > + <instantiation-strategy>per-lookup</instantiation-strategy> No, you should leave it as a singleton, since the context initializer does not hold any state. It will be invoked manually for each request by another component in the velocity module. > <requirements> > <requirement> > <role>org.xwiki.officeimporter.OfficeImporter</role> > -- Sergiu Dumitriu http://purl.org/net/sergiu/

1 0

Re: [xwiki-devs] [xwiki-notifications] r15251 - xeclipse/tags
by Sergiu Dumitriu 10 Jan '09

10 Jan '09

fmancinelli (SVN) wrote: > Author: fmancinelli > Date: 2009-01-09 19:14:00 +0100 (Fri, 09 Jan 2009) > New Revision: 15251 > > Added: > xeclipse/tags/xwiki-eclipse-1.2-rc-1/ > Log: > [Release] Tagged trunk as xwiki-eclipse-1.2-rc-1 > > > Copied: xeclipse/tags/xwiki-eclipse-1.2-rc-1 (from rev 15250, xeclipse/trunk) Shouldn't this be a real release, instead of a direct tag? -- Sergiu Dumitriu http://purl.org/net/sergiu/

2 1

Re: [xwiki-devs] [xwiki-notifications] r14929 - in platform/core/branches/xwiki-core-1.7/xwiki-rendering/src: main/java/org/xwiki/rendering/internal/parser main/java/org/xwiki/rendering/internal/renderer main/java/org/xwiki/rendering/internal/rendere
by Thomas Mortagne 10 Jan '09

10 Jan '09

On Sat, Jan 10, 2009 at 4:45 AM, Sergiu Dumitriu <sergiu(a)xwiki.com> wrote: > tmortagne (SVN) wrote: > >> Added: platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/main/java/org/xwiki/rendering/listener/DefaultAttachement.java >> =================================================================== >> --- platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/main/java/org/xwiki/rendering/listener/DefaultAttachement.java (rev 0) >> +++ platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/main/java/org/xwiki/rendering/listener/DefaultAttachement.java 2008-12-27 15:58:45 UTC (rev 14929) >> @@ -0,0 +1,69 @@ >> +/* >> + * 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.rendering.listener; >> + >> +/** >> + * Default implementation of {@link Attachment}. >> + * >> + * @version $Id$ >> + * @since 1.7.1 >> + */ >> +public class DefaultAttachement implements Attachment >> +{ >> + /** >> + * The name of the document containing the attachment. >> + */ >> + private String documentName; >> + >> + /** >> + * The name of the attachment. >> + */ >> + private String attachmentName; >> + >> + /** >> + * @param documentName the name of the document containing the attachment. >> + * @param attachmentName the name of the attachment. >> + */ >> + public DefaultAttachement(String documentName, String attachmentName) >> + { >> + this.documentName = documentName; >> + this.attachmentName = attachmentName; >> + } >> + >> + /** >> + * {@inheritDoc} >> + * >> + * @see org.xwiki.rendering.listener.Attachment#getDocumentName() >> + */ >> + public String getDocumentName() >> + { >> + return this.documentName; >> + } >> + >> + /** >> + * {@inheritDoc} >> + * >> + * @see org.xwiki.rendering.listener.Attachment#getAttachmentName() >> + */ >> + public String getAttachmentName() >> + { >> + return this.attachmentName; >> + } >> +} > > Shouldn't this one be in an internal package, like the > DefaultAttachmentParser? DefaultAttachement is not a component so you need to know it to be able to use it and it's more the default implementation anyone could use to represent an attachment. It's here as a toolkit and not just the implementation used by DefaultAttachmentParser. > > -- > Sergiu Dumitriu > http://purl.org/net/sergiu/ > _______________________________________________ > devs mailing list > devs(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/devs > -- Thomas Mortagne

1 0

10 Jan '09

tmortagne (SVN) wrote: > Added: platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/main/java/org/xwiki/rendering/listener/DefaultAttachement.java > =================================================================== > --- platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/main/java/org/xwiki/rendering/listener/DefaultAttachement.java (rev 0) > +++ platform/core/branches/xwiki-core-1.7/xwiki-rendering/src/main/java/org/xwiki/rendering/listener/DefaultAttachement.java 2008-12-27 15:58:45 UTC (rev 14929) > @@ -0,0 +1,69 @@ > +/* > + * 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.rendering.listener; > + > +/** > + * Default implementation of {@link Attachment}. > + * > + * @version $Id$ > + * @since 1.7.1 > + */ > +public class DefaultAttachement implements Attachment > +{ > + /** > + * The name of the document containing the attachment. > + */ > + private String documentName; > + > + /** > + * The name of the attachment. > + */ > + private String attachmentName; > + > + /** > + * @param documentName the name of the document containing the attachment. > + * @param attachmentName the name of the attachment. > + */ > + public DefaultAttachement(String documentName, String attachmentName) > + { > + this.documentName = documentName; > + this.attachmentName = attachmentName; > + } > + > + /** > + * {@inheritDoc} > + * > + * @see org.xwiki.rendering.listener.Attachment#getDocumentName() > + */ > + public String getDocumentName() > + { > + return this.documentName; > + } > + > + /** > + * {@inheritDoc} > + * > + * @see org.xwiki.rendering.listener.Attachment#getAttachmentName() > + */ > + public String getAttachmentName() > + { > + return this.attachmentName; > + } > +} Shouldn't this one be in an internal package, like the DefaultAttachmentParser? -- Sergiu Dumitriu http://purl.org/net/sergiu/

1 0

[xwiki-devs] [VOTE] Release XE 1.7.1 today
by Jean-Vincent Drean 09 Jan '09

09 Jan '09

Hi, The last bugs preventing this release have been fixed and I'd like to start the release ASAP. Is it ok for everyone ? here's my +1. JV.

6 6