diff gwt-client/src/main/java/org/dive4elements/river/client/server/filter/GGInAFilter.java @ 8203:238fc722f87a

sed 's/logger/log/g' src/**/*.java
author Sascha L. Teichmann <teichmann@intevation.de>
date Fri, 05 Sep 2014 13:19:22 +0200
parents 3bff11208d3d
children b1580e4d342a
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/filter/GGInAFilter.java	Fri Sep 05 12:58:17 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/filter/GGInAFilter.java	Fri Sep 05 13:19:22 2014 +0200
@@ -36,8 +36,8 @@
 /** ServletFilter used for GGInA authentification and certain authorisation. */
 public class GGInAFilter implements Filter {
 
-    /** Private logger. */
-    private static Logger logger = Logger.getLogger(GGInAFilter.class);
+    /** Private log. */
+    private static Logger log = Logger.getLogger(GGInAFilter.class);
 
     private boolean deactivate = false;
     private String authmethod;
@@ -61,7 +61,7 @@
     {
         String deactivate = config.getInitParameter("deactivate");
         this.sc = config.getServletContext();
-        logger.debug("GGInAFilter context " + this.sc.getContextPath());
+        log.debug("GGInAFilter context " + this.sc.getContextPath());
         this.authmethod = sc.getInitParameter("authentication");
         this.redirecturl = sc.getInitParameter("redirect-url");
         if (deactivate != null && deactivate.equalsIgnoreCase("true")) {
@@ -82,7 +82,7 @@
     throws IOException, ServletException
     {
         if (this.deactivate) {
-            logger.debug("GGinAFilter is deactivated");
+            log.debug("GGinAFilter is deactivated");
             chain.doFilter(req, resp);
             return;
         }
@@ -90,19 +90,19 @@
         HttpServletRequest sreq = (HttpServletRequest) req;
 
         String requesturi = sreq.getRequestURI();
-        if (logger.isDebugEnabled()) {
+        if (log.isDebugEnabled()) {
             for (Enumeration e = req.getAttributeNames() ; e.hasMoreElements() ;) {
-                logger.debug(e.nextElement());
+                log.debug(e.nextElement());
             }
         }
 
-        logger.debug("Request for: " + requesturi);
+        log.debug("Request for: " + requesturi);
 
         // Allow access to localhost
         if (isLocalAddress(req)) {
             String noAuth = sreq.getHeader("X_NO_GGINA_AUTH");
             if (noAuth != null && noAuth.equals("TRUE")) {
-                logger.debug("Request to localhost");
+                log.debug("Request to localhost");
                 chain.doFilter(req, resp);
                 return;
             }
@@ -114,7 +114,7 @@
                 || requesturi.equals(path + LOGIN_SERVLET)
                 || requesturi.equals(path + SAML_SERVLET)
                 || requesturi.equals(path + FLYS_CSS)) {
-            logger.debug("Request for login " + requesturi);
+            log.debug("Request for login " + requesturi);
             chain.doFilter(req, resp);
             return;
         }
@@ -139,23 +139,23 @@
 
         User user = (User)session.getAttribute("user");
         if (user == null) {
-            logger.debug("No user in session: " + requesturi);
+            log.debug("No user in session: " + requesturi);
             this.handleResponse(resp, redirect);
             return;
         }
         if (user.hasExpired()) {
             // try to re-authenticate the user
-            logger.debug("User ticket has expired: " + requesturi);
+            log.debug("User ticket has expired: " + requesturi);
             String encoding = sreq.getCharacterEncoding();
             try {
                 Authentication auth = this.auth(user, encoding);
                 if (auth == null || !auth.isSuccess()) {
-                    logger.debug("Re-athentication not successful");
+                    log.debug("Re-athentication not successful");
                     this.handleResponse(resp, redirect);
                 }
             }
             catch(AuthenticationException e) {
-                logger.error("Failure during re-authentication", e);
+                log.error("Failure during re-authentication", e);
                 this.handleResponse(resp, redirect);
                 return;
             }
@@ -166,13 +166,13 @@
     }
 
     private void redirect(ServletResponse resp) throws IOException {
-        logger.debug("Redirect to login");
+        log.debug("Redirect to login");
         ((HttpServletResponse) resp).sendRedirect(this.sc.getContextPath() +
             "/login.jsp");
     }
 
     private void sendNotAuthenticated(ServletResponse resp) throws IOException {
-        logger.debug("Send not authenticated");
+        log.debug("Send not authenticated");
         ((HttpServletResponse)resp).sendError(HttpServletResponse.SC_FORBIDDEN, "User not authenticated");
     }
 
@@ -211,7 +211,7 @@
             InetAddress addr = InetAddress.getByName(req.getRemoteAddr());
             return addr.isAnyLocalAddress() || addr.isLoopbackAddress();
         } catch (UnknownHostException e) {
-            logger.error(e, e);
+            log.error(e, e);
             return false;
         }
     }

http://dive4elements.wald.intevation.org