[java-identity-provider COMMIT] in /trunk: idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAc...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jul 17 13:09:20 2013
New Revision: 4587

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4587&view=rev
Log:
Extend wrappers to handle AttributeMap-based EventContext.

Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WebFlowMessageHandlerAdaptor.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java?rev=4587&r1=4586&r2=4587&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java Wed Jul 17 13:09:20 2013
@@ -34,9 +34,9 @@
 import org.opensaml.profile.action.ProfileAction;
 import org.opensaml.profile.context.EventContext;
 import org.opensaml.profile.context.ProfileRequestContext;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.webflow.core.collection.AttributeMap;
 import org.springframework.webflow.execution.Action;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.RequestContext;
@@ -242,6 +242,9 @@
                 return (Event) eventCtx.getEvent();
             } else if (eventCtx.getEvent() instanceof String) {
                 return ActionSupport.buildEvent(action, (String) eventCtx.getEvent());
+            } else if (eventCtx.getEvent() instanceof AttributeMap) {
+                AttributeMap map = (AttributeMap) eventCtx.getEvent();
+                return ActionSupport.buildEvent(action, map.getString("eventId", EventIds.PROCEED_EVENT_ID), map); 
             } else {
                 return null;
             }

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WebFlowMessageHandlerAdaptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WebFlowMessageHandlerAdaptor.java?rev=4587&r1=4586&r2=4587&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WebFlowMessageHandlerAdaptor.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WebFlowMessageHandlerAdaptor.java Wed Jul 17 13:09:20 2013
@@ -32,6 +32,7 @@
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.webflow.core.collection.AttributeMap;
 import org.springframework.webflow.execution.Action;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.RequestContext;
@@ -164,6 +165,10 @@
                 return (Event) eventCtx.getEvent();
             } else if (eventCtx.getEvent() instanceof String) {
                 return ActionSupport.buildEvent(messageHandler, (String) eventCtx.getEvent());
+            } else if (eventCtx.getEvent() instanceof AttributeMap) {
+                AttributeMap map = (AttributeMap) eventCtx.getEvent();
+                return ActionSupport.buildEvent(
+                        messageHandler, map.getString("eventId", EventIds.PROCEED_EVENT_ID), map); 
             } else {
                 return null;
             }