You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ja...@apache.org on 2008/12/04 09:05:29 UTC
svn commit: r723236 [1/2] - in /incubator/jspwiki/trunk: ./
src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/action/
src/com/ecyrd/jspwiki/attachment/ src/com/ecyrd/jspwiki/auth/
src/com/ecyrd/jspwiki/auth/authorize/ src/com/ecyrd/jspwiki/content/
src/com/...
Author: jalkanen
Date: Thu Dec 4 00:05:25 2008
New Revision: 723236
URL: http://svn.apache.org/viewvc?rev=723236&view=rev
Log:
Switched to use org.apache.jspwiki.api.WikiException & PluginException; old classes removed.
Added:
incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiException.java
- copied, changed from r723059, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiException.java
Removed:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiException.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginException.java
Modified:
incubator/jspwiki/trunk/.classpath
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/NoRequiredPropertyException.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/NoSuchVariableException.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PropertyReader.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/ViewActionBean.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/WikiContextFactory.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/UserManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/WikiSecurityException.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterException.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormClose.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormInput.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOpen.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOutput.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormSelect.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormSet.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormTextarea.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/ParseException.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/PluginContent.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Groups.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IfPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Image.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InitializablePlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Note.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Search.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WikiPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/ProviderException.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/RenderingManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PluginTag.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ProviderConverter.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/AbstractStep.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Decision.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/DecisionQueue.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/DecisionRequiredException.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/SimpleNotification.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Step.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Workflow.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/WorkflowBuilder.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/WorkflowManager.java
incubator/jspwiki/trunk/src/org/apache/jspwiki/api/PluginException.java
incubator/jspwiki/trunk/src/webdocs/Rename.jsp
incubator/jspwiki/trunk/tests/SamplePlugin2.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiSessionTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/GroupManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabaseTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabaseTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/JavaScriptPlugin.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/ReferringPagesPluginTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/SamplePlugin.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/UndefinedPagesPluginTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/DefaultURLConstructorTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/ShortURLConstructorTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/url/ShortViewURLConstructorTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/ApprovalWorkflowTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/DecisionQueueTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/SimpleDecisionTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/TaskTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/WorkflowManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/WorkflowTest.java
incubator/jspwiki/trunk/tests/com/foo/SamplePlugin3.java
Modified: incubator/jspwiki/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Thu Dec 4 00:05:25 2008
@@ -38,6 +38,8 @@
<classpathentry kind="lib" path="tests/lib/jetty-servlet-5.1.14.jar"/>
<classpathentry kind="lib" path="tests/lib/selenium-server-1.0-beta1.jar"/>
<classpathentry kind="lib" path="lib/stripes-1.5.jar" sourcepath="/stripes-1.5/stripes/src"/>
+ <classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.6.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.5.6.jar"/>
<classpathentry kind="lib" path="lib/jul-to-slf4j-1.5.6.jar"/>
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/NoRequiredPropertyException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/NoRequiredPropertyException.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/NoRequiredPropertyException.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/NoRequiredPropertyException.java Thu Dec 4 00:05:25 2008
@@ -20,6 +20,8 @@
*/
package com.ecyrd.jspwiki;
+import org.apache.jspwiki.api.WikiException;
+
/**
* Marks an erroneus jspwiki.properties file. Certain properties
* have been marked as "required", and if you do not provide
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/NoSuchVariableException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/NoSuchVariableException.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/NoSuchVariableException.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/NoSuchVariableException.java Thu Dec 4 00:05:25 2008
@@ -20,6 +20,8 @@
*/
package com.ecyrd.jspwiki;
+import org.apache.jspwiki.api.WikiException;
+
/**
* Marks that no such variable was located.
*/
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java Thu Dec 4 00:05:25 2008
@@ -26,6 +26,8 @@
import java.util.*;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PropertyReader.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PropertyReader.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PropertyReader.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PropertyReader.java Thu Dec 4 00:05:25 2008
@@ -28,6 +28,8 @@
import javax.servlet.ServletContext;
+import org.apache.jspwiki.api.WikiException;
+
/**
* Property Reader for the WikiEngine. Reads the properties for the WikiEngine
* and implements the feature of cascading properties and variable substitution,
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java Thu Dec 4 00:05:25 2008
@@ -35,6 +35,8 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.time.StopWatch;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
//import org.apache.log4j.PropertyConfigurator;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java Thu Dec 4 00:05:25 2008
@@ -2,6 +2,8 @@
import javax.servlet.http.HttpServletRequest;
+import org.apache.jspwiki.api.WikiException;
+
import net.sourceforge.stripes.action.HandlesEvent;
import net.sourceforge.stripes.action.RedirectResolution;
import net.sourceforge.stripes.action.Resolution;
@@ -12,7 +14,6 @@
import net.sourceforge.stripes.validation.ValidationMethod;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiException;
import com.ecyrd.jspwiki.WikiPage;
import com.ecyrd.jspwiki.auth.permissions.PagePermission;
import com.ecyrd.jspwiki.log.Logger;
@@ -95,7 +96,7 @@
/**
* Handler method that renames the current wiki page. If the rename
* operation does not succeed for any reason, this method throws a
- * {@link com.ecyrd.jspwiki.WikiException}.
+ * {@link org.apache.jspwiki.api.WikiException}.
*
* @return a redirection to the renamed wiki page
* @throws WikiException if the page cannot be renamed
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/ViewActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/ViewActionBean.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/ViewActionBean.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/ViewActionBean.java Thu Dec 4 00:05:25 2008
@@ -1,5 +1,7 @@
package com.ecyrd.jspwiki.action;
+import org.apache.jspwiki.api.WikiException;
+
import net.sourceforge.stripes.action.*;
import net.sourceforge.stripes.controller.LifecycleStage;
import net.sourceforge.stripes.validation.Validate;
@@ -7,7 +9,6 @@
import net.sourceforge.stripes.validation.ValidationErrors;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiException;
import com.ecyrd.jspwiki.WikiPage;
import com.ecyrd.jspwiki.auth.permissions.PagePermission;
import com.ecyrd.jspwiki.log.Logger;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/WikiContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/WikiContextFactory.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/WikiContextFactory.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/WikiContextFactory.java Thu Dec 4 00:05:25 2008
@@ -7,6 +7,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
+import org.apache.jspwiki.api.WikiException;
+
import net.sourceforge.stripes.action.RedirectResolution;
import net.sourceforge.stripes.mock.MockHttpServletRequest;
import net.sourceforge.stripes.mock.MockHttpServletResponse;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentManager.java Thu Dec 4 00:05:25 2008
@@ -27,6 +27,8 @@
import java.util.*;
import org.apache.commons.lang.StringUtils;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java Thu Dec 4 00:05:25 2008
@@ -42,6 +42,8 @@
import org.apache.commons.fileupload.ProgressListener;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthenticationManager.java Thu Dec 4 00:05:25 2008
@@ -33,12 +33,13 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.TextUtil;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiException;
import com.ecyrd.jspwiki.WikiSession;
import com.ecyrd.jspwiki.auth.authorize.Role;
import com.ecyrd.jspwiki.auth.authorize.WebContainerAuthorizer;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/AuthorizationManager.java Thu Dec 4 00:05:25 2008
@@ -31,12 +31,13 @@
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
+
+import org.apache.jspwiki.api.WikiException;
import org.freshcookies.security.policy.LocalPolicy;
import org.freshcookies.security.policy.PolicyException;
import com.ecyrd.jspwiki.NoRequiredPropertyException;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiException;
import com.ecyrd.jspwiki.WikiPage;
import com.ecyrd.jspwiki.WikiSession;
import com.ecyrd.jspwiki.auth.acl.Acl;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/SecurityVerifier.java Thu Dec 4 00:05:25 2008
@@ -33,6 +33,8 @@
import javax.security.auth.spi.LoginModule;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
import org.freshcookies.security.policy.PolicyReader;
@@ -40,7 +42,6 @@
import com.ecyrd.jspwiki.InternalWikiException;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiException;
import com.ecyrd.jspwiki.WikiSession;
import com.ecyrd.jspwiki.auth.authorize.*;
import com.ecyrd.jspwiki.auth.permissions.AllPermission;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/UserManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/UserManager.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/UserManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/UserManager.java Thu Dec 4 00:05:25 2008
@@ -30,6 +30,8 @@
import javax.mail.internet.AddressException;
import javax.servlet.http.HttpServletRequest;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/WikiSecurityException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/WikiSecurityException.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/WikiSecurityException.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/WikiSecurityException.java Thu Dec 4 00:05:25 2008
@@ -20,7 +20,7 @@
*/
package com.ecyrd.jspwiki.auth;
-import com.ecyrd.jspwiki.WikiException;
+import org.apache.jspwiki.api.WikiException;
/**
* Indicates an authentication or authorization
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java Thu Dec 4 00:05:25 2008
@@ -31,13 +31,14 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.NoRequiredPropertyException;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiException;
import com.ecyrd.jspwiki.WikiSession;
import com.ecyrd.jspwiki.auth.*;
import com.ecyrd.jspwiki.auth.user.UserProfile;
@@ -124,7 +125,7 @@
* Returns the current external {@link GroupDatabase} in use. This method
* is guaranteed to return a properly-initialized GroupDatabase, unless
* it could not be initialized. In that case, this method throws
- * a {@link com.ecyrd.jspwiki.WikiException}. The GroupDatabase
+ * a {@link org.apache.jspwiki.api.WikiException}. The GroupDatabase
* is lazily initialized.
* @throws com.ecyrd.jspwiki.auth.WikiSecurityException if the GroupDatabase could
* not be initialized
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java Thu Dec 4 00:05:25 2008
@@ -26,6 +26,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterException.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterException.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterException.java Thu Dec 4 00:05:25 2008
@@ -20,7 +20,7 @@
*/
package com.ecyrd.jspwiki.filters;
-import com.ecyrd.jspwiki.WikiException;
+import org.apache.jspwiki.api.WikiException;
/**
* A generic PageFilter exception.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterManager.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterManager.java Thu Dec 4 00:05:25 2008
@@ -30,6 +30,8 @@
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
+
+import org.apache.jspwiki.api.WikiException;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -38,7 +40,6 @@
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiException;
import com.ecyrd.jspwiki.event.WikiEventManager;
import com.ecyrd.jspwiki.event.WikiPageEvent;
import com.ecyrd.jspwiki.modules.ModuleManager;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormClose.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormClose.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormClose.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormClose.java Thu Dec 4 00:05:25 2008
@@ -20,11 +20,13 @@
*/
package com.ecyrd.jspwiki.forms;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.plugin.PluginException;
-import com.ecyrd.jspwiki.plugin.WikiPlugin;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import org.apache.jspwiki.api.PluginException;
-import java.util.*;
+import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.plugin.WikiPlugin;
/**
* Closes a WikiForm.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormInput.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormInput.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormInput.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormInput.java Thu Dec 4 00:05:25 2008
@@ -20,13 +20,16 @@
*/
package com.ecyrd.jspwiki.forms;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.plugin.PluginException;
-import com.ecyrd.jspwiki.plugin.WikiPlugin;
-
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
import org.apache.ecs.xhtml.input;
+import org.apache.jspwiki.api.PluginException;
+
+import com.ecyrd.jspwiki.TextUtil;
+import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.plugin.WikiPlugin;
/**
* Creates a simple input text field.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOpen.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOpen.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOpen.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOpen.java Thu Dec 4 00:05:25 2008
@@ -24,8 +24,9 @@
import java.util.Map;
import java.util.ResourceBundle;
+import org.apache.jspwiki.api.PluginException;
+
import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.plugin.PluginException;
import com.ecyrd.jspwiki.plugin.WikiPlugin;
/**
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOutput.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOutput.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOutput.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOutput.java Thu Dec 4 00:05:25 2008
@@ -24,8 +24,9 @@
import java.util.Map;
import java.util.ResourceBundle;
+import org.apache.jspwiki.api.PluginException;
+
import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.plugin.PluginException;
import com.ecyrd.jspwiki.plugin.PluginManager;
import com.ecyrd.jspwiki.plugin.WikiPlugin;
import com.ecyrd.jspwiki.util.FormUtil;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormSelect.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormSelect.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormSelect.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormSelect.java Thu Dec 4 00:05:25 2008
@@ -20,15 +20,17 @@
*/
package com.ecyrd.jspwiki.forms;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.plugin.PluginException;
-import com.ecyrd.jspwiki.plugin.WikiPlugin;
-
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
import org.apache.ecs.ConcreteElement;
import org.apache.ecs.xhtml.option;
import org.apache.ecs.xhtml.select;
+import org.apache.jspwiki.api.PluginException;
+
+import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.plugin.WikiPlugin;
/**
* Creates a Form select field.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormSet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormSet.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormSet.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormSet.java Thu Dec 4 00:05:25 2008
@@ -20,9 +20,13 @@
*/
package com.ecyrd.jspwiki.forms;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.plugin.*;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.jspwiki.api.PluginException;
+
+import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.plugin.WikiPlugin;
/**
* FormSet is a companion WikiPlugin for Form.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormTextarea.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormTextarea.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormTextarea.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormTextarea.java Thu Dec 4 00:05:25 2008
@@ -20,14 +20,16 @@
*/
package com.ecyrd.jspwiki.forms;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.plugin.PluginException;
-import com.ecyrd.jspwiki.plugin.WikiPlugin;
-
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
import org.apache.ecs.ConcreteElement;
import org.apache.ecs.xhtml.textarea;
+import org.apache.jspwiki.api.PluginException;
+
+import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.plugin.WikiPlugin;
/**
* Creates a Form text area element. You may specify the size of the textarea
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java Thu Dec 4 00:05:25 2008
@@ -31,8 +31,7 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.jspwiki.api.PluginException;
import org.apache.oro.text.GlobCompiler;
import org.apache.oro.text.regex.*;
import org.jdom.*;
@@ -43,7 +42,8 @@
import com.ecyrd.jspwiki.auth.WikiSecurityException;
import com.ecyrd.jspwiki.auth.acl.Acl;
import com.ecyrd.jspwiki.i18n.InternationalizationManager;
-import com.ecyrd.jspwiki.plugin.PluginException;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.plugin.PluginManager;
import com.ecyrd.jspwiki.plugin.WikiPlugin;
import com.ecyrd.jspwiki.providers.ProviderException;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/ParseException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/ParseException.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/ParseException.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/ParseException.java Thu Dec 4 00:05:25 2008
@@ -20,7 +20,7 @@
*/
package com.ecyrd.jspwiki.parser;
-import com.ecyrd.jspwiki.WikiException;
+import org.apache.jspwiki.api.WikiException;
/**
* This is an exception which gets thrown whenever the parser cannot
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/PluginContent.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/PluginContent.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/PluginContent.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/PluginContent.java Thu Dec 4 00:05:25 2008
@@ -25,11 +25,11 @@
import java.util.Map;
import java.util.ResourceBundle;
+import org.apache.jspwiki.api.PluginException;
import org.jdom.Text;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.plugin.PluginException;
import com.ecyrd.jspwiki.plugin.WikiPlugin;
import com.ecyrd.jspwiki.render.RenderingManager;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java Thu Dec 4 00:05:25 2008
@@ -25,12 +25,13 @@
import java.util.*;
import org.apache.commons.lang.StringUtils;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.jspwiki.api.PluginException;
import org.apache.oro.text.GlobCompiler;
import org.apache.oro.text.regex.*;
import com.ecyrd.jspwiki.*;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.parser.MarkupParser;
import com.ecyrd.jspwiki.parser.WikiDocument;
import com.ecyrd.jspwiki.preferences.Preferences;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java Thu Dec 4 00:05:25 2008
@@ -27,14 +27,15 @@
import java.text.SimpleDateFormat;
import java.util.*;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.jspwiki.api.PluginException;
+import org.apache.jspwiki.api.WikiException;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiException;
import com.ecyrd.jspwiki.WikiPage;
import com.ecyrd.jspwiki.filters.RedirectException;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.parser.MarkupParser;
/**
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java Thu Dec 4 00:05:25 2008
@@ -20,8 +20,12 @@
*/
package com.ecyrd.jspwiki.plugin;
-import com.ecyrd.jspwiki.*;
-import java.util.*;
+import java.util.Map;
+
+import org.apache.jspwiki.api.PluginException;
+
+import com.ecyrd.jspwiki.TextUtil;
+import com.ecyrd.jspwiki.WikiContext;
/**
* 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/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java Thu Dec 4 00:05:25 2008
@@ -25,6 +25,8 @@
import java.util.Map;
import java.util.ResourceBundle;
+import org.apache.jspwiki.api.PluginException;
+
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.preferences.Preferences;
import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java Thu Dec 4 00:05:25 2008
@@ -22,18 +22,20 @@
*/
package com.ecyrd.jspwiki.plugin;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-import org.apache.oro.text.*;
-import org.apache.oro.text.regex.*;
-
-import java.util.*;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
import javax.servlet.http.HttpServletRequest;
+import org.apache.jspwiki.api.PluginException;
+import org.apache.oro.text.GlobCompiler;
+import org.apache.oro.text.regex.*;
+
+import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
+
/**
* Denounces a link by removing it from any search engine.
* <br> The bots are listed in com/ecyrd/jspwiki/plugin/denounce.properties.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Groups.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Groups.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Groups.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Groups.java Thu Dec 4 00:05:25 2008
@@ -25,6 +25,8 @@
import java.util.Comparator;
import java.util.Map;
+import org.apache.jspwiki.api.PluginException;
+
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.auth.PrincipalComparator;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IfPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IfPlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IfPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IfPlugin.java Thu Dec 4 00:05:25 2008
@@ -26,6 +26,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.jspwiki.api.ModuleData;
+import org.apache.jspwiki.api.PluginException;
import org.apache.oro.text.regex.*;
import com.ecyrd.jspwiki.TextUtil;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Image.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Image.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Image.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Image.java Thu Dec 4 00:05:25 2008
@@ -20,13 +20,16 @@
*/
package com.ecyrd.jspwiki.plugin;
-import java.util.*;
+import java.util.Map;
import org.apache.jspwiki.api.ModuleData;
+import org.apache.jspwiki.api.PluginException;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.attachment.AttachmentManager;
+import com.ecyrd.jspwiki.TextUtil;
+import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.attachment.Attachment;
+import com.ecyrd.jspwiki.attachment.AttachmentManager;
import com.ecyrd.jspwiki.providers.ProviderException;
/**
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java Thu Dec 4 00:05:25 2008
@@ -26,10 +26,11 @@
import org.apache.ecs.Element;
import org.apache.ecs.xhtml.div;
import org.apache.ecs.xhtml.span;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.jspwiki.api.PluginException;
import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.providers.ProviderException;
/**
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InitializablePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InitializablePlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InitializablePlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InitializablePlugin.java Thu Dec 4 00:05:25 2008
@@ -20,6 +20,8 @@
*/
package com.ecyrd.jspwiki.plugin;
+import org.apache.jspwiki.api.PluginException;
+
import com.ecyrd.jspwiki.WikiEngine;
/**
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java Thu Dec 4 00:05:25 2008
@@ -20,13 +20,21 @@
*/
package com.ecyrd.jspwiki.plugin;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.auth.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import org.apache.jspwiki.api.PluginException;
+
+import com.ecyrd.jspwiki.TextUtil;
+import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.WikiEngine;
+import com.ecyrd.jspwiki.WikiPage;
+import com.ecyrd.jspwiki.auth.AuthorizationManager;
import com.ecyrd.jspwiki.auth.permissions.PermissionFactory;
import com.ecyrd.jspwiki.providers.ProviderException;
-import java.util.*;
-
/**
* Inserts page contents. Muchos thanks to Scott Hurlbert for the initial code.
*
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java Thu Dec 4 00:05:25 2008
@@ -20,8 +20,16 @@
*/
package com.ecyrd.jspwiki.plugin;
-import com.ecyrd.jspwiki.*;
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import org.apache.jspwiki.api.PluginException;
+
+import com.ecyrd.jspwiki.PageLock;
+import com.ecyrd.jspwiki.PageManager;
+import com.ecyrd.jspwiki.WikiContext;
/**
* This is a plugin for the administrator: It allows him to see in a single
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Note.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Note.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Note.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Note.java Thu Dec 4 00:05:25 2008
@@ -24,6 +24,8 @@
import java.util.Map;
+import org.apache.jspwiki.api.PluginException;
+
import com.ecyrd.jspwiki.TextUtil;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java Thu Dec 4 00:05:25 2008
@@ -30,11 +30,12 @@
import org.apache.commons.lang.ClassUtils;
import org.apache.ecs.xhtml.*;
import org.apache.jspwiki.api.ModuleData;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.jspwiki.api.PluginException;
import org.apache.oro.text.regex.*;
import com.ecyrd.jspwiki.*;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.modules.ModuleManager;
import com.ecyrd.jspwiki.modules.WikiModuleInfo;
import com.ecyrd.jspwiki.parser.PluginContent;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java Thu Dec 4 00:05:25 2008
@@ -22,6 +22,8 @@
import java.util.Map;
+import org.apache.jspwiki.api.PluginException;
+
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.rpc.RPCCallable;
import com.ecyrd.jspwiki.rpc.json.JSONRPCManager;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java Thu Dec 4 00:05:25 2008
@@ -25,8 +25,7 @@
import java.util.*;
import org.apache.ecs.xhtml.*;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.jspwiki.api.PluginException;
import com.ecyrd.jspwiki.TextUtil;
import com.ecyrd.jspwiki.WikiContext;
@@ -34,6 +33,8 @@
import com.ecyrd.jspwiki.WikiPage;
import com.ecyrd.jspwiki.attachment.Attachment;
import com.ecyrd.jspwiki.i18n.InternationalizationManager;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.preferences.Preferences;
import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java Thu Dec 4 00:05:25 2008
@@ -22,11 +22,12 @@
import java.util.*;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.jspwiki.api.PluginException;
import org.apache.oro.text.regex.*;
import com.ecyrd.jspwiki.*;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
/**
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java Thu Dec 4 00:05:25 2008
@@ -20,12 +20,19 @@
*/
package com.ecyrd.jspwiki.plugin;
+import java.text.MessageFormat;
+import java.util.Collection;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import org.apache.jspwiki.api.PluginException;
+
+import com.ecyrd.jspwiki.ReferenceManager;
+import com.ecyrd.jspwiki.TextUtil;
+import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.WikiPage;
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.*;
-
-import java.text.MessageFormat;
-import java.util.*;
/**
* Displays the pages referring to the current page.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Search.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Search.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Search.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Search.java Thu Dec 4 00:05:25 2008
@@ -26,12 +26,13 @@
import java.util.Map;
import org.apache.ecs.xhtml.*;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.jspwiki.api.PluginException;
import com.ecyrd.jspwiki.SearchResult;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.providers.ProviderException;
/**
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java Thu Dec 4 00:05:25 2008
@@ -25,6 +25,8 @@
import java.util.Iterator;
import java.util.Map;
+import org.apache.jspwiki.api.PluginException;
+
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.WikiSession;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java Thu Dec 4 00:05:25 2008
@@ -20,17 +20,20 @@
*/
package com.ecyrd.jspwiki.plugin;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import org.apache.jspwiki.api.PluginException;
+
+import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
-import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.parser.Heading;
import com.ecyrd.jspwiki.parser.HeadingListener;
import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
-import java.util.*;
-import java.io.StringReader;
-import java.io.IOException;
-
/**
* Provides a table of contents.
* <p>Parameters : </p>
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java Thu Dec 4 00:05:25 2008
@@ -20,9 +20,14 @@
*/
package com.ecyrd.jspwiki.plugin;
-import com.ecyrd.jspwiki.*;
+import java.util.Collection;
+import java.util.Map;
+import java.util.TreeSet;
-import java.util.*;
+import org.apache.jspwiki.api.PluginException;
+
+import com.ecyrd.jspwiki.ReferenceManager;
+import com.ecyrd.jspwiki.WikiContext;
/**
* Plugin that enumerates the pages in the wiki that have not yet been defined.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java Thu Dec 4 00:05:25 2008
@@ -20,8 +20,16 @@
*/
package com.ecyrd.jspwiki.plugin;
-import com.ecyrd.jspwiki.*;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeSet;
+
+import org.apache.jspwiki.api.PluginException;
+
+import com.ecyrd.jspwiki.ReferenceManager;
+import com.ecyrd.jspwiki.TextUtil;
+import com.ecyrd.jspwiki.WikiContext;
/**
* Plugin for displaying pages that are not linked to in other pages.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java Thu Dec 4 00:05:25 2008
@@ -20,14 +20,19 @@
*/
package com.ecyrd.jspwiki.plugin;
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.providers.ProviderException;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-
import java.text.SimpleDateFormat;
import java.util.*;
+import org.apache.jspwiki.api.PluginException;
+
+import com.ecyrd.jspwiki.TextUtil;
+import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.WikiEngine;
+import com.ecyrd.jspwiki.WikiPage;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
+import com.ecyrd.jspwiki.providers.ProviderException;
+
/**
* Creates a list of all weblog entries on a monthly basis.
*
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java Thu Dec 4 00:05:25 2008
@@ -20,13 +20,15 @@
*/
package com.ecyrd.jspwiki.plugin;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import org.apache.jspwiki.api.PluginException;
+
import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.providers.ProviderException;
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
+import com.ecyrd.jspwiki.providers.ProviderException;
/**
* Builds a simple weblog.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java Thu Dec 4 00:05:25 2008
@@ -23,24 +23,17 @@
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.apache.jspwiki.api.PluginException;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.auth.AuthorizationManager;
import com.ecyrd.jspwiki.auth.permissions.PagePermission;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.parser.PluginContent;
import com.ecyrd.jspwiki.preferences.Preferences;
import com.ecyrd.jspwiki.preferences.Preferences.TimeFormat;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WikiPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WikiPlugin.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WikiPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WikiPlugin.java Thu Dec 4 00:05:25 2008
@@ -22,6 +22,8 @@
import java.util.Map;
+import org.apache.jspwiki.api.PluginException;
+
import com.ecyrd.jspwiki.WikiContext;
/**
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/ProviderException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/ProviderException.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/ProviderException.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/ProviderException.java Thu Dec 4 00:05:25 2008
@@ -20,7 +20,7 @@
*/
package com.ecyrd.jspwiki.providers;
-import com.ecyrd.jspwiki.WikiException;
+import org.apache.jspwiki.api.WikiException;
/**
* This exception represents the superclass of all exceptions that providers
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/RenderingManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/RenderingManager.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/RenderingManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/RenderingManager.java Thu Dec 4 00:05:25 2008
@@ -27,13 +27,14 @@
import java.util.Iterator;
import java.util.Properties;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.TextUtil;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiException;
import com.ecyrd.jspwiki.event.WikiEvent;
import com.ecyrd.jspwiki.event.WikiEventListener;
import com.ecyrd.jspwiki.event.WikiEventUtils;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java Thu Dec 4 00:05:25 2008
@@ -32,6 +32,8 @@
import java.util.Iterator;
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
+
+import org.apache.jspwiki.api.WikiException;
import org.intabulas.sandler.*;
import org.intabulas.sandler.exceptions.*;
import org.intabulas.sandler.elements.*;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java Thu Dec 4 00:05:25 2008
@@ -22,6 +22,8 @@
import java.util.*;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java Thu Dec 4 00:05:25 2008
@@ -24,6 +24,8 @@
import java.util.*;
import org.apache.commons.lang.time.StopWatch;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PluginTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PluginTag.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PluginTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PluginTag.java Thu Dec 4 00:05:25 2008
@@ -26,8 +26,9 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyContent;
+import org.apache.jspwiki.api.PluginException;
+
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.plugin.PluginException;
import com.ecyrd.jspwiki.plugin.PluginManager;
/**
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java Thu Dec 4 00:05:25 2008
@@ -27,12 +27,13 @@
import com.ecyrd.jspwiki.log.Logger;
import com.ecyrd.jspwiki.log.LoggerFactory;
+
+import org.apache.jspwiki.api.WikiException;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
import org.jdom.xpath.XPath;
-import com.ecyrd.jspwiki.WikiException;
/**
* Contains useful utilities for class file manipulation. This is a static class,
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ProviderConverter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ProviderConverter.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ProviderConverter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ProviderConverter.java Thu Dec 4 00:05:25 2008
@@ -25,6 +25,7 @@
import java.util.*;
import org.apache.commons.lang.SystemUtils;
+import org.apache.jspwiki.api.WikiException;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.providers.AbstractFileProvider;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/AbstractStep.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/AbstractStep.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/AbstractStep.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/AbstractStep.java Thu Dec 4 00:05:25 2008
@@ -24,7 +24,8 @@
import java.security.Principal;
import java.util.*;
-import com.ecyrd.jspwiki.WikiException;
+import org.apache.jspwiki.api.WikiException;
+
/**
* Abstact superclass that provides a complete implementation of most
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Decision.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Decision.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Decision.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Decision.java Thu Dec 4 00:05:25 2008
@@ -25,7 +25,8 @@
import java.util.Collections;
import java.util.List;
-import com.ecyrd.jspwiki.WikiException;
+import org.apache.jspwiki.api.WikiException;
+
/**
* <p>
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/DecisionQueue.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/DecisionQueue.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/DecisionQueue.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/DecisionQueue.java Thu Dec 4 00:05:25 2008
@@ -26,7 +26,8 @@
import java.util.Collection;
import java.util.LinkedList;
-import com.ecyrd.jspwiki.WikiException;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.WikiSession;
/**
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/DecisionRequiredException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/DecisionRequiredException.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/DecisionRequiredException.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/DecisionRequiredException.java Thu Dec 4 00:05:25 2008
@@ -20,7 +20,7 @@
*/
package com.ecyrd.jspwiki.workflow;
-import com.ecyrd.jspwiki.WikiException;
+import org.apache.jspwiki.api.WikiException;
/**
* Exception thrown when an activity -- that would otherwise complete silently --
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/SimpleNotification.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/SimpleNotification.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/SimpleNotification.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/SimpleNotification.java Thu Dec 4 00:05:25 2008
@@ -22,7 +22,8 @@
import java.security.Principal;
-import com.ecyrd.jspwiki.WikiException;
+import org.apache.jspwiki.api.WikiException;
+
/**
* Decision subclass used for notifications that includes only one available Outcome:
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Step.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Step.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Step.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Step.java Thu Dec 4 00:05:25 2008
@@ -26,7 +26,8 @@
import java.util.Date;
import java.util.List;
-import com.ecyrd.jspwiki.WikiException;
+import org.apache.jspwiki.api.WikiException;
+
/**
* <p>
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Workflow.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Workflow.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Workflow.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/Workflow.java Thu Dec 4 00:05:25 2008
@@ -24,7 +24,8 @@
import java.security.Principal;
import java.util.*;
-import com.ecyrd.jspwiki.WikiException;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.event.WikiEventListener;
import com.ecyrd.jspwiki.event.WikiEventManager;
import com.ecyrd.jspwiki.event.WorkflowEvent;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/WorkflowBuilder.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/WorkflowBuilder.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/WorkflowBuilder.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/WorkflowBuilder.java Thu Dec 4 00:05:25 2008
@@ -24,8 +24,9 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiException;
/**
* Factory class that creates common Workflow instances such as a standard approval workflow.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/WorkflowManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/WorkflowManager.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/WorkflowManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/workflow/WorkflowManager.java Thu Dec 4 00:05:25 2008
@@ -23,8 +23,9 @@
import java.security.Principal;
import java.util.*;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiException;
import com.ecyrd.jspwiki.WikiSession;
import com.ecyrd.jspwiki.auth.acl.UnresolvedPrincipal;
import com.ecyrd.jspwiki.event.WikiEvent;
Modified: incubator/jspwiki/trunk/src/org/apache/jspwiki/api/PluginException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/jspwiki/api/PluginException.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/jspwiki/api/PluginException.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/jspwiki/api/PluginException.java Thu Dec 4 00:05:25 2008
@@ -29,8 +29,6 @@
{
private static final long serialVersionUID = 0L;
- private final Throwable m_throwable;
-
/**
* Create a PluginException.
*
@@ -39,7 +37,6 @@
public PluginException( String message )
{
super( message );
- m_throwable = null;
}
/**
@@ -50,17 +47,7 @@
*/
public PluginException( String message, Throwable original )
{
- super( message );
- m_throwable = original;
+ super( message, original );
}
- /**
- * Return the original exception.
- *
- * @return The original exception.
- */
- public Throwable getRootThrowable()
- {
- return m_throwable;
- }
}
Copied: incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiException.java (from r723059, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiException.java)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiException.java?p2=incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiException.java&p1=incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiException.java&r1=723059&r2=723236&rev=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiException.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiException.java Thu Dec 4 00:05:25 2008
@@ -18,17 +18,18 @@
specific language governing permissions and limitations
under the License.
*/
-package com.ecyrd.jspwiki;
+package org.apache.jspwiki.api;
/**
- * A generic Wiki exception.
+ * The main JSPWiki exception. All JSPWiki exceptions thrown by JSPWiki
+ * are derivatives of this exception type.
*
- * @since 2.0
+ * @since 3.0
*/
public class WikiException
extends Exception
{
- private static final long serialVersionUID = 3257290231723210803L;
+ private static final long serialVersionUID = 3257290231723210813L;
/**
* Constructs an exception.
@@ -39,4 +40,15 @@
{
super(msg);
}
+
+ /**
+ * Constructs an exception with a root cause.
+ *
+ * @param msg The message in the exception
+ * @param rootCause The root cause.
+ */
+ public WikiException( String msg, Throwable rootCause )
+ {
+ super( msg, rootCause );
+ }
}
Modified: incubator/jspwiki/trunk/src/webdocs/Rename.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Rename.jsp?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Rename.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Rename.jsp Thu Dec 4 00:05:25 2008
@@ -1,6 +1,7 @@
<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="org.apache.jspwiki.api.WikiException" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
@@ -72,12 +73,11 @@
}
pageContext.setAttribute( "renameto",
- TextUtil.replaceEntities( renameTo ),
- PageContext.REQUEST_SCOPE );
+ TextUtil.replaceEntities( renameTo ),
+ PageContext.REQUEST_SCOPE );
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
String contentPage = wiki.getTemplateManager().findJSP( pageContext,
- wikiContext.getTemplate(),
- "ViewTemplate.jsp" );
-
+ wikiContext.getTemplate(),
+ "ViewTemplate.jsp" );
%><wiki:Include page="<%=contentPage%>" />
\ No newline at end of file
Modified: incubator/jspwiki/trunk/tests/SamplePlugin2.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/SamplePlugin2.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/SamplePlugin2.java (original)
+++ incubator/jspwiki/trunk/tests/SamplePlugin2.java Thu Dec 4 00:05:25 2008
@@ -1,6 +1,10 @@
-import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.plugin.*;
-import java.util.*;
+import java.util.Map;
+
+import org.apache.jspwiki.api.PluginException;
+
+import com.ecyrd.jspwiki.WikiContext;
+import com.ecyrd.jspwiki.WikiEngine;
+import com.ecyrd.jspwiki.plugin.WikiPlugin;
/**
* Implements a simple plugin that just returns its text.
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java Thu Dec 4 00:05:25 2008
@@ -5,6 +5,8 @@
import java.util.*;
import java.io.*;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.providers.FileSystemProvider;
/**
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java Thu Dec 4 00:05:25 2008
@@ -8,6 +8,8 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
+import org.apache.jspwiki.api.WikiException;
+
import net.sourceforge.stripes.controller.DispatcherServlet;
import net.sourceforge.stripes.controller.StripesFilter;
import net.sourceforge.stripes.mock.MockHttpServletRequest;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiEngineTest.java Thu Dec 4 00:05:25 2008
@@ -5,6 +5,8 @@
import java.io.*;
import java.util.*;
+import org.apache.jspwiki.api.WikiException;
+
import com.ecyrd.jspwiki.providers.*;
import com.ecyrd.jspwiki.attachment.*;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiSessionTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiSessionTest.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiSessionTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/WikiSessionTest.java Thu Dec 4 00:05:25 2008
@@ -17,6 +17,7 @@
import net.sourceforge.stripes.mock.*;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.jspwiki.api.WikiException;
import com.ecyrd.jspwiki.auth.AuthenticationManager;
import com.ecyrd.jspwiki.auth.Users;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/action/WikiContextFactoryTest.java Thu Dec 4 00:05:25 2008
@@ -6,6 +6,8 @@
package com.ecyrd.jspwiki.action;
import java.util.Properties;
+import org.apache.jspwiki.api.WikiException;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java Thu Dec 4 00:05:25 2008
@@ -10,6 +10,7 @@
import junit.framework.TestSuite;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.jspwiki.api.WikiException;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.attachment.Attachment;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/GroupManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/GroupManagerTest.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/GroupManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/GroupManagerTest.java Thu Dec 4 00:05:25 2008
@@ -4,13 +4,13 @@
import java.util.Properties;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.jspwiki.api.WikiException;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiException;
import com.ecyrd.jspwiki.WikiSession;
import com.ecyrd.jspwiki.WikiSessionTest;
import com.ecyrd.jspwiki.auth.authorize.Group;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabaseTest.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabaseTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/JDBCGroupDatabaseTest.java Thu Dec 4 00:05:25 2008
@@ -10,6 +10,8 @@
import javax.naming.InitialContext;
import javax.sql.DataSource;
+import org.apache.jspwiki.api.WikiException;
+
import junit.framework.TestCase;
import com.ecyrd.jspwiki.*;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabaseTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabaseTest.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabaseTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/authorize/XMLGroupDatabaseTest.java Thu Dec 4 00:05:25 2008
@@ -22,11 +22,12 @@
import java.security.Principal;
import java.util.Properties;
+import org.apache.jspwiki.api.WikiException;
+
import junit.framework.TestCase;
import com.ecyrd.jspwiki.TestEngine;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.WikiException;
import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
import com.ecyrd.jspwiki.auth.WikiPrincipal;
import com.ecyrd.jspwiki.auth.WikiSecurityException;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/PageRenamerTest.java Thu Dec 4 00:05:25 2008
@@ -3,6 +3,8 @@
import java.util.Collection;
import java.util.Properties;
+import org.apache.jspwiki.api.WikiException;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java?rev=723236&r1=723235&r2=723236&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java Thu Dec 4 00:05:25 2008
@@ -3,6 +3,8 @@
import java.io.IOException;
import java.util.Properties;
+import org.apache.jspwiki.api.WikiException;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;