jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject [07/14] jspwiki git commit: 2016-09-16 Harry Metske (metskem@apache.org) * Fixed JSPWIKI-1033 - Incorrect relative navigations (reported by Niklas Polke)
Date Wed, 28 Dec 2016 19:01:36 GMT
2016-09-16  Harry Metske (metskem@apache.org)
       * Fixed JSPWIKI-1033 - Incorrect relative navigations (reported by Niklas Polke)


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/1ba57b3e
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/1ba57b3e
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/1ba57b3e

Branch: refs/heads/develop
Commit: 1ba57b3ea51e51ad3540395cc7d45f7d0e4ce3e3
Parents: d8ee0a4
Author: Harry Metske <metskem@apache.org>
Authored: Fri Dec 2 21:06:16 2016 +0100
Committer: Harry Metske <metskem@apache.org>
Committed: Fri Dec 2 21:06:16 2016 +0100

----------------------------------------------------------------------
 ChangeLog                                                     | 3 +++
 jspwiki-war/src/main/java/org/apache/wiki/Release.java        | 2 +-
 .../java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java  | 7 +++++--
 3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/1ba57b3e/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index bbf45fe..616e6be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-12-03  Harry Metske (metskem@apache.org)
+       * Fixed JSPWIKI-1036 - Search for non-Latin characters fails (reported by Peter Paessler)
+
 2016-09-16  Harry Metske (metskem@apache.org)
        * Fixed JSPWIKI-1033 - Incorrect relative navigations (reported by Niklas Polke)
 

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/1ba57b3e/jspwiki-war/src/main/java/org/apache/wiki/Release.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 850d240..58ec0ff 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/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         = "15";
+    public static final String     BUILD         = "16";
 
     /**
      *  This is the generic version string you should use when printing out the version.
 It is of 

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/1ba57b3e/jspwiki-war/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
b/jspwiki-war/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
index 6366693..829de91 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/ajax/WikiAjaxDispatcherServlet.java
@@ -52,6 +52,7 @@ public class WikiAjaxDispatcherServlet extends HttpServlet {
 	private static Map<String,AjaxServletContainer> ajaxServlets = new HashMap<String,AjaxServletContainer>();
     static final Logger log = Logger.getLogger(WikiAjaxDispatcherServlet.class.getName());
     private String PATH_AJAX = "/ajax/";
+    private WikiEngine m_engine;
 
     /**
      * {@inheritDoc}
@@ -62,8 +63,8 @@ public class WikiAjaxDispatcherServlet extends HttpServlet {
     public void init(ServletConfig config)
             throws ServletException {
         super.init(config);
-        WikiEngine e = WikiEngine.getInstance(config);
-        PATH_AJAX = "/"+TextUtil.getStringProperty(e.getWikiProperties(), "jspwiki.ajax.url.prefix",
"ajax")+"/";
+        m_engine = WikiEngine.getInstance(config);
+        PATH_AJAX = "/"+TextUtil.getStringProperty(m_engine.getWikiProperties(), "jspwiki.ajax.url.prefix",
"ajax")+"/";
         log.info("WikiAjaxDispatcherServlet initialized.");
     }
 
@@ -127,6 +128,8 @@ public class WikiAjaxDispatcherServlet extends HttpServlet {
             if (container != null) {
             	WikiAjaxServlet servlet = container.servlet;
             	if ( validatePermission(req,container) ) {
+            	    req.setCharacterEncoding(m_engine.getContentEncoding());
+            	    res.setCharacterEncoding(m_engine.getContentEncoding());
             		String actionName = AjaxUtil.getNextPathPart(req.getRequestURI(), servlet.getServletMapping());
             		log.debug("actionName="+actionName);
             		Object params = req.getParameter("params");


Mime
View raw message