You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2013/01/06 20:51:02 UTC
svn commit: r1429585 - in /incubator/jspwiki/trunk/src: org/apache/wiki/
org/apache/wiki/attachment/ org/apache/wiki/auth/
org/apache/wiki/auth/authorize/ org/apache/wiki/content/
org/apache/wiki/filters/ org/apache/wiki/parser/ org/apache/wiki/plugin/...
Author: juanpablo
Date: Sun Jan 6 19:51:02 2013
New Revision: 1429585
URL: http://svn.apache.org/viewvc?rev=1429585&view=rev
Log:
- Global use of org.apache.wiki.api.exceptions.WikiException instead of org.apache.wiki.WikiException,
as part of JSPWiki API (cfr. JSPWIKI-303).
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/NoRequiredPropertyException.java
incubator/jspwiki/trunk/src/org/apache/wiki/NoSuchVariableException.java
incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/PropertyReader.java
incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java
incubator/jspwiki/trunk/src/org/apache/wiki/WikiException.java
incubator/jspwiki/trunk/src/org/apache/wiki/WikiPage.java
incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java
incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthenticationManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthorizationManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/auth/SecurityVerifier.java
incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/auth/WikiSecurityException.java
incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/GroupManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/content/PageRenamer.java
incubator/jspwiki/trunk/src/org/apache/wiki/filters/DefaultFilterManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/filters/FilterManager.java
incubator/jspwiki/trunk/src/org/apache/wiki/parser/ParseException.java
incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java
incubator/jspwiki/trunk/src/org/apache/wiki/providers/ProviderException.java
incubator/jspwiki/trunk/src/org/apache/wiki/rpc/atom/AtomAPIServlet.java
incubator/jspwiki/trunk/src/org/apache/wiki/util/ClassUtil.java
incubator/jspwiki/trunk/src/org/apache/wiki/util/ProviderConverter.java
incubator/jspwiki/trunk/src/webdocs/Rename.jsp
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/NoRequiredPropertyException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/NoRequiredPropertyException.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/NoRequiredPropertyException.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/NoRequiredPropertyException.java Sun Jan 6 19:51:02 2013
@@ -18,6 +18,8 @@
*/
package org.apache.wiki;
+import org.apache.wiki.api.exceptions.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/org/apache/wiki/NoSuchVariableException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/NoSuchVariableException.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/NoSuchVariableException.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/NoSuchVariableException.java Sun Jan 6 19:51:02 2013
@@ -18,6 +18,8 @@
*/
package org.apache.wiki;
+import org.apache.wiki.api.exceptions.WikiException;
+
/**
* Marks that no such variable was located.
*/
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/PageManager.java Sun Jan 6 19:51:02 2013
@@ -25,7 +25,8 @@ import java.util.*;
import org.apache.commons.lang.ArrayUtils;
import org.apache.log4j.Logger;
-
+import org.apache.wiki.api.exceptions.WikiException;
+import org.apache.wiki.api.filters.FilterManager;
import org.apache.wiki.auth.WikiPrincipal;
import org.apache.wiki.auth.WikiSecurityException;
import org.apache.wiki.auth.acl.Acl;
@@ -33,8 +34,6 @@ import org.apache.wiki.auth.acl.AclEntry
import org.apache.wiki.auth.acl.AclEntryImpl;
import org.apache.wiki.auth.user.UserProfile;
import org.apache.wiki.event.*;
-import org.apache.wiki.api.exceptions.FilterException;
-import org.apache.wiki.api.filters.FilterManager;
import org.apache.wiki.modules.ModuleManager;
import org.apache.wiki.providers.CachingProvider;
import org.apache.wiki.providers.ProviderException;
@@ -703,15 +702,8 @@ public class PageManager extends ModuleM
// Run the pre-save filters. If any exceptions, add error to list, abort, and redirect
String saveText;
- try
- {
- FilterManager fm = engine.getFilterManager();
- saveText = fm.doPreSaveFiltering( m_context, m_proposedText );
- }
- catch ( FilterException e )
- {
- throw e;
- }
+ FilterManager fm = engine.getFilterManager();
+ saveText = fm.doPreSaveFiltering( m_context, m_proposedText );
// Stash the wiki context, old and new text as workflow attributes
workflow.setAttribute( PRESAVE_WIKI_CONTEXT, m_context );
@@ -836,7 +828,7 @@ public class PageManager extends ModuleM
}
catch ( WikiSecurityException e )
{
- log.error( "Could not change page ACL for page " + page.getName() + ": " + e.getMessage() );
+ log.error( "Could not change page ACL for page " + page.getName() + ": " + e.getMessage(), e );
}
pagesChanged++;
}
@@ -847,7 +839,7 @@ public class PageManager extends ModuleM
catch ( ProviderException e )
{
// Oooo! This is really bad...
- log.error( "Could not change user name in Page ACLs because of Provider error:" + e.getMessage() );
+ log.error( "Could not change user name in Page ACLs because of Provider error:" + e.getMessage(), e );
}
}
}
@@ -868,36 +860,36 @@ public class PageManager extends ModuleM
boolean pageChanged = false;
if ( acl != null )
{
- Enumeration entries = acl.entries();
+ Enumeration< AclEntry > entries = acl.entries();
Collection<AclEntry> entriesToAdd = new ArrayList<AclEntry>();
Collection<AclEntry> entriesToRemove = new ArrayList<AclEntry>();
while ( entries.hasMoreElements() )
{
- AclEntry entry = (AclEntry)entries.nextElement();
+ AclEntry entry = entries.nextElement();
if ( ArrayUtils.contains( oldPrincipals, entry.getPrincipal() ) )
{
// Create new entry
AclEntry newEntry = new AclEntryImpl();
newEntry.setPrincipal( newPrincipal );
- Enumeration permissions = entry.permissions();
+ Enumeration< Permission > permissions = entry.permissions();
while ( permissions.hasMoreElements() )
{
- Permission permission = (Permission)permissions.nextElement();
- newEntry.addPermission(permission);
+ Permission permission = permissions.nextElement();
+ newEntry.addPermission( permission );
}
pageChanged = true;
entriesToRemove.add( entry );
entriesToAdd.add( newEntry );
}
}
- for ( Iterator ix = entriesToRemove.iterator(); ix.hasNext(); )
+ for ( Iterator< AclEntry > ix = entriesToRemove.iterator(); ix.hasNext(); )
{
- AclEntry entry = (AclEntry)ix.next();
+ AclEntry entry = ix.next();
acl.removeEntry( entry );
}
- for ( Iterator ix = entriesToAdd.iterator(); ix.hasNext(); )
+ for ( Iterator< AclEntry > ix = entriesToAdd.iterator(); ix.hasNext(); )
{
- AclEntry entry = (AclEntry)ix.next();
+ AclEntry entry = ix.next();
acl.addEntry( entry );
}
}
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/PropertyReader.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/PropertyReader.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/PropertyReader.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/PropertyReader.java Sun Jan 6 19:51:02 2013
@@ -26,6 +26,8 @@ import java.util.*;
import javax.servlet.ServletContext;
+import org.apache.wiki.api.exceptions.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/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/Release.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Sun Jan 6 19:51:02 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "13";
+ public static final String BUILD = "14";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java Sun Jan 6 19:51:02 2013
@@ -35,6 +35,7 @@ import org.apache.commons.lang.time.Stop
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
import org.apache.wiki.api.exceptions.FilterException;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.api.filters.FilterManager;
import org.apache.wiki.api.plugin.PluginManager;
import org.apache.wiki.attachment.Attachment;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/WikiException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/WikiException.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/WikiException.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/WikiException.java Sun Jan 6 19:51:02 2013
@@ -18,11 +18,15 @@
*/
package org.apache.wiki;
+
/**
* A generic Wiki exception.
*
* @since 2.0
+ * @deprecated will be removed in 2.10 scope. Consider using
+ * {@link org.apache.wiki.api.exceptions.WikiException} instead
*/
+@Deprecated
public class WikiException
extends Exception
{
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/WikiPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/WikiPage.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/WikiPage.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/WikiPage.java Sun Jan 6 19:51:02 2013
@@ -334,9 +334,9 @@ public class WikiPage
{
p.m_accessList = new AclImpl();
- for( Enumeration entries = m_accessList.entries(); entries.hasMoreElements(); )
+ for( Enumeration< AclEntry > entries = m_accessList.entries(); entries.hasMoreElements(); )
{
- AclEntry e = (AclEntry)entries.nextElement();
+ AclEntry e = entries.nextElement();
p.m_accessList.addEntry( e );
}
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentManager.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentManager.java Sun Jan 6 19:51:02 2013
@@ -26,12 +26,13 @@ import java.util.*;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-
import org.apache.wiki.*;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.providers.ProviderException;
import org.apache.wiki.providers.WikiAttachmentProvider;
import org.apache.wiki.util.ClassUtil;
+
import com.opensymphony.oscache.base.Cache;
import com.opensymphony.oscache.base.NeedsRefreshException;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/attachment/AttachmentServlet.java Sun Jan 6 19:51:02 2013
@@ -44,6 +44,7 @@ import org.apache.commons.fileupload.ser
import org.apache.log4j.Logger;
import org.apache.wiki.*;
import org.apache.wiki.api.exceptions.RedirectException;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.auth.AuthorizationManager;
import org.apache.wiki.auth.permissions.PermissionFactory;
import org.apache.wiki.i18n.InternationalizationManager;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthenticationManager.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthenticationManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthenticationManager.java Sun Jan 6 19:51:02 2013
@@ -32,11 +32,10 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
-
import org.apache.wiki.TextUtil;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.WikiException;
import org.apache.wiki.WikiSession;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.auth.authorize.Role;
import org.apache.wiki.auth.authorize.WebAuthorizer;
import org.apache.wiki.auth.authorize.WebContainerAuthorizer;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthorizationManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthorizationManager.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthorizationManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/AuthorizationManager.java Sun Jan 6 19:51:02 2013
@@ -28,14 +28,11 @@ import java.util.Properties;
import java.util.WeakHashMap;
import org.apache.log4j.Logger;
-import org.freshcookies.security.policy.LocalPolicy;
-import org.freshcookies.security.policy.PolicyException;
-
import org.apache.wiki.NoRequiredPropertyException;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.WikiException;
import org.apache.wiki.WikiPage;
import org.apache.wiki.WikiSession;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.auth.acl.Acl;
import org.apache.wiki.auth.acl.AclEntry;
import org.apache.wiki.auth.acl.UnresolvedPrincipal;
@@ -48,6 +45,8 @@ import org.apache.wiki.event.WikiEventLi
import org.apache.wiki.event.WikiEventManager;
import org.apache.wiki.event.WikiSecurityEvent;
import org.apache.wiki.util.ClassUtil;
+import org.freshcookies.security.policy.LocalPolicy;
+import org.freshcookies.security.policy.PolicyException;
/**
* <p>Manages all access control and authorization; determines what authenticated
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/SecurityVerifier.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/SecurityVerifier.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/SecurityVerifier.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/SecurityVerifier.java Sun Jan 6 19:51:02 2013
@@ -32,13 +32,10 @@ import javax.security.auth.spi.LoginModu
import org.apache.commons.lang.ArrayUtils;
import org.apache.log4j.Logger;
-import org.freshcookies.security.policy.PolicyReader;
-import org.jdom.JDOMException;
-
import org.apache.wiki.InternalWikiException;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.WikiException;
import org.apache.wiki.WikiSession;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.auth.authorize.*;
import org.apache.wiki.auth.permissions.AllPermission;
import org.apache.wiki.auth.permissions.GroupPermission;
@@ -46,6 +43,8 @@ import org.apache.wiki.auth.permissions.
import org.apache.wiki.auth.permissions.WikiPermission;
import org.apache.wiki.auth.user.UserDatabase;
import org.apache.wiki.auth.user.UserProfile;
+import org.freshcookies.security.policy.PolicyReader;
+import org.jdom.JDOMException;
/**
* Helper class for verifying JSPWiki's security configuration. Invoked by
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/UserManager.java Sun Jan 6 19:51:02 2013
@@ -29,8 +29,13 @@ import javax.mail.internet.AddressExcept
import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger;
-
-import org.apache.wiki.*;
+import org.apache.wiki.NoRequiredPropertyException;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
+import org.apache.wiki.api.exceptions.WikiException;
+import org.apache.wiki.api.filters.FilterManager;
+import org.apache.wiki.api.filters.PageFilter;
import org.apache.wiki.auth.permissions.AllPermission;
import org.apache.wiki.auth.permissions.WikiPermission;
import org.apache.wiki.auth.user.AbstractUserDatabase;
@@ -40,8 +45,6 @@ import org.apache.wiki.auth.user.UserPro
import org.apache.wiki.event.WikiEventListener;
import org.apache.wiki.event.WikiEventManager;
import org.apache.wiki.event.WikiSecurityEvent;
-import org.apache.wiki.api.filters.FilterManager;
-import org.apache.wiki.api.filters.PageFilter;
import org.apache.wiki.filters.SpamFilter;
import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.rpc.RPCCallable;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/WikiSecurityException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/WikiSecurityException.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/WikiSecurityException.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/WikiSecurityException.java Sun Jan 6 19:51:02 2013
@@ -18,7 +18,7 @@
*/
package org.apache.wiki.auth;
-import org.apache.wiki.WikiException;
+import org.apache.wiki.api.exceptions.WikiException;
/**
* Indicates an authentication or authorization
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/GroupManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/GroupManager.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/GroupManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/authorize/GroupManager.java Sun Jan 6 19:51:02 2013
@@ -19,23 +19,17 @@
package org.apache.wiki.auth.authorize;
import java.security.Principal;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
+import java.util.*;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.ArrayUtils;
import org.apache.log4j.Logger;
-
import org.apache.wiki.NoRequiredPropertyException;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.WikiException;
import org.apache.wiki.WikiSession;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.auth.*;
import org.apache.wiki.auth.user.UserProfile;
import org.apache.wiki.event.WikiEvent;
@@ -120,7 +114,7 @@ public final class GroupManager implemen
* 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 org.apache.wiki.WikiException}. The GroupDatabase
+ * a {@link org.apache.wiki.api.exceptions.WikiException}. The GroupDatabase
* is lazily initialized.
* @throws org.apache.wiki.auth.WikiSecurityException if the GroupDatabase could
* not be initialized
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/content/PageRenamer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/content/PageRenamer.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/content/PageRenamer.java Sun Jan 6 19:51:02 2013
@@ -27,6 +27,7 @@ import java.util.regex.Pattern;
import org.apache.log4j.Logger;
import org.apache.wiki.*;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.event.WikiEventManager;
import org.apache.wiki.event.WikiPageRenameEvent;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/filters/DefaultFilterManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/filters/DefaultFilterManager.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/filters/DefaultFilterManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/filters/DefaultFilterManager.java Sun Jan 6 19:51:02 2013
@@ -26,23 +26,22 @@ import java.net.URL;
import java.util.*;
import org.apache.log4j.Logger;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.jdom.xpath.XPath;
-
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.WikiException;
-import org.apache.wiki.api.filters.PageFilter;
import org.apache.wiki.api.exceptions.FilterException;
+import org.apache.wiki.api.exceptions.WikiException;
+import org.apache.wiki.api.filters.PageFilter;
import org.apache.wiki.event.WikiEventManager;
import org.apache.wiki.event.WikiPageEvent;
import org.apache.wiki.modules.ModuleManager;
import org.apache.wiki.modules.WikiModuleInfo;
import org.apache.wiki.util.ClassUtil;
import org.apache.wiki.util.PriorityList;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.input.SAXBuilder;
+import org.jdom.xpath.XPath;
/**
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/filters/FilterManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/filters/FilterManager.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/filters/FilterManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/filters/FilterManager.java Sun Jan 6 19:51:02 2013
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Properties;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.WikiException;
+import org.apache.wiki.api.exceptions.WikiException;
/**
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/parser/ParseException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/parser/ParseException.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/parser/ParseException.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/parser/ParseException.java Sun Jan 6 19:51:02 2013
@@ -18,7 +18,7 @@
*/
package org.apache.wiki.parser;
-import org.apache.wiki.WikiException;
+import org.apache.wiki.api.exceptions.WikiException;
/**
* This is an exception which gets thrown whenever the parser cannot
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/BugReportHandler.java Sun Jan 6 19:51:02 2013
@@ -26,13 +26,12 @@ import java.text.SimpleDateFormat;
import java.util.*;
import org.apache.log4j.Logger;
-
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.WikiException;
import org.apache.wiki.WikiPage;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.exceptions.RedirectException;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.parser.MarkupParser;
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/providers/ProviderException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/providers/ProviderException.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/providers/ProviderException.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/providers/ProviderException.java Sun Jan 6 19:51:02 2013
@@ -18,7 +18,7 @@
*/
package org.apache.wiki.providers;
-import org.apache.wiki.WikiException;
+import org.apache.wiki.api.exceptions.WikiException;
/**
* This exception represents the superclass of all exceptions that providers
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/rpc/atom/AtomAPIServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/rpc/atom/AtomAPIServlet.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/rpc/atom/AtomAPIServlet.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/rpc/atom/AtomAPIServlet.java Sun Jan 6 19:51:02 2013
@@ -18,27 +18,31 @@
*/
package org.apache.wiki.rpc.atom;
-import java.io.*;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.Collection;
-import java.util.Iterator;
import org.apache.log4j.Logger;
-import org.intabulas.sandler.*;
-import org.intabulas.sandler.exceptions.*;
-import org.intabulas.sandler.elements.*;
-
-import org.apache.wiki.*;
-import org.apache.wiki.util.*;
-
+import org.apache.wiki.TextUtil;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.plugin.WeblogEntryPlugin;
import org.apache.wiki.plugin.WeblogPlugin;
import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.util.BlogUtil;
+import org.intabulas.sandler.Sandler;
+import org.intabulas.sandler.SyndicationFactory;
+import org.intabulas.sandler.elements.*;
+import org.intabulas.sandler.exceptions.FeedMarshallException;
/**
* Handles incoming requests for the Atom API. This class uses the
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/util/ClassUtil.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/util/ClassUtil.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/util/ClassUtil.java Sun Jan 6 19:51:02 2013
@@ -29,7 +29,7 @@ import org.jdom.Element;
import org.jdom.input.SAXBuilder;
import org.jdom.xpath.XPath;
-import org.apache.wiki.WikiException;
+import org.apache.wiki.api.exceptions.WikiException;
/**
* Contains useful utilities for class file manipulation. This is a static class,
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/util/ProviderConverter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/util/ProviderConverter.java?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/util/ProviderConverter.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/util/ProviderConverter.java Sun Jan 6 19:51:02 2013
@@ -23,8 +23,11 @@ import java.io.IOException;
import java.util.*;
import org.apache.commons.lang.SystemUtils;
-
-import org.apache.wiki.*;
+import org.apache.wiki.PageManager;
+import org.apache.wiki.TextUtil;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.providers.AbstractFileProvider;
import org.apache.wiki.providers.VersioningFileProvider;
import org.apache.wiki.providers.WikiPageProvider;
Modified: incubator/jspwiki/trunk/src/webdocs/Rename.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Rename.jsp?rev=1429585&r1=1429584&r2=1429585&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Rename.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Rename.jsp Sun Jan 6 19:51:02 2013
@@ -19,6 +19,7 @@
<%@ page import="org.apache.log4j.*" %>
<%@ page import="org.apache.wiki.*" %>
+<%@ page import="org.apache.wiki.api.exceptions.WikiException" %>
<%@ page import="org.apache.wiki.tags.BreadcrumbsTag" %>
<%@ page import="org.apache.wiki.tags.BreadcrumbsTag.FixedQueue" %>
<%@ page errorPage="/Error.jsp" %>