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

Re: [xwiki-devs] [xwiki-notifications] r27187 - in platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-code/src: main/java/org/xwiki/rendering/internal/macro/code test/resources
by Vincent Massol 21 Feb '10

21 Feb '10

Hi Thomas, Can you explain the reason for this change? It doesn't sound logical at first sight that the code macro result isn't wrapped in a verbatim block. Thanks -Vincent On Feb 21, 2010, at 4:14 PM, tmortagne (SVN) wrote: > Author: tmortagne > Date: 2010-02-21 16:14:04 +0100 (Sun, 21 Feb 2010) > New Revision: 27187 > > Modified: > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-code/src/main/java/org/xwiki/rendering/internal/macro/code/CodeMacro.java > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-code/src/test/resources/macrocode10.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-code/src/test/resources/macrocode3.test > platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-code/src/test/resources/macrocode6.test > Log: > XWIKI-4915: Code macro 2.0 - inline language=none uses non-monospace font > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-code/src/main/java/org/xwiki/rendering/internal/macro/code/CodeMacro.java > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-code/src/main/java/org/xwiki/rendering/internal/macro/code/CodeMacro.java 2010-02-21 14:55:48 UTC (rev 27186) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-code/src/main/java/org/xwiki/rendering/internal/macro/code/CodeMacro.java 2010-02-21 15:14:04 UTC (rev 27187) > @@ -23,16 +23,18 @@ > import java.util.Collections; > import java.util.List; > > +import org.apache.commons.lang.StringUtils; > import org.xwiki.component.annotation.Component; > +import org.xwiki.component.annotation.Requirement; > import org.xwiki.component.manager.ComponentLookupException; > import org.xwiki.rendering.block.Block; > -import org.xwiki.rendering.block.VerbatimBlock; > import org.xwiki.rendering.macro.MacroExecutionException; > import org.xwiki.rendering.macro.box.AbstractBoxMacro; > import org.xwiki.rendering.macro.code.CodeMacroParameters; > import org.xwiki.rendering.macro.descriptor.DefaultContentDescriptor; > import org.xwiki.rendering.parser.HighlightParser; > import org.xwiki.rendering.parser.ParseException; > +import org.xwiki.rendering.parser.Parser; > import org.xwiki.rendering.transformation.MacroTransformationContext; > > /** > @@ -48,7 +50,7 @@ > * The description of the macro. > */ > private static final String DESCRIPTION = "Highlights code snippets of various programming languages"; > - > + > /** > * Used to indicate that content should not be highlighted. > */ > @@ -60,6 +62,12 @@ > private static final String CONTENT_DESCRIPTION = "the content to highlight"; > > /** > + * Used to parse content when language="none". > + */ > + @Requirement("plain/1.0") > + private Parser plainTextParser; > + > + /** > * Create and initialize the descriptor of the macro. > */ > public CodeMacro() > @@ -81,7 +89,14 @@ > List<Block> result; > try { > if (LANGUAGE_NONE.equalsIgnoreCase(parameters.getLanguage())) { > - result = Collections.<Block> singletonList(new VerbatimBlock(content, context.isInline())); > + if (StringUtils.isEmpty(content)) { > + result = Collections.emptyList(); > + } else { > + result = this.plainTextParser.parse(new StringReader(content)).getChildren(); > + if (context.isInline()) { > + result = result.get(0).getChildren(); > + } > + } > } else { > result = highlight(parameters, content); > } > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-code/src/test/resources/macrocode10.test > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-code/src/test/resources/macrocode10.test 2010-02-21 14:55:48 UTC (rev 27186) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-macros/xwiki-rendering-macro-code/src/test/resources/macrocode10.test 2010-02-21 15:14:04 UTC (rev 27187) > @@ -16,7 +16,9 @@ > endMacroMarkerStandalone [code] [language=notsupportedsyntax] [Text] > beginMacroMarkerStandalone [code] [language=none] [Text] > beginGroup [[class]=[box code]] > -onVerbatim [Text] [false] > +beginParagraph > +onWord [Text] > +endParagraph > endGroup [[class]=[box code]] > endMacroMarkerStandalone [code] [language=none] [Text] > endDocument > \ No newline at end of file [snip]

2 2

Re: [xwiki-devs] [xwiki-notifications] r27178 - platform/core/branches/xwiki-core-2.2/xwiki-core/src/main/resources
by Sergiu Dumitriu 20 Feb '10

20 Feb '10

On 02/19/2010 07:14 PM, jvelociter (SVN) wrote: > Author: jvelociter > Date: 2010-02-19 19:14:54 +0100 (Fri, 19 Feb 2010) > New Revision: 27178 > > Modified: > platform/core/branches/xwiki-core-2.2/xwiki-core/src/main/resources/ApplicationResources.properties > Log: > XE-604 Link to RSS feed on dashboard when used as space dashboard points to global RSS feed > > Merged from trunk > > > Modified: platform/core/branches/xwiki-core-2.2/xwiki-core/src/main/resources/ApplicationResources.properties > =================================================================== > --- platform/core/branches/xwiki-core-2.2/xwiki-core/src/main/resources/ApplicationResources.properties 2010-02-19 18:14:35 UTC (rev 27177) > +++ platform/core/branches/xwiki-core-2.2/xwiki-core/src/main/resources/ApplicationResources.properties 2010-02-19 18:14:54 UTC (rev 27178) > @@ -2242,6 +2242,7 @@ > xe.rss.blog=Blog RSS feed: > xe.rss.blog.description=this feed displays blog posts from this wiki. > xe.rss.blog.feed=Blog RSS Feed Are you sure this works? As far as I know, ' has to be doubled, since otherwise it just marks a verbatim section, which means that {0} will be literally printed, without apostrophes. > +xe.rss.space.description=RSS feed for document changes on space '{0}' > xe.rss.search.description=It is possible to subscribe to a search on a specific query term. To do this, got to the {0}, run a search on a keyword and then click on the RSS icon. > xe.rss.tags.description=It is possible to subscribe to a feed for a specific tag or for all existing tags. To do this, got to the {0} and click on the RSS feed icon you wish to use. > xe.rss.tags.feed=Tags RSS Feed -- Sergiu Dumitriu http://purl.org/net/sergiu/

1 0

[xwiki-devs] GSOC proposals-Export To Word / PDF through OpenOffice [BrainStroming]
by shelan Perera 20 Feb '10

20 Feb '10

Hi devs, I am Shelan Perera 3rd Year university Student of University of Moratuwa Sri Lanka who is currently an intern in Open Source Web Services Solutions developing company( WSO2).I am interested in participating in Google Summer of code this year and conducted a research on Xwiki and specially on Xwiki Office Importer. I am glad to see a project using Open Office Server (which is currently managed inside the Office Importer module) to export to word and pdf. When i used the Office Importer i realised that it is really necessay to have Open Office Process as a Separate Utility module which is consumed by Open Office Importer and Open Office Exporter.Since the current implementation is okay since there is only importer module. I am not clear about the suggested way of implementation(whether it is a nested module in the office importer or a separate module).Could you please elaborate more on that. Regards, Shelan Perera.

3 3

[xwiki-devs] [Proposal] Display document titles in Document Index table
by Jerome Velociter 20 Feb '10

20 Feb '10

Hi all, I propose to add a column in the document index table to display the document titles. Right now we only display document name and space ; and users do relate to the title they enter in the edit Form, not to the technical name of the page. Only issue is that currently we can't have this column sortable nor filterable since standard XE documents use the localization tool for their title, so searching and ordering would not provide with expected results. I propose we add the column just after the page name one, non filterable/sortable (for the moment and until we find a way to make internationalized titles searchable) and non clickable. You can check the result on the incubator wiki (just the i18n key for the table header is missing) http://incubator.myxwiki.org/xwiki/bin/view/Main/AllDocs Note that this will force us to add a nice title to all documents in XE (this is not the case right now, some technical documents in "blacklisted" spaces still have no title) JIRA issue : http://jira.xwiki.org/jira/browse/XE-603 Opinions ? Thanks, Jerome.

6 14

[xwiki-devs] Help! Velocity can not render database related GWT application right.
by Leon Wang 20 Feb '10

20 Feb '10

Dear XWiki Devs, Here is the recap of the last conversation: ----------------------------------------------------------------------------Recap Below----------------------------------------------------------------------------------------- > "Two questions: (1) do you get the same velocity exception when > viewing the Panels.YourPanelName page? (2) When you get the velocity > exception, is your JavaScript file loaded properly? Check with firebug > in the header of the edited page for the associated script tag." > > (1). Yes, I get exception when viewing the Panels. Here is visual: > http://picasaweb.google.com/lh/photo/0ZTNIoSvoAWZe9NveH_3SA?feat=directlink So the panel is rendered fine, > > (2). Here is the pic, I do not think they are loaded right. > http://picasaweb.google.com/lh/photo/U826Ehn6oVWcxiGoUZBsrA?feat=directlin but your JavaScript file (designrationaletreeview.nocache.js) is not loaded correctly. I noticed that the application context path you're using is "xwiki-enterprise-web-2.1.1" instead of "xwiki" (e.g. http://localhost:8080/xwiki-enterprise-web-2.1.1/bin/view/Panels/DesignRati…<http://www.google.com/url?q=http%3A%2F%2Flocalhost%3A8080%2Fxwiki-enterpris…> ). AFAIK you have to do some configurations if you want a different context path. My advice is to use the default one, "xwiki". Also, can you check if the URL from the script tag points indeed to your JavaScript file? I can see only the final part of the URL (the file name) in the picture. Paste here the URL. ------------------------------------------------------------------------------Recap Above--------------------------------------------------------------------------------------------------- I can load other GWT(JavaScript) app in XWiki and Edit Sidebar (or say velocity can render them right). I think the difference of loading other non-database GWT application and DesignRationale Tree View is DR Treeview require make a rpc call to server and somehow the velocity could not render it right. Do I need to use XWiki's api to make the rpc call? Or use the Hiberbinate? Can you give me some suggestion how can I fit the Treeview into the XWiki? I deployed the the DR tree view outside of XWiki as a single application it work fine in web.xml, like this: <servlet-mapping> <servlet-name>treeParentServiceImpl</servlet-name> <url-pattern>/designrationaletreeview/treeParent</url-pattern> </servlet-mapping> But when I deploy it within XWiki context, and writing servlet-mapping in web.xml, velocity could not render it right. Should I change the strut stuff? Thank you all! Leon

3 2

[xwiki-devs] Problem of load database related GWT app
by Leon Wang 19 Feb '10

19 Feb '10

Hi Marius, Also, can you check if the URL from the script tag points indeed to your > JavaScript file? I can see only the final part of the URL (the file > name) in the picture. Paste here the URL. Any feedback on this? Did you changed the application context path to "xwiki"? Is the script tag pointing to the right URL? Yes, I have change the context path to xwiki. I think the script tag pointing to the right URL. I copyed the non-database GWT app in the same folder which is \apache-tomcat\webapps\xwiki\resources\js\xwiki\designrationaletypetree and I can loaded it into edit sidebar without any problems. The script tag is $xwiki.jsfx.use("js/xwiki/designrationaletreeview/designrationaletreeview.nocache.js", true), and It is pointed to the right URL. Firebug's console displays all GWT-RPC requests you make so it's easy to detect if (1) the request is send to the right URL and (2) the response is correct. I think it did not get to the point that making the RPC request, from the net tab of Firebug. One thing I think worth noticing is that the request url is that localhost:8000/xwiki/bin/skin/resources/js/xwiki/designrationaletreeview/designrationaletreeview.nocache.js while I think it should not have "skin" in it. I do not know why the url is look like that. I saw the request to get designrationaletreeview.nocache.js (Here is the screenshot: http://picasaweb.google.com/lh/photo/R5iBi4i8hRuuTd-M0Jb55Q?feat=directlink) under the Header tag: Response Headers: ServerApache-Coyote/1.1Last-Modified Fri, 19 Feb 2010 17:05:54 GMT Cache-Controlpublic ExpiresSun, 21 Mar 2010 17:05:54 GMT Content-Type text/javascript;charset=UTF-8Content-Language enContent-Length8639 DateFri, 19 Feb 2010 17:05:54 GMT Request Header: Host localhost:8080User-AgentMozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.6) Gecko/20091201 Firefox/3.5.6 QQDownload/1.7 Accept*/* Accept-Language en-us,en;q=0.5Accept-Encodinggzip,deflate Accept-Charset ISO-8859-1,utf-8;q=0.7,*;q=0.7 Keep-Alive300Connection keep-aliveReferer http://localhost:8080/xwiki/bin/view/Panels/DesignRationaleTreeView CookieJSESSIONID=8D3407935F56F210EB2BFE1CF29BB34B; language=en; username=FS1YvSKKiX8_; password=FS1YvSKKiX8_; rememberme=true; validation=1bc347cc9d3bf770c6c23d35886d4012 Under the response tag: <a href="" onclick="document.getElementById('xwikierror1').style.display='block'; return false;">Error number 4001 in 4: Error while parsing velocity page xwiki:resources.jsWrapped Exception: Failed to evaluate content with id [xwiki:resources.js]</a><div id="xwikierror1" style="display: none;"><pre class="xwikierror">Error number 4001 in 4: Error while parsing velocity page xwiki:resources.jsWrapped Exception: Failed to evaluate content with id [xwiki:resources.js]com.xpn.xwiki.XWikiException: Error number 4001 in 4: Error while parsing velocity page xwiki:resources.jsWrapped Exception: Failed to evaluate content with id [xwiki:resources.js] at com.xpn.xwiki.render.XWikiVelocityRenderer.evaluate(XWikiVelocityRenderer.java:122) Thank you, Marius! Leon

2 1

[xwiki-devs] Running wysiwyg as standalone
by Fady Matar 19 Feb '10

19 Feb '10

I'm aiming to run the wysiwyg component as a standalone GWT for a number of reasons: 1. To be able to test the component without it being hooked up to XWiki 2. To be able to expand it or add more features to it as required. I would like to get all the possible assistance in achieving that task so I can share it with others and probably update the documentation if it's beneficial to others. Cheers, Fady

1 0

Re: [xwiki-devs] [xwiki-notifications] r27152 - platform/core/trunk/xwiki-rendering/xwiki-rendering-api
by Vincent Massol 19 Feb '10

19 Feb '10

On Feb 19, 2010, at 9:20 AM, tmortagne (SVN) wrote: > Author: tmortagne > Date: 2010-02-19 09:20:16 +0100 (Fri, 19 Feb 2010) > New Revision: 27152 > > Modified: > platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml > Log: > XWIKI-4884: Hide the first and last new line when editing a standalone macro > > Modified: platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml > =================================================================== > --- platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml 2010-02-19 08:07:39 UTC (rev 27151) > +++ platform/core/trunk/xwiki-rendering/xwiki-rendering-api/pom.xml 2010-02-19 08:20:16 UTC (rev 27152) > @@ -199,7 +199,7 @@ > <configuration> >  > <excludes> > - <exclude>org/xwiki/rendering/internal/renderer/xwiki/XWikiSyntaxMacroRenderer</exclude> > + <exclude>**/internal/**</exclude> Is this not less good than what we had before? Thanks -Vincent > <exclude>org/xwiki/rendering/syntax/SyntaxFactory</exclude> > <exclude>org/xwiki/rendering/internal/parser/DefaultSyntaxFactory</exclude> > </excludes>

2 3

[xwiki-devs] Translation-Wiki
by hel-o 18 Feb '10

18 Feb '10

Hi, nice new Layout but the Translation-Table is displayed correct and partly hidden by the right panels. hel. ----- semantic-web.hel.at hel(a)hel.at -- View this message in context: http://n2.nabble.com/Translation-Wiki-tp4591724p4591724.html Sent from the XWiki- Dev mailing list archive at Nabble.com.

1 0

[xwiki-devs] Google Summer of Code 2010
by Vincent Massol 18 Feb '10

18 Feb '10

Hi everyone, The Google Summer of Code 2010 is on and we'd like to propose some projects for XWiki. Some of us have started with some ideas at http://dev.xwiki.org/xwiki/bin/view/GoogleSummerOfCode/ Please join us in proposing ideas. Then once we have enough we'll decide which ones we keep and students will apply on the projects we'll have kept. Thanks -Vincent

1 0