This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit e85155ee9d79b175edd93ac40c6840111f1c14ea Author: juanpablo <[email protected]> AuthorDate: Thu Jan 16 00:05:42 2020 +0100 use new VariableManager#VAR_RUNFILTERS instead of old WikiEngine#PROP_RUNFILTERS on jsps --- .../src/main/webapp/templates/210/editors/CKeditor.jsp | 10 +++++----- jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp | 9 +++++---- jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp | 11 +++++------ .../src/main/webapp/templates/default/editors/CKeditor.jsp | 11 +++++------ .../src/main/webapp/templates/default/editors/TinyMCE.jsp | 11 +++++------ .../src/main/webapp/templates/default/editors/wysiwyg.jsp | 11 +++++------ 6 files changed, 30 insertions(+), 33 deletions(-) diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/CKeditor.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/CKeditor.jsp index d7ab340..08c287e 100644 --- a/jspwiki-war/src/main/webapp/templates/210/editors/CKeditor.jsp +++ b/jspwiki-war/src/main/webapp/templates/210/editors/CKeditor.jsp @@ -19,17 +19,17 @@ <%@ page language="java" pageEncoding="UTF-8"%> <%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %> <%@ page import="java.util.Properties"%> +<%@ page import="org.apache.commons.text.*" %> <%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.auth.*" %> <%@ page import="org.apache.wiki.auth.permissions.*" %> +<%@ page import="org.apache.wiki.filters.*" %> <%@ page import="org.apache.wiki.render.*" %> <%@ page import="org.apache.wiki.parser.JSPWikiMarkupParser" %> <%@ page import="org.apache.wiki.ui.*" %> - <%@ page import="org.apache.wiki.util.TextUtil" %> +<%@ page import="org.apache.wiki.variables.VariableManager" %> -<%@ page import="org.apache.wiki.filters.*" %> -<%@ page import="org.apache.commons.text.*" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %> <fmt:setLocale value="${prefs.Language}" /> @@ -51,7 +51,7 @@ */ context.setVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE, Boolean.TRUE ); - context.setVariable( WikiEngine.PROP_RUNFILTERS, "false" ); + context.setVariable( VariableManager.VAR_RUNFILTERS, "false" ); WikiPage wikiPage = context.getPage(); String originalCCLOption = (String)wikiPage.getAttribute( JSPWikiMarkupParser.PROP_CAMELCASELINKS ); @@ -110,7 +110,7 @@ // after the XHTML for CKeditor has been rendered. context.setVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE, Boolean.FALSE ); - context.setVariable( WikiEngine.PROP_RUNFILTERS, null ); + context.setVariable( VariableManager.VAR_RUNFILTERS, null ); wikiPage.setAttribute( JSPWikiMarkupParser.PROP_CAMELCASELINKS, originalCCLOption ); /*not used diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp index 470d060..4db5005 100644 --- a/jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp +++ b/jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp @@ -20,15 +20,16 @@ <%@ page language="java" pageEncoding="UTF-8"%> <%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %> <%@ page import="java.util.Properties"%> +<%@ page import="org.apache.commons.text.*" %> <%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.auth.*" %> <%@ page import="org.apache.wiki.auth.permissions.*" %> +<%@ page import="org.apache.wiki.filters.*" %> <%@ page import="org.apache.wiki.render.*" %> <%@ page import="org.apache.wiki.parser.JSPWikiMarkupParser" %> <%@ page import="org.apache.wiki.ui.*" %> <%@ page import="org.apache.wiki.util.TextUtil" %> -<%@ page import="org.apache.wiki.filters.*" %> -<%@ page import="org.apache.commons.text.*" %> +<%@ page import="org.apache.wiki.variables.VariableManager" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %> <fmt:setLocale value="${prefs.Language}" /> @@ -39,7 +40,7 @@ <% WikiContext context = WikiContext.findContext( pageContext ); WikiEngine engine = context.getEngine(); context.setVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE, Boolean.TRUE ); - context.setVariable( WikiEngine.PROP_RUNFILTERS, "false" ); + context.setVariable( VariableManager.VAR_RUNFILTERS, "false" ); WikiPage wikiPage = context.getPage(); String originalCCLOption = (String)wikiPage.getAttribute( JSPWikiMarkupParser.PROP_CAMELCASELINKS ); @@ -86,7 +87,7 @@ // Disable the WYSIWYG_EDITOR_MODE and reset the other properties immediately // after the XHTML for FCK has been rendered. context.setVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE, Boolean.FALSE ); - context.setVariable( WikiEngine.PROP_RUNFILTERS, null ); + context.setVariable( VariableManager.VAR_RUNFILTERS, null ); wikiPage.setAttribute( JSPWikiMarkupParser.PROP_CAMELCASELINKS, originalCCLOption ); String templateDir = (String)engine.getWikiProperties().get( WikiEngine.PROP_TEMPLATEDIR ); diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp index 45c4335..0372792 100644 --- a/jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp +++ b/jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp @@ -19,17 +19,16 @@ <%@ page language="java" pageEncoding="UTF-8"%> <%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %> <%@ page import="java.util.Properties"%> +<%@ page import="org.apache.commons.text.*" %> <%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.auth.*" %> <%@ page import="org.apache.wiki.auth.permissions.*" %> +<%@ page import="org.apache.wiki.filters.*" %> <%@ page import="org.apache.wiki.render.*" %> <%@ page import="org.apache.wiki.parser.JSPWikiMarkupParser" %> <%@ page import="org.apache.wiki.ui.*" %> - <%@ page import="org.apache.wiki.util.TextUtil" %> - -<%@ page import="org.apache.wiki.filters.*" %> -<%@ page import="org.apache.commons.text.*" %> +<%@ page import="org.apache.wiki.variables.VariableManager" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %> <fmt:setLocale value="${prefs.Language}" /> @@ -51,7 +50,7 @@ */ context.setVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE, Boolean.TRUE ); - context.setVariable( WikiEngine.PROP_RUNFILTERS, "false" ); + context.setVariable( VariableManager.VAR_RUNFILTERS, "false" ); WikiPage wikiPage = context.getPage(); String originalCCLOption = (String)wikiPage.getAttribute( JSPWikiMarkupParser.PROP_CAMELCASELINKS ); @@ -106,7 +105,7 @@ // Disable the WYSIWYG_EDITOR_MODE and reset the other properties immediately // after the XHTML for TinyMCE has been rendered. context.setVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE, Boolean.FALSE ); - context.setVariable( WikiEngine.PROP_RUNFILTERS, null ); + context.setVariable( VariableManager.VAR_RUNFILTERS, null ); wikiPage.setAttribute( JSPWikiMarkupParser.PROP_CAMELCASELINKS, originalCCLOption ); /*not used diff --git a/jspwiki-war/src/main/webapp/templates/default/editors/CKeditor.jsp b/jspwiki-war/src/main/webapp/templates/default/editors/CKeditor.jsp index 9fa10da..c292043 100644 --- a/jspwiki-war/src/main/webapp/templates/default/editors/CKeditor.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/editors/CKeditor.jsp @@ -18,17 +18,16 @@ --%> <%@ page language="java" pageEncoding="UTF-8"%> <%@ page import="java.util.Properties"%> +<%@ page import="org.apache.commons.lang3.*" %> <%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.auth.*" %> <%@ page import="org.apache.wiki.auth.permissions.*" %> +<%@ page import="org.apache.wiki.filters.*" %> <%@ page import="org.apache.wiki.render.*" %> <%@ page import="org.apache.wiki.parser.JSPWikiMarkupParser" %> <%@ page import="org.apache.wiki.ui.*" %> - <%@ page import="org.apache.wiki.util.TextUtil" %> - -<%@ page import="org.apache.wiki.filters.*" %> -<%@ page import="org.apache.commons.lang3.*" %> +<%@ page import="org.apache.wiki.variables.VariableManager" %> <%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %> @@ -52,7 +51,7 @@ */ context.setVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE, Boolean.TRUE ); - context.setVariable( WikiEngine.PROP_RUNFILTERS, "false" ); + context.setVariable( VariableManager.VAR_RUNFILTERS, "false" ); WikiPage wikiPage = context.getPage(); String originalCCLOption = (String)wikiPage.getAttribute( JSPWikiMarkupParser.PROP_CAMELCASELINKS ); @@ -115,7 +114,7 @@ // Disable the WYSIWYG_EDITOR_MODE and reset the other properties immediately // after the XHTML for CKeditor has been rendered. context.setVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE, Boolean.FALSE ); - context.setVariable( WikiEngine.PROP_RUNFILTERS, null ); + context.setVariable( VariableManager.VAR_RUNFILTERS, null ); wikiPage.setAttribute( JSPWikiMarkupParser.PROP_CAMELCASELINKS, originalCCLOption ); /*FFS not used diff --git a/jspwiki-war/src/main/webapp/templates/default/editors/TinyMCE.jsp b/jspwiki-war/src/main/webapp/templates/default/editors/TinyMCE.jsp index 5e46921..106f3d9 100644 --- a/jspwiki-war/src/main/webapp/templates/default/editors/TinyMCE.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/editors/TinyMCE.jsp @@ -19,17 +19,16 @@ <%@ page language="java" pageEncoding="UTF-8"%> <%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %> <%@ page import="java.util.Properties"%> +<%@ page import="org.apache.commons.lang3.*" %> <%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.auth.*" %> <%@ page import="org.apache.wiki.auth.permissions.*" %> +<%@ page import="org.apache.wiki.filters.*" %> <%@ page import="org.apache.wiki.render.*" %> <%@ page import="org.apache.wiki.parser.JSPWikiMarkupParser" %> <%@ page import="org.apache.wiki.ui.*" %> - <%@ page import="org.apache.wiki.util.TextUtil" %> - -<%@ page import="org.apache.wiki.filters.*" %> -<%@ page import="org.apache.commons.lang3.*" %> +<%@ page import="org.apache.wiki.variables.VariableManager" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %> @@ -49,7 +48,7 @@ WikiEngine engine = context.getEngine(); context.setVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE, Boolean.TRUE ); - context.setVariable( WikiEngine.PROP_RUNFILTERS, "false" ); + context.setVariable( VariableManager.VAR_RUNFILTERS, "false" ); WikiPage wikiPage = context.getPage(); String originalCCLOption = (String)wikiPage.getAttribute( JSPWikiMarkupParser.PROP_CAMELCASELINKS ); @@ -116,7 +115,7 @@ // Disable the WYSIWYG_EDITOR_MODE and reset the other properties immediately // after the XHTML for TinyMCE has been rendered. context.setVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE, Boolean.FALSE ); - context.setVariable( WikiEngine.PROP_RUNFILTERS, null ); + context.setVariable( VariableManager.VAR_RUNFILTERS, null ); wikiPage.setAttribute( JSPWikiMarkupParser.PROP_CAMELCASELINKS, originalCCLOption ); /*FSS not used diff --git a/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp b/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp index 7c2db80..2849bf3 100644 --- a/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp @@ -19,17 +19,16 @@ <%@ page language="java" pageEncoding="UTF-8"%> <%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %> <%@ page import="java.util.Properties"%> +<%@ page import="org.apache.commons.lang3.*" %> <%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.auth.*" %> <%@ page import="org.apache.wiki.auth.permissions.*" %> +<%@ page import="org.apache.wiki.filters.*" %> <%@ page import="org.apache.wiki.render.*" %> <%@ page import="org.apache.wiki.parser.JSPWikiMarkupParser" %> <%@ page import="org.apache.wiki.ui.*" %> - <%@ page import="org.apache.wiki.util.TextUtil" %> - -<%@ page import="org.apache.wiki.filters.*" %> -<%@ page import="org.apache.commons.lang3.*" %> +<%@ page import="org.apache.wiki.variables.VariableManager" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %> @@ -45,7 +44,7 @@ WikiEngine engine = context.getEngine(); context.setVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE, Boolean.TRUE ); - context.setVariable( WikiEngine.PROP_RUNFILTERS, "false" ); + context.setVariable( VariableManager.VAR_RUNFILTERS, "false" ); WikiPage wikiPage = context.getPage(); String originalCCLOption = (String)wikiPage.getAttribute( JSPWikiMarkupParser.PROP_CAMELCASELINKS ); @@ -107,7 +106,7 @@ // Disable the WYSIWYG_EDITOR_MODE and reset the other properties immediately // after the XHTML for wysiwyg editor has been rendered. context.setVariable( WikiContext.VAR_WYSIWYG_EDITOR_MODE, Boolean.FALSE ); - context.setVariable( WikiEngine.PROP_RUNFILTERS, null ); + context.setVariable( VariableManager.VAR_RUNFILTERS, null ); wikiPage.setAttribute( JSPWikiMarkupParser.PROP_CAMELCASELINKS, originalCCLOption ); /*not used
