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

[xwiki-devs] Syntax 2.0 - one macro, several implementations

by Jerome Velociter

Dear devs, Regarding XWIKI-2784 (Create a {{map}} macro for XWiki Syntax 2.0), I'd like to discuss the way I should go to have several implementations available for the same macro. The idea is for one to be able to chose a map provider (google, MS live, yahoo, etc.). From a syntax point of view, there are 2 possibilities : 1. Using a parameter : {{map service="google" .../}} 2. Using aliases for the macro {{livemap .../}} (and 3. supporting both) For 2. we could implement one macro per supported service, all of them using the same parameters bean. There might be some redundant code though, that would need to be extracted in a common class (for example the code to generate the proper JS call according to the parameters, as I plan to have a common JS interface for all services, and load the proper one according to the service requested). For 1. (or for 3.) I guess it would mean a unique macro class entry point. Then a possibility I discussed with Thomas could be to have a component interface for generating blocks for a map (MapProvider, or something like this), and one implementation of that component per service. The macro would then lookup for the proper implementation according to the alias used or the parameters used. WDYT ? Do I miss something there ? Jerome.

16 years, 10 months

2
1
0 0

[xwiki-devs] [Proposal] WYSIWYG 1.7 Roadmap

by Marius Dumitru Florea

Hi there, Here's the roadmap I propose: * Fix current issues ** Write Selenium tests for all current features (JV). ** Provide a Range/Selection implementation for IE. (fixes XWIKI-2737, XWIKI-2738, XWIKI-2739). One option is to wrap this JavaScript code http://jorgenhorstink.nl/2006/07/05/dom-range-implementation-in-ecmascript-… . I have Jorgen's permision to use his code. This will save me from implemeting it by myself (which is the second option). The third option is to use the selection support from rocket-gwt library ( http://code.google.com/p/rocket-gwt/wiki/Selections ), which is limited right now. I'm waiting for an answer regarding their roadmap. 24 man-hours ** Reimplement list support. (fixes XWIKI-2734). The default implementation doesn't wrap nested lits in a list item element and fails to detect the presence of a list when the cursor is on a list item with a nested list inside (generated by the wiki editor). Indent/outdent for nested lists have to be reimplemented also. 16 man-hours ** Improve history mechanism (fixes XWIKI-2731). I should restore the previous selection on Undo/Redo. Right now, only the cursor position is restored. 8 man-hours ** Reimplement the heading (using id's and possibly named anchors) and improve the Format plugin (by adding Inline and Paragraph options besides Title X). 8 man-hours ** Fix horizontal rule generation. (fixes XWIKI-2729) 2 man-hours ** Fix Insert Symbol features so it won't require any special encoding. (fixes XWIKI-2669) Right now I have no idea on how fix this. 6 man-hours ** Use the same styling in edit mode as in view mode. (fixes XWIKI-2721). I have to check what CSS rules from the Toucan style sheet messes up the editor. 8 man-hours ** Fix cursor issues (navigation through empty DOM nodes using arrow keys; avoid cursor hiding when the user clicks on an empty DOM element). 8 man-hours ----- Total: 80 man-hours // 1.7M1 * Integrate (& revisit) implemented features ** Justify (left, center, right, full) 3 man-hours ** Font (family, size) 3 man-hours ** Color (background, foreground) 3 man-hours * Implement new features ** Teletype text. I have to discuss this with Vincent because there are two use cases. 16 man-hours. ** Definition lists. Currently there's no support at all. 22 man-hours ** Clear inline formatting. 2 man-hours ** Insert/Edit/Remove Link. I have to extend the built-in command "createlink" for our custom wiki link. We have to implement one big tabbed-dialog for insertion and the link inspector. We also need to implement the remote services for retrieving wiki, space, page, attachment names, as well as comments and history. 8+32 man-hours ** Insert/Edit Image. We have to implement the insert dialog and the image inspector. We also need to implement the remote services for uploading and retrieving images as/from attachments. 24 man-hours ** Insert/Edit Table. We have to implement the insert dialog and the table inspector. 24 man-hours ** Insert/Edit Macro. We have to implement the insert dialog and the macro inspector. 24 man-hours ----- Total: 161 man-hours // 1.7RC1 * Pending features (in case we finish all the above) ** Full screen editing. I have to investigate this more, so I'm not sure about the effort. 24 man-hours ** Paste/Import Office document fragments. Requires catching the paste event and some on-server clean-up. We may also need an insert dialog. 16 man-hours, provided the server part is already done. ** Find & Replace. 24 man-hours ----- Total: 64 man-hours As you can see there are plenty of things to do. We have to finish them before Javapolis. Thanks, Marius

16 years, 10 months

9
45
0 0

[xwiki-devs] XWiki - Get Currently Logged In Of All User

by Prathap Pandian

Hi Guys, How can i get the currently logged in users in a separate page.(Currently logged in of all the users in xwiki). if i use the following *$context.user* its showing the currently logged in user id. Please comment. -- Prathap

16 years, 10 months

1
0
0 0

[xwiki-devs] [Proposal] Default link target options in the new WYSIWYG editor

by Guillaume Lerouge

Hi, I'd like to propose that the default target option for link insertion in the new WYSIWYG editor be as follows: - Internal link: use the default target (not specified) - External Links: use target_blank to force opening the page in a new tab / window (at a later stage we could do the same thing that otehr wikis such as Confluence or MediaWiki and add a small icon showing that the links points to outside of the wiki) So that the user does not lose contact with the wiki. WDYT? Guillaume -- Guillaume Lerouge Product Manager - XWiki Skype ID : wikibc http://blog.xwiki.com/

16 years, 10 months

6
7
0 0

[xwiki-devs] Digest Authentication & XWiki

by Asiri Rathnayake

Hi Devs, I have hit a wall trying to implement Digest Access Authentication for the xwiki-webdav module. I'll try to be clear as much as possible. *+ INTRO* : Digest Access Authentication is used to avoid the transmission of clear text passwords over http for authenticating users. Instead of the clear text password, following hash (RESPONSE) will be transferred to the server by client, HA1 = MD5(username,password,realm) HA2 = MD5(method,digestURI) RESPONSE = MD5(HA1,nonce,HA2) Here the 'nonce' is some weird string token generated by the server for that particular client for a particular session. So the RESPONSE instead of the clear text password will be transferred to the server. For more specific information about Digest Authentication, you may refer [1]. *+ PROBLEM* : Simply put, the way xwiki handles authentication requires the presentation of a clear text password by the client (which is not available with Digest Authentication scheme). What we have with xwiki (on the server side) is a crypted version of the original password. One possible solution to overcome this limitation is to store the HA1 value in our databases (is this possible ?). This is one of the limitations of Digest Authentication scheme as mentioned in [1] : *"There is an important problem with implementing Digest access authentication. This is the requirement that either cleartext passwords or the HA1 hashes must be known in order to perform client response validation" * I would like to know what other developers have to say about this issue, and possible workarounds ... [?] Thanks. - Asiri [1] http://en.wikipedia.org/wiki/Digest_access_authentication

16 years, 10 months

5
13
0 0

Re: [xwiki-devs] [xwiki-notifications] r13895 - in platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/client: plugin ui/cmd ui/cmd/internal util util/internal

by Vincent Massol

Hi Marius, On Oct 29, 2008, at 5:23 PM, mflorea (SVN) wrote: > Author: mflorea > Date: 2008-10-29 17:23:28 +0100 (Wed, 29 Oct 2008) > New Revision: 13895 > > Modified: > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/plugin/Config.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/plugin/Plugin.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/plugin/PluginFactory.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/plugin/PluginFactoryManager.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/plugin/PluginManager.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/plugin/UIExtension.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/ui/cmd/CommandListener.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/ui/cmd/CommandListenerCollection.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/ui/cmd/CommandManager.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/ui/cmd/SourcesCommandEvents.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/ui/cmd/internal/AbstractCommandManager.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/util/DOMUtils.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/util/Document.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/util/internal/IEDOMUtils.java > platform/web/trunk/wysiwyg/src/main/java/com/xpn/xwiki/wysiwyg/ > client/util/internal/MozillaDOMUtils.java > Log: > * more javadoc > * ability to import DOM nodes (the current GWT support for this is > broken); this is needed for the FormatInline command that I'm writing. One remark: I hope that you're putting these comments in the code as otherwise it'll be imposible to remember why you're doing extra work in the code in 6 months time. It's very important that anything not standard/normal is fully documented with a reference on the web to the reason and even better with a link too on the issue in the project issue tracer that references the pb so that when it's fixed we can remove our cruft. Thanks -Vincent

16 years, 10 months

2
2
0 0

[xwiki-devs] [Proposal] Choosing the separator character for representing the FQN of an attachment (new rendering)

by Vincent Massol

Hi, I had proposed to use the ^ character as attachment delimiter. Ex: wiki:Space.Page^attachment However I've just realized while implementing it that it's an "unwise" character in an URI (source: http://www.ietf.org/rfc/rfc2396.txt) unwise = "{" | "}" | "|" | "\" | "^" | "[" | "]" | "`" Allowed punctuations characters are: mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")" BTW the following are reserved: reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | "," Note that we use ":" for wiki delimiter but that's okay since we're using an opaque URI and thus reserved chars, unreserved chars and escaped chars are authorized. I think it would be better to choose amongst one the valid chars for the attachment to prevent future problems. Of course this means we'll have to make that character forbidden in a page name. Actually we could also decide that it's character forbidden in an attachment (and use lastIndexOf() instead of indexOf() to separate the page name from the attachment name). Or we could double it once again... I propose we use the @ symbol since it's not a char used often in page names. For example: attach:wiki:Space.Page@my.doc This raises the discussion of the full FQN we'd like to have when we support nested spaces too. For example: (wiki name) "::" (space name) [ "." (space name)]* "::" (page name) ["@" (attachment name)]? Now what about referencing objects and properties using a URI too? Do we want that? What would be the use? Right now I don't see a use and using an API to access them seems fine to me. Alternative view ============ We could also only specify the attachment name in the uri and use link parameters to specify the document where it's located as in: [[image:my.png>>document="wiki:Space.Page"]] This sounds reasonable to me too. I think the real question is whether we need a textual representation of an attachment FQN or not. WDYT? Thanks -Vincent

16 years, 10 months

5
7
0 0

Re: [xwiki-devs] [xwiki-notifications] r13873 - in sandbox/xwiki-plugin-officeimporter/src: main/java/com/xpn/xwiki/plugin/officeimporter main/java/com/xpn/xwiki/plugin/officeimporter/core main/java/com/xpn/xwiki/plugin/officeimporter/filters test/ja

by Asiri Rathnayake

Hi Vincent, Ok, will revert those changes. Btw, why I tried to use static methods instead of separate classes is because those classes seemed to be doing very little. I mean those classes were utilized like, <code> new TagRemoveFilter().doFilter(document); new UnderlineLinkFilter().filter(document); new XWikiSyntaxEscapeFilter().doFilter(document); new ImageTagFilter().doFilter(document); new PinLiFilter().doFilter(document); new EmptyLinkFilter().doFilter(document); </code> That's all. Something didn't look right to me. And also it seems to clutter the functionality into a lots of tiny classes. Thanks. - Asiri

16 years, 10 months

3
5
0 0

Re: [xwiki-devs] [xwiki-notifications] r13873 - in sandbox/xwiki-plugin-officeimporter/src: main/java/com/xpn/xwiki/plugin/officeimporter main/java/com/xpn/xwiki/plugin/officeimporter/core main/java/com/xpn/xwiki/plugin/officeimporter/filters test/java/com/xpn/xwiki/plugin/officeconverter

by Vincent Massol

Hi Asiri, I don't like this "core" package. It's very artificial IMO. The core should be the main package. Also, I'd put the HTMLFilter interface in the filters package. Re the plural "filters" vs "filter" we need to decide. In the rendering module we've decided to use the singular form everywhere. In xwiki-core the majority is also singular. So I'd propose the use always the singular form. WDYT? Thanks -Vincent On Oct 28, 2008, at 5:50 PM, asiri (SVN) wrote: > Author: asiri > Date: 2008-10-28 17:50:32 +0100 (Tue, 28 Oct 2008) > New Revision: 13873 > > Added: > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/core/ > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/core/HTMLFilter.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/ > Removed: > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/ > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/HTMLFilter.java > Modified: > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/OfficeImporterPlugin.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/EmptyLinkFilter.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/ImageTagFilter.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/PinLiFilter.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/TagRemoveFilter.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/UnderlineLinkFilter.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/XWikiSyntaxEscapeFilter.java > sandbox/xwiki-plugin-officeimporter/src/test/java/com/xpn/xwiki/ > plugin/officeconverter/CleanHTMLTest.java > Log: > Introduced a new package for core interfaces of the plugin. Renames > the .filter package to .filters > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/OfficeImporterPlugin.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/OfficeImporterPlugin.java 2008-10-28 16:46:15 > UTC (rev 13872) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/OfficeImporterPlugin.java 2008-10-28 16:50:32 > UTC (rev 13873) > @@ -57,12 +57,12 @@ > import com.xpn.xwiki.doc.XWikiDocument; > import com.xpn.xwiki.plugin.XWikiDefaultPlugin; > import com.xpn.xwiki.plugin.XWikiPluginInterface; > -import com.xpn.xwiki.plugin.officeimporter.filter.EmptyLinkFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.ImageTagFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.PinLiFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.TagRemoveFilter; > -import > com.xpn.xwiki.plugin.officeimporter.filter.UnderlineLinkFilter; > -import > com.xpn.xwiki.plugin.officeimporter.filter.XWikiSyntaxEscapeFilter; > +import com.xpn.xwiki.plugin.officeimporter.filters.EmptyLinkFilter; > +import com.xpn.xwiki.plugin.officeimporter.filters.ImageTagFilter; > +import com.xpn.xwiki.plugin.officeimporter.filters.PinLiFilter; > +import com.xpn.xwiki.plugin.officeimporter.filters.TagRemoveFilter; > +import > com.xpn.xwiki.plugin.officeimporter.filters.UnderlineLinkFilter; > +import > com.xpn.xwiki.plugin.officeimporter.filters.XWikiSyntaxEscapeFilter; > import com.xpn.xwiki.plugin.officeimporter.utils.ImporterException; > import com.xpn.xwiki.plugin.officeimporter.utils.DocumentType; > import com.xpn.xwiki.web.Utils; > @@ -500,12 +500,12 @@ > } > Document document = htmlCleaner.clean(new > StringReader(inputHTML)); > > - new TagRemoveFilter().filter(document); > + new TagRemoveFilter().doFilter(document); > new UnderlineLinkFilter().filter(document); > - new XWikiSyntaxEscapeFilter().filter(document); > - new ImageTagFilter().filter(document); > - new PinLiFilter().filter(document); > - new EmptyLinkFilter().filter(document); > + new XWikiSyntaxEscapeFilter().doFilter(document); > + new ImageTagFilter().doFilter(document); > + new PinLiFilter().doFilter(document); > + new EmptyLinkFilter().doFilter(document); > > XMLUtils.stripHTMLEnvelope(document); > String cleanedHTML = XMLUtils.toString(document); > > Copied: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/core/HTMLFilter.java (from rev 13871, > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/HTMLFilter.java) > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/core/HTMLFilter.java > (rev 0) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/core/HTMLFilter.java 2008-10-28 16:50:32 UTC > (rev 13873) > @@ -0,0 +1,38 @@ > +/* > + * 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 com.xpn.xwiki.plugin.officeimporter.core; > + > +import org.w3c.dom.Document; > + > +/** > + * The filter to clean the html. This Filter only can handle the > {@link Document}. > + * > + * @version $Id$ > + * @since 1.6M1 > + */ > +public interface HTMLFilter > +{ > + /** > + * Do some clean action to the html code stored in {@link > Document}. > + * > + * @param element the {@link Document} with html code > + */ > + void doFilter(Document document); > +} > > > Property changes on: sandbox/xwiki-plugin-officeimporter/src/main/ > java/com/xpn/xwiki/plugin/officeimporter/core/HTMLFilter.java > ___________________________________________________________________ > Name: svn:keywords > + Id > Name: svn:mergeinfo > + > > Copied: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/filters (from rev 13871, sandbox/xwiki- > plugin-officeimporter/src/main/java/com/xpn/xwiki/plugin/ > officeimporter/filter) > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/filters/EmptyLinkFilter.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/EmptyLinkFilter.java 2008-10-28 > 16:45:05 UTC (rev 13871) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/EmptyLinkFilter.java 2008-10-28 > 16:50:32 UTC (rev 13873) > @@ -17,13 +17,15 @@ > * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > */ > -package com.xpn.xwiki.plugin.officeimporter.filter; > +package com.xpn.xwiki.plugin.officeimporter.filters; > > import org.w3c.dom.Document; > import org.w3c.dom.Element; > import org.w3c.dom.Node; > import org.w3c.dom.NodeList; > > +import com.xpn.xwiki.plugin.officeimporter.core.HTMLFilter; > + > /** > * Only for convert2html.<br/> As the xwiki 1.0 xhtml render now > don't handle the empty link very well, so need to > * remove the empty link from the html. <br/> If a label of the link > is empty, it's a empty link, {@code <a />} or > @@ -36,7 +38,7 @@ > public class EmptyLinkFilter implements HTMLFilter > { > > - public void filter(Document document) > + public void doFilter(Document document) > { > Element root = document.getDocumentElement(); > NodeList links = root.getElementsByTagName("a"); > > Deleted: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/filters/HTMLFilter.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/HTMLFilter.java 2008-10-28 16:45:05 UTC > (rev 13871) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/HTMLFilter.java 2008-10-28 16:50:32 > UTC (rev 13873) > @@ -1,38 +0,0 @@ > -/* > - * See the NOTICE file distributed with this work for additional > - * information regarding copyright ownership. > - * > - * This is free software; you can redistribute it and/or modify it > - * under the terms of the GNU Lesser General Public License as > - * published by the Free Software Foundation; either version 2.1 of > - * the License, or (at your option) any later version. > - * > - * This software is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with this software; if not, write to the Free > - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > - */ > -package com.xpn.xwiki.plugin.officeimporter.filter; > - > -import org.w3c.dom.Document; > - > -/** > - * The filter to clean the html. This Filter only can handle the > {@link Document}. > - * > - * @version $Id$ > - * @since 1.6M1 > - */ > -public interface HTMLFilter > -{ > - /** > - * Do some clean action to the html code stored in {@link > Document}. > - * > - * @param element the {@link Document} with html code > - */ > - void filter(Document document); > -} > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/filters/ImageTagFilter.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/ImageTagFilter.java 2008-10-28 16:45:05 > UTC (rev 13871) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/ImageTagFilter.java 2008-10-28 > 16:50:32 UTC (rev 13873) > @@ -17,7 +17,7 @@ > * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > */ > -package com.xpn.xwiki.plugin.officeimporter.filter; > +package com.xpn.xwiki.plugin.officeimporter.filters; > > import org.w3c.dom.Document; > import org.w3c.dom.Element; > @@ -26,6 +26,8 @@ > import org.w3c.dom.NodeList; > import org.w3c.dom.Text; > > +import com.xpn.xwiki.plugin.officeimporter.core.HTMLFilter; > + > /** > * Only for convert2html<br/> This is only for the html rendering in > xwiki syntax 1.0, as it can't find the image's src > * in img tag. Replace the {@code <img>} tag to {image}. Handled > attribute: src, width, height, alt, align. > @@ -36,7 +38,7 @@ > public class ImageTagFilter implements HTMLFilter > { > > - public void filter(Document document) > + public void doFilter(Document document) > { > Element root = document.getDocumentElement(); > NodeList imgs = root.getElementsByTagName("img"); > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/filters/PinLiFilter.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/PinLiFilter.java 2008-10-28 16:45:05 > UTC (rev 13871) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/PinLiFilter.java 2008-10-28 16:50:32 > UTC (rev 13873) > @@ -17,13 +17,15 @@ > * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > */ > -package com.xpn.xwiki.plugin.officeimporter.filter; > +package com.xpn.xwiki.plugin.officeimporter.filters; > > import org.w3c.dom.Document; > import org.w3c.dom.Element; > import org.w3c.dom.Node; > import org.w3c.dom.NodeList; > > +import com.xpn.xwiki.plugin.officeimporter.core.HTMLFilter; > + > /** > * Only for convert2html<br/>As the xwiki 1.0 xhtml render don't > display the first p tag just followed to list tag > * appropriately, need to remove the first {@code <p>} tag in the > {@code <li>} tag. > @@ -34,7 +36,7 @@ > public class PinLiFilter implements HTMLFilter > { > > - public void filter(Document document) > + public void doFilter(Document document) > { > Element root = document.getDocumentElement(); > NodeList lists = root.getElementsByTagName("li"); > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/filters/TagRemoveFilter.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/TagRemoveFilter.java 2008-10-28 > 16:45:05 UTC (rev 13871) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/TagRemoveFilter.java 2008-10-28 > 16:50:32 UTC (rev 13873) > @@ -17,13 +17,15 @@ > * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > */ > -package com.xpn.xwiki.plugin.officeimporter.filter; > +package com.xpn.xwiki.plugin.officeimporter.filters; > > import org.w3c.dom.Document; > import org.w3c.dom.Element; > import org.w3c.dom.Node; > import org.w3c.dom.NodeList; > > +import com.xpn.xwiki.plugin.officeimporter.core.HTMLFilter; > + > /** > * Remove some tag from html, such as style, script. The tag and all > the contents under the tag will be removed. > * > @@ -34,7 +36,7 @@ > { > private final String[] toRemovedTags = {"style", "script"}; > > - public void filter(Document document) > + public void doFilter(Document document) > { > Element root = document.getDocumentElement(); > for (String tag : toRemovedTags) { > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/filters/UnderlineLinkFilter.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/UnderlineLinkFilter.java 2008-10-28 > 16:45:05 UTC (rev 13871) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/UnderlineLinkFilter.java 2008-10-28 > 16:50:32 UTC (rev 13873) > @@ -17,7 +17,7 @@ > * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > */ > -package com.xpn.xwiki.plugin.officeimporter.filter; > +package com.xpn.xwiki.plugin.officeimporter.filters; > > import org.w3c.dom.Document; > import org.w3c.dom.Element; > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/filters/XWikiSyntaxEscapeFilter.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/XWikiSyntaxEscapeFilter.java 2008-10-28 > 16:45:05 UTC (rev 13871) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filters/XWikiSyntaxEscapeFilter.java > 2008-10-28 16:50:32 UTC (rev 13873) > @@ -17,7 +17,7 @@ > * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > * 02110-1301 USA, or see the FSF site: http://www.fsf.org. > */ > -package com.xpn.xwiki.plugin.officeimporter.filter; > +package com.xpn.xwiki.plugin.officeimporter.filters; > > import java.util.ArrayList; > import java.util.List; > @@ -28,6 +28,8 @@ > import org.w3c.dom.NodeList; > import org.w3c.dom.Text; > > +import com.xpn.xwiki.plugin.officeimporter.core.HTMLFilter; > + > /** > * Only for convert2html<br/> Change the html content conflicting > with xwiki syntax to escape. Such as replace {@code [} > * to {@code \]} > @@ -66,7 +68,7 @@ > // escapeChars.add("k"); > } > > - public void filter(Document document) > + public void doFilter(Document document) > { > Element root = document.getDocumentElement(); > cleanNode(root); > > Modified: sandbox/xwiki-plugin-officeimporter/src/test/java/com/xpn/ > xwiki/plugin/officeconverter/CleanHTMLTest.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/test/java/com/xpn/xwiki/ > plugin/officeconverter/CleanHTMLTest.java 2008-10-28 16:46:15 UTC > (rev 13872) > +++ sandbox/xwiki-plugin-officeimporter/src/test/java/com/xpn/xwiki/ > plugin/officeconverter/CleanHTMLTest.java 2008-10-28 16:50:32 UTC > (rev 13873) > @@ -27,13 +27,13 @@ > import org.xwiki.xml.XMLUtils; > import org.xwiki.xml.html.HTMLCleaner; > > -import com.xpn.xwiki.plugin.officeimporter.filter.EmptyLinkFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.HTMLFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.ImageTagFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.PinLiFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.TagRemoveFilter; > -import > com.xpn.xwiki.plugin.officeimporter.filter.UnderlineLinkFilter; > -import > com.xpn.xwiki.plugin.officeimporter.filter.XWikiSyntaxEscapeFilter; > +import com.xpn.xwiki.plugin.officeimporter.core.HTMLFilter; > +import com.xpn.xwiki.plugin.officeimporter.filters.EmptyLinkFilter; > +import com.xpn.xwiki.plugin.officeimporter.filters.ImageTagFilter; > +import com.xpn.xwiki.plugin.officeimporter.filters.PinLiFilter; > +import com.xpn.xwiki.plugin.officeimporter.filters.TagRemoveFilter; > +import > com.xpn.xwiki.plugin.officeimporter.filters.UnderlineLinkFilter; > +import > com.xpn.xwiki.plugin.officeimporter.filters.XWikiSyntaxEscapeFilter; > import com.xpn.xwiki.plugin.officeimporter.utils.ImporterException; > import com.xpn.xwiki.test.AbstractXWikiComponentTestCase; > > @@ -122,12 +122,12 @@ > { > Document document = cleaner.clean(new StringReader(input)); > > - new TagRemoveFilter().filter(document); > + new TagRemoveFilter().doFilter(document); > new UnderlineLinkFilter().filter(document); > - new XWikiSyntaxEscapeFilter().filter(document); > - new ImageTagFilter().filter(document); > - new PinLiFilter().filter(document); > - new EmptyLinkFilter().filter(document); > + new XWikiSyntaxEscapeFilter().doFilter(document); > + new ImageTagFilter().doFilter(document); > + new PinLiFilter().doFilter(document); > + new EmptyLinkFilter().doFilter(document); > > XMLUtils.stripHTMLEnvelope(document); > String actual = XMLUtils.toString(document); > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

16 years, 10 months

1
0
0 0

Re: [xwiki-devs] [xwiki-notifications] r13868 - in sandbox/xwiki-plugin-officeimporter/src: main/java/com/xpn/xwiki/plugin/officeimporter main/java/com/xpn/xwiki/plugin/officeimporter/utils test/java/com/xpn/xwiki/plugin/officeconverter

by Vincent Massol

Hi Asiri, I think I'd really prefer one filter per class. Same as what is done in the HTML cleaner. Also please donc use any *Utils class and no static please (these are both anti patterns). Thanks -Vincent On Oct 28, 2008, at 2:54 PM, asiri (SVN) wrote: > Author: asiri > Date: 2008-10-28 14:54:04 +0100 (Tue, 28 Oct 2008) > New Revision: 13868 > > Removed: > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/ > Modified: > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/OfficeImporterPlugin.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/utils/HtmlFilterUtils.java > sandbox/xwiki-plugin-officeimporter/src/test/java/com/xpn/xwiki/ > plugin/officeconverter/CleanHTMLTest.java > Log: > Moved all html filter code into a single utility class called > HtmlFilterUtils. I thought of introducing some sort of a filter > chain (may be chain of responsibility pattern) but it seemed like an > over-kill for this scenario. > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/OfficeImporterPlugin.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/OfficeImporterPlugin.java 2008-10-28 11:33:41 > UTC (rev 13867) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/OfficeImporterPlugin.java 2008-10-28 13:54:04 > UTC (rev 13868) > @@ -57,14 +57,9 @@ > import com.xpn.xwiki.doc.XWikiDocument; > import com.xpn.xwiki.plugin.XWikiDefaultPlugin; > import com.xpn.xwiki.plugin.XWikiPluginInterface; > -import com.xpn.xwiki.plugin.officeimporter.filter.EmptyLinkFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.ImageTagFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.PinLiFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.TagRemoveFilter; > -import > com.xpn.xwiki.plugin.officeimporter.filter.UnderlineLinkFilter; > -import > com.xpn.xwiki.plugin.officeimporter.filter.XWikiSyntaxEscapeFilter; > -import com.xpn.xwiki.plugin.officeimporter.utils.ImporterException; > import com.xpn.xwiki.plugin.officeimporter.utils.DocumentType; > +import com.xpn.xwiki.plugin.officeimporter.utils.HtmlFilterUtils; > +import com.xpn.xwiki.plugin.officeimporter.utils.ImporterException; > import com.xpn.xwiki.web.Utils; > > /** > @@ -471,9 +466,7 @@ > HTMLCleaner.ROLE), e); > } > Document document = htmlCleaner.clean(new > StringReader(inputHTML)); > - > - new UnderlineLinkFilter().filter(document); > - > + HtmlFilterUtils.filterUnderlinedLinks(document); > XMLUtils.stripHTMLEnvelope(document); > String cleanedHTML = XMLUtils.toString(document); > return cleanedHTML; > @@ -499,14 +492,12 @@ > HTMLCleaner.ROLE), e); > } > Document document = htmlCleaner.clean(new > StringReader(inputHTML)); > - > - new TagRemoveFilter().filter(document); > - new UnderlineLinkFilter().filter(document); > - new XWikiSyntaxEscapeFilter().filter(document); > - new ImageTagFilter().filter(document); > - new PinLiFilter().filter(document); > - new EmptyLinkFilter().filter(document); > - > + HtmlFilterUtils.filterTags(document, new String[]{"style", > "script"}); > + HtmlFilterUtils.filterUnderlinedLinks(document); > + HtmlFilterUtils.filterSytaxChars(document); > + HtmlFilterUtils.filterImageLinks(document); > + HtmlFilterUtils.filterParagraphTagsInLineItemTags(document); > + HtmlFilterUtils.filterEmptyLinks(document); > XMLUtils.stripHTMLEnvelope(document); > String cleanedHTML = XMLUtils.toString(document); > return cleanedHTML; > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/utils/HtmlFilterUtils.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/utils/HtmlFilterUtils.java 2008-10-28 11:33:41 > UTC (rev 13867) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/utils/HtmlFilterUtils.java 2008-10-28 13:54:04 > UTC (rev 13868) > @@ -1,12 +1,247 @@ > package com.xpn.xwiki.plugin.officeimporter.utils; > > +import java.util.ArrayList; > +import java.util.List; > + > +import org.w3c.dom.Document; > +import org.w3c.dom.Element; > +import org.w3c.dom.NamedNodeMap; > +import org.w3c.dom.Node; > +import org.w3c.dom.NodeList; > +import org.w3c.dom.Text; > + > /** > * A utility class containing a suite of filter methods used to > manipulate Html documents. > * > * @version $Id$ > * @since 1.7M1 > */ > -public class HtmlFilterUtils > +public abstract class HtmlFilterUtils > { > + /** > + * Characters that need to be escaped when jumping from html to > xwiki syntax. > + */ > + private static final List<String> escapeChars = new > ArrayList<String>(); > > + /** > + * Static initializer for escape chars. > + */ > + static { > + escapeChars.add("["); > + escapeChars.add("]"); > + escapeChars.add("{"); > + escapeChars.add("}"); > + escapeChars.add("*"); > + escapeChars.add("~"); > + escapeChars.add("_"); > + escapeChars.add("-"); > + escapeChars.add("1"); > + escapeChars.add("#"); > + escapeChars.add("$"); > + } > + > + /** > + * Removes empty links from html documents. If the label of the > link is empty, simply remove the > + * tag as in {@code <a/>} or {@code <a href=""/>}. If the label > is not null but the href > + * attribute is missing, replace the tag with it's label. Like > changing {@code <a>something</a>} > + * to {@code something}. > + * > + * @param document The html document. > + */ > + public static void filterEmptyLinks(Document document) > + { > + Element root = document.getDocumentElement(); > + NodeList links = root.getElementsByTagName("a"); > + for (int i = 0; i < links.getLength(); i++) { > + Node link = links.item(i); > + if (link.getTextContent() == null || > link.getTextContent().trim().equals("")) { > + link.getParentNode().removeChild(link); > + i--; > + continue; > + } > + > + Node hrefAttr = > link.getAttributes().getNamedItem("href"); > + if (hrefAttr == null || > hrefAttr.getTextContent().trim().equals("")) { > + NodeList children = link.getChildNodes(); > + while (children.getLength() > 0) { > + > link.getParentNode().insertBefore(children.item(0), link); > + } > + link.getParentNode().removeChild(link); > + i--; > + } > + } > + } > + > + /** > + * Replaces the {@code <img>} tags with corresponding {image} > macro elements which are > + * recognized by xwiki syntax 1.0. Handles image attributes > like src, width, height, alt, align. > + * > + * @param document The html document. > + */ > + public static void filterImageLinks(Document document) > + { > + Element root = document.getDocumentElement(); > + NodeList imgs = root.getElementsByTagName("img"); > + while (imgs.getLength() > 0) { > + Node image = imgs.item(0); > + String imageCode = generateImageMacroString(image); > + Node parent = image.getParentNode(); > + Text newImg = document.createTextNode(imageCode); > + parent.replaceChild(newImg, image); > + } > + } > + > + /** > + * Converts a {@code <img>} element into a xwiki syntax 1.0 > {image} macro element. > + * > + * @param imageLink Node representing the image link. > + * @return Converted {image} macro string. > + */ > + private static String generateImageMacroString(Node imageLink) > + { > + NamedNodeMap attrs = imageLink.getAttributes(); > + if (attrs == null) { > + return null; > + } > + StringBuffer sb = new StringBuffer(); > + sb.append("{image:"); > + if (attrs.getNamedItem("src") != null) { > + String src = attrs.getNamedItem("src").getTextContent(); > + sb.append(src); > + } > + if (attrs.getNamedItem("width") != null) { > + String width = > attrs.getNamedItem("width").getTextContent(); > + sb.append("|width=" + width); > + } > + if (attrs.getNamedItem("height") != null) { > + String height = > attrs.getNamedItem("height").getTextContent(); > + sb.append("|height=" + height); > + } > + if (attrs.getNamedItem("alt") != null) { > + String alt = attrs.getNamedItem("alt").getTextContent(); > + sb.append("|alt=" + alt); > + } > + if (attrs.getNamedItem("align") != null) { > + String align = > attrs.getNamedItem("align").getTextContent(); > + sb.append("|align=" + align); > + } > + sb.append("}"); > + return sb.toString(); > + } > + > + /** > + * Removes the starting {@code <p>} tags found within {@code > <li>} tags. This is useful since > + * such formations are not properly handled in xwiki 1.0 syntax. > + * > + * @param document The html document. > + */ > + public static void filterParagraphTagsInLineItemTags(Document > document) > + { > + Element root = document.getDocumentElement(); > + NodeList lists = root.getElementsByTagName("li"); > + for (int i = 0; i < lists.getLength(); i++) { > + Node list = lists.item(i); > + Node firstChild = list.getFirstChild(); > + if (firstChild.getNodeName() != null && > firstChild.getNodeName().equals("p")) { > + NodeList childchildren = firstChild.getChildNodes(); > + while (childchildren.getLength() > 0) { > + list.insertBefore(childchildren.item(0), > firstChild); > + } > + list.removeChild(firstChild); > + } > + } > + } > + > + /** > + * Removes all listed tags from the given html document. > + * > + * @param document The html document. > + * @param tags Tags to be removed. > + */ > + public static void filterTags(Document document, String[] tags) > + { > + Element root = document.getDocumentElement(); > + for (String tag : tags) { > + NodeList toBeRemovedTags = > root.getElementsByTagName(tag); > + while (toBeRemovedTags.getLength() > 0) { > + Node t = toBeRemovedTags.item(0); > + t.getParentNode().removeChild(t); > + } > + } > + } > + > + /** > + * Strips off underline tags surrounding links like {@code > <u><a href="something">link</a></u>}. > + * > + * @param document The html document. > + */ > + public static void filterUnderlinedLinks(Document document) > + { > + Element root = document.getDocumentElement(); > + NodeList links = root.getElementsByTagName("a"); > + for (int i = 0; i < links.getLength(); i++) { > + Node link = links.item(i); > + Node parent = link.getParentNode(); > + String parentName = parent.getNodeName(); > + if (parentName != null && (parentName.equals("u") || > parentName.equals("del"))) { > + parent.getParentNode().insertBefore(link, parent); > + parent.getParentNode().removeChild(parent); > + } > + } > + } > + > + /** > + * Escapes the xwiki sytax characters from the given html > document. Example : {@code [} will be > + * replaced by {@code \]}. > + * > + * @param document The html document. > + */ > + public static void filterSytaxChars(Document document) > + { > + Element root = document.getDocumentElement(); > + escapeNode(root); > + } > + > + /** > + * Escapes xwiki syntax characters within the given node's > content. > + * > + * @param node The node which is to be examined. > + */ > + private static void escapeNode(Node node) > + { > + NodeList nodes = node.getChildNodes(); > + for (int i = 0; i < nodes.getLength(); i++) { > + Node next = nodes.item(i); > + if (next instanceof Text) { > + String text = next.getTextContent(); > + text = escapeText(text); > + next.setTextContent(text); > + } else { > + if (next.hasChildNodes()) { > + escapeNode(next); > + } > + } > + } > + } > + > + /** > + * Escapes xwiki syntax characters within the given string. > + * > + * @param text The string to be examined. > + * @return The syntax escaped string. > + */ > + private static String escapeText(String text) > + { > + StringBuffer sb = new StringBuffer(); > + for (int i = 0; i < text.length(); i++) { > + char x = text.charAt(i); > + if (escapeChars.contains(String.valueOf(x))) { > + sb.append("\\"); > + sb.append(String.valueOf(x)); > + } else { > + sb.append(x); > + } > + } > + return sb.toString(); > + } > } > > Modified: sandbox/xwiki-plugin-officeimporter/src/test/java/com/xpn/ > xwiki/plugin/officeconverter/CleanHTMLTest.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/test/java/com/xpn/xwiki/ > plugin/officeconverter/CleanHTMLTest.java 2008-10-28 11:33:41 UTC > (rev 13867) > +++ sandbox/xwiki-plugin-officeimporter/src/test/java/com/xpn/xwiki/ > plugin/officeconverter/CleanHTMLTest.java 2008-10-28 13:54:04 UTC > (rev 13868) > @@ -27,13 +27,7 @@ > import org.xwiki.xml.XMLUtils; > import org.xwiki.xml.html.HTMLCleaner; > > -import com.xpn.xwiki.plugin.officeimporter.filter.EmptyLinkFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.HTMLFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.ImageTagFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.PinLiFilter; > -import com.xpn.xwiki.plugin.officeimporter.filter.TagRemoveFilter; > -import > com.xpn.xwiki.plugin.officeimporter.filter.UnderlineLinkFilter; > -import > com.xpn.xwiki.plugin.officeimporter.filter.XWikiSyntaxEscapeFilter; > +import com.xpn.xwiki.plugin.officeimporter.utils.HtmlFilterUtils; > import com.xpn.xwiki.plugin.officeimporter.utils.ImporterException; > import com.xpn.xwiki.test.AbstractXWikiComponentTestCase; > > @@ -121,14 +115,12 @@ > private void test(String input, String expected) throws > ImporterException > { > Document document = cleaner.clean(new StringReader(input)); > - > - new TagRemoveFilter().filter(document); > - new UnderlineLinkFilter().filter(document); > - new XWikiSyntaxEscapeFilter().filter(document); > - new ImageTagFilter().filter(document); > - new PinLiFilter().filter(document); > - new EmptyLinkFilter().filter(document); > - > + HtmlFilterUtils.filterTags(document, new String[]{"style", > "script"}); > + HtmlFilterUtils.filterUnderlinedLinks(document); > + HtmlFilterUtils.filterSytaxChars(document); > + HtmlFilterUtils.filterImageLinks(document); > + HtmlFilterUtils.filterParagraphTagsInLineItemTags(document); > + HtmlFilterUtils.filterEmptyLinks(document); > XMLUtils.stripHTMLEnvelope(document); > String actual = XMLUtils.toString(document); > assertEquals(HEAD + expected + FOOT, actual); > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications

16 years, 10 months

2
1
0 0

[xwiki-devs] [Proposal] Behavior of the top line when hitting the <return> key

by Guillaume Lerouge

Hi, In the current implementation of the new WYSIWYG editor, the following behavior occurs : 1. Type a word (say, "Test") 2. Highlight that word and make it a level 1 title 3. Put the caret at the beginning of the selection ("|Test" where "|" is the caret) and hit <return> 1. *Text on the second line is now a Level 1 title, as expected* 4. Go back to the previous line (using the <arrow up> key for instance) 5. Start typing on the top line: the text uses the level 1 title style (it does the same thing with other styles, such as bold or italics) After talking with our project managers I think this should not happen: when the user goes back to the previous line and starts typing, the text should use the "normal" style (that is, no style at all) rather than the style that was previously set on that line. In other words, styles should be applied to words and content but not to lines themselves. So in the end we would have : | *(normal text, no style selected)* LEVEL 1 TITLE instead of | *(level one title selected)* LEVEL ONE TITLE When the users hits <return> after writing LEVEL ONE TITLE. Here's my informal +1 for this proposal. Guillaume -- Guillaume Lerouge Product Manager - XWiki Skype ID : wikibc http://blog.xwiki.com/

16 years, 10 months

2
2
0 0

[xwiki-devs] New "Foreign Key" property

by Thomas McColgan

I'm proposing to implement a new property type: A foreign key, analogous to the concept in relational databases. Together with custom mapping, a property like this would make it possible to use Xwiki as a frontend for a relational database, while making full use of the wikis capabilities(configurability, history, etc). The implementation would look similar to the existing "Database list" on the outside, but it would make a lot more use of the databases features. If A links to B, and someone deletes B the reference in A would either be set to null, or the delete would be stopped, depending on the configuration. It would also make it possible to adress associated objects directly in hql. The basic functionality can be emulated using DBList(adding a property to one object by choosing from existing instances of another class), but this is not useful if one wants to have "real" foreign key behaviour in the wiki and the underlying DB. If there is a demand for this I will be happy to contribute a patch once I am done, and I will try make the code nice enough to submit. Otherwise I will probably just make it as a hack to meet the exact need that I have... Thomas

16 years, 10 months

3
6
0 0

[xwiki-devs] [Rendering] Image support & Parameters for links/images

by Vincent Massol

Hi, There are 2 features I need to finish implementing for the new rendering and I have some doubts. 1) Parameters for links Problem ======= We decided to use the (% param=value %)[[link]] notation. However this is raising some issues. First the user needs to close the parameter list so that it doesn't affect other elements coming after. For example: (% rel="_blank" %)[[link]](%%) hello is different from: (% rel="_blank" %)[[link]] hello In the second case the rel="_blank" applied to both the link, the space and the word "hello". However if we consider the params to only apply the link then we cannot set params anymore that span more than the link. For example: (% style="color:red" %)[[link]] and some text(%%) Note that technically the params currently generate a <span> element with the params as attributes. Thus right now using rel="_blank" is set on the span and not on the <a> element which means it doesn't work. Solutions ======= a) Add again the notion of parameters inside the link syntax: [[label>>reference>>>param=value...]] (or using some other separator) b) Use a different syntax for link parameters, for ex: {% param=value %}[[link]] (but I really don't like it) c) Force the params in the (% %)[[link]] notation to always apply only to the link and thus force users to use a space if they want to start a styled portion of text beginning with a link: (% param=value %) [[link]] something else %) As much as I hate having to recode what I've removed, I think the best solution is a). 2) Syntax for images Problem ======= We had decided to use the following syntax: image:wiki:Space.Page^my.png (note: not sure we agreed about the use of ^ but that's a detail - I couldn't find the email where we discussed that) The question is how do we set parameters for images. For example: alt, title, width, height, etc? We have the exact same problem as for links but it's even worse since we don't have the ability to define the parameters inside the image syntax since the image syntax is too limited. Solutions ======= a) Use a different syntax such as: !!label>>image>>>param=value...!! (note that there are several wikis using the !! notation for images, including confluence) Ex: !!my.png!! !!my image>>my.png!! !!wiki:Space.Page^my.png>>>width=100 height=200!! b) Decide not to have a syntax for images and instead use an image macro. Ex: {{image name="my.png" document="wiki:Space.Page" width="100" height="200"/}} Note that there's one problem with not having a syntax for images in the grammar: it makes it harder to convert from one syntax for another. For example people using wikimodel wouldn't be able to convert from xwiki to another syntax easily and viceversa. In XWiki itself we would need to have some extra handling code to handle the fact that the image is a macro to convert it to another syntax but that's possible (not the easiest but possible). WDYT for 1) and 2)? My choice: 1) a) For 2) I'd prefer to have a syntax for images (for the conversion between syntaxes issue and for the fact that the syntax wouldn't be complete - We've added tables in the syntax so it would be a pity not to have a syntax for images IMO). There's only possibility though: that we add {{image...}} in the syntax, so it would generate an onImage() event in XWiki and we would just convert it internally to an image macro. Ideally I'd still prefer a clean syntax but that'd be my second choice. Thanks -Vincent

16 years, 10 months

8
19
0 0

Re: [xwiki-devs] [xwiki-notifications] r13864 - in platform/core/trunk/xwiki-rendering/src: main/java/org/xwiki/rendering/block test/java/org/xwiki/rendering/block

by Sergiu Dumitriu

vmassol (SVN) wrote: > Author: vmassol > Date: 2008-10-28 09:19:23 +0100 (Tue, 28 Oct 2008) > New Revision: 13864 > > Added: > platform/core/trunk/xwiki-rendering/src/test/java/org/xwiki/rendering/block/XMLBlockTest.java > Modified: > platform/core/trunk/xwiki-rendering/src/main/java/org/xwiki/rendering/block/XMLBlock.java > Log: > XWIKI-2785: The order in which XML attributes are printed when converted to XWiki syntax is not fixed > > + public void testAttributeOrder() > + { > + Map<String, String> attributes = new HashMap<String, String>(); > + attributes.put("aaa", "value1"); > + attributes.put("bbb", "value2"); > + XMLBlock block = new XMLBlock("element", attributes); > + > + Iterator<String> it = attributes.keySet().iterator(); > + Iterator<String> newIt = block.getAttributes().keySet().iterator(); > + while (it.hasNext()) { > + assertEquals(newIt.next(), it.next()); > + } > + } I'm not sure this test is enough, since the order for two attributes could happen to be the same. Why not add 10 attributes (aN = vN, where N goes from 0 to 9)? -- Sergiu Dumitriu http://purl.org/net/sergiu/

16 years, 10 months

3
4
0 0

[xwiki-devs] Javascript in {{html}} or {{xhtml}} blocks in syntax 2.0

by Jerome Velociter

Hello, I realize that entering the following in a wiki document using syntax xwiki/2.0 : {{html}} <script type="text/javascript"> //<![CDATA[ alert("Hello, World") // ]]> </script> {{/html}} Results in html as :  So the script tag is not rendered at all, thus the javascript not interpreted. Is this expected ? Is there a way to embed JS in a html block ? Regards, Jerome.

16 years, 10 months

2
4
0 0

[xwiki-devs] IE issue with placing the caret at the beginning of a text node

by Marius Dumitru Florea

Hi devs, To explain the issue lets consider the following scenario: * Edit a new page with the new WYSIWYG editor. * Type "foobar" and place the caret as in "foo|bar", where the pipe represents the caret. * Press the Bold button or type CRTL+B in order to start typing bold text at the current insertion point. * At this moment, the HTML should be "foo<strong>|</strong>bar" where the pipe represents the caret. The Problem In Mozilla it's easy to place the caret as suggested. In IE it's impossible (this weekend I tried all sort of things and search desperately on Google..). What I can easily do in IE is either "foo|<strong></strong>bar" or "foo<strong></strong>|bar". The workaround that I found is to use a special space symbol http://en.wikipedia.org/wiki/Zero-width_non-joiner inside the strong tag (before, it had an empty text node inside) and place the caret just after this special space symbol. PROs: * When the use will type the text will be bold. CONs: * Although the space character is not visible you have to jump over it while navigating with the arrow keys. * Although we can remove these special symbols before converting to wiki syntax, the user will have them when copy&pasting. I'm in favor of using this special space symbol. WDYT? Thanks, Marius. P.S.: I need your opinion ASAP, thanks!

16 years, 11 months

4
7
0 0

[xwiki-devs] [VOTE] Make ditribution maven packages not "generics" anymore

by Thomas Mortagne

Hi devs, I finished a maven build for XWiki+GlassFish+derby distribution. So this means a distribution not based on jetty and we can't use database profile to decide what distribution to build anymore. So I propose: 1) havnig distributions like jetty-hsqldb, glassfish-derby, etc. and to remove distribution we are not releasing/using right now on XE/XEM like hsqldb-pgsql, hsqldb-derby etc. On maven build this means that to build XE glassfish-derby you will need to execute: - on XE parent : mvn install -Pci,derby,glassfish-derby - on the distribution : mvn install This will change all distributions ids but I don't think it's a problem. 2) jetty-hsqldb remain the default distribution for now Here is my +1 for both -- Thomas Mortagne

16 years, 11 months

6
12
0 0

[xwiki-devs] [vote] Apply inline style to the whole word or just the insertion point?

by Marius Dumitru Florea

Hi devs, Let's consider the following scenario: * Edit a new page with the new WYSIWYG editor. * Type a word like "ubuntu". * Move the caret inside the word like "ubu|ntu". * Press the Bold button or type CTRL+B. Question: What is the expected behavior? a) Apply the inline style (bold) only to the insertion point. The next letters typed will have this style applied. b) Apply the inline style (bold) to the word that contains the insertion point ("ubuntu"). Note: b) is the current behavior in Open Office and IE. FF behaves as in a). The behavior currently implemented in the new WYSIWYG editor is a). Also, by choosing b) I avoid the use of the special space character in IE (see my previous mail), but I have to re-implement the current behavior of the new WYSIWYG. I need around 2 days for it. Of course, it will work for any inline style like bold, italic etc. I'm +1 for b) Thanks, Marius.

16 years, 11 months

7
11
0 0

Re: [xwiki-devs] [xwiki-notifications] r13850 - sandbox/xwiki-plugin-officeimporter

by Sergiu Dumitriu

asiri (SVN) wrote: > Author: asiri > Date: 2008-10-27 14:00:09 +0100 (Mon, 27 Oct 2008) > New Revision: 13850 > > Removed: > sandbox/xwiki-plugin-officeimporter/BUILD > sandbox/xwiki-plugin-officeimporter/README > Log: > Removing out dated / unnecessary files. > The README file contained useful information; I hope you copied it someplace else (the xwiki.org site) before, right? -- Sergiu Dumitriu http://purl.org/net/sergiu/

16 years, 11 months

2
1
0 0

Re: [xwiki-devs] [xwiki-notifications] r13849 - in sandbox: xwiki-application-officeimporter xwiki-plugin-officeimporter

by Sergiu Dumitriu

asiri (SVN) wrote: > Author: asiri > Date: 2008-10-27 13:49:42 +0100 (Mon, 27 Oct 2008) > New Revision: 13849 > > Modified: > sandbox/xwiki-application-officeimporter/pom.xml > sandbox/xwiki-plugin-officeimporter/pom.xml > Log: > Changing the name of the officeimporter plugin & application to make more sense. Asiri, the description of the field should not duplicate the name. - The artifactId should be lowercase, no space, and have a specific format (like xwiki-plugin-alexa); this is an identifier intended for machines, to be able to identify and locate the artifact. - The name should be like a breadcrumb, from general to specific, human readable, separated by dashes (like XWiki Platform - Plugins - Alexa); this is a human readable identifier (name) of the project, intended for humans to quickly see what module this is. - The description should be prose, describing what the module does. It is intended to describe the purpose of the module. I know that most of the modules simply use the name as the description, but that does not add any useful information, thus it is wrong. See http://maven.apache.org/pom.html#More_Project_Information and http://maven.apache.org/ref/current/maven-model/maven.html#class_project > - <description>import office documents such as MS word to xwiki page</description> > + <description>XWiki Platform - Applications - Office Importer</description> -- Sergiu Dumitriu http://purl.org/net/sergiu/

16 years, 11 months

2
1
0 0

[xwiki-devs] JMesa and our new table support in the new rendering?

by Vincent Massol

Hi Thomas (and others), Just found JMesa: http://code.google.com/p/jmesa/ Maybe that's something we could be interested in using for our new table implementation? Or maybe not. I just wanted to raise the topic (note that dynamic table support is planned for XE 1.8 and not 1.7). One caveat: It seems to like JQuery. I don't know if it'll work with prototype for example. Thanks -Vincent

16 years, 11 months

1
0
0 0

[xwiki-devs] [vote] Next localization steps

by Sergiu Dumitriu

Hi devs, The new localization component is committed. I think it is working pretty well, so it's time to decide what to do next (estimate deadlines and responsibles after each item): 0. Outside review - me and Marta refactored it about 5 times already, a third opinion would be nice. ASAP, let's say by the end of the week - volunteers; this is a good exercise, as it shows how to write and use components 1. Add it in the build cycle (include it in the core pom as a submodule) ASAP - me 2. Deprecate the XWikiMessageTool class and methods. Should be completely phased out by 1.9 according to our deprecation strategy. ASAP - me 3. Use it in the xwiki-core, replacing the messagetool Full replacement until 1.7M2 - me and other volunteers 4. Propose a standard for writing keys Next week - me + discussion on devs 5. Start properly translating applications in their own documents Until 1.7 final - everybody, especially application owners 6. Split ApplicationResources into smaller files, moving everything to its proper place: .properties files in plugins, wiki documents for applications, CoreResources.properties (the clean version of ApplicationResources). Until 1.7 final - everybody 7. Improve the localization component: 7a. Replace hashmaps with caches Until 1.7M2 - me or volunteers 7b. Write tests Until 1.7M2 - me or volunteers A note for items 2 and 3: The localization component interface is compatible with the message tool, as it provides the get(string) and get(string, list) methods. However, old code casts the retrieved object to XWikiMessageTool, so replacing the "msg" context variable is not advisable yet. I used 'l10n' as the variable name for the new tool, as it reflects better what it does. And, as Vincent suggested, this is a workaround until the velocity bridge is in place, when we shouldn't use direct context variables, but request access to services through this bridge. >From me, +1 to all of these. WDYT? Any volunteers where needed? -- Sergiu Dumitriu http://purl.org/net/sergiu/

16 years, 11 months

5
6
0 0

[xwiki-devs] JCRStore status

by Artem Melentyev

Hi. I just committed JCRStore prototype based on JCRv1 to sandbox/jcrstore Ideas of the prototype: 1. use value objects for storage (xwiki data model proposal: sandbox/org.xwiki.model) org.xwiki.store.value.* value objects allow us to eliminate xwiki-core dependency in jcrstore. we can reuse value objects in new data model later as in sandbox/org.xwiki.model. 2. put all storage specific code in DAO classes. Stores will remain only business code and delegate storage stuff to DAOs. (stores will deprecated by new data model later) 3. convert value objects to/from xwiki business objects. org.xwiki.store.value.ValueConverter planed jcr hierarchy: (node name (node type)) / <space> (xwiki:space) <docname> (xwiki:document) objects <class.name> <number> (xwiki:object) properties (Jcr Value or Value[]) attachments <filename> (xwiki:attachment extends nt:resource) lock (xwiki:lock) translations <language> (xwiki:document) (translations of document) the main problem: JCRStore needs JCRSQL2 language from JCRv2 (JCRv1 has very limited query languages), but: JSR-283 aka JCR v2 isn't still out. It was planed for September. http://jcp.org/en/jsr/detail?id=283 Jackrabbit's JCRSQL2 parser is still in progress (and unusable yet). eXoJCR v2 also in progress: http://jira.exoplatform.org/browse/JCRS I'm afraid JCR v2 may not release before XE-1.7. JCRv2 release was shifted several times before. :(. JcrStore plans: implement base JcrDAOs. (JcrDocumentDAO is ready) try to run xwiki on jcrstore. (not fully possible without JCRSQL2, but may show some problems in store) implement XWQL to JCRSQL2 translator. wait for JCRv2 or at least working JCRSQL2. test XWQL on JCRSQL2. rewrite all HQL queries to XWQL. Delivery date: If JCRv2 (or JCRSQL2) will release in a ~week then I'll implement base functionality in 1.7M2 and improve it in 1.7RC1. If not then 1.8M1 PS: I'm sorry for long delay. I was ill 2.5 last weeks. It very reduce my activity. -- Artem Melentyev

16 years, 11 months

3
2
0 0

Re: [xwiki-devs] Mozilla Add-ons: FoXWiki Nomination

by Asiri Rathnayake

Hi All, Thanks for your support to make FoXWiki a public plugin :) Btw, if you have any suggestions for new features you expect in a future version of FoXWiki, please dump them in this thread ;) - Asiri On Sat, Oct 25, 2008 at 7:42 AM, Mozilla Add-ons <nobody(a)mozilla.org> wrote: > Congratulations! Your nominated add-on, FoXWiki, has been reviewed by a > Mozilla Add-ons editor who approved your add-on to be public. > > Your most recent version (1.0b) has also been made public. > > You can view your public add-on now at: > http://addons.mozilla.org/addon/2358 > > Review Information: > Reviewer: shane hansen > Comments: Congratulations, your addon has been approved for public > status.<br /> > <br /> > Keep up the good work!<br /> > I did notice that you had an empty "general" preferences tab, which is kind > of distracting for users. > If you have questions about this review, please e-mail > amo-editors(a)mozilla.org or join #addons on irc.mozilla.org. > > Mozilla Add-ons > http://addons.mozilla.org > >

16 years, 11 months

1
0
0 0

[xwiki-devs] mute error while importing xar

by Paul Libbrecht

Hello XWikiers, I'm importing the base xar on a brand new xwiki and... well... - upload works flawlessly - clicking on the archive as well (this should have a wait UI btw!) - but then I get the following text with no information in the console > > Import > > Import > Importing curriki-wiki.xar: Error while preparing importing > > * 0 Document(s) installed > * 0 Document(s) skipped > * 0 Document(s) with error > (preceded by the warning the wiki is empty) Is there a switch somewhere to raise verbosity and get info about what went wrong? As I said, the list of files is there (and big). paul PS: for curriki-aware folks, that xar was created with the current curriki checkout after removal of package.xml. I get the same results if I use the svn-ed package.xml.

16 years, 11 months

2
1
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