[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/utilities.xml idp-conf/src/main/re...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep  8 18:00:57 2014
New Revision: 6508

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6508&view=rev
Log:
IDP-224 - Add RPUI information to logout flows/view

Modified:
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
    trunk/idp-conf/src/main/resources/views/logout.vm
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=6508&r1=6507&r2=6508&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Mon Sep  8 18:00:57 2014
@@ -31,6 +31,9 @@
     <bean id="shibboleth.ChildLookup.RelyingParty"
         class="org.opensaml.messaging.context.navigate.ChildContextLookup"
         c:type="#{ T(net.shibboleth.idp.profile.context.RelyingPartyContext) }" />
+    <bean id="shibboleth.ChildLookup.MultiRelyingParty"
+        class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+        c:type="#{ T(net.shibboleth.idp.profile.context.MultiRelyingPartyContext) }" />
         
     <bean id="shibboleth.ChildLookup.SecurityParameters"
         class="org.opensaml.messaging.context.navigate.ChildContextLookup"
@@ -50,6 +53,10 @@
     <bean id="shibboleth.ChildLookupOrCreate.AttributeFilterContext"
         class="org.opensaml.messaging.context.navigate.ChildContextLookup"
         c:type="#{ T(net.shibboleth.idp.attribute.filter.context.AttributeFilterContext) }"
+        c:createContext="true" />
+    <bean id="shibboleth.ChildLookupOrCreate.RelyingPartyUIContext"
+        class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+        c:type="#{ T(net.shibboleth.idp.ui.context.RelyingPartyUIContext) }"
         c:createContext="true" />
 
     <bean id="shibboleth.ChildLookup.AuthenticationContext"
@@ -71,6 +78,9 @@
     <bean id="shibboleth.ChildLookup.SAMLPeerEntityContext"
         class="org.opensaml.messaging.context.navigate.ChildContextLookup"
         c:type="#{ T(org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext) }" />
+    <bean id="shibboleth.ChildLookup.SAMLMetadataContext"
+        class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+        c:type="#{ T(org.opensaml.saml.common.messaging.context.SAMLMetadataContext) }" />
     <bean id="shibboleth.ChildLookupOrCreate.SAMLMessageInfoContext"
         class="org.opensaml.messaging.context.navigate.ChildContextLookup"
         c:type="#{ T(org.opensaml.saml.common.messaging.context.SAMLMessageInfoContext) }"

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml?rev=6508&r1=6507&r2=6508&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml Mon Sep  8 18:00:57 2014
@@ -44,6 +44,46 @@
         p:activationCondition="%{idp.logout.elaboration:false}"
         p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"
         p:sessionTypeProtocolMap-ref="shibboleth.SessionTypeProtocolMap" />
+        
+    <bean id="SetRPUIInformation"
+            class="net.shibboleth.idp.ui.context.SetRPUIInformation" scope="prototype"
+            p:activationCondition="%{idp.logout.elaboration:false}"
+            p:httpServletRequest-ref="shibboleth.HttpServletRequest">
+        <property name="metadataContextLookupStrategy">
+            <bean class="com.google.common.base.Functions" factory-method="compose">
+                <constructor-arg name="g">
+                    <bean class="com.google.common.base.Functions" factory-method="compose">
+                        <constructor-arg name="g">
+                            <ref bean="shibboleth.ChildLookup.SAMLMetadataContext" />
+                        </constructor-arg>
+                        <constructor-arg name="f">
+                            <bean class="net.shibboleth.idp.profile.context.navigate.RelyingPartyContextLookupByCurrent" />
+                        </constructor-arg>
+                    </bean>
+                </constructor-arg>
+                <constructor-arg name="f">
+                    <ref bean="shibboleth.ChildLookup.MultiRelyingParty" />
+                </constructor-arg>
+            </bean>
+        </property>

[... 263 lines stripped ...]