You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/12/03 05:37:55 UTC
svn commit: r722766 - in /incubator/jspwiki/trunk/src/webdocs: ./ admin/
Author: ajaquith
Date: Tue Dec 2 20:37:54 2008
New Revision: 722766
URL: http://svn.apache.org/viewvc?rev=722766&view=rev
Log:
Checked in the Stripes code (about 220 classes, tests, JSPs and other files. All code compiles clean, but the JSPs do NOT work at the moment. Unit tests run clean except for some stray failing Stripes-related unit tests. See the file doc/README - Stripes Migration for some (repeat, SOME) details of what it all means. I'll sort out the JSP issues later this week.
Modified:
incubator/jspwiki/trunk/src/webdocs/Captcha.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Comment.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/CookieError.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Delete.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Diff.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Edit.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Error.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Group.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Install.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Login.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Logout.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Message.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/PageModified.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Preview.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Rename.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Search.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Upload.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Wiki.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/Workflow.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp (contents, props changed)
incubator/jspwiki/trunk/src/webdocs/rss.jsp (contents, props changed)
Modified: incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Captcha.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Captcha.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Captcha.jsp Tue Dec 2 20:37:54 2008
@@ -10,7 +10,9 @@
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<fmt:setBundle basename="CoreResources"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" />
+
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
@@ -19,8 +21,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.VIEW );
- if(!wikiContext.hasAccess( response )) return;
- String pagereq = wikiContext.getName();
+ String pagereq = wikiContext.getPage().getName();
String content = request.getParameter("text");
@@ -52,7 +53,7 @@
<html>
<head>
- <title><wiki:Variable var="applicationname" />: <wiki:PageName /></title>
+ <title><wiki:Variable var="applicationname" />: <wiki:PageName/></title>
<%-- <wiki:Include page="commonheader.jsp"/> --%>
<meta name="robots" content="noindex,nofollow" />
<script type="text/javascript">
Propchange: incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Comment.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Comment.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Comment.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Comment.jsp Tue Dec 2 20:37:54 2008
@@ -16,6 +16,8 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.CommentActionBean" event="comment" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
@@ -38,8 +40,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.COMMENT );
- if( !wikiContext.hasAccess( response ) ) return;
- String pagereq = wikiContext.getName();
+ String pagereq = wikiContext.getPage().getName();
ResourceBundle rb = wikiContext.getBundle("CoreResources");
WikiSession wikiSession = wikiContext.getWikiSession();
Propchange: incubator/jspwiki/trunk/src/webdocs/Comment.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/CookieError.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/CookieError.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/CookieError.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/CookieError.jsp Tue Dec 2 20:37:54 2008
@@ -1,5 +1,7 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" />
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
Propchange: incubator/jspwiki/trunk/src/webdocs/CookieError.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Delete.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Delete.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Delete.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Delete.jsp Tue Dec 2 20:37:54 2008
@@ -5,6 +5,8 @@
<%@ page import="com.ecyrd.jspwiki.attachment.Attachment" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.DeleteActionBean" event="delete" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
@@ -14,8 +16,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.DELETE );
- if(!wikiContext.hasAccess( response )) return;
- String pagereq = wikiContext.getName();
+ String pagereq = wikiContext.getPage().getName();
WikiPage wikipage = wikiContext.getPage();
WikiPage latestversion = wiki.getPage( pagereq );
Propchange: incubator/jspwiki/trunk/src/webdocs/Delete.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp Tue Dec 2 20:37:54 2008
@@ -15,7 +15,6 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.DELETE_GROUP );
- if(!wikiContext.hasAccess( response )) return;
WikiSession wikiSession = wikiContext.getWikiSession();
GroupManager groupMgr = wiki.getGroupManager();
Propchange: incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Diff.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Diff.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Diff.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Diff.jsp Tue Dec 2 20:37:54 2008
@@ -5,6 +5,8 @@
<%@ page import="com.ecyrd.jspwiki.tags.InsertDiffTag" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="diff" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
@@ -14,8 +16,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.DIFF );
- if(!wikiContext.hasAccess( response )) return;
- String pagereq = wikiContext.getName();
+ String pagereq = wikiContext.getPage().getName();
WatchDog w = wiki.getCurrentWatchDog();
try
Propchange: incubator/jspwiki/trunk/src/webdocs/Diff.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Edit.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Edit.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Edit.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Edit.jsp Tue Dec 2 20:37:54 2008
@@ -8,6 +8,8 @@
<%@ page import="com.ecyrd.jspwiki.workflow.DecisionRequiredException" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="edit" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
@@ -31,8 +33,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.EDIT );
- if(!wikiContext.hasAccess( response )) return;
- String pagereq = wikiContext.getName();
+ String pagereq = wikiContext.getPage().getName();
WikiSession wikiSession = wikiContext.getWikiSession();
String user = wikiSession.getUserPrincipal().getName();
Propchange: incubator/jspwiki/trunk/src/webdocs/Edit.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp Tue Dec 2 20:37:54 2008
@@ -14,7 +14,6 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.EDIT_GROUP );
- if(!wikiContext.hasAccess( response )) return;
// Extract the current user, group name, members and action attributes
WikiSession wikiSession = wikiContext.getWikiSession();
Propchange: incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Error.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Error.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Error.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Error.jsp Tue Dec 2 20:37:54 2008
@@ -2,15 +2,16 @@
<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="com.ecyrd.jspwiki.action.*" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
%>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ErrorActionBean" />
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
- WikiContext wikiContext = wiki.createContext( request,
- WikiContext.ERROR );
- String pagereq = wikiContext.getName();
+ WikiActionBean wikiContext = WikiActionBeanFactory.findActionBean( request );
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
Propchange: incubator/jspwiki/trunk/src/webdocs/Error.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Group.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Group.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Group.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Group.jsp Tue Dec 2 20:37:54 2008
@@ -15,7 +15,6 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.VIEW_GROUP );
- if(!wikiContext.hasAccess( response )) return;
// Extract the current user, group name, members
WikiSession wikiSession = wikiContext.getWikiSession();
Propchange: incubator/jspwiki/trunk/src/webdocs/Group.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Install.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Install.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Install.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Install.jsp Tue Dec 2 20:37:54 2008
@@ -8,7 +8,9 @@
<%@ page import="java.util.ResourceBundle" %>
<%@ page import="java.text.MessageFormat" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<fmt:setBundle basename="CoreResources"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.InstallActionBean" event="install" />
+
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
@@ -18,7 +20,6 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.INSTALL );
-if(!wikiContext.hasAccess( response )) return;
Installer installer = new Installer( request, config );
WikiSession wikiSession = wikiContext.getWikiSession();
@@ -62,8 +63,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><fmt:message key="install.jsp.title" /></title>
- <link rel="stylesheet" media="screen, projection" type="text/css" href='<wiki:Link format="url" templatefile="jspwiki.css"/>'/>
- <wiki:IncludeResources type="stylesheet"/>
+ <link rel="stylesheet" media="screen, projection" type="text/css" href='<wiki:Link format="url" templatefile="jspwiki.css" />' />
+ <wiki:IncludeResources type="stylesheet" />
</head>
<body class="view">
<div id="wikibody">
@@ -80,9 +81,9 @@
<!-- Any messages or errors? -->
<div class="instructions">
- <wiki:Messages div="information" topic="<%=Installer.INSTALL_INFO%>" prefix='<%= rb.getString( "install.jsp.install.info" )%>'/>
- <wiki:Messages div="warning" topic="<%=Installer.INSTALL_WARNING%>" prefix='<%= rb.getString( "install.jsp.install.warning" )%>'/>
- <wiki:Messages div="error" topic="<%=Installer.INSTALL_ERROR%>" prefix='<%= rb.getString( "install.jsp.install.error" )%>'/>
+ <wiki:Messages div="information" topic="<%=Installer.INSTALL_INFO%>" prefix='<%= rb.getString( "install.jsp.install.info" )%>' />
+ <wiki:Messages div="warning" topic="<%=Installer.INSTALL_WARNING%>" prefix='<%= rb.getString( "install.jsp.install.warning" )%>' />
+ <wiki:Messages div="error" topic="<%=Installer.INSTALL_ERROR%>" prefix='<%= rb.getString( "install.jsp.install.error" )%>' />
</div>
<div class="formcontainer">
@@ -94,19 +95,19 @@
<div class="block">
<label><fmt:message key="install.jsp.basics.appname.label" /></label>
- <input type="text" name="<%=Installer.APP_NAME%>" size="20" value="<%=installer.getProperty( Installer.APP_NAME )%>"/><br />
+ <input type="text" name="<%=Installer.APP_NAME%>" size="20" value="<%=installer.getProperty( Installer.APP_NAME )%>" /><br/>
<div class="description">
<fmt:message key="install.jsp.basics.appname.desc" />
</div>
<label><fmt:message key="install.jsp.basics.baseurl.label" /></label>
- <input type="text" name="<%=Installer.BASE_URL%>" size="40" value="<%=installer.getProperty( Installer.BASE_URL )%>"/><br />
+ <input type="text" name="<%=Installer.BASE_URL%>" size="40" value="<%=installer.getProperty( Installer.BASE_URL )%>" /><br/>
<div class="description">
<fmt:message key="install.jsp.basics.baseurl.desc" />
</div>
<label><fmt:message key="install.jsp.basics.page.storage.label" /></label>
- <input type="text" name="<%=Installer.PAGE_DIR%>" size="40" value="<%=installer.getProperty( Installer.PAGE_DIR )%>"/><br />
+ <input type="text" name="<%=Installer.PAGE_DIR%>" size="40" value="<%=installer.getProperty( Installer.PAGE_DIR )%>" /><br/>
<div class="description">
<fmt:message key="install.jsp.basics.page.storage.desc" />
</div>
@@ -117,9 +118,9 @@
<div class="block">
<label><fmt:message key="install.jsp.security.sec.conf.label" /></label><br/>
- <input type="radio" name="<%=AuthenticationManager.PROP_SECURITY%>" value="<%=AuthenticationManager.SECURITY_JAAS%>" checked="checked"/>
+ <input type="radio" name="<%=AuthenticationManager.PROP_SECURITY%>" value="<%=AuthenticationManager.SECURITY_JAAS%>" checked="checked" />
<fmt:message key="install.jsp.security.sec.conf.opt1" /><br/>
- <input type="radio" name="<%=AuthenticationManager.PROP_SECURITY%>" value="<%=AuthenticationManager.SECURITY_OFF%>"/>
+ <input type="radio" name="<%=AuthenticationManager.PROP_SECURITY%>" value="<%=AuthenticationManager.SECURITY_OFF%>" />
<fmt:message key="install.jsp.security.sec.conf.opt2" />
<div class="description">
<fmt:message key="install.jsp.security.sec.conf.desc" />
@@ -155,22 +156,22 @@
<h3><fmt:message key="install.jsp.adv.settings.title" /></h3>
<div class="block">
<label><fmt:message key="install.jsp.adv.settings.logfile.label" /></label>
- <input type="text" name="<%=Installer.LOG_DIR%>" value="<%=installer.getProperty( Installer.LOG_DIR )%>" size="40"/><br />
+ <input type="text" name="<%=Installer.LOG_DIR%>" value="<%=installer.getProperty( Installer.LOG_DIR )%>" size="40" /><br/>
<div class="description">
<fmt:message key="install.jsp.adv.settings.logfile.desc" />
</div>
<label><fmt:message key="install.jsp.adv.settings.workdir.label" /></label>
- <input type="text" name="<%=Installer.WORK_DIR%>" size="40" value="<%=installer.getProperty( Installer.WORK_DIR )%>"/><br />
+ <input type="text" name="<%=Installer.WORK_DIR%>" size="40" value="<%=installer.getProperty( Installer.WORK_DIR )%>" /><br/>
<div class="description">
<fmt:message key="install.jsp.adv.settings.workdir.desc" />
</div>
</div>
- <br /><br />
+ <br/><br/>
<div class="block">
<div class="instructions">
- <fmt:message key="install.jsp.instr.desc" >
+ <fmt:message key="install.jsp.instr.desc">
<fmt:param><%=installer.getPropertiesPath()%></fmt:param>
</fmt:message>
</div>
@@ -181,7 +182,7 @@
</div>
-<hr />
+<hr/>
<%
if( validated )
{
Propchange: incubator/jspwiki/trunk/src/webdocs/Install.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Login.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Login.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Login.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Login.jsp Tue Dec 2 20:37:54 2008
@@ -1,177 +1,2 @@
-<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
-<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="java.security.Principal" %>
-<%@ page import="com.ecyrd.jspwiki.auth.*" %>
-<%@ page import="com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule" %>
-<%@ page import="com.ecyrd.jspwiki.auth.login.CookieAuthenticationLoginModule" %>
-<%@ page import="com.ecyrd.jspwiki.auth.user.DuplicateUserException" %>
-<%@ page import="com.ecyrd.jspwiki.auth.user.UserProfile" %>
-<%@ page import="com.ecyrd.jspwiki.workflow.DecisionRequiredException" %>
-<%@ page import="com.ecyrd.jspwiki.tags.WikiTagBase" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ page import="java.util.*" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
-<%!
- Logger log = LoggerFactory.getLogger("JSPWiki");
-%>
-<%
- WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
- AuthenticationManager mgr = wiki.getAuthenticationManager();
- WikiContext wikiContext = wiki.createContext( request, WikiContext.LOGIN );
- pageContext.setAttribute( WikiTagBase.ATTR_CONTEXT,
- wikiContext,
- PageContext.REQUEST_SCOPE );
- WikiSession wikiSession = wikiContext.getWikiSession();
- ResourceBundle rb = wikiContext.getBundle("CoreResources");
-
- // Set the redirect-page variable if one was passed as a parameter
- if( request.getParameter( "redirect" ) != null )
- {
- wikiContext.setVariable( "redirect", request.getParameter( "redirect" ) );
- }
- else
- {
- wikiContext.setVariable( "redirect", wiki.getFrontPage());
- }
-
- // Are we saving the profile?
- if( "saveProfile".equals(request.getParameter("action")) )
- {
- UserManager userMgr = wiki.getUserManager();
- UserProfile profile = userMgr.parseProfile( wikiContext );
-
- // Validate the profile
- userMgr.validateProfile( wikiContext, profile );
-
- // If no errors, save the profile now & refresh the principal set!
- if ( wikiSession.getMessages( "profile" ).length == 0 )
- {
- try
- {
- userMgr.setUserProfile( wikiSession, profile );
- CookieAssertionLoginModule.setUserCookie( response, profile.getFullname() );
- }
- catch( DuplicateUserException e )
- {
- // User collision! (full name or wiki name already taken)
- wikiSession.addMessage( "profile", e.getMessage() );
- }
- catch( DecisionRequiredException e )
- {
- String redirect = wiki.getURL(WikiContext.VIEW,"ApprovalRequiredForUserProfiles",null,true);
- response.sendRedirect( redirect );
- return;
- }
- catch( WikiSecurityException e )
- {
- // Something went horribly wrong! Maybe it's an I/O error...
- wikiSession.addMessage( "profile", e.getMessage() );
- }
- }
- if ( wikiSession.getMessages( "profile" ).length == 0 )
- {
- String redirectPage = request.getParameter( "redirect" );
- response.sendRedirect( wiki.getViewURL(redirectPage) );
- return;
- }
- }
-
- // If NOT using container auth, perform all of the access control logic here...
- // (Note: if using the container for auth, it will handle all of this for us.)
- if( !mgr.isContainerAuthenticated() )
- {
- // If user got here and is already authenticated, it means
- // they just aren't allowed access to what they asked for.
- // Weepy tears and hankies all 'round.
- if( wikiSession.isAuthenticated() )
- {
- response.sendError( HttpServletResponse.SC_FORBIDDEN, rb.getString("login.error.noaccess") );
- return;
- }
-
- // If using custom auth, we need to do the login now
-
- String action = request.getParameter("action");
- if( request.getParameter("submitlogin") != null )
- {
- String uid = request.getParameter( "j_username" );
- String passwd = request.getParameter( "j_password" );
- log.debug( "Attempting to authenticate user " + uid );
-
- // Log the user in!
- if ( mgr.login( wikiSession, uid, passwd ) )
- {
- log.info( "Successfully authenticated user " + uid + " (custom auth)" );
- }
- else
- {
- log.info( "Failed to authenticate user " + uid );
- wikiSession.addMessage( "login", rb.getString("login.error.password") );
- }
- }
- }
- else
- {
- //
- // Have we already been submitted? If yes, then we can assume that
- // we have been logged in before.
- //
- Object seen = session.getAttribute("_redirect");
- if( seen != null )
- {
- response.sendError( HttpServletResponse.SC_FORBIDDEN, rb.getString("login.error.noaccess") );
- session.removeAttribute("_redirect");
- return;
- }
- session.setAttribute("_redirect","I love Outi"); // Just any marker will do
-
- // If using container auth, the container will have automatically
- // attempted to log in the user before Login.jsp was loaded.
- // Thus, if we got here, the container must have authenticated
- // the user already. All we do is simply record that fact.
- // Nice and easy.
-
- Principal user = wikiSession.getLoginPrincipal();
- log.info( "Successfully authenticated user " + user.getName() + " (container auth)" );
- }
-
- // If user logged in, set the user cookie with the wiki principal's name.
- // redirect to wherever we're supposed to go. If login.jsp
- // was called without parameters, this will be the front page. Otherwise,
- // there's probably a 'page' parameter telling us where to go.
-
- if( wikiSession.isAuthenticated() )
- {
- String rember = request.getParameter( "j_remember" );
-
- // Set user cookie
- Principal principal = wikiSession.getUserPrincipal();
- CookieAssertionLoginModule.setUserCookie( response, principal.getName() );
-
- if( rember != null )
- {
- CookieAuthenticationLoginModule.setLoginCookie( wiki, response, principal.getName() );
- }
-
- // If wiki page was "Login", redirect to main, otherwise use the page supplied
- String redirectPage = request.getParameter( "redirect" );
- if ( redirectPage == null )
- {
- redirectPage = wiki.getFrontPage();
- }
- String viewUrl = ( "Login".equals( redirectPage ) ) ? "Wiki.jsp" : wiki.getViewURL( redirectPage );
-
- // Redirect!
- log.info( "Redirecting user to " + viewUrl );
- response.sendRedirect( viewUrl );
- return;
- }
-
- // If we've gotten here, the user hasn't authenticated yet.
- // So, find the login form and include it. This should be in the same directory
- // as this page. We don't need to use the wiki:Include tag.
-
- response.setContentType("text/html; charset="+wiki.getContentEncoding() );
-
-%><jsp:include page="LoginForm.jsp" />
\ No newline at end of file
+<jsp:include page="LoginForm.jsp" />
\ No newline at end of file
Propchange: incubator/jspwiki/trunk/src/webdocs/Login.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp Tue Dec 2 20:37:54 2008
@@ -1,9 +1,11 @@
<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="com.ecyrd.jspwiki.tags.WikiTagBase" %>
+<%@ page import="com.ecyrd.jspwiki.action.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.LoginActionBean" />
<%!
/**
* This page contains the logic for finding and including
@@ -20,17 +22,8 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Retrieve the Login page context, then go and find the login form
- WikiContext wikiContext = (WikiContext) pageContext.getAttribute( WikiTagBase.ATTR_CONTEXT, PageContext.REQUEST_SCOPE );
-
- // If no context, it means we're using container auth. So, create one anyway
- if( wikiContext == null )
- {
- wikiContext = wiki.createContext( request, WikiContext.LOGIN );
- pageContext.setAttribute( WikiTagBase.ATTR_CONTEXT,
- wikiContext,
- PageContext.REQUEST_SCOPE );
- }
-
+ WikiActionBean wikiContext = WikiActionBeanFactory.findActionBean( request );
+ wikiContext.setVariable( "contentTemplate", "LoginContent.jsp" );
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
String contentPage = wiki.getTemplateManager().findJSP( pageContext,
wikiContext.getTemplate(),
Propchange: incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Logout.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Logout.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Logout.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Logout.jsp Tue Dec 2 20:37:54 2008
@@ -1,6 +1,6 @@
-<%@page import="com.ecyrd.jspwiki.auth.login.CookieAuthenticationLoginModule"%>
-<%@page import="com.ecyrd.jspwiki.WikiEngine" %>
-<%@page import="com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule" %>
+<%@ page import="com.ecyrd.jspwiki.auth.login.CookieAuthenticationLoginModule" %>
+<%@ page import="com.ecyrd.jspwiki.WikiEngine" %>
+<%@ page import="com.ecyrd.jspwiki.auth.login.CookieAssertionLoginModule" %>
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
wiki.getAuthenticationManager().logout( request );
Propchange: incubator/jspwiki/trunk/src/webdocs/Logout.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp Tue Dec 2 20:37:54 2008
@@ -1,17 +1,19 @@
<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
-<%@ page import="com.ecyrd.jspwiki.*"%>
-<%@ page import="java.util.*"%>
-<%@ page import="java.text.*"%>
-<%@ page import="javax.mail.*"%>
-<%@ page import="com.ecyrd.jspwiki.auth.user.*"%>
-<%@ page import="com.ecyrd.jspwiki.auth.*"%>
-<%@ page import="com.ecyrd.jspwiki.util.*"%>
-<%@ page import="com.ecyrd.jspwiki.i18n.*"%>
-<%@ page errorPage="/Error.jsp"%>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki"%>
-<%@ page import="com.ecyrd.jspwiki.tags.WikiTagBase"%>
-<%@ page import="javax.servlet.jsp.jstl.fmt.*"%>
+<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="java.util.*" %>
+<%@ page import="java.text.*" %>
+<%@ page import="javax.mail.*" %>
+<%@ page import="com.ecyrd.jspwiki.auth.user.*" %>
+<%@ page import="com.ecyrd.jspwiki.auth.*" %>
+<%@ page import="com.ecyrd.jspwiki.util.*" %>
+<%@ page import="com.ecyrd.jspwiki.i18n.*" %>
+<%@ page errorPage="/Error.jsp" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ page import="com.ecyrd.jspwiki.tags.WikiTagBase" %>
+<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.LoginActionBean" event="login" />
<%!Logger log = LoggerFactory.getLogger( "JSPWiki" );
String message = null;
@@ -133,4 +135,4 @@
String contentPage = wiki.getTemplateManager().findJSP( pageContext, wikiContext.getTemplate(), "ViewTemplate.jsp" );
%>
-<wiki:Include page="<%=contentPage%>" />
+<wiki:Include page="<%=contentPage%>" />
\ No newline at end of file
Propchange: incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Message.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Message.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Message.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Message.jsp Tue Dec 2 20:37:54 2008
@@ -2,19 +2,19 @@
<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="com.ecyrd.jspwiki.action.*" %>
<%@ page import="com.ecyrd.jspwiki.tags.WikiTagBase" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
%>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.MessageActionBean" />
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
- WikiContext wikiContext = wiki.createContext( request,
- WikiContext.MESSAGE );
+ MessageActionBean wikiContext = (MessageActionBean)WikiActionBeanFactory.findActionBean( request );
- // Stash the wiki context and message text
- request.setAttribute( WikiTagBase.ATTR_CONTEXT, wikiContext );
- request.setAttribute( "message", request.getParameter("message"));
+ request.setAttribute( "message", wikiContext.getMessage() );
// Set the content type and include the response content
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
Propchange: incubator/jspwiki/trunk/src/webdocs/Message.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp Tue Dec 2 20:37:54 2008
@@ -4,6 +4,8 @@
<%@ page import="com.ecyrd.jspwiki.plugin.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="edit" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
%>
@@ -13,7 +15,7 @@
// Create wiki context; no need to check for authorization since the
// redirect will take care of that
WikiContext wikiContext = wiki.createContext( request, WikiContext.EDIT );
- String pagereq = wikiContext.getName();
+ String pagereq = wikiContext.getPage().getName();
// Redirect if the request was for a 'special page'
String specialpage = wiki.getSpecialPageReference( pagereq );
Propchange: incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp Tue Dec 2 20:37:54 2008
@@ -17,7 +17,6 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.CREATE_GROUP );
- if(!wikiContext.hasAccess( response )) return;
// Extract the current user, group name, members and action attributes
WikiSession wikiSession = wikiContext.getWikiSession();
Propchange: incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp Tue Dec 2 20:37:54 2008
@@ -4,6 +4,8 @@
<%@ page import="com.ecyrd.jspwiki.util.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.PageInfoActionBean" event="info" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
@@ -13,8 +15,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.INFO );
- if(!wikiContext.hasAccess( response )) return;
- String pagereq = wikiContext.getName();
+ String pagereq = wikiContext.getPage().getName();
WatchDog w = wiki.getCurrentWatchDog();
try{
Propchange: incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/PageModified.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/PageModified.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/PageModified.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/PageModified.jsp Tue Dec 2 20:37:54 2008
@@ -5,6 +5,8 @@
<%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.PageModifiedActionBean" event="conflict" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
@@ -14,8 +16,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.CONFLICT );
- if(!wikiContext.hasAccess( response )) return;
- String pagereq = wikiContext.getName();
+ String pagereq = wikiContext.getPage().getName();
String usertext = (String)session.getAttribute( EditorManager.REQ_EDITEDTEXT );
Propchange: incubator/jspwiki/trunk/src/webdocs/PageModified.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Preview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Preview.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Preview.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Preview.jsp Tue Dec 2 20:37:54 2008
@@ -6,6 +6,8 @@
<%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.EditActionBean" event="preview" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
%>
@@ -14,8 +16,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.PREVIEW );
- if(!wikiContext.hasAccess( response )) return;
- String pagereq = wikiContext.getName();
+ String pagereq = wikiContext.getPage().getName();
pageContext.setAttribute( EditorManager.ATTR_EDITEDTEXT,
session.getAttribute( EditorManager.REQ_EDITEDTEXT ),
Propchange: incubator/jspwiki/trunk/src/webdocs/Preview.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Rename.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Rename.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Rename.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Rename.jsp Tue Dec 2 20:37:54 2008
@@ -6,7 +6,8 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ page import="java.util.*" %>
<%@ page import="java.text.*" %>
-<fmt:setBundle basename="CoreResources"/>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.RenameActionBean" event="rename" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
%>
@@ -15,9 +16,8 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.RENAME );
- if(!wikiContext.hasAccess( response )) return;
- String renameFrom = wikiContext.getName();
+ String renameFrom = wikiContext.getPage().getName();
String renameTo = request.getParameter("renameto");
boolean changeReferences = false;
Propchange: incubator/jspwiki/trunk/src/webdocs/Rename.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Search.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Search.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Search.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Search.jsp Tue Dec 2 20:37:54 2008
@@ -6,6 +6,8 @@
<%@ page import="java.util.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.SearchActionBean" event="find" />
<%!
Logger log = LoggerFactory.getLogger("JSPWikiSearch");
@@ -15,8 +17,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.FIND );
- if(!wikiContext.hasAccess( response )) return;
- String pagereq = wikiContext.getName();
+ String pagereq = wikiContext.getPage().getName();
// Get the search results
Collection list = null;
Propchange: incubator/jspwiki/trunk/src/webdocs/Search.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp Tue Dec 2 20:37:54 2008
@@ -18,7 +18,6 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, "rss" );
- if(!wikiContext.hasAccess( response )) return;
Set allPages = wiki.getReferenceManager().findCreated();
Propchange: incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Upload.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Upload.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Upload.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Upload.jsp Tue Dec 2 20:37:54 2008
@@ -3,8 +3,8 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
-
-
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.UploadActionBean" event="upload" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
%>
@@ -13,8 +13,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.UPLOAD );
- if(!wikiContext.hasAccess( response )) return;
- String pagereq = wikiContext.getName();
+ String pagereq = wikiContext.getPage().getName();
// Set the content type and include the response content
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
Propchange: incubator/jspwiki/trunk/src/webdocs/Upload.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp Tue Dec 2 20:37:54 2008
@@ -15,6 +15,8 @@
<%@ page import="com.ecyrd.jspwiki.preferences.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.UserPreferencesActionBean" event="createAssertedName" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
@@ -24,7 +26,6 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.PREFS );
- if(!wikiContext.hasAccess( response )) return;
// Extract the user profile and action attributes
UserManager userMgr = wiki.getUserManager();
Propchange: incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Wiki.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Wiki.jsp Tue Dec 2 20:37:54 2008
@@ -5,6 +5,8 @@
<%@ page import="org.apache.commons.lang.time.StopWatch" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ViewActionBean" event="view" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
%>
@@ -13,14 +15,13 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.VIEW );
- if(!wikiContext.hasAccess( response )) return;
- String pagereq = wikiContext.getName();
+ String pagereq = wikiContext.getPage().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;
}
@@ -31,6 +32,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(),
Propchange: incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/Workflow.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Workflow.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Workflow.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Workflow.jsp Tue Dec 2 20:37:54 2008
@@ -12,6 +12,8 @@
<%@ page import="com.ecyrd.jspwiki.workflow.Workflow" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.WorkflowActionBean" event="view" />
<%!
Logger log = LoggerFactory.getLogger("JSPWiki");
@@ -21,7 +23,6 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.WORKFLOW );
- if(!wikiContext.hasAccess( response )) return;
// Extract the wiki session
WikiSession wikiSession = wikiContext.getWikiSession();
Propchange: incubator/jspwiki/trunk/src/webdocs/Workflow.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp Tue Dec 2 20:37:54 2008
@@ -2,7 +2,7 @@
<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="com.ecyrd.jspwiki.ui.admin.*" %>
-<%@page import="com.ecyrd.jspwiki.ui.TemplateManager"%>
+<%@ page import="com.ecyrd.jspwiki.ui.TemplateManager" %>
<%@ page import="org.apache.commons.lang.time.StopWatch" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
@@ -14,7 +14,6 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.ADMIN );
- if(!wikiContext.hasAccess( response )) return;
//
// This is an experimental feature, so we will turn it off unless the
Propchange: incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp Tue Dec 2 20:37:54 2008
@@ -5,6 +5,8 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="com.ecyrd.jspwiki.auth.*" %>
<%@ page errorPage="/Error.jsp" %>
+<%@ taglib uri="/WEB-INF/stripes.tld" prefix="stripes" %>
+<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.NoneActionBean" event="none" />
<%!
public void jspInit()
{
@@ -16,7 +18,6 @@
%>
<%
WikiContext wikiContext = wiki.createContext( request, WikiContext.NONE );
- if(!wikiContext.hasAccess( response )) return;
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
verifier = new SecurityVerifier( wiki, wikiContext.getWikiSession() );
@@ -29,9 +30,9 @@
%>
<html>
<head>
- <base href="../"/>
- <link rel="stylesheet" media="screen, projection" type="text/css" href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/>
- <wiki:IncludeResources type="stylesheet"/>
+ <base href="../" />
+ <link rel="stylesheet" media="screen, projection" type="text/css" href="<wiki:Link format="url" templatefile="jspwiki.css" />" />
+ <wiki:IncludeResources type="stylesheet" />
</head>
<body><div id="wikibody">
<h1>Disabled</h1>
@@ -57,9 +58,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>JSPWiki Security Configuration Verifier</title>
- <base href="../"/>
- <link rel="stylesheet" media="screen, projection" type="text/css" href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/>
- <wiki:IncludeResources type="stylesheet"/>
+ <base href="../" />
+ <link rel="stylesheet" media="screen, projection" type="text/css" href="<wiki:Link format="url" templatefile="jspwiki.css" />" />
+ <wiki:IncludeResources type="stylesheet" />
</head>
<body>
<div id="wikibody">
@@ -126,16 +127,16 @@
<!-- Notify users which JAAS configs we need to find -->
<p>JSPWiki wires up its own JAAS to define the authentication process, and does not rely on the JRE configuration. By default, JSPWiki configures its JAAS login stack to use the UserDatabaseLoginModule. You can specify a custom login module by setting the <code>jspwiki.loginModule.class</code> property in <code>jspwiki.properties</code>.</p>
-<wiki:Messages div="information" topic='<%=SecurityVerifier.INFO+"java.security.auth.login.config"%>' prefix="Good news: "/>
-<wiki:Messages div="warning" topic='<%=SecurityVerifier.WARNING+"java.security.auth.login.config"%>' prefix="We found some potential problems with your configuration: "/>
+<wiki:Messages div="information" topic='<%=SecurityVerifier.INFO+"java.security.auth.login.config"%>' prefix="Good news: " />
+<wiki:Messages div="warning" topic='<%=SecurityVerifier.WARNING+"java.security.auth.login.config"%>' prefix="We found some potential problems with your configuration: " />
<wiki:Messages div="error" topic='<%=SecurityVerifier.ERROR+"java.security.auth.login.config"%>' prefix="We found some errors with your configuration: " />
<!-- Print JAAS configuration status -->
<p>The JAAS login configuration is correctly configured if the <code>jspwiki.loginModule.class</code> property specifies
a class we can find on the classpath. This class must also be a LoginModule implementation. We will check for both conditions.</p>
-<wiki:Messages div="information" topic="<%=SecurityVerifier.INFO_JAAS%>" prefix="Good news: "/>
-<wiki:Messages div="warning" topic="<%=SecurityVerifier.WARNING_JAAS%>" prefix="We found some potential problems with your configuration: "/>
+<wiki:Messages div="information" topic="<%=SecurityVerifier.INFO_JAAS%>" prefix="Good news: " />
+<wiki:Messages div="warning" topic="<%=SecurityVerifier.WARNING_JAAS%>" prefix="We found some potential problems with your configuration: " />
<wiki:Messages div="error" topic="<%=SecurityVerifier.ERROR_JAAS%>" prefix="We found some errors with your configuration: " />
<!--
@@ -208,8 +209,8 @@
alias exists in our keystore. The keystore itself must also exist in the file system.
And as an additional check, we will try to load each <code>Permission</code> class into memory to verify that JSPWiki's classloader can find them.</p>
-<wiki:Messages div="information" topic="<%=SecurityVerifier.INFO_POLICY%>" prefix="Good news: "/>
-<wiki:Messages div="warning" topic="<%=SecurityVerifier.WARNING_POLICY%>" prefix="We found some potential problems with your configuration: "/>
+<wiki:Messages div="information" topic="<%=SecurityVerifier.INFO_POLICY%>" prefix="Good news: " />
+<wiki:Messages div="warning" topic="<%=SecurityVerifier.WARNING_POLICY%>" prefix="We found some potential problems with your configuration: " />
<wiki:Messages div="error" topic="<%=SecurityVerifier.ERROR_POLICY%>" prefix="We found some errors with your configuration: " />
<%
@@ -288,7 +289,7 @@
<role-name>Admin</role-name>
</security-role></pre></blockquote>
- <wiki:Messages div="information" topic="<%=SecurityVerifier.INFO_ROLES%>" prefix="Good news: "/>
+ <wiki:Messages div="information" topic="<%=SecurityVerifier.INFO_ROLES%>" prefix="Good news: " />
<wiki:Messages div="error" topic="<%=SecurityVerifier.ERROR_ROLES%>" prefix="We found some errors with your configuration: " />
<%
@@ -300,15 +301,15 @@
<h3>User Database Configuration</h3>
<p>The user database stores user profiles. It's pretty important that it functions properly. We will try to determine what your current UserDatabase implementation is, based on the current value of the <code>jspwiki.userdatabase</code> property in your <code>jspwiki.properties</code> file. In addition, once we establish that the UserDatabase has been initialized properly, we will try to add (then, delete) a random test user. If all of these things work they way they should, then you should have no problems with user self-registration.</p>
-<wiki:Messages div="information" topic="<%=SecurityVerifier.INFO_DB%>" prefix="Good news: "/>
-<wiki:Messages div="warning" topic="<%=SecurityVerifier.WARNING_DB%>" prefix="We found some potential problems with your configuration: "/>
+<wiki:Messages div="information" topic="<%=SecurityVerifier.INFO_DB%>" prefix="Good news: " />
+<wiki:Messages div="warning" topic="<%=SecurityVerifier.WARNING_DB%>" prefix="We found some potential problems with your configuration: " />
<wiki:Messages div="error" topic="<%=SecurityVerifier.ERROR_DB%>" prefix="We found some errors with your configuration: " />
<h3>Group Database Configuration</h3>
<p>The group database stores wiki groups. It's pretty important that it functions properly. We will try to determine what your current GroupDatabase implementation is, based on the current value of the <code>jspwiki.groupdatabase</code> property in your <code>jspwiki.properties</code> file. In addition, once we establish that the GroupDatabase has been initialized properly, we will try to add (then, delete) a random test group. If all of these things work they way they should, then you should have no problems with wiki group creation and editing.</p>
-<wiki:Messages div="information" topic="<%=SecurityVerifier.INFO_GROUPS%>" prefix="Good news: "/>
-<wiki:Messages div="warning" topic="<%=SecurityVerifier.WARNING_GROUPS%>" prefix="We found some potential problems with your configuration: "/>
+<wiki:Messages div="information" topic="<%=SecurityVerifier.INFO_GROUPS%>" prefix="Good news: " />
+<wiki:Messages div="warning" topic="<%=SecurityVerifier.WARNING_GROUPS%>" prefix="We found some potential problems with your configuration: " />
<wiki:Messages div="error" topic="<%=SecurityVerifier.ERROR_GROUPS%>" prefix="We found some errors with your configuration: " />
<!-- We're done... -->
Propchange: incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/src/webdocs/rss.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/rss.jsp?rev=722766&r1=722765&r2=722766&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/rss.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/rss.jsp Tue Dec 2 20:37:54 2008
@@ -18,7 +18,6 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, "rss" );
- if(!wikiContext.hasAccess( response )) return;
WikiPage wikipage = wikiContext.getPage();
// Redirect if baseURL not set or RSS generation not on
Propchange: incubator/jspwiki/trunk/src/webdocs/rss.jsp
('svn:eol-style' removed)