You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2019/08/19 20:17:01 UTC

[jspwiki] 02/24: removal of @deprecated code (2) - AuthorizationManager: removed unused method

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 7c033301cdcb65be3ea706046a1267bf7fcbd181
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Aug 16 20:13:03 2019 +0200

    removal of @deprecated code (2) - AuthorizationManager: removed unused method
---
 .../org/apache/wiki/auth/AuthorizationManager.java | 51 ++++++++--------------
 1 file changed, 19 insertions(+), 32 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
index d37b629..a892249 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/AuthorizationManager.java
@@ -19,26 +19,6 @@
 package org.apache.wiki.auth;
 
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-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.Arrays;
-import java.util.Map;
-import java.util.Properties;
-import java.util.ResourceBundle;
-import java.util.WeakHashMap;
-
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.log4j.Logger;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
@@ -63,6 +43,25 @@ import org.apache.wiki.tags.WikiTagBase;
 import org.apache.wiki.util.ClassUtil;
 import org.freshcookies.security.policy.LocalPolicy;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+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.Arrays;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+import java.util.WeakHashMap;
+
 /**
  * <p>Manages all access control and authorization; determines what authenticated
  * users are allowed to do.</p>
@@ -497,18 +496,6 @@ public class AuthorizationManager {
     }
 
     /**
-     * Returns <code>true</code> if JSPWiki's JAAS authorization system
-     * is used for authorization in addition to container controls.
-     * @return the result
-     * @deprecated functionality deprecated - returns true always. To be removed on 2.11.0
-     */
-    @Deprecated
-    protected boolean isJAASAuthorized()
-    {
-        return true;
-    }
-
-    /**
      * Attempts to locate and initialize a Authorizer to use with this manager.
      * Throws a WikiException if no entry is found, or if one fails to
      * initialize.