[jboss-cvs] JBossAS SVN: r107988 - in branches/infinispan-int: tomcat/src/main/java/org/jboss/web/tomcat/service/sso and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: smarlow at redhat.com
Date: 2010-09-04 11:25:18 -0400 (Sat, 04 Sep 2010)
New Revision: 107988

Modified:
   branches/infinispan-int/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java
   branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java
Log:
sso unit test improvement and change to set SSO configuration

Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java	2010-09-04 03:51:17 UTC (rev 107987)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/web/test/SSOBaseCase.java	2010-09-04 15:25:18 UTC (rev 107988)
@@ -167,7 +167,7 @@
       GetMethod war2Index = new GetMethod(url);
       int responseCode = httpConn.executeMethod(war2Index.getHostConfiguration(),
          war2Index, httpConn.getState());
-      assertTrue("Get OK", responseCode == HttpURLConnection.HTTP_OK);
+      assertTrue("expected response code == OK but got " + responseCode+" for request=" + url, responseCode == HttpURLConnection.HTTP_OK);
       String body = war2Index.getResponseBodyAsString();
       if( body.indexOf("j_security_check") > 0 )
          fail("get of " + url + " redirected to login page");
@@ -201,8 +201,8 @@
       GetMethod indexGet = new GetMethod(url);
       int responseCode = httpConn.executeMethod(indexGet);
       String body = indexGet.getResponseBodyAsString();
-      assertTrue("Get OK", responseCode == HttpURLConnection.HTTP_OK);
-      assertTrue("Redirected to login page", body.indexOf("j_security_check") > 0 );
+      assertTrue("Expected response code ==  OK but got "+responseCode+" for request=" + url, responseCode == HttpURLConnection.HTTP_OK);
+      assertTrue("Redirected to login page ("+body+")", body.indexOf("j_security_check") > 0 );
    }
 
    public static String processSSOCookie(HttpState state, String serverA, String serverB)

Modified: branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java
===================================================================
--- branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java	2010-09-04 03:51:17 UTC (rev 107987)
+++ branches/infinispan-int/tomcat/src/main/java/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java	2010-09-04 15:25:18 UTC (rev 107988)
@@ -45,6 +45,7 @@
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.session.ManagerBase;
 import org.apache.tomcat.util.modeler.Registry;
+import org.jboss.logging.Logger;
 import org.jboss.web.tomcat.service.session.JBossManager;
 import org.jboss.web.tomcat.service.sso.spi.FullyQualifiedSessionId;
 import org.jboss.web.tomcat.service.sso.spi.SSOClusterManager;
@@ -83,7 +84,9 @@
    /** The default JBoss Cache to use for storing SSO entries */
    public static final String DEFAULT_CACHE_NAME = "clustered-sso";
    public static final String LEGACY_CACHE_NAME = "jboss.cache:service=TomcatClusteringCache";
-   
+   /** for use when there is no container logger to use **/
+   private static final Logger ALTERNATE_LOG = Logger.getLogger(ClusteredSingleSignOn.class);
+
    // Override the superclass value
    static
    {
@@ -414,6 +417,11 @@
             (sm.getString("authenticator.alreadyStarted"));
       }
 
+      if (ALTERNATE_LOG.isDebugEnabled())
+      {
+         ALTERNATE_LOG.debug("ClusteredSSO:  starting, clusterManagerClass=" + this.clusterManagerClass);
+      }
+
       // Attempt to create an SSOClusterManager
       createClusterManager(this.clusterManagerClass);
 
@@ -432,8 +440,8 @@
          }
          catch (Exception e)
          {
-            throw new LifecycleException("Caught exception stopping " + 
-                  ssoClusterManager.getClass().getSimpleName(), e);
+            throw new LifecycleException("Caught exception starting " + 
+                  this.clusterManagerClass, e);
          }
       }
 
@@ -1291,9 +1299,10 @@
          {
             throw new LifecycleException("No service provider found: " + SSOClusterManager.class.getName());
          }
-
-         this.ssoClusterManager = managers.next();
-         this.clusterManagerClass = this.ssoClusterManager.getClass().getName();
+         SSOClusterManager mgr = managers.next();
+         mgr.setSSOLocalManager(this);
+         ssoClusterManager = mgr;
+         clusterManagerClass = this.ssoClusterManager.getClass().getName();
       }
 
       if (started)