You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/07/14 23:08:23 UTC
svn commit: r1503057 [1/2] - in /incubator/jspwiki/trunk: ./
jspwiki-site/src/site/trunk/content/jspwiki/development/
jspwiki-site/src/site/trunk/templates/ jspwiki-war/
jspwiki-war/src/main/java/org/apache/wiki/
jspwiki-war/src/main/java/org/apache/wi...
Author: gmazza
Date: Sun Jul 14 21:08:22 2013
New Revision: 1503057
URL: http://svn.apache.org/r1503057
Log:
dependency scopes moved to jspwiki-war, about 160-170 Sonar complaints fixed.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
incubator/jspwiki/trunk/jspwiki-war/pom.xml
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/SearchResult.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/StringTransmutator.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiContext.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiProvider.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/FilterManager.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/PluginManager.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/filters/PageFilter.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/DynamicAttachmentProvider.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/Authorizer.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclEntry.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclManager.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserDatabase.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserProfile.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DiffProvider.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventListener.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PageFilter.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/HeadingListener.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ParserStagePlugin.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WikiPlugin.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningProvider.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiPageProvider.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchProvider.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/ParamHandler.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/TranslateTag.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Command.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/GenericHTTPHandler.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/AdminBean.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/URLConstructor.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/Watchable.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/Step.java
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java
incubator/jspwiki/trunk/pom.xml
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Jul 14 21:08:22 2013
@@ -1,3 +1,13 @@
+2013-07-14 Glen Mazza (gmazza AT apache DOT org)
+
+ * 2.10.0-svn-18
+
+ * Fixed the 160-170 Sonar complaints about redundant methods/variables redundantly being
+ declared "public" or "public static final" within interfaces, also removed unused imports.
+ Pre-commit we're at 77.5% rules compliance (ranked 69 of 87 Apache projects).
+
+ * Moved POM dependency scope declarations out of root pom and into jspwiki-war pom.
+
2013-07-11 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-17
Modified: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext (original)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/development/changelog.mdtext Sun Jul 14 21:08:22 2013
@@ -1,5 +1,23 @@
Title: Changelog
+#### 2013-07-11 Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-17
+
+* Moved jspwiki.tld to releases/META-INF/ so it becomes part of the JSPWiki JAR instead of
+ standalone file
+
+* Upgraded jspwiki.tld from JSP 1.1 to JSP 2.1 (requires Tomcat 6 or higher), new URL for taglib
+ includes "incubator" but can be quickly changed should JSPWiki become TLP.
+
+#### 2013-07-11 Glen Mazza (gmazza AT apache DOT org)
+
+* 2.10.0-svn-16
+
+* Upgraded JSTL to 1.2 (which includes standard, so could remove that dependency)
+
+* Removed jstl-fmt.tld, oscache.tld in favor of versions within their respective JARs
+
#### 2013-07-03 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.10.0-svn-15
Modified: incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext (original)
+++ incubator/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/release.mdtext Sun Jul 14 21:08:22 2013
@@ -1 +1 @@
-JSPWiki v2.10.0-svn-16
\ No newline at end of file
+JSPWiki v2.10.0-svn-17
\ No newline at end of file
Modified: incubator/jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/pom.xml?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/trunk/jspwiki-war/pom.xml Sun Jul 14 21:08:22 2013
@@ -46,6 +46,13 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -72,12 +79,7 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </dependency>
-
+
<dependency>
<groupId>com.metaparadigm</groupId>
<artifactId>json-rpc</artifactId>
@@ -141,31 +143,37 @@
<dependency>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>sqltool</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Sun Jul 14 21:08:22 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 = "17";
+ public static final String BUILD = "18";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/SearchResult.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/SearchResult.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/SearchResult.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/SearchResult.java Sun Jul 14 21:08:22 2013
@@ -29,7 +29,7 @@ public interface SearchResult
*
* @return the WikiPage object containing this result
*/
- public WikiPage getPage();
+ WikiPage getPage();
/**
* Returns the score.
@@ -37,7 +37,7 @@ public interface SearchResult
* @return A positive score value. Note that there is no upper limit for the score.
*/
- public int getScore();
+ int getScore();
/**
@@ -47,5 +47,5 @@ public interface SearchResult
* @return the search results
* @since 2.4
*/
- public String[] getContexts();
+ String[] getContexts();
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/StringTransmutator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/StringTransmutator.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/StringTransmutator.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/StringTransmutator.java Sun Jul 14 21:08:22 2013
@@ -32,5 +32,5 @@ public interface StringTransmutator
* @param source The source string.
* @return The mutated string.
*/
- public String mutate( WikiContext context, String source );
+ String mutate( WikiContext context, String source );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiContext.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiContext.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiContext.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiContext.java Sun Jul 14 21:08:22 2013
@@ -21,7 +21,6 @@ package org.apache.wiki;
import java.io.IOException;
import java.security.Permission;
import java.security.Principal;
-import java.text.MessageFormat;
import java.util.HashMap;
import java.util.Locale;
import java.util.MissingResourceException;
@@ -33,13 +32,11 @@ import javax.servlet.http.HttpSession;
import javax.servlet.jsp.PageContext;
import org.apache.log4j.Logger;
-import org.apache.wiki.auth.AuthorizationManager;
import org.apache.wiki.auth.NoSuchPrincipalException;
import org.apache.wiki.auth.UserManager;
import org.apache.wiki.auth.WikiPrincipal;
import org.apache.wiki.auth.permissions.AllPermission;
import org.apache.wiki.auth.user.UserDatabase;
-import org.apache.wiki.i18n.InternationalizationManager;
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.tags.WikiTagBase;
import org.apache.wiki.ui.*;
@@ -795,7 +792,8 @@ public class WikiContext
* @param response the http response
* @return the result of the access check
* @throws IOException In case something goes wrong
- * @deprecated will be removed in 2.10 scope. Consider using {@link AuthorizationManager#hasAccess(WikiContext, HttpServletResponse)}
+ * @deprecated will be removed in 2.10 scope. Consider using
+ * {@link org.apache.wiki.auth.AuthorizationManager#hasAccess(WikiContext, HttpServletResponse)}
* instead
*/
@Deprecated
@@ -818,7 +816,7 @@ public class WikiContext
* @param redirect If true, makes an automatic redirect to the response
* @throws IOException If something goes wrong
* @deprecated will be removed in 2.10 scope. Consider using
- * {@link AuthorizationManager#hasAccess(WikiContext, HttpServletResponse, boolean)} instead
+ * {@link org.apache.wiki.auth.AuthorizationManager#hasAccess(WikiContext, HttpServletResponse, boolean)} instead
*/
@Deprecated
public boolean hasAccess( HttpServletResponse response, boolean redirect ) throws IOException
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiProvider.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiProvider.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/WikiProvider.java Sun Jul 14 21:08:22 2013
@@ -32,7 +32,7 @@ public interface WikiProvider
/**
* Passing this to any method should get the latest version
*/
- public static final int LATEST_VERSION = -1;
+ int LATEST_VERSION = -1;
/**
* Initializes the page provider.
@@ -42,7 +42,7 @@ public interface WikiProvider
* @throws NoRequiredPropertyException If the provider needs a property which is not found in the property set
* @throws IOException If there is an IO problem
*/
- public void initialize( WikiEngine engine, Properties properties )
+ void initialize( WikiEngine engine, Properties properties )
throws NoRequiredPropertyException,
IOException;
@@ -53,7 +53,7 @@ public interface WikiProvider
* @return A string describing the provider.
*/
- public String getProviderInfo();
+ String getProviderInfo();
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/FilterManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/FilterManager.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/FilterManager.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/FilterManager.java Sun Jul 14 21:08:22 2013
@@ -28,16 +28,16 @@ import org.apache.wiki.api.filters.PageF
public interface FilterManager
{
/** Property name for setting the filter XML property file. Value is <tt>{@value}</tt>. */
- static final String PROP_FILTERXML = "jspwiki.filterConfig";
+ String PROP_FILTERXML = "jspwiki.filterConfig";
/** Default location for the filter XML property file. Value is <tt>{@value}</tt>. */
- static final String DEFAULT_XMLFILE = "/WEB-INF/filters.xml";
+ String DEFAULT_XMLFILE = "/WEB-INF/filters.xml";
/** JSPWiki system filters are all below this value. */
- static final int SYSTEM_FILTER_PRIORITY = -1000;
+ int SYSTEM_FILTER_PRIORITY = -1000;
/** The standard user level filtering. */
- static final int USER_FILTER_PRIORITY = 0;
+ int USER_FILTER_PRIORITY = 0;
/**
* Adds a page filter to the queue. The priority defines in which
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/PluginManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/PluginManager.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/PluginManager.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/PluginManager.java Sun Jul 14 21:08:22 2013
@@ -31,28 +31,28 @@ import org.apache.wiki.parser.PluginCont
public interface PluginManager
{
/** The property name defining which packages will be searched for properties. */
- static final String PROP_SEARCHPATH = "jspwiki.plugin.searchPath";
+ String PROP_SEARCHPATH = "jspwiki.plugin.searchPath";
/** This is the default package to try in case the instantiation fails. */
- static final String DEFAULT_PACKAGE = "org.apache.wiki.plugin";
+ String DEFAULT_PACKAGE = "org.apache.wiki.plugin";
/**
* The name of the body content. Current value is "_body".
*/
- static final String PARAM_BODY = "_body";
+ String PARAM_BODY = "_body";
/** The name of the command line content parameter. The value is "_cmdline". */
- static final String PARAM_CMDLINE = "_cmdline";
+ String PARAM_CMDLINE = "_cmdline";
/**
* The name of the parameter containing the start and end positions in the
* read stream of the plugin text (stored as a two-element int[], start
* and end resp.).
*/
- static final String PARAM_BOUNDS = "_bounds";
+ String PARAM_BOUNDS = "_bounds";
/** A special name to be used in case you want to see debug output */
- static final String PARAM_DEBUG = "debug";
+ String PARAM_DEBUG = "debug";
/**
* Enables or disables plugin execution.
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/filters/PageFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/filters/PageFilter.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/filters/PageFilter.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/filters/PageFilter.java Sun Jul 14 21:08:22 2013
@@ -53,7 +53,7 @@ public interface PageFilter
* @throws FilterException If the filter could not be initialized. If this is thrown,
* the filter is not added to the internal queues.
*/
- public void initialize( WikiEngine engine, Properties properties )
+ void initialize( WikiEngine engine, Properties properties )
throws FilterException;
/**
@@ -67,7 +67,7 @@ public interface PageFilter
* @throws FilterException If something goes wrong. Throwing this causes the entire page
* processing to be abandoned.
*/
- public String preTranslate( WikiContext wikiContext, String content )
+ String preTranslate( WikiContext wikiContext, String content )
throws FilterException;
/**
@@ -82,7 +82,7 @@ public interface PageFilter
* @throws FilterException If something goes wrong. Throwing this causes the entire page
* processing to be abandoned.
*/
- public String postTranslate( WikiContext wikiContext, String htmlContent )
+ String postTranslate( WikiContext wikiContext, String htmlContent )
throws FilterException;
/**
@@ -94,7 +94,7 @@ public interface PageFilter
* @throws FilterException If something goes wrong. Throwing this causes the entire page
* processing to be abandoned.
*/
- public String preSave( WikiContext wikiContext, String content )
+ String preSave( WikiContext wikiContext, String content )
throws FilterException;
/**
@@ -110,7 +110,7 @@ public interface PageFilter
* @throws FilterException If something goes wrong. As the page is already saved,
* This is just logged.
*/
- public void postSave( WikiContext wikiContext, String content )
+ void postSave( WikiContext wikiContext, String content )
throws FilterException;
/**
@@ -120,6 +120,6 @@ public interface PageFilter
* @param engine The WikiEngine which owns this filter.
* @since 2.5.36
*/
- public void destroy( WikiEngine engine );
+ void destroy( WikiEngine engine );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java Sun Jul 14 21:08:22 2013
@@ -33,7 +33,7 @@ public interface WikiPlugin
/**
* Name of the default plugin resource bundle.
*/
- static final String CORE_PLUGINS_RESOURCEBUNDLE = "plugin.PluginResources";
+ String CORE_PLUGINS_RESOURCEBUNDLE = "plugin.PluginResources";
/**
* This is the main entry point for any plugin. The parameters are parsed,
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/DynamicAttachmentProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/DynamicAttachmentProvider.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/DynamicAttachmentProvider.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/DynamicAttachmentProvider.java Sun Jul 14 21:08:22 2013
@@ -46,6 +46,6 @@ public interface DynamicAttachmentProvid
* @throws ProviderException If something goes wrong internally
* @throws IOException If something goes wrong when reading the data
*/
- public InputStream getAttachmentData( WikiContext context, Attachment att )
+ InputStream getAttachmentData( WikiContext context, Attachment att )
throws ProviderException, IOException;
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/Authorizer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/Authorizer.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/Authorizer.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/Authorizer.java Sun Jul 14 21:08:22 2013
@@ -54,7 +54,7 @@ public interface Authorizer
*
* @return an array of Principals representing the roles
*/
- public Principal[] getRoles();
+ Principal[] getRoles();
/**
* Looks up and returns a role Principal matching a given String. If a
@@ -65,7 +65,7 @@ public interface Authorizer
* @param role the name of the role to retrieve
* @return the role Principal
*/
- public Principal findRole( String role );
+ Principal findRole( String role );
/**
* Initializes the authorizer.
@@ -74,7 +74,7 @@ public interface Authorizer
* @param props the wiki engine initialization properties
* @throws WikiSecurityException if the Authorizer could not be initialized
*/
- public void initialize( WikiEngine engine, Properties props ) throws WikiSecurityException;
+ void initialize( WikiEngine engine, Properties props ) throws WikiSecurityException;
/**
* Determines whether the Subject associated with a WikiSession is in a
@@ -88,6 +88,6 @@ public interface Authorizer
* @return <code>true</code> if the user is considered to be in the role,
* <code>false</code> otherwise
*/
- public boolean isUserInRole( WikiSession session, Principal role );
+ boolean isUserInRole( WikiSession session, Principal role );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclEntry.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclEntry.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclEntry.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclEntry.java Sun Jul 14 21:08:22 2013
@@ -55,7 +55,7 @@ public interface AclEntry
* already part of this entry's permission set, and <code>false</code> if
* the permission is not of type PagePermission
*/
- public boolean addPermission(Permission permission);
+ boolean addPermission(Permission permission);
/**
* Checks if the specified permission is part of the permission set in this
@@ -64,20 +64,20 @@ public interface AclEntry
* @return true if the permission is part of the permission set in this entry,
* false otherwise.
*/
- public boolean checkPermission(Permission permission);
+ boolean checkPermission(Permission permission);
/**
* Returns the principal for which permissions are granted by this
* ACL entry. Returns null if there is no principal set for this entry yet.
* @return the principal associated with this entry.
*/
- public Principal getPrincipal();
+ Principal getPrincipal();
/**
* Returns an enumeration of the permissions in this ACL entry.
* @return an enumeration of the permissions
*/
- public Enumeration< Permission > permissions();
+ Enumeration< Permission > permissions();
/**
* Removes the specified permission from this ACL entry.
@@ -85,7 +85,7 @@ public interface AclEntry
* @return true if the permission is removed, false if the permission was not
* part of this entry's permission set.
*/
- public boolean removePermission(Permission permission);
+ boolean removePermission(Permission permission);
/**
* Specifies the principal for which permissions are granted or denied by
@@ -95,11 +95,11 @@ public interface AclEntry
* @return true if the principal is set, false if there was already a
* principal set for this entry
*/
- public boolean setPrincipal(Principal user);
+ boolean setPrincipal(Principal user);
/**
* Returns a string representation of the contents of this ACL entry.
* @return a string representation of the contents.
*/
- public String toString();
+ String toString();
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclManager.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclManager.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/AclManager.java Sun Jul 14 21:08:22 2013
@@ -36,7 +36,7 @@ public interface AclManager
* @param engine the wiki engine
* @param props the initialization properties
*/
- public void initialize( WikiEngine engine, Properties props );
+ void initialize( WikiEngine engine, Properties props );
/**
* A helper method for parsing textual AccessControlLists. The line is in
@@ -50,7 +50,7 @@ public interface AclManager
* @throws WikiSecurityException if the ruleLine was faulty somehow.
* @since 2.1.121
*/
- public Acl parseAcl( WikiPage page, String ruleLine ) throws WikiSecurityException;
+ Acl parseAcl( WikiPage page, String ruleLine ) throws WikiSecurityException;
/**
* Returns the access control list for the page.
@@ -62,7 +62,7 @@ public interface AclManager
* @since 2.2.121
* @return the Acl representing permissions for the page
*/
- public Acl getPermissions( WikiPage page );
+ Acl getPermissions( WikiPage page );
/**
* Sets the access control list for the page and persists it.
@@ -71,5 +71,5 @@ public interface AclManager
* @since 2.5
* @throws WikiSecurityException if the ACL cannot be set or persisted
*/
- public void setPermissions( WikiPage page, Acl acl ) throws WikiSecurityException;
+ void setPermissions( WikiPage page, Acl acl ) throws WikiSecurityException;
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupDatabase.java Sun Jul 14 21:08:22 2013
@@ -23,7 +23,6 @@ import java.util.Properties;
import org.apache.wiki.NoRequiredPropertyException;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.auth.NoSuchPrincipalException;
import org.apache.wiki.auth.WikiSecurityException;
/**
@@ -41,19 +40,19 @@ public interface GroupDatabase
* @deprecated there is no need to call this method because the save and
* delete methods contain their own commit logic
*/
- public void commit() throws WikiSecurityException;
+ void commit() throws WikiSecurityException;
/**
* Looks up and deletes a {@link Group} from the group database. If the
* group database does not contain the supplied Group. this method throws a
- * {@link NoSuchPrincipalException}. The method commits the results
+ * {@link org.apache.wiki.auth.NoSuchPrincipalException}. The method commits the results
* of the delete to persistent storage.
* @param group the group to remove
* @throws WikiSecurityException if the database does not contain the
- * supplied group (thrown as {@link NoSuchPrincipalException}) or if
+ * supplied group (thrown as {@link org.apache.wiki.auth.NoSuchPrincipalException}) or if
* the commit did not succeed
*/
- public void delete( Group group ) throws WikiSecurityException;
+ void delete( Group group ) throws WikiSecurityException;
/**
* Initializes the group database based on values from a Properties object.
@@ -62,7 +61,7 @@ public interface GroupDatabase
* @throws WikiSecurityException if the database could not be initialized successfully
* @throws NoRequiredPropertyException if a required property is not present
*/
- public void initialize( WikiEngine engine, Properties props ) throws NoRequiredPropertyException, WikiSecurityException;
+ void initialize( WikiEngine engine, Properties props ) throws NoRequiredPropertyException, WikiSecurityException;
/**
* Saves a Group to the group database. Note that this method <em>must</em>
@@ -75,7 +74,7 @@ public interface GroupDatabase
* @param modifier the user who saved the Group
* @throws WikiSecurityException if the Group could not be saved successfully
*/
- public void save( Group group, Principal modifier ) throws WikiSecurityException;
+ void save( Group group, Principal modifier ) throws WikiSecurityException;
/**
* Returns all wiki groups that are stored in the GroupDatabase as an array
@@ -90,5 +89,5 @@ public interface GroupDatabase
* @return the wiki groups
* @throws WikiSecurityException if the groups cannot be returned by the back-end
*/
- public Group[] groups() throws WikiSecurityException;
+ Group[] groups() throws WikiSecurityException;
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebAuthorizer.java Sun Jul 14 21:08:22 2013
@@ -42,6 +42,6 @@ public interface WebAuthorizer extends A
* @return <code>true</code> if the user is considered to be in the role,
* <code>false</code> otherwise
*/
- public boolean isUserInRole( HttpServletRequest request, Principal role );
+ boolean isUserInRole( HttpServletRequest request, Principal role );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/login/WikiCallbackHandler.java Sun Jul 14 21:08:22 2013
@@ -24,12 +24,11 @@ import javax.security.auth.callback.*;
import javax.servlet.http.HttpServletRequest;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.WikiSession;
/**
* Handles logins made from inside the wiki application, rather than via the web
* container. This handler is instantiated in
- * {@link org.apache.wiki.auth.AuthenticationManager#login(WikiSession,HttpServletRequest, String, String)}.
+ * {@link org.apache.wiki.auth.AuthenticationManager#login(org.apache.wiki.WikiSession,HttpServletRequest, String, String)}.
* If container-managed authentication is used, the
* {@link WebContainerCallbackHandler}is used instead. This callback handler is
* designed to be used with {@link UserDatabaseLoginModule}.
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserDatabase.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserDatabase.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserDatabase.java Sun Jul 14 21:08:22 2013
@@ -42,7 +42,7 @@ public interface UserDatabase
* @deprecated there is no need to call this method because the save, rename and
* delete methods contain their own commit logic
*/
- public void commit() throws WikiSecurityException;
+ void commit() throws WikiSecurityException;
/**
* Looks up and deletes the first {@link UserProfile} in the user database
@@ -54,7 +54,7 @@ public interface UserDatabase
* to the file system may wish to make this method <code>synchronized</code>.
* @param loginName the login name of the user profile that shall be deleted
*/
- public void deleteByLoginName( String loginName ) throws NoSuchPrincipalException, WikiSecurityException;
+ void deleteByLoginName( String loginName ) throws NoSuchPrincipalException, WikiSecurityException;
/**
* <p>
@@ -80,7 +80,7 @@ public interface UserDatabase
* {@link UserProfile#getLoginName()} method.
* @return the array of Principals representing the user's identities
*/
- public Principal[] getPrincipals( String identifier ) throws NoSuchPrincipalException;
+ Principal[] getPrincipals( String identifier ) throws NoSuchPrincipalException;
/**
* Returns all WikiNames that are stored in the UserDatabase
@@ -89,7 +89,7 @@ public interface UserDatabase
* array.
* @return the WikiNames
*/
- public Principal[] getWikiNames() throws WikiSecurityException;
+ Principal[] getWikiNames() throws WikiSecurityException;
/**
* Looks up and returns the first {@link UserProfile} in the user database
@@ -99,7 +99,7 @@ public interface UserDatabase
* is unknown.
* @param index the login name, full name, or wiki name
*/
- public UserProfile find( String index ) throws NoSuchPrincipalException;
+ UserProfile find( String index ) throws NoSuchPrincipalException;
/**
* Looks up and returns the first {@link UserProfile} in the user database
@@ -109,7 +109,7 @@ public interface UserDatabase
* @param index the e-mail address of the desired user profile
* @return the user profile
*/
- public UserProfile findByEmail( String index ) throws NoSuchPrincipalException;
+ UserProfile findByEmail( String index ) throws NoSuchPrincipalException;
/**
* Looks up and returns the first {@link UserProfile} in the user database
@@ -119,7 +119,7 @@ public interface UserDatabase
* @param index the login name of the desired user profile
* @return the user profile
*/
- public UserProfile findByLoginName( String index ) throws NoSuchPrincipalException;
+ UserProfile findByLoginName( String index ) throws NoSuchPrincipalException;
/**
* Looks up and returns the first {@link UserProfile} in the user database
@@ -130,7 +130,7 @@ public interface UserDatabase
* @return the user profile
* @since 2.8
*/
- public UserProfile findByUid( String uid ) throws NoSuchPrincipalException;
+ UserProfile findByUid( String uid ) throws NoSuchPrincipalException;
/**
* Looks up and returns the first {@link UserProfile} in the user database
@@ -140,7 +140,7 @@ public interface UserDatabase
* @param index the wiki name of the desired user profile
* @return the user profile
*/
- public UserProfile findByWikiName( String index ) throws NoSuchPrincipalException;
+ UserProfile findByWikiName( String index ) throws NoSuchPrincipalException;
/**
* Looks up and returns the first {@link UserProfile} in the user database
@@ -150,19 +150,19 @@ public interface UserDatabase
* @param index the fill name of the desired user profile
* @return the user profile
*/
- public UserProfile findByFullName( String index ) throws NoSuchPrincipalException;
+ UserProfile findByFullName( String index ) throws NoSuchPrincipalException;
/**
* Initializes the user database based on values from a Properties object.
*/
- public void initialize( WikiEngine engine, Properties props ) throws NoRequiredPropertyException;
+ void initialize( WikiEngine engine, Properties props ) throws NoRequiredPropertyException;
/**
* Factory method that instantiates a new user profile.
* The {@link UserProfile#isNew()} method of profiles created using
* this method should return <code>true</code>.
*/
- public UserProfile newProfile();
+ UserProfile newProfile();
/**
* <p>Renames a {@link UserProfile} in the user database by changing
@@ -185,7 +185,7 @@ public interface UserDatabase
* any reason, such as an I/O error, database connection failure
* or lack of support for renames.
*/
- public void rename( String loginName, String newName ) throws NoSuchPrincipalException, DuplicateUserException, WikiSecurityException;
+ void rename( String loginName, String newName ) throws NoSuchPrincipalException, DuplicateUserException, WikiSecurityException;
/**
* <p>
@@ -211,7 +211,7 @@ public interface UserDatabase
* @param profile the user profile to save
* @throws WikiSecurityException if the profile cannot be saved
*/
- public void save( UserProfile profile ) throws WikiSecurityException;
+ void save( UserProfile profile ) throws WikiSecurityException;
/**
* Determines whether a supplied user password is valid, given a login name
@@ -223,6 +223,6 @@ public interface UserDatabase
* @return <code>true</code> if the password is valid, <code>false</code>
* otherwise
*/
- public boolean validatePassword( String loginName, String password );
+ boolean validatePassword( String loginName, String password );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserProfile.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserProfile.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserProfile.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/user/UserProfile.java Sun Jul 14 21:08:22 2013
@@ -40,31 +40,31 @@ public interface UserProfile extends Ser
* in the UserProfile.
* @return the attributes
*/
- public Map<String,Serializable> getAttributes();
+ Map<String,Serializable> getAttributes();
/**
* Returns the creation date.
* @return the creation date
*/
- public Date getCreated();
+ Date getCreated();
/**
* Returns the user's e-mail address.
* @return the e-mail address
*/
- public String getEmail();
+ String getEmail();
/**
* Returns the user's full name.
* @return the full name
*/
- public String getFullname();
+ String getFullname();
/**
* Returns the last-modified date.
* @return the date and time of last modification
*/
- public Date getLastModified();
+ Date getLastModified();
/**
* Returns the date/time of expiration of the profile's lock, if it has been
@@ -76,13 +76,13 @@ public interface UserProfile extends Ser
*
* @return the lock expiration date
*/
- public Date getLockExpiry();
+ Date getLockExpiry();
/**
* Returns the user's login name.
* @return the login name
*/
- public String getLoginName();
+ String getLoginName();
/**
* Returns the user password for use with custom authentication. Note that
@@ -93,21 +93,21 @@ public interface UserProfile extends Ser
* itself.
* @return the password
*/
- public String getPassword();
+ String getPassword();
/**
* Returns the unique identifier for the user profile. If not previously
* set, the value will be <code>null</code>.
* @return the unique ID.
*/
- public String getUid();
+ String getUid();
/**
* Returns the user's wiki name, based on the full name with all
* whitespace removed.
* @return the wiki name.
*/
- public String getWikiName();
+ String getWikiName();
/**
* Returns
@@ -116,7 +116,7 @@ public interface UserProfile extends Ser
* and, if it returns a non-<code>null</code> value, checking if the date returned is later than the current time.
* @return the result
*/
- public boolean isLocked();
+ boolean isLocked();
/**
* Returns <code>true</code> if the profile has never been
@@ -124,31 +124,31 @@ public interface UserProfile extends Ser
* last modified date, for example, to determine this.
* @return whether the profile is new
*/
- public boolean isNew();
+ boolean isNew();
/**
* Sets the created date.
* @param date the creation date
*/
- public void setCreated( Date date );
+ void setCreated( Date date );
/**
* Sets the user's e-mail address.
* @param email the e-mail address
*/
- public void setEmail( String email );
+ void setEmail( String email );
/**
* Sets the user's full name. For example, "Janne Jalkanen."
* @param arg the full name
*/
- public void setFullname( String arg );
+ void setFullname( String arg );
/**
* Sets the last-modified date
* @param date the last-modified date
*/
- public void setLastModified( Date date );
+ void setLastModified( Date date );
/**
* Locks the profile until a specified lock expiration date.
@@ -156,7 +156,7 @@ public interface UserProfile extends Ser
* @param expiry the date the lock expires; setting this value to <code>null</code>
* will cause the lock to be cleared.
*/
- public void setLockExpiry( Date expiry );
+ void setLockExpiry( Date expiry );
/**
* Sets the name by which the user logs in. The login name is used as the
@@ -167,7 +167,7 @@ public interface UserProfile extends Ser
* typically of type FirstnameLastName ("JanneJalkanen").
* @param name the login name
*/
- public void setLoginName( String name );
+ void setLoginName( String name );
/**
* Sets the user's password for use with custom authentication. It is
@@ -179,14 +179,14 @@ public interface UserProfile extends Ser
* elsewhere.
* @param arg the password
*/
- public void setPassword( String arg );
+ void setPassword( String arg );
/**
* Sets the unique identifier for the user profile. Note that UserDatabase implementations
* are required <em>not</em> to change the unique identifier after the initial save.
* @param uid the unique identifier to set
*/
- public void setUid( String uid );
+ void setUid( String uid );
/**
* No-op method. In previous versions of JSPWiki, the method
@@ -195,11 +195,11 @@ public interface UserProfile extends Ser
* @param name the wiki name
* @deprecated This method will be removed in a future release.
*/
- public void setWikiName( String name );
+ void setWikiName( String name );
/**
* Returns a string representation of this user profile.
* @return the string
*/
- public String toString();
+ String toString();
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DiffProvider.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DiffProvider.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DiffProvider.java Sun Jul 14 21:08:22 2013
@@ -40,12 +40,12 @@ public interface DiffProvider extends Wi
* @param oldWikiText the old text
* @param newWikiText the new text
*/
- public String makeDiffHtml(WikiContext context, String oldWikiText, String newWikiText);
+ String makeDiffHtml(WikiContext context, String oldWikiText, String newWikiText);
/**
* If there is no diff provider set, this provider will work instead.
*/
- public static class NullDiffProvider implements DiffProvider
+ class NullDiffProvider implements DiffProvider
{
/**
* {@inheritDoc}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventListener.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventListener.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventListener.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/event/WikiEventListener.java Sun Jul 14 21:08:22 2013
@@ -34,7 +34,7 @@ public interface WikiEventListener exten
*
* @param event a WikiEvent object
*/
- public void actionPerformed( WikiEvent event );
+ void actionPerformed( WikiEvent event );
} // end com.ecryd.jspwiki.event.WikiEventListener
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PageFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PageFilter.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PageFilter.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/PageFilter.java Sun Jul 14 21:08:22 2013
@@ -55,7 +55,7 @@ public interface PageFilter extends org.
* @throws FilterException If the filter could not be initialized. If this is thrown,
* the filter is not added to the internal queues.
*/
- public void initialize( WikiEngine engine, Properties properties )
+ void initialize( WikiEngine engine, Properties properties )
throws FilterException;
/**
@@ -69,7 +69,7 @@ public interface PageFilter extends org.
* @throws FilterException If something goes wrong. Throwing this causes the entire page
* processing to be abandoned.
*/
- public String preTranslate( WikiContext wikiContext, String content )
+ String preTranslate( WikiContext wikiContext, String content )
throws FilterException;
/**
@@ -84,7 +84,7 @@ public interface PageFilter extends org.
* @throws FilterException If something goes wrong. Throwing this causes the entire page
* processing to be abandoned.
*/
- public String postTranslate( WikiContext wikiContext, String htmlContent )
+ String postTranslate( WikiContext wikiContext, String htmlContent )
throws FilterException;
/**
@@ -96,7 +96,7 @@ public interface PageFilter extends org.
* @throws FilterException If something goes wrong. Throwing this causes the entire page
* processing to be abandoned.
*/
- public String preSave( WikiContext wikiContext, String content )
+ String preSave( WikiContext wikiContext, String content )
throws FilterException;
/**
@@ -112,7 +112,7 @@ public interface PageFilter extends org.
* @throws FilterException If something goes wrong. As the page is already saved,
* This is just logged.
*/
- public void postSave( WikiContext wikiContext, String content )
+ void postSave( WikiContext wikiContext, String content )
throws FilterException;
/**
@@ -122,6 +122,6 @@ public interface PageFilter extends org.
* @param engine The WikiEngine which owns this filter.
* @since 2.5.36
*/
- public void destroy( WikiEngine engine );
+ void destroy( WikiEngine engine );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/HeadingListener.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/HeadingListener.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/HeadingListener.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/parser/HeadingListener.java Sun Jul 14 21:08:22 2013
@@ -32,5 +32,5 @@ public interface HeadingListener
* @param context The WikiContext
* @param hd The heading which was just encountered.
*/
- public void headingAdded( WikiContext context, Heading hd );
+ void headingAdded( WikiContext context, Heading hd );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ParserStagePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ParserStagePlugin.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ParserStagePlugin.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ParserStagePlugin.java Sun Jul 14 21:08:22 2013
@@ -41,5 +41,5 @@ public interface ParserStagePlugin exten
* @param context WikiContext, as usual.
* @param params Parsed parameters for the plugin.
*/
- public void executeParser( PluginContent element, WikiContext context, Map<String, String> params );
+ void executeParser( PluginContent element, WikiContext context, Map<String, String> params );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WikiPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WikiPlugin.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WikiPlugin.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WikiPlugin.java Sun Jul 14 21:08:22 2013
@@ -34,7 +34,7 @@ public interface WikiPlugin extends org.
/**
* Name of the default plugin resource bundle.
*/
- static final String CORE_PLUGINS_RESOURCEBUNDLE = "plugin.PluginResources";
+ String CORE_PLUGINS_RESOURCEBUNDLE = "plugin.PluginResources";
/**
* This is the main entry point for any plugin. The parameters are parsed,
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningProvider.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningProvider.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningProvider.java Sun Jul 14 21:08:22 2013
@@ -38,6 +38,5 @@ public interface VersioningProvider
* @param version The version to check
* @return True, if page exists; false otherwise.
*/
-
- public boolean pageExists( String page, int version );
+ boolean pageExists( String page, int version );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java Sun Jul 14 21:08:22 2013
@@ -51,7 +51,7 @@ public interface WikiAttachmentProvider
* @throws IOException If writing fails
* @throws ProviderException If there are other errors.
*/
- public void putAttachmentData( Attachment att, InputStream data )
+ void putAttachmentData( Attachment att, InputStream data )
throws ProviderException,
IOException;
@@ -65,7 +65,7 @@ public interface WikiAttachmentProvider
* @throws IOException If the attachment cannot be opened
*/
- public InputStream getAttachmentData( Attachment att )
+ InputStream getAttachmentData( Attachment att )
throws ProviderException,
IOException;
@@ -77,7 +77,7 @@ public interface WikiAttachmentProvider
* @throws ProviderException If something goes wrong when listing the attachments.
*/
- public Collection listAttachments( WikiPage page )
+ Collection listAttachments( WikiPage page )
throws ProviderException;
/**
@@ -85,7 +85,7 @@ public interface WikiAttachmentProvider
* @param query An array of QueryItem objects to search for
* @return A Collection of Attachment objects. May be empty, but never null.
*/
- public Collection findAttachments( QueryItem[] query );
+ Collection findAttachments( QueryItem[] query );
/**
* Lists changed attachments since given date. Can also be used to fetch
@@ -103,7 +103,7 @@ public interface WikiAttachmentProvider
* @return A List of Attachment objects, in most-recently-changed first order.
* @throws ProviderException If something goes wrong.
*/
- public List listAllChanged( Date timestamp )
+ List listAllChanged( Date timestamp )
throws ProviderException;
/**
@@ -115,7 +115,7 @@ public interface WikiAttachmentProvider
* @return An attachment object
* @throws ProviderException If the attachment cannot be found or some other error occurs.
*/
- public Attachment getAttachmentInfo( WikiPage page, String name, int version )
+ Attachment getAttachmentInfo( WikiPage page, String name, int version )
throws ProviderException;
/**
@@ -125,7 +125,7 @@ public interface WikiAttachmentProvider
* @param att The attachment for which to find the version history for.
* @return A List of Attachment objects.
*/
- public List getVersionHistory( Attachment att );
+ List getVersionHistory( Attachment att );
/**
* Removes a specific version from the repository. The implementations
@@ -140,7 +140,7 @@ public interface WikiAttachmentProvider
* @throws ProviderException If the attachment cannot be removed for some reason.
*/
- public void deleteVersion( Attachment att )
+ void deleteVersion( Attachment att )
throws ProviderException;
/**
@@ -157,7 +157,7 @@ public interface WikiAttachmentProvider
*
* @throws ProviderException If the page could not be removed for some reason.
*/
- public void deleteAttachment( Attachment att )
+ void deleteAttachment( Attachment att )
throws ProviderException;
/**
@@ -170,7 +170,7 @@ public interface WikiAttachmentProvider
* @throws ProviderException If the attachments could not be moved for some
* reason.
*/
- public void moveAttachmentsForPage( String oldParent,
+ void moveAttachmentsForPage( String oldParent,
String newParent )
throws ProviderException;
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiPageProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiPageProvider.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiPageProvider.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/WikiPageProvider.java Sun Jul 14 21:08:22 2013
@@ -51,7 +51,7 @@ public interface WikiPageProvider
* @param text The text to save.
* @throws ProviderException If something goes wrong.
*/
- public void putPageText( WikiPage page, String text )
+ void putPageText( WikiPage page, String text )
throws ProviderException;
/**
@@ -61,7 +61,7 @@ public interface WikiPageProvider
* @return true, if the page exists; false otherwise.
*/
- public boolean pageExists( String page );
+ boolean pageExists( String page );
/**
* Finds pages based on the query. Only applicable to providers
@@ -73,7 +73,7 @@ public interface WikiPageProvider
* @param query An array of QueryItems to match
* @return A Collection of WikiPages.
*/
- public Collection findPages( QueryItem[] query );
+ Collection findPages( QueryItem[] query );
/**
* Returns info about the page.
@@ -83,7 +83,7 @@ public interface WikiPageProvider
* @param version The version number
* @throws ProviderException If something goes wrong.
*/
- public WikiPage getPageInfo( String page, int version )
+ WikiPage getPageInfo( String page, int version )
throws ProviderException;
/**
@@ -94,7 +94,7 @@ public interface WikiPageProvider
* @throws ProviderException If something goes wrong.
*/
- public Collection getAllPages()
+ Collection getAllPages()
throws ProviderException;
/**
@@ -105,7 +105,7 @@ public interface WikiPageProvider
* @since 1.6.4
*/
- public Collection getAllChangedSince( Date date );
+ Collection getAllChangedSince( Date date );
/**
* Gets the number of pages.
@@ -115,7 +115,7 @@ public interface WikiPageProvider
* @since 1.6.4
*/
- public int getPageCount()
+ int getPageCount()
throws ProviderException;
/**
@@ -127,7 +127,7 @@ public interface WikiPageProvider
* @throws ProviderException If something goes wrong.
*/
- public List getVersionHistory( String page )
+ List getVersionHistory( String page )
throws ProviderException;
/**
@@ -140,7 +140,7 @@ public interface WikiPageProvider
* @throws ProviderException If something goes wrong.
*/
- public String getPageText( String page, int version )
+ String getPageText( String page, int version )
throws ProviderException;
/**
@@ -156,7 +156,7 @@ public interface WikiPageProvider
* @throws ProviderException If the page cannot be removed for some reason.
*/
- public void deleteVersion( String pageName, int version )
+ void deleteVersion( String pageName, int version )
throws ProviderException;
/**
@@ -178,7 +178,7 @@ public interface WikiPageProvider
*
* @throws ProviderException If the page could not be removed for some reason.
*/
- public void deletePage( String pageName )
+ void deletePage( String pageName )
throws ProviderException;
@@ -190,7 +190,7 @@ public interface WikiPageProvider
*
* @throws ProviderException If the page could not be moved for some reason.
*/
- public void movePage(String from, String to)
+ void movePage(String from, String to)
throws ProviderException;
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java Sun Jul 14 21:08:22 2013
@@ -25,7 +25,6 @@ import org.apache.commons.lang.time.Stop
import org.apache.log4j.Logger;
import org.apache.wiki.*;
import org.apache.wiki.api.exceptions.FilterException;
-import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.api.filters.BasicPageFilter;
import org.apache.wiki.event.WikiEvent;
import org.apache.wiki.event.WikiEventListener;
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchProvider.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchProvider.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchProvider.java Sun Jul 14 21:08:22 2013
@@ -36,7 +36,7 @@ public interface SearchProvider extends
* Delete a page from the search index
* @param page Page to remove from search index
*/
- public void pageRemoved(WikiPage page);
+ void pageRemoved(WikiPage page);
/**
* Adds a WikiPage for indexing queue. This is called a queue, since
@@ -45,7 +45,7 @@ public interface SearchProvider extends
*
* @param page The WikiPage to be indexed.
*/
- public void reindexPage(WikiPage page);
+ void reindexPage(WikiPage page);
/**
* Search for pages matching a search query
@@ -54,5 +54,5 @@ public interface SearchProvider extends
* @throws ProviderException if the search provider failed.
* @throws IOException if for some reason the query could not be executed.
*/
- public Collection findPages(String query) throws ProviderException, IOException;
+ Collection findPages(String query) throws ProviderException, IOException;
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/ParamHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/ParamHandler.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/ParamHandler.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/ParamHandler.java Sun Jul 14 21:08:22 2013
@@ -27,5 +27,5 @@ package org.apache.wiki.tags;
*/
public interface ParamHandler
{
- public void setContainedParameter( String n, String v );
+ void setContainedParameter( String n, String v );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/TranslateTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/TranslateTag.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/TranslateTag.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/tags/TranslateTag.java Sun Jul 14 21:08:22 2013
@@ -24,7 +24,6 @@ import javax.servlet.jsp.tagext.BodyCont
import javax.servlet.jsp.tagext.BodyTagSupport;
import org.apache.wiki.WikiContext;
-import org.apache.wiki.WikiPage;
import org.apache.log4j.Logger;
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Command.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Command.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Command.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/Command.java Sun Jul 14 21:08:22 2013
@@ -90,7 +90,7 @@ public interface Command
* @return the new, targeted Command
* @throws IllegalArgumentException if the target is not of the correct type
*/
- public Command targetedCommand( Object target );
+ Command targetedCommand( Object target );
/**
* Returns the content template associated with a Command, such as
@@ -100,7 +100,7 @@ public interface Command
* of this method is <code>null</code></em>.
* @return the content template
*/
- public String getContentTemplate();
+ String getContentTemplate();
/**
* Returns the JSP associated with the Command. The JSP is
@@ -111,20 +111,20 @@ public interface Command
* result, although in some cases the result may be an empty string.
* @return the JSP or url associated with the wiki command
*/
- public String getJSP();
+ String getJSP();
/**
* Returns the human-friendly name for this command.
* @return the name
*/
- public String getName();
+ String getName();
/**
* Returns the request context associated with this Command. This method is
* guaranteed to return a non-<code>null</code> String.
* @return the request context
*/
- public String getRequestContext();
+ String getRequestContext();
/**
* Returns the Permission required to successfully execute this Command. If
@@ -137,7 +137,7 @@ public interface Command
* <code>PagePermission "<em>yourWiki</em>:Main", "view"</code>.
* @return the required permission, or <code>null</code> if not required
*/
- public Permission requiredPermission();
+ Permission requiredPermission();
/**
* Returns the target associated with a Command, if it was created with one.
@@ -147,13 +147,13 @@ public interface Command
* is <code>null</code></em>.
* @return the wiki page
*/
- public Object getTarget();
+ Object getTarget();
/**
* Returns the URL pattern associated with this Command. This method is
* guaranteed to return a non-<code>null</code> String.
* @return the URL pattern
*/
- public String getURLPattern();
+ String getURLPattern();
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/CommandResolver.java Sun Jul 14 21:08:22 2013
@@ -35,7 +35,6 @@ import org.apache.wiki.WikiProvider;
import org.apache.wiki.auth.GroupPrincipal;
import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.providers.ProviderException;
-import org.apache.wiki.url.URLConstructor;
import org.apache.wiki.util.TextUtil;
/**
@@ -419,7 +418,7 @@ public final class CommandResolver
* user, taking into acccount special pages. The resolution algorithm will:
* <ul>
* <li>Extract the page name from the URL according to the rules for the
- * current {@link URLConstructor}. If a page name was
+ * current {@link org.apache.wiki.url.URLConstructor}. If a page name was
* passed in the request, return the correct name after taking into account
* potential plural matches.</li>
* <li>If the extracted page name is <code>null</code>, attempt to see
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/GenericHTTPHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/GenericHTTPHandler.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/GenericHTTPHandler.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/GenericHTTPHandler.java Sun Jul 14 21:08:22 2013
@@ -34,7 +34,7 @@ public interface GenericHTTPHandler
*
* @return the identifier for the bean
*/
- public String getId();
+ String getId();
/**
* Return basic HTML.
@@ -42,12 +42,12 @@ public interface GenericHTTPHandler
* @param context
* @return the HTML for the bean
*/
- public String doGet( WikiContext context );
+ String doGet( WikiContext context );
/**
* Handles a POST response.
* @param context
* @return the response string resulting from the POST
*/
- public String doPost( WikiContext context );
+ String doPost( WikiContext context );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiServletFilter.java Sun Jul 14 21:08:22 2013
@@ -31,7 +31,6 @@ import org.apache.log4j.NDC;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.WikiSession;
-import org.apache.wiki.auth.AuthenticationManager;
import org.apache.wiki.auth.SessionMonitor;
import org.apache.wiki.auth.WikiSecurityException;
import org.apache.wiki.tags.WikiTagBase;
@@ -45,7 +44,7 @@ import org.apache.wiki.tags.WikiTagBase;
* authenticated by container or by JSPWiki's custom system).
* The wrapper's other responsibility is to incorporate JSPWiki built-in roles
* into the role-checking algorithm for {@link HttpServletRequest#isUserInRole(String)}.
- * Just before the request is wrapped, the method {@link AuthenticationManager#login(HttpServletRequest)} executes;
+ * Just before the request is wrapped, the method {@link org.apache.wiki.auth.AuthenticationManager#login(HttpServletRequest)} executes;
* this method contains all of the logic needed to grab any user login credentials set
* by the container or by cookies.
*
@@ -93,13 +92,13 @@ public class WikiServletFilter implement
/**
* Checks that the WikiEngine is running ok, wraps the current
* HTTP request, and sets the correct authentication state for the users's
- * WikiSession. First, the method {@link AuthenticationManager#login(HttpServletRequest)}
+ * WikiSession. First, the method {@link org.apache.wiki.auth.AuthenticationManager#login(HttpServletRequest)}
* executes, which sets the authentication state. Then, the request is wrapped with a
* {@link WikiRequestWrapper}.
* @param request the current HTTP request object
* @param response the current HTTP response object
* @param chain The Filter chain passed down.
- * @throws ServletException if {@link AuthenticationManager#login(HttpServletRequest)} fails for any reason
+ * @throws ServletException if {@link org.apache.wiki.auth.AuthenticationManager#login(HttpServletRequest)} fails for any reason
* @throws IOException If writing to the servlet response fails.
*/
public void doFilter( ServletRequest request, ServletResponse response, FilterChain chain ) throws IOException, ServletException
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/AdminBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/AdminBean.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/AdminBean.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/admin/AdminBean.java Sun Jul 14 21:08:22 2013
@@ -29,23 +29,23 @@ import org.apache.wiki.ui.GenericHTTPHan
public interface AdminBean
extends GenericHTTPHandler
{
- public static final int UNKNOWN = 0;
- public static final int CORE = 1;
- public static final int EDITOR = 2;
+ int UNKNOWN = 0;
+ int CORE = 1;
+ int EDITOR = 2;
- public void initialize( WikiEngine engine );
+ void initialize( WikiEngine engine );
/**
* Return a human-readable title for this AdminBean.
*
* @return the bean's title
*/
- public String getTitle();
+ String getTitle();
/**
* Returns a type (UNKNOWN, EDITOR, etc).
*
* @return the bean's type
*/
- public int getType();
+ int getType();
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/URLConstructor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/URLConstructor.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/URLConstructor.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/url/URLConstructor.java Sun Jul 14 21:08:22 2013
@@ -43,7 +43,7 @@ public interface URLConstructor
* @param engine The WikiEngine that this URLConstructor belongs to
* @param properties Properties used to initialize
*/
- public void initialize( WikiEngine engine,
+ void initialize( WikiEngine engine,
Properties properties );
/**
@@ -58,7 +58,7 @@ public interface URLConstructor
* @return An URL pointing to the resource. Must never return null - throw an InternalWikiException
* if something goes wrong.
*/
- public String makeURL( String context,
+ String makeURL( String context,
String name,
boolean absolute,
String parameters );
@@ -77,7 +77,7 @@ public interface URLConstructor
* @return This method must return the name of the resource.
* @throws IOException If parsing failes
*/
- public String parsePage( String context,
+ String parsePage( String context,
HttpServletRequest request,
String encoding )
throws IOException;
@@ -90,5 +90,5 @@ public interface URLConstructor
* @return "Wiki.jsp", "PageInfo.jsp", etc. Just return the name,
* JSPWiki will figure out the page.
*/
- public String getForwardPage( HttpServletRequest request );
+ String getForwardPage( HttpServletRequest request );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/Watchable.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/Watchable.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/Watchable.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/Watchable.java Sun Jul 14 21:08:22 2013
@@ -32,7 +32,7 @@ public interface Watchable
*
* @param state The state in which your Watchable is currently.
*/
- public void timeoutExceeded( String state );
+ void timeoutExceeded( String state );
/**
* Returns a human-readable name of this Watchable. Used in
@@ -40,7 +40,7 @@ public interface Watchable
*
* @return The name of the Watchable.
*/
- public String getName();
+ String getName();
/**
* Returns <code>true</code>, if this Watchable is still alive and can be
@@ -49,5 +49,5 @@ public interface Watchable
*
* @return the result
*/
- public boolean isAlive();
+ boolean isAlive();
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/Step.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/Step.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/Step.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/Step.java Sun Jul 14 21:08:22 2013
@@ -74,7 +74,7 @@ public interface Step extends Serializab
* the Step to associated with this Outcomes (<code>null</code>
* denotes no Steps)
*/
- public void addSuccessor( Outcome outcome, Step step );
+ void addSuccessor( Outcome outcome, Step step );
/**
* Returns a Collection of available outcomes, such as "approve", "deny" or
@@ -85,7 +85,7 @@ public interface Step extends Serializab
*
* @return the set of outcomes
*/
- public Collection getAvailableOutcomes();
+ Collection getAvailableOutcomes();
/**
* Returns a List of error strings generated by this Step. If this Step
@@ -93,7 +93,7 @@ public interface Step extends Serializab
*
* @return the errors
*/
- public List getErrors();
+ List getErrors();
/**
* <p>
@@ -119,7 +119,7 @@ public interface Step extends Serializab
* @throws WikiException
* if the step encounters errors while executing
*/
- public Outcome execute() throws WikiException;
+ Outcome execute() throws WikiException;
/**
* The Principal responsible for completing this Step, such as a system user
@@ -127,7 +127,7 @@ public interface Step extends Serializab
*
* @return the responsible Principal
*/
- public Principal getActor();
+ Principal getActor();
/**
* The end time for this Step. This value should be set when the step
@@ -135,7 +135,7 @@ public interface Step extends Serializab
*
* @return the end time
*/
- public Date getEndTime();
+ Date getEndTime();
/**
* Message key for human-friendly name of this Step, including any parameter
@@ -145,7 +145,7 @@ public interface Step extends Serializab
*
* @return the message key for this Step.
*/
- public String getMessageKey();
+ String getMessageKey();
/**
* Returns the message arguments for this Step, typically by delegating to the
@@ -153,7 +153,7 @@ public interface Step extends Serializab
*
* @return the message arguments.
*/
- public Serializable[] getMessageArguments();
+ Serializable[] getMessageArguments();
/**
* Returns the Outcome of this Step's processing; by default,
@@ -161,7 +161,7 @@ public interface Step extends Serializab
*
* @return the outcome
*/
- public Outcome getOutcome();
+ Outcome getOutcome();
/**
* The start time for this Step. Returns {@link Workflow#TIME_NOT_SET} if
@@ -169,14 +169,14 @@ public interface Step extends Serializab
*
* @return the start time
*/
- public Date getStartTime();
+ Date getStartTime();
/**
* Gets the Workflow that is the parent of this Step.
*
* @return the workflow
*/
- public Workflow getWorkflow();
+ Workflow getWorkflow();
/**
* Determines whether the Step is completed; if not, it is by definition
@@ -187,7 +187,7 @@ public interface Step extends Serializab
* @return <code>true</code> if the Step has completed; <code>false</code>
* if not.
*/
- public boolean isCompleted();
+ boolean isCompleted();
/**
* Determines whether the Step has started.
@@ -195,7 +195,7 @@ public interface Step extends Serializab
* @return <code>true</code> if the Step has started; <code>false</code>
* if not.
*/
- public boolean isStarted();
+ boolean isStarted();
/**
* Starts the Step, and sets the start time to the moment when this method
@@ -206,7 +206,7 @@ public interface Step extends Serializab
*
* @throws WikiException if the step encounters errors while starting
*/
- public void start() throws WikiException;
+ void start() throws WikiException;
/**
* Sets the current Outcome for the step. If the Outcome is a "completion"
@@ -221,7 +221,7 @@ public interface Step extends Serializab
*
* @param outcome whether the step should be considered completed
*/
- public void setOutcome( Outcome outcome );
+ void setOutcome( Outcome outcome );
/**
* Convenience method that returns the owner of the Workflow by delegating
@@ -229,7 +229,7 @@ public interface Step extends Serializab
*
* @return the owner of the Workflow
*/
- public Principal getOwner();
+ Principal getOwner();
/**
* Identifies the next Step for a particular Outcome; if there is no next
@@ -239,6 +239,6 @@ public interface Step extends Serializab
* the outcome
* @return the next step
*/
- public Step getSuccessor( Outcome outcome );
+ Step getSuccessor( Outcome outcome );
}
Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java?rev=1503057&r1=1503056&r2=1503057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java (original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/WikiRPCHandler.java Sun Jul 14 21:08:22 2013
@@ -30,5 +30,5 @@ import org.apache.wiki.WikiContext;
// in 3.0
public interface WikiRPCHandler
{
- public void initialize( WikiContext context );
+ void initialize( WikiContext context );
}