From do-not-reply at jboss.org Fri Mar 11 09:27:42 2011
Content-Type: multipart/mixed; boundary="===============6755697965014935210=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r6009 - in
 components/wci/branches/logout:
 tomcat/tomcat6/src/main/java/org/gatein/wci/tomcat and 1 other directories.
Date: Fri, 11 Mar 2011 09:27:42 -0500
Message-ID: <201103111427.p2BERgQO028193@svn01.web.mwc.hst.phx2.redhat.com>

--===============6755697965014935210==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mstruk
Date: 2011-03-11 09:27:41 -0500 (Fri, 11 Mar 2011)
New Revision: 6009

Modified:
   components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wci=
/jboss/JB6ContainerServlet.java
   components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wci=
/jboss/JB6ServletContainerContext.java
   components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/w=
ci/tomcat/TC6ContainerServlet.java
   components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/w=
ci/tomcat/TC6ServletContainerContext.java
   components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/w=
ci/tomcat/TC7ContainerServlet.java
   components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/w=
ci/tomcat/TC7ServletContainerContext.java
Log:
Renamed off-switch init param and consistently renamed fields and methods +=
 applied off-switch to  JB6, and TC7

Modified: components/wci/branches/logout/jboss/jboss6/src/main/java/org/gat=
ein/wci/jboss/JB6ContainerServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wc=
i/jboss/JB6ContainerServlet.java	2011-03-11 10:58:08 UTC (rev 6008)
+++ components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wc=
i/jboss/JB6ContainerServlet.java	2011-03-11 14:27:41 UTC (rev 6009)
@@ -29,6 +29,8 @@
 import org.apache.catalina.ContainerServlet;
 import org.apache.catalina.Engine;
 import org.apache.catalina.Wrapper;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
 =

 /**
  * @author <a href=3D"mailto:mwringe(a)redhat.com">Matt Wringe</a>
@@ -36,6 +38,11 @@
  */
 public class JB6ContainerServlet extends HttpServlet implements ContainerS=
ervlet
 {
+   private static final Logger log =3D LoggerFactory.getLogger(JB6Containe=
rServlet.class);
+
+   /** Servlet context init parameter name that can be used to turn off cr=
oss-context logout */
+   private static final String CROSS_CONTEXT_LOGOUT_KEY =3D "org.gatein.wc=
i.cross_context_logout";
+
    /** . */
    private Wrapper wrapper;
 =

@@ -107,6 +114,7 @@
          {
             Engine engine =3D (Engine) container;
             containerContext =3D new JB6ServletContainerContext(engine);
+            containerContext.setCrossContextLogout(getCrossContextLogoutCo=
nfig());
             containerContext.start();
             break;
          }
@@ -123,4 +131,21 @@
          containerContext =3D null;
       }
    }
+
+   private boolean getCrossContextLogoutConfig()
+   {
+      String val =3D getServletContext().getInitParameter(CROSS_CONTEXT_LO=
GOUT_KEY);
+      if (val =3D=3D null || Boolean.valueOf(val))
+      {
+         return true;
+      }
+
+      if (!"false".equalsIgnoreCase(val))
+      {
+         log.warn("Context init param " + CROSS_CONTEXT_LOGOUT_KEY + " val=
ue is invalid: " + val + " - falling back to: false");
+      }
+
+      log.info("Cross-context session invalidation on logout disabled");
+      return false;
+   }
 }

Modified: components/wci/branches/logout/jboss/jboss6/src/main/java/org/gat=
ein/wci/jboss/JB6ServletContainerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wc=
i/jboss/JB6ServletContainerContext.java	2011-03-11 10:58:08 UTC (rev 6008)
+++ components/wci/branches/logout/jboss/jboss6/src/main/java/org/gatein/wc=
i/jboss/JB6ServletContainerContext.java	2011-03-11 14:27:41 UTC (rev 6009)
@@ -78,6 +78,9 @@
    /** . */
    private Registration registration;
 =

+   /** Perform cross-context session invalidation on logout, or not */
+   private boolean crossContextLogout =3D true;
+
    public JB6ServletContainerContext(Engine engine)
    {
       this.engine =3D engine;
@@ -99,6 +102,11 @@
       this.registration =3D null;
    }
 =

+   public void setCrossContextLogout(boolean val)
+   {
+      crossContextLogout =3D val;
+   }
+
    public void login(HttpServletRequest request, HttpServletResponse respo=
nse, Credentials credentials, long validityMillis) throws ServletException,=
 IOException
    {
       login(request, response, credentials, validityMillis, null);
@@ -142,8 +150,10 @@
       if (sess =3D=3D null)
          return;
 =

+      if (!crossContextLogout)
+         return;
+
       final String sessId =3D sess.getId();
-
       DefaultServletContainerFactory.getInstance().getServletContainer().v=
isit(new ServletContainerVisitor()
       {
          public void accept(WebApp webApp)

Modified: components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/g=
atein/wci/tomcat/TC6ContainerServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/=
wci/tomcat/TC6ContainerServlet.java	2011-03-11 10:58:08 UTC (rev 6008)
+++ components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/=
wci/tomcat/TC6ContainerServlet.java	2011-03-11 14:27:41 UTC (rev 6009)
@@ -40,7 +40,8 @@
 {
    private static final Logger log =3D LoggerFactory.getLogger(TC6Containe=
rServlet.class);
 =

-   private static final String INVALIDATE_SESSION_IN_ALL_CTX =3D "org.gate=
in.invalidate_session_in_all_ctx";
+   /** Servlet context init parameter name that can be used to turn off cr=
oss-context logout */
+   private static final String CROSS_CONTEXT_LOGOUT_KEY =3D "org.gatein.wc=
i.cross_context_logout";
 =

    /** . */
    private Wrapper wrapper;
@@ -113,7 +114,7 @@
          {
             Engine engine =3D (Engine)container;
             containerContext =3D new TC6ServletContainerContext(engine);
-            containerContext.setInvalidateSessionInAllContexts(getInvalida=
teSessionInAllContextsConfig());
+            containerContext.setCrossContextLogout(getCrossContextLogoutCo=
nfig());
             containerContext.start();
             break;
          }
@@ -131,13 +132,13 @@
       }
    }
 =

-    public boolean getInvalidateSessionInAllContextsConfig() {
-       String val =3D getServletContext().getInitParameter(INVALIDATE_SESS=
ION_IN_ALL_CTX);
+    private boolean getCrossContextLogoutConfig() {
+       String val =3D getServletContext().getInitParameter(CROSS_CONTEXT_L=
OGOUT_KEY);
        if (val =3D=3D null || Boolean.valueOf(val))
           return true;
 =

        if (!"false".equalsIgnoreCase(val))
-          log.warn("Context init param " + INVALIDATE_SESSION_IN_ALL_CTX +=
 " value is invalid: " + val + " - falling back to: false");
+          log.warn("Context init param " + CROSS_CONTEXT_LOGOUT_KEY + " va=
lue is invalid: " + val + " - falling back to: false");
 =

        log.info("Cross-context session invalidation on logout disabled");
        return false;

Modified: components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/g=
atein/wci/tomcat/TC6ServletContainerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/=
wci/tomcat/TC6ServletContainerContext.java	2011-03-11 10:58:08 UTC (rev 600=
8)
+++ components/wci/branches/logout/tomcat/tomcat6/src/main/java/org/gatein/=
wci/tomcat/TC6ServletContainerContext.java	2011-03-11 14:27:41 UTC (rev 600=
9)
@@ -78,8 +78,8 @@
    /** . */
    private Registration registration;
 =

-   /** perform cross context session invalidation on logout, or not */
-   private boolean invalidateSessionInAllCtx =3D true;
+   /** Perform cross-context session invalidation on logout, or not */
+   private boolean crossContextLogout =3D true;
 =

    /** . */
    private GenericAuthentication authentication =3D new GenericAuthenticat=
ion();
@@ -109,6 +109,11 @@
       this.registration =3D null;
    }
 =

+   public void setCrossContextLogout(boolean val)
+   {
+      crossContextLogout =3D val;
+   }
+
    public void login(HttpServletRequest request, HttpServletResponse respo=
nse, Credentials credentials, long validityMillis) throws IOException
    {
       authentication.login(credentials, request, response, validityMillis);
@@ -128,7 +133,7 @@
 =

       sess.invalidate();
 =

-      if (!invalidateSessionInAllCtx)
+      if (!crossContextLogout)
          return;
 =

       final String sessId =3D sess.getId();
@@ -352,8 +357,4 @@
          e.printStackTrace();
       }
    }
-
-   public void setInvalidateSessionInAllContexts(boolean val) {
-      invalidateSessionInAllCtx =3D val;
-   }
 }

Modified: components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/g=
atein/wci/tomcat/TC7ContainerServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/=
wci/tomcat/TC7ContainerServlet.java	2011-03-11 10:58:08 UTC (rev 6008)
+++ components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/=
wci/tomcat/TC7ContainerServlet.java	2011-03-11 14:27:41 UTC (rev 6009)
@@ -26,6 +26,8 @@
 import org.apache.catalina.ContainerServlet;
 import org.apache.catalina.Engine;
 import org.apache.catalina.Wrapper;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
 =

 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -36,7 +38,11 @@
  */
 public class TC7ContainerServlet extends HttpServlet implements ContainerS=
ervlet
 {
+   private static final Logger log =3D LoggerFactory.getLogger(TC7Containe=
rServlet.class);
 =

+   /** Servlet context init parameter name that can be used to turn off cr=
oss-context logout */
+   private static final String CROSS_CONTEXT_LOGOUT_KEY =3D "org.gatein.wc=
i.cross_context_logout";
+
    /** . */
    private Wrapper wrapper;
 =

@@ -108,6 +114,7 @@
          {
             Engine engine =3D (Engine)container;
             containerContext =3D new TC7ServletContainerContext(engine);
+            containerContext.setCrossContextLogout(getCrossContextLogoutCo=
nfig());
             containerContext.start();
             break;
          }
@@ -124,4 +131,16 @@
          containerContext =3D null;
       }
    }
+
+   private boolean getCrossContextLogoutConfig() {
+      String val =3D getServletContext().getInitParameter(CROSS_CONTEXT_LO=
GOUT_KEY);
+      if (val =3D=3D null || Boolean.valueOf(val))
+         return true;
+
+      if (!"false".equalsIgnoreCase(val))
+         log.warn("Context init param " + CROSS_CONTEXT_LOGOUT_KEY + " val=
ue is invalid: " + val + " - falling back to: false");
+
+      log.info("Cross-context session invalidation on logout disabled");
+      return false;
+   }
 }

Modified: components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/g=
atein/wci/tomcat/TC7ServletContainerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/=
wci/tomcat/TC7ServletContainerContext.java	2011-03-11 10:58:08 UTC (rev 600=
8)
+++ components/wci/branches/logout/tomcat/tomcat7/src/main/java/org/gatein/=
wci/tomcat/TC7ServletContainerContext.java	2011-03-11 14:27:41 UTC (rev 600=
9)
@@ -81,6 +81,9 @@
    /** . */
    private Registration registration;
 =

+   /** Perform cross-context session invalidation on logout, or not */
+   private boolean crossContextLogout =3D true;
+
    public TC7ServletContainerContext(Engine engine)
    {
       this.engine =3D engine;
@@ -106,6 +109,11 @@
       this.registration =3D null;
    }
 =

+   public void setCrossContextLogout(boolean val)
+   {
+      crossContextLogout =3D val;
+   }
+
    public void login(HttpServletRequest request, HttpServletResponse respo=
nse, Credentials credentials, long validityMillis) throws ServletException,=
 IOException
    {
       login(request, response, credentials, validityMillis, null);
@@ -146,8 +154,10 @@
       if (sess =3D=3D null)
          return;
 =

+      if (!crossContextLogout)
+         return;
+
       final String sessId =3D sess.getId();
-
       DefaultServletContainerFactory.getInstance().getServletContainer().v=
isit(new ServletContainerVisitor()
       {
          public void accept(WebApp webApp)


--===============6755697965014935210==--