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 d65ebff56544e0aa5eb887b3e11238052724aba3 Author: juanpablo <[email protected]> AuthorDate: Wed Jan 8 00:40:23 2020 +0100 revert change on previous commits: PageManager and WorkflowManager must extend WikiEventListener --- .../src/main/java/org/apache/wiki/pages/DefaultPageManager.java | 3 +-- jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java | 3 ++- .../src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java | 3 +-- .../src/main/java/org/apache/wiki/workflow/WorkflowManager.java | 3 ++- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java b/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java index 2090371..1a7e4f7 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java @@ -35,7 +35,6 @@ import org.apache.wiki.auth.acl.AclEntry; import org.apache.wiki.auth.acl.AclEntryImpl; import org.apache.wiki.auth.user.UserProfile; import org.apache.wiki.event.WikiEvent; -import org.apache.wiki.event.WikiEventListener; import org.apache.wiki.event.WikiEventManager; import org.apache.wiki.event.WikiPageEvent; import org.apache.wiki.event.WikiSecurityEvent; @@ -76,7 +75,7 @@ import java.util.concurrent.ConcurrentHashMap; // FIXME: This class currently only functions just as an extra layer over providers, // complicating things. We need to move more provider-specific functionality // from WikiEngine (which is too big now) into this class. -public class DefaultPageManager extends ModuleManager implements PageManager, WikiEventListener { +public class DefaultPageManager extends ModuleManager implements PageManager { private static final Logger LOG = Logger.getLogger( DefaultPageManager.class ); diff --git a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java index 0c48a48..9173df8 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java @@ -20,6 +20,7 @@ package org.apache.wiki.pages; import org.apache.wiki.WikiPage; import org.apache.wiki.api.exceptions.ProviderException; +import org.apache.wiki.event.WikiEventListener; import org.apache.wiki.providers.WikiPageProvider; import java.util.Collection; @@ -27,7 +28,7 @@ import java.util.List; import java.util.Set; -public interface PageManager { +public interface PageManager extends WikiEventListener { /** The property value for setting the current page provider. Value is {@value}. */ String PROP_PAGEPROVIDER = "jspwiki.pageProvider"; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java index bec5649..fac5361 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java @@ -23,7 +23,6 @@ import org.apache.wiki.WikiSession; import org.apache.wiki.api.exceptions.WikiException; import org.apache.wiki.auth.acl.UnresolvedPrincipal; import org.apache.wiki.event.WikiEvent; -import org.apache.wiki.event.WikiEventListener; import org.apache.wiki.event.WorkflowEvent; import java.security.Principal; @@ -42,7 +41,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * users or groups expected to approve particular Workflows. * </p> */ -public class DefaultWorkflowManager implements WorkflowManager, WikiEventListener { +public class DefaultWorkflowManager implements WorkflowManager { private final DecisionQueue m_queue = new DecisionQueue(); private final Set<Workflow> m_workflows; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java index 8fe46cb..e82e02c 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/WorkflowManager.java @@ -21,6 +21,7 @@ package org.apache.wiki.workflow; import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiSession; import org.apache.wiki.api.exceptions.WikiException; +import org.apache.wiki.event.WikiEventListener; import java.security.Principal; import java.util.List; @@ -34,7 +35,7 @@ import java.util.Set; * particular Workflows. * </p> */ -public interface WorkflowManager { +public interface WorkflowManager extends WikiEventListener { /** The workflow attribute which stores the wikiContext. */ String WF_WP_SAVE_ATTR_PRESAVE_WIKI_CONTEXT = "wikiContext";
