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

[noreply at shibboleth.net]

Author: serac
Date: Wed Nov  5 20:10:52 2014
New Revision: 6849

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6849&view=rev
Log:
Add high-level CAS flow test.

Fix configuration problems revealed by tests.

Added:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/PublishProtocolMessageAction.java
      - copied, changed from r6843, trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/PublishProtocolResponseAction.java
    trunk/idp-conf/src/main/resources/system/flows/cas/common-beans.xml
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java
    trunk/idp-conf/src/test/resources/test/test-cas-beans.xml
    trunk/idp-conf/src/test/resources/test/test-relying-party-cas.xml
Modified:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ProcessSamlMessageAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/PublishProtocolResponseAction.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/PublishProtocolResponseActionTest.java
    trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
    trunk/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.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-beans.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-beans.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-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/serviceValidate/serviceValidate-flow.xml
    trunk/idp-conf/src/test/resources/logback-test.xml

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ProcessSamlMessageAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ProcessSamlMessageAction.java?rev=6849&r1=6848&r2=6849&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ProcessSamlMessageAction.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/ProcessSamlMessageAction.java Wed Nov  5 20:10:52 2014
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.cas.flow;
 
+import net.shibboleth.idp.cas.config.ValidateConfiguration;
 import net.shibboleth.idp.cas.protocol.*;
 import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.profile.ActionSupport;
@@ -50,6 +51,8 @@
     protected Event doExecute(
             final @Nonnull RequestContext springRequestContext,
             final @Nonnull ProfileRequestContext profileRequestContext) {
+
+        profileRequestContext.setProfileId(ValidateConfiguration.PROFILE_ID);
 
         final ParameterMap params = springRequestContext.getRequestParameters();
         final String service = params.get(SamlParam.TARGET.name());

Copied: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/PublishProtocolMessageAction.java (from r6843, trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/PublishProtocolResponseAction.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/PublishProtocolMessageAction.java?p2=trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/PublishProtocolMessageAction.java&p1=trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/PublishProtocolResponseAction.java&r1=6843&r2=6849&rev=6849&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/PublishProtocolResponseAction.java (original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/PublishProtocolMessageAction.java Wed Nov  5 20:10:52 2014
@@ -8,7 +8,7 @@
 import javax.annotation.Nonnull;
 
 /**
- * Action to publish the CAS protocol response message, i.e.
+ * Action to publish the CAS protocol request or response messages, i.e.
  * {@link net.shibboleth.idp.cas.protocol.ProtocolContext#getResponse()}, in Spring Webflow

[... 490 lines stripped ...]