Author: jalkanen
Date: Thu Dec 4 01:21:21 2008
New Revision: 723262
URL: http://svn.apache.org/viewvc?rev=723262&view=rev
Log:
Moved FilterException to the API package.
Removed:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterException.java
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/PageEventFilter.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/BasicPageFilter.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/CreoleFilter.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/PageFilter.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/RedirectException.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/ApprovalWorkflowTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=723262&r1=723261&r2=723262&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Dec 4 01:21:21 2008
@@ -2,8 +2,9 @@
* 3.0.0-svn-22
- * Moved WikiException & PluginException to the org.apache.jspwiki.api
- package. This is a part of the overall transition to have a stable
API.
+ * Moved WikiException, FilterException & PluginException to the
+ org.apache.jspwiki.api package. This is a part of the overall
+ transition to have a stable API.
* [JSPWIKI-291] Added patch from Thomas Engelschmidt to replace ORO
regexp library with Java built-in regexps for DenouncePlugin, as well
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=723262&r1=723261&r2=723262&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java Thu Dec 4
01:21:21 2008
@@ -26,11 +26,9 @@
import java.util.*;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.jspwiki.api.FilterException;
import org.apache.jspwiki.api.WikiException;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-
import com.ecyrd.jspwiki.auth.WikiPrincipal;
import com.ecyrd.jspwiki.auth.WikiSecurityException;
import com.ecyrd.jspwiki.auth.acl.Acl;
@@ -38,7 +36,8 @@
import com.ecyrd.jspwiki.auth.acl.AclEntryImpl;
import com.ecyrd.jspwiki.auth.user.UserProfile;
import com.ecyrd.jspwiki.event.*;
-import com.ecyrd.jspwiki.filters.FilterException;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.modules.ModuleManager;
import com.ecyrd.jspwiki.providers.CachingProvider;
import com.ecyrd.jspwiki.providers.ProviderException;
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=723262&r1=723261&r2=723262&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiEngine.java Thu Dec 4
01:21:21 2008
@@ -35,12 +35,9 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.time.StopWatch;
+import org.apache.jspwiki.api.FilterException;
import org.apache.jspwiki.api.WikiException;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-//import org.apache.log4j.PropertyConfigurator;
-
import com.ecyrd.jspwiki.action.WikiContextFactory;
import com.ecyrd.jspwiki.attachment.Attachment;
import com.ecyrd.jspwiki.attachment.AttachmentManager;
@@ -55,9 +52,10 @@
import com.ecyrd.jspwiki.event.WikiEngineEvent;
import com.ecyrd.jspwiki.event.WikiEventListener;
import com.ecyrd.jspwiki.event.WikiEventManager;
-import com.ecyrd.jspwiki.filters.FilterException;
import com.ecyrd.jspwiki.filters.FilterManager;
import com.ecyrd.jspwiki.i18n.InternationalizationManager;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.parser.JSPWikiMarkupParser;
import com.ecyrd.jspwiki.parser.MarkupParser;
import com.ecyrd.jspwiki.parser.WikiDocument;
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/PageEventFilter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/PageEventFilter.java?rev=723262&r1=723261&r2=723262&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/PageEventFilter.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/PageEventFilter.java
Thu Dec 4 01:21:21 2008
@@ -21,11 +21,12 @@
package com.ecyrd.jspwiki.event;
-import com.ecyrd.jspwiki.filters.BasicPageFilter;
-import com.ecyrd.jspwiki.filters.FilterException;
+import java.util.Properties;
+
+import org.apache.jspwiki.api.FilterException;
import com.ecyrd.jspwiki.WikiContext;
-import java.util.Properties;
+import com.ecyrd.jspwiki.filters.BasicPageFilter;
/**
* Fires WikiPageEvents for page events.
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/BasicPageFilter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/BasicPageFilter.java?rev=723262&r1=723261&r2=723262&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/BasicPageFilter.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/BasicPageFilter.java
Thu Dec 4 01:21:21 2008
@@ -22,6 +22,8 @@
import java.util.Properties;
+import org.apache.jspwiki.api.FilterException;
+
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/CreoleFilter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/CreoleFilter.java?rev=723262&r1=723261&r2=723262&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/CreoleFilter.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/CreoleFilter.java Thu
Dec 4 01:21:21 2008
@@ -22,10 +22,10 @@
import java.util.Properties;
+import org.apache.jspwiki.api.FilterException;
+
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
-import com.ecyrd.jspwiki.filters.BasicPageFilter;
-import com.ecyrd.jspwiki.filters.FilterException;
import com.ecyrd.jspwiki.parser.CreoleToJSPWikiTranslator;
/**
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=723262&r1=723261&r2=723262&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 01:21:21 2008
@@ -28,9 +28,7 @@
import net.sourceforge.stripes.util.ResolverUtil;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-
+import org.apache.jspwiki.api.FilterException;
import org.apache.jspwiki.api.WikiException;
import org.jdom.Document;
import org.jdom.Element;
@@ -42,6 +40,8 @@
import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.event.WikiEventManager;
import com.ecyrd.jspwiki.event.WikiPageEvent;
+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.util.ClassUtil;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/PageFilter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/PageFilter.java?rev=723262&r1=723261&r2=723262&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/PageFilter.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/PageFilter.java Thu
Dec 4 01:21:21 2008
@@ -22,6 +22,8 @@
import java.util.Properties;
+import org.apache.jspwiki.api.FilterException;
+
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/RedirectException.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/RedirectException.java?rev=723262&r1=723261&r2=723262&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/RedirectException.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/RedirectException.java
Thu Dec 4 01:21:21 2008
@@ -26,6 +26,8 @@
import net.sourceforge.stripes.action.RedirectResolution;
import net.sourceforge.stripes.action.Resolution;
+import org.apache.jspwiki.api.FilterException;
+
/**
* This exception may be thrown if a filter wants to reject something and
* redirect the user elsewhere. In addition to being a subclass of
FilterException,
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=723262&r1=723261&r2=723262&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 01:21:21 2008
@@ -24,18 +24,17 @@
import java.util.*;
import org.apache.commons.lang.time.StopWatch;
+import org.apache.jspwiki.api.FilterException;
import org.apache.jspwiki.api.WikiException;
-import com.ecyrd.jspwiki.log.Logger;
-import com.ecyrd.jspwiki.log.LoggerFactory;
-
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.event.WikiEvent;
import com.ecyrd.jspwiki.event.WikiEventListener;
import com.ecyrd.jspwiki.event.WikiEventUtils;
import com.ecyrd.jspwiki.event.WikiPageEvent;
import com.ecyrd.jspwiki.filters.BasicPageFilter;
-import com.ecyrd.jspwiki.filters.FilterException;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.modules.InternalModule;
import com.ecyrd.jspwiki.parser.MarkupParser;
import com.ecyrd.jspwiki.providers.ProviderException;
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/ApprovalWorkflowTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/ApprovalWorkflowTest.java?rev=723262&r1=723261&r2=723262&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/ApprovalWorkflowTest.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/ApprovalWorkflowTest.java
Thu Dec 4 01:21:21 2008
@@ -5,15 +5,17 @@
import java.util.List;
import java.util.Properties;
-import org.apache.jspwiki.api.WikiException;
-
import junit.framework.TestCase;
-import com.ecyrd.jspwiki.*;
+import org.apache.jspwiki.api.FilterException;
+import org.apache.jspwiki.api.WikiException;
+
+import com.ecyrd.jspwiki.PageManager;
+import com.ecyrd.jspwiki.TestEngine;
+import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.auth.Users;
import com.ecyrd.jspwiki.auth.WikiPrincipal;
import com.ecyrd.jspwiki.filters.BasicPageFilter;
-import com.ecyrd.jspwiki.filters.FilterException;
public class ApprovalWorkflowTest extends TestCase
{
