[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/cas: cas-abstract-beans.xml login/...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 25 11:04:45 2016
New Revision: 8541

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8541&view=rev
Log:
IDP-1060 - Adding hook for MetricContext to CAS flows

https://issues.shibboleth.net/jira/browse/IDP-1060

Modified:
    trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-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
    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
    trunk/idp-conf/src/main/resources/system/flows/cas/validate-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/validate/validate-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.xml?rev=8541&r1=8540&r2=8541&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.xml	Tue Oct 25 11:04:45 2016
@@ -21,6 +21,10 @@
 
     <!-- These are beans that are common to all CAS protocol flows. -->
 
+    <bean id="PopulateMetricContext"
+        class="org.opensaml.profile.action.impl.PopulateMetricContext" scope="prototype"
+        p:metricStrategy="#{getObject('shibboleth.metrics.MetricStrategy')}" />
+        
     <bean id="BuildRelyingPartyContext"
           class="net.shibboleth.idp.cas.flow.impl.BuildRelyingPartyContextAction"
           c:registry-ref="shibboleth.CASServiceRegistry"/>

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=8541&r1=8540&r2=8541&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	Tue Oct 25 11:04:45 2016
@@ -10,6 +10,7 @@
             <evaluate result="flowScope.hasAuthenticationContext" expression="false" />
         </on-entry>
         <evaluate expression="InitializeProfileRequestContext"/>
+        <evaluate expression="PopulateMetricContext" />
         <evaluate expression="InitializeLogin" />
         <evaluate expression="PopulateClientStorageLoadContext" />
         <evaluate expression="'proceed'" />

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=8541&r1=8540&r2=8541&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml	Tue Oct 25 11:04:45 2016
@@ -11,6 +11,7 @@
 
     <action-state id="InitializeProxy">
         <evaluate expression="InitializeProfileRequestContext"/>
+        <evaluate expression="PopulateMetricContext" />
         <evaluate expression="InitializeProxy" />
         <evaluate expression="BuildRelyingPartyContext" />
         <evaluate expression="BuildSAMLMetadataContext" />

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-flow.xml?rev=8541&r1=8540&r2=8541&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-flow.xml	Tue Oct 25 11:04:45 2016
@@ -8,6 +8,7 @@
     <!-- Bootstrap action has to be at the "top" of the flow after this flow prepends itself to parent. -->
     <action-state id="InitializeValidate">
         <evaluate expression="InitializeProfileRequestContext"/>
+        <evaluate expression="PopulateMetricContext" />
         <evaluate expression="InitializeValidate" />
         <evaluate expression="'proceed'" />
         <transition on="proceed" to="InitializeRelyingParty" />

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

[... 57 lines stripped ...]