July 2011 - Wikitty-commits - mailman.cloud.codelutin.com

r1100 - in trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication: . externalize
by mfortun＠users.nuiton.org July 28, 2011

July 28, 2011

Author: mfortun Date: 2011-07-28 18:08:38 +0200 (Thu, 28 Jul 2011) New Revision: 1100 Url: http://nuiton.org/repositories/revision/wikitty/1100 Log: * change how work the mimeType helper * unused import Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 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-07-28 13:33:54 UTC (rev 1099) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-07-28 16:08:38 UTC (rev 1100) @@ -29,6 +29,10 @@ import java.util.List; import java.util.Map; +import javax.script.ScriptEngineManager; + +import org.nuiton.wikitty.ScriptEvaluator; + /** * Class used to determine mimetype for an extension, used to determine type of * wikittypub (data or text) with the extension and the mime type @@ -43,25 +47,19 @@ * Mapping between extention and mime type, key: extension, value: mimeType */ protected Map<String, String> mapExtensionMime; + protected ScriptEngineManager manager; /** - * White list of mime type that have to be transform as a wikittyPubText - */ - protected List<String> mimePubText; - - /** * The default mime type */ public static String DEFAULT_MIME_TYPE = "application/octet-stream"; public MimeTypePubHelper() { this.mapExtensionMime = new HashMap<String, String>(); - this.mimePubText = new ArrayList<String>(); + - // TODO create a property file to store and handle mimetype for pub - // text - mimePubText.add("application/javascript"); - + manager = ScriptEvaluator.getScriptEnginManager(null); + mapExtensionMime.put("wp", "application/javascript"); mapExtensionMime.put("js", "application/javascript"); mapExtensionMime.put("jpg", "image/jpeg"); @@ -76,13 +74,7 @@ this.mapExtensionMime = mapExtensionMime; } - public List<String> getMimePubText() { - return mimePubText; - } - public void setMimePubText(List<String> mimePubText) { - this.mimePubText = mimePubText; - } /** * Return the corresponding mime Type for an extension, default if not @@ -111,7 +103,8 @@ * @return if the mimetype of a file correspond to a wikittyPubText */ public boolean isPubTextMime(String mimeType) { - return mimePubText.contains(mimeType); + // will check if there is an engine for the mimetype + return manager.getEngineByMimeType(mimeType)!=null; } /** @@ -126,15 +119,6 @@ } /** - * Add a mimeType corresponding to a WikittyPubText - * - * @param mime - */ - public void addMimeForPubText(String mime) { - mimePubText.add(mime); - } - - /** * Add an entry in the map that store mapping between extension and * mimeType. * @@ -144,4 +128,14 @@ public void addExtensionMime(String extension, String mime) { mapExtensionMime.put(extension, mime); } + + public ScriptEngineManager getManager() { + return manager; + } + + public void setManager(ScriptEngineManager manager) { + this.manager = manager; + } + + } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-07-28 13:33:54 UTC (rev 1099) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-07-28 16:08:38 UTC (rev 1100) @@ -14,6 +14,7 @@ import org.nuiton.processor.filters.GeneratorTemplatesFilterIn; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubText; import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; @@ -24,6 +25,9 @@ * * décorer à l'inverse en fait transformer du html en js qui contient du * html par exemple + * + * regex for html end token need to add /n at the end + * "</[\\w\\d]*>" */ protected String DEFAULT_MIME_TYPE_RETURN = "text/html"; @@ -48,6 +52,7 @@ + } public UiCodeDecorator() { @@ -138,4 +143,16 @@ return result; } + + public boolean isTransformationNeeded(WikittyPubData wikitty) { + String mime = wikitty.getMimeType(); + String[] mimeParsed = StringUtil.split(mime, MIME_SEP); + boolean result = firstPartMimeHandled.contains(mimeParsed[0]); + + return result; + } + + + + } 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-07-28 13:33:54 UTC (rev 1099) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-07-28 16:08:38 UTC (rev 1100) @@ -25,7 +25,6 @@ import org.nuiton.wikitty.publication.entities.WikittyPubDataHelper; import org.nuiton.wikitty.publication.entities.WikittyPubText; import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; -import org.nuiton.wikitty.publication.entities.WikittyPubTextImpl; import org.nuiton.wikitty.publication.synchro.WikittyPublicationSynchronize; import org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem; import org.nuiton.wikitty.search.Criteria;

1 0

r1099 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize
by mfortun＠users.nuiton.org July 28, 2011

July 28, 2011

Author: mfortun Date: 2011-07-28 15:33:54 +0200 (Thu, 28 Jul 2011) New Revision: 1099 Url: http://nuiton.org/repositories/revision/wikitty/1099 Log: * add externalize methods Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 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-07-28 13:27:31 UTC (rev 1098) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-07-28 13:33:54 UTC (rev 1099) @@ -41,7 +41,8 @@ */ public class WikittyPublicationExternalize { - static private Log log = LogFactory.getLog(WikittyPublicationExternalize.class); + static private Log log = LogFactory + .getLog(WikittyPublicationExternalize.class); static public String TEMPORARY_FILE_NAME = "tempBeforeJar"; static public String DEFAULT_JAR_NAME = "pub-externalized"; @@ -81,14 +82,29 @@ appconfig.setOption(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), urlFileSystem); - WikittyProxy proxy = new WikittyProxy( - WikittyServiceFactory.buildWikittyService(appconfig)); + externalize(appconfig); + } + + static public void externalize(ApplicationConfig conf) + throws ArgumentsParserException, IOException { // Found all wikity on the file System Criteria findAllCrit = Search.query().keyword("*").criteria(); - PagedResult<Wikitty> allWikittyOnFS = proxy - .findAllByCriteria(findAllCrit); + externalize(conf, findAllCrit); + } + + static public void externalize(ApplicationConfig conf, Criteria crit) + throws ArgumentsParserException, IOException { + + File currentFile = new File("."); + currentFile = new File(currentFile.getAbsolutePath()).getParentFile(); + + WikittyProxy proxy = new WikittyProxy( + WikittyServiceFactory.buildWikittyService(conf)); + + PagedResult<Wikitty> allWikittyOnFS = proxy.findAllByCriteria(crit); + // make tempfile File tempDirectory = new File(currentFile + File.separator + TEMPORARY_FILE_NAME); @@ -162,8 +178,6 @@ wikittyFile.createNewFile(); FileUtil.writeString(wikittyFile, content); - WikittyPubText currentPubText = new WikittyPubTextImpl(wikit); - File javaFile = new File(tempDirectory.getAbsolutePath() + File.separator + labelPath + name + SOURCE_EXTENSION); javaFile.createNewFile(); @@ -213,6 +227,7 @@ // delete tempfile FileUtil.deleteRecursively(tempDirectory); + } /* @@ -242,7 +257,7 @@ UiCodeDecorator uidecDecorator = new UiCodeDecorator(); if (uidecDecorator.isTransformationNeeded(wikitty)) { try { - wikitty= uidecDecorator.transformPubUIToPubText(wikitty); + wikitty = uidecDecorator.transformPubUIToPubText(wikitty); } catch (IOException e) { log.debug("Error while transform ui"); }

1 0

r1098 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize
by mfortun＠users.nuiton.org July 28, 2011

July 28, 2011

Author: mfortun Date: 2011-07-28 15:27:31 +0200 (Thu, 28 Jul 2011) New Revision: 1098 Url: http://nuiton.org/repositories/revision/wikitty/1098 Log: * integrate UiCodeDecorator inside externalize Mechanism Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 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-07-28 13:15:33 UTC (rev 1097) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-07-28 13:27:31 UTC (rev 1098) @@ -6,6 +6,8 @@ import java.util.Set; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; import org.nuiton.util.FileUtil; @@ -16,6 +18,7 @@ import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.entities.WikittyLabelHelper; import org.nuiton.wikitty.publication.PropertiesExtended; +import org.nuiton.wikitty.publication.UiCodeDecorator; import org.nuiton.wikitty.publication.WikittyFileUtil; import org.nuiton.wikitty.publication.WikittyPublicationConstant; import org.nuiton.wikitty.publication.entities.WikittyPubData; @@ -38,6 +41,7 @@ */ public class WikittyPublicationExternalize { + static private Log log = LogFactory.getLog(WikittyPublicationExternalize.class); static public String TEMPORARY_FILE_NAME = "tempBeforeJar"; static public String DEFAULT_JAR_NAME = "pub-externalized"; @@ -71,7 +75,8 @@ String Label = currentFile.getName(); // String urlFileSystem = "file:///home/User/testWP#wp"; - String urlFileSystem = currentFile.getParent() + WikittyPublicationSynchronize.LABEL_DELIM + Label; + String urlFileSystem = currentFile.getParent() + + WikittyPublicationSynchronize.LABEL_DELIM + Label; appconfig.setOption(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), urlFileSystem); @@ -101,7 +106,8 @@ PropertiesExtended metaProperties = new PropertiesExtended( filePropertiesMeta); - metaProperties.setProperty(PATH_SEPARATOR_PROPERTIE_KEY, File.separator); + metaProperties + .setProperty(PATH_SEPARATOR_PROPERTIE_KEY, File.separator); // iterate wikitty // - write file // - write property @@ -161,7 +167,7 @@ File javaFile = new File(tempDirectory.getAbsolutePath() + File.separator + labelPath + name + SOURCE_EXTENSION); javaFile.createNewFile(); - String codeClass = getCode(currentPubText); + String codeClass = getCode(wikit); FileUtil.writeString(javaFile, codeClass); File classDirectory = new File(tempDirectory.getAbsolutePath() @@ -232,10 +238,19 @@ * en jar et on va supprimer le dossier tempJar */ - public static String getCode(WikittyPubText wikitty) { - String content = wikitty.getContent(); - String mimeType = wikitty.getMimeType(); - String className = wikitty.getName();// +"PublicationClass"; + public static String getCode(Wikitty wikitty) { + UiCodeDecorator uidecDecorator = new UiCodeDecorator(); + if (uidecDecorator.isTransformationNeeded(wikitty)) { + try { + wikitty= uidecDecorator.transformPubUIToPubText(wikitty); + } catch (IOException e) { + log.debug("Error while transform ui"); + } + } + + String content = WikittyPubTextHelper.getContent(wikitty); + String mimeType = WikittyPubTextHelper.getMimeType(wikitty); + String className = WikittyPubTextHelper.getName(wikitty);// +"PublicationClass"; String classContent = StringUtils.EMPTY; // Set<String> labels = (Set<String>) @@ -266,7 +281,7 @@ classContent += "String mimeType = \"" + StringEscapeUtils.escapeJava(mimeType) + "\";"; classContent += "String criteriaName= \"" + Element.ELT_ID + ":" - + wikitty.getWikittyId() + "\";"; + + wikitty.getId() + "\";"; classContent += " result = ScriptEvaluator.eval(null, criteriaName, content, mimeType, bindings);"; classContent += "return result;"; } else { @@ -280,10 +295,12 @@ */ // contruct variables that can be used inside the java code. classContent = "PublicationContext " - + WikittyPublicationConstant.CONTEXT_VAR + " = bindings.get(\"" + + WikittyPublicationConstant.CONTEXT_VAR + + " = bindings.get(\"" + WikittyPublicationConstant.CONTEXT_VAR + "\");"; classContent = "WikittyPublicationConstant " - + WikittyPublicationConstant.EVAL_VAR + " = bindings.get(\"" + + WikittyPublicationConstant.EVAL_VAR + + " = bindings.get(\"" + WikittyPublicationConstant.EVAL_VAR + "\");"; classContent = "String " + WikittyPublicationConstant.PAGE_NAME_VAR + " = bindings.get(\"" @@ -293,8 +310,8 @@ + " = bindings.get(\"" + WikittyPublicationConstant.SUBCONTEXT_VAR + "\");"; classContent = "Wikitty " + WikittyPublicationConstant.WIKITTY_VAR - + " = bindings.get(\"" + WikittyPublicationConstant.WIKITTY_VAR - + "\");"; + + " = bindings.get(\"" + + WikittyPublicationConstant.WIKITTY_VAR + "\");"; classContent += content;

1 0

r1097 - in trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication: . action
by mfortun＠users.nuiton.org July 28, 2011

July 28, 2011

Author: mfortun Date: 2011-07-28 15:15:33 +0200 (Thu, 28 Jul 2011) New Revision: 1097 Url: http://nuiton.org/repositories/revision/wikitty/1097 Log: * correct eval action wikitty content where extract before replacement by uiCodeDecorator * + others correction Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 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-07-28 09:39:11 UTC (rev 1096) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java 2011-07-28 13:15:33 UTC (rev 1097) @@ -6,9 +6,31 @@ protected String stringDelim; protected String concatChar; protected String endingCar; - protected String initializeOutputWriter; + protected String openingTemplate; protected String closingWriterChar; - + protected String closingTemplate; + protected String mimeType; + + + + public String getMimeType() { + return mimeType; + } + public void setMimeType(String mimeType) { + this.mimeType = mimeType; + } + public String getOpeningTemplate() { + return openingTemplate; + } + public void setOpeningTemplate(String openingTemplate) { + this.openingTemplate = openingTemplate; + } + public String getClosingTemplate() { + return closingTemplate; + } + public void setClosingTemplate(String closingTemplate) { + this.closingTemplate = closingTemplate; + } public String getClosingWriterChar() { return closingWriterChar; } @@ -48,14 +70,8 @@ public void setEndingCar(String endingCar) { this.endingCar = endingCar; } - public String getInitializeOutputWriter() { - return initializeOutputWriter; - } - public void setInitializeOutputWriter(String prefixFirstWriteString) { - this.initializeOutputWriter = prefixFirstWriteString; - } + - } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-07-28 09:39:11 UTC (rev 1096) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-07-28 13:15:33 UTC (rev 1097) @@ -4,7 +4,10 @@ import java.io.StringReader; import java.io.StringWriter; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; +import java.util.Set; + import org.apache.commons.lang.StringUtils; import org.nuiton.processor.Processor; import org.nuiton.processor.filters.GeneratorTemplatesFilter; @@ -27,35 +30,44 @@ protected String MIME_SEP = "/"; protected Map<String, FilterOption> filtersOptions; + protected Set<String> firstPartMimeHandled; static protected FilterOption defaultFilterOption; - protected String decoringInit = StringUtils.EMPTY; - protected String decoringAffect; - protected String decoringEnd; - static { - defaultFilterOption= new FilterOption(); - defaultFilterOption.setInitializeOutputWriter("var result=\""); + defaultFilterOption = new FilterOption(); + defaultFilterOption.setOpeningTemplate("var result=\""); defaultFilterOption.setWriteString("result"); defaultFilterOption.setStringDelim("\""); defaultFilterOption.setConcatChar("+"); - defaultFilterOption.setEndingCar(";"); + defaultFilterOption.setEndingCar(";"); defaultFilterOption.setClosingWriterChar(""); defaultFilterOption.setOpeningWriterChar("+="); + defaultFilterOption.setClosingTemplate("\";"); + defaultFilterOption.setMimeType("application/javascript"); + + + } - - + public UiCodeDecorator() { - filtersOptions= new HashMap<String, FilterOption>(); + filtersOptions = new HashMap<String, FilterOption>(); + firstPartMimeHandled = new HashSet<String>(); + + // add basic value js and htmlp + filtersOptions.put("javascript", defaultFilterOption); + firstPartMimeHandled.add("htmlp"); } - public Wikitty transformPubUIToPubText(Wikitty wikitty) throws IOException { + public Wikitty transformPubUIToPubText(Wikitty wikitty) throws IOException { - - + if (!wikitty.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)) { + return wikitty; + } + GeneratorTemplatesFilter filter = new GeneratorTemplatesFilter(); - GeneratorTemplatesFilterIn filterIn = new GeneratorTemplatesFilterIn(filter); + GeneratorTemplatesFilterIn filterIn = new GeneratorTemplatesFilterIn( + filter); String mime = WikittyPubTextHelper.getMimeType(wikitty); String initialVersion = wikitty.getVersion(); @@ -80,50 +92,50 @@ filterIn.setEndCar(foption.getEndingCar()); filterIn.setOpeningWriterChar(foption.getOpeningWriterChar()); filterIn.setClosingWriterChar(foption.getClosingWriterChar()); - //filter.setPassEmptyLine(false); - - - decoringEnd = foption.getStringDelim() + foption.getEndingCar(); - decoringAffect = foption.getInitializeOutputWriter(); + String decoringAffect = foption.getOpeningTemplate(); // initialize new content - String decoredContent = decoringInit; + String decoredContent = StringUtils.EMPTY; // set default content result (override if wikitty content define it) decoredContent += WikittyPublicationConstant.CONTEXT_VAR + ".setContentType(\"" + DEFAULT_MIME_TYPE_RETURN + "\")" + foption.getEndingCar(); - Processor proc= new Processor(); + Processor proc = new Processor(); proc.setInputFilter(filterIn); - - StringWriter writer = new StringWriter(); String content = WikittyPubTextHelper.getContent(wikitty); StringReader reader = new StringReader(content); // process string proc.process(reader, writer); - - - + decoredContent += decoringAffect; // replace element between <% %> and <%= %> decoredContent += writer.toString(); // end of string - decoredContent += decoringEnd; - - WikittyPubTextHelper.setContent(wikitty,decoredContent); - WikittyPubTextHelper.setMimeType(wikitty,mime); + decoredContent += foption.getClosingTemplate(); + // set the content + WikittyPubTextHelper.setContent(wikitty, decoredContent); + // get associated mimeType and set it + WikittyPubTextHelper.setMimeType(wikitty, foption.getMimeType()); + // restore version wikitty.setVersion(initialVersion); return wikitty; } - - public boolean isTransformationNeeded(Wikitty wikitty){ - return true; + + public boolean isTransformationNeeded(Wikitty wikitty) { + if (!wikitty.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)) { + return false; + } + String mime = WikittyPubTextHelper.getMimeType(wikitty); + String[] mimeParsed = StringUtil.split(mime, MIME_SEP); + boolean result = firstPartMimeHandled.contains(mimeParsed[0]); + + return result; } - - + } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-07-28 09:39:11 UTC (rev 1096) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-07-28 13:15:33 UTC (rev 1097) @@ -19,7 +19,6 @@ import org.nuiton.wikitty.ScriptEvaluator; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.publication.UiCodeDecorator; import org.nuiton.wikitty.publication.WikittyPublicationConfig; @@ -130,14 +129,10 @@ } } else { - String content = WikittyPubTextHelper.getContent(w); - - UiCodeDecorator decorator= new UiCodeDecorator(); - - - if (decorator.isTransformationNeeded(w)){ + UiCodeDecorator decorator = new UiCodeDecorator(); + if (decorator.isTransformationNeeded(w)) { try { - w=decorator.transformPubUIToPubText(w); + w = decorator.transformPubUIToPubText(w); } catch (IOException e) { log.debug("Error when processing the wikitty content"); // TODO Mfortun-2011-07-28 really handle exception @@ -145,7 +140,9 @@ result = getError(context); } } - + + String content = WikittyPubTextHelper.getContent(w); + if (content == null) { result = getError(context); } else { @@ -235,8 +232,6 @@ return WikittyPublicationConfig.getConfig(); } - - @Override public String makeUrl(String url) { String finalUrl = url; @@ -289,12 +284,13 @@ @Override public Map<String, String> getArguments() { - Map<String,String> result = new HashMap<String, String>(); - - for( String argElm : ActionContext.getContext().getParameters().keySet()){ + Map<String, String> result = new HashMap<String, String>(); + + for (String argElm : ActionContext.getContext().getParameters() + .keySet()) { result.put(argElm, this.getArgument(argElm, "")); } - + return result; }

1 0

r1096 - in trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication: . action
by mfortun＠users.nuiton.org July 28, 2011

July 28, 2011

Author: mfortun Date: 2011-07-28 11:39:11 +0200 (Thu, 28 Jul 2011) New Revision: 1096 Url: http://nuiton.org/repositories/revision/wikitty/1096 Log: * integrate UiCodeDecorator to eval mechanism Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-07-28 08:16:27 UTC (rev 1095) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-07-28 09:39:11 UTC (rev 1096) @@ -1,19 +1,18 @@ package org.nuiton.wikitty.publication; import java.io.IOException; -import java.io.InputStreamReader; import java.io.StringReader; import java.io.StringWriter; import java.util.HashMap; import java.util.Map; - import org.apache.commons.lang.StringUtils; import org.nuiton.processor.Processor; -import org.nuiton.processor.ProcessorUtil; import org.nuiton.processor.filters.GeneratorTemplatesFilter; import org.nuiton.processor.filters.GeneratorTemplatesFilterIn; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.publication.entities.WikittyPubText; +import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; public class UiCodeDecorator { @@ -51,15 +50,15 @@ filtersOptions= new HashMap<String, FilterOption>(); } - public WikittyPubText transformPubUIToPubText(WikittyPubText wikitty) throws IOException { + public Wikitty transformPubUIToPubText(Wikitty wikitty) throws IOException { GeneratorTemplatesFilter filter = new GeneratorTemplatesFilter(); GeneratorTemplatesFilterIn filterIn = new GeneratorTemplatesFilterIn(filter); - String mime = wikitty.getMimeType(); - String initialVersion = wikitty.getWikittyVersion(); + String mime = WikittyPubTextHelper.getMimeType(wikitty); + String initialVersion = wikitty.getVersion(); /* * changement de mime type changement de @@ -81,9 +80,9 @@ filterIn.setEndCar(foption.getEndingCar()); filterIn.setOpeningWriterChar(foption.getOpeningWriterChar()); filterIn.setClosingWriterChar(foption.getClosingWriterChar()); + //filter.setPassEmptyLine(false); - decoringEnd = foption.getStringDelim() + foption.getEndingCar(); decoringAffect = foption.getInitializeOutputWriter(); @@ -101,11 +100,13 @@ StringWriter writer = new StringWriter(); + String content = WikittyPubTextHelper.getContent(wikitty); + StringReader reader = new StringReader(content); // process string - proc.process(new StringReader(wikitty.getContent()), writer); + proc.process(reader, writer); + - decoredContent += decoringAffect; // replace element between <% %> and <%= %> decoredContent += writer.toString(); @@ -113,14 +114,14 @@ // end of string decoredContent += decoringEnd; - wikitty.setContent(decoredContent); - wikitty.setMimeType(mime); - wikitty.setWikittyVersion(initialVersion); + WikittyPubTextHelper.setContent(wikitty,decoredContent); + WikittyPubTextHelper.setMimeType(wikitty,mime); + wikitty.setVersion(initialVersion); return wikitty; } - public boolean isTransformationNeeded(WikittyPubText wikitty){ + public boolean isTransformationNeeded(Wikitty wikitty){ return true; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-07-28 08:16:27 UTC (rev 1095) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-07-28 09:39:11 UTC (rev 1096) @@ -1,6 +1,7 @@ package org.nuiton.wikitty.publication.action; import java.io.ByteArrayInputStream; +import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; @@ -18,7 +19,9 @@ import org.nuiton.wikitty.ScriptEvaluator; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.publication.UiCodeDecorator; import org.nuiton.wikitty.publication.WikittyPublicationConfig; import org.nuiton.wikitty.publication.WikittyPublicationConstant; import org.nuiton.wikitty.publication.entities.WikittyPubText; @@ -129,6 +132,20 @@ } else { String content = WikittyPubTextHelper.getContent(w); + UiCodeDecorator decorator= new UiCodeDecorator(); + + + if (decorator.isTransformationNeeded(w)){ + try { + w=decorator.transformPubUIToPubText(w); + } catch (IOException e) { + log.debug("Error when processing the wikitty content"); + // TODO Mfortun-2011-07-28 really handle exception + e.printStackTrace(); + result = getError(context); + } + } + if (content == null) { result = getError(context); } else {

1 0

r1095 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org July 28, 2011

July 28, 2011

Author: mfortun Date: 2011-07-28 10:16:27 +0200 (Thu, 28 Jul 2011) New Revision: 1095 Url: http://nuiton.org/repositories/revision/wikitty/1095 Log: * correct filter use Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 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-07-27 16:06:15 UTC (rev 1094) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java 2011-07-28 08:16:27 UTC (rev 1095) @@ -5,10 +5,23 @@ protected String writeString; protected String stringDelim; protected String concatChar; - protected boolean passEmptyLine = false; - protected boolean writeParentheses = true; protected String endingCar; - protected String prefixFirstWriteString; + protected String initializeOutputWriter; + protected String closingWriterChar; + + public String getClosingWriterChar() { + return closingWriterChar; + } + public void setClosingWriterChar(String closingWriterChar) { + this.closingWriterChar = closingWriterChar; + } + public String getOpeningWriterChar() { + return openingWriterChar; + } + public void setOpeningWriterChar(String openingWriterChar) { + this.openingWriterChar = openingWriterChar; + } + protected String openingWriterChar; public String getWriteString() { return writeString; @@ -28,29 +41,18 @@ public void setConcatChar(String concatChar) { this.concatChar = concatChar; } - public boolean isPassEmptyLine() { - return passEmptyLine; - } - public void setPassEmptyLine(boolean passEmptyLine) { - this.passEmptyLine = passEmptyLine; - } - public boolean isWriteParentheses() { - return writeParentheses; - } - public void setWriteParentheses(boolean writeParentheses) { - this.writeParentheses = writeParentheses; - } + public String getEndingCar() { return endingCar; } public void setEndingCar(String endingCar) { this.endingCar = endingCar; } - public String getPrefixFirstWriteString() { - return prefixFirstWriteString; + public String getInitializeOutputWriter() { + return initializeOutputWriter; } - public void setPrefixFirstWriteString(String prefixFirstWriteString) { - this.prefixFirstWriteString = prefixFirstWriteString; + public void setInitializeOutputWriter(String prefixFirstWriteString) { + this.initializeOutputWriter = prefixFirstWriteString; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-07-27 16:06:15 UTC (rev 1094) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-07-28 08:16:27 UTC (rev 1095) @@ -37,12 +37,13 @@ static { defaultFilterOption= new FilterOption(); - defaultFilterOption.setPrefixFirstWriteString("var "); - defaultFilterOption.setWriteString("result= \""); + defaultFilterOption.setInitializeOutputWriter("var result=\""); + defaultFilterOption.setWriteString("result"); defaultFilterOption.setStringDelim("\""); defaultFilterOption.setConcatChar("+"); defaultFilterOption.setEndingCar(";"); - defaultFilterOption.setWriteParentheses(false); + defaultFilterOption.setClosingWriterChar(""); + defaultFilterOption.setOpeningWriterChar("+="); } @@ -78,13 +79,14 @@ filterIn.setStringDelim(foption.getStringDelim()); filterIn.getParent().setWriteString(foption.getWriteString()); filterIn.setEndCar(foption.getEndingCar()); + filterIn.setOpeningWriterChar(foption.getOpeningWriterChar()); + filterIn.setClosingWriterChar(foption.getClosingWriterChar()); decoringEnd = foption.getStringDelim() + foption.getEndingCar(); - decoringAffect = foption.getPrefixFirstWriteString() - + foption.getWriteString(); + decoringAffect = foption.getInitializeOutputWriter(); // initialize new content String decoredContent = decoringInit;

1 0

r1094 - in trunk/wikitty-publication: . src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org July 27, 2011

July 27, 2011

Author: mfortun Date: 2011-07-27 18:06:15 +0200 (Wed, 27 Jul 2011) New Revision: 1094 Url: http://nuiton.org/repositories/revision/wikitty/1094 Log: * remove custom filter * now use improved Generator filter template Removed: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationUiFilter.java Modified: trunk/wikitty-publication/pom.xml trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-07-27 13:25:23 UTC (rev 1093) +++ trunk/wikitty-publication/pom.xml 2011-07-27 16:06:15 UTC (rev 1094) @@ -110,7 +110,7 @@ <dependency> <groupId>org.nuiton.processor</groupId> <artifactId>nuiton-processor</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> </dependency> </dependencies> Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationUiFilter.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationUiFilter.java 2011-07-27 13:25:23 UTC (rev 1093) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationUiFilter.java 2011-07-27 16:06:15 UTC (rev 1094) @@ -1,164 +0,0 @@ -package org.nuiton.wikitty.publication; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.processor.filters.DefaultFilter; - -/** - * Filter inspired from generatorTemplateFilterIn. - * - * Use to parse any wikittyPubText content to transform - * - * @author mfortun - * - */ -public class PublicationUiFilter extends DefaultFilter { - - private static final Log log = LogFactory.getLog(PublicationUiFilter.class); - - protected String beginParenthese = EMPTY_STRING; - - protected String endParenthese = EMPTY_STRING; - - protected boolean passEmptyLine; - protected boolean writeParentheses; - - protected String concatString; - - protected String stringDelim; - - protected String writeString; - protected String endingCar; - - public PublicationUiFilter() { - stringDelim = "\""; - concatString = "+"; - passEmptyLine = false; - writeParentheses = true; - writeString = "output.write"; - endingCar = ";"; - } - - /** - * méthode appelée lorsqu'on a la chaîne entière entre le header et le - * footer. - * - * @param ch - * la chaîne trouvé - * @return ce qu'il faut écrire dans le fichier de sortie - */ - @Override - protected String performInFilter(String ch) { - if (writeParentheses) { - beginParenthese = "("; - endParenthese = ")"; - } else { - beginParenthese = EMPTY_STRING; - endParenthese = EMPTY_STRING; - } - if (ch.startsWith("=")) { - return stringDelim + concatString + ch.substring(1) + concatString - + stringDelim; - } - return stringDelim + endParenthese + endingCar + ch + writeString - + beginParenthese + stringDelim; - } - - /** - * Converti les fin de commentaire *) en fin normal de commentraire - * - * @param ch - * la chaine a convertir - * @return la chaine convertie - */ - protected String convertEndComment(String ch) { - String result = ch.replaceAll("\\*\\)", "*/"); - return result; - } - - /** - * methode appele lorsqu'on a la chaine entiere a l'exterieur du - * header/footer - * - * @param ch - * la chaine trouve - * @return ce qu'il faut ecrire dans le fichier de sortie - */ - @Override - protected String performOutFilter(String ch) { - if (writeParentheses) { - beginParenthese = "("; - endParenthese = ")" + endingCar; - } else { - beginParenthese = EMPTY_STRING; - endParenthese = EMPTY_STRING; - } - String result = convertEndComment(ch).replaceAll("\"", "\\\\\"") - .replaceAll( - "(\r\n|\n|\r)", - "\\\\n\"" + endParenthese + endingCar + stringDelim - + writeString + beginParenthese + stringDelim); - // it's important that \r\n is first in regexp. - - return result; - } - - @Override - protected String getHeader() { - return "<%"; - } - - @Override - protected String getFooter() { - return "%>"; - } - - public boolean isPassEmptyLine() { - return passEmptyLine; - } - - public void setPassEmptyLine(boolean passEmptyLine) { - this.passEmptyLine = passEmptyLine; - } - - public String getConcatString() { - return concatString; - } - - public void setConcatString(String concatString) { - this.concatString = concatString; - } - - public String getStringDelim() { - return stringDelim; - } - - public void setStringDelim(String stringDelim) { - this.stringDelim = stringDelim; - } - - public boolean isWriteParentheses() { - return writeParentheses; - } - - public void setWriteParentheses(boolean writeParentheses) { - this.writeParentheses = writeParentheses; - } - - public String getWriteString() { - return writeString; - } - - public void setWriteString(String writeString) { - this.writeString = writeString; - } - - public String getEndingCar() { - return endingCar; - } - - public void setEndingCar(String endingCar) { - this.endingCar = endingCar; - } - -} Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-07-27 13:25:23 UTC (rev 1093) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-07-27 16:06:15 UTC (rev 1094) @@ -1,9 +1,17 @@ package org.nuiton.wikitty.publication; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.StringReader; +import java.io.StringWriter; import java.util.HashMap; import java.util.Map; import org.apache.commons.lang.StringUtils; +import org.nuiton.processor.Processor; +import org.nuiton.processor.ProcessorUtil; +import org.nuiton.processor.filters.GeneratorTemplatesFilter; +import org.nuiton.processor.filters.GeneratorTemplatesFilterIn; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.publication.entities.WikittyPubText; @@ -42,9 +50,12 @@ filtersOptions= new HashMap<String, FilterOption>(); } - public WikittyPubText transformPubUIToPubText(WikittyPubText wikitty) { + public WikittyPubText transformPubUIToPubText(WikittyPubText wikitty) throws IOException { - PublicationUiFilter filterUI = new PublicationUiFilter(); + + + GeneratorTemplatesFilter filter = new GeneratorTemplatesFilter(); + GeneratorTemplatesFilterIn filterIn = new GeneratorTemplatesFilterIn(filter); String mime = wikitty.getMimeType(); String initialVersion = wikitty.getWikittyVersion(); @@ -63,12 +74,13 @@ foption = defaultFilterOption; } - filterUI.setConcatString(foption.getConcatChar()); - filterUI.setPassEmptyLine(foption.isPassEmptyLine()); - filterUI.setWriteParentheses(foption.isWriteParentheses()); - filterUI.setStringDelim(foption.getStringDelim()); - filterUI.setWriteString(foption.getWriteString()); - filterUI.setEndingCar(foption.getEndingCar()); + filterIn.setConcacChar(foption.getConcatChar()); + filterIn.setStringDelim(foption.getStringDelim()); + filterIn.getParent().setWriteString(foption.getWriteString()); + filterIn.setEndCar(foption.getEndingCar()); + + + decoringEnd = foption.getStringDelim() + foption.getEndingCar(); decoringAffect = foption.getPrefixFirstWriteString() @@ -81,9 +93,20 @@ + ".setContentType(\"" + DEFAULT_MIME_TYPE_RETURN + "\")" + foption.getEndingCar(); + Processor proc= new Processor(); + proc.setInputFilter(filterIn); + + + + StringWriter writer = new StringWriter(); + // process string + proc.process(new StringReader(wikitty.getContent()), writer); + + + decoredContent += decoringAffect; // replace element between <% %> and <%= %> - decoredContent += filterUI.parse(wikitty.getContent()); + decoredContent += writer.toString(); // end of string decoredContent += decoringEnd;

1 0

r1093 - in trunk/wikitty-publication: . src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org July 27, 2011

July 27, 2011

Author: mfortun Date: 2011-07-27 15:25:23 +0200 (Wed, 27 Jul 2011) New Revision: 1093 Url: http://nuiton.org/repositories/revision/wikitty/1093 Log: * add nuiton processor as dependency * script engine replacement with filter Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationUiFilter.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java Modified: trunk/wikitty-publication/pom.xml Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-07-26 14:25:46 UTC (rev 1092) +++ trunk/wikitty-publication/pom.xml 2011-07-27 13:25:23 UTC (rev 1093) @@ -107,6 +107,12 @@ <artifactId>xwork-core</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.processor</groupId> + <artifactId>nuiton-processor</artifactId> + <version>1.2.1</version> + </dependency> + </dependencies>  Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java 2011-07-27 13:25:23 UTC (rev 1093) @@ -0,0 +1,59 @@ +package org.nuiton.wikitty.publication; + +public class FilterOption { + + protected String writeString; + protected String stringDelim; + protected String concatChar; + protected boolean passEmptyLine = false; + protected boolean writeParentheses = true; + protected String endingCar; + protected String prefixFirstWriteString; + + public String getWriteString() { + return writeString; + } + public void setWriteString(String writeString) { + this.writeString = writeString; + } + public String getStringDelim() { + return stringDelim; + } + public void setStringDelim(String stringDelim) { + this.stringDelim = stringDelim; + } + public String getConcatChar() { + return concatChar; + } + public void setConcatChar(String concatChar) { + this.concatChar = concatChar; + } + public boolean isPassEmptyLine() { + return passEmptyLine; + } + public void setPassEmptyLine(boolean passEmptyLine) { + this.passEmptyLine = passEmptyLine; + } + public boolean isWriteParentheses() { + return writeParentheses; + } + public void setWriteParentheses(boolean writeParentheses) { + this.writeParentheses = writeParentheses; + } + public String getEndingCar() { + return endingCar; + } + public void setEndingCar(String endingCar) { + this.endingCar = endingCar; + } + public String getPrefixFirstWriteString() { + return prefixFirstWriteString; + } + public void setPrefixFirstWriteString(String prefixFirstWriteString) { + this.prefixFirstWriteString = prefixFirstWriteString; + } + + + + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationUiFilter.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationUiFilter.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationUiFilter.java 2011-07-27 13:25:23 UTC (rev 1093) @@ -0,0 +1,164 @@ +package org.nuiton.wikitty.publication; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.processor.filters.DefaultFilter; + +/** + * Filter inspired from generatorTemplateFilterIn. + * + * Use to parse any wikittyPubText content to transform + * + * @author mfortun + * + */ +public class PublicationUiFilter extends DefaultFilter { + + private static final Log log = LogFactory.getLog(PublicationUiFilter.class); + + protected String beginParenthese = EMPTY_STRING; + + protected String endParenthese = EMPTY_STRING; + + protected boolean passEmptyLine; + protected boolean writeParentheses; + + protected String concatString; + + protected String stringDelim; + + protected String writeString; + protected String endingCar; + + public PublicationUiFilter() { + stringDelim = "\""; + concatString = "+"; + passEmptyLine = false; + writeParentheses = true; + writeString = "output.write"; + endingCar = ";"; + } + + /** + * méthode appelée lorsqu'on a la chaîne entière entre le header et le + * footer. + * + * @param ch + * la chaîne trouvé + * @return ce qu'il faut écrire dans le fichier de sortie + */ + @Override + protected String performInFilter(String ch) { + if (writeParentheses) { + beginParenthese = "("; + endParenthese = ")"; + } else { + beginParenthese = EMPTY_STRING; + endParenthese = EMPTY_STRING; + } + if (ch.startsWith("=")) { + return stringDelim + concatString + ch.substring(1) + concatString + + stringDelim; + } + return stringDelim + endParenthese + endingCar + ch + writeString + + beginParenthese + stringDelim; + } + + /** + * Converti les fin de commentaire *) en fin normal de commentraire + * + * @param ch + * la chaine a convertir + * @return la chaine convertie + */ + protected String convertEndComment(String ch) { + String result = ch.replaceAll("\\*\\)", "*/"); + return result; + } + + /** + * methode appele lorsqu'on a la chaine entiere a l'exterieur du + * header/footer + * + * @param ch + * la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ + @Override + protected String performOutFilter(String ch) { + if (writeParentheses) { + beginParenthese = "("; + endParenthese = ")" + endingCar; + } else { + beginParenthese = EMPTY_STRING; + endParenthese = EMPTY_STRING; + } + String result = convertEndComment(ch).replaceAll("\"", "\\\\\"") + .replaceAll( + "(\r\n|\n|\r)", + "\\\\n\"" + endParenthese + endingCar + stringDelim + + writeString + beginParenthese + stringDelim); + // it's important that \r\n is first in regexp. + + return result; + } + + @Override + protected String getHeader() { + return "<%"; + } + + @Override + protected String getFooter() { + return "%>"; + } + + public boolean isPassEmptyLine() { + return passEmptyLine; + } + + public void setPassEmptyLine(boolean passEmptyLine) { + this.passEmptyLine = passEmptyLine; + } + + public String getConcatString() { + return concatString; + } + + public void setConcatString(String concatString) { + this.concatString = concatString; + } + + public String getStringDelim() { + return stringDelim; + } + + public void setStringDelim(String stringDelim) { + this.stringDelim = stringDelim; + } + + public boolean isWriteParentheses() { + return writeParentheses; + } + + public void setWriteParentheses(boolean writeParentheses) { + this.writeParentheses = writeParentheses; + } + + public String getWriteString() { + return writeString; + } + + public void setWriteString(String writeString) { + this.writeString = writeString; + } + + public String getEndingCar() { + return endingCar; + } + + public void setEndingCar(String endingCar) { + this.endingCar = endingCar; + } + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationUiFilter.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-07-27 13:25:23 UTC (rev 1093) @@ -0,0 +1,103 @@ +package org.nuiton.wikitty.publication; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.lang.StringUtils; +import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.publication.entities.WikittyPubText; + +public class UiCodeDecorator { + + /* + * Après le script engine le ui Code décorateur + * + * décorer à l'inverse en fait transformer du html en js qui contient du + * html par exemple + */ + + protected String DEFAULT_MIME_TYPE_RETURN = "text/html"; + protected String MIME_SEP = "/"; + + protected Map<String, FilterOption> filtersOptions; + + static protected FilterOption defaultFilterOption; + protected String decoringInit = StringUtils.EMPTY; + protected String decoringAffect; + protected String decoringEnd; + + + static { + defaultFilterOption= new FilterOption(); + defaultFilterOption.setPrefixFirstWriteString("var "); + defaultFilterOption.setWriteString("result= \""); + defaultFilterOption.setStringDelim("\""); + defaultFilterOption.setConcatChar("+"); + defaultFilterOption.setEndingCar(";"); + defaultFilterOption.setWriteParentheses(false); + } + + + public UiCodeDecorator() { + filtersOptions= new HashMap<String, FilterOption>(); + } + + public WikittyPubText transformPubUIToPubText(WikittyPubText wikitty) { + + PublicationUiFilter filterUI = new PublicationUiFilter(); + + String mime = wikitty.getMimeType(); + String initialVersion = wikitty.getWikittyVersion(); + + /* + * changement de mime type changement de + */ + /* + * Fonction du mime type + */ + + String[] mimeTab = StringUtil.split(mime, MIME_SEP); + + FilterOption foption = filtersOptions.get(mimeTab[1]); + if (foption == null) { + foption = defaultFilterOption; + } + + filterUI.setConcatString(foption.getConcatChar()); + filterUI.setPassEmptyLine(foption.isPassEmptyLine()); + filterUI.setWriteParentheses(foption.isWriteParentheses()); + filterUI.setStringDelim(foption.getStringDelim()); + filterUI.setWriteString(foption.getWriteString()); + filterUI.setEndingCar(foption.getEndingCar()); + + decoringEnd = foption.getStringDelim() + foption.getEndingCar(); + decoringAffect = foption.getPrefixFirstWriteString() + + foption.getWriteString(); + // initialize new content + String decoredContent = decoringInit; + + // set default content result (override if wikitty content define it) + decoredContent += WikittyPublicationConstant.CONTEXT_VAR + + ".setContentType(\"" + DEFAULT_MIME_TYPE_RETURN + "\")" + + foption.getEndingCar(); + + decoredContent += decoringAffect; + // replace element between <% %> and <%= %> + decoredContent += filterUI.parse(wikitty.getContent()); + + // end of string + decoredContent += decoringEnd; + + wikitty.setContent(decoredContent); + wikitty.setMimeType(mime); + wikitty.setWikittyVersion(initialVersion); + + return wikitty; + } + + public boolean isTransformationNeeded(WikittyPubText wikitty){ + return true; + } + + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0

r1092 - trunk/wikitty-publication/src/site/rst
by mfortun＠users.nuiton.org July 26, 2011

July 26, 2011

Author: mfortun Date: 2011-07-26 16:25:46 +0200 (Tue, 26 Jul 2011) New Revision: 1092 Url: http://nuiton.org/repositories/revision/wikitty/1092 Log: * correct wikitty publication ui solution Modified: trunk/wikitty-publication/src/site/rst/publication-ui.rst Modified: trunk/wikitty-publication/src/site/rst/publication-ui.rst =================================================================== --- trunk/wikitty-publication/src/site/rst/publication-ui.rst 2011-07-26 13:11:33 UTC (rev 1091) +++ trunk/wikitty-publication/src/site/rst/publication-ui.rst 2011-07-26 14:25:46 UTC (rev 1092) @@ -49,30 +49,48 @@ Solution proposée ================= -La solution la plus simple serait d'autoriser le html directement dans les -WikittyPubText, voir avoir un nouveau wikittyPub pour le html. Mais ce n'est -pas suffisant comme solution, on perd la possibilité d'avoir du code -dans ces wikittyPubText là. +Plutôt qu'un script engine pour le html qui permettrais l'intégration d'élements +des bindings, on va transformer les wikittyPubText qui contiennent des +construction d'ui en wikittyPubText qui seront évalué par le script engine +correspondant au langage correspondant. -Il faut finalement un nouveau script engine pour le html, ce qui implique que -dans le code html on pourra insérer des invocations direct à des éléments mis -dans les bindings. +Par exemple : -Par exemple: - - <div class='menu'> -wpEval.doAction(wpContext, "WikiMenu")+ +<%wpEval.doAction(wpContext, "WikiMenu")%> </div> <h1>Bonjour Les Lutins,</h1> Bienvenue sur le Wikitty Wiki -<img src="wpContext.makeUrl("/raw/Logo")"/> -Cette solution à l’intérêt d'être relativement simple et de permettre la -création de page naturellement, puisqu'il n'y a aucune différence de traitement -tout passe par "eval". +va devenir : +wpContext.setContentType("text/html"); +var result = +""+ +" <div class='menu'>\n"+ +wpEval.doAction(wpContext, "WikiMenu")+ +" </div>\n"+ +" <h1>Bonjour Les Lutins,</h1>\n"+ +" Bienvenue sur le Wikitty Wiki\n"; +result; -On gagne toutes les possibilités du Html pour le rendu, avec la possibilité -de javascript et css, javascript qui peut être inséré dans la page ou évalué -en tant que code. +Et être finalement interprété par le script engine javascript. + +Les éléments de binding ou de code seront glissé entre des "balises" type +jsp: "<%= %> / <% %>" ce qui permettra de les isolers et de savoir quels morceau +"décorer". Entre les balises on doit pouvoir écrire du code dans le langage de +son choix, enfin le même pour toute la page. + +Pour spécifier que le code à été écrit dans un certain langage on va jouer avec +le mime type, par exmeple pour ce morceau de wikittyPubText, on pourra avoir un +mime type : + +htmlp/js + +Et une fois que l'on aura décoré le myme type sera application/javascript, la +valeur après le "/" donnera le langage cible, et la valeur avant le "/" la façon +dont on doit interpréter le code "ui". + +Pour converserver ces informations pour des wikittyPubText sur fileSystem ou +externaliser on pourra imaginer sauver celà dans l'extension du fichier par +exemple : fichiertoto.htmlp.js

1 0

r1091 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org July 26, 2011

July 26, 2011

Author: mfortun Date: 2011-07-26 15:11:33 +0200 (Tue, 26 Jul 2011) New Revision: 1091 Url: http://nuiton.org/repositories/revision/wikitty/1091 Log: * html script engine to complex, will use another solution Removed: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/

1 0