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

[noreply at shibboleth.net]

Author: serac
Date: Thu Nov 13 14:29:18 2014
New Revision: 6894

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6894&view=rev
Log:
Add support for CAS RP config activation by group name.

Added:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildSAMLMetadataContextAction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/ServiceEntityDescriptor.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/BuildSAMLMetadataContextActionTest.java
Modified:
    trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/common-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-flow.xml

Modified: trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml?rev=6894&r1=6893&r2=6894&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml (original)
+++ trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml Thu Nov 13 14:29:18 2014
@@ -91,6 +91,9 @@
           class="net.shibboleth.idp.cas.flow.BuildRelyingPartyContextAction"
           c:registry-ref="cas.serviceRegistry"/>
 
+    <bean id="buildSAMLMetadataContextAction"
+          class="net.shibboleth.idp.cas.flow.BuildSAMLMetadataContextAction" />
+
     <bean id="checkAuthenticationRequiredAction"
           class="net.shibboleth.idp.cas.flow.CheckAuthenticationRequiredAction" />
 

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml?rev=6894&r1=6893&r2=6894&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-flow.xml Thu Nov 13 14:29:18 2014
@@ -8,6 +8,7 @@
     <action-state id="initializeRelyingParty">
         <evaluate expression="publishProtocolRequestAction" />
         <evaluate expression="buildRelyingPartyContextAction" />
+        <evaluate expression="buildSAMLMetadataContextAction" />
         <evaluate expression="selectRelyingPartyConfiguration" />
         <evaluate expression="selectProfileConfiguration" />
         <evaluate expression="'proceed'" />

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/common-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/common-beans.xml?rev=6894&r1=6893&r2=6894&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/common-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/common-beans.xml Thu Nov 13 14:29:18 2014
@@ -18,6 +18,9 @@
     <bean id="buildRelyingPartyContextAction"
           class="net.shibboleth.idp.cas.flow.BuildRelyingPartyContextAction"
           c:registry-ref="cas.serviceRegistry"/>
+
+    <bean id="buildSAMLMetadataContextAction"
+          class="net.shibboleth.idp.cas.flow.BuildSAMLMetadataContextAction" />
 
     <bean id="publishProtocolRequestAction"
           class="net.shibboleth.idp.cas.flow.PublishProtocolMessageAction"

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml?rev=6894&r1=6893&r2=6894&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml Thu Nov 13 14:29:18 2014
@@ -9,6 +9,7 @@
         <evaluate expression="populateSessionContext"/>
         <evaluate expression="initializeLoginAction" />
         <evaluate expression="buildRelyingPartyContextAction" />
+        <evaluate expression="buildSAMLMetadataContextAction" />
         <evaluate expression="selectRelyingPartyConfiguration" />
         <evaluate expression="selectProfileConfiguration" />
         <evaluate expression="publishProtocolRequestAction" />

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml?rev=6894&r1=6893&r2=6894&view=diff
==============================================================================

[... 11 lines stripped ...]