jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1426084 - in /incubator/jspwiki/trunk: ./ etc/ini/ src/org/apache/wiki/ src/org/apache/wiki/api/ src/org/apache/wiki/api/plugin/ src/org/apache/wiki/forms/ src/org/apache/wiki/parser/ src/org/apache/wiki/plugin/ src/org/apache/wiki/tags/ s...
Date Wed, 26 Dec 2012 22:55:22 GMT
Author: juanpablo
Date: Wed Dec 26 22:55:20 2012
New Revision: 1426084

URL: http://svn.apache.org/viewvc?rev=1426084&view=rev
Log:
 * Plugin API moved to its own sub-package, org.apache.wiki.api.plugin

Added:
    incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/
    incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/InitializablePlugin.java
      - copied, changed from r1423638, incubator/jspwiki/trunk/src/org/apache/wiki/api/InitializablePlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/ParserStagePlugin.java
      - copied, changed from r1426059, incubator/jspwiki/trunk/src/org/apache/wiki/api/ParserStagePlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/PluginManager.java
      - copied, changed from r1426061, incubator/jspwiki/trunk/src/org/apache/wiki/api/PluginManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/WikiPlugin.java
      - copied, changed from r1426059, incubator/jspwiki/trunk/src/org/apache/wiki/api/WikiPlugin.java
Removed:
    incubator/jspwiki/trunk/src/org/apache/wiki/api/InitializablePlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/api/ParserStagePlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/api/PluginManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/api/WikiPlugin.java
Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/etc/ini/classmappings.xml
    incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java
    incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormClose.java
    incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormElement.java
    incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java
    incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOpen.java
    incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java
    incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSelect.java
    incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSet.java
    incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormTextarea.java
    incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
    incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/AbstractReferralPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Counter.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/CurrentTimePlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Denounce.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Groups.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IfPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Image.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IndexPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InitializablePlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InsertPage.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ListLocksPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Note.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PageViewPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ParserStagePlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RPCSamplePlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferredPagesPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Search.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/SessionsPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogArchivePlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogEntryPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WikiPlugin.java
    incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java
    incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/AdminBeanManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PluginBean.java
    incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java
    incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java
    incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Dec 26 22:55:20 2012
@@ -2,8 +2,10 @@
 
        * 2.9.1-svn-8
         
-       * Filters API, as part of JSPWiki API (cfr. JSPWIKI-303). Check UPGRADING document for 
-         details
+       * Filters API (org.apache.wiki.api.filters), as part of JSPWiki API (cfr. JSPWIKI-303). 
+         Check UPGRADING document for details
+         
+       * Plugin API moved to its own sub-package, org.apache.wiki.api.plugin
          
        * explicit access to API interfaces to get rid of "<Object> cannot dereference error with 
          generics" errors at builds.a.o (cfr. http://stackoverflow.com/q/4144623)

Modified: incubator/jspwiki/trunk/etc/ini/classmappings.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/ini/classmappings.xml?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/ini/classmappings.xml (original)
+++ incubator/jspwiki/trunk/etc/ini/classmappings.xml Wed Dec 26 22:55:20 2012
@@ -97,7 +97,7 @@
     <mappedClass>org.apache.wiki.i18n.InternationalizationManager</mappedClass>
   </mapping>
   <mapping>
-    <requestedClass>org.apache.wiki.api.PluginManager</requestedClass>
+    <requestedClass>org.apache.wiki.api.plugin.PluginManager</requestedClass>
     <mappedClass>org.apache.wiki.plugin.PluginManager</mappedClass> <!-- to be replaced in 2.10 -->
     <!-- <mappedClass>org.apache.wiki.plugin.DefaultPluginManager</mappedClass> --> <!-- replacing the former in 2.10 -->
   </mapping>

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java Wed Dec 26 22:55:20 2012
@@ -34,9 +34,9 @@ import javax.servlet.http.HttpServletReq
 import org.apache.commons.lang.time.StopWatch;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
-import org.apache.wiki.api.PluginManager;
 import org.apache.wiki.api.exceptions.FilterException;
 import org.apache.wiki.api.filters.FilterManager;
+import org.apache.wiki.api.plugin.PluginManager;
 import org.apache.wiki.attachment.Attachment;
 import org.apache.wiki.attachment.AttachmentManager;
 import org.apache.wiki.auth.AuthenticationManager;

Copied: incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/InitializablePlugin.java (from r1423638, incubator/jspwiki/trunk/src/org/apache/wiki/api/InitializablePlugin.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/InitializablePlugin.java?p2=incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/InitializablePlugin.java&p1=incubator/jspwiki/trunk/src/org/apache/wiki/api/InitializablePlugin.java&r1=1423638&r2=1426084&rev=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/api/InitializablePlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/InitializablePlugin.java Wed Dec 26 22:55:20 2012
@@ -16,7 +16,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package org.apache.wiki.api;
+package org.apache.wiki.api.plugin;
 
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.api.exceptions.PluginException;

Copied: incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/ParserStagePlugin.java (from r1426059, incubator/jspwiki/trunk/src/org/apache/wiki/api/ParserStagePlugin.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/ParserStagePlugin.java?p2=incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/ParserStagePlugin.java&p1=incubator/jspwiki/trunk/src/org/apache/wiki/api/ParserStagePlugin.java&r1=1426059&r2=1426084&rev=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/api/ParserStagePlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/ParserStagePlugin.java Wed Dec 26 22:55:20 2012
@@ -16,7 +16,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package org.apache.wiki.api;
+package org.apache.wiki.api.plugin;
 
 import java.util.Map;
 

Copied: incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/PluginManager.java (from r1426061, incubator/jspwiki/trunk/src/org/apache/wiki/api/PluginManager.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/PluginManager.java?p2=incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/PluginManager.java&p1=incubator/jspwiki/trunk/src/org/apache/wiki/api/PluginManager.java&r1=1426061&r2=1426084&rev=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/api/PluginManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/PluginManager.java Wed Dec 26 22:55:20 2012
@@ -1,4 +1,4 @@
-package org.apache.wiki.api;
+package org.apache.wiki.api.plugin;
 
 import java.io.IOException;
 import java.util.Collection;

Copied: incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/WikiPlugin.java (from r1426059, incubator/jspwiki/trunk/src/org/apache/wiki/api/WikiPlugin.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/WikiPlugin.java?p2=incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/WikiPlugin.java&p1=incubator/jspwiki/trunk/src/org/apache/wiki/api/WikiPlugin.java&r1=1426059&r2=1426084&rev=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/api/WikiPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/api/plugin/WikiPlugin.java Wed Dec 26 22:55:20 2012
@@ -16,7 +16,7 @@
     specific language governing permissions and limitations
     under the License.  
  */
-package org.apache.wiki.api;
+package org.apache.wiki.api.plugin;
 
 import java.util.Map;
 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormClose.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormClose.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormClose.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormClose.java Wed Dec 26 22:55:20 2012
@@ -22,8 +22,8 @@ import java.util.Map;
 import java.util.ResourceBundle;
 
 import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 /**
  *  Closes a WikiForm.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormElement.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormElement.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormElement.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormElement.java Wed Dec 26 22:55:20 2012
@@ -19,7 +19,7 @@
 package org.apache.wiki.forms;
 
 import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.WikiPlugin;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 /**
  */

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormInput.java Wed Dec 26 22:55:20 2012
@@ -26,7 +26,7 @@ import org.apache.ecs.xhtml.input;
 import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.WikiPlugin;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 /**
  *  Creates a simple input text field.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOpen.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOpen.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOpen.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOpen.java Wed Dec 26 22:55:20 2012
@@ -23,8 +23,8 @@ import java.util.Map;
 import java.util.ResourceBundle;
 
 import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 /**
  *  Opens a WikiForm.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormOutput.java Wed Dec 26 22:55:20 2012
@@ -23,9 +23,9 @@ import java.util.Map;
 import java.util.ResourceBundle;
 
 import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.PluginManager;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.PluginManager;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.plugin.DefaultPluginManager;
 import org.apache.wiki.util.FormUtil;
 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSelect.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSelect.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSelect.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSelect.java Wed Dec 26 22:55:20 2012
@@ -26,8 +26,8 @@ import org.apache.ecs.ConcreteElement;
 import org.apache.ecs.xhtml.option;
 import org.apache.ecs.xhtml.select;
 import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 /**
  *  Creates a Form select field.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSet.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSet.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormSet.java Wed Dec 26 22:55:20 2012
@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 /**
  * FormSet is a companion WikiPlugin for Form. 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormTextarea.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormTextarea.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormTextarea.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/forms/FormTextarea.java Wed Dec 26 22:55:20 2012
@@ -26,7 +26,7 @@ import org.apache.ecs.ConcreteElement;
 import org.apache.ecs.xhtml.textarea;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.WikiPlugin;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 /**
  *  Creates a Form text area element.   You may specify the size of the textarea

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/parser/JSPWikiMarkupParser.java Wed Dec 26 22:55:20 2012
@@ -32,9 +32,9 @@ import org.apache.log4j.Logger;
 import org.apache.oro.text.GlobCompiler;
 import org.apache.oro.text.regex.*;
 import org.apache.wiki.*;
-import org.apache.wiki.api.PluginManager;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.PluginManager;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.attachment.Attachment;
 import org.apache.wiki.attachment.AttachmentManager;
 import org.apache.wiki.auth.WikiSecurityException;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/parser/PluginContent.java Wed Dec 26 22:55:20 2012
@@ -26,8 +26,8 @@ import java.util.ResourceBundle;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.api.exceptions.PluginException;
-import org.apache.wiki.api.PluginManager;
-import org.apache.wiki.api.WikiPlugin;
+import org.apache.wiki.api.plugin.PluginManager;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.render.RenderingManager;
 import org.jdom.Text;
 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/AbstractReferralPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/AbstractReferralPlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/AbstractReferralPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/AbstractReferralPlugin.java Wed Dec 26 22:55:20 2012
@@ -30,8 +30,8 @@ import org.apache.log4j.Logger;
 import org.apache.oro.text.GlobCompiler;
 import org.apache.oro.text.regex.*;
 import org.apache.wiki.*;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.parser.MarkupParser;
 import org.apache.wiki.parser.WikiDocument;
 import org.apache.wiki.preferences.Preferences;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java Wed Dec 26 22:55:20 2012
@@ -31,9 +31,9 @@ import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiException;
 import org.apache.wiki.WikiPage;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.exceptions.RedirectException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.parser.MarkupParser;
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Counter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Counter.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Counter.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Counter.java Wed Dec 26 22:55:20 2012
@@ -22,8 +22,8 @@ import java.util.Map;
 
 import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 /**
  *  Provides a page-specific counter, it is reset every time a page is rendered, so it is not usable as a hitcounter.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/CurrentTimePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/CurrentTimePlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/CurrentTimePlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/CurrentTimePlugin.java Wed Dec 26 22:55:20 2012
@@ -24,8 +24,8 @@ import java.util.Map;
 import java.util.ResourceBundle;
 
 import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.preferences.Preferences;
 import org.apache.wiki.preferences.Preferences.TimeFormat;
 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/DefaultPluginManager.java Wed Dec 26 22:55:20 2012
@@ -28,11 +28,11 @@ import org.apache.ecs.xhtml.*;
 import org.apache.log4j.Logger;
 import org.apache.oro.text.regex.*;
 import org.apache.wiki.*;
-import org.apache.wiki.api.InitializablePlugin;
-import org.apache.wiki.api.ParserStagePlugin;
-import org.apache.wiki.api.PluginManager;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.InitializablePlugin;
+import org.apache.wiki.api.plugin.ParserStagePlugin;
+import org.apache.wiki.api.plugin.PluginManager;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.modules.ModuleManager;
 import org.apache.wiki.modules.WikiModuleInfo;
 import org.apache.wiki.parser.PluginContent;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Denounce.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Denounce.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Denounce.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Denounce.java Wed Dec 26 22:55:20 2012
@@ -30,8 +30,8 @@ import org.apache.log4j.Logger;
 import org.apache.oro.text.GlobCompiler;
 import org.apache.oro.text.regex.*;
 import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 /**
  *  Denounces a link by removing it from any search engine. 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Groups.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Groups.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Groups.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Groups.java Wed Dec 26 22:55:20 2012
@@ -25,8 +25,8 @@ import java.util.Map;
 
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.auth.PrincipalComparator;
 import org.apache.wiki.auth.authorize.GroupManager;
 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IfPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IfPlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IfPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IfPlugin.java Wed Dec 26 22:55:20 2012
@@ -27,8 +27,8 @@ import org.apache.oro.text.regex.*;
 import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiProvider;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 /**
  *  The IfPlugin allows parts of a WikiPage to be executed conditionally, and is intended as a flexible way

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Image.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Image.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Image.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Image.java Wed Dec 26 22:55:20 2012
@@ -23,8 +23,8 @@ import java.util.Map;
 import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.attachment.Attachment;
 import org.apache.wiki.attachment.AttachmentManager;
 import org.apache.wiki.providers.ProviderException;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IndexPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IndexPlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IndexPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/IndexPlugin.java Wed Dec 26 22:55:20 2012
@@ -27,8 +27,8 @@ import org.apache.ecs.xhtml.div;
 import org.apache.ecs.xhtml.span;
 import org.apache.log4j.Logger;
 import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.providers.ProviderException;
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InitializablePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InitializablePlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InitializablePlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InitializablePlugin.java Wed Dec 26 22:55:20 2012
@@ -33,10 +33,10 @@ import org.apache.wiki.WikiEngine;
  *  @since 2.2
  *
  *  @deprecated will be removed in 2.10 scope. Consider using 
- *  {@link org.apache.wiki.api.InitializablePlugin} instead
+ *  {@link org.apache.wiki.api.plugin.InitializablePlugin} instead
  */
 @Deprecated
-public interface InitializablePlugin extends org.apache.wiki.api.InitializablePlugin
+public interface InitializablePlugin extends org.apache.wiki.api.plugin.InitializablePlugin
 {
     /**
      *  Called whenever the plugin is being instantiated for

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InsertPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InsertPage.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InsertPage.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/InsertPage.java Wed Dec 26 22:55:20 2012
@@ -26,8 +26,8 @@ import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.auth.AuthorizationManager;
 import org.apache.wiki.auth.permissions.PermissionFactory;
 import org.apache.wiki.providers.ProviderException;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ListLocksPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ListLocksPlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ListLocksPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ListLocksPlugin.java Wed Dec 26 22:55:20 2012
@@ -26,8 +26,8 @@ import java.util.ResourceBundle;
 import org.apache.wiki.PageLock;
 import org.apache.wiki.PageManager;
 import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.preferences.Preferences;
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Note.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Note.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Note.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Note.java Wed Dec 26 22:55:20 2012
@@ -25,8 +25,8 @@ import java.util.Map;
 import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 /**
  * Outputs an image with the supplied text as the <tt>title</tt> which is shown as a tooltip by

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PageViewPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PageViewPlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PageViewPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/PageViewPlugin.java Wed Dec 26 22:55:20 2012
@@ -28,9 +28,9 @@ import org.apache.log4j.Logger;
 import org.apache.oro.text.GlobCompiler;
 import org.apache.oro.text.regex.*;
 import org.apache.wiki.*;
-import org.apache.wiki.api.InitializablePlugin;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.InitializablePlugin;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.event.*;
 import org.apache.wiki.util.WikiBackgroundThread;
 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ParserStagePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ParserStagePlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ParserStagePlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ParserStagePlugin.java Wed Dec 26 22:55:20 2012
@@ -29,10 +29,10 @@ import org.apache.wiki.parser.PluginCont
  * 
  *  @since 2.5.30
  *  @deprecated will be removed in 2.10 scope. Consider using 
- *  {@link org.apache.wiki.api.ParserStagePlugin} instead
+ *  {@link org.apache.wiki.api.plugin.ParserStagePlugin} instead
  */
 @Deprecated
-public interface ParserStagePlugin extends org.apache.wiki.api.ParserStagePlugin
+public interface ParserStagePlugin extends org.apache.wiki.api.plugin.ParserStagePlugin
 {
     /**
      *  Method which is executed during parsing.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RPCSamplePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RPCSamplePlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RPCSamplePlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RPCSamplePlugin.java Wed Dec 26 22:55:20 2012
@@ -21,8 +21,8 @@ package org.apache.wiki.plugin;
 import java.util.Map;
 
 import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.rpc.RPCCallable;
 import org.apache.wiki.rpc.json.JSONRPCManager;
 

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/RecentChangesPlugin.java Wed Dec 26 22:55:20 2012
@@ -28,8 +28,8 @@ import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.attachment.Attachment;
 import org.apache.wiki.i18n.InternationalizationManager;
 import org.apache.wiki.preferences.Preferences;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferredPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferredPagesPlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferredPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferredPagesPlugin.java Wed Dec 26 22:55:20 2012
@@ -23,8 +23,8 @@ import java.util.*;
 import org.apache.log4j.Logger;
 import org.apache.oro.text.regex.*;
 import org.apache.wiki.*;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/ReferringPagesPlugin.java Wed Dec 26 22:55:20 2012
@@ -28,8 +28,8 @@ import org.apache.wiki.ReferenceManager;
 import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiPage;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 /**
  *  Displays the pages referring to the current page.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Search.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Search.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Search.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Search.java Wed Dec 26 22:55:20 2012
@@ -28,8 +28,8 @@ import org.apache.log4j.Logger;
 import org.apache.wiki.SearchResult;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.providers.ProviderException;
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/SessionsPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/SessionsPlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/SessionsPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/SessionsPlugin.java Wed Dec 26 22:55:20 2012
@@ -26,8 +26,8 @@ import java.util.Map;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiSession;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 
 /**
  *  <p>Displays information about active wiki sessions. The parameter

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/TableOfContents.java Wed Dec 26 22:55:20 2012
@@ -25,9 +25,9 @@ import java.util.ResourceBundle;
 
 import org.apache.log4j.Logger;
 import org.apache.wiki.*;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
 import org.apache.wiki.api.filters.FilterManager;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.parser.Heading;
 import org.apache.wiki.parser.HeadingListener;
 import org.apache.wiki.parser.JSPWikiMarkupParser;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogArchivePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogArchivePlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogArchivePlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogArchivePlugin.java Wed Dec 26 22:55:20 2012
@@ -26,8 +26,8 @@ import org.apache.wiki.TextUtil;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.WikiPage;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.providers.ProviderException;
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogEntryPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogEntryPlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogEntryPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogEntryPlugin.java Wed Dec 26 22:55:20 2012
@@ -23,8 +23,8 @@ import java.util.*;
 
 import org.apache.log4j.Logger;
 import org.apache.wiki.*;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.providers.ProviderException;
 
 /**

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogPlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WeblogPlugin.java Wed Dec 26 22:55:20 2012
@@ -27,9 +27,9 @@ import java.util.regex.Pattern;
 
 import org.apache.log4j.Logger;
 import org.apache.wiki.*;
-import org.apache.wiki.api.ParserStagePlugin;
-import org.apache.wiki.api.WikiPlugin;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.ParserStagePlugin;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.auth.AuthorizationManager;
 import org.apache.wiki.auth.permissions.PagePermission;
 import org.apache.wiki.parser.PluginContent;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WikiPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WikiPlugin.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WikiPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WikiPlugin.java Wed Dec 26 22:55:20 2012
@@ -25,11 +25,11 @@ import org.apache.wiki.WikiContext;
 /**
  *  Defines an interface for plugins.  Any instance of a wiki plugin
  *  should implement this interface.
- * @deprecated will be removed in 2.10 scope. Consider using {@link org.apache.wiki.api.WikiPlugin} 
+ * @deprecated will be removed in 2.10 scope. Consider using {@link org.apache.wiki.api.plugin.WikiPlugin} 
  * instead
  */
 @Deprecated
-public interface WikiPlugin extends org.apache.wiki.api.WikiPlugin
+public interface WikiPlugin extends org.apache.wiki.api.plugin.WikiPlugin
 {
     /**
      *  Name of the default plugin resource bundle.

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java Wed Dec 26 22:55:20 2012
@@ -25,8 +25,8 @@ import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyContent;
 
 import org.apache.wiki.WikiEngine;
-import org.apache.wiki.api.PluginManager;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.PluginManager;
 
 /**
  *  Inserts any Wiki plugin.  The body of the tag becomes then

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/AdminBeanManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/AdminBeanManager.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/AdminBeanManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/AdminBeanManager.java Wed Dec 26 22:55:20 2012
@@ -29,7 +29,7 @@ import javax.management.*;
 import org.apache.log4j.Logger;
 import org.apache.wiki.Release;
 import org.apache.wiki.WikiEngine;
-import org.apache.wiki.api.PluginManager;
+import org.apache.wiki.api.plugin.PluginManager;
 import org.apache.wiki.event.WikiEngineEvent;
 import org.apache.wiki.event.WikiEvent;
 import org.apache.wiki.event.WikiEventListener;

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PluginBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PluginBean.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PluginBean.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/ui/admin/beans/PluginBean.java Wed Dec 26 22:55:20 2012
@@ -27,7 +27,7 @@ import org.apache.ecs.xhtml.*;
 import org.apache.wiki.Release;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
-import org.apache.wiki.api.PluginManager;
+import org.apache.wiki.api.plugin.PluginManager;
 import org.apache.wiki.plugin.DefaultPluginManager.WikiPluginInfo;
 import org.apache.wiki.ui.admin.SimpleAdminBean;
 

Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/PageViewPluginTest.java Wed Dec 26 22:55:20 2012
@@ -27,7 +27,7 @@ import junit.framework.TestSuite;
 import org.apache.wiki.TestEngine;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiPage;
-import org.apache.wiki.api.PluginManager;
+import org.apache.wiki.api.plugin.PluginManager;
 
 public class PageViewPluginTest extends TestCase
 

Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/ReferringPagesPluginTest.java Wed Dec 26 22:55:20 2012
@@ -29,8 +29,8 @@ import junit.framework.TestSuite;
 import org.apache.wiki.TestEngine;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiPage;
-import org.apache.wiki.api.PluginManager;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.PluginManager;
 
 public class ReferringPagesPluginTest extends TestCase
 {

Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java?rev=1426084&r1=1426083&r2=1426084&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/UndefinedPagesPluginTest.java Wed Dec 26 22:55:20 2012
@@ -28,8 +28,8 @@ import junit.framework.Test;
 import org.apache.wiki.TestEngine;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiPage;
-import org.apache.wiki.api.PluginManager;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.PluginManager;
 
 public class UndefinedPagesPluginTest extends TestCase
 {



Mime
View raw message