roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r477854 - in /incubator/roller/trunk: src/org/apache/roller/ui/core/ web/WEB-INF/classes/
Date Tue, 21 Nov 2006 19:57:06 GMT
Author: agilliland
Date: Tue Nov 21 11:57:05 2006
New Revision: 477854

URL: http://svn.apache.org/viewvc?view=rev&rev=477854
Log:
removing unused Authenticator interface.  the functionality from that interface seems to have
been incomplete and ultimately is already handled by RollerSession.getAuthenticatedUser().


Removed:
    incubator/roller/trunk/src/org/apache/roller/ui/core/Authenticator.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/DefaultAuthenticator.java
Modified:
    incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java
    incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java
    incubator/roller/trunk/web/WEB-INF/classes/roller.properties

Modified: incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java?view=diff&rev=477854&r1=477853&r2=477854
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/RollerContext.java Tue Nov 21 11:57:05
2006
@@ -76,7 +76,6 @@
     public static final String ROLLER_CONTEXT = "roller.context";
     
     private static ServletContext mContext = null;
-    private static Authenticator mAuthenticator = null;
     private final SynchronizedInt mSessionCount = new SynchronizedInt(0);
     
     
@@ -403,29 +402,6 @@
         mLogger.debug("sessions=" + mSessionCount
                     + ":freemem=" + Runtime.getRuntime().freeMemory()
                     + ":totalmem=" + Runtime.getRuntime().totalMemory());
-    }
-    
-    
-    /**
-     * Get authenticator
-     */
-    public Authenticator getAuthenticator() {
-        if (mAuthenticator == null) {
-            try {
-                Class authClass =
-                        Class.forName(RollerConfig.getProperty("authenticator.classname"));
-                mAuthenticator = (Authenticator) authClass.newInstance();
-            } catch (Exception e) {
-                // this isn't an ERROR if no authenticatorClass was specified
-                if (!(e instanceof NullPointerException)) {
-                    mLogger.error("ERROR creating authenticator, using default", e);
-                } else {
-                    mLogger.debug("No authenticator specified, using DefaultAuthenticator");
-                }
-                mAuthenticator = new DefaultAuthenticator();
-            }
-        }
-        return mAuthenticator;
     }
     
     

Modified: incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java?view=diff&rev=477854&r1=477853&r2=477854
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java Tue Nov 21 11:57:05
2006
@@ -134,18 +134,6 @@
             return; // Atom servlet request needs no init
         }
         
-        // Bind persistence session to authenticated user, if we have one
-        RollerContext rctx = RollerContext.getRollerContext(); 
-        Authenticator auth = rctx.getAuthenticator();
-        String userName = auth.getAuthenticatedUserName(mRequest);
-        if (userName != null)
-        {
-            UserManager userMgr = RollerFactory.getRoller().getUserManager();
-            UserData currentUser = userMgr.getUserByUserName(userName);
-            // TODO: possible fix for backend refactoryings
-            //RollerFactory.getRoller().setUser(currentUser);
-        }
-        
         // path info may be null, (e.g. on JSP error page)
         mPathInfo = mRequest.getPathInfo();
         mPathInfo = (mPathInfo!=null) ? mPathInfo : "";            

Modified: incubator/roller/trunk/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/classes/roller.properties?view=diff&rev=477854&r1=477853&r2=477854
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/roller.properties Tue Nov 21 11:57:05 2006
@@ -330,9 +330,6 @@
 #----------------------------------
 # comment, referrer and trackback settings
 
-# comment authenticator settings (experimental)
-authenticator.classname=org.apache.roller.ui.core.DefaultAuthenticator
-
 comment.authenticator.classname=org.apache.roller.ui.rendering.util.MathCommentAuthenticator
 comment.notification.separateOwnerMessage=false
 comment.notification.hideCommenterAddresses=false



Mime
View raw message