Author: mfortun Date: 2011-08-12 18:26:07 +0200 (Fri, 12 Aug 2011) New Revision: 1140 Url: http://nuiton.org/repositories/revision/wikitty/1140 Log: *prepare better handling for java type Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.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-08-12 16:01:00 UTC (rev 1139) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-12 16:26:07 UTC (rev 1140) @@ -47,6 +47,7 @@ */ public class MimeTypePubHelper { + public static final String JAVA_TYPE = "text/java"; /** * Mapping between extention and mime type, key: extension, value: mimeType */ @@ -81,7 +82,7 @@ compilable = new LinkedList<String>(); bidiMap = new DualHashBidiMap(); manager = ScriptEvaluator.getScriptEnginManager(null); - compilable.add("text/java"); + compilable.add(JAVA_TYPE); InputStream input = MimeTypePubHelper.class.getResourceAsStream("/mimetype.properties"); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-12 16:01:00 UTC (rev 1139) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-12 16:26:07 UTC (rev 1140) @@ -296,18 +296,18 @@ // TODO mfortun-2011-07-08 write a better "filter" must isolate specific // mime type that correspond to precompilable langague - if (!mimeHelper.isReallyCompilable(mimeType)) { - classContent += "Object result = null;"; - classContent += "String content = \"" - + StringEscapeUtils.escapeJava(content) + "\";"; - classContent += "String mimeType = \"" - + StringEscapeUtils.escapeJava(mimeType) + "\";"; - classContent += "String criteriaName= \"" + Element.ELT_ID + ":" - + wikitty.getId() + "\";"; - classContent += " result = ScriptEvaluator.eval(null, criteriaName, content, mimeType, bindings);"; - classContent += "return result;"; - } else { + classContent += "Object result = null;"; + classContent += "String content = \"" + + StringEscapeUtils.escapeJava(content) + "\";"; + classContent += "String mimeType = \"" + + StringEscapeUtils.escapeJava(mimeType) + "\";"; + classContent += "String criteriaName= \"" + Element.ELT_ID + ":" + + wikitty.getId() + "\";"; + classContent += " result = ScriptEvaluator.eval(null, criteriaName, content, mimeType, bindings);"; + classContent += "return result;"; + if (mimeType.equals(MimeTypePubHelper.JAVA_TYPE)){ + /* * Iterate on element that must be in the context and write *