[jboss-cvs] Picketlink SVN: r641 - in federation/trunk/picketlink-web/src: test/resources/openid/webapp and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2011-01-20 14:38:20 -0500 (Thu, 20 Jan 2011)
New Revision: 641

Modified:
   federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/OpenIDProviderServlet.java
   federation/trunk/picketlink-web/src/test/resources/openid/webapp/securepage.jsp
Log:
openid cleanup

Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/OpenIDProviderServlet.java
===================================================================
--- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/OpenIDProviderServlet.java	2011-01-20 19:13:23 UTC (rev 640)
+++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/OpenIDProviderServlet.java	2011-01-20 19:38:20 UTC (rev 641)
@@ -130,8 +130,7 @@
                
                responsem = protoCtx.getResponseMessage();
                
-               // --- process an association request ---
-               /*responsem = serverManager.processAssociationRequest(requestp);*/
+               // --- process an association request --- 
                responseText = responsem.getResponseText();
             }
             else if ("checkid_setup".equals(mode)
@@ -176,6 +175,7 @@
                   
                   try
                   {
+                     // --- process an authentication request ---
                      sts.issueToken(protoCtx);
                   }
                   catch (ProcessingException e)
@@ -183,12 +183,6 @@
                      throw new ServletException( e );
                   }
                   
-                  /*// --- process an authentication request ---
-                  responsem = serverManager.processAuthenticationRequest(requestp,
-                        userSelectedId,
-                        userSelectedClaimedId,
-                        authenticatedAndApproved.booleanValue());*/
-                  
                   responsem = protoCtx.getResponseMessage();
 
                   // caller will need to decide which of the following to use:
@@ -211,6 +205,7 @@
             {
                try
                {
+                  // --- processing a verification request ---
                   sts.validateToken( protoCtx );
                }
                catch (ProcessingException e)
@@ -219,9 +214,6 @@
                }
                responsem = protoCtx.getResponseMessage();
                
-               
-               // --- processing a verification request ---
-               //responsem = serverManager.verify(requestp);
                responseText = responsem.getResponseText();
             }
             else
@@ -230,6 +222,7 @@
                protoCtx.setErrorText( "Unknown request" );
                try
                {
+                  // --- error response ---
                   sts.issueToken(protoCtx);
                }
                catch (ProcessingException e)
@@ -238,8 +231,6 @@
                }
                responsem = protoCtx.getResponseMessage();
                
-               // --- error response ---
-               //responsem = serverManager.getDirectError("Unknown request");
                responseText = responsem.getResponseText();
             }
 

Modified: federation/trunk/picketlink-web/src/test/resources/openid/webapp/securepage.jsp
===================================================================
--- federation/trunk/picketlink-web/src/test/resources/openid/webapp/securepage.jsp	2011-01-20 19:13:23 UTC (rev 640)
+++ federation/trunk/picketlink-web/src/test/resources/openid/webapp/securepage.jsp	2011-01-20 19:38:20 UTC (rev 641)
@@ -1,9 +1,5 @@
 <%
- session.setAttribute("authenticatedAndApproved", Boolean.TRUE);
- if( request.getUserPrincipal() != null )
- {
-    session.setAttribute( "openid.claimed_id", request.getUserPrincipal().getName());
- }
+ session.setAttribute("authenticatedAndApproved", Boolean.TRUE); 
 %>