Author: juanpablo
Date: Fri Feb 8 20:43:07 2013
New Revision: 1444226
URL: http://svn.apache.org/r1444226
Log:
deprecated / moved [2/2]:
-> WikiContext#hasAccess( HttpServletResponse ) in favour of
AuthorizationManager#hasAccess( HttpServletResponse )
-> WikiContext#hasAccess( HttpServletResponse, boolean ) in favour of
AuthorizationManager#hasAccess( HttpServletResponse, boolean )
Modified:
incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
incubator/jspwiki/trunk/src/webdocs/Comment.jsp
incubator/jspwiki/trunk/src/webdocs/Delete.jsp
incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp
incubator/jspwiki/trunk/src/webdocs/Diff.jsp
incubator/jspwiki/trunk/src/webdocs/Edit.jsp
incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp
incubator/jspwiki/trunk/src/webdocs/Group.jsp
incubator/jspwiki/trunk/src/webdocs/Install.jsp
incubator/jspwiki/trunk/src/webdocs/Login.jsp
incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp
incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp
incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp
incubator/jspwiki/trunk/src/webdocs/PageModified.jsp
incubator/jspwiki/trunk/src/webdocs/Preview.jsp
incubator/jspwiki/trunk/src/webdocs/Rename.jsp
incubator/jspwiki/trunk/src/webdocs/Search.jsp
incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp
incubator/jspwiki/trunk/src/webdocs/Upload.jsp
incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp
incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
incubator/jspwiki/trunk/src/webdocs/Workflow.jsp
incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp
incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp
incubator/jspwiki/trunk/src/webdocs/rss.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
Modified: incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Captcha.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Captcha.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Captcha.jsp Fri Feb 8 20:43:07 2013
@@ -21,6 +21,7 @@
<%@ page import="org.apache.commons.httpclient.*" %>
<%@ page import="org.apache.commons.httpclient.methods.*" %>
<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.util.*" %>
<%@ page import="org.apache.wiki.ui.EditorManager" %>
<%@ page import="org.apache.commons.lang.time.StopWatch" %>
@@ -36,7 +37,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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
String pagereq = wikiContext.getName();
String content = request.getParameter("text");
Modified: incubator/jspwiki/trunk/src/webdocs/Comment.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Comment.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Comment.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Comment.jsp Fri Feb 8 20:43:07 2013
@@ -30,6 +30,7 @@
<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.auth.login.CookieAssertionLoginModule" %>
<%@ page import="org.apache.wiki.workflow.DecisionRequiredException" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.preferences.Preferences.TimeFormat" %>
<%@ page errorPage="/Error.jsp" %>
<%@ page import="javax.servlet.http.Cookie" %>
@@ -58,10 +59,10 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.COMMENT
);
- if( !wikiContext.hasAccess( response ) ) return;
+ if( !wiki.getAuthorizationManager().hasAccess( wikiContext, response ) )
return;
String pagereq = wikiContext.getName();
- ResourceBundle rb = wikiContext.getBundle("CoreResources");
+ ResourceBundle rb = Preferences.getBundle( wikiContext, "CoreResources" );
WikiSession wikiSession = wikiContext.getWikiSession();
String storedUser = wikiSession.getUserPrincipal().getName();
Modified: incubator/jspwiki/trunk/src/webdocs/Delete.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Delete.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Delete.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Delete.jsp Fri Feb 8 20:43:07 2013
@@ -23,6 +23,7 @@
<%@ page import="org.apache.wiki.tags.BreadcrumbsTag.FixedQueue" %>
<%@ page import="java.util.*" %>
<%@ page import="org.apache.wiki.attachment.Attachment" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
@@ -34,7 +35,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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
String pagereq = wikiContext.getName();
WikiPage wikipage = wikiContext.getPage();
Modified: incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp Fri Feb 8 20:43:07 2013
@@ -22,6 +22,7 @@
<%@ page import="org.apache.wiki.auth.NoSuchPrincipalException" %>
<%@ page import="org.apache.wiki.auth.WikiSecurityException" %>
<%@ page import="org.apache.wiki.auth.authorize.GroupManager" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
@@ -33,7 +34,7 @@
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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
WikiSession wikiSession = wikiContext.getWikiSession();
GroupManager groupMgr = wiki.getGroupManager();
Modified: incubator/jspwiki/trunk/src/webdocs/Diff.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Diff.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Diff.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Diff.jsp Fri Feb 8 20:43:07 2013
@@ -19,6 +19,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.util.*" %>
<%@ page import="org.apache.wiki.tags.InsertDiffTag" %>
<%@ page errorPage="/Error.jsp" %>
@@ -32,7 +33,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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
String pagereq = wikiContext.getName();
WatchDog w = wiki.getCurrentWatchDog();
Modified: incubator/jspwiki/trunk/src/webdocs/Edit.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Edit.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Edit.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Edit.jsp Fri Feb 8 20:43:07 2013
@@ -23,6 +23,7 @@
<%@ page import="org.apache.wiki.api.exceptions.RedirectException" %>
<%@ page import="org.apache.wiki.filters.SpamFilter" %>
<%@ page import="org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.ui.EditorManager" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="org.apache.wiki.workflow.DecisionRequiredException" %>
@@ -51,7 +52,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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
String pagereq = wikiContext.getName();
WikiSession wikiSession = wikiContext.getWikiSession();
Modified: incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp Fri Feb 8 20:43:07 2013
@@ -22,6 +22,7 @@
<%@ page import="org.apache.wiki.auth.WikiSecurityException" %>
<%@ page import="org.apache.wiki.auth.authorize.Group" %>
<%@ page import="org.apache.wiki.auth.authorize.GroupManager" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%!
@@ -32,7 +33,7 @@
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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
// Extract the current user, group name, members and action attributes
WikiSession wikiSession = wikiContext.getWikiSession();
Modified: incubator/jspwiki/trunk/src/webdocs/Group.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Group.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Group.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Group.jsp Fri Feb 8 20:43:07 2013
@@ -23,6 +23,7 @@
<%@ page import="org.apache.wiki.auth.WikiSecurityException" %>
<%@ page import="org.apache.wiki.auth.authorize.Group" %>
<%@ page import="org.apache.wiki.auth.authorize.GroupManager" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%!
@@ -33,7 +34,7 @@
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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
// Extract the current user, group name, members
WikiSession wikiSession = wikiContext.getWikiSession();
Modified: incubator/jspwiki/trunk/src/webdocs/Install.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Install.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Install.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Install.jsp Fri Feb 8 20:43:07 2013
@@ -21,6 +21,7 @@
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.auth.AuthenticationManager" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.ui.Installer" %>
<%@ page import="org.apache.log4j.*" %>
<%@ page import="java.util.ResourceBundle" %>
@@ -36,7 +37,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.INSTALL );
-if(!wikiContext.hasAccess( response )) return;
+if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response )) return;
Installer installer = new Installer( request, config );
WikiSession wikiSession = wikiContext.getWikiSession();
@@ -45,7 +46,7 @@ WikiSession wikiSession = wikiContext.ge
installer.parseProperties();
boolean validated = false;
String password = null;
-ResourceBundle rb = wikiContext.getBundle("CoreResources");
+ResourceBundle rb = Preferences.getBundle( wikiContext, "CoreResources" );
// If user hit "submit" button, validate and install them
if( request.getParameter("submit") != null )
Modified: incubator/jspwiki/trunk/src/webdocs/Login.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Login.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Login.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Login.jsp Fri Feb 8 20:43:07 2013
@@ -26,8 +26,9 @@
<%@ page import="org.apache.wiki.auth.user.DuplicateUserException" %>
<%@ page import="org.apache.wiki.auth.user.UserProfile" %>
<%@ page import="org.apache.wiki.i18n.InternationalizationManager" %>
-<%@ page import="org.apache.wiki.workflow.DecisionRequiredException" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.tags.WikiTagBase" %>
+<%@ page import="org.apache.wiki.workflow.DecisionRequiredException" %>
<%@ page errorPage="/Error.jsp" %>
<%@ page import="java.util.*" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
@@ -42,7 +43,7 @@
wikiContext,
PageContext.REQUEST_SCOPE );
WikiSession wikiSession = wikiContext.getWikiSession();
- ResourceBundle rb = wikiContext.getBundle("CoreResources");
+ ResourceBundle rb = Preferences.getBundle( wikiContext, "CoreResources" );
// Set the redirect-page variable if one was passed as a parameter
if( request.getParameter( "redirect" ) != null )
@@ -51,7 +52,7 @@
}
else
{
- wikiContext.setVariable( "redirect", wiki.getFrontPage());
+ wikiContext.setVariable( "redirect", wiki.getFrontPage() );
}
// Are we saving the profile?
Modified: incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp Fri Feb 8 20:43:07
2013
@@ -26,6 +26,7 @@
<%@ page import="org.apache.wiki.auth.*"%>
<%@ page import="org.apache.wiki.util.*"%>
<%@ page import="org.apache.wiki.i18n.*"%>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page errorPage="/Error.jsp"%>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki"%>
@@ -123,7 +124,7 @@
pageContext.setAttribute( WikiTagBase.ATTR_CONTEXT, wikiContext,
PageContext.REQUEST_SCOPE );
}
- ResourceBundle rb = wikiContext.getBundle( "CoreResources" );
+ ResourceBundle rb = Preferences.getBundle( wikiContext, "CoreResources" );
WikiSession wikiSession = wikiContext.getWikiSession();
String action = request.getParameter( "action" );
Modified: incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp Fri Feb 8 20:43:07 2013
@@ -23,6 +23,7 @@
<%@ page import="org.apache.wiki.auth.WikiSecurityException" %>
<%@ page import="org.apache.wiki.auth.authorize.Group" %>
<%@ page import="org.apache.wiki.auth.authorize.GroupManager" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ page import="java.util.*" %>
@@ -35,7 +36,7 @@
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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
// Extract the current user, group name, members and action attributes
WikiSession wikiSession = wikiContext.getWikiSession();
@@ -63,10 +64,9 @@
groupMgr.getGroup( group.getName() );
// Oops! The group already exists. This is mischief!
- ResourceBundle rb = wikiContext.getBundle("CoreResources");
- Object[] args = { group.getName() };
+ ResourceBundle rb = Preferences.getBundle( wikiContext,
"CoreResources");
wikiSession.addMessage( GroupManager.MESSAGES_KEY,
-
MessageFormat.format(rb.getString("newgroup.exists"),args));
+
MessageFormat.format(rb.getString("newgroup.exists"),group.getName()));
}
catch ( NoSuchPrincipalException e )
{
Modified: incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp Fri Feb 8 20:43:07 2013
@@ -19,6 +19,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.util.*" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
@@ -31,7 +32,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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
String pagereq = wikiContext.getName();
WatchDog w = wiki.getCurrentWatchDog();
Modified: incubator/jspwiki/trunk/src/webdocs/PageModified.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/PageModified.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/PageModified.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/PageModified.jsp Fri Feb 8 20:43:07
2013
@@ -20,6 +20,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.commons.lang.*" %>
<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.ui.EditorManager" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page errorPage="/Error.jsp" %>
@@ -33,7 +34,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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
String pagereq = wikiContext.getName();
String usertext = (String)session.getAttribute(
EditorManager.REQ_EDITEDTEXT );
Modified: incubator/jspwiki/trunk/src/webdocs/Preview.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Preview.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Preview.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Preview.jsp Fri Feb 8 20:43:07 2013
@@ -20,6 +20,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.filters.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="java.util.Date" %>
<%@ page import="org.apache.wiki.ui.EditorManager" %>
<%@ page errorPage="/Error.jsp" %>
@@ -32,7 +33,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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
String pagereq = wikiContext.getName();
pageContext.setAttribute( EditorManager.ATTR_EDITEDTEXT,
Modified: incubator/jspwiki/trunk/src/webdocs/Rename.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Rename.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Rename.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Rename.jsp Fri Feb 8 20:43:07 2013
@@ -20,6 +20,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.api.exceptions.WikiException" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.tags.BreadcrumbsTag" %>
<%@ page import="org.apache.wiki.tags.BreadcrumbsTag.FixedQueue" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
@@ -37,14 +38,14 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request,
WikiContext.RENAME );
- if(!wikiContext.hasAccess( response )) return;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
String renameFrom = wikiContext.getName();
String renameTo = request.getParameter("renameto");
boolean changeReferences = false;
- ResourceBundle rb = wikiContext.getBundle("CoreResources");
+ ResourceBundle rb = Preferences.getBundle( wikiContext, "CoreResources" );
if (request.getParameter("references") != null)
{
@@ -86,13 +87,11 @@
else if (e.getMessage().startsWith("Page already exists "))
{
log.info("Page rename request failed because new page name is
already in use");
- Object[] args = { renameTo };
- wikiSession.addMessage("rename",
MessageFormat.format(rb.getString("rename.exists"),args));
+ wikiSession.addMessage("rename",
MessageFormat.format(rb.getString("rename.exists"),renameTo));
}
else
{
- Object[] args = { e.toString() };
- wikiSession.addMessage("rename",
MessageFormat.format(rb.getString("rename.unknownerror"),args));
+ wikiSession.addMessage("rename",
MessageFormat.format(rb.getString("rename.unknownerror"),e.toString()));
}
}
Modified: incubator/jspwiki/trunk/src/webdocs/Search.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Search.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Search.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Search.jsp Fri Feb 8 20:43:07 2013
@@ -21,6 +21,7 @@
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page import="org.apache.wiki.auth.permissions.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="java.util.*" %>
<%@ page errorPage="/Error.jsp" %>
@@ -34,7 +35,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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
String pagereq = wikiContext.getName();
// Get the search results
Modified: incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp Fri Feb 8 20:43:07 2013
@@ -20,6 +20,7 @@
<%@ page import="java.util.*,org.apache.wiki.*" %>
<%@ page import="org.apache.log4j.*" %>
<%@ page import="java.text.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.rss.*" %>
<%@ page import="org.apache.wiki.util.*" %>
<%@ taglib uri="/WEB-INF/oscache.tld" prefix="oscache" %>
@@ -36,7 +37,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, "rss" );
- if(!wikiContext.hasAccess( response )) return;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
Set allPages = wiki.getReferenceManager().findCreated();
Modified: incubator/jspwiki/trunk/src/webdocs/Upload.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Upload.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Upload.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Upload.jsp Fri Feb 8 20:43:07 2013
@@ -19,6 +19,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
@@ -31,7 +32,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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
String pagereq = wikiContext.getName();
// Set the content type and include the response content
Modified: incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp Fri Feb 8 20:43:07
2013
@@ -28,7 +28,7 @@
<%@ page import="org.apache.wiki.auth.user.DuplicateUserException" %>
<%@ page import="org.apache.wiki.auth.user.UserProfile" %>
<%@ page import="org.apache.wiki.i18n.InternationalizationManager" %>
-<%@ page import="org.apache.wiki.preferences.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.ui.EditorManager" %>
<%@ page import="org.apache.wiki.ui.TemplateManager" %>
<%@ page import="org.apache.wiki.workflow.DecisionRequiredException" %>
@@ -43,7 +43,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.PREFS );
- if(!wikiContext.hasAccess( response )) return;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
// Extract the user profile and action attributes
UserManager userMgr = wiki.getUserManager();
Modified: incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Wiki.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Wiki.jsp Fri Feb 8 20:43:07 2013
@@ -19,6 +19,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.util.*" %>
<%@ page import="org.apache.commons.lang.time.StopWatch" %>
<%@ page errorPage="/Error.jsp" %>
@@ -31,7 +32,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;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
String pagereq = wikiContext.getName();
// Redirect if request was for a special page
Modified: incubator/jspwiki/trunk/src/webdocs/Workflow.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Workflow.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Workflow.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Workflow.jsp Fri Feb 8 20:43:07 2013
@@ -23,6 +23,7 @@
<%@ page import="org.apache.wiki.WikiContext" %>
<%@ page import="org.apache.wiki.WikiSession" %>
<%@ page import="org.apache.wiki.WikiEngine" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.workflow.Decision" %>
<%@ page import="org.apache.wiki.workflow.DecisionQueue" %>
<%@ page import="org.apache.wiki.workflow.NoSuchOutcomeException" %>
@@ -39,7 +40,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request,
WikiContext.WORKFLOW );
- if(!wikiContext.hasAccess( response )) return;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
// Extract the wiki session
WikiSession wikiSession = wikiContext.getWikiSession();
Modified: incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp Fri Feb 8 20:43:07 2013
@@ -22,6 +22,7 @@
<%@ page import="org.apache.wiki.ui.admin.*" %>
<%@ page import="org.apache.wiki.ui.TemplateManager" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.commons.lang.time.StopWatch" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
@@ -33,7 +34,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.ADMIN );
- if(!wikiContext.hasAccess( response )) return;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
//
// This is an experimental feature, so we will turn it off unless the
Modified: incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp Fri Feb 8
20:43:07 2013
@@ -22,6 +22,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.auth.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page errorPage="/Error.jsp" %>
<%!
@@ -35,7 +36,7 @@
%>
<%
WikiContext wikiContext = wiki.createContext( request, WikiContext.NONE );
- if(!wikiContext.hasAccess( response )) return;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
verifier = new SecurityVerifier( wiki, wikiContext.getWikiSession() );
Modified: incubator/jspwiki/trunk/src/webdocs/rss.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/rss.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/rss.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/rss.jsp Fri Feb 8 20:43:07 2013
@@ -22,6 +22,7 @@
<%@ page import="java.util.*,org.apache.wiki.*" %>
<%@ page import="org.apache.log4j.*" %>
<%@ page import="java.text.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.rss.*" %>
<%@ page import="org.apache.wiki.util.*" %>
<%@ page import="com.opensymphony.oscache.base.*" %>
@@ -37,7 +38,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, "rss" );
- if(!wikiContext.hasAccess( response )) return;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
WikiPage wikipage = wikiContext.getPage();
// Redirect if baseURL not set or RSS generation not on
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXCategories.jsp
Fri Feb 8 20:43:07 2013
@@ -18,6 +18,7 @@
--%>
<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%!
public void jspInit()
@@ -29,7 +30,7 @@
<%
// Copied from a top-level jsp -- which would be a better place to put this
WikiContext wikiContext = wiki.createContext( request, WikiContext.VIEW );
- if( !wikiContext.hasAccess( response ) ) return;
+ if( !wiki.getAuthorizationManager().hasAccess( wikiContext, response ) )
return;
String pagereq = wikiContext.getPage().getName();
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp Fri
Feb 8 20:43:07 2013
@@ -23,6 +23,7 @@
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.auth.*" %>
<%@ page import="org.apache.wiki.auth.permissions.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%!
@@ -36,7 +37,7 @@
<%
// Copied from a top-level jsp -- which would be a better place to put this
WikiContext wikiContext = wiki.createContext( request, WikiContext.VIEW );
- if( !wikiContext.hasAccess( response ) ) return;
+ if( !wiki.getAuthorizationManager().hasAccess( wikiContext, response ) )
return;
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp Fri
Feb 8 20:43:07 2013
@@ -21,13 +21,14 @@
<%@ page language="java" pageEncoding="UTF-8"%>
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.auth.*" %>
+<%@ page import="org.apache.wiki.auth.permissions.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="java.util.*" %>
<%@ page import="java.util.Collection" %>
<%@ page import="org.apache.commons.lang.*" %>
<%@ page import="java.net.URLEncoder" %>
-<%@ page import="org.apache.wiki.auth.*" %>
-<%@ page import="org.apache.wiki.auth.permissions.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
@@ -46,7 +47,7 @@
/* FIXME: too much hackin on this level -- should better happen in toplevel
jsp's */
/* Create wiki context and check for authorization */
WikiContext wikiContext = wiki.createContext( request, WikiContext.FIND );
- if(!wikiContext.hasAccess( response )) return;
+ if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response ))
return;
String query = request.getParameter( "query");
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp Fri
Feb 8 20:43:07 2013
@@ -23,6 +23,7 @@
<%@ page import="org.apache.wiki.auth.permissions.*" %>
<%@ page import="org.apache.wiki.attachment.*" %>
<%@ page import="org.apache.wiki.i18n.InternationalizationManager" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="java.security.Permission" %>
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
@@ -54,7 +55,7 @@
}
else
{
- creationAuthor = c.getBundle( InternationalizationManager.CORE_BUNDLE
).getString( "common.unknownauthor" );
+ creationAuthor = Preferences.getBundle( c,
InternationalizationManager.CORE_BUNDLE ).getString( "common.unknownauthor" );
}
}
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp?rev=1444226&r1=1444225&r2=1444226&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp Fri
Feb 8 20:43:07 2013
@@ -21,7 +21,7 @@
<%@ page import="org.apache.wiki.*" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.util.*" %>
-<%@ page import="org.apache.wiki.preferences.*" %>
+<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="java.util.*" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
