- xwiki-devs@xwiki.org - lists.xwiki.org

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

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 >

16 years, 8 months

2
1
0 0

[xwiki-devs] Office Importer application comments

by Vincent Massol

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

16 years, 8 months

2
4
0 0

Re: [xwiki-devs] [xwiki-notifications] r15301 - platform/core/trunk/xwiki-officeimporter/src/main/java/org/xwiki/officeimporter

by Sergiu Dumitriu

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/

16 years, 8 months

2
1
0 0

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

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/

16 years, 8 months

1
0
0 0

Re: [xwiki-devs] [xwiki-notifications] r15251 - xeclipse/tags

by Sergiu Dumitriu

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/

16 years, 8 months

2
1
0 0

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

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

16 years, 8 months

1
0
0 0

by Sergiu Dumitriu

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/

16 years, 8 months

1
0
0 0

[xwiki-devs] [VOTE] Release XE 1.7.1 today

by Jean-Vincent Drean

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.

16 years, 8 months

6
6
0 0

[xwiki-devs] [VOTE] Move all rendering related components under the same maven parent and separate a little more

by Thomas Mortagne

Hi xwikiers, I need to commit the 1.0->2.0 converter which contains some classes used only for this purpose. So I would prefer to to add it directly in xwiki-core-rendering module, plus I don't like to have anything about xwiki 1.0 in the core-rendering module. But if we have XWiki 1.0 parser in it's own module, it would be cleaner to have all parsers extracted from the core-rendering module. So I propose to reorg a bit rendering to have: - xwiki-core-rendering - xwiki-core-rendering-api - xwiki-core-rendering-macros - xwiki-core-rendering-macro-toc - ... - xwiki-core-rendering-parsers - xwiki-core-rendering-parser-xwiki10 - xwiki-core-rendering-parser-wikimodel - xwiki-core-rendering-parser-doxia Also having everything under the same maven parent is better in the context of making xwiki rendering framework an independent open source project latter. And better sooner than latter. Here is my +1. -- Thomas Mortagne

16 years, 8 months

5
13
0 0

[xwiki-devs] [VOTE] Add a method to retrieve the list of properties of a class in DocumentAccessBridge

by Jerome Velociter

To implement the wiki configuration source in the configuration component, we need to retrieve the list of properties of the XWiki.XWikiPreferences class. For this, I would like to add the following method in the DocumentAccessBridge : List<String> getPropertyNames(String className) throws Exception; My +1, Jerome

16 years, 8 months

3
3
0 0

[xwiki-devs] [VOTE] Do we keep "\\" in xwiki syntax 2.0?

by Vincent Massol

Hi, We need to decide if we want to keep the "\\" syntax since now newlines are significant. There are two use cases I can see: 1) If we want to allow users to enter empty paragraphs (using \\): some para \\ still the same para another para 2) Using \\ in scripts For example: #set ($var = "hello\\world") $var note that a possibility is to use the following which is less nice IMO: #set ($var = "hello${xwiki.nl}world") So here's my +1 to keep "\\" syntax. Thanks -Vincent http://xwiki.com http://xwiki.org http://massol.net

16 years, 8 months

6
13
0 0

Re: [xwiki-devs] [xwiki-notifications] r15193 - in sandbox/xwiki-core-rest: . src/main/java/org/xwiki/rest src/main/java/org/xwiki/rest/model src/main/java/org/xwiki/rest/resources src/main/resources/META-INF/plexus src/test/java/org/xwiki/rest

by Thomas Mortagne

On Thu, Jan 8, 2009 at 8:58 PM, SVN fmancinelli <sandbox-notifications(a)xwiki.org> wrote: > Author: fmancinelli > Date: 2009-01-08 20:58:17 +0100 (Thu, 08 Jan 2009) > New Revision: 15193 > > Added: > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Wiki.java > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Wikis.java > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/resources/WikisResource.java > Modified: > sandbox/xwiki-core-rest/.classpath This file should not be versionned since it's managed/generated by M2Eclipse > sandbox/xwiki-core-rest/pom.xml > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/Constants.java > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/DomainObjectFactory.java > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/Utils.java > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/XWikiResource.java > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Relations.java > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Space.java > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/UriConstants.java > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/XStreamFactory.java > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/resources/SpaceResource.java > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/resources/SpacesResource.java > sandbox/xwiki-core-rest/src/main/resources/META-INF/plexus/components.xml > sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/PageResourceTest.java > sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/PagesResourceTest.java > sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/RootResourceTest.java > sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/SpacesResourceTest.java > Log: > Added support for multiple wikis. > > Modified: sandbox/xwiki-core-rest/.classpath > =================================================================== > --- sandbox/xwiki-core-rest/.classpath 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/.classpath 2009-01-08 19:58:17 UTC (rev 15193) > @@ -1,6 +1,6 @@ > <?xml version="1.0" encoding="UTF-8"?> > <classpath> > - <classpathentry kind="src" output="target/classes" path="src/main/java"/> > + <classpathentry kind="src" path="src/main/java"/> > <classpathentry kind="src" path="src/main/resources"/> > <classpathentry kind="src" path="src/test/java"/> > <classpathentry kind="src" path="src/test/resources"/> > > Modified: sandbox/xwiki-core-rest/pom.xml > =================================================================== > --- sandbox/xwiki-core-rest/pom.xml 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/pom.xml 2009-01-08 19:58:17 UTC (rev 15193) > @@ -91,6 +91,14 @@ > <plugins> > <plugin> > <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-surefire-plugin</artifactId> > + <configuration> > + <skip>true</skip> > + </configuration> > + </plugin> > + > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-checkstyle-plugin</artifactId> > <dependencies> > <dependency> > > Modified: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/Constants.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/Constants.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/Constants.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -13,7 +13,7 @@ > > /* These are relevant parameter names that are used in URI templates. */ > public static final String WIKI_NAME_PARAMETER = "wikiName"; > - > + > public static final String SPACE_NAME_PARAMETER = "spaceName"; > > public static final String PAGE_NAME_PARAMETER = "pageName"; > > Modified: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/DomainObjectFactory.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/DomainObjectFactory.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/DomainObjectFactory.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -1,6 +1,7 @@ > package org.xwiki.rest; > > import java.sql.Timestamp; > +import java.util.ArrayList; > import java.util.List; > > import org.restlet.data.MediaType; > @@ -12,7 +13,7 @@ > import org.xwiki.rest.model.Relations; > import org.xwiki.rest.model.Space; > import org.xwiki.rest.model.Translations; > -import org.xwiki.rest.model.UriConstants; > +import org.xwiki.rest.model.Wikis; > import org.xwiki.rest.model.XWikiRoot; > import org.xwiki.rest.resources.PageResource; > import org.xwiki.rest.resources.PageTranslationResource; > @@ -22,7 +23,9 @@ > import org.xwiki.rest.resources.RootResource; > import org.xwiki.rest.resources.SpaceResource; > import org.xwiki.rest.resources.SpacesResource; > +import org.xwiki.rest.resources.WikisResource; > > +import com.xpn.xwiki.XWikiException; > import com.xpn.xwiki.api.Document; > import com.xpn.xwiki.doc.rcs.XWikiRCSNodeId; > > @@ -37,9 +40,9 @@ > XWikiRoot xwikiRoot = new XWikiRoot(xwikiApi.getVersion()); > > String fullUri = > - String.format("%s%s", request.getRootRef(), registry.getUriPatternForResourceClass(SpacesResource.class)); > + String.format("%s%s", request.getRootRef(), registry.getUriPatternForResourceClass(WikisResource.class)); > Link link = new Link(Utils.formatUriTemplate(fullUri)); > - link.setRel(Relations.SPACES); > + link.setRel(Relations.WIKIS); > xwikiRoot.addLink(link); > > fullUri = > @@ -52,15 +55,43 @@ > return xwikiRoot; > } > > - public static Space createSpace(Request request, XWikiResourceClassRegistry resourceClassRegistry, > - String wiki, String spaceName, String home, int numberOfPages) > + public static Wikis createWikis(Request request, com.xpn.xwiki.XWiki xwiki, > + com.xpn.xwiki.XWikiContext xwikiContext, XWikiResourceClassRegistry registry) > { > + Wikis wikis = new Wikis(); > + > + List<String> databaseNames = new ArrayList<String>(); > + > + try { > + databaseNames = xwiki.getVirtualWikisDatabaseNames(xwikiContext); > + } catch (XWikiException e) { > + /* Ignore */ > + } > + > + for (String databaseName : databaseNames) { > + String fullUri = > + String.format("%s%s", request.getRootRef(), registry > + .getUriPatternForResourceClass(SpacesResource.class)); > + Link link = new Link(Utils.formatUriTemplate(fullUri)); > + link.setRel(Relations.SPACES); > + wikis.addLink(link); > + } > + > + return wikis; > + > + } > + > + public static Space createSpace(Request request, XWikiResourceClassRegistry resourceClassRegistry, String wiki, > + String spaceName, String home, int numberOfPages) > + { > Space space = new Space(wiki, spaceName, home, numberOfPages); > > String fullUri = > String.format("%s%s", request.getRootRef(), resourceClassRegistry > .getUriPatternForResourceClass(PagesResource.class)); > - Link link = new Link(Utils.formatUriTemplate(fullUri, UriConstants.SPACE_NAME_PARAMETER, spaceName)); > + Link link = > + new Link(Utils.formatUriTemplate(fullUri, Constants.WIKI_NAME_PARAMETER, wiki, > + Constants.SPACE_NAME_PARAMETER, spaceName)); > link.setRel(Relations.PAGES); > > space.addLink(link); > @@ -99,8 +130,9 @@ > String.format("%s%s", request.getRootRef(), resourceClassRegistry > .getUriPatternForResourceClass(PageTranslationResource.class)); > link = > - new Link(Utils.formatUriTemplate(fullUri, UriConstants.SPACE_NAME_PARAMETER, doc.getSpace(), > - UriConstants.PAGE_NAME_PARAMETER, doc.getName(), UriConstants.LANGUAGE_ID_PARAMETER, language)); > + new Link(Utils.formatUriTemplate(fullUri, Constants.WIKI_NAME_PARAMETER, doc.getWiki(), > + Constants.SPACE_NAME_PARAMETER, doc.getSpace(), Constants.PAGE_NAME_PARAMETER, doc.getName(), > + Constants.LANGUAGE_ID_PARAMETER, language)); > link.setRel(Relations.TRANSLATION); > link.setHrefLang(language); > translations.addLink(link); > @@ -110,15 +142,17 @@ > String.format("%s%s", request.getRootRef(), resourceClassRegistry > .getUriPatternForResourceClass(PageResource.class)); > link = > - new Link(Utils.formatUriTemplate(fullUri, UriConstants.SPACE_NAME_PARAMETER, doc.getSpace(), > - UriConstants.PAGE_NAME_PARAMETER, doc.getName())); > + new Link(Utils.formatUriTemplate(fullUri, Constants.WIKI_NAME_PARAMETER, doc.getWiki(), > + Constants.SPACE_NAME_PARAMETER, doc.getSpace(), Constants.PAGE_NAME_PARAMETER, doc.getName())); > link.setRel(Relations.PAGE); > pageSummary.addLink(link); > > fullUri = > String.format("%s%s", request.getRootRef(), resourceClassRegistry > .getUriPatternForResourceClass(SpaceResource.class)); > - link = new Link(Utils.formatUriTemplate(fullUri, UriConstants.SPACE_NAME_PARAMETER, doc.getSpace())); > + link = > + new Link(Utils.formatUriTemplate(fullUri, Constants.WIKI_NAME_PARAMETER, doc.getWiki(), > + Constants.SPACE_NAME_PARAMETER, doc.getSpace())); > link.setRel(Relations.SPACE); > pageSummary.addLink(link); > > @@ -127,10 +161,12 @@ > pageSummary.setParent(doc.getParent()); > > String[] components = doc.getParent().split("\\."); > - fullUri = String.format("%s%s", request.getRootRef(), UriConstants.PAGE_URI_TEMPLATE); > + fullUri = > + String.format("%s%s", request.getRootRef(), resourceClassRegistry > + .getUriPatternForResourceClass(PageResource.class)); > link = > - new Link(Utils.formatUriTemplate(fullUri, UriConstants.SPACE_NAME_PARAMETER, components[0], > - UriConstants.PAGE_NAME_PARAMETER, components[1])); > + new Link(Utils.formatUriTemplate(fullUri, Constants.WIKI_NAME_PARAMETER, doc.getWiki(), > + Constants.SPACE_NAME_PARAMETER, components[0], Constants.PAGE_NAME_PARAMETER, components[1])); > link.setRel(Relations.PARENT); > pageSummary.addLink(link); > } > @@ -180,8 +216,9 @@ > String.format("%s%s", request.getRootRef(), resourceClassRegistry > .getUriPatternForResourceClass(PageTranslationResource.class)); > link = > - new Link(Utils.formatUriTemplate(fullUri, UriConstants.SPACE_NAME_PARAMETER, doc.getSpace(), > - UriConstants.PAGE_NAME_PARAMETER, doc.getName(), UriConstants.LANGUAGE_ID_PARAMETER, language)); > + new Link(Utils.formatUriTemplate(fullUri, Constants.WIKI_NAME_PARAMETER, doc.getWiki(), > + Constants.SPACE_NAME_PARAMETER, doc.getSpace(), Constants.PAGE_NAME_PARAMETER, doc.getName(), > + Constants.LANGUAGE_ID_PARAMETER, language)); > link.setRel(Relations.TRANSLATION); > link.setHrefLang(language); > translations.addLink(link); > @@ -194,7 +231,7 @@ > fullUri = > String.format("%s%s", request.getRootRef(), resourceClassRegistry > .getUriPatternForResourceClass(SpaceResource.class)); > - link = new Link(Utils.formatUriTemplate(fullUri, UriConstants.SPACE_NAME_PARAMETER, doc.getSpace())); > + link = new Link(Utils.formatUriTemplate(fullUri, Constants.SPACE_NAME_PARAMETER, doc.getSpace())); > link.setRel(Relations.SPACE); > page.addLink(link); > > @@ -207,8 +244,8 @@ > String.format("%s%s", request.getRootRef(), resourceClassRegistry > .getUriPatternForResourceClass(PageResource.class)); > link = > - new Link(Utils.formatUriTemplate(fullUri, UriConstants.SPACE_NAME_PARAMETER, components[0], > - UriConstants.PAGE_NAME_PARAMETER, components[1])); > + new Link(Utils.formatUriTemplate(fullUri, Constants.SPACE_NAME_PARAMETER, components[0], > + Constants.PAGE_NAME_PARAMETER, components[1])); > link.setRel(Relations.PARENT); > page.addLink(link); > } > @@ -250,16 +287,16 @@ > String.format("%s%s", request.getRootRef(), resourceClassRegistry > .getUriPatternForResourceClass(PageTranslationVersionResource.class)); > link = > - new Link(Utils.formatUriTemplate(fullUri, UriConstants.SPACE_NAME_PARAMETER, spaceName, > - UriConstants.PAGE_NAME_PARAMETER, pageName, UriConstants.LANGUAGE_ID_PARAMETER, languageId, > - UriConstants.VERSION_PARAMETER, String.format("%d.%d", version, minorVersion))); > + new Link(Utils.formatUriTemplate(fullUri, Constants.SPACE_NAME_PARAMETER, spaceName, > + Constants.PAGE_NAME_PARAMETER, pageName, Constants.LANGUAGE_ID_PARAMETER, languageId, > + Constants.VERSION_PARAMETER, String.format("%d.%d", version, minorVersion))); > } else { > fullUri = > String.format("%s%s", request.getRootRef(), resourceClassRegistry > .getUriPatternForResourceClass(PageVersionResource.class)); > link = > - new Link(Utils.formatUriTemplate(fullUri, UriConstants.SPACE_NAME_PARAMETER, spaceName, > - UriConstants.PAGE_NAME_PARAMETER, pageName, UriConstants.VERSION_PARAMETER, String.format("%d.%d", > + new Link(Utils.formatUriTemplate(fullUri, Constants.SPACE_NAME_PARAMETER, spaceName, > + Constants.PAGE_NAME_PARAMETER, pageName, Constants.VERSION_PARAMETER, String.format("%d.%d", > version, minorVersion))); > } > > > Modified: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/Utils.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/Utils.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/Utils.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -18,6 +18,8 @@ > import org.xwiki.rest.model.XStreamFactory; > > import com.thoughtworks.xstream.XStream; > +import com.xpn.xwiki.api.Document; > +import com.xpn.xwiki.doc.XWikiDocument; > > public class Utils > { > @@ -96,4 +98,16 @@ > return null; > } > > + public static String getPrefixedPageName(String database, String space, String name) > + { > + XWikiDocument xwikiDocument = new XWikiDocument(); > + xwikiDocument.setDatabase(database); > + xwikiDocument.setName(name); > + xwikiDocument.setSpace(space); > + > + Document document = new Document(xwikiDocument, null); > + > + return document.getPrefixedFullName(); > + } > + > } > > Modified: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/XWikiResource.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/XWikiResource.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/XWikiResource.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -174,12 +174,14 @@ > public DocumentInfo getDocumentFromRequest(Request request, boolean failIfDoesntExist) > { > try { > + String wikiName = (String) request.getAttributes().get(Constants.WIKI_NAME_PARAMETER); > String spaceName = (String) request.getAttributes().get(Constants.SPACE_NAME_PARAMETER); > String pageName = (String) request.getAttributes().get(Constants.PAGE_NAME_PARAMETER); > String language = (String) request.getAttributes().get(Constants.LANGUAGE_ID_PARAMETER); > String version = (String) request.getAttributes().get(Constants.VERSION_PARAMETER); > - String pageFullName = String.format("%s.%s", spaceName, pageName); > > + String pageFullName = Utils.getPrefixedPageName(wikiName, spaceName, pageName); > + > boolean existed = xwikiApi.exists(pageFullName); > > if (failIfDoesntExist) { > > Modified: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Relations.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Relations.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Relations.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -7,6 +7,10 @@ > { > public static final String SELF = "self"; > > + public static final String WADL = "wadl"; > + > + public static final String WIKIS = "http://www.xwiki.org/rel/wikis"; > + > public static final String SPACES = "http://www.xwiki.org/rel/spaces"; > > public static final String SPACE = "http://www.xwiki.org/rel/space"; > @@ -18,6 +22,4 @@ > public static final String PAGE = "http://www.xwiki.org/rel/page"; > > public static final String PARENT = "http://www.xwiki.org/rel/page/parent"; > - > - public static final String WADL = "wadl"; > } > > Modified: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Space.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Space.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Space.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -9,7 +9,7 @@ > public class Space extends LinkCollection > { > private String wiki; > - > + > private String name; > > private String home; > > Modified: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/UriConstants.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/UriConstants.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/UriConstants.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -7,6 +7,8 @@ > { > public static final String BROWSER_AUTHENTICATION_URI_TEMPLATE = "/browser_authentication"; > > + public static final String WIKI_NAME_PARAMETER = "wikiName"; > + > public static final String SPACE_NAME_PARAMETER = "spaceName"; > > public static final String PAGE_NAME_PARAMETER = "pageName"; > @@ -17,34 +19,40 @@ > > public static final String ROOT_URI_TEMPLATE = "/"; > > - public static final String SPACES_URI_TEMPLATE = "/spaces"; > + public static final String WIKIS_URI_TEMPLATE = "/wikis"; > > - public static final String PAGES_URI_TEMPLATE = String.format("/spaces/{%s}/pages", SPACE_NAME_PARAMETER); > + public static final String SPACES_URI_TEMPLATE = "/wikis/{%s}"; > > + public static final String PAGES_URI_TEMPLATE = > + String.format("/wikis/{%s}/spaces/{%s}/pages", WIKI_NAME_PARAMETER, SPACE_NAME_PARAMETER); > + > public static final String PAGE_URI_TEMPLATE = > - String.format("/spaces/{%s}/pages/{%s}", SPACE_NAME_PARAMETER, PAGE_NAME_PARAMETER); > + String.format("/wikis/{%s}/spaces/{%s}/pages/{%s}", WIKI_NAME_PARAMETER, SPACE_NAME_PARAMETER, > + PAGE_NAME_PARAMETER); > > public static final String TRANSLATIONS_URI_TEMPLATE = > - String.format("/spaces/{%s}/pages/{%s}/translations", SPACE_NAME_PARAMETER, PAGE_NAME_PARAMETER); > + String.format("/wikis/{%s}/spaces/{%s}/pages/{%s}/translations", WIKI_NAME_PARAMETER, SPACE_NAME_PARAMETER, > + PAGE_NAME_PARAMETER); > > public static final String PAGE_TRANSLATION_URI_TEMPLATE = > - String.format("/spaces/{%s}/pages/{%s}/translations/{%s}", SPACE_NAME_PARAMETER, PAGE_NAME_PARAMETER, > - LANGUAGE_ID_PARAMETER); > + String.format("/wikis/{%s}/spaces/{%s}/pages/{%s}/translations/{%s}", WIKI_NAME_PARAMETER, > + SPACE_NAME_PARAMETER, PAGE_NAME_PARAMETER, LANGUAGE_ID_PARAMETER); > > public static final String HISTORY_URI_TEMPLATE = > - String.format("/spaces/{%s}/pages/{%s}/history", SPACE_NAME_PARAMETER, PAGE_NAME_PARAMETER); > + String.format("/wikis/{%s}/spaces/{%s}/pages/{%s}/history", WIKI_NAME_PARAMETER, SPACE_NAME_PARAMETER, > + PAGE_NAME_PARAMETER); > > public static final String TRANSLATION_HISTORY_URI_TEMPLATE = > - String.format("/spaces/{%s}/pages/{%s}/translations/{%s}/history", SPACE_NAME_PARAMETER, PAGE_NAME_PARAMETER, > - LANGUAGE_ID_PARAMETER); > + String.format("/wikis/{%s}/spaces/{%s}/pages/{%s}/translations/{%s}/history", WIKI_NAME_PARAMETER, > + SPACE_NAME_PARAMETER, PAGE_NAME_PARAMETER, LANGUAGE_ID_PARAMETER); > > public static final String PAGE_VERSION_URI_TEMPLATE = > - String.format("/spaces/{%s}/pages/{%s}/history/{%s}", SPACE_NAME_PARAMETER, PAGE_NAME_PARAMETER, > - VERSION_PARAMETER); > + String.format("/wikis/{%s}/spaces/{%s}/pages/{%s}/history/{%s}", WIKI_NAME_PARAMETER, SPACE_NAME_PARAMETER, > + PAGE_NAME_PARAMETER, VERSION_PARAMETER); > > public static final String PAGE_TRANSLATION_VERSION_URI_TEMPLATE = > - String.format("/spaces/{%s}/pages/{%s}/translations/{%s}/history/{%s}", SPACE_NAME_PARAMETER, > - PAGE_NAME_PARAMETER, LANGUAGE_ID_PARAMETER, VERSION_PARAMETER); > + String.format("/wikis/{%s}/spaces/{%s}/pages/{%s}/translations/{%s}/history/{%s}", WIKI_NAME_PARAMETER, > + SPACE_NAME_PARAMETER, PAGE_NAME_PARAMETER, LANGUAGE_ID_PARAMETER, VERSION_PARAMETER); > > public static final String START_PARAMETER = "start"; > > > Added: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Wiki.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Wiki.java (rev 0) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Wiki.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -0,0 +1,23 @@ > +package org.xwiki.rest.model; > + > +import com.thoughtworks.xstream.annotations.XStreamAlias; > + > +/** > + * @version $Id$ > + */ > +@XStreamAlias("wiki") > +public class Wiki extends LinkCollection > +{ > + private String name; > + > + public Wiki(String name) > + { > + this.name = name; > + } > + > + public String getName() > + { > + return name; > + } > + > +} > > Added: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Wikis.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Wikis.java (rev 0) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/Wikis.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -0,0 +1,32 @@ > +package org.xwiki.rest.model; > + > +import java.util.ArrayList; > +import java.util.List; > + > +import com.thoughtworks.xstream.annotations.XStreamAlias; > +import com.thoughtworks.xstream.annotations.XStreamImplicit; > + > +/** > + * @version $Id$ > + */ > +@XStreamAlias("wikis") > +public class Wikis extends LinkCollection > +{ > + @XStreamImplicit > + private List<Wiki> wikiList; > + > + public Wikis() > + { > + wikiList = new ArrayList<Wiki>(); > + } > + > + public void addWiki(Wiki space) > + { > + wikiList.add(space); > + } > + > + public List<Wiki> getWikiList() > + { > + return wikiList; > + } > +} > > Modified: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/XStreamFactory.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/XStreamFactory.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/model/XStreamFactory.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -28,6 +28,8 @@ > > sorter.registerFieldOrder(XWikiRoot.class, new String[] {"version", "links"}); > > + sorter.registerFieldOrder(Wiki.class, new String[] {"name", "links"}); > + > sorter.registerFieldOrder(Space.class, new String[] {"wiki", "name", "home", "numberOfPages", "links"}); > > sorter.registerFieldOrder(PageSummary.class, new String[] {"fullId", "id", "wiki", "space", "name", "title", > @@ -41,6 +43,8 @@ > > xstream.processAnnotations(Link.class); > xstream.processAnnotations(XWikiRoot.class); > + xstream.processAnnotations(Wikis.class); > + xstream.processAnnotations(Wiki.class); > xstream.processAnnotations(Spaces.class); > xstream.processAnnotations(Space.class); > xstream.processAnnotations(Pages.class); > > Modified: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/resources/SpaceResource.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/resources/SpaceResource.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/resources/SpaceResource.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -11,7 +11,6 @@ > import org.xwiki.rest.model.Space; > > import com.xpn.xwiki.XWikiException; > -import com.xpn.xwiki.api.Document; > > /** > * @version $Id$ > @@ -25,7 +24,7 @@ > String spaceName = (String) getRequest().getAttributes().get(Constants.SPACE_NAME_PARAMETER); > > xwiki.setDatabase("xwiki"); > - > + > List<String> docNames = xwikiApi.getSpaceDocsName(spaceName); > String home = String.format("%s.WebHome", spaceName); > > @@ -36,7 +35,8 @@ > String wiki = "xwiki"; > > Space space = > - DomainObjectFactory.createSpace(getRequest(), resourceClassRegistry, wiki, spaceName, home, docNames.size()); > + DomainObjectFactory.createSpace(getRequest(), resourceClassRegistry, wiki, spaceName, home, docNames > + .size()); > > return getRepresenterFor(variant).represent(getContext(), getRequest(), getResponse(), space); > } catch (XWikiException e) { > > Modified: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/resources/SpacesResource.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/resources/SpacesResource.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/resources/SpacesResource.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -7,6 +7,7 @@ > import org.restlet.data.Status; > import org.restlet.resource.Representation; > import org.restlet.resource.Variant; > +import org.xwiki.rest.Constants; > import org.xwiki.rest.DomainObjectFactory; > import org.xwiki.rest.RangeIterable; > import org.xwiki.rest.Utils; > @@ -15,7 +16,6 @@ > import org.xwiki.rest.model.UriConstants; > > import com.xpn.xwiki.XWikiException; > -import com.xpn.xwiki.api.Document; > > /** > * @version $Id$ > @@ -24,8 +24,13 @@ > { > @Override > public Representation represent(Variant variant) > - { > + { > + String database = xwikiContext.getDatabase(); > + > try { > + String wiki = (String) getRequest().getAttributes().get(Constants.WIKI_NAME_PARAMETER); > + xwikiContext.setDatabase(wiki); > + > Spaces spaces = new Spaces(); > > List<String> spaceNames = xwikiApi.getSpaces(); > @@ -44,8 +49,6 @@ > home = null; > } > > - String wiki = "xwiki"; > - > spaces.addSpace(DomainObjectFactory.createSpace(getRequest(), resourceClassRegistry, wiki, spaceName, > home, docNames.size())); > } > @@ -54,7 +57,9 @@ > } catch (XWikiException e) { > e.printStackTrace(); > getResponse().setStatus(Status.SERVER_ERROR_INTERNAL); > - } > + } finally { > + xwikiContext.setDatabase(database); > + } > > return null; > } > > Added: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/resources/WikisResource.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/resources/WikisResource.java (rev 0) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/resources/WikisResource.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -0,0 +1,57 @@ > +package org.xwiki.rest.resources; > + > +import java.util.List; > + > +import org.restlet.data.Status; > +import org.restlet.resource.Representation; > +import org.restlet.resource.Variant; > +import org.xwiki.rest.Constants; > +import org.xwiki.rest.Utils; > +import org.xwiki.rest.XWikiResource; > +import org.xwiki.rest.model.Link; > +import org.xwiki.rest.model.Relations; > +import org.xwiki.rest.model.Wiki; > +import org.xwiki.rest.model.Wikis; > + > +import com.xpn.xwiki.XWikiException; > + > +/** > + * @version $Id$ > + */ > +public class WikisResource extends XWikiResource > +{ > + @Override > + public Representation represent(Variant variant) > + { > + try { > + Wikis wikis = new Wikis(); > + > + List<String> databaseNames = xwiki.getVirtualWikisDatabaseNames(xwikiContext); > + > + if (databaseNames.isEmpty()) { > + databaseNames.add("xwiki"); > + } > + > + for (String databaseName : databaseNames) { > + Wiki wiki = new Wiki(databaseName); > + > + String fullUri = > + String.format("%s%s", getRequest().getRootRef(), resourceClassRegistry > + .getUriPatternForResourceClass(SpacesResource.class)); > + Link link = new Link(Utils.formatUriTemplate(fullUri, Constants.WIKI_NAME_PARAMETER, databaseName)); > + link.setRel(Relations.SPACES); > + wiki.addLink(link); > + > + wikis.addWiki(wiki); > + } > + > + return getRepresenterFor(variant).represent(getContext(), getRequest(), getResponse(), wikis); > + } catch (XWikiException e) { > + e.printStackTrace(); > + getResponse().setStatus(Status.SERVER_ERROR_INTERNAL); > + } > + > + return null; > + > + } > +} > > Modified: sandbox/xwiki-core-rest/src/main/resources/META-INF/plexus/components.xml > =================================================================== > --- sandbox/xwiki-core-rest/src/main/resources/META-INF/plexus/components.xml 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/main/resources/META-INF/plexus/components.xml 2009-01-08 19:58:17 UTC (rev 15193) > @@ -76,7 +76,50 @@ > org.xwiki.rest.representers.XmlTextXStreamRepresenter > </implementation> > </component> > + > +  > +  > +  > + <component> > + <role>org.xwiki.rest.XWikiResource > + </role> > + <role-hint>org.xwiki.rest.resources.WikisResource > + </role-hint> > + <instantiation-strategy>per-lookup</instantiation-strategy> > + <implementation>org.xwiki.rest.resources.WikisResource > + </implementation> > + <requirements> > + <requirement> > + <role>org.xwiki.rest.XWikiResourceClassRegistry > + </role> > + </requirement> > + <requirement> > + <role>org.xwiki.rest.XWikiResourceRepresenter > + </role> > + <role-hint>org.xwiki.rest.resources.WikisResource > + </role-hint> > + <field-name>descriptorToRepresenterMap > + </field-name> > + </requirement> > + </requirements> > + <configuration> > + <uriPattern>/wikis</uriPattern> > + </configuration> > + </component> > > +  > + > + <component> > + <role>org.xwiki.rest.XWikiResourceRepresenter > + </role> > + <role-hint>org.xwiki.rest.resources.WikisResource:text/xml > + </role-hint> > + <instantiation-strategy>singleton</instantiation-strategy> > + <implementation> > + org.xwiki.rest.representers.XmlTextXStreamRepresenter > + </implementation> > + </component> > + >  >  >  > @@ -108,7 +151,7 @@ > </requirement> > </requirements> > <configuration> > - <uriPattern>/spaces</uriPattern> > + <uriPattern>/wikis/{wikiName}/spaces</uriPattern> > </configuration> > </component> > > @@ -163,7 +206,7 @@ > </requirement> > </requirements> > <configuration> > - <uriPattern>/spaces/{spaceName}</uriPattern> > + <uriPattern>/wikis/{wikiName}/spaces/{spaceName}</uriPattern> > </configuration> > </component> > > @@ -207,7 +250,7 @@ > </requirement> > </requirements> > <configuration> > - <uriPattern>/spaces/{spaceName}/pages > + <uriPattern>/wikis/{wikiName}/spaces/{spaceName}/pages > </uriPattern> > </configuration> > </component> > @@ -252,7 +295,7 @@ > </requirement> > </requirements> > <configuration> > - <uriPattern>/spaces/{spaceName}/pages/{pageName} > + <uriPattern>/wikis/{wikiName}/spaces/{spaceName}/pages/{pageName} > </uriPattern> > </configuration> > </component> > @@ -297,7 +340,7 @@ > </requirement> > </requirements> > <configuration> > - <uriPattern>/spaces/{spaceName}/pages/{pageName}/history/{version} > + <uriPattern>/wikis/{wikiName}/spaces/{spaceName}/pages/{pageName}/history/{version} > </uriPattern> > </configuration> > </component> > @@ -342,7 +385,7 @@ > </requirement> > </requirements> > <configuration> > - <uriPattern>/spaces/{spaceName}/pages/{pageName}/translations > + <uriPattern>/wikis/{wikiName}/spaces/{spaceName}/pages/{pageName}/translations > </uriPattern> > </configuration> > </component> > @@ -387,7 +430,7 @@ > </requirement> > </requirements> > <configuration> > - <uriPattern>/spaces/{spaceName}/pages/{pageName}/translations/{languageId} > + <uriPattern>/wikis/{wikiName}/spaces/{spaceName}/pages/{pageName}/translations/{languageId} > </uriPattern> > </configuration> > </component> > @@ -432,7 +475,7 @@ > </requirement> > </requirements> > <configuration> > - <uriPattern>/spaces/{spaceName}/pages/{pageName}/translations/{languageId}/history/{version} > + <uriPattern>/wikis/{wikiName}/spaces/{spaceName}/pages/{pageName}/translations/{languageId}/history/{version} > </uriPattern> > </configuration> > </component> > @@ -477,7 +520,7 @@ > </requirement> > </requirements> > <configuration> > - <uriPattern>/spaces/{spaceName}/pages/{pageName}/history > + <uriPattern>/wikis/{wikiName}/spaces/{spaceName}/pages/{pageName}/history > </uriPattern> > </configuration> > </component> > @@ -522,7 +565,7 @@ > </requirement> > </requirements> > <configuration> > - <uriPattern>/spaces/{spaceName}/pages/{pageName}/translations/{languageId}/history > + <uriPattern>/wikis/{wikiName}/spaces/{spaceName}/pages/{pageName}/translations/{languageId}/history > </uriPattern> > </configuration> > </component> > > Modified: sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/PageResourceTest.java > =================================================================== > --- sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/PageResourceTest.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/PageResourceTest.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -14,21 +14,34 @@ > import org.xwiki.rest.model.Space; > import org.xwiki.rest.model.Spaces; > import org.xwiki.rest.model.UriConstants; > +import org.xwiki.rest.model.Wiki; > +import org.xwiki.rest.model.Wikis; > > public class PageResourceTest extends AbstractHttpTest > { > private Page getPage() throws Exception > { > - GetMethod getMethod = executeGet(getFullUri(Utils.formatUriTemplate(UriConstants.SPACES_URI_TEMPLATE))); > + GetMethod getMethod = executeGet(getFullUri(Utils.formatUriTemplate(UriConstants.WIKIS_URI_TEMPLATE))); > assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > TestUtils.printHttpMethodInfo(getMethod); > > + Wikis wikis = (Wikis) xstream.fromXML(getMethod.getResponseBodyAsString()); > + assertTrue(wikis.getWikiList().size() > 0); > + > + Wiki wiki = wikis.getWikiList().get(0); > + Link link = wiki.getFirstLinkByRelation(Relations.SPACES); > + assertNotNull(link); > + > + getMethod = executeGet(link.getHref()); > + assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + TestUtils.printHttpMethodInfo(getMethod); > + > Spaces spaces = (Spaces) xstream.fromXML(getMethod.getResponseBodyAsString()); > > assertTrue(spaces.getSpaceList().size() > 0); > > Space space = spaces.getSpaceList().get(0); > - Link link = space.getFirstLinkByRelation(Relations.PAGES); > + link = space.getFirstLinkByRelation(Relations.PAGES); > assertNotNull(link); > > getMethod = executeGet(link.getHref()); > @@ -51,6 +64,18 @@ > return page; > } > > + public String getWiki() throws Exception > + { > + GetMethod getMethod = executeGet(getFullUri(Utils.formatUriTemplate(UriConstants.WIKIS_URI_TEMPLATE))); > + assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + TestUtils.printHttpMethodInfo(getMethod); > + > + Wikis wikis = (Wikis) xstream.fromXML(getMethod.getResponseBodyAsString()); > + assertTrue(wikis.getWikiList().size() > 0); > + > + return wikis.getWikiList().get(0).getName(); > + } > + > public void testRepresentation() throws Exception > { > TestUtils.banner("testRepresentation()"); > @@ -67,7 +92,8 @@ > > GetMethod getMethod = > executeGet(getFullUri(Utils.formatUriTemplate(UriConstants.PAGE_URI_TEMPLATE, > - UriConstants.SPACE_NAME_PARAMETER, "NOTEXISTING", UriConstants.PAGE_NAME_PARAMETER, "NOTEXISTING"))); > + UriConstants.WIKI_NAME_PARAMETER, getWiki(), UriConstants.SPACE_NAME_PARAMETER, "NOTEXISTING", > + UriConstants.PAGE_NAME_PARAMETER, "NOTEXISTING"))); > assertTrue(getMethod.getStatusCode() == HttpStatus.SC_NOT_FOUND); > TestUtils.printHttpMethodInfo(getMethod); > } > @@ -131,8 +157,8 @@ > > PutMethod putMethod = > executePut(getFullUri(Utils.formatUriTemplate(UriConstants.PAGE_URI_TEMPLATE, > - UriConstants.SPACE_NAME_PARAMETER, SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, PAGE_NAME)), page, > - "Admin", "admin"); > + UriConstants.WIKI_NAME_PARAMETER, getWiki(), UriConstants.SPACE_NAME_PARAMETER, SPACE_NAME, > + UriConstants.PAGE_NAME_PARAMETER, PAGE_NAME)), page, "Admin", "admin"); > assertTrue(putMethod.getStatusCode() == HttpStatus.SC_CREATED); > TestUtils.printHttpMethodInfo(putMethod); > > @@ -159,8 +185,8 @@ > private void createPageIfDoesntExist(String spaceName, String pageName, String content) throws Exception > { > String uri = > - getFullUri(Utils.formatUriTemplate(UriConstants.PAGE_URI_TEMPLATE, UriConstants.SPACE_NAME_PARAMETER, > - spaceName, UriConstants.PAGE_NAME_PARAMETER, pageName)); > + getFullUri(Utils.formatUriTemplate(UriConstants.PAGE_URI_TEMPLATE, UriConstants.WIKI_NAME_PARAMETER, > + getWiki(), UriConstants.SPACE_NAME_PARAMETER, spaceName, UriConstants.PAGE_NAME_PARAMETER, pageName)); > > GetMethod getMethod = executeGet(uri); > TestUtils.printHttpMethodInfo(getMethod); > @@ -197,16 +223,17 @@ > > PutMethod putMethod = > executePut(getFullUri(Utils.formatUriTemplate(UriConstants.PAGE_TRANSLATION_URI_TEMPLATE, > - UriConstants.SPACE_NAME_PARAMETER, TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, > - TestConstants.TRANSLATIONS_PAGE_NAME, UriConstants.LANGUAGE_ID_PARAMETER, languageId)), page, "Admin", > - "admin"); > + UriConstants.WIKI_NAME_PARAMETER, getWiki(), UriConstants.SPACE_NAME_PARAMETER, > + TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, TestConstants.TRANSLATIONS_PAGE_NAME, > + UriConstants.LANGUAGE_ID_PARAMETER, languageId)), page, "Admin", "admin"); > assertTrue(putMethod.getStatusCode() == HttpStatus.SC_CREATED); > TestUtils.printHttpMethodInfo(putMethod); > > GetMethod getMethod = > executeGet(getFullUri(Utils.formatUriTemplate(UriConstants.PAGE_TRANSLATION_URI_TEMPLATE, > - UriConstants.SPACE_NAME_PARAMETER, TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, > - TestConstants.TRANSLATIONS_PAGE_NAME, UriConstants.LANGUAGE_ID_PARAMETER, languageId))); > + UriConstants.WIKI_NAME_PARAMETER, getWiki(), UriConstants.SPACE_NAME_PARAMETER, > + TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, TestConstants.TRANSLATIONS_PAGE_NAME, > + UriConstants.LANGUAGE_ID_PARAMETER, languageId))); > assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > TestUtils.printHttpMethodInfo(getMethod); > > @@ -221,8 +248,8 @@ > > GetMethod getMethod = > executeGet(getFullUri(Utils.formatUriTemplate(UriConstants.PAGE_URI_TEMPLATE, > - UriConstants.SPACE_NAME_PARAMETER, TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, > - TestConstants.TRANSLATIONS_PAGE_NAME))); > + UriConstants.WIKI_NAME_PARAMETER, getWiki(), UriConstants.SPACE_NAME_PARAMETER, > + TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, TestConstants.TRANSLATIONS_PAGE_NAME))); > assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > TestUtils.printHttpMethodInfo(getMethod); > > @@ -232,6 +259,7 @@ > assertTrue(translationLinks.size() > 0); > > for (Link translationLink : translationLinks) { > + System.out.format("Translation link: %s\n", translationLink.getHref()); > getMethod = executeGet(translationLink.getHref()); > assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > TestUtils.printHttpMethodInfo(getMethod); > @@ -248,15 +276,16 @@ > > GetMethod getMethod = > executeGet(getFullUri(Utils.formatUriTemplate(UriConstants.PAGE_URI_TEMPLATE, > - UriConstants.SPACE_NAME_PARAMETER, TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, > - TestConstants.TRANSLATIONS_PAGE_NAME))); > + UriConstants.WIKI_NAME_PARAMETER, getWiki(), UriConstants.SPACE_NAME_PARAMETER, > + TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, TestConstants.TRANSLATIONS_PAGE_NAME))); > assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > TestUtils.printHttpMethodInfo(getMethod); > > getMethod = > executeGet(getFullUri(Utils.formatUriTemplate(UriConstants.PAGE_TRANSLATION_URI_TEMPLATE, > - UriConstants.SPACE_NAME_PARAMETER, TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, > - TestConstants.TRANSLATIONS_PAGE_NAME, UriConstants.LANGUAGE_ID_PARAMETER, "NOTEXISTING"))); > + UriConstants.WIKI_NAME_PARAMETER, getWiki(), UriConstants.SPACE_NAME_PARAMETER, > + TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, TestConstants.TRANSLATIONS_PAGE_NAME, > + UriConstants.LANGUAGE_ID_PARAMETER, "NOTEXISTING"))); > assertTrue(getMethod.getStatusCode() == HttpStatus.SC_NOT_FOUND); > TestUtils.printHttpMethodInfo(getMethod); > } > @@ -271,15 +300,15 @@ > > DeleteMethod deleteMethod = > executeDelete(getFullUri(Utils.formatUriTemplate(UriConstants.PAGE_URI_TEMPLATE, > - UriConstants.SPACE_NAME_PARAMETER, TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, > - pageName))); > + UriConstants.WIKI_NAME_PARAMETER, getWiki(), UriConstants.SPACE_NAME_PARAMETER, > + TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, pageName))); > assertTrue(deleteMethod.getStatusCode() == HttpStatus.SC_OK); > TestUtils.printHttpMethodInfo(deleteMethod); > > GetMethod getMethod = > executeGet(getFullUri(Utils.formatUriTemplate(UriConstants.PAGE_URI_TEMPLATE, > - UriConstants.SPACE_NAME_PARAMETER, TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, > - pageName))); > + UriConstants.WIKI_NAME_PARAMETER, getWiki(), UriConstants.SPACE_NAME_PARAMETER, > + TestConstants.TEST_SPACE_NAME, UriConstants.PAGE_NAME_PARAMETER, pageName))); > assertTrue(getMethod.getStatusCode() == HttpStatus.SC_NOT_FOUND); > TestUtils.printHttpMethodInfo(getMethod); > } > > Modified: sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/PagesResourceTest.java > =================================================================== > --- sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/PagesResourceTest.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/PagesResourceTest.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -8,6 +8,8 @@ > import org.xwiki.rest.model.Space; > import org.xwiki.rest.model.Spaces; > import org.xwiki.rest.model.UriConstants; > +import org.xwiki.rest.model.Wiki; > +import org.xwiki.rest.model.Wikis; > > public class PagesResourceTest extends AbstractHttpTest > { > @@ -15,15 +17,26 @@ > { > TestUtils.banner("testRepresentation()"); > > - GetMethod getMethod = executeGet(getFullUri(Utils.formatUriTemplate(UriConstants.SPACES_URI_TEMPLATE))); > + GetMethod getMethod = executeGet(getFullUri(Utils.formatUriTemplate(UriConstants.WIKIS_URI_TEMPLATE))); > assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > TestUtils.printHttpMethodInfo(getMethod); > > + Wikis wikis = (Wikis) xstream.fromXML(getMethod.getResponseBodyAsString()); > + assertTrue(wikis.getWikiList().size() > 0); > + > + Wiki wiki = wikis.getWikiList().get(0); > + Link link = wiki.getFirstLinkByRelation(Relations.SPACES); > + assertNotNull(link); > + > + getMethod = executeGet(link.getHref()); > + assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + TestUtils.printHttpMethodInfo(getMethod); > + > Spaces spaces = (Spaces) xstream.fromXML(getMethod.getResponseBodyAsString()); > assertTrue(spaces.getSpaceList().size() > 0); > > Space space = spaces.getSpaceList().get(0); > - Link link = space.getFirstLinkByRelation(Relations.PAGES); > + link = space.getFirstLinkByRelation(Relations.PAGES); > assertNotNull(link); > > getMethod = executeGet(link.getHref()); > > Modified: sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/RootResourceTest.java > =================================================================== > --- sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/RootResourceTest.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/RootResourceTest.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -19,7 +19,7 @@ > > XWikiRoot xwikiRoot = (XWikiRoot) xstream.fromXML(getMethod.getResponseBodyAsString()); > > - Link link = xwikiRoot.getFirstLinkByRelation(Relations.SPACES); > + Link link = xwikiRoot.getFirstLinkByRelation(Relations.WIKIS); > assertNotNull(link); > > link = xwikiRoot.getFirstLinkByRelation(Relations.WADL); > > Modified: sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/SpacesResourceTest.java > =================================================================== > --- sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/SpacesResourceTest.java 2009-01-08 19:48:12 UTC (rev 15192) > +++ sandbox/xwiki-core-rest/src/test/java/org/xwiki/rest/SpacesResourceTest.java 2009-01-08 19:58:17 UTC (rev 15193) > @@ -2,8 +2,12 @@ > > import org.apache.commons.httpclient.HttpStatus; > import org.apache.commons.httpclient.methods.GetMethod; > +import org.xwiki.rest.model.Link; > +import org.xwiki.rest.model.Relations; > import org.xwiki.rest.model.Spaces; > import org.xwiki.rest.model.UriConstants; > +import org.xwiki.rest.model.Wiki; > +import org.xwiki.rest.model.Wikis; > > public class SpacesResourceTest extends AbstractHttpTest > { > @@ -11,10 +15,21 @@ > { > TestUtils.banner("testRepresentation()"); > > - GetMethod getMethod = executeGet(getFullUri(Utils.formatUriTemplate(UriConstants.SPACES_URI_TEMPLATE))); > + GetMethod getMethod = executeGet(getFullUri(Utils.formatUriTemplate(UriConstants.WIKIS_URI_TEMPLATE))); > assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > TestUtils.printHttpMethodInfo(getMethod); > > + Wikis wikis = (Wikis) xstream.fromXML(getMethod.getResponseBodyAsString()); > + assertTrue(wikis.getWikiList().size() > 0); > + > + Wiki wiki = wikis.getWikiList().get(0); > + Link link = wiki.getFirstLinkByRelation(Relations.SPACES); > + assertNotNull(link); > + > + getMethod = executeGet(link.getHref()); > + assertTrue(getMethod.getStatusCode() == HttpStatus.SC_OK); > + TestUtils.printHttpMethodInfo(getMethod); > + > Spaces spaces = (Spaces) xstream.fromXML(getMethod.getResponseBodyAsString()); > > assertTrue(spaces.getSpaceList().size() > 0); > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications > -- Thomas Mortagne

16 years, 8 months

1
0
0 0

[xwiki-devs] Switch off fullscreen in Wiki editor

by Juergen Lorenz Simon

Hi, I'm trying to embed the Wiki in a portal application. When editing a Wiki page, the Wiki takes over the browser window, which is not wanted. is there some option to turn off fullscreen editing in the normal Wiki editor? Or do I need to change the skin for that? Thanks, J.L.Simon

16 years, 8 months

2
3
0 0

[xwiki-devs] [VOTE] Add a public API to retrieve a XWikiPreference with a fallback parameter on xwiki.cfg and a final default value

by Jerome Velociter

The signature would be : public String getXWikiPreference(String prefname, String fallback_param, String default_value); The underlaying method already exists in the non API XWiki.java (was added for http://jira.xwiki.org/jira/browse/XWIKI-2569). What this method exactly do is : "Obtain a preference value for the wiki, looking up first in the XWiki.XWikiPreferences document, then fallbacking on a config parameter when the first lookup gives an empty string, then returning the default value if the config parameter returned itself an empty string." My +1: +1 Jerome. PS: I've created a JIRA for it: http://jira.xwiki.org/jira/browse/XWIKI-3086

16 years, 8 months

3
4
0 0

[xwiki-devs] Mysterious fields in XWiki Preferences

by stephane barbey

In the following screenshot (XE 1.6.1), I've had hard time to understand what those fields are dedicated to... (Fields "anonymous/registered" repeated three times in a row)Thanks for your help...

16 years, 8 months

3
3
0 0

Re: [xwiki-devs] XWikiException Unable to build interceptor chain

by flowerbud

manickaraj wrote: > > Hey guys, > > I am trying to run the XWiki 1.6 stable version in Tomcat > 6.0.18 on Windows2000 m/c. > For that I've done setup for MySQL DB. I included "mysqlconnector" jar in > place. But when I start the server it started well, but while hitting the > xwiki url "http://localhost:8080/appname" it gives the following error. > > message > > description The server encountered an internal error () that prevented it > from fulfilling this request. > > exception > > javax.servlet.ServletException: com.xpn.xwiki.XWikiException: Error number > 3 in 0: Could not initialize main XWiki context > Wrapped Exception: Unable to build interceptor chain > > org.apache.struts.action.RequestProcessor.processException(RequestProcessor.java:535) > > org.apache.struts.action.RequestProcessor.processActionPerform(RequestProcessor.java:433) > > org.apache.struts.action.RequestProcessor.process(RequestProcessor.java:236) > org.apache.struts.action.ActionServlet.process(ActionServlet.java:1196) > org.apache.struts.action.ActionServlet.doGet(ActionServlet.java:414) > javax.servlet.http.HttpServlet.service(HttpServlet.java:617) > javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > > com.xpn.xwiki.wysiwyg.server.filter.ConversionFilter.doFilter(ConversionFilter.java:94) > > com.xpn.xwiki.web.SavedRequestRestorerFilter.doFilter(SavedRequestRestorerFilter.java:287) > > com.xpn.xwiki.web.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:112) > > root cause > > com.xpn.xwiki.XWikiException: Error number 3 in 0: Could not initialize > main XWiki context > Wrapped Exception: Unable to build interceptor chain > com.xpn.xwiki.XWiki.getMainXWiki(XWiki.java:325) > com.xpn.xwiki.XWiki.getXWiki(XWiki.java:386) > com.xpn.xwiki.web.XWikiAction.execute(XWikiAction.java:135) > com.xpn.xwiki.web.XWikiAction.execute(XWikiAction.java:115) > > org.apache.struts.action.RequestProcessor.processActionPerform(RequestProcessor.java:431) > > org.apache.struts.action.RequestProcessor.process(RequestProcessor.java:236) > org.apache.struts.action.ActionServlet.process(ActionServlet.java:1196) > org.apache.struts.action.ActionServlet.doGet(ActionServlet.java:414) > javax.servlet.http.HttpServlet.service(HttpServlet.java:617) > javax.servlet.http.HttpServlet.service(HttpServlet.java:717) > > com.xpn.xwiki.wysiwyg.server.filter.ConversionFilter.doFilter(ConversionFilter.java:94) > > com.xpn.xwiki.web.SavedRequestRestorerFilter.doFilter(SavedRequestRestorerFilter.java:287) > > com.xpn.xwiki.web.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:112) > > note The full stack trace of the root cause is available in the Apache > Tomcat/6.0.18 logs. > > > Please Note : I checked the same setup for XWiki1.5.war. It works. > > I am using windows 2000 for XWiki 1.6 > > It seems really odd to me.. and stuck with this.. Please help anybody > > > Thanks in advance > Hi! I'm sorry this is not a reply but a case of similar nature I am getting a similar exception :Unable to build interceptor chain but with jboss I just installed XWiki enterprise on my system Thats all i did When some of my friends seem to get the Homepage via MyWiki shortcut, i get an exception Here are the logs: org.jboss.cache.config.ConfigurationException: Unable to build interceptor chain at org.jboss.cache.factories.InterceptorChainFactory.construct(Intercept orChainFactory.java:136) at org.jboss.cache.factories.ComponentRegistry.getOrCreateComponent(Comp onentRegistry.java:284) at org.jboss.cache.factories.ComponentRegistry.invokeInjectionMethod(Com ponentRegistry.java:245) at org.jboss.cache.factories.ComponentRegistry$Component.injectDependenc ies(ComponentRegistry.java:911) at org.jboss.cache.factories.ComponentRegistry.registerComponent(Compone ntRegistry.java:221) at org.jboss.cache.DefaultCacheFactory.bootstrap(DefaultCacheFactory.jav a:129) at org.jboss.cache.DefaultCacheFactory.createAndWire(DefaultCacheFactory .java:115) at org.jboss.cache.DefaultCacheFactory.createCache(DefaultCacheFactory.j ava:94) at org.jboss.cache.DefaultCacheFactory.createCache(DefaultCacheFactory.j ava:79) at org.xwiki.cache.jbosscache.internal.JBossCacheCache.initialize(JBossC acheCache.java:101) at org.xwiki.cache.jbosscache.internal.JBossCacheCacheFactory.newCache(J BossCacheCacheFactory.java:78) at com.xpn.xwiki.store.XWikiCacheStore.initCache(XWikiCacheStore.java:99 ) at com.xpn.xwiki.store.XWikiCacheStore.initCache(XWikiCacheStore.java:84 ) at com.xpn.xwiki.store.XWikiCacheStore.<init>(XWikiCacheStore.java:64) at com.xpn.xwiki.XWiki.initXWiki(XWiki.java:679) at com.xpn.xwiki.XWiki.<init>(XWiki.java:655) at com.xpn.xwiki.XWiki.getMainXWiki(XWiki.java:315) at com.xpn.xwiki.XWiki.getXWiki(XWiki.java:386) at com.xpn.xwiki.web.XWikiAction.execute(XWikiAction.java:135) at com.xpn.xwiki.web.XWikiAction.execute(XWikiAction.java:115) at org.apache.struts.action.RequestProcessor.processActionPerform(Reques tProcessor.java:431) at org.apache.struts.action.RequestProcessor.process(RequestProcessor.ja va:236) at org.apache.struts.action.ActionServlet.process(ActionServlet.java:119 6) at org.apache.struts.action.ActionServlet.doGet(ActionServlet.java:414) at javax.servlet.http.HttpServlet.service(HttpServlet.java:596) at javax.servlet.http.HttpServlet.service(HttpServlet.java:689) at org.mortbay.jetty.servlet.ServletHolder.handle(ServletHolder.java:428 ) at org.mortbay.jetty.servlet.WebApplicationHandler$CachedChain.doFilter( WebApplicationHandler.java:830) at com.xpn.xwiki.wysiwyg.server.filter.ConversionFilter.doFilter(Convers ionFilter.java:94) at org.mortbay.jetty.servlet.WebApplicationHandler$CachedChain.doFilter( WebApplicationHandler.java:821) at com.xpn.xwiki.web.SavedRequestRestorerFilter.doFilter(SavedRequestRes torerFilter.java:287) at org.mortbay.jetty.servlet.WebApplicationHandler$CachedChain.doFilter( WebApplicationHandler.java:821) at com.xpn.xwiki.web.SetCharacterEncodingFilter.doFilter(SetCharacterEnc odingFilter.java:112) at org.mortbay.jetty.servlet.WebApplicationHandler$CachedChain.doFilter( WebApplicationHandler.java:821) at org.mortbay.jetty.servlet.WebApplicationHandler.dispatch(WebApplicati onHandler.java:471) at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:5 68) at org.mortbay.http.HttpContext.handle(HttpContext.java:1565) at org.mortbay.jetty.servlet.WebApplicationContext.handle(WebApplication Context.java:633) at org.mortbay.http.HttpContext.handle(HttpContext.java:1517) at org.mortbay.http.HttpServer.service(HttpServer.java:954) at org.mortbay.http.HttpConnection.service(HttpConnection.java:816) at org.mortbay.http.HttpConnection.handleNext(HttpConnection.java:983) at org.mortbay.http.HttpConnection.handle(HttpConnection.java:833) at org.mortbay.http.SocketListener.handleConnection(SocketListener.java: 244) at org.mortbay.util.ThreadedServer.handle(ThreadedServer.java:357) at org.mortbay.util.ThreadPool$PoolThread.run(ThreadPool.java:534) Caused by: java.lang.TypeNotPresentException: Type net.jcip.annotations.ThreadSa fe not present at sun.reflect.generics.factory.CoreReflectionFactory.makeNamedType(Core ReflectionFactory.java:98) at sun.reflect.generics.visitor.Reifier.visitClassTypeSignature(Reifier. java:107) at sun.reflect.generics.tree.ClassTypeSignature.accept(ClassTypeSignatur e.java:31) at sun.reflect.annotation.AnnotationParser.parseSig(AnnotationParser.jav a:351) at sun.reflect.annotation.AnnotationParser.parseAnnotation(AnnotationPar ser.java:175) at sun.reflect.annotation.AnnotationParser.parseAnnotations2(AnnotationP arser.java:69) at sun.reflect.annotation.AnnotationParser.parseAnnotations(AnnotationPa rser.java:52) at java.lang.Class.initAnnotationsIfNecessary(Class.java:2998) at java.lang.Class.getAnnotation(Class.java:2958) at java.lang.Class.isAnnotationPresent(Class.java:2970) at org.jboss.cache.factories.ComponentRegistry.registerComponent(Compone ntRegistry.java:218) at org.jboss.cache.factories.ComponentRegistry.getOrCreateComponent(Comp onentRegistry.java:291) at org.jboss.cache.factories.ComponentRegistry.invokeInjectionMethod(Com ponentRegistry.java:245) at org.jboss.cache.factories.ComponentRegistry$Component.injectDependenc ies(ComponentRegistry.java:911) at org.jboss.cache.factories.ComponentRegistry.registerComponent(Compone ntRegistry.java:221) at org.jboss.cache.factories.ComponentRegistry.getOrCreateComponent(Comp onentRegistry.java:291) at org.jboss.cache.factories.ComponentRegistry.invokeInjectionMethod(Com ponentRegistry.java:245) at org.jboss.cache.factories.ComponentRegistry$Component.injectDependenc ies(ComponentRegistry.java:911) at org.jboss.cache.factories.ComponentRegistry.registerComponent(Compone ntRegistry.java:221) at org.jboss.cache.factories.ComponentRegistry.getOrCreateComponent(Comp onentRegistry.java:291) at org.jboss.cache.factories.ComponentRegistry.invokeInjectionMethod(Com ponentRegistry.java:245) at org.jboss.cache.factories.ComponentRegistry$Component.injectDependenc ies(ComponentRegistry.java:911) at org.jboss.cache.factories.ComponentRegistry.registerComponent(Compone ntRegistry.java:221) at org.jboss.cache.factories.ComponentRegistry.getOrCreateComponent(Comp onentRegistry.java:291) at org.jboss.cache.factories.ComponentRegistry.invokeInjectionMethod(Com ponentRegistry.java:245) at org.jboss.cache.factories.ComponentRegistry$Component.injectDependenc ies(ComponentRegistry.java:911) at org.jboss.cache.factories.ComponentRegistry.registerComponent(Compone ntRegistry.java:221) at org.jboss.cache.factories.ComponentRegistry.getOrCreateComponent(Comp onentRegistry.java:291) at org.jboss.cache.factories.ComponentRegistry.invokeInjectionMethod(Com ponentRegistry.java:245) at org.jboss.cache.factories.ComponentRegistry$Component.injectDependenc ies(ComponentRegistry.java:911) at org.jboss.cache.factories.ComponentRegistry.registerComponent(Compone ntRegistry.java:221) at org.jboss.cache.factories.ComponentRegistry.getOrCreateComponent(Comp onentRegistry.java:291) at org.jboss.cache.factories.ComponentRegistry.invokeInjectionMethod(Com ponentRegistry.java:245) at org.jboss.cache.factories.ComponentRegistry$Component.injectDependenc ies(ComponentRegistry.java:911) at org.jboss.cache.factories.ComponentRegistry.registerComponent(Compone ntRegistry.java:221) at org.jboss.cache.factories.InterceptorChainFactory.createInterceptor(I nterceptorChainFactory.java:41) at org.jboss.cache.factories.InterceptorChainFactory.buildInterceptorCha in(InterceptorChainFactory.java:56) at org.jboss.cache.factories.InterceptorChainFactory.construct(Intercept orChainFactory.java:132) ... 45 more Caused by: java.lang.ClassNotFoundException: net.jcip.annotations.ThreadSafe at java.net.URLClassLoader$1.run(URLClassLoader.java:200) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:188) at java.lang.ClassLoader.loadClass(ClassLoader.java:306) at java.lang.ClassLoader.loadClass(ClassLoader.java:251) at org.mortbay.http.ContextLoader.loadClass(ContextLoader.java:239) at org.mortbay.http.ContextLoader.loadClass(ContextLoader.java:193) at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:319) at java.lang.Class.forName0(Native Method) at java.lang.Class.forName(Class.java:242) at sun.reflect.generics.factory.CoreReflectionFactory.makeNamedType(Core ReflectionFactory.java:95) ... 82 more Can someone please help me on this? Thanks -- View this message in context: http://n2.nabble.com/XWikiException-Unable-to-build-interceptor-chain-tp131… Sent from the XWiki- Dev mailing list archive at Nabble.com.

16 years, 8 months

4
8
0 0

[xwiki-devs] [VOTE] Move Office Importer projects to trunk

by Asiri Rathnayake

Devs, We plan to include office importer functionality for 1.8M1 release and for that we need to move the respective projects to trunk. I propose the following locations for the projects: 1. xwiki-core-officeimporter This is the core officeimporter component and it's currently in /sandbox/xwiki-officeimporter/ proposed location : /platform/core/trunk/xwiki-officeimporter 2. xwiki-application-officeimporter The front-end application for officeimporter, currently under /sandbox/xwiki-application-officeimporter/ proposed location : /platform/xwiki-applications/trunk/officeimporter 3. xwiki-enterprise-tests-officeimporter Functional tests for officeimporter, currently under /sandbox/officeimporter-tests/ proposed location : /enterprise/trunk/distribution-test/officeimporter-tests/ Here's my +1 for all of above. Thanks. - Asiri

16 years, 8 months

6
6
0 0

[xwiki-devs] Problem obtaining external URL from XWikiDocument in servlet deployment

by Juergen Lorenz Simon

Hi, I'm writing an indexer plugin for XWiki and recently found a problem when trying to obtain the external document url: java.lang.NullPointerException at com.xpn.xwiki.XWiki.getServletPath(XWiki.java:4317) at com .xpn .xwiki .web.XWikiServletURLFactory.addServletPath(XWikiServletURLFactory.java: 208) at com .xpn .xwiki .web.XWikiServletURLFactory.createURL(XWikiServletURLFactory.java:178) at com .xpn .xwiki .web .XWikiServletURLFactory.createExternalURL(XWikiServletURLFactory.java: 273) at com.xpn.xwiki.doc.XWikiDocument.getExternalURL(XWikiDocument.java: 925) at com .kontrast .vodafone .portal .xwiki.plugins.indexer.IndexUpdater.runMainLoop(IndexUpdater.java:180) at com .kontrast .vodafone .portal.xwiki.plugins.indexer.IndexUpdater.run(IndexUpdater.java:116) I updated to XWiki version 1.7-SNAPSHOT recently. Before that I didn't experience this. Can anyone shed some light on this? Thanks, J.L.Simon

16 years, 8 months

3
13
0 0

[xwiki-devs] Fwd: [ANN] Maven Assembly Plugin 2.2-beta-3 Released

by Vincent Massol

To test... and fix hacks we had to introduce to see if they can now be removed. -Vincent Begin forwarded message: > From: John Casey <jdcasey(a)apache.org> > Date: January 5, 2009 9:25:04 PM CEST > To: announce(a)maven.apache.org, Maven Users List <users(a)maven.apache.org > > > Subject: [ANN] Maven Assembly Plugin 2.2-beta-3 Released > Reply-To: "Maven Users List" <users(a)maven.apache.org> > > The Maven team is pleased to announce the release of the Maven > Assembly Plugin, version 2.2-beta-3 > > This plugin is used to create custom archives using the build > output, dependencies, and other files owned by a Maven project. You > can find more information, including instructions and examples, at: > > http://maven.apache.org/plugins/maven-assembly-plugin/ > > You should specify the version in your project's plugin configuration: > > <plugin> > <groupId>org.apache.maven.plugins</groupId> > <artifactId>maven-assembly-plugin</artifactId> > <version>2.2-beta-3</version> > </plugin> > > > Release Notes - Maven 2.x Assembly Plugin - Version 2.2-beta-3 > > ** Sub-task > * [MASSEMBLY-361] - Fix MASSEMBLY-285 default behaviour to be the > correct behaviour > > ** Bug > * [MASSEMBLY-75] - Unpacked TAR dependencies do not preserve file > mode nor uid/gid > * [MASSEMBLY-165] - Test error on Windows XP + Cygwin > * [MASSEMBLY-190] - Problem with dependency conflict resolution > on multi-module project > * [MASSEMBLY-196] - use of repository assembly is no longer working > * [MASSEMBLY-201] - classifier not included in name of dependency > set > * [MASSEMBLY-211] - assembly plugin and jar plugin disagree about > whether to use uniqueVersion snapshot names > * [MASSEMBLY-213] - jar-with-dependencies and signed jars issue > again > * [MASSEMBLY-217] - <outputFileNameMapping> needs to report > collision. > * [MASSEMBLY-230] - <fileset> not filtering resources, but > <files> does filter > * [MASSEMBLY-236] - assembly:assembly resolves excluded artifacts > * [MASSEMBLY-237] - lineEnding ignored in a child project > * [MASSEMBLY-238] - Assembly plugin removes file permissions > * [MASSEMBLY-241] - Multiple includes in dependencySet > * [MASSEMBLY-242] - transitive dependencies do not get included > * [MASSEMBLY-245] - Manifest Section configuration does not work > properly > * [MASSEMBLY-251] - NullPointer wehn using scope system in a > dependencySet > * [MASSEMBLY-256] - Regression: pom properties are no longer > expanded in descriptor. > * [MASSEMBLY-264] - Filtering in Assembly Generates Blank Files > in the Archive > * [MASSEMBLY-270] - Assembly does not resolved managed > dependencies correctly > * [MASSEMBLY-280] - Regression: Dependency resolution for > dependencySets does broken things > * [MASSEMBLY-284] - regression: line ending setting is not honoured > * [MASSEMBLY-285] - regression: duplicate files added to the > assembly > * [MASSEMBLY-287] - Unable to pass -DskipAssembly=true through > the command line to skip the assembly plugin. > * [MASSEMBLY-291] - attach the resulting assembly not working as > expected > * [MASSEMBLY-293] - <fileSets> not filtered in multimodule build, > but <files> are > * [MASSEMBLY-294] - Regression - dependency is skipped? > * [MASSEMBLY-297] - Assembly broke on GNU/Linux - > NullPointerException > * [MASSEMBLY-298] - Includes/Excludes within <unpackOptions> are > ignored > * [MASSEMBLY-300] - Regression: outputFileNameMapping variable > resolution > * [MASSEMBLY-301] - assembly:attach wrongly renames/overwrites > assemblies to the primary artifact > * [MASSEMBLY-302] - Maven assembly plugin should use plexus- > archiver version > * [MASSEMBLY-306] - Dependency resolution fails with an NPE for a > provided dependency with a fixed version > * [MASSEMBLY-308] - Syntax Problem in Example Doco > * [MASSEMBLY-309] - outputFileNameMapping fails and includes > parent's name > * [MASSEMBLY-312] - outputFileNameMapping not respected when the > unpack=true > * [MASSEMBLY-314] - Multiple inclusion of dependencies in binary > assembly > * [MASSEMBLY-318] - Example to attach assembly to package incorrect > * [MASSEMBLY-319] - Cannot bind to lifecycle with multiple modules > * [MASSEMBLY-322] - Filtering in filesets in multimodule build > does not work > * [MASSEMBLY-328] - When assembly is attached to pom with > appendAssemblyId disabled, it won't be installed or deployed > * [MASSEMBLY-331] - assembly descriptor doesn't seem to property > substitute properties > * [MASSEMBLY-340] - Filtering doesn't work for multimodule > assembly builds > * [MASSEMBLY-341] - Fat JAR assemblies may result in JARs with > duplicate files > * [MASSEMBLY-342] - NPE when filtering fileSet > * [MASSEMBLY-345] - a"ppxml attribute is required" error when > making ears with the assembly plugin > * [MASSEMBLY-351] - ${project.xxxx} is not interpolated in the > descriptor > * [MASSEMBLY-354] - useTransitiveFiltering does NOT include > artifacts whose dependency trail matches one of the include patterns > when it has wildcards > * [MASSEMBLY-355] - I get duplicate files in my "-jar-with- > dependencies.jar" > * [MASSEMBLY-375] - Leading slash in Windows when including one > file in archive. > > ** Improvement > * [MASSEMBLY-76] - [assembly plugin] improve or clarify > inheriting/reusing descriptors > * [MASSEMBLY-159] - Add FAQ about building multi-module > assemblies from the top using Maven 2.0 > * [MASSEMBLY-216] - archive element in assembly descriptor > * [MASSEMBLY-239] - In format dir, be able to create a dir > without the suffix .dir > * [MASSEMBLY-366] - DependencySet info message should be changed > to debug level > > > > Enjoy, > > -The Maven team

16 years, 8 months

1
0
0 0

Re: [xwiki-devs] [xwiki-notifications] r15121 - sandbox/xwiki-officeimporter/src/test/java/org/xwiki/officeimporter/internal/cleaner

by Vincent Massol

Asiri, you need to use JIRA issue references in your commits. You already have one open for the officeimporter work so why don't you use it? Thanks -Vincent On Jan 7, 2009, at 8:25 AM, asiri (SVN) wrote: > Author: asiri > Date: 2009-01-07 08:25:13 +0100 (Wed, 07 Jan 2009) > New Revision: 15121 > > Modified: > sandbox/xwiki-officeimporter/src/test/java/org/xwiki/ > officeimporter/internal/cleaner/OpenOfficeHTMLCleanerTest.java > Log: > * Added one more test case. > > Modified: sandbox/xwiki-officeimporter/src/test/java/org/xwiki/ > officeimporter/internal/cleaner/OpenOfficeHTMLCleanerTest.java > =================================================================== > --- sandbox/xwiki-officeimporter/src/test/java/org/xwiki/ > officeimporter/internal/cleaner/OpenOfficeHTMLCleanerTest.java > 2009-01-07 07:07:10 UTC (rev 15120) > +++ sandbox/xwiki-officeimporter/src/test/java/org/xwiki/ > officeimporter/internal/cleaner/OpenOfficeHTMLCleanerTest.java > 2009-01-07 07:25:13 UTC (rev 15121) > @@ -227,4 +227,32 @@ > assertEquals(Node.COMMENT_NODE, stopComment.getNodeType()); > assertTrue(stopComment.getNodeValue().equals("stopimage")); > } > + > + /** > + * Test handling of image links. > + */ > + public void testImageLinks() { > + String html = header + "<a href=\"http://www.xwiki.org > \"><img src=\"foo.png\"/></a>" + footer; > + Document doc = cleaner.clean(new > StringReader(html),Collections.singletonMap("targetDocument", > "Import.Test")); > + NodeList nodes = doc.getElementsByTagName("img"); > + assertEquals(1, nodes.getLength()); > + Element image = (Element)nodes.item(0); > + Node startImageComment = image.getPreviousSibling(); > + Node stopImageComment = image.getNextSibling(); > + assertEquals(Node.COMMENT_NODE, > startImageComment.getNodeType()); > + > assertTrue > (startImageComment.getNodeValue().equals("startimage:foo.png")); > + assertEquals("/bridge/foo.png", image.getAttribute("src")); > + assertEquals(Node.COMMENT_NODE, > stopImageComment.getNodeType()); > + > assertTrue(stopImageComment.getNodeValue().equals("stopimage")); > + Element link = (Element) image.getParentNode(); > + assertEquals("a", link.getNodeName()); > + assertEquals("http://www.xwiki.org", > link.getAttribute("href")); > + Element span = (Element) link.getParentNode(); > + assertEquals("span", span.getNodeName()); > + assertEquals("wikiexternallink", span.getAttribute("class")); > + Node startLinkComment = span.getPreviousSibling(); > + > assertTrue > (startLinkComment.getNodeValue().startsWith("startwikilink")); > + Node stopLinkComment = span.getNextSibling(); > + > assertTrue(stopLinkComment.getNodeValue().startsWith("stopwikilink")); > + } > }

16 years, 8 months

2
1
0 0

Re: [xwiki-devs] [xwiki-notifications] r15118 - platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc

by Vincent Massol

Would be better next time to have a jira issue associated with commits like this one, especially since you're changing something visible to the user. Didn't you open a jira issue already when you made those changes to DefaultDocumentAccessBridge earlier on? BTW shouldn't this be i18ned? Are we doing that for other save messages? Thanks -Vincent On Jan 7, 2009, at 7:28 AM, asiri (SVN) wrote: > Author: asiri > Date: 2009-01-07 07:28:11 +0100 (Wed, 07 Jan 2009) > New Revision: 15118 > > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/ > DefaultDocumentAccessBridge.java > Log: > Addressing review comments. > > * Improced javadoc comemnts. > * Added an editComments when changing document syntaxId > * Prevented re-saving the XWikiDocument after calling > doc.saveAttachmentContent() > > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ > doc/DefaultDocumentAccessBridge.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/ > DefaultDocumentAccessBridge.java 2009-01-06 23:15:02 UTC (rev 15117) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/ > DefaultDocumentAccessBridge.java 2009-01-07 06:28:11 UTC (rev 15118) > @@ -116,8 +116,10 @@ > { > XWikiContext xcontext = getContext(); > XWikiDocument doc = > xcontext.getWiki().getDocument(documentName, xcontext); > + String oldSyntaxId = doc.getSyntaxId(); > doc.setSyntaxId(syntaxId); > - xcontext.getWiki().saveDocument(doc, xcontext); > + xcontext.getWiki().saveDocument(doc, > + String.format("Changed document syntax from [%s] to > [%s].", oldSyntaxId, syntaxId), xcontext); > } > > /** > @@ -241,8 +243,6 @@ > attachment.setAuthor(xcontext.getUser()); > attachment.setDoc(doc); > doc.saveAttachmentContent(attachment, xcontext); > - xcontext.getWiki().saveDocument(doc, > - String.format("Added attachment [%s].", > AttachmentName), xcontext); > } > > /** > @@ -326,6 +326,8 @@ > } > > /** > + * Utility method for checking access rights of the current > user on a target document. > + * > * @param documentName The name of the document. > * @param right Access right requested. > * @return True if the current user has the given access right, > false otherwise.

16 years, 8 months

2
1
0 0

[xwiki-devs] XMLRPC tests in distribution-test

by Vincent Massol

Hi there, I've just noticed that we have the following in distribution-test/ pom.xml:  <property> <name>pathToXWikiXar</name> <value>com/xpn/xwiki/products/xwiki-enterprise-wiki/$ {pom.version}/xwiki-enterprise-wiki-${pom.version}.xar</value> </property> I don't think this is in the right place. It should be in the the XMLRPC test's pom.xml file. Fabio could you look into this? Thanks -Vincent

16 years, 8 months

1
1
0 0

Re: [xwiki-devs] [xwiki-notifications] r14969 - in platform/core/trunk: xwiki-bridge/src/main/java/org/xwiki/bridge xwiki-core/src/main/java/com/xpn/xwiki/doc xwiki-rendering/src/test/java/org/xwiki/rendering/internal

by Sergiu Dumitriu

asiri (SVN) wrote: > Author: asiri > Date: 2008-12-30 16:29:22 +0100 (Tue, 30 Dec 2008) > New Revision: 14969 > > Modified: > platform/core/trunk/xwiki-bridge/src/main/java/org/xwiki/bridge/DocumentAccessBridge.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/DefaultDocumentAccessBridge.java > platform/core/trunk/xwiki-rendering/src/test/java/org/xwiki/rendering/internal/MockDocumentAccessBridge.java > Log: > Added several proposed methods to DocumentAccessBridge. > + public void setDocumentSyntaxId(String documentName, String syntaxId) throws Exception Missing edit comment. > + xcontext.getWiki().saveDocument(doc, xcontext); > + } > + public void setAttachmentContent(String documentName, String AttachmentName, > + byte[] attachmentData) throws Exception I think you're saving the document twice, since the first line also saves the document, so the manual save is not needed. > + doc.saveAttachmentContent(attachment, xcontext); > + xcontext.getWiki().saveDocument(doc, > + String.format("Added attachment [%s].", AttachmentName), xcontext); > + } This should have a short description, too > + /** > + * @param documentName The name of the document. > + * @param right Access right requested. > + * @return True if the current user has the given access right, false otherwise. > + */ > + private boolean hasRight(String documentName, String right) > Modified: platform/core/trunk/xwiki-rendering/src/test/java/org/xwiki/rendering/internal/MockDocumentAccessBridge.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/src/test/java/org/xwiki/rendering/internal/MockDocumentAccessBridge.java 2008-12-30 13:43:52 UTC (rev 14968) > +++ platform/core/trunk/xwiki-rendering/src/test/java/org/xwiki/rendering/internal/MockDocumentAccessBridge.java 2008-12-30 15:29:22 UTC (rev 14969) > @@ -116,14 +116,46 @@ > { > throw new RuntimeException("Not implemented"); > } > + > + public void setAttachmentContent(String documentName, String AttachmentName, > + byte[] attachmentData) throws Exception > + { > + throw new RuntimeException("Not implemented"); > + } > > + public void setDocumentContent(String documentName, String content, String editComment, > + boolean isMinorEdit) throws Exception > + { > + throw new RuntimeException("Not implemented"); > + } > + > + public void setDocumentSyntaxId(String documentName, String syntaxId) throws Exception > + { > + throw new RuntimeException("Not implemented"); > + } > + > public boolean isDocumentViewable(String documentName) > { > return true; > } > + > + public boolean isDocumentEditable(String documentName) > + { > + return true; > + } > > public boolean hasProgrammingRights() > { > return true; > } > + > + public String getCurrentUser() > + { > + throw new RuntimeException("Not implemented"); > + } > + > + public String getDefaultEncoding() > + { > + throw new RuntimeException("Not implemented"); > + } > } Although this is a mock used during test, you should still add javadoc for them: /** * {@inheritDoc} * * @see DocumentAccessBridge#getDefaultEncoding() */ I know that the other methods were not documented, but whenever you see something wrong, you should fix it, and not see it as an excuse for doing more bad things. -- Sergiu Dumitriu http://purl.org/net/sergiu/

16 years, 8 months

2
1
0 0

Re: [xwiki-devs] [xwiki-notifications] r15096 - in sandbox/xwiki-core-rest/src/main: java/components/org/xwiki/rest resources/META-INF/plexus

by Vincent Massol

Hi Fabio, I can't see the reply you got on the list. Also I think you've introduced an important bug: whenever plexus instantiates a per-lookup component a new instance is created but you have to release it explicitely as otherwise it won't be released. Which means you'll get an out of memory exception very quickly. per-look must be avoided as much as possible (we don't have any in the other components of xwiki because of the release problem). Also I don't understand why something like XmlTextSpacesRepresenter should not be a singleton. Thanks -Vincent On Jan 6, 2009, at 4:43 PM, fmancinelli (SVN) wrote: > Author: fmancinelli > Date: 2009-01-06 16:43:28 +0100 (Tue, 06 Jan 2009) > New Revision: 15096 > > Added: > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiRouter.java > Removed: > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiResourceFinder.java > Modified: > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiResource.java > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiRestApplication.java > sandbox/xwiki-core-rest/src/main/resources/META-INF/plexus/ > components.xml > Log: > Refactoring due to the reply on the Restlet forum concerning object > lifecycle (http://restlet.tigris.org/ds/viewMessage.do?dsForumId=4447&dsMessageId=1007… > ) > > Now resources and presenters are instantiated at every lookup. > > Code simplification. > > > Modified: sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/ > rest/XWikiResource.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiResource.java 2009-01-06 14:29:26 UTC (rev 15095) > +++ sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiResource.java 2009-01-06 15:43:28 UTC (rev 15096) > @@ -18,25 +18,20 @@ > */ > public class XWikiResource extends WadlResource > { > - /* This is injected by the component manager and containsall > the registered representers */ > + /* This is injected by the component manager and contains all > the registered representers */ > private Map<String, XWikiResourceRepresenter> > descriptorToRepresenterMap; > > /* This map contains only the the representers for the current > resource, indexed by media type */ > private Map<MediaType, XWikiResourceRepresenter> > mediaTypeToRepresenterMap; > > + /* This is configured in components.xml */ > + private String uriPattern; > + > @Override > public void init(Context context, Request request, Response > response) > { > super.init(context, request, response); > > - /* > - * If the mediaTypeToRepresenterMap is already initialized > then return because we already have all the > - * representers registered. > - */ > - if (mediaTypeToRepresenterMap != null) { > - return; > - } > - > mediaTypeToRepresenterMap = new HashMap<MediaType, > XWikiResourceRepresenter>(); > getVariants().clear(); > for (String hint : descriptorToRepresenterMap.keySet()) { > @@ -45,7 +40,7 @@ > if (hint.startsWith(this.getClass().getName())) { > getLogger().log( > Level.INFO, > - String.format("Registering %s representer for > resource %s", representer.getMediaType(), this > + String.format("Registering '%s' representer for > resource %s", representer.getMediaType(), this > .getClass().getName())); > getVariants().add(new > Variant(representer.getMediaType())); > > mediaTypeToRepresenterMap.put(representer.getMediaType(), > representer); > @@ -60,9 +55,21 @@ > if (representer != null) { > return representer; > } else { > - /* Flow control should never reach this. */ > + /* Flow control should never reach this point. */ > + getLogger() > + .log( > + Level.WARNING, > + String > + .format( > + "'%s' representer for resource %s > doesn't exist. This should never happen. Returning a null > representer.", > + variant.getMediaType(), > this.getClass().getName())); > return new NullRepresenter(); > } > } > > + public String getUriPattern() > + { > + return uriPattern; > + } > + > } > > Deleted: sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/ > rest/XWikiResourceFinder.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiResourceFinder.java 2009-01-06 14:29:26 UTC (rev 15095) > +++ sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiResourceFinder.java 2009-01-06 15:43:28 UTC (rev 15096) > @@ -1,32 +0,0 @@ > -package components.org.xwiki.rest; > - > -import org.restlet.Context; > -import org.restlet.Finder; > -import org.restlet.Handler; > -import org.restlet.data.Request; > -import org.restlet.data.Response; > - > -/** > - * @version $Id$ > - */ > -public class XWikiResourceFinder extends Finder > -{ > - private Context context; > - > - private XWikiResource resource; > - > - public XWikiResourceFinder(Context context, XWikiResource > resource) > - { > - this.context = context; > - this.resource = resource; > - } > - > - @Override > - protected Handler findTarget(Request request, Response response) > - { > - resource.init(context, request, response); > - > - return resource; > - } > - > -} > > Modified: sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/ > rest/XWikiRestApplication.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiRestApplication.java 2009-01-06 14:29:26 UTC (rev 15095) > +++ sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiRestApplication.java 2009-01-06 15:43:28 UTC (rev 15096) > @@ -20,7 +20,7 @@ > /* Injected by the component manager */ > private ComponentManager componentManager; > > - private Map<String, XWikiResource> uriPatternToResourceMap; > + private Map<String, XWikiResource> classNameToResourceMap; > > public XWikiRestApplication() > { > @@ -48,18 +48,18 @@ > getTunnelService().setEnabled(true); > getTunnelService().setExtensionsTunnel(true); > > - Router router = new Router(getContext()); > + Router router = new XWikiRouter(componentManager, > getContext()); > > /* Register all the resource components */ > - for (String uriPattern : uriPatternToResourceMap.keySet()) { > - XWikiResource resource = > uriPatternToResourceMap.get(uriPattern); > + for (String className : classNameToResourceMap.keySet()) { > + XWikiResource resource = > classNameToResourceMap.get(className); > > getLogger().log( > Level.INFO, > - String > - .format("Registering resource %s for URI > pattern '%s'", resource.getClass().getName(), uriPattern)); > + String.format("Attaching resource %s to URI pattern > '%s'", resource.getClass().getName(), resource > + .getUriPattern())); > > - router.attach(uriPattern, new > XWikiResourceFinder(getContext(), resource)); > + router.attach(resource.getUriPattern(), > resource.getClass()); > } > > return router; > @@ -69,4 +69,5 @@ > { > this.componentManager = componentManager; > } > + > } > > Added: sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/ > rest/XWikiRouter.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiRouter.java (rev 0) > +++ sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiRouter.java 2009-01-06 15:43:28 UTC (rev 15096) > @@ -0,0 +1,56 @@ > +package components.org.xwiki.rest; > + > +import org.restlet.Context; > +import org.restlet.Finder; > +import org.restlet.Handler; > +import org.restlet.Router; > +import org.restlet.data.Request; > +import org.restlet.data.Response; > +import org.restlet.resource.Resource; > +import org.xwiki.component.manager.ComponentLookupException; > +import org.xwiki.component.manager.ComponentManager; > + > +public class XWikiRouter extends Router > +{ > + private ComponentManager componentManager; > + > + private static class XWikiFinder extends Finder > + { > + private ComponentManager componentManager; > + > + public XWikiFinder(ComponentManager componentManager, > Context context, Class< ? extends Handler> targetClass) > + { > + super(context, targetClass); > + this.componentManager = componentManager; > + } > + > + @Override > + public Handler createTarget(Class< ? extends Handler> > targetClass, Request request, Response response) > + { > + Handler handler = null; > + > + try { > + handler = (Handler) > componentManager.lookup(XWikiResource.class.getName(), > targetClass.getName()); > + handler.init(getContext(), request, response); > + } catch (ComponentLookupException e) { > + e.printStackTrace(); > + } > + > + return handler; > + } > + > + } > + > + public XWikiRouter(ComponentManager componentManager, Context > context) > + { > + super(context); > + this.componentManager = componentManager; > + } > + > + @Override > + protected Finder createFinder(Class< ? extends Resource> > targetClass) > + { > + return new XWikiFinder(componentManager, getContext(), > targetClass); > + } > + > +} > > Modified: sandbox/xwiki-core-rest/src/main/resources/META-INF/plexus/ > components.xml > =================================================================== > --- sandbox/xwiki-core-rest/src/main/resources/META-INF/plexus/ > components.xml 2009-01-06 14:29:26 UTC (rev 15095) > +++ sandbox/xwiki-core-rest/src/main/resources/META-INF/plexus/ > components.xml 2009-01-06 15:43:28 UTC (rev 15096) > @@ -12,19 +12,23 @@ > <requirement> > <role>components.org.xwiki.rest.XWikiResource > </role> > - <field-name>uriPatternToResourceMap</field-name> > + <field-name>classNameToResourceMap > + </field-name> > </requirement> > </requirements> > </component> > + > <component> > <role>components.org.xwiki.rest.XWikiResource > </role> >  > - <role-hint>/spaces</role-hint> > - <instantiation-strategy>singleton</instantiation-strategy> > + <role-hint>components.org.xwiki.rest.SpacesResource > + </role-hint> > +  > + <instantiation-strategy>per-lookup</instantiation-strategy> > <implementation>components.org.xwiki.rest.SpacesResource > </implementation> > <requirements> > @@ -33,10 +37,15 @@ > </role> > <role-hint>components.org.xwiki.rest.SpacesResource > </role-hint> > - <field-name>descriptorToRepresenterMap</field-name> > + <field-name>descriptorToRepresenterMap > + </field-name> > </requirement> > </requirements> > + <configuration> > + <uriPattern>/spaces</uriPattern> > + </configuration> > </component> > + > <component> > <role>components.org.xwiki.rest.XWikiResourceRepresenter > </role> > @@ -53,7 +62,7 @@ > --> > <role-hint>components.org.xwiki.rest.SpacesResource:text/plain > </role-hint> > - <instantiation-strategy>singleton</instantiation-strategy> > + <instantiation-strategy>per-lookup</instantiation-strategy> > <implementation> > components.org.xwiki.rest.internal.PlainTextSpacesRepresenter > </implementation> > @@ -63,7 +72,7 @@ > </role> > <role-hint>components.org.xwiki.rest.SpacesResource:text/xml > </role-hint> > - <instantiation-strategy>singleton</instantiation-strategy> > + <instantiation-strategy>per-lookup</instantiation-strategy> > <implementation> > components.org.xwiki.rest.internal.XmlTextSpacesRepresenter > </implementation>

16 years, 8 months

2
3
0 0

Re: [xwiki-devs] [xwiki-notifications] r15098 - platform/web/branches/xwiki-web-1.7/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client/plugin/table

by Vincent Massol

On Jan 6, 2009, at 5:05 PM, jvdrean (SVN) wrote: > Author: jvdrean > Date: 2009-01-06 17:05:57 +0100 (Tue, 06 Jan 2009) > New Revision: 15098 > > Modified: > platform/web/branches/xwiki-web-1.7/wysiwyg/src/main/java/com/xpn/ > xwiki/wysiwyg/client/plugin/table/TablePlugin.java > Log: > XWIKI-3068 : Builtin firefox table features (add row, add col) > messes up tables in the WYSIWYG > > Fixed by disabling builtin firefox table features. Merged from trunk. > > > > Modified: platform/web/branches/xwiki-web-1.7/wysiwyg/src/main/java/ > com/xpn/xwiki/wysiwyg/client/plugin/table/TablePlugin.java > =================================================================== > --- platform/web/branches/xwiki-web-1.7/wysiwyg/src/main/java/com/ > xpn/xwiki/wysiwyg/client/plugin/table/TablePlugin.java 2009-01-06 > 16:02:23 UTC (rev 15097) > +++ platform/web/branches/xwiki-web-1.7/wysiwyg/src/main/java/com/ > xpn/xwiki/wysiwyg/client/plugin/table/TablePlugin.java 2009-01-06 > 16:05:57 UTC (rev 15098) > @@ -85,6 +85,10 @@ > addFeature(rta, new InsertColAfter(this)); > addFeature(rta, new DeleteCol(this)); > addFeature(rta, new DeleteTable(this)); > + > + // Disable the standard table editing features of Firefox. > + // See XWIKI-3068 for more info. I don't think we should put JIRA references in our code and not for describing a solution. Rationale: we can move to another issue tracker in the future, the issue can be moved/deleted/replace, etc. It's better to have all the information in the source file IMO. > > + rta.getDocument().execCommand("enableInlineTableEditing", > "false"); > > getUIExtensionList().add(toolBarExtension); > } Thanks -Vincent http://xwiki.com http://massol.net http://xwiki.org

16 years, 8 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

xwiki-devs