[jspwiki] 04/15: use Engine instead of WikiEngine

[juanpablo]

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 d8c40d9f6e456bc5830f292aaf9bdbe1d0cfd7d2
Author: juanpablo <juanpa...@apache.org>
AuthorDate: Tue Mar 24 15:46:29 2020 +0100

    use Engine instead of WikiEngine
---
 jspwiki-war/src/main/webapp/admin/Admin.jsp | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/jspwiki-war/src/main/webapp/admin/Admin.jsp 
b/jspwiki-war/src/main/webapp/admin/Admin.jsp
index b6d3742..a8ddd17 100644
--- a/jspwiki-war/src/main/webapp/admin/Admin.jsp
+++ b/jspwiki-war/src/main/webapp/admin/Admin.jsp
@@ -19,6 +19,8 @@
 
 <%@ page import="org.apache.log4j.*" %>
 <%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.api.core.*" %>
+<%@ page import="org.apache.wiki.auth.*" %>
 <%@ page import="org.apache.wiki.ui.admin.*" %>
 <%@ page import="org.apache.wiki.ui.TemplateManager" %>
 <%@ page import="org.apache.wiki.util.TextUtil" %>
@@ -32,10 +34,10 @@
 %>
 <%
     String bean = request.getParameter("bean");
-    WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
+    Engine wiki = WikiEngine.getInstance( getServletConfig() );
     // Create wiki context and check for authorization
     WikiContext wikiContext = new WikiContext( wiki, request, 
WikiContext.ADMIN );
-    if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response )) 
return;
+    if(!wiki.getManager( AuthorizationManager.class ).hasAccess( wikiContext, 
response ) ) return;
 
     //
     //  This is an experimental feature, so we will turn it off unless the 
user really wants to.
@@ -68,23 +70,17 @@
 
     // Set the content type and include the response content
     response.setContentType("text/html; charset="+wiki.getContentEncoding() );
-    String contentPage = wiki.getTemplateManager().findJSP( pageContext,
-                                                            
wikiContext.getTemplate(),
-                                                            
"admin/AdminTemplate.jsp" );
+    String contentPage = wiki.getManager( TemplateManager.class ).findJSP( 
pageContext, wikiContext.getTemplate(), "admin/AdminTemplate.jsp" );
 
     pageContext.setAttribute( "engine", wiki, PageContext.REQUEST_SCOPE );
     pageContext.setAttribute( "context", wikiContext, 
PageContext.REQUEST_SCOPE );
 
-    if( request.getMethod().equalsIgnoreCase("post") && bean != null )
-    {
-        AdminBean ab = wiki.getAdminBeanManager().findBean( bean );
+    if( request.getMethod().equalsIgnoreCase("post") && bean != null ) {
+        AdminBean ab = wiki.getManager( AdminBeanManager.class ).findBean( 
bean );
 
-        if( ab != null )
-        {
+        if( ab != null ) {
             ab.doPost( wikiContext );
-        }
-        else
-        {
+        } else {
             wikiContext.getWikiSession().addMessage( "No such bean "+bean+" 
was found!" );
         }
     }