[jboss-cvs] Picketlink SVN: r655 - in federation/trunk: picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2011-01-26 13:45:55 -0500 (Wed, 26 Jan 2011)
New Revision: 655

Modified:
   federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/openid/OpenIDManager.java
   federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/OpenIDConsumerServlet.java
Log:
add setUserString

Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/openid/OpenIDManager.java
===================================================================
--- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/openid/OpenIDManager.java	2011-01-26 18:44:46 UTC (rev 654)
+++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/openid/OpenIDManager.java	2011-01-26 18:45:55 UTC (rev 655)
@@ -25,14 +25,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.picketlink.identity.federation.api.openid.OpenIDLifecycleEvent.OP;
-import org.picketlink.identity.federation.api.openid.OpenIDLifecycleEvent.TYPE;
-import org.picketlink.identity.federation.api.openid.exceptions.OpenIDAssociationException;
-import org.picketlink.identity.federation.api.openid.exceptions.OpenIDConsumerException;
-import org.picketlink.identity.federation.api.openid.exceptions.OpenIDDiscoveryException;
-import org.picketlink.identity.federation.api.openid.exceptions.OpenIDLifeCycleException;
-import org.picketlink.identity.federation.api.openid.exceptions.OpenIDMessageException;
-import org.picketlink.identity.federation.api.openid.exceptions.OpenIDProtocolException;
 import org.openid4java.association.AssociationException;
 import org.openid4java.consumer.ConsumerException;
 import org.openid4java.consumer.ConsumerManager;
@@ -48,6 +40,14 @@
 import org.openid4java.message.ParameterList;
 import org.openid4java.message.ax.FetchRequest;
 import org.openid4java.message.sreg.SRegRequest;
+import org.picketlink.identity.federation.api.openid.OpenIDLifecycleEvent.OP;
+import org.picketlink.identity.federation.api.openid.OpenIDLifecycleEvent.TYPE;
+import org.picketlink.identity.federation.api.openid.exceptions.OpenIDAssociationException;
+import org.picketlink.identity.federation.api.openid.exceptions.OpenIDConsumerException;
+import org.picketlink.identity.federation.api.openid.exceptions.OpenIDDiscoveryException;
+import org.picketlink.identity.federation.api.openid.exceptions.OpenIDLifeCycleException;
+import org.picketlink.identity.federation.api.openid.exceptions.OpenIDMessageException;
+import org.picketlink.identity.federation.api.openid.exceptions.OpenIDProtocolException;
 
 /**
  * OpenID Manager for consumers
@@ -87,6 +87,7 @@
          consumerManager = new ConsumerManager(); 
          consumerManager.setAssociations(new InMemoryConsumerAssociationStore());
          consumerManager.setNonceVerifier(new InMemoryNonceVerifier(5000));
+         
          userString = request.getURL(); 
       }
       catch(ConsumerException ce)
@@ -96,6 +97,15 @@
    }
    
    /**
+    * Set the user string
+    * @param userString
+    */
+   public void setUserString(String userString)
+   {
+      this.userString = userString;
+   }
+
+   /**
     * Get the OpenID Request
     * @return
     */

Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/OpenIDConsumerServlet.java
===================================================================
--- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/OpenIDConsumerServlet.java	2011-01-26 18:44:46 UTC (rev 654)
+++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/OpenIDConsumerServlet.java	2011-01-26 18:45:55 UTC (rev 655)
@@ -79,6 +79,7 @@
          manager = new OpenIDManager(openIDReq);
          session.setAttribute("openid_manager", manager); 
       }
+      manager.setUserString( userEntry );
       
       try
       {