Author: juanpablo
Date: Sun Dec 15 19:20:16 2013
New Revision: 1551040
URL: http://svn.apache.org/r1551040
Log:
JSPWIKI-155: AuthenticationManager, AuthorizationManager, DefaultFilterManager,
GroupManager and UserManager not final anymore
reorganized imports on the rest of the managers
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ReferenceManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/i18n/InternationalizationManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ReferenceManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ReferenceManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ReferenceManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ReferenceManager.java
Sun Dec 15 19:20:16 2013
@@ -18,10 +18,28 @@
*/
package org.apache.wiki;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.ConcurrentModificationException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
import org.apache.commons.lang.time.StopWatch;
import org.apache.log4j.Logger;
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/VariableManager.java
Sun Dec 15 19:20:16 2013
@@ -20,7 +20,11 @@ package org.apache.wiki;
import java.lang.reflect.Method;
import java.security.Principal;
-import java.util.*;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.ResourceBundle;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
Sun Dec 15 19:20:16 2013
@@ -22,7 +22,11 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheManager;
@@ -30,7 +34,11 @@ import net.sf.ehcache.Element;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-import org.apache.wiki.*;
+import org.apache.wiki.PageManager;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
+import org.apache.wiki.WikiProvider;
import org.apache.wiki.api.exceptions.NoRequiredPropertyException;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.parser.MarkupParser;
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
Sun Dec 15 19:20:16 2013
@@ -18,11 +18,20 @@
*/
package org.apache.wiki.auth;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.Principal;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
@@ -38,7 +47,13 @@ import org.apache.wiki.api.exceptions.Wi
import org.apache.wiki.auth.authorize.Role;
import org.apache.wiki.auth.authorize.WebAuthorizer;
import org.apache.wiki.auth.authorize.WebContainerAuthorizer;
-import org.apache.wiki.auth.login.*;
+import org.apache.wiki.auth.login.AnonymousLoginModule;
+import org.apache.wiki.auth.login.CookieAssertionLoginModule;
+import org.apache.wiki.auth.login.CookieAuthenticationLoginModule;
+import org.apache.wiki.auth.login.UserDatabaseLoginModule;
+import org.apache.wiki.auth.login.WebContainerCallbackHandler;
+import org.apache.wiki.auth.login.WebContainerLoginModule;
+import org.apache.wiki.auth.login.WikiCallbackHandler;
import org.apache.wiki.event.WikiEventListener;
import org.apache.wiki.event.WikiEventManager;
import org.apache.wiki.event.WikiSecurityEvent;
@@ -58,8 +73,8 @@ import org.apache.wiki.util.TimedCounter
*
* @since 2.3
*/
-public final class AuthenticationManager
-{
+public class AuthenticationManager {
+
/** How many milliseconds the logins are stored before they're cleaned
away. */
private static final long LASTLOGINS_CLEANUP_TIME = 10*60*1000L; // Ten
minutes
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
Sun Dec 15 19:20:16 2013
@@ -22,7 +22,13 @@ package org.apache.wiki.auth;
import java.io.File;
import java.io.IOException;
import java.net.URL;
-import java.security.*;
+import java.security.AccessControlException;
+import java.security.AccessController;
+import java.security.CodeSource;
+import java.security.Permission;
+import java.security.Principal;
+import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
import java.security.cert.Certificate;
import java.text.MessageFormat;
import java.util.Map;
@@ -33,7 +39,10 @@ import java.util.WeakHashMap;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
-import org.apache.wiki.*;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
+import org.apache.wiki.WikiSession;
import org.apache.wiki.api.exceptions.NoRequiredPropertyException;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.auth.acl.Acl;
@@ -86,8 +95,8 @@ import org.freshcookies.security.policy.
* @since 2.3
* @see AuthenticationManager
*/
-public final class AuthorizationManager
-{
+public class AuthorizationManager {
+
private static final Logger log = Logger.getLogger(
AuthorizationManager.class );
/**
* The default external Authorizer is the {@link
org.apache.wiki.auth.authorize.WebContainerAuthorizer}
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/UserManager.java
Sun Dec 15 19:20:16 2013
@@ -21,7 +21,12 @@ package org.apache.wiki.auth;
import java.security.Permission;
import java.security.Principal;
import java.text.MessageFormat;
-import java.util.*;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+import java.util.WeakHashMap;
import javax.mail.MessagingException;
import javax.mail.internet.AddressException;
@@ -53,14 +58,21 @@ import org.apache.wiki.ui.InputValidator
import org.apache.wiki.util.ClassUtil;
import org.apache.wiki.util.MailUtil;
import org.apache.wiki.util.TextUtil;
-import org.apache.wiki.workflow.*;
+import org.apache.wiki.workflow.Decision;
+import org.apache.wiki.workflow.DecisionRequiredException;
+import org.apache.wiki.workflow.Fact;
+import org.apache.wiki.workflow.Outcome;
+import org.apache.wiki.workflow.Task;
+import org.apache.wiki.workflow.Workflow;
+import org.apache.wiki.workflow.WorkflowBuilder;
+
/**
* Provides a facade for obtaining user information.
* @since 2.3
*/
-public final class UserManager
-{
+public class UserManager {
+
private static final String USERDATABASE_PACKAGE =
"org.apache.wiki.auth.user";
private static final String SESSION_MESSAGES = "profile";
private static final String PARAM_EMAIL = "email";
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
Sun Dec 15 19:20:16 2013
@@ -20,13 +20,24 @@ package org.apache.wiki.auth.acl;
import java.security.Permission;
import java.security.Principal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.TreeMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.log4j.Logger;
-
-import org.apache.wiki.*;
+import org.apache.wiki.PageLock;
+import org.apache.wiki.PageManager;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
import org.apache.wiki.attachment.Attachment;
import org.apache.wiki.auth.AuthorizationManager;
import org.apache.wiki.auth.PrincipalComparator;
@@ -40,9 +51,9 @@ import org.apache.wiki.render.RenderingM
* Default implementation that parses Acls from wiki page markup.
* @since 2.3
*/
-public class DefaultAclManager implements AclManager
-{
- static Logger log = Logger.getLogger(
DefaultAclManager.class );
+public class DefaultAclManager implements AclManager {
+
+ private static final Logger log = Logger.getLogger(
DefaultAclManager.class );
private AuthorizationManager m_auth = null;
private WikiEngine m_engine = null;
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/GroupManager.java
Sun Dec 15 19:20:16 2013
@@ -19,7 +19,12 @@
package org.apache.wiki.auth.authorize;
import java.security.Principal;
-import java.util.*;
+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 javax.servlet.http.HttpServletRequest;
@@ -44,6 +49,7 @@ import org.apache.wiki.event.WikiSecurit
import org.apache.wiki.ui.InputValidator;
import org.apache.wiki.util.ClassUtil;
+
/**
* <p>
* Facade class for storing, retrieving and managing wiki groups on behalf of
@@ -59,8 +65,8 @@ import org.apache.wiki.util.ClassUtil;
* </p>
* @since 2.4.19
*/
-public final class GroupManager implements Authorizer, WikiEventListener
-{
+public class GroupManager implements Authorizer, WikiEventListener {
+
/** Key used for adding UI messages to a user's WikiSession. */
public static final String MESSAGES_KEY = "group";
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/diff/DifferenceManager.java
Sun Dec 15 19:20:16 2013
@@ -29,10 +29,8 @@ import org.apache.wiki.api.exceptions.No
import org.apache.wiki.util.ClassUtil;
-
/**
* Load, initialize and delegate to the DiffProvider that will actually do the
work.
- *
*/
public class DifferenceManager
{
@@ -41,7 +39,6 @@ public class DifferenceManager
/** Property value for storing a diff provider. Value is {@value}. */
public static final String PROP_DIFF_PROVIDER = "jspwiki.diffProvider";
-
private DiffProvider m_provider;
/**
@@ -66,7 +63,7 @@ public class DifferenceManager
try
{
- Class providerClass = ClassUtil.findClass( "org.apache.wiki.diff",
providerClassName );
+ Class< ? > providerClass = ClassUtil.findClass(
"org.apache.wiki.diff", providerClassName );
m_provider = (DiffProvider)providerClass.newInstance();
}
catch( ClassNotFoundException e )
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
Sun Dec 15 19:20:16 2013
@@ -23,11 +23,19 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import org.apache.log4j.Logger;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
+import org.apache.wiki.api.engine.FilterManager;
import org.apache.wiki.api.exceptions.FilterException;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.api.filters.PageFilter;
@@ -89,11 +97,11 @@ import org.jdom2.xpath.XPath;
* The <filter> -sections define the filters. For more information,
please see
* the PageFilterConfiguration page in the JSPWiki distribution.
*/
-public final class DefaultFilterManager extends ModuleManager implements
org.apache.wiki.api.engine.FilterManager
-{
- private PriorityList<PageFilter> m_pageFilters = new
PriorityList<PageFilter>();
+public class DefaultFilterManager extends ModuleManager implements
FilterManager {
+
+ private PriorityList< PageFilter > m_pageFilters = new PriorityList<
PageFilter >();
- private Map<String, PageFilterInfo> m_filterClassMap = new
HashMap<String,PageFilterInfo>();
+ private Map< String, PageFilterInfo > m_filterClassMap = new HashMap<
String, PageFilterInfo >();
private static final Logger log =
Logger.getLogger(DefaultFilterManager.class);
@@ -149,8 +157,7 @@ public final class DefaultFilterManager
int priority = 0; // FIXME: Currently fixed.
- Class cl = ClassUtil.findClass( "org.apache.wiki.filters",
- className );
+ Class< ? > cl = ClassUtil.findClass( "org.apache.wiki.filters",
className );
PageFilter filter = (PageFilter)cl.newInstance();
@@ -432,10 +439,9 @@ public final class DefaultFilterManager
/**
* {@inheritDoc}
*/
- @SuppressWarnings("unchecked")
public Collection modules()
{
- ArrayList modules = new ArrayList();
+ ArrayList< PageFilter > modules = new ArrayList< PageFilter >();
modules.addAll( m_pageFilters );
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/i18n/InternationalizationManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/i18n/InternationalizationManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/i18n/InternationalizationManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/i18n/InternationalizationManager.java
Sun Dec 15 19:20:16 2013
@@ -25,13 +25,14 @@ import java.util.ResourceBundle;
import org.apache.wiki.WikiEngine;
+
/**
* Manages all internationalization in JSPWiki.
*
* @since 2.6
*/
-public class InternationalizationManager
-{
+public class InternationalizationManager {
+
/** The name of the ResourceBundle which contains any and all JSPWiki core
* resource strings. It's value is {@value}.
*/
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/render/RenderingManager.java
Sun Dec 15 19:20:16 2013
@@ -28,8 +28,8 @@ import java.util.Properties;
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Element;
-import org.apache.log4j.Logger;
+import org.apache.log4j.Logger;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.exceptions.WikiException;
@@ -41,8 +41,6 @@ import org.apache.wiki.modules.InternalM
import org.apache.wiki.parser.JSPWikiMarkupParser;
import org.apache.wiki.parser.MarkupParser;
import org.apache.wiki.parser.WikiDocument;
-import org.apache.wiki.providers.CachingProvider;
-import org.apache.wiki.util.TextUtil;
/**
* This class provides a facade towards the differing rendering routines.
You should
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/search/SearchManager.java
Sun Dec 15 19:20:16 2013
@@ -19,11 +19,19 @@
package org.apache.wiki.search;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
import org.apache.commons.lang.time.StopWatch;
import org.apache.log4j.Logger;
-import org.apache.wiki.*;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiPage;
import org.apache.wiki.api.exceptions.FilterException;
import org.apache.wiki.api.exceptions.NoRequiredPropertyException;
import org.apache.wiki.api.filters.BasicPageFilter;
@@ -39,15 +47,14 @@ import org.apache.wiki.rpc.json.JSONRPCM
import org.apache.wiki.util.ClassUtil;
import org.apache.wiki.util.TextUtil;
+
/**
* Manages searching the Wiki.
*
* @since 2.2.21.
*/
-public class SearchManager
- extends BasicPageFilter
- implements InternalModule, WikiEventListener
-{
+public class SearchManager extends BasicPageFilter implements InternalModule,
WikiEventListener {
+
private static final Logger log = Logger.getLogger(SearchManager.class);
private static final String DEFAULT_SEARCHPROVIDER =
"org.apache.wiki.search.LuceneSearchProvider";
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/EditorManager.java
Sun Dec 15 19:20:16 2013
@@ -19,23 +19,31 @@
package org.apache.wiki.ui;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
import javax.servlet.jsp.PageContext;
import org.apache.log4j.Logger;
-import org.jdom2.Document;
-import org.jdom2.Element;
-import org.jdom2.JDOMException;
-import org.jdom2.input.SAXBuilder;
-import org.jdom2.xpath.XPath;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.api.exceptions.NoSuchVariableException;
import org.apache.wiki.modules.ModuleManager;
import org.apache.wiki.modules.WikiModuleInfo;
-import org.apache.wiki.plugin.DefaultPluginManager;
import org.apache.wiki.preferences.Preferences;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPath;
+
/**
* Defines an editor manager. An editor can be added by adding a
@@ -57,8 +65,8 @@ import org.apache.wiki.preferences.Prefe
*
* @since 2.4
*/
-public class EditorManager extends ModuleManager
-{
+public class EditorManager extends ModuleManager {
+
/** The property name for setting the editor. Current value is
"jspwiki.editor" */
/* not used anymore -- replaced by defaultpref.template.editor */
public static final String PROP_EDITORTYPE = "jspwiki.editor";
@@ -117,11 +125,11 @@ public class EditorManager extends Modul
// Get all resources of all modules
//
- Enumeration resources = getClass().getClassLoader().getResources(
PLUGIN_RESOURCE_LOCATION );
+ Enumeration< URL > resources =
getClass().getClassLoader().getResources( PLUGIN_RESOURCE_LOCATION );
while( resources.hasMoreElements() )
{
- URL resource = (URL) resources.nextElement();
+ URL resource = resources.nextElement();
try
{
@@ -153,11 +161,11 @@ public class EditorManager extends Modul
}
catch( java.io.IOException e )
{
- log.error( "Couldn't load " +
DefaultPluginManager.PLUGIN_RESOURCE_LOCATION + " resources: " + resource, e );
+ log.error( "Couldn't load " +
ModuleManager.PLUGIN_RESOURCE_LOCATION + " resources: " + resource, e );
}
catch( JDOMException e )
{
- log.error( "Error parsing XML for plugin:
"+DefaultPluginManager.PLUGIN_RESOURCE_LOCATION );
+ log.error( "Error parsing XML for plugin:
"+ModuleManager.PLUGIN_RESOURCE_LOCATION );
}
}
}
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/TemplateManager.java
Sun Dec 15 19:20:16 2013
@@ -21,7 +21,22 @@ package org.apache.wiki.ui;
import java.io.IOException;
import java.io.InputStream;
import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.TreeSet;
+import java.util.Vector;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -38,15 +53,16 @@ import org.apache.wiki.modules.ModuleMan
import org.apache.wiki.preferences.Preferences;
import org.apache.wiki.preferences.Preferences.TimeFormat;
import org.apache.wiki.util.ClassUtil;
+
+
/**
* This class takes care of managing JSPWiki templates. This class also
provides
* the ResourceRequest mechanism.
*
* @since 2.1.62
*/
-public class TemplateManager
- extends ModuleManager
-{
+public class TemplateManager extends ModuleManager {
+
private static final String SKIN_DIRECTORY = "skins";
/**
@@ -667,9 +683,9 @@ public class TemplateManager
boolean first = true;
- for( Enumeration en = rb.getKeys(); en.hasMoreElements(); )
+ for( Enumeration< String > en = rb.getKeys(); en.hasMoreElements(); )
{
- String key = (String)en.nextElement();
+ String key = en.nextElement();
if( key.startsWith("javascript") )
{
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java?rev=1551040&r1=1551039&r2=1551040&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/workflow/WorkflowManager.java
Sun Dec 15 19:20:16 2013
@@ -19,26 +19,33 @@
package org.apache.wiki.workflow;
import java.security.Principal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
import org.apache.wiki.WikiEngine;
-import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.WikiSession;
+import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.auth.acl.UnresolvedPrincipal;
import org.apache.wiki.event.WikiEvent;
import org.apache.wiki.event.WikiEventListener;
import org.apache.wiki.event.WorkflowEvent;
+
/**
* <p>
* Monitor class that tracks running Workflows. The WorkflowManager also keeps
* track of the names of users or groups expected to approve particular
* Workflows.
* </p>
- *
*/
-public class WorkflowManager implements WikiEventListener
-{
+public class WorkflowManager implements WikiEventListener {
private final DecisionQueue m_queue = new DecisionQueue();
