[jboss-cvs] Picketlink SVN: r321 - federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation.

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

Author: marcelkolsteren
Date: 2010-06-30 17:40:43 -0400 (Wed, 30 Jun 2010)
New Revision: 321

Modified:
   federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/OpenIdPrincipal.java
   federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/OpenIdSingleLoginReceiver.java
Log:
fix for PLFED-40: Seam module: attributes in OpenIdPrincipal has wrong type

Modified: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/OpenIdPrincipal.java
===================================================================
--- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/OpenIdPrincipal.java	2010-06-30 21:29:21 UTC (rev 320)
+++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/OpenIdPrincipal.java	2010-06-30 21:40:43 UTC (rev 321)
@@ -23,6 +23,7 @@
 
 import java.net.URL;
 import java.security.Principal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -35,9 +36,9 @@
 
    private URL openIdProvider;
 
-   private Map<String, String> attributes;
+   private Map<String, List<String>> attributes;
 
-   public OpenIdPrincipal(String identifier, URL openIdProvider, Map<String, String> attributes)
+   public OpenIdPrincipal(String identifier, URL openIdProvider, Map<String, List<String>> attributes)
    {
       super();
       this.identifier = identifier;
@@ -60,7 +61,7 @@
       return openIdProvider;
    }
 
-   public Map<String, String> getAttributes()
+   public Map<String, List<String>> getAttributes()
    {
       return attributes;
    }

Modified: federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/OpenIdSingleLoginReceiver.java
===================================================================
--- federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/OpenIdSingleLoginReceiver.java	2010-06-30 21:29:21 UTC (rev 320)
+++ federation/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/OpenIdSingleLoginReceiver.java	2010-06-30 21:40:43 UTC (rev 321)
@@ -23,6 +23,7 @@
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.List;
 import java.util.Map;
 
 import javax.security.auth.login.LoginException;
@@ -99,7 +100,7 @@
          {
             AuthSuccess authSuccess = (AuthSuccess) verification.getAuthResponse();
 
-            Map<String, String> attributes = null;
+            Map<String, List<String>> attributes = null;
             if (authSuccess.hasExtension(AxMessage.OPENID_NS_AX))
             {
                FetchResponse fetchResp = (FetchResponse) authSuccess.getExtension(AxMessage.OPENID_NS_AX);
@@ -141,7 +142,7 @@
 
    }
 
-   private OpenIdPrincipal createPrincipal(String identifier, URL openIdProvider, Map<String, String> attributes)
+   private OpenIdPrincipal createPrincipal(String identifier, URL openIdProvider, Map<String, List<String>> attributes)
    {
       return new OpenIdPrincipal(identifier, openIdProvider, attributes);
    }