This is an automated email from the ASF dual-hosted git repository.
brushed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new b17f699 2.11.0-M3-git-03 : remove XHRMarkup2Wysiwyg.jsp
b17f699 is described below
commit b17f699a4a099639beebb905cf4e04a8bea63b3c
Author: brushed <[email protected]>
AuthorDate: Sun Mar 17 22:44:57 2019 +0100
2.11.0-M3-git-03 : remove XHRMarkup2Wysiwyg.jsp
Remove unused top level JSP. See also [JSPWIKI-1093]
---
ChangeLog | 6 ++
.../src/main/java/org/apache/wiki/Release.java | 2 +-
jspwiki-war/src/main/webapp/XHRMarkup2Wysiwyg.jsp | 76 ----------------------
3 files changed, 7 insertions(+), 77 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a9d326b..f0d003d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-03-17 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.11.0-M3-git-03
+
+ * Remove unused top level JSP. See also [JSPWIKI-1093]
+
2019-03-09 Dirk Frederickx (brushed AT apache DOT org)
* 2.11.0-M3-git-02
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
index 602abbf..58685d0 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "02";
+ public static final String BUILD = "03";
/**
* This is the generic version string you should use when printing out
the version. It is of
diff --git a/jspwiki-war/src/main/webapp/XHRMarkup2Wysiwyg.jsp
b/jspwiki-war/src/main/webapp/XHRMarkup2Wysiwyg.jsp
deleted file mode 100644
index c205e38..0000000
--- a/jspwiki-war/src/main/webapp/XHRMarkup2Wysiwyg.jsp
+++ /dev/null
@@ -1,76 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
---%>
-
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ page import="java.util.Properties" %>
-<%@ page import="org.apache.log4j.*" %>
-<%@ page import="org.apache.wiki.*" %>
-<%@ page import="org.apache.wiki.render.*" %>
-<%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
-<%!
- public void jspInit()
- {
- wiki = WikiEngine.getInstance( getServletConfig() );
- }
- //Logger log = Logger.getLogger("XHRMarkup2Wysiwyg");
- WikiEngine wiki;
-%>
-<%
- WikiContext wikiContext = wiki.createContext( request, WikiContext.VIEW );
- //WikiEngine engine = wikiContext.getEngine();
-
- if( !wiki.getAuthorizationManager().hasAccess( wikiContext, response ) )
return;
-
- response.setContentType("text/html; charset="+wiki.getContentEncoding() );
- //response.setHeader( "Cache-control", "max-age=0" );
- //response.setDateHeader( "Expires", new Date().getTime() );
- //response.setDateHeader( "Last-Modified", new Date().getTime() );
-
- String usertext = request.getParameter( "markupPageText" );
-
- if( usertext != null )
- {
-
- String pageAsHtml;
- try
- {
- pageAsHtml = wiki.getRenderingManager().getHTML( wikiContext, usertext
);
- }
- catch( Exception e )
- {
- pageAsHtml = "<div class='error'>Error in converting wiki-markup to
well-formed HTML <br/>" + e.toString() + "</div>";
-
- /*
- java.io.StringWriter sw = new java.io.StringWriter();
- java.io.PrintWriter pw = new java.io.PrintWriter(sw);
- e.printStackTrace(pw);
- pageAsHtml += "<pre>" + sw.toString() + "</pre>";
- */
- }
-
- // Disable the WYSIWYG_EDITOR_MODE and reset the other properties
immediately
- // after the XHTML for wysiwyg editor has been rendered.
- wikiContext.setVariable( RenderingManager.WYSIWYG_EDITOR_MODE,
Boolean.FALSE );
- wikiContext.setVariable( WikiEngine.PROP_RUNFILTERS, null );
-
-
-%><%= pageAsHtml %><%
- }
-%>
\ No newline at end of file
