svn commit: r683810 - /incubator/jspwiki/trunk/src/webdocs/Wiki.jsp

[aj...@apache.org]

Author: ajaquith
Date: Thu Aug  7 19:58:10 2008
New Revision: 683810

URL: http://svn.apache.org/viewvc?rev=683810&view=rev
Log:
Beginning of Stripes JSP-tier refactoring.

Modified:
    incubator/jspwiki/trunk/src/webdocs/Wiki.jsp

Modified: incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Wiki.jsp?rev=683810&r1=683809&r2=683810&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Wiki.jsp Thu Aug  7 19:58:10 2008
@@ -15,11 +15,11 @@
     if(!wikiContext.hasAccess( response )) return;
     String pagereq = wikiContext.getName();
 
-    // Redirect if request was for a 'special page'
-    String redirect = wiki.getRedirectURL( wikiContext );
+    // Redirect if the request was for a 'special page'
+    String redirect = wiki.getWikiActionBeanFactory().getSpecialPageReference( pagereq );
     if( redirect != null )
     {
-        response.sendRedirect( redirect );
+        response.sendRedirect( wikiContext.getViewURL( redirect ) );
         return;
     }
     
@@ -30,6 +30,7 @@
         w.enterState("Generating VIEW response for "+wikiContext.getPage(),60);
     
         // Set the content type and include the response content
+        wikiContext.setVariable( "contentTemplate", "PageContent.jsp" );
         response.setContentType("text/html; charset="+wiki.getContentEncoding() );
         String contentPage = wiki.getTemplateManager().findJSP( pageContext,
                                                                 wikiContext.getTemplate(),