[jboss-identity-commits] JBoss Identity SVN: r249 - in identity-federation/trunk/identity-bindings: src/main/java/org/jboss/identity/federation/bindings/tomcat/idp and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2009-01-26 01:23:15 -0500 (Mon, 26 Jan 2009)
New Revision: 249

Modified:
   identity-federation/trunk/identity-bindings/.classpath
   identity-federation/trunk/identity-bindings/pom.xml
   identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
Log:
use updated tomcat to get to the GenericPrincipal from catalina request

Modified: identity-federation/trunk/identity-bindings/.classpath
===================================================================
--- identity-federation/trunk/identity-bindings/.classpath	2009-01-26 04:20:00 UTC (rev 248)
+++ identity-federation/trunk/identity-bindings/.classpath	2009-01-26 06:23:15 UTC (rev 249)
@@ -5,12 +5,12 @@
 	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="M2_REPO/apache-tomcat/catalina/5.5.12/catalina-5.5.12.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/tomcat/catalina/6.0.18/catalina-6.0.18.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="var" path="M2_REPO/apache-tomcat/tomcat-util/5.5.12/tomcat-util-5.5.12.jar"/>
 	<classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/>
 	<classpathentry kind="var" path="M2_REPO/apache-modeler/commons-modeler/1.1patch/commons-modeler-1.1patch.jar"/>
-	<classpathentry kind="var" path="M2_REPO/apache-tomcat/tomcat-coyote/5.5.12/tomcat-coyote-5.5.12.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/tomcat/coyote/6.0.18/coyote-6.0.18.jar"/>
 	<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
 	<classpathentry kind="var" path="M2_REPO/apache-tomcat/tomcat-http/5.5.12/tomcat-http-5.5.12.jar"/>
 	<classpathentry kind="var" path="M2_REPO/apache-tomcat/naming-resources/5.5.12/naming-resources-5.5.12.jar"/>

Modified: identity-federation/trunk/identity-bindings/pom.xml
===================================================================
--- identity-federation/trunk/identity-bindings/pom.xml	2009-01-26 04:20:00 UTC (rev 248)
+++ identity-federation/trunk/identity-bindings/pom.xml	2009-01-26 06:23:15 UTC (rev 249)
@@ -59,14 +59,14 @@
          <version>2.4</version>
       </dependency>
       <dependency>
-         <groupId>apache-tomcat</groupId>
+         <groupId>org.apache.tomcat</groupId>
          <artifactId>catalina</artifactId>
-         <version>5.5.12</version>
+         <version>6.0.18</version>
       </dependency>
       <dependency>
-         <groupId>apache-tomcat</groupId>
-         <artifactId>tomcat-coyote</artifactId>
-         <version>5.5.12</version>
+         <groupId>org.apache.tomcat</groupId>
+         <artifactId>coyote</artifactId>
+         <version>6.0.18</version>
          <scope>test</scope>
       </dependency>
       <dependency>

Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java	2009-01-26 04:20:00 UTC (rev 248)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java	2009-01-26 06:23:15 UTC (rev 249)
@@ -87,7 +87,7 @@
       boolean containsSAMLRequestMessage = this.hasSAMLRequestMessage(request); 
       
       //Lets check if the user has been authenticated
-      Principal userPrincipal = request.getUserPrincipal();
+      Principal userPrincipal = request.getPrincipal();
       if(userPrincipal == null)
       {
          //Send it for user authentication
@@ -108,7 +108,7 @@
             } 
 
             //User is authenticated as we are on the return path
-            userPrincipal = request.getUserPrincipal();
+            userPrincipal = request.getPrincipal();
             if(userPrincipal != null)
             {
                //Send valid saml response after processing the request