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

Re: [xwiki-devs] [xwiki-notifications] r15118 - platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc
by Vincent Massol 07 Jan '09

07 Jan '09

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.

2 1

[xwiki-devs] XMLRPC tests in distribution-test
by Vincent Massol 07 Jan '09

07 Jan '09

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

1 1

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 07 Jan '09

07 Jan '09

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/

2 1

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 06 Jan '09

06 Jan '09

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>

2 3

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 06 Jan '09

06 Jan '09

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

1 0

Re: [xwiki-devs] [xwiki-notifications] r15087 - in sandbox/xwiki-core-rest/src/main: java java/components java/components/org java/components/org/xwiki java/components/org/xwiki/rest java/components/org/xwiki/rest/internal resources/META-INF/plexus
by Vincent Massol 06 Jan '09

06 Jan '09

Hi Fabio On Jan 6, 2009, at 1:46 AM, fmancinelli (SVN) wrote: > Author: fmancinelli > Date: 2009-01-06 01:46:26 +0100 (Tue, 06 Jan 2009) > New Revision: 15087 > > Added: > sandbox/xwiki-core-rest/src/main/java/components/ > sandbox/xwiki-core-rest/src/main/java/components/org/ > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/ > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > SpacesResource.java > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiResource.java > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiResourceFinder.java > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiResourceRepresenter.java > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiRestApplication.java > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > XWikiRestletServlet.java > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > internal/ > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > internal/PlainTextSpacesRepresenter.java > sandbox/xwiki-core-rest/src/main/java/components/org/xwiki/rest/ > internal/XmlTextSpacesRepresenter.java > Modified: > sandbox/xwiki-core-rest/src/main/resources/META-INF/plexus/ > components.xml > Log: > Added a fully componentized version of the REST infrastructure. > > Now resources and "representers" (i.e., objects that are in charge > for representing a given resource for a given media type) are > declared through components.xml and automatically registered: > > 1) At the application level routes are created for all the > components declaring the org.xwiki.rest.XWikiResource role. The role > hint defines the uri template. > > 2) Representers components are associated to resource components by > looking at the role hint (which should reflect the resource a given > representer is associated to) [snip] > + restApplication = (XWikiRestApplication) > componentManager.lookup(applicationClass); > + > + > restApplication.setName(getServletConfig().getServletName()); > + restApplication.setContext(new > ServletContextAdapter(this, context)); > + > restApplication > .getContext().setLogger(restApplication.getClass().getName()); Looks good in general. Just making sure: is createApplication() and hence the code above executed only once? All components you've created are singletons so you need to be careful that they don't hold state or if they do (as above) then this needs to be a state that is common for all threads and thus only initialized once for the entire app lifetime. [snip] Thanks -Vincent

2 2

[xwiki-devs] Build error of fresh checkout on Windows Vista
by smithmarkl 06 Jan '09

06 Jan '09

Howdy, I've checked out the source code HEAD revision from: http://svn.xwiki.org/svnroot/xwiki/platform/trunks I've installed Maven, setup my .../.m2/settings.xml, and am running "mvn -Pwindows install". The build seems to proceed part way, then one of the tests fails: Running com.xpn.xwiki.tool.xar.XarMojoTest [info] Using the existing package.xml descriptor at [C:\temp\xwiki\tools\xwiki-x ar-plugin\target\test-classes\malformedXml\src\main\resources\package.xml] [error] The existing package.xml is invalid. java.lang.Exception: The supplied document contains no document list at com.xpn.xwiki.tool.xar.XarMojo.getDocumentNamesFromXML(XarMojo.java:2 72) at com.xpn.xwiki.tool.xar.XarMojo.addFilesToArchive(XarMojo.java:321) at com.xpn.xwiki.tool.xar.XarMojo.performArchive(XarMojo.java:124) at com.xpn.xwiki.tool.xar.XarMojo.execute(XarMojo.java:76) Any ideas? -- View this message in context: http://n2.nabble.com/Build-error-of-fresh-checkout-on-Windows-Vista-tp21117… Sent from the XWiki- Dev mailing list archive at Nabble.com.

3 5

[xwiki-devs] [VOTE][UI] WYSIWYG Macro dialogs
by Jean-Vincent Drean 06 Jan '09

06 Jan '09

Hi, I've made a mockup for the macro dialog in the WYSIWYG editor : http://incubator.myxwiki.org/xwiki/bin/download/Mockups/WebHome/MacroDialog… I've assumed that using a tree to browse macros was : - Scalable. - Consistent with link dialogs. Shout if you think about another way of displaying them. Note that the second dialog is generated dynamically and will vary a lot according to macros needs (see 2 bis), its layout must remain as simple as possible. Here's my +1. JV.

8 14

Re: [xwiki-devs] [xwiki-notifications] r15061 - in sandbox/xwiki-core-rest: . src/main/java/org/xwiki/rest
by Vincent Massol 06 Jan '09

06 Jan '09

On Jan 5, 2009, at 1:05 PM, fmancinelli (SVN) wrote: > Author: fmancinelli > Date: 2009-01-05 13:05:32 +0100 (Mon, 05 Jan 2009) > New Revision: 15061 > > Modified: > sandbox/xwiki-core-rest/.classpath > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/ > PageResource.java > sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/ > RestApplication.java > Log: > Componentized page representation with plexus components as > suggested on the mailing list. > > Modified: sandbox/xwiki-core-rest/.classpath > =================================================================== > --- sandbox/xwiki-core-rest/.classpath 2009-01-05 12:01:09 UTC (rev > 15060) > +++ sandbox/xwiki-core-rest/.classpath 2009-01-05 12:05:32 UTC (rev > 15061) > @@ -1,6 +1,7 @@ > <?xml version="1.0" encoding="UTF-8"?> > <classpath> > <classpathentry kind="src" output="target/classes" 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"/> > <classpathentry kind="con" > path="org.eclipse.jdt.launching.JRE_CONTAINER/ > org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> > > Modified: sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/ > PageResource.java > =================================================================== > --- sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/ > PageResource.java 2009-01-05 12:01:09 UTC (rev 15060) > +++ sandbox/xwiki-core-rest/src/main/java/org/xwiki/rest/ > PageResource.java 2009-01-05 12:05:32 UTC (rev 15061) > @@ -1,14 +1,15 @@ > package org.xwiki.rest; > > +import java.util.Map; > + > import org.restlet.Context; > import org.restlet.data.MediaType; > import org.restlet.data.Request; > import org.restlet.data.Response; > import org.restlet.data.Status; > import org.restlet.resource.Representation; > -import org.restlet.resource.StringRepresentation; > import org.restlet.resource.Variant; > -import org.xwiki.rest.model.Page; > +import org.xwiki.component.manager.ComponentLookupException; > > import com.xpn.xwiki.api.Document; > > @@ -29,9 +30,19 @@ > public PageResource(Context context, Request request, Response > response) > { > super(context, request, response); > - getVariants().clear(); > - getVariants().add(new Variant(MediaType.TEXT_XML)); > - getVariants().add(new Variant(MediaType.TEXT_PLAIN)); > + > + /* Configure Media types from registered PageRepresenter > components */ > + try { > + getVariants().clear(); > + Map<String, Object> map = com.xpn.xwiki.web.Utils.getComponentManager > ().lookupMap(PageRepresenter.ROLE); > + for (String mediaTypeName : map.keySet()) { > + MediaType mediaType = > MediaType.valueOf(mediaTypeName); > + getVariants().add(new Variant(mediaType)); > + } > + } catch (ComponentLookupException e) { > + throw new RuntimeException(e); > + } The ideal way would be for PageResource to be a component. You could then have a component map directly injected in PageResource using Plexus and you wouldn't need to use the xwiki-core dep on web.Utils which we need to get rif of. -Vincent

2 10

[xwiki-devs] [Proposal] Make our new GWT WYSIWYG editor a top level standalone project
by Vincent Massol 05 Jan '09

05 Jan '09

Hi devs, This is not a priority (we need to finish our first stable release of the WYSIWYG editor first) but I wanted to propose 2 things and start a discussion on it: * That we make our new GWT WYSIWYG editor a top level project (i.e. with a separate jira, separate wiki like http://wysiwyg.xwiki.org with a better name, etc) * Make it usable by someone who is not using XWiki The rationale is: * If we want our editor to become strong and compete with the likes of FCKEditor/TinyMCE we need to open it up to others and for that we need to: - advertise it (hence the http://wysiwyg.xwiki.org that would lists all features same as http://www.fckeditor.net/) - make it be usable easily and thus without dragging xwiki dependencies Other options: 1) Don't do anything. Cons: we won't get enough help and it'll be hard to compete with other editors. They'll have more features/less bugs and we'll have a hard time keeping up. In addition it's possible someone else creates a new GWT WYSIWYG editor and it would be better if we could all join force on that and using what we have started 2) Externalize it on some forge other than the xwiki forge. This is nice from a marketing point of view (i.e. easier to show it as a pure wysiwyg editor) but it has some drawbacks: - further from the xwiki community and thus harder for us to maintain it there - doesn't strengthen our xwiki project In addition, what we need to evaluate is how do we make it independent of xwiki and how long would that take. This is probably more a question for Marius. Marius this is not urgent compared to the 1.7.1 release. Whenever you have time. Thanks -Vincent

4 4