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

r1096 - in trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication: . action
by mfortun＠users.nuiton.org 28 Jul '11

28 Jul '11

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 28 Jul '11

28 Jul '11

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 27 Jul '11

27 Jul '11

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 27 Jul '11

27 Jul '11

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 26 Jul '11

26 Jul '11

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 26 Jul '11

26 Jul '11

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

r1090 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine
by mfortun＠users.nuiton.org 26 Jul '11

26 Jul '11

Author: mfortun Date: 2011-07-26 14:24:33 +0200 (Tue, 26 Jul 2011) New Revision: 1090 Url: http://nuiton.org/repositories/revision/wikitty/1090 Log: * add comments Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngine.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngine.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngine.java 2011-07-26 11:43:51 UTC (rev 1089) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngine.java 2011-07-26 12:24:33 UTC (rev 1090) @@ -14,11 +14,23 @@ import javax.script.SimpleBindings; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.ArrayUtil; import org.nuiton.util.StringUtil; +/** + * Script engine for html code. + * Use to handle binds element invocation inside html code. + * + * @author mfortun + * + */ public class HtmlScriptEngine implements ScriptEngine { + + final static Log log = LogFactory.getLog(HtmlScriptEngine.class); + /* * algo super simple en fait. * @@ -34,6 +46,9 @@ static public String REGEX_END = "$"; static public String REGEX_EMPTY = " +"; static public String REGEX_EMPTY_END = REGEX_EMPTY + REGEX_END; + /** + * regex to match string method argument + */ static public String REGEX_STRING_ARG = "\"[\\w\\d]*\""; protected ScriptEngineFactory factory; @@ -135,16 +150,23 @@ return factory; } + /** + * Finaly handle html to found invokation to bindings element + * @param code the html code + * @param binds the binding + * @return code with binds value/invokation replacement + */ protected String evaluateCodeInsideHtml(String code, Bindings binds) { String result = new String(code); for (String bindingElement : binds.keySet()) { Object oo = binds.get(bindingElement); - + + // parse to search method invokation on binds element String[] hmtl = result.split(bindingElement + REGEX_BIND_ELEMENT_METHOD); - + String pageModified = hmtl[0]; for (int i = 0; i < hmtl.length - 1; i++) { @@ -153,17 +175,15 @@ int end = code.indexOf(hmtl[i + 1]); // end = end; - + // Isolate method invocation String codeToExecude = code.substring(begin, end); codeToExecude = codeToExecude.trim(); - + //invoke String resultCode = invokeFromName(oo, codeToExecude, binds); // replace at position by result - pageModified += resultCode; - pageModified += hmtl[i + 1]; } @@ -186,11 +206,18 @@ * Si ça match seulement avec le nom alors on fait * getValue().tostring */ - } return result; } + /** + * use to invoke method on the object contained in the bindinds + * @param oo the object bind + * @param invokation the string containing the invokation + * @param binds binding used inside evaluation + * @return result of the invokation or if method not found the invokation + * string + */ protected String invokeFromName(Object oo, String invokation, Bindings binds) { int dotPosition = invokation.indexOf("."); @@ -203,15 +230,16 @@ // String methodName = invokation.substring(dotPosition + 1, openBracketPosition); - + // obtain param list String params = invokation.substring(openBracketPosition + 1, closingBracketPosition); - + // parse params String[] parsedParam = StringUtil.split(params, ","); List<Object> listParam = new LinkedList<Object>(); List<Class<?>> listType = new LinkedList<Class<?>>(); - + + // found param type and values for (String argument : parsedParam) { Object value = argument; /* @@ -261,8 +289,7 @@ result = methodBindin.invoke(oo, args).toString(); } catch (Exception e) { - e.printStackTrace(); - // TODO mfortun-2011-07-25 handle exception + log.debug("Method "+methodName+ " not found on:" + oo); } return result;

1 0

r1089 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine
by mfortun＠users.nuiton.org 26 Jul '11

26 Jul '11

Author: mfortun Date: 2011-07-26 13:43:51 +0200 (Tue, 26 Jul 2011) New Revision: 1089 Url: http://nuiton.org/repositories/revision/wikitty/1089 Log: * correct engine for method invoke Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngine.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngine.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngine.java 2011-07-25 15:24:41 UTC (rev 1088) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngine.java 2011-07-26 11:43:51 UTC (rev 1089) @@ -14,6 +14,7 @@ import javax.script.SimpleBindings; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; +import org.nuiton.util.ArrayUtil; import org.nuiton.util.StringUtil; public class HtmlScriptEngine implements ScriptEngine { @@ -29,10 +30,11 @@ * usefull to match element contained inside the binding map that on which * method are called. like : objectName.getName() objectName.setName("truc") */ - static public String REGEX_BIND_ELEMENT_METHOD = "\\.\\w+\$\\w*\$"; + static public String REGEX_BIND_ELEMENT_METHOD = "\\.\\w+\$[\\w\"\\d]*\$"; static public String REGEX_END = "$"; - static public String REGEX_EMPTY = " *"; + static public String REGEX_EMPTY = " +"; static public String REGEX_EMPTY_END = REGEX_EMPTY + REGEX_END; + static public String REGEX_STRING_ARG = "\"[\\w\\d]*\""; protected ScriptEngineFactory factory; protected ScriptContext context; @@ -54,8 +56,8 @@ try { return this.eval(IOUtils.toString(reader), context); } catch (IOException e) { - //TODO mfortun-2011-07-25 handle this, change ? - return StringUtils.EMPTY; + // TODO mfortun-2011-07-25 handle this, change ? + return StringUtils.EMPTY; } } @@ -85,8 +87,8 @@ try { return this.eval(IOUtils.toString(reader), n); } catch (IOException e) { - //TODO mfortun-2011-07-25 handle this, change ? - return StringUtils.EMPTY; + // TODO mfortun-2011-07-25 handle this, change ? + return StringUtils.EMPTY; } } @@ -147,26 +149,31 @@ for (int i = 0; i < hmtl.length - 1; i++) { int begin = code.indexOf(hmtl[i]); - begin = begin + hmtl[i].length() + 1; + begin = begin + hmtl[i].length(); int end = code.indexOf(hmtl[i + 1]); - end = end - 1; + // end = end; String codeToExecude = code.substring(begin, end); codeToExecude = codeToExecude.trim(); + String resultCode = invokeFromName(oo, codeToExecude, binds); // replace at position by result - pageModified += " " + resultCode + " "; + pageModified += resultCode; pageModified += hmtl[i + 1]; } - pageModified.replaceAll(bindingElement + REGEX_END, oo.toString()); - pageModified.replaceAll(bindingElement + REGEX_EMPTY_END, - oo.toString() + " "); + pageModified = pageModified.replaceAll(bindingElement + REGEX_END + + "|" + REGEX_EMPTY + bindingElement + REGEX_EMPTY, + oo.toString()); + // pageModified = pageModified.replaceAll(bindingElement + + // REGEX_EMPTY_END, + // oo.toString() + " "); + result = pageModified; /* @@ -186,17 +193,19 @@ protected String invokeFromName(Object oo, String invokation, Bindings binds) { - String result = StringUtils.EMPTY; - int dotPosition = invokation.indexOf("."); int openBracketPosition = invokation.indexOf("("); int closingBracketPosition = invokation.indexOf(")"); + // if no method found just let the same string in place + String result = invokation; + // .substring(0,dotPosition);; + // String methodName = invokation.substring(dotPosition + 1, - openBracketPosition - 1); + openBracketPosition); String params = invokation.substring(openBracketPosition + 1, - closingBracketPosition - 1); + closingBracketPosition); String[] parsedParam = StringUtil.split(params, ","); @@ -209,6 +218,13 @@ * check if argument is contained inside binding */ + if (argument.matches(REGEX_STRING_ARG)){ + value = argument.substring(1, argument.length()-1); + listParam.add(value); + listType.add(String.class); + continue; + } + if (binds.containsKey(argument)) { value = binds.get(argument); listParam.add(value); @@ -235,14 +251,17 @@ } Object[] args = listParam.toArray(); - Class<?>[] types = (Class<?>[]) listType.toArray(); + Class<?>[] types = ArrayUtil.toArray(listType, Class.class); + try { Method methodBindin = oo.getClass().getMethod(methodName, types); + result = methodBindin.invoke(oo, args).toString(); } catch (Exception e) { + e.printStackTrace(); // TODO mfortun-2011-07-25 handle exception } @@ -250,7 +269,4 @@ } - - - }

1 0

r1088 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine
by mfortun＠users.nuiton.org 25 Jul '11

25 Jul '11

Author: mfortun Date: 2011-07-25 17:24:41 +0200 (Mon, 25 Jul 2011) New Revision: 1088 Url: http://nuiton.org/repositories/revision/wikitty/1088 Log: * complete factory Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngineFactory.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngineFactory.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngineFactory.java 2011-07-25 13:34:29 UTC (rev 1087) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngineFactory.java 2011-07-25 15:24:41 UTC (rev 1088) @@ -1,17 +1,43 @@ package org.nuiton.wikitty.publication.engine; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import javax.script.ScriptEngine; import javax.script.ScriptEngineFactory; +public class HtmlScriptEngineFactory implements ScriptEngineFactory { -public class HtmlScriptEngineFactory implements ScriptEngineFactory{ + static protected List<String> extensions; + static protected List<String> names; + static protected List<String> mimesTypes; + static { + extensions = new ArrayList<String>(5); + extensions.add("xhtml"); + extensions.add("xht"); + extensions.add("xml"); + extensions.add("html"); + extensions.add("htm"); + extensions = Collections.unmodifiableList(extensions); + + names = new ArrayList<String>(2); + names.add("HtmlScriptEngine"); + names.add("WikittyPublicationHtmlEngine"); + names = Collections.unmodifiableList(names); + + mimesTypes = new ArrayList<String>(2); + mimesTypes.add("application/xhtml+xml"); + mimesTypes.add("text/html"); + + mimesTypes = Collections.unmodifiableList(mimesTypes); + } + @Override public String getEngineName() { return "HTML"; - + } @Override @@ -21,26 +47,17 @@ @Override public List<String> getExtensions() { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - //return null; - + return extensions; } @Override public List<String> getMimeTypes() { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - //return null; - + return mimesTypes; } @Override public List<String> getNames() { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - //return null; - + return names; } @Override @@ -50,54 +67,70 @@ @Override public String getLanguageVersion() { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - //return null; - + return "5.0"; } @Override public Object getParameter(String key) { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - //return null; - + + if (key.equals(ScriptEngine.ENGINE)) { + return this.getScriptEngine(); + } + if (key.equals(ScriptEngine.ENGINE_VERSION)) { + return this.getEngineVersion(); + } + if (key.equals(ScriptEngine.NAME)) { + return this.getEngineName(); + } + if (key.equals(ScriptEngine.LANGUAGE)) { + return this.getLanguageName(); + } + if (key.equals(ScriptEngine.LANGUAGE_VERSION)) { + return this.getLanguageVersion(); + } + + throw new IllegalArgumentException("Invalid key"); + } @Override public String getMethodCallSyntax(String obj, String m, String... args) { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - //return null; - + String ret = obj + "." + m + "("; + int len = args.length; + if (len == 0) { + ret += ")"; + return ret; + } + + for (int i = 0; i < len; i++) { + ret += args[i]; + if (i != len - 1) { + ret += ","; + } else { + ret += ")"; + } + } + return ret; } @Override public String getOutputStatement(String toDisplay) { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - //return null; - + return toDisplay; } @Override public String getProgram(String... statements) { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - //return null; - + int len = statements.length; + String ret = ""; + for (int i = 0; i < len; i++) { + ret += statements[i] + ";"; + } + + return ret; } @Override public ScriptEngine getScriptEngine() { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - //return null; - + return new HtmlScriptEngine(); } - - - - - }

1 0

r1087 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine
by mfortun＠users.nuiton.org 25 Jul '11

25 Jul '11

Author: mfortun Date: 2011-07-25 15:34:29 +0200 (Mon, 25 Jul 2011) New Revision: 1087 Url: http://nuiton.org/repositories/revision/wikitty/1087 Log: * complete html script engine methods Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngine.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngine.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngine.java 2011-07-25 13:08:27 UTC (rev 1086) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/engine/HtmlScriptEngine.java 2011-07-25 13:34:29 UTC (rev 1087) @@ -1,5 +1,6 @@ package org.nuiton.wikitty.publication.engine; +import java.io.IOException; import java.io.Reader; import java.lang.reflect.Method; import java.util.LinkedList; @@ -11,6 +12,7 @@ import javax.script.ScriptEngineFactory; import javax.script.ScriptException; import javax.script.SimpleBindings; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.nuiton.util.StringUtil; @@ -29,7 +31,8 @@ */ static public String REGEX_BIND_ELEMENT_METHOD = "\\.\\w+\$\\w*\$"; static public String REGEX_END = "$"; - static public String REGEX_EMPTY_END = " *" + REGEX_END; + static public String REGEX_EMPTY = " *"; + static public String REGEX_EMPTY_END = REGEX_EMPTY + REGEX_END; protected ScriptEngineFactory factory; protected ScriptContext context; @@ -38,51 +41,53 @@ @Override public Object eval(String script, ScriptContext context) throws ScriptException { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - // return null; - + if (context.getBindings(ScriptContext.ENGINE_SCOPE) == null) { + return script; + } + return evaluateCodeInsideHtml(script, + context.getBindings(ScriptContext.ENGINE_SCOPE)); } @Override public Object eval(Reader reader, ScriptContext context) throws ScriptException { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - // return null; - + try { + return this.eval(IOUtils.toString(reader), context); + } catch (IOException e) { + //TODO mfortun-2011-07-25 handle this, change ? + return StringUtils.EMPTY; + } } @Override public Object eval(String script) throws ScriptException { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - // return null; + if (context.getBindings(ScriptContext.ENGINE_SCOPE) == null) { + return script; + } + return evaluateCodeInsideHtml(script, + context.getBindings(ScriptContext.ENGINE_SCOPE)); } @Override public Object eval(Reader reader) throws ScriptException { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - // return null; + return this.eval(reader, getContext()); } @Override public Object eval(String script, Bindings n) throws ScriptException { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - // return null; - + return evaluateCodeInsideHtml(script, n); } @Override public Object eval(Reader reader, Bindings n) throws ScriptException { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - // return null; - + try { + return this.eval(IOUtils.toString(reader), n); + } catch (IOException e) { + //TODO mfortun-2011-07-25 handle this, change ? + return StringUtils.EMPTY; + } } @Override @@ -245,4 +250,7 @@ } + + + }

1 0