svn commit: r550799 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java

[sn...@apache.org]

Author: snoopdave
Date: Tue Jun 26 06:08:24 2007
New Revision: 550799

URL: http://svn.apache.org/viewvc?view=rev&rev=550799
Log:
Fixing broken bootstrap filter, using redirect without context name only works if roller is installed at root

Modified:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java?view=diff&rev=550799&r1=550798&r2=550799
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java Tue Jun 26 06:08:24 2007
@@ -23,6 +23,7 @@
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -39,7 +40,7 @@
  * type is "auto", otherwise does nothing.
  */
 public class BootstrapFilter implements Filter {
-    
+    private ServletContext context = null;
     private static Log log = LogFactory.getLog(BootstrapFilter.class);
     
     
@@ -55,8 +56,10 @@
                 "auto".equals(RollerConfig.getProperty("installation.type")) &&
                 !isInstallUrl(request.getServletPath())) {
             
-            // just redirect to install action
-            response.sendRedirect("/roller-ui/install/install.rol");
+            // we doing an install, so forward to installer
+            RequestDispatcher rd = context.getRequestDispatcher(
+                "/roller-ui/install/install.rol");
+            rd.forward(req, res);
             
         } else {
             chain.doFilter(request, response);
@@ -72,8 +75,9 @@
     }
     
     
-    public void init(FilterConfig filterConfig) throws ServletException {}
-    
-    public void destroy() {}
+    public void init(FilterConfig filterConfig) throws ServletException {
+        context = filterConfig.getServletContext();
+    }
     
+    public void destroy() {}    
 }