[java-identity-provider COMMIT] in /trunk: idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeLoginActi...

[noreply at shibboleth.net]

Author: serac
Date: Tue Nov 11 14:03:24 2014
New Revision: 6879

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6879&view=rev
Log:
Use InitializeProfileRequestContext action to set up PRC.

Modified:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeLoginAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeProxyAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeValidateAction.java
    trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/common-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/samlValidate/samlValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/serviceValidate/serviceValidate-flow.xml

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeLoginAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeLoginAction.java?rev=6879&r1=6878&r2=6879&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeLoginAction.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeLoginAction.java Tue Nov 11 14:03:24 2014
@@ -17,8 +17,11 @@
 
 package net.shibboleth.idp.cas.flow;
 
-import net.shibboleth.idp.cas.config.LoginConfiguration;
-import net.shibboleth.idp.cas.protocol.*;
+import net.shibboleth.idp.cas.protocol.ProtocolError;
+import net.shibboleth.idp.cas.protocol.ProtocolParam;
+import net.shibboleth.idp.cas.protocol.SamlParam;
+import net.shibboleth.idp.cas.protocol.ServiceTicketRequest;
+import net.shibboleth.idp.cas.protocol.ServiceTicketResponse;
 import net.shibboleth.idp.profile.ActionSupport;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.springframework.webflow.core.collection.ParameterMap;
@@ -43,8 +46,6 @@
     protected Event doExecute(
             final @Nonnull RequestContext springRequestContext,
             final @Nonnull ProfileRequestContext profileRequestContext) {
-
-        profileRequestContext.setProfileId(LoginConfiguration.PROFILE_ID);
 
         final ParameterMap params = springRequestContext.getRequestParameters();
         String service = params.get(ProtocolParam.Service.id());

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeProxyAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeProxyAction.java?rev=6879&r1=6878&r2=6879&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeProxyAction.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeProxyAction.java Tue Nov 11 14:03:24 2014
@@ -17,7 +17,6 @@
 
 package net.shibboleth.idp.cas.flow;
 
-import net.shibboleth.idp.cas.config.ProxyConfiguration;
 import net.shibboleth.idp.cas.protocol.ProtocolError;
 import net.shibboleth.idp.cas.protocol.ProtocolParam;
 import net.shibboleth.idp.cas.protocol.ProxyTicketRequest;
@@ -74,8 +73,6 @@
             final @Nonnull RequestContext springRequestContext,
             final @Nonnull ProfileRequestContext profileRequestContext) {
 
-        profileRequestContext.setProfileId(ProxyConfiguration.PROFILE_ID);
-
         final ParameterMap params = springRequestContext.getRequestParameters();
         final String service = params.get(ProtocolParam.TargetService.id());
         if (service == null) {

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeValidateAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeValidateAction.java?rev=6879&r1=6878&r2=6879&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeValidateAction.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/InitializeValidateAction.java Tue Nov 11 14:03:24 2014
@@ -17,14 +17,11 @@
 
 package net.shibboleth.idp.cas.flow;
 
-import net.shibboleth.idp.cas.config.ValidateConfiguration;
 import net.shibboleth.idp.cas.protocol.ProtocolError;
 import net.shibboleth.idp.cas.protocol.ProtocolParam;
 import net.shibboleth.idp.cas.protocol.TicketValidationRequest;

[... 181 lines stripped ...]