Author: mfortun Date: 2011-08-30 17:26:02 +0200 (Tue, 30 Aug 2011) New Revision: 1218 Url: http://nuiton.org/repositories/revision/wikitty/1218 Log: *correct header/footer *correct filters option Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -81,6 +81,10 @@ protected Map<String, FilterOption> filtersOptions; + /** + * Mime type helper used to transform mime + */ + static protected FilterOption defaultFilterOption; static { @@ -119,17 +123,14 @@ .getProperty(FilterOption.OPENING_WRITER_CHAR)); defaultFilterOption.setClosingTemplate(mimeProps .getProperty(FilterOption.CLOSING_TEMPLATE)); - defaultFilterOption.setMimeType(mimeProps - .getProperty(FilterOption.MIME_TYPE)); defaultFilterOption.setKey(mimeProps.getProperty(FilterOption.KEY)); - defaultFilterOption.setContentType(mimeProps - .getProperty(FilterOption.CONTENT_TYPE)); + } public CodeDecorator() { filtersOptions = new HashMap<String, FilterOption>(); - + // add basic value js and htmlp filtersOptions.put(defaultFilterOption.getKey(), defaultFilterOption); try { @@ -159,10 +160,7 @@ .getProperty(FilterOption.OPENING_WRITER_CHAR)); option.setClosingTemplate(props .getProperty(FilterOption.CLOSING_TEMPLATE)); - option.setMimeType(props.getProperty(FilterOption.MIME_TYPE)); option.setKey(props.getProperty(FilterOption.KEY)); - option.setContentType(props - .getProperty(FilterOption.CONTENT_TYPE)); // addfilters options filtersOptions.put(option.getKey(), option); @@ -189,6 +187,10 @@ String mime = WikittyPubTextHelper.getMimeType(wikitty); String initialVersion = wikitty.getVersion(); + + MimeTypePubHelper helper = new MimeTypePubHelper(); + String mimeAfterTransformation = helper.pubUiMimeToTargetMime(mime); + String contentType = helper.uiMimeContentType(mime); /* * changement de mime type changement de @@ -217,7 +219,7 @@ // set default content result (override if wikitty content define it) decoredContent += WikittyPublicationConstant.CONTEXT_VAR - + ".setContentType(\"" + foption.getContentType() + "\")" + + ".setContentType(\"" +contentType + "\")" + foption.getEndingCar(); Processor proc = new Processor(); @@ -238,7 +240,7 @@ // set the content WikittyPubTextHelper.setContent(wikitty, decoredContent); // get associated mimeType and set it - WikittyPubTextHelper.setMimeType(wikitty, foption.getMimeType()); + WikittyPubTextHelper.setMimeType(wikitty, mimeAfterTransformation); // restore version wikitty.setVersion(initialVersion); @@ -260,7 +262,7 @@ public boolean isMimeTypeUi(String mime) { MimeTypePubHelper helper = new MimeTypePubHelper(); - String mimeKeyOption = helper.pubUiMimeToConverterOption(mime); + String mimeKeyOption = helper.uiMimeToFilterOptionKey(mime); return filtersOptions.containsKey(mimeKeyOption); } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -42,13 +42,9 @@ public static String CLOSING_WRITER_CHAR = "ClosingWriterChar"; public static String OPENING_WRITER_CHAR = "OpeningWriterChar"; public static String CLOSING_TEMPLATE = "ClosingTemplate"; - public static String MIME_TYPE = "MimeType"; public static String KEY = "Key"; - public static String CONTENT_TYPE = "ContentType"; - - protected String writeString; protected String stringDelim; protected String concatChar; @@ -56,28 +52,14 @@ protected String openingTemplate; protected String closingWriterChar; protected String closingTemplate; - protected String mimeType; - protected String contentType; protected String key; - public String getContentType() { - return contentType; - } - public void setContentType(String contentType) { - this.contentType = contentType; - } public String getKey() { return key; } public void setKey(String key) { this.key = key; } - public String getMimeType() { - return mimeType; - } - public void setMimeType(String mimeType) { - this.mimeType = mimeType; - } public String getOpeningTemplate() { return openingTemplate; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -62,8 +62,8 @@ // change this to a handler to have specific langage compiler as jython etc protected ScriptEngineManager manager; - protected CodeDecorator decorator; + static public String COMMON_MIME_SEP = "/"; static public String PUBLICATION_MIME_SEP = "."; @@ -84,7 +84,7 @@ public static String DEFAULT_MIME_TYPE = "application/octet-stream"; public MimeTypePubHelper() { - decorator = new CodeDecorator(); + bidiMap = new DualHashBidiMap(); manager = ScriptEvaluator.getScriptEnginManager(null); @@ -166,7 +166,7 @@ // check if mimetype startwith the PUbtext prefix result = mimeType.startsWith(PREFIX_MIME_PUB_TEXT); - + CodeDecorator decorator = new CodeDecorator(); // if mimetype match the regex for wikitty pub text that must be // decorate by uidecorator, if (mimeType.matches(REGEX_PUB_TEXT_TRANSFORM)) { @@ -194,13 +194,23 @@ * @param mime * @return */ - public String pubUiMimeToConverterOption(String mime) { + public String uiMimeToFilterOptionKey(String mime) { String result = mime; if (mime.matches(REGEX_PUB_TEXT_TRANSFORM)) { result = StringUtil.split(mime, COMMON_MIME_SEP)[1]; } return result; } + + public String uiMimeContentType(String mime) { + String result = mime; + if (mime.matches(REGEX_PUB_TEXT_TRANSFORM)) { + result = StringUtil.split(mime, COMMON_MIME_SEP)[0]; + } + return result; + } + + /** * Used to convert uiMime to the mimeType after content decoration @@ -252,4 +262,7 @@ this.manager = manager; } + + + } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -23,7 +23,11 @@ * #L% */ package org.nuiton.wikitty.publication; - +/** + * Wikitty Publication Constant use inside wikitty Publication. + * @author mfortun + * + */ public class WikittyPublicationConstant { /* Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -192,10 +192,10 @@ */ static public File externalize(ApplicationConfig conf, Criteria crit, File TargetDir, String jarName) throws ArgumentsParserException, IOException { - + MimeTypePubHelper mimeHelper = new MimeTypePubHelper(); CodeDecorator decorator = new CodeDecorator(); - MimeTypePubHelper mimeHelper = new MimeTypePubHelper(); + WikittyProxy proxy = new WikittyProxy( WikittyServiceFactory.buildWikittyService(conf)); Modified: trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties 2011-08-30 15:26:02 UTC (rev 1218) @@ -30,6 +30,4 @@ ClosingWriterChar= OpeningWriterChar=+= ClosingTemplate="; return wp_result; -MimeType=text\/java Key=html.java -ContentType=text\/html; charset=UTF-8 \ No newline at end of file Modified: trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst =================================================================== --- trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst 2011-08-30 15:26:02 UTC (rev 1218) @@ -73,9 +73,7 @@ * ClosingWriterChar: chaine qui se place avant le caractère de fin et le délimiteur de chaine * OpeningWriterChar: chaine qui se place juste après l'instruction d'écriture et avant le délimiteur de chaine * ClosingTemplate: chaine de fermeture du template - * MimeType: mime type après application du template - * Key: clé du mime type, définition des langages utilisé langageAutourBalise.LangageEntreBalise si le mime type du wikitty pub fini par la clé, ce template sera appliqué. - * ContentType: content type qui sera mit pour le retour de la page + * Key: clé du mime type, définition des langages utilisé langageAutourBalise.LangageEntreBalise si le mime type du wikitty pub fini par la clé, ce template sera appliqué. Key sous forme [xxx.yyy] Un exemple de fonctionnement @@ -90,7 +88,7 @@ Règle de remplacement avec le template:: - wpContext.setContentType("[ContentType]")[EndingCar] + wpContext.setContentType("text/[yyy]")[EndingCar] [OpeningTemplate]<html>[StringDelim][ClosingWriterChar][EndingCar] @@ -102,7 +100,7 @@ [WriteString][OpeningWriterChar][StringDelim]</html>[StringDelim][ClosingWriterChar][EndingCar][ClosingTemplate] ce filtre sera actif quand on le mime type du wikittyPubText sera : -text/[Key], après transformation par le filtre le mimetype sera [MimeType] +text/[xxx.yyy], après transformation par le filtre le mimetype sera text/[xxx] Si on avait utilisé le filtre de base:: Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -36,7 +36,7 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> <head> - <title>Wikitty Publication : <decorator:title default="Bow" /></title> + <title>Wikitty Publication : <decorator:title default="" /></title> <decorator:head /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta name="description" content="Bookmarks on the web" /> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml 2011-08-30 15:26:02 UTC (rev 1218) @@ -31,7 +31,7 @@ <!-- Any urls that are excluded will never be decorated by Sitemesh --> <excludes> <pattern>/nodecorate/*</pattern> - <pattern>index.jsp</pattern> + <pattern>*/eval/*</pattern> </excludes> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -1,4 +1,4 @@ -<!-- +<%-- #%L Wikitty :: publication @@ -21,7 +21,7 @@ License along with this program. If not, see <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% - --> + --%> <%-- Document : edit Created on : 6 d�c. 2010, 18:32:18 @@ -225,5 +225,4 @@ <input type="submit" name="store" value="<%=action.getText("publication.edit.save") %>" /> <input type="submit" name="delete" value="<%=action.getText("publication.edit.delete") %>" /> - </form> \ No newline at end of file Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -1,4 +1,4 @@ -<!-- +<%-- #%L Wikitty :: publication @@ -21,7 +21,7 @@ License along with this program. If not, see <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% - --> + --%> <%-- Document : footer Created on : 6 d�c. 2010, 19:21:22 Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -1,4 +1,4 @@ -<!-- +<%-- #%L Wikitty :: publication @@ -21,7 +21,7 @@ License along with this program. If not, see <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% - --> + --%> <%-- Document : header Created on : 6 déc. 2010, 19:21:06 Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -25,7 +25,8 @@ <%@page import="org.nuiton.wikitty.publication.action.ui.PublicationActionLogin"%> -<%@ taglib prefix="s" uri="/struts-tags"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> <% String successValue = request.getParameter("success"); Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -23,7 +23,9 @@ #L% --%> -<%@taglib prefix="s" uri="/struts-tags"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> + <div id="content"> <div id="formFrame" class="fond"> <h1> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -24,7 +24,7 @@ --> <%-- Document : view - Created on : 7 d�c. 2010, 04:18:13 + Created on : 7 d�c. 2010, 04:18:13 Author : poussin --%> @@ -43,7 +43,8 @@ import="org.nuiton.wikitty.publication.ui.WikittyPublicationSession"%> <%@page import="org.nuiton.wikitty.search.PagedResult"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> -<%@taglib prefix="s" uri="/struts-tags"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> <sj:head jquerytheme="default"/> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -26,7 +26,8 @@ <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@page import="org.nuiton.wikitty.publication.ui.action.PublicationActionRestoreWikitty"%> -<%@taglib prefix="s" uri="/struts-tags"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> <% PublicationActionRestoreWikitty action = PublicationActionRestoreWikitty