You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2016/12/31 14:23:44 UTC
[09/12] jspwiki git commit: JSPWIKI-1035 - removed detection of
jspwiki.baseURL absence. We can no longer detect this,
user has to point directly to Install.jsp (as instructed in the docs)
JSPWIKI-1035 - removed detection of jspwiki.baseURL absence. We can no longer detect this, user has to point directly to Install.jsp (as instructed in the docs)
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/3a1773a7
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/3a1773a7
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/3a1773a7
Branch: refs/heads/master
Commit: 3a1773a7be26430b531920b08c6ccf88ea04be50
Parents: 0857375
Author: Harry Metske <ha...@gmail.com>
Authored: Mon Dec 26 14:36:51 2016 +0100
Committer: Harry Metske <ha...@gmail.com>
Committed: Mon Dec 26 14:36:51 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/wiki/ui/WikiServletFilter.java | 16 ----------------
1 file changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/3a1773a7/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java b/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
index 59f915e..2d9be35 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
@@ -134,22 +134,6 @@ public class WikiServletFilter implements Filter
// Set the character encoding
httpRequest.setCharacterEncoding( m_engine.getContentEncoding() );
- if( m_engine.getBaseURL().length() == 0 && !httpRequest.getRequestURI().endsWith("Install.jsp") )
- {
- PrintWriter out = response.getWriter();
-
- out.print( "<html><head><title>JSPWiki installation start</title></head>" );
- out.print( "<body>" );
- out.print( "<h1>JSPWiki installation</h1>" );
- out.print( "<p>Hello! It appears that this is your first jspwiki installation." );
- out.print( "Therefore, you will need to start the installation process. " );
- out.print( "Please <a href='Install.jsp'>continue to the installer</a>." );
- out.print( "</p>");
- out.print( "<p>If you just used the installer, then please restart your servlet container to get rid of this message.</p>" );
- out.print("</body></html>");
- return;
- }
-
if ( !isWrapped( request ) )
{
// Prepare the WikiSession