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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Dec 18 22:06:42 2013
New Revision: 5060

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5060&view=rev
Log:
- Establish SAML 2 SSO profile ID when bootstrapping
- Add a default BrowserSSOProfileConfig to dummy RelyingParty
- Switch from mock profile config selection/lookup to "real" code

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml?rev=5060&r1=5059&r2=5060&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml Wed Dec 18 22:06:42 2013
@@ -24,7 +24,11 @@
     <bean id="LogSpringContextInfo" class="idp.LogSpringContextInfo" />
     -->
 
-    <bean id="InitializeProfileRequestContext" class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" />
+    <bean id="InitializeProfileRequestContext" class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext">
+        <property name="profileId">
+            <util:constant static-field="net.shibboleth.idp.saml.profile.config.saml2.BrowserSSOProfileConfiguration.PROFILE_ID" />
+        </property>
+    </bean>
     
     <bean id="inboundMessageHandlerChain" class="org.opensaml.messaging.handler.impl.BasicMessageHandlerChain" scope="prototype">
         <property name="handlers">
@@ -154,7 +158,7 @@
     
     <bean id="AddBasicMessageMetadataContext" class="idp.AddBasicMessageMetadataContext" />
     
-    <bean id="AddProfileConfiguration" class="idp.AddProfileConfiguration" />
+    <bean id="InitializeRelyingPartyContext" class="net.shibboleth.idp.profile.impl.InitializeRelyingPartyContext" />
             
     <bean id="CheckMandatoryIssuer" class="org.opensaml.profile.action.impl.CheckMandatoryIssuer" />
     
@@ -173,7 +177,13 @@
         <constructor-arg value="ActivatedRelyingPartyConfiguration" />
         <constructor-arg value="https://idp.example.org" />
         <constructor-arg>
-            <null />
+            <util:list>
+                <bean class="net.shibboleth.idp.saml.profile.config.saml2.BrowserSSOProfileConfiguration">
+                    <property name="securityConfiguration">
+                        <bean class="net.shibboleth.idp.profile.config.SecurityConfiguration" />
+                    </property>
+                </bean>
+            </util:list>
         </constructor-arg>
         <constructor-arg>
             <bean id="AlwaysTrueRelyingPartyPredicate" class="com.google.common.base.Predicates" factory-method="alwaysTrue" />
@@ -188,10 +198,12 @@
         </property>
     </bean>
 
-    <bean id="SelectRelyingPartyConfiguration" class="net.shibboleth.idp.profile.impl.SelectRelyingPartyConfiguration">
+    <bean id="SelectRelyingPartyConfiguration" class="net.shibboleth.idp.profile.impl.SelectRelyingPartyConfiguration" scope="prototype">
         <constructor-arg ref="ConditionalRelyingPartyConfigurationResolver" />
     </bean>
 
+    <bean id="SelectProfileConfiguration" class="net.shibboleth.idp.profile.impl.SelectProfileConfiguration" scope="prototype"/>
+
     <bean id="AddAttributeStatementToAssertion" class="net.shibboleth.idp.saml.impl.profile.saml2.AddAttributeStatementToAssertion" />
     
     <bean id="AddAttributeRecipientContext" class="idp.AddAttributeRecipientContext" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml?rev=5060&r1=5059&r2=5060&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml Wed Dec 18 22:06:42 2013
@@ -37,19 +37,19 @@
           
     <action-state id="CheckMandatoryIssuer">
         <evaluate expression="CheckMandatoryIssuer" />
-        <transition on="proceed" to="AddProfileConfiguration" />
+        <transition on="proceed" to="SelectRelyingPartyConfiguration" />
     </action-state>
     
-    <action-state id="AddProfileConfiguration">
-        <evaluate expression="AddProfileConfiguration" />
-        <transition on="proceed" to="SelectRelyingPartyConfiguration"/>
+    <action-state id="SelectRelyingPartyConfiguration">
+        <evaluate expression="SelectRelyingPartyConfiguration" />
+        <transition on="proceed" to="SelectProfileConfiguration"/>
     </action-state>
     
-   <action-state id="SelectRelyingPartyConfiguration">
-        <evaluate expression="SelectRelyingPartyConfiguration" />

[... 10 lines stripped ...]