This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 2d2bb51e3db4bee5d6873ff5874804e51a5beb41 Author: juanpablo <[email protected]> AuthorDate: Sat Mar 28 16:36:14 2020 +0100 use public api on top level JSPs --- jspwiki-war/src/main/webapp/Captcha.jsp | 8 ++++---- jspwiki-war/src/main/webapp/Comment.jsp | 12 +++++------ jspwiki-war/src/main/webapp/CookieError.jsp | 6 +++--- jspwiki-war/src/main/webapp/Delete.jsp | 10 ++++----- jspwiki-war/src/main/webapp/DeleteGroup.jsp | 6 +++--- jspwiki-war/src/main/webapp/Diff.jsp | 27 ++++++++++--------------- jspwiki-war/src/main/webapp/Edit.jsp | 12 +++++------ jspwiki-war/src/main/webapp/EditGroup.jsp | 6 +++--- jspwiki-war/src/main/webapp/Error.jsp | 9 +++++---- jspwiki-war/src/main/webapp/Group.jsp | 6 +++--- jspwiki-war/src/main/webapp/Install.jsp | 6 +++--- jspwiki-war/src/main/webapp/Login.jsp | 10 ++++----- jspwiki-war/src/main/webapp/LoginForm.jsp | 10 ++++----- jspwiki-war/src/main/webapp/Logout.jsp | 4 ++-- jspwiki-war/src/main/webapp/LostPassword.jsp | 14 +++++++------ jspwiki-war/src/main/webapp/Message.jsp | 8 ++++---- jspwiki-war/src/main/webapp/NewBlogEntry.jsp | 14 ++++++------- jspwiki-war/src/main/webapp/NewGroup.jsp | 10 ++++----- jspwiki-war/src/main/webapp/PageInfo.jsp | 7 ++++--- jspwiki-war/src/main/webapp/PageModified.jsp | 6 +++--- jspwiki-war/src/main/webapp/Preview.jsp | 6 +++--- jspwiki-war/src/main/webapp/Rename.jsp | 8 ++++---- jspwiki-war/src/main/webapp/Search.jsp | 6 +++--- jspwiki-war/src/main/webapp/SisterSites.jsp | 6 +++--- jspwiki-war/src/main/webapp/Upload.jsp | 6 +++--- jspwiki-war/src/main/webapp/UserPreferences.jsp | 13 ++++++------ jspwiki-war/src/main/webapp/Wiki.jsp | 7 ++++--- jspwiki-war/src/main/webapp/Workflow.jsp | 9 +++++---- jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp | 6 +++--- jspwiki-war/src/main/webapp/rss.jsp | 7 ++++--- 30 files changed, 132 insertions(+), 133 deletions(-) diff --git a/jspwiki-war/src/main/webapp/Captcha.jsp b/jspwiki-war/src/main/webapp/Captcha.jsp index 152f86d..3bc8955 100644 --- a/jspwiki-war/src/main/webapp/Captcha.jsp +++ b/jspwiki-war/src/main/webapp/Captcha.jsp @@ -20,8 +20,8 @@ <%@ page import="org.apache.log4j.*" %> <%@ page import="org.apache.commons.httpclient.*" %> <%@ page import="org.apache.commons.httpclient.methods.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.preferences.Preferences" %> <%@ page import="org.apache.wiki.util.*" %> @@ -37,9 +37,9 @@ Logger log = Logger.getLogger("JSPWiki"); %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.VIEW ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_VIEW.getRequestContext() ); if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response )) return; String pagereq = wikiContext.getName(); String reqPage = TextUtil.replaceEntities( request.getParameter( "page" ) ); @@ -59,7 +59,7 @@ if( body.indexOf( "Pass" ) != -1 ) { session.setAttribute( "captcha", "ok" ); - response.sendRedirect( wikiContext.getURL( WikiContext.EDIT, reqPage ) ); + response.sendRedirect( wikiContext.getURL( ContextEnum.PAGE_EDIT.getRequestContext(), reqPage ) ); return; } } diff --git a/jspwiki-war/src/main/webapp/Comment.jsp b/jspwiki-war/src/main/webapp/Comment.jsp index b9b6d03..760c7c5 100644 --- a/jspwiki-war/src/main/webapp/Comment.jsp +++ b/jspwiki-war/src/main/webapp/Comment.jsp @@ -23,6 +23,7 @@ <%@ page import="org.apache.wiki.util.HttpUtil" %> <%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.api.exceptions.RedirectException" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.auth.login.CookieAssertionLoginModule" %> @@ -61,9 +62,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.COMMENT ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_COMMENT.getRequestContext() ); if( !wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response ) ) return; if( wikiContext.getCommand().getTarget() == null ) { response.sendRedirect( wikiContext.getURL( wikiContext.getRequestContext(), wikiContext.getName() ) ); @@ -97,8 +98,7 @@ } // - // Setup everything for the editors and possible preview. We store everything in the - // session. + // Setup everything for the editors and possible preview. We store everything in the session. // if( remember == null ) { @@ -234,7 +234,7 @@ wikiContext.setPage( modifiedPage ); wiki.getManager( PageManager.class ).saveText( wikiContext, pageText.toString() ); } catch( DecisionRequiredException e ) { - String redirect = wikiContext.getURL(WikiContext.VIEW,"ApprovalRequiredForPageChanges"); + String redirect = wikiContext.getURL( ContextEnum.PAGE_VIEW.getRequestContext(), "ApprovalRequiredForPageChanges" ); response.sendRedirect( redirect ); return; } catch( RedirectException e ) { @@ -247,7 +247,7 @@ } else if( preview != null ) { log.debug("Previewing "+pagereq); session.setAttribute(EditorManager.REQ_EDITEDTEXT, EditorManager.getEditedText(pageContext)); - response.sendRedirect( TextUtil.replaceString( wiki.getURL(WikiContext.PREVIEW, pagereq, "action=comment"),"&","&") ); + response.sendRedirect( TextUtil.replaceString( wiki.getURL( ContextEnum.PAGE_PREVIEW.getRequestContext(), pagereq, "action=comment"),"&","&") ); return; } else if( cancel != null ) { log.debug("Cancelled editing "+pagereq); diff --git a/jspwiki-war/src/main/webapp/CookieError.jsp b/jspwiki-war/src/main/webapp/CookieError.jsp index 20e188f..e06dae0 100755 --- a/jspwiki-war/src/main/webapp/CookieError.jsp +++ b/jspwiki-war/src/main/webapp/CookieError.jsp @@ -17,15 +17,15 @@ under the License. --%> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.ui.TemplateManager" %> <%@ taglib prefix="wiki" uri="http://jspwiki.apache.org/tags"; %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context; authorization check not needed - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.VIEW ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_VIEW.getRequestContext() ); // Set the content type and include the response content response.setContentType("text/html; charset="+wiki.getContentEncoding() ); diff --git a/jspwiki-war/src/main/webapp/Delete.jsp b/jspwiki-war/src/main/webapp/Delete.jsp index f459da0..3526add 100644 --- a/jspwiki-war/src/main/webapp/Delete.jsp +++ b/jspwiki-war/src/main/webapp/Delete.jsp @@ -19,8 +19,8 @@ <%@ page import="java.util.*" %> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.attachment.Attachment" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.pages.PageManager" %> @@ -38,9 +38,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.DELETE ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_DELETE.getRequestContext() ); if( !wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response ) ) return; if( wikiContext.getCommand().getTarget() == null ) { response.sendRedirect( wikiContext.getURL( wikiContext.getRequestContext(), wikiContext.getName() ) ); @@ -77,7 +77,7 @@ session.setAttribute( BreadcrumbsTag.BREADCRUMBTRAIL_KEY, trail ); } - response.sendRedirect( TextUtil.replaceString( wiki.getURL( WikiContext.VIEW, redirTo, "tab="+request.getParameter("tab") ),"&","&" )); + response.sendRedirect( TextUtil.replaceString( wiki.getURL( ContextEnum.PAGE_VIEW.getRequestContext(), redirTo, "tab="+request.getParameter("tab") ),"&","&" )); return; } else if( delete != null ) { log.info("Deleting a range of pages from "+pagereq); @@ -96,7 +96,7 @@ } response.sendRedirect( - TextUtil.replaceString( wiki.getURL( WikiContext.VIEW, redirTo, "tab=" + request.getParameter( "tab" ) ),"&","&" ) + TextUtil.replaceString( wiki.getURL( ContextEnum.PAGE_VIEW.getRequestContext(), redirTo, "tab=" + request.getParameter( "tab" ) ),"&","&" ) ); return; diff --git a/jspwiki-war/src/main/webapp/DeleteGroup.jsp b/jspwiki-war/src/main/webapp/DeleteGroup.jsp index 5f1c158..4e5408e 100644 --- a/jspwiki-war/src/main/webapp/DeleteGroup.jsp +++ b/jspwiki-war/src/main/webapp/DeleteGroup.jsp @@ -18,8 +18,8 @@ --%> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.auth.NoSuchPrincipalException" %> <%@ page import="org.apache.wiki.auth.WikiSecurityException" %> @@ -33,9 +33,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.DELETE_GROUP ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.GROUP_DELETE.getRequestContext() ); if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response )) return; Session wikiSession = wikiContext.getWikiSession(); diff --git a/jspwiki-war/src/main/webapp/Diff.jsp b/jspwiki-war/src/main/webapp/Diff.jsp index 38c653b..dd47a58 100644 --- a/jspwiki-war/src/main/webapp/Diff.jsp +++ b/jspwiki-war/src/main/webapp/Diff.jsp @@ -18,8 +18,9 @@ --%> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> +<%@ page import="org.apache.wiki.WatchDog" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.preferences.Preferences" %> <%@ page import="org.apache.wiki.tags.InsertDiffTag" %> @@ -33,9 +34,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.DIFF ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_DIFF.getRequestContext() ); if( !wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response ) ) return; if( wikiContext.getCommand().getTarget() == null ) { response.sendRedirect( wikiContext.getURL( wikiContext.getRequestContext(), wikiContext.getName() ) ); @@ -57,34 +58,28 @@ // FIXME: There is a set of unnecessary conversions here: InsertDiffTag // does the String->int conversion anyway. - WikiPage wikipage = wikiContext.getPage(); + Page wikipage = wikiContext.getPage(); String srev1 = request.getParameter("r1"); String srev2 = request.getParameter("r2"); int ver1 = -1, ver2 = -1; - if( srev1 != null ) - { + if( srev1 != null ) { ver1 = Integer.parseInt( srev1 ); } - if( srev2 != null ) - { + if( srev2 != null ) { ver2 = Integer.parseInt( srev2 ); - } - else - { + } else { int lastver = wikipage.getVersion(); - - if( lastver > 1 ) - { + if( lastver > 1 ) { ver2 = lastver-1; } } - pageContext.setAttribute( InsertDiffTag.ATTR_OLDVERSION, new Integer(ver1), PageContext.REQUEST_SCOPE ); - pageContext.setAttribute( InsertDiffTag.ATTR_NEWVERSION, new Integer(ver2), PageContext.REQUEST_SCOPE ); + pageContext.setAttribute( InsertDiffTag.ATTR_OLDVERSION, Integer.valueOf(ver1), PageContext.REQUEST_SCOPE ); + pageContext.setAttribute( InsertDiffTag.ATTR_NEWVERSION, Integer.valueOf(ver2), PageContext.REQUEST_SCOPE ); // log.debug("Request for page diff for '"+pagereq+"' from "+HttpUtil.getRemoteAddress(request)+" by "+request.getRemoteUser()+". R1="+ver1+", R2="+ver2 ); diff --git a/jspwiki-war/src/main/webapp/Edit.jsp b/jspwiki-war/src/main/webapp/Edit.jsp index d1a0fc3..2638783 100644 --- a/jspwiki-war/src/main/webapp/Edit.jsp +++ b/jspwiki-war/src/main/webapp/Edit.jsp @@ -19,9 +19,9 @@ <%@ page import="org.apache.log4j.*" %> <%@ page import="java.util.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> <%@ page import="org.apache.wiki.api.exceptions.RedirectException" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.util.HttpUtil" %> <%@ page import="org.apache.wiki.filters.SpamFilter" %> @@ -51,9 +51,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.EDIT ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_EDIT.getRequestContext() ); if( !wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response ) ) { return; } @@ -137,7 +137,7 @@ log.info("Page changed, warning user."); session.setAttribute( EditorManager.REQ_EDITEDTEXT, EditorManager.getEditedText(pageContext) ); - response.sendRedirect( wiki.getURL(WikiContext.CONFLICT, pagereq, null ) ); + response.sendRedirect( wiki.getURL( ContextEnum.PAGE_CONFLICT.getRequestContext(), pagereq, null ) ); return; } @@ -192,7 +192,7 @@ wiki.getManager( PageManager.class ).saveText( wikiContext, text ); } } catch( DecisionRequiredException ex ) { - String redirect = wikiContext.getURL(WikiContext.VIEW,"ApprovalRequiredForPageChanges"); + String redirect = wikiContext.getURL(ContextEnum.PAGE_VIEW.getRequestContext(),"ApprovalRequiredForPageChanges"); response.sendRedirect( redirect ); return; } catch( RedirectException ex ) { @@ -223,7 +223,7 @@ } session.setAttribute("changenote", changenote != null ? changenote : "" ); - response.sendRedirect( wiki.getURL( WikiContext.PREVIEW, pagereq, null ) ); + response.sendRedirect( wiki.getURL( ContextEnum.PAGE_PREVIEW.getRequestContext(), pagereq, null ) ); return; } else if( cancel != null ) { log.debug("Cancelled editing "+pagereq); diff --git a/jspwiki-war/src/main/webapp/EditGroup.jsp b/jspwiki-war/src/main/webapp/EditGroup.jsp index 6690982..159a3a0 100644 --- a/jspwiki-war/src/main/webapp/EditGroup.jsp +++ b/jspwiki-war/src/main/webapp/EditGroup.jsp @@ -18,8 +18,8 @@ --%> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.auth.WikiSecurityException" %> <%@ page import="org.apache.wiki.auth.authorize.Group" %> @@ -33,9 +33,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.EDIT_GROUP ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.GROUP_EDIT.getRequestContext() ); if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response )) return; // Extract the current user, group name, members and action attributes diff --git a/jspwiki-war/src/main/webapp/Error.jsp b/jspwiki-war/src/main/webapp/Error.jsp index 90346fc..18ffc0d 100644 --- a/jspwiki-war/src/main/webapp/Error.jsp +++ b/jspwiki-war/src/main/webapp/Error.jsp @@ -19,16 +19,18 @@ <%@ page isErrorPage="true" %> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> +<%@ page import="org.apache.wiki.api.core.Context" %> +<%@ page import="org.apache.wiki.api.core.ContextEnum" %> <%@ page import="org.apache.wiki.api.core.Engine" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.util.FileUtil" %> <%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %> <%! Logger log = Logger.getLogger("JSPWiki"); %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.ERROR ); + Engine wiki = Wiki.engine().find( getServletConfig() ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.WIKI_ERROR.getRequestContext() ); String pagereq = wikiContext.getName(); response.setContentType("text/html; charset="+wiki.getContentEncoding() ); @@ -49,7 +51,6 @@ // imported in JSP pages. // - if( exception instanceof javax.servlet.jsp.JspException ) { log.debug("IS JSPEXCEPTION"); diff --git a/jspwiki-war/src/main/webapp/Group.jsp b/jspwiki-war/src/main/webapp/Group.jsp index 307e13a..fbe624e 100644 --- a/jspwiki-war/src/main/webapp/Group.jsp +++ b/jspwiki-war/src/main/webapp/Group.jsp @@ -18,8 +18,8 @@ --%> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.auth.NoSuchPrincipalException" %> <%@ page import="org.apache.wiki.auth.WikiSecurityException" %> @@ -34,9 +34,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.VIEW_GROUP ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.GROUP_VIEW.getRequestContext() ); if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response )) return; // Extract the current user, group name, members diff --git a/jspwiki-war/src/main/webapp/Install.jsp b/jspwiki-war/src/main/webapp/Install.jsp index 1ac30dc..cec6615 100644 --- a/jspwiki-war/src/main/webapp/Install.jsp +++ b/jspwiki-war/src/main/webapp/Install.jsp @@ -19,8 +19,8 @@ <?xml version="1.0" encoding="UTF-8"?> <%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthenticationManager" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.preferences.Preferences" %> @@ -36,9 +36,9 @@ %> <% -Engine wiki = WikiEngine.getInstance( getServletConfig() ); +Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization -WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.INSTALL ); +Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.WIKI_INSTALL.getRequestContext() ); if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response )) return; Installer installer = new Installer( request, config ); diff --git a/jspwiki-war/src/main/webapp/Login.jsp b/jspwiki-war/src/main/webapp/Login.jsp index 0bf8605..6ba1740 100644 --- a/jspwiki-war/src/main/webapp/Login.jsp +++ b/jspwiki-war/src/main/webapp/Login.jsp @@ -20,8 +20,8 @@ <%@ page import="java.security.Principal" %> <%@ page import="java.util.*" %> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.*" %> <%@ page import="org.apache.wiki.auth.login.CookieAssertionLoginModule" %> <%@ page import="org.apache.wiki.auth.login.CookieAuthenticationLoginModule" %> @@ -37,10 +37,10 @@ Logger log = Logger.getLogger("JSPWiki"); %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); AuthenticationManager mgr = wiki.getManager( AuthenticationManager.class ); - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.LOGIN ); - pageContext.setAttribute( WikiContext.ATTR_CONTEXT, wikiContext, PageContext.REQUEST_SCOPE ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.WIKI_LOGIN.getRequestContext() ); + pageContext.setAttribute( Context.ATTR_CONTEXT, wikiContext, PageContext.REQUEST_SCOPE ); Session wikiSession = wikiContext.getWikiSession(); ResourceBundle rb = Preferences.getBundle( wikiContext, "CoreResources" ); @@ -71,7 +71,7 @@ Preferences.getLocale( wikiContext ), due.getMessage(), due.getArgs() ) ); } catch( DecisionRequiredException e ) { - String redirect = wiki.getURL( WikiContext.VIEW, "ApprovalRequiredForUserProfiles", null ); + String redirect = wiki.getURL( ContextEnum.PAGE_VIEW.getRequestContext(), "ApprovalRequiredForUserProfiles", null ); response.sendRedirect( redirect ); return; } catch( WikiSecurityException e ) { diff --git a/jspwiki-war/src/main/webapp/LoginForm.jsp b/jspwiki-war/src/main/webapp/LoginForm.jsp index 0c58899..63a6dad 100644 --- a/jspwiki-war/src/main/webapp/LoginForm.jsp +++ b/jspwiki-war/src/main/webapp/LoginForm.jsp @@ -18,8 +18,8 @@ --%> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.ui.TemplateManager" %> <%@ page errorPage="/Error.jsp" %> <%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %> @@ -36,15 +36,15 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Retrieve the Login page context, then go and find the login form - WikiContext wikiContext = (WikiContext) pageContext.getAttribute( WikiContext.ATTR_CONTEXT, PageContext.REQUEST_SCOPE ); + Context wikiContext = ( Context )pageContext.getAttribute( Context.ATTR_CONTEXT, PageContext.REQUEST_SCOPE ); // If no context, it means we're using container auth. So, create one anyway if( wikiContext == null ) { - wikiContext = new WikiContext( wiki, request, WikiContext.LOGIN ); - pageContext.setAttribute( WikiContext.ATTR_CONTEXT, wikiContext, PageContext.REQUEST_SCOPE ); + wikiContext = Wiki.context().create( wiki, request, ContextEnum.WIKI_LOGIN.getRequestContext() ); + pageContext.setAttribute( Context.ATTR_CONTEXT, wikiContext, PageContext.REQUEST_SCOPE ); } response.setContentType("text/html; charset="+wiki.getContentEncoding() ); diff --git a/jspwiki-war/src/main/webapp/Logout.jsp b/jspwiki-war/src/main/webapp/Logout.jsp index 6a4a247..cc84bfd 100644 --- a/jspwiki-war/src/main/webapp/Logout.jsp +++ b/jspwiki-war/src/main/webapp/Logout.jsp @@ -17,13 +17,13 @@ under the License. --%> -<%@page import="org.apache.wiki.WikiEngine" %> <%@page import="org.apache.wiki.api.core.Engine" %> +<%@page import="org.apache.wiki.api.spi.Wiki" %> <%@page import="org.apache.wiki.auth.AuthenticationManager" %> <%@page import="org.apache.wiki.auth.login.CookieAssertionLoginModule" %> <%@page import="org.apache.wiki.auth.login.CookieAuthenticationLoginModule"%> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); wiki.getManager( AuthenticationManager.class ).logout( request ); // Clear the user cookie diff --git a/jspwiki-war/src/main/webapp/LostPassword.jsp b/jspwiki-war/src/main/webapp/LostPassword.jsp index 0dee9b9..93d633a 100644 --- a/jspwiki-war/src/main/webapp/LostPassword.jsp +++ b/jspwiki-war/src/main/webapp/LostPassword.jsp @@ -22,9 +22,11 @@ <%@ page import="javax.mail.*"%> <%@ page import="javax.servlet.jsp.jstl.fmt.*"%> <%@ page import="org.apache.log4j.*"%> -<%@ page import="org.apache.wiki.*"%> +<%@ page import="org.apache.wiki.api.core.Context" %> +<%@ page import="org.apache.wiki.api.core.ContextEnum" %> <%@ page import="org.apache.wiki.api.core.Engine"%> <%@ page import="org.apache.wiki.api.core.Session"%> +<%@ page import="org.apache.wiki.api.spi.Wiki"%> <%@ page import="org.apache.wiki.auth.*"%> <%@ page import="org.apache.wiki.auth.user.*"%> <%@ page import="org.apache.wiki.i18n.*"%> @@ -65,7 +67,7 @@ // Try sending email first, as that is more likely to fail. Object[] args = { profile.getLoginName(), randomPassword, request.getScheme() + "://"+ request.getServerName() + ":" + request.getServerPort() + - wiki.getManager( URLConstructor.class ).makeURL( WikiContext.NONE, "Login.jsp", "" ), wiki.getApplicationName() }; + wiki.getManager( URLConstructor.class ).makeURL( ContextEnum.PAGE_NONE.getRequestContext(), "Login.jsp", "" ), wiki.getApplicationName() }; String mailMessage = MessageFormat.format( rb.getString( "lostpwd.newpassword.email" ), args ); @@ -100,16 +102,16 @@ } %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); //Create wiki context like in Login.jsp: //don't check for access permissions: if you have lost your password you cannot login! - WikiContext wikiContext = (WikiContext) pageContext.getAttribute( WikiContext.ATTR_CONTEXT, PageContext.REQUEST_SCOPE ); + Context wikiContext = ( Context )pageContext.getAttribute( Context.ATTR_CONTEXT, PageContext.REQUEST_SCOPE ); // If no context, it means we're using container auth. So, create one anyway if( wikiContext == null ) { - wikiContext = new WikiContext( wiki, request, WikiContext.LOGIN ); /* reuse login context ! */ - pageContext.setAttribute( WikiContext.ATTR_CONTEXT, wikiContext, PageContext.REQUEST_SCOPE ); + wikiContext = Wiki.context().create( wiki, request, ContextEnum.WIKI_LOGIN.getRequestContext() ); /* reuse login context ! */ + pageContext.setAttribute( Context.ATTR_CONTEXT, wikiContext, PageContext.REQUEST_SCOPE ); } ResourceBundle rb = Preferences.getBundle( wikiContext, "CoreResources" ); diff --git a/jspwiki-war/src/main/webapp/Message.jsp b/jspwiki-war/src/main/webapp/Message.jsp index c2844c0..af3227e 100755 --- a/jspwiki-war/src/main/webapp/Message.jsp +++ b/jspwiki-war/src/main/webapp/Message.jsp @@ -19,19 +19,19 @@ <%@ page isErrorPage="true" %> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.ui.TemplateManager" %> <%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %> <%! Logger log = Logger.getLogger("JSPWiki"); %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.MESSAGE ); + Engine wiki = Wiki.engine().find( getServletConfig() ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.WIKI_MESSAGE.getRequestContext() ); // Stash the wiki context and message text - request.setAttribute( WikiContext.ATTR_CONTEXT, wikiContext ); + request.setAttribute( Context.ATTR_CONTEXT, wikiContext ); request.setAttribute( "message", request.getParameter( "message" ) ); // Set the content type and include the response content diff --git a/jspwiki-war/src/main/webapp/NewBlogEntry.jsp b/jspwiki-war/src/main/webapp/NewBlogEntry.jsp index 034de4b..d75479c 100644 --- a/jspwiki-war/src/main/webapp/NewBlogEntry.jsp +++ b/jspwiki-war/src/main/webapp/NewBlogEntry.jsp @@ -18,8 +18,8 @@ --%> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.plugin.*" %> <%@ page errorPage="/Error.jsp" %> <%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %> @@ -28,16 +28,14 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); - // Create wiki context; no need to check for authorization since the - // redirect will take care of that - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.EDIT ); + Engine wiki = Wiki.engine().find( getServletConfig() ); + // Create wiki context; no need to check for authorization since the redirect will take care of that + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_EDIT.getRequestContext() ); String pagereq = wikiContext.getName(); // Redirect if the request was for a 'special page' String specialpage = wiki.getSpecialPageReference( pagereq ); - if( specialpage != null ) - { + if( specialpage != null ) { // FIXME: Do Something Else response.sendRedirect( specialpage ); return; @@ -48,6 +46,6 @@ String newEntry = p.getNewEntryPage( wiki, pagereq ); // Redirect to a new page for user to edit - response.sendRedirect( wikiContext.getURL( WikiContext.EDIT, newEntry ) ); + response.sendRedirect( wikiContext.getURL( ContextEnum.PAGE_EDIT.getRequestContext(), newEntry ) ); %> diff --git a/jspwiki-war/src/main/webapp/NewGroup.jsp b/jspwiki-war/src/main/webapp/NewGroup.jsp index 7e6f0b8..9b2c415 100644 --- a/jspwiki-war/src/main/webapp/NewGroup.jsp +++ b/jspwiki-war/src/main/webapp/NewGroup.jsp @@ -20,8 +20,8 @@ <%@ page import="java.text.*" %> <%@ page import="java.util.*" %> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.NoSuchPrincipalException" %> <%@ page import="org.apache.wiki.auth.WikiSecurityException" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> @@ -36,9 +36,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.CREATE_GROUP ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.WIKI_CREATE_GROUP.getRequestContext() ); if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response )) return; // Extract the current user, group name, members and action attributes @@ -49,9 +49,7 @@ { group = groupMgr.parseGroup( wikiContext, true ); pageContext.setAttribute ( "Group", group, PageContext.REQUEST_SCOPE ); - } - catch ( WikiSecurityException e ) - { + } catch ( WikiSecurityException e ) { wikiSession.addMessage( GroupManager.MESSAGES_KEY, e.getMessage() ); response.sendRedirect( "Group.jsp" ); } diff --git a/jspwiki-war/src/main/webapp/PageInfo.jsp b/jspwiki-war/src/main/webapp/PageInfo.jsp index 5d11b78..4bbcd5b 100644 --- a/jspwiki-war/src/main/webapp/PageInfo.jsp +++ b/jspwiki-war/src/main/webapp/PageInfo.jsp @@ -18,8 +18,9 @@ --%> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> +<%@ page import="org.apache.wiki.WatchDog" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.preferences.Preferences" %> <%@ page import="org.apache.wiki.ui.TemplateManager" %> @@ -32,9 +33,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.INFO ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_INFO.getRequestContext() ); if( !wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response ) ) return; if( wikiContext.getCommand().getTarget() == null ) { response.sendRedirect( wikiContext.getURL( wikiContext.getRequestContext(), wikiContext.getName() ) ); diff --git a/jspwiki-war/src/main/webapp/PageModified.jsp b/jspwiki-war/src/main/webapp/PageModified.jsp index b815865..2e409dc 100644 --- a/jspwiki-war/src/main/webapp/PageModified.jsp +++ b/jspwiki-war/src/main/webapp/PageModified.jsp @@ -19,8 +19,8 @@ <%@ page import="org.apache.log4j.*" %> <%@ page import="org.apache.commons.text.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.pages.PageManager" %> <%@ page import="org.apache.wiki.preferences.Preferences" %> @@ -35,9 +35,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.CONFLICT ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_CONFLICT.getRequestContext() ); if( !wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response ) ) return; if( wikiContext.getCommand().getTarget() == null ) { response.sendRedirect( wikiContext.getURL( wikiContext.getRequestContext(), wikiContext.getName() ) ); diff --git a/jspwiki-war/src/main/webapp/Preview.jsp b/jspwiki-war/src/main/webapp/Preview.jsp index d6bfa02..f7350f7 100644 --- a/jspwiki-war/src/main/webapp/Preview.jsp +++ b/jspwiki-war/src/main/webapp/Preview.jsp @@ -19,8 +19,8 @@ <%@ page import="java.util.Date" %> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.filters.*" %> <%@ page import="org.apache.wiki.preferences.Preferences" %> @@ -33,9 +33,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.PREVIEW ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_PREVIEW.getRequestContext() ); if( !wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response ) ) return; if( wikiContext.getCommand().getTarget() == null ) { response.sendRedirect( wikiContext.getURL( wikiContext.getRequestContext(), wikiContext.getName() ) ); diff --git a/jspwiki-war/src/main/webapp/Rename.jsp b/jspwiki-war/src/main/webapp/Rename.jsp index db23a86..e0127b1 100644 --- a/jspwiki-war/src/main/webapp/Rename.jsp +++ b/jspwiki-war/src/main/webapp/Rename.jsp @@ -20,8 +20,8 @@ <%@ page import="java.text.*" %> <%@ page import="java.util.*" %> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.api.exceptions.WikiException" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.content.PageRenamer" %> @@ -40,9 +40,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.RENAME ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_RENAME.getRequestContext() ); if( !wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response ) ) return; if( wikiContext.getCommand().getTarget() == null ) { response.sendRedirect( wikiContext.getURL( wikiContext.getRequestContext(), wikiContext.getName() ) ); @@ -78,7 +78,7 @@ log.info("Page successfully renamed to '"+renamedTo+"'"); - response.sendRedirect( wikiContext.getURL( WikiContext.VIEW, renamedTo ) ); + response.sendRedirect( wikiContext.getURL( ContextEnum.PAGE_VIEW.getRequestContext(), renamedTo ) ); return; } wikiSession.addMessage("rename", rb.getString("rename.empty")); diff --git a/jspwiki-war/src/main/webapp/Search.jsp b/jspwiki-war/src/main/webapp/Search.jsp index 5048498..34df2f6 100644 --- a/jspwiki-war/src/main/webapp/Search.jsp +++ b/jspwiki-war/src/main/webapp/Search.jsp @@ -19,9 +19,9 @@ <%@ page import="java.util.*" %> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> <%@ page import="org.apache.wiki.api.search.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.*" %> <%@ page import="org.apache.wiki.auth.permissions.*" %> <%@ page import="org.apache.wiki.preferences.Preferences" %> @@ -36,9 +36,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.FIND ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.WIKI_FIND.getRequestContext() ); if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response )) return; String pagereq = wikiContext.getName(); diff --git a/jspwiki-war/src/main/webapp/SisterSites.jsp b/jspwiki-war/src/main/webapp/SisterSites.jsp index dde554a..18aad79 100644 --- a/jspwiki-war/src/main/webapp/SisterSites.jsp +++ b/jspwiki-war/src/main/webapp/SisterSites.jsp @@ -20,8 +20,8 @@ <%@ page import="java.text.*" %> <%@ page import="java.util.*" %> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.preferences.Preferences" %> <%@ page import="org.apache.wiki.references.ReferenceManager" %> @@ -37,9 +37,9 @@ * * FIXME: Does not honor the ACL's on the pages. */ - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, "rss" ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_RSS.getRequestContext() ); if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response )) return; Set< String > allPages = wiki.getManager( ReferenceManager.class ).findCreated(); diff --git a/jspwiki-war/src/main/webapp/Upload.jsp b/jspwiki-war/src/main/webapp/Upload.jsp index 729a62d..4be699f 100644 --- a/jspwiki-war/src/main/webapp/Upload.jsp +++ b/jspwiki-war/src/main/webapp/Upload.jsp @@ -18,8 +18,8 @@ --%> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.preferences.Preferences" %> <%@ page import="org.apache.wiki.ui.TemplateManager" %> @@ -32,9 +32,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.UPLOAD ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_UPLOAD.getRequestContext() ); if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response )) return; String pagereq = wikiContext.getName(); diff --git a/jspwiki-war/src/main/webapp/UserPreferences.jsp b/jspwiki-war/src/main/webapp/UserPreferences.jsp index 3d4c2bc..edf8db6 100644 --- a/jspwiki-war/src/main/webapp/UserPreferences.jsp +++ b/jspwiki-war/src/main/webapp/UserPreferences.jsp @@ -18,10 +18,11 @@ --%> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.WikiContext" %> -<%@ page import="org.apache.wiki.WikiEngine" %> +<%@ page import="org.apache.wiki.api.core.Context" %> +<%@ page import="org.apache.wiki.api.core.ContextEnum" %> <%@ page import="org.apache.wiki.api.core.Engine" %> <%@ page import="org.apache.wiki.api.core.Session" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.auth.UserManager" %> <%@ page import="org.apache.wiki.auth.WikiSecurityException" %> @@ -43,9 +44,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.PREFS ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.WIKI_PREFS.getRequestContext() ); if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response ) ) return; // Extract the user profile and action attributes @@ -86,7 +87,7 @@ } catch( DecisionRequiredException e ) { - String redirect = wiki.getURL( WikiContext.VIEW, "ApprovalRequiredForUserProfiles", null ); + String redirect = wiki.getURL( ContextEnum.PAGE_VIEW.getRequestContext(), "ApprovalRequiredForUserProfiles", null ); response.sendRedirect( redirect ); return; } @@ -132,7 +133,7 @@ if( "clearAssertedName".equals(request.getParameter("action")) ) { CookieAssertionLoginModule.clearUserCookie( response ); - response.sendRedirect( wikiContext.getURL(WikiContext.NONE,"Logout.jsp") ); + response.sendRedirect( wikiContext.getURL(ContextEnum.PAGE_NONE.getRequestContext(),"Logout.jsp") ); return; } response.setContentType("text/html; charset="+wiki.getContentEncoding() ); diff --git a/jspwiki-war/src/main/webapp/Wiki.jsp b/jspwiki-war/src/main/webapp/Wiki.jsp index 5b18bdc..16305c4 100644 --- a/jspwiki-war/src/main/webapp/Wiki.jsp +++ b/jspwiki-war/src/main/webapp/Wiki.jsp @@ -19,8 +19,9 @@ <%@ page import="org.apache.commons.lang3.time.StopWatch" %> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> +<%@ page import="org.apache.wiki.WatchDog" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.preferences.Preferences" %> <%@ page import="org.apache.wiki.ui.TemplateManager" %> @@ -32,9 +33,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.VIEW ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_VIEW.getRequestContext() ); if( !wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response ) ) return; String pagereq = wikiContext.getName(); diff --git a/jspwiki-war/src/main/webapp/Workflow.jsp b/jspwiki-war/src/main/webapp/Workflow.jsp index f9a5b14..7b70a27 100644 --- a/jspwiki-war/src/main/webapp/Workflow.jsp +++ b/jspwiki-war/src/main/webapp/Workflow.jsp @@ -20,10 +20,11 @@ <%@ page import="java.util.Collection" %> <%@ page import="java.util.Iterator" %> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.WikiContext" %> -<%@ page import="org.apache.wiki.WikiEngine" %> +<%@ page import="org.apache.wiki.api.core.Context" %> +<%@ page import="org.apache.wiki.api.core.ContextEnum" %> <%@ page import="org.apache.wiki.api.core.Engine" %> <%@ page import="org.apache.wiki.api.core.Session" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.preferences.Preferences" %> <%@ page import="org.apache.wiki.ui.TemplateManager" %> @@ -40,9 +41,9 @@ %> <% - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.WORKFLOW ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.WIKI_WORKFLOW.getRequestContext() ); if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response )) return; // Extract the wiki session diff --git a/jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp b/jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp index 7a6caec..653fd4a 100644 --- a/jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp +++ b/jspwiki-war/src/main/webapp/XHRHtml2Markup.jsp @@ -19,8 +19,8 @@ <%@ page language="java" pageEncoding="UTF-8"%> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.htmltowiki.HtmlStringToWikiTranslator" %> <%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %> @@ -28,13 +28,13 @@ <%! public void jspInit() { - wiki = WikiEngine.getInstance( getServletConfig() ); + wiki = Wiki.engine().find( getServletConfig() ); } //Logger log = Logger.getLogger("XHRHtml2Markup"); Engine wiki; %> <% - WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.VIEW ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_VIEW.getRequestContext() ); if( !wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response ) ) return; diff --git a/jspwiki-war/src/main/webapp/rss.jsp b/jspwiki-war/src/main/webapp/rss.jsp index 5b55c25..fc92c9c 100644 --- a/jspwiki-war/src/main/webapp/rss.jsp +++ b/jspwiki-war/src/main/webapp/rss.jsp @@ -25,8 +25,9 @@ <%@ page import="net.sf.ehcache.Element" %> <%@ page import="net.sf.ehcache.CacheManager" %> <%@ page import="org.apache.log4j.*" %> -<%@ page import="org.apache.wiki.*" %> +<%@ page import="org.apache.wiki.WatchDog" %> <%@ page import="org.apache.wiki.api.core.*" %> +<%@ page import="org.apache.wiki.api.spi.Wiki" %> <%@ page import="org.apache.wiki.auth.AuthorizationManager" %> <%@ page import="org.apache.wiki.plugin.WeblogPlugin" %> <%@ page import="org.apache.wiki.pages.PageManager" %> @@ -51,9 +52,9 @@ m_rssCache = new Cache(cacheName, cacheCapacity, false, false, m_expiryPeriod, m_expiryPeriod); m_cacheManager.addCache(m_rssCache); } - Engine wiki = WikiEngine.getInstance( getServletConfig() ); + Engine wiki = Wiki.engine().find( getServletConfig() ); // Create wiki context and check for authorization - WikiContext wikiContext = new WikiContext( wiki, request, "rss" ); + Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_RSS.getRequestContext() ); if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response ) ) return; Page wikipage = wikiContext.getPage();
