[jspwiki] 03/35: JSPWIKI-303: move AdminBeanManager to o.a.w.ui.admin package, as it is not intended for the public api

[ju...@apache.org]

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 9b40c193674fc5c4eb643d3cb9d9fd1c01dc9b8d
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Mar 1 14:20:56 2020 +0100

    JSPWIKI-303: move AdminBeanManager to o.a.w.ui.admin package, as it is not intended for the public api
---
 jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java         | 2 +-
 .../org/apache/wiki/{api/engine => ui/admin}/AdminBeanManager.java | 7 +++----
 .../java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java     | 1 -
 jspwiki-main/src/main/resources/ini/classmappings.xml              | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
index 8b4aca4..f9c6a85 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -22,7 +22,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.wiki.api.core.Engine;
-import org.apache.wiki.api.engine.AdminBeanManager;
 import org.apache.wiki.api.engine.FilterManager;
 import org.apache.wiki.api.engine.PluginManager;
 import org.apache.wiki.api.exceptions.ProviderException;
@@ -50,6 +49,7 @@ import org.apache.wiki.tasks.TasksManager;
 import org.apache.wiki.ui.CommandResolver;
 import org.apache.wiki.ui.EditorManager;
 import org.apache.wiki.ui.TemplateManager;
+import org.apache.wiki.ui.admin.AdminBeanManager;
 import org.apache.wiki.ui.progress.ProgressManager;
 import org.apache.wiki.url.URLConstructor;
 import org.apache.wiki.util.ClassUtil;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/AdminBeanManager.java
similarity index 95%
rename from jspwiki-main/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java
rename to jspwiki-main/src/main/java/org/apache/wiki/ui/admin/AdminBeanManager.java
index 3855337..af22757 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/AdminBeanManager.java
@@ -17,12 +17,11 @@
     under the License.  
  */
 
-package org.apache.wiki.api.engine;
-
-import java.util.List;
+package org.apache.wiki.ui.admin;
 
 import org.apache.wiki.event.WikiEvent;
-import org.apache.wiki.ui.admin.AdminBean;
+
+import java.util.List;
 
 public interface AdminBeanManager {
 
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
index 6045a15..5240be5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
@@ -21,7 +21,6 @@ package org.apache.wiki.ui.admin;
 import org.apache.log4j.Logger;
 import org.apache.wiki.Release;
 import org.apache.wiki.api.core.Engine;
-import org.apache.wiki.api.engine.AdminBeanManager;
 import org.apache.wiki.api.engine.FilterManager;
 import org.apache.wiki.api.engine.PluginManager;
 import org.apache.wiki.event.WikiEngineEvent;
diff --git a/jspwiki-main/src/main/resources/ini/classmappings.xml b/jspwiki-main/src/main/resources/ini/classmappings.xml
index a1817fb..8ef5164 100644
--- a/jspwiki-main/src/main/resources/ini/classmappings.xml
+++ b/jspwiki-main/src/main/resources/ini/classmappings.xml
@@ -60,7 +60,7 @@
     <mappedClass>org.apache.wiki.plugin.DefaultPluginManager</mappedClass>
   </mapping>
   <mapping>
-    <requestedClass>org.apache.wiki.api.engine.AdminBeanManager</requestedClass>
+    <requestedClass>org.apache.wiki.ui.admin.AdminBeanManager</requestedClass>
     <mappedClass>org.apache.wiki.ui.admin.DefaultAdminBeanManager</mappedClass>
   </mapping>
   <mapping>