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/06 18:04:16 UTC
[jspwiki] 14/35: fix jsp compilation issues derived from moving the
AdminBeanManager interface to another package
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 127c520d5810048142b0dec3587e4e253fb1a0fc
Author: juanpablo <ju...@apache.org>
AuthorDate: Wed Mar 4 12:57:10 2020 +0100
fix jsp compilation issues derived from moving the AdminBeanManager interface to another package
---
jspwiki-war/src/main/webapp/templates/210/admin/AdminTemplate.jsp | 3 +--
jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/jspwiki-war/src/main/webapp/templates/210/admin/AdminTemplate.jsp b/jspwiki-war/src/main/webapp/templates/210/admin/AdminTemplate.jsp
index df45f38..5d60314 100644
--- a/jspwiki-war/src/main/webapp/templates/210/admin/AdminTemplate.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/admin/AdminTemplate.jsp
@@ -19,7 +19,6 @@
<%@ page import="java.util.*" %>
<%@ page import="org.apache.wiki.*" %>
-<%@ page import="org.apache.wiki.api.engine.AdminBeanManager" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.ui.admin.*" %>
<%@ page errorPage="/Error.jsp" %>
@@ -42,7 +41,7 @@ in your <code>jspwiki.properties</code> file.</div>
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
WikiContext ctx = WikiContext.findContext(pageContext);
- AdminBeanManager mgr = wiki.getAdminBeanManager();
+ AdminBeanManager mgr = wiki.getManager( AdminBeanManager.class );
%>
<wiki:TabbedSection defaultTab="${param['tab-admin']}">
diff --git a/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp b/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp
index 333b3ad..777273d 100644
--- a/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/admin/AdminTemplate.jsp
@@ -19,7 +19,6 @@
<%@ page import="java.util.*" %>
<%@ page import="org.apache.wiki.*" %>
-<%@ page import="org.apache.wiki.api.engine.AdminBeanManager" %>
<%@ page import="org.apache.wiki.ui.*" %>
<%@ page import="org.apache.wiki.ui.admin.*" %>
<%@ page errorPage="/Error.jsp" %>
@@ -42,7 +41,7 @@ in your <code>jspwiki.properties</code> file.</div>
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
WikiContext ctx = WikiContext.findContext(pageContext);
- AdminBeanManager mgr = wiki.getAdminBeanManager();
+ AdminBeanManager mgr = wiki.getManager( AdminBeanManager.class );
%>
<div class="tabs admin">