xwiki-devs

xwiki-devs@xwiki.org

9400 discussions

[xwiki-devs] [VOTE] XE 1.7 release dates (SUMMARY)

by Jean-Vincent Drean

On Mon, Nov 10, 2008 at 3:34 PM, Jean-Vincent Drean <jv(a)xwiki.com> wrote: > Revised proposal : > > 1.7M2: nov 12th > 1.7M3: nov 19th > 1.7RC1: nov 26th (create 1.7 branches and make trunk 1.8-SNAPSHOT) > 1.7 final: dec 3rd > 1.7.1 (if needed) : dec 8th > Seven +1, no 0, no -1. Vote passed. Thomas is fixing a LDAP bug blocking the release, I plan to start it around 1:30pm GMT. This release will be performed with maven-release-plugin 2.0-beta-8. 1.7M2 release plan : xwiki-platform-pom 1.19 xwiki-tools xwiki-plugins xwiki-applications xwiki-skins xwiki-core 1.7-milestone-2 xwiki-plugin-mailsender 1.6 xwiki-plugin-watchlist 1.11 xwiki-plugin-skinx 1.3 xwiki-application-watchlist 1.11 xwiki-application-panels 1.12 xwiki-platform-web 1.7-milestone-2 xwiki-product-enterprise 1.7-milestone-2 Thanks, JV.

16 years, 2 months

[xwiki-devs] [VOTE] Create a xwiki-macro module in core for Syntax 2.0 macros

by Thomas Mortagne

Hi devs, the xwiki-core-rendering module is growing more and more and will contain too many things and dependencies IMO. For example I will soon commit code macro and script/groovy macros which come with big dependencies (like jython, groovy, etc.) and it would be god to not add more things in already too big core -rendering pom.xml file ;) Now the proposal: add a xwiki-macro submodule in /platform/core and have one macro/one sub module (xwiki-macro/xwiki-macro-code, xwiki-macro/xwiki-macro-script, etc.). Jerome already created a task for it, see http://jira.xwiki.org/jira/browse/XWIKI-2823 Here is my +1 -- Thomas Mortagne

16 years, 2 months

Re: [xwiki-devs] [xwiki-notifications] Hudson build is back to stable: xwiki-product-enterprise-test-trunk » XWiki Products - Enterprise - LDAP Functional Tests #1467

by Jean-Vincent Drean

Starting the release. Thanks, JV. On Wed, Nov 12, 2008 at 4:01 PM, Hudson <build.noreply(a)xwiki.org> wrote: > See http://hudson.xwiki.org/job/xwiki-product-enterprise-test-trunk/com.xpn.xwi… > > > _______________________________________________ > notifications mailing list > notifications(a)xwiki.org > http://lists.xwiki.org/mailman/listinfo/notifications >

16 years, 2 months

[xwiki-devs] Patch with support for multiwiki without the need for subdomains

by Ludovic Dubost

Hi, I've proposed a patch that allows multiwiki to function based on URLs and not based on subdomains. http://jira.xwiki.org/jira/browse/XWIKI-2824 The approach of this patch is to support multiwiki using the following URLs: http://host/xwiki/bin/[view]/Main/ is the main wiki http://host/xwiki/subwiki/wiki_wikiname/[view]/Main/ is the subwiki called 'wikiname' 'wikiname' needs to be what is in the server field in the wiki declaration in the main wiki. I wanted to implemented it by using wiki_wikiname directly as a replacement to bin, but this is not possible since web.xml does not allow to pass /wiki_* as a regexp. This is related to the issue of Short URLs (http://platform.xwiki.org/xwiki/bin/view/Main/ShortURLs) for which sergiu has documented a solution that needs a servlet to serve the static content. I think that controling our URLs is becoming more and more important (we also have URL rewriting patches that are old now but would be quite cool to have), and we have lot of people asking to be able to get rid of /bin/ in our urls. So we probably need to write this servlet that would be able to be a unique entry point to XWiki. This servlet would: - handle static content URLs -- currently we would need to reserve the words 'templates', 'skins', 'wiki_editor', 'tiny_mce' ,' freemind', 's5 ,'yui' for static content but we could put them into 'static' in the future) - handle multiwiki URLs (we could reserve subwiki_* for subwiki URLs) - handle the other URLs as the main wiki URLs Ludovic -- Ludovic Dubost Blog: http://blog.ludovic.org/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost

16 years, 2 months

[xwiki-devs] exo all in one integration

by avsee

Hello, I am trying to use the xwiki portlet with exo portal (and a mysql database). I have configured the hibernate.cfg.xml file as needed and included my jdbc driver. However I still get an error, here is my log: <code> GRAVE: Erreur lors de la configuration de la classe d'�coute de l'application (application listener) com.xpn.xwiki.web.InitializationServletContextListener java.lang.ClassNotFoundException: com.xpn.xwiki.web.InitializationServletContextListener at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1360) at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1206) at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:3786) at org.apache.catalina.core.StandardContext.start(StandardContext.java:4350) at org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:791) at org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:771) at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:525) at org.apache.catalina.startup.HostConfig.deployDirectory(HostConfig.java:934) at org.apache.catalina.startup.HostConfig.deployDirectories(HostConfig.java:897) at org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:496) at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1157) at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:315) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:117) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1053) at org.apache.catalina.core.StandardHost.start(StandardHost.java:719) at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1045) at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:443) at org.apache.catalina.core.StandardService.start(StandardService.java:516) at org.apache.catalina.core.StandardServer.start(StandardServer.java:710) at org.apache.catalina.startup.Catalina.start(Catalina.java:578) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:597) at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:288) at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:413) 6 nov. 2008 18:02:16 org.apache.catalina.core.StandardContext listenerStart GRAVE: L'installation des �couteurs (listeners) de l'application a �t� saut�e suite aux erreurs pr�c�dentes </code> -- View this message in context: http://n2.nabble.com/exo-all-in-one-integration-tp1466118p1466118.html Sent from the XWiki- Dev mailing list archive at Nabble.com.

16 years, 2 months

[xwiki-devs] [VOTE] XE 1.7 release dates

by Vincent Massol

Hi, Today is 1.7M2 release date. However since we're late on several items I think we need a M3 release. Here are the remaining items: * WYSIWYG editor (lots of things remain and will overflow to RC1 and RC2) * Webdav integration (Sergiu to review Asiri's patch) - For 1.7M3 * Rendering: some bug fixes which can go in M3 or even RC1/RC2 + some CSS change for unknown pages in link rendering (1.7M3) * Rendering: groovy macro + rss macro + graph macro + finalize code macro - Would be good to have the max in 1.7M3 and can overflow in RC1 if need be * More? So here's the proposal: 1.7M2: today 1.7M3: 10th to 17th 1.7RC1: 17th to 24th 1.7RC2: 24th to 1st 1.7 final: sometime during the week of the 1st. Here's my +1 Thanks -Vincent

16 years, 3 months

[xwiki-devs] checkin - checkout

by Paul Libbrecht

Hello fellow developers, The usage of a bunch of command-line tools for checking-out the (XML of) xwiki pages and checking them in would be really useful. The xar approach is not really practical: there's no merge, it's problematic when it gets big, and it still doesn't have a command-line to integrate within a build-flow. I am convinced it would be easy, for example, to use the XEclipse code to make checkout, update, and checkin ant-tasks or command-line tools. Did anyone try? thanks in advance paul

16 years, 3 months

Re: [xwiki-devs] [xwiki-notifications] r14068 - in sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/plugin/officeimporter: filter transformer utils

by Sergiu Dumitriu

asiri (SVN) wrote: You should use StringUtils.stripEnd and stripStart for this. > Added: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/plugin/officeimporter/utils/ImporterUtils.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/plugin/officeimporter/utils/ImporterUtils.java (rev 0) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/plugin/officeimporter/utils/ImporterUtils.java 2008-11-10 12:09:35 UTC (rev 14068) > @@ -0,0 +1,36 @@ > +package com.xpn.xwiki.plugin.officeimporter.utils; > + > +/** > + * Utility methods common for office importer. > + * > + * @version $Id$ > + * @since 1.7M1 > + */ > +public abstract class ImporterUtils > +{ > + public static String leftTrim(String s) > + { > + String content = s.trim(); > + if (content.equals("")) { > + return ""; > + } else { > + int index = s.indexOf(content); > + if(index == 0) { > + return s; > + } else { > + return s.substring(index); > + } > + } > + } > + > + public static String rightTrim(String s) > + { > + String content = s.trim(); > + if (content.equals("")) { > + return ""; > + } else { > + int index = s.indexOf(content); > + return s.substring(0, index + content.length()); > + } > + } > +} > -- Sergiu Dumitriu http://purl.org/net/sergiu/

16 years, 3 months

Re: [xwiki-devs] [xwiki-notifications] r14068 - in sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/plugin/officeimporter: filter transformer utils

by Vincent Massol

Hi Asiri, For trimming please use: * Commons Lang: http://commons.apache.org/lang/api/org/apache/commons/lang/StringUtils.html… * If you want the exact list of whitespaces for HTML, see http://www.w3.org/TR/html4/struct/text.html#h-9.1 * You can also use \s in Regex It really depends what chars you want removed but your implementation isn't correct I'm sure. Thanks -Vincent On Nov 10, 2008, at 1:09 PM, asiri (SVN) wrote: > Author: asiri > Date: 2008-11-10 13:09:35 +0100 (Mon, 10 Nov 2008) > New Revision: 14068 > > Added: > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/HtmlTableFilter.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/utils/ImporterUtils.java > Modified: > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/HtmlListFilter.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/transformer/HtmlToXWikiTwoZeroTransformer.java > sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/transformer/HtmlToXWikiXhtmlTransformer.java > Log: > XAOFFICE-1 : Develop the initial feature set for office-importer > plugin. > > * Completing list support and table support, need to test and make > few more adjustments. > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/filter/HtmlListFilter.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/HtmlListFilter.java 2008-11-10 11:32:32 > UTC (rev 14067) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/HtmlListFilter.java 2008-11-10 12:09:35 > UTC (rev 14068) > @@ -5,11 +5,15 @@ > import org.w3c.dom.NodeList; > > import com.xpn.xwiki.plugin.officeimporter.utils.ImporterContext; > +import com.xpn.xwiki.plugin.officeimporter.utils.ImporterUtils; > > /** > - * This is a temporary filter until we have a clear solution to the > issue at > - * http://jira.xwiki.org/jira/browse/XWIKI-2812. The problem occurs > when the first child of a > - * {@code <li>} tag is a {@code <p>} tag. > + * Presently xwiki rendering module doesn't support complex list > items. Because of this reason this > + * temporary filter is used to rip off any complex formatting > elements present in html lists. The > + * JIRA issue is located at http://jira.xwiki.org/jira/browse/XWIKI-2812 > . > + * > + * @version $Id$ > + * @since 1.7M1 > */ > public class HtmlListFilter implements HtmlFilter > { > @@ -21,13 +25,23 @@ > NodeList listItems = document.getElementsByTagName("li"); > for (int i = 0; i < listItems.getLength(); i++) { > Node listItem = listItems.item(i); > - Node firstChild = listItem.getFirstChild(); > - if (firstChild != null && > firstChild.getNodeName().equals("p")) { > - NodeList grandChildren = firstChild.getChildNodes(); > - while (grandChildren.getLength() > 0) { > - listItem.insertBefore(grandChildren.item(0), > firstChild); > + Node counter = listItem.getFirstChild(); > + while (counter != null) { > + if (counter.getNodeType() == Node.TEXT_NODE) { > + String trimmed = > ImporterUtils.leftTrim(counter.getTextContent()); > + counter.setTextContent(trimmed); > + if (trimmed.equals("")) { > + counter = counter.getNextSibling(); > + continue; > + } > + } else if (counter.getNodeName().equals("p")) { > + NodeList children = counter.getChildNodes(); > + while (children.getLength() > 0) { > + listItem.insertBefore(children.item(0), > counter); > + } > + listItem.removeChild(counter); > } > - listItem.removeChild(firstChild); > + break; > } > } > } > > Added: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/filter/HtmlTableFilter.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/ > HtmlTableFilter.java (rev 0) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/filter/HtmlTableFilter.java 2008-11-10 > 12:09:35 UTC (rev 14068) > @@ -0,0 +1,65 @@ > +package com.xpn.xwiki.plugin.officeimporter.filter; > + > +import org.w3c.dom.Document; > +import org.w3c.dom.Node; > +import org.w3c.dom.NodeList; > + > +import com.xpn.xwiki.plugin.officeimporter.utils.ImporterContext; > +import com.xpn.xwiki.plugin.officeimporter.utils.ImporterUtils; > + > +/** > + * Presently xwiki rendering module doesn't support complex table > cell items. This filter is used to > + * rip-off or modify html tables so that they can be rendered > properly. The corresponding JIRA issue > + * is located at http://jira.xwiki.org/jira/browse/XWIKI-2804. > + * > + * @version $Id$ > + * @since 1.7M1 > + */ > +public class HtmlTableFilter implements HtmlFilter > +{ > + /** > + * {@inheritDoc} > + */ > + public void filter(Document document, ImporterContext context) > + { > + NodeList cellItems = document.getElementsByTagName("td"); > + for (int i = 0; i < cellItems.getLength(); i++) { > + Node cellItem = cellItems.item(i); > + Node counter = cellItem.getFirstChild(); > + while (counter != null) { > + if (counter.getNodeType() == Node.TEXT_NODE) { > + String trimmed = > ImporterUtils.leftTrim(counter.getTextContent()); > + counter.setTextContent(trimmed); > + if (trimmed.equals("")) { > + counter = counter.getNextSibling(); > + continue; > + } > + } else if (counter.getNodeName().equals("p")) { > + NodeList children = counter.getChildNodes(); > + while (children.getLength() > 0) { > + cellItem.insertBefore(children.item(0), > counter); > + } > + cellItem.removeChild(counter); > + } > + break; > + } > + counter = cellItem.getLastChild(); > + while (counter != null) { > + if (counter.getNodeType() == Node.TEXT_NODE) { > + String trimmed = > ImporterUtils.rightTrim(counter.getTextContent()); > + counter.setTextContent(trimmed); > + if (trimmed.equals("")) { > + counter = counter.getPreviousSibling(); > + continue; > + } > + } > + break; > + } > + // Fill all empty cells with an empty character > (space / tab). > + // This is because the current xwiki 2.0 syntax doesn't > handle empty cells correctly. > + if (cellItem.getTextContent().equals("")) { > + cellItem.setTextContent("-"); > + } > + } > + } > +} > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/transformer/ > HtmlToXWikiTwoZeroTransformer.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/transformer/HtmlToXWikiTwoZeroTransformer.java > 2008-11-10 11:32:32 UTC (rev 14067) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/transformer/HtmlToXWikiTwoZeroTransformer.java > 2008-11-10 12:09:35 UTC (rev 14068) > @@ -23,6 +23,7 @@ > import com.xpn.xwiki.plugin.officeimporter.filter.HtmlLinkFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.HtmlListFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.HtmlStyleFilter; > +import com.xpn.xwiki.plugin.officeimporter.filter.HtmlTableFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.ImageTagFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.TagRemoveFilter; > import com.xpn.xwiki.plugin.officeimporter.utils.ImporterContext; > @@ -50,6 +51,7 @@ > filterList.add(new ImageTagFilter()); > filterList.add(new HtmlLinkFilter()); > filterList.add(new HtmlListFilter()); > + filterList.add(new HtmlTableFilter()); > } > > /** > > Modified: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/transformer/ > HtmlToXWikiXhtmlTransformer.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/transformer/HtmlToXWikiXhtmlTransformer.java > 2008-11-10 11:32:32 UTC (rev 14067) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/transformer/HtmlToXWikiXhtmlTransformer.java > 2008-11-10 12:09:35 UTC (rev 14068) > @@ -13,6 +13,7 @@ > import com.xpn.xwiki.plugin.officeimporter.filter.HtmlLinkFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.HtmlListFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.HtmlStyleFilter; > +import com.xpn.xwiki.plugin.officeimporter.filter.HtmlTableFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.ImageTagFilter; > import com.xpn.xwiki.plugin.officeimporter.filter.TagRemoveFilter; > import com.xpn.xwiki.plugin.officeimporter.utils.ImporterContext; > @@ -41,6 +42,7 @@ > filterList.add(new ImageTagFilter()); > filterList.add(new HtmlLinkFilter()); > filterList.add(new HtmlListFilter()); > + filterList.add(new HtmlTableFilter()); > } > > /** > > Added: sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/ > xwiki/plugin/officeimporter/utils/ImporterUtils.java > =================================================================== > --- sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/utils/ > ImporterUtils.java (rev 0) > +++ sandbox/xwiki-plugin-officeimporter/src/main/java/com/xpn/xwiki/ > plugin/officeimporter/utils/ImporterUtils.java 2008-11-10 12:09:35 > UTC (rev 14068) > @@ -0,0 +1,36 @@ > +package com.xpn.xwiki.plugin.officeimporter.utils; > + > +/** > + * Utility methods common for office importer. > + * > + * @version $Id$ > + * @since 1.7M1 > + */ > +public abstract class ImporterUtils > +{ > + public static String leftTrim(String s) > + { > + String content = s.trim(); > + if (content.equals("")) { > + return ""; > + } else { > + int index = s.indexOf(content); > + if(index == 0) { > + return s; > + } else { > + return s.substring(index); > + } > + } > + } > + > + public static String rightTrim(String s) > + { > + String content = s.trim(); > + if (content.equals("")) { > + return ""; > + } else { > + int index = s.indexOf(content); > + return s.substring(0, index + content.length()); > + } > + } > +}

16 years, 3 months

Re: [xwiki-devs] [xwiki-notifications] r14062 - in platform: core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx xwiki-plugins/trunk/skinx/src/main/java/com/xpn/xwiki/plugin/skinx

by Sergiu Dumitriu

jvelociter (SVN) wrote: > Author: jvelociter > Date: 2008-11-09 20:00:37 +0100 (Sun, 09 Nov 2008) > New Revision: 14062 > > Added: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/ > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/AbstractSxAction.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/CssExtension.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/Extension.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/JsExtension.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/SxCompressor.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/SxDocumentSource.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/SxResourceSource.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/sx/SxSource.java > platform/xwiki-plugins/trunk/skinx/src/main/java/com/xpn/xwiki/plugin/skinx/CssResourceSkinExtensionPlugin.java > platform/xwiki-plugins/trunk/skinx/src/main/java/com/xpn/xwiki/plugin/skinx/JsResourceSkinExtensionPlugin.java > Modified: > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/JsxAction.java > platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/SsxAction.java > Log: > XSKINX-12 Ability to load extension files from JAR resources > You forgot to modify this one to support resource extensions: > Modified: platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/SsxAction.java > =================================================================== > --- platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/SsxAction.java 2008-11-08 18:00:54 UTC (rev 14061) > +++ platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/SsxAction.java 2008-11-09 19:00:37 UTC (rev 14062) > @@ -20,23 +20,20 @@ > */ > package com.xpn.xwiki.web; > > -import java.io.IOException; > -import java.io.StringReader; > -import java.io.StringWriter; > -import java.util.Date; > +import javax.servlet.http.HttpServletResponse; > > -import org.apache.commons.lang.BooleanUtils; > -import org.apache.commons.lang.StringUtils; > import org.apache.commons.logging.Log; > import org.apache.commons.logging.LogFactory; > > -import com.xpn.xwiki.XWiki; > import com.xpn.xwiki.XWikiContext; > import com.xpn.xwiki.XWikiException; > -import com.xpn.xwiki.doc.XWikiDocument; > -import com.xpn.xwiki.objects.BaseObject; > -import com.yahoo.platform.yui.compressor.CssCompressor; > > +import com.xpn.xwiki.web.sx.AbstractSxAction; > +import com.xpn.xwiki.web.sx.CssExtension; > +import com.xpn.xwiki.web.sx.Extension; > +import com.xpn.xwiki.web.sx.SxDocumentSource; > +import com.xpn.xwiki.web.sx.SxSource; > + > /** > * <p> > * Action for serving css skin extensions. > @@ -45,22 +42,11 @@ > * @version $Id$ > * @since 1.4M2 > */ > -public class SsxAction extends XWikiAction > +public class SsxAction extends AbstractSxAction > { > - enum CachePolicies > - { > - LONG, SHORT, DEFAULT, FORBID > - } > - > - protected static final long LONG_CACHE_DURATION = 30 * 24 * 3600 * 1000L; > - > - protected static final long SHORT_CACHE_DURATION = 1 * 24 * 3600 * 1000L; > - > /** Logging helper. */ > private static final Log LOG = LogFactory.getLog(SsxAction.class); > - > - public static final String SSX_CLASS_NAME = "XWiki.StyleSheetExtension"; > - > + > /** > * {@inheritDoc} > * > @@ -69,77 +55,25 @@ > @Override > public String render(XWikiContext context) throws XWikiException > { > - XWiki xwiki = context.getWiki(); > - XWikiRequest request = context.getRequest(); > - XWikiResponse response = context.getResponse(); > - XWikiDocument doc = context.getDoc(); > - > - if (doc.isNew()) { > - response.setStatus(404); > + if (context.getDoc().isNew()) { > + context.getResponse().setStatus(HttpServletResponse.SC_NOT_FOUND); > return "docdoesnotexist"; > } > > - CachePolicies finalCache = CachePolicies.LONG; > - StringBuilder resultBuilder = new StringBuilder(); > + SxSource sxSource; > > - if (doc.getObjects(SSX_CLASS_NAME) != null) { > - for (BaseObject sxObj : doc.getObjects(SSX_CLASS_NAME)) { > - String sxContent = sxObj.getLargeStringValue("code"); > - int parse = sxObj.getIntValue("parse"); > - try { > - CachePolicies cache = > - CachePolicies.valueOf(StringUtils.upperCase(StringUtils.defaultIfEmpty(sxObj > - .getStringValue("cache"), "LONG"))); > - if (cache.compareTo(finalCache) > 0) { > - finalCache = cache; > - } > - } catch (Exception ex) { > - LOG.warn(String.format("JSX object [%s#%s] has an invalid cache policy: [%s]", doc.getFullName(), > - sxObj.getStringValue("name"), sxObj.getStringValue("cache"))); > - } > + Extension sxType = new CssExtension(); > > - if (parse == 1) { > - sxContent = xwiki.getRenderingEngine().interpretText(sxContent, doc, context); > - } > - // Also add a newline, in case the different object contents don't end with a blank > - // line, and could cause syntax errors when concatenated. > - resultBuilder.append(sxContent + "\n"); > - } > - } > + sxSource = new SxDocumentSource(context, sxType); > > - String result = resultBuilder.toString(); > - > - response.setContentType("text/css; charset=UTF-8"); > - response.setDateHeader("Last-Modified", doc.getDate().getTime()); > - if (finalCache != CachePolicies.FORBID) { > - response.setHeader("Cache-Control", "public"); > - } > - > - if (finalCache == CachePolicies.LONG) { > - // Cache for one month (30 days) > - response.setDateHeader("Expires", (new Date()).getTime() + LONG_CACHE_DURATION); > - } else if (finalCache == CachePolicies.SHORT) { > - // Cache for one day > - response.setDateHeader("Expires", (new Date()).getTime() + SHORT_CACHE_DURATION); > - } else if (finalCache == CachePolicies.FORBID) { > - response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate"); > - } > - if (BooleanUtils.toBoolean(StringUtils.defaultIfEmpty(request.get("minify"), "true"))) { > - try { > - CssCompressor compressor = new CssCompressor(new StringReader(result)); > - StringWriter out = new StringWriter(); > - compressor.compress(out, -1); > - result = out.toString(); > - } catch (IOException ex) { > - LOG.warn(String.format("Exception compressing the SSX code for [%s]", doc.getFullName()), ex); > - } > - } > - try { > - response.setContentLength(result.getBytes("UTF-8").length); > - response.getOutputStream().write(result.getBytes("UTF-8")); > - } catch (IOException ex) { > - LOG.warn("Failed to send SSX content: " + ex.getMessage()); > - } > + super.renderExtension(sxSource, sxType, context); > return null; > } -- Sergiu Dumitriu http://purl.org/net/sergiu/

16 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

xwiki-devs