Author: ajaquith
Date: Thu Aug 7 20:11:39 2008
New Revision: 683815
URL: http://svn.apache.org/viewvc?rev=683815&view=rev
Log:
Beginning of Stripes JSP-tier refactoring.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Wiki.jsp
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Wiki.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Wiki.jsp?rev=683815&r1=683814&r2=683815&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Wiki.jsp
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Wiki.jsp
Thu Aug 7 20:11:39 2008
@@ -15,11 +15,11 @@
if(!wikiContext.hasAccess( response )) return;
String pagereq = wikiContext.getName();
- // Redirect if the 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(),
