You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2020/03/29 09:39:21 UTC
[jspwiki] 21/36: use public api on admin area
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 e298f5ba9e99a18d51dd4ff0c5225f0cd04dd0c6
Author: juanpablo <ju...@apache.org>
AuthorDate: Sat Mar 28 14:08:16 2020 +0100
use public api on admin area
---
jspwiki-war/src/main/webapp/admin/Admin.jsp | 6 +++---
jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/jspwiki-war/src/main/webapp/admin/Admin.jsp b/jspwiki-war/src/main/webapp/admin/Admin.jsp
index a8ddd17..5c27925 100644
--- a/jspwiki-war/src/main/webapp/admin/Admin.jsp
+++ b/jspwiki-war/src/main/webapp/admin/Admin.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.*" %>
<%@ page import="org.apache.wiki.ui.admin.*" %>
<%@ page import="org.apache.wiki.ui.TemplateManager" %>
@@ -34,9 +34,9 @@
%>
<%
String bean = request.getParameter("bean");
- 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.ADMIN );
+ Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.WIKI_ADMIN.getRequestContext() );
if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response ) ) return;
//
diff --git a/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp b/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp
index 894c68b..2a2f539 100644
--- a/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp
+++ b/jspwiki-war/src/main/webapp/admin/SecurityConfig.jsp
@@ -20,8 +20,8 @@
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ page import="java.security.Principal" %>
<%@ 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.preferences.Preferences" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
@@ -29,7 +29,7 @@
<%!
public void jspInit()
{
- wiki = WikiEngine.getInstance( getServletConfig() );
+ wiki = Wiki.engine().find( getServletConfig() );
}
Logger log = Logger.getLogger("JSPWiki");
Engine wiki;
@@ -38,7 +38,7 @@
<!doctype html>
<html lang="en" name="top">
<%
- WikiContext wikiContext = new WikiContext( wiki, request, WikiContext.NONE );
+ Context wikiContext = Wiki.context().create( wiki, request, ContextEnum.PAGE_NONE.getRequestContext() );
if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, response )) return;
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
verifier = new SecurityVerifier( wiki, wikiContext.getWikiSession() );