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

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Jan 21 14:43:32 2014
New Revision: 5222

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5222&view=rev
Log:
More work on SAML1 flow. Experimenting with preferring c-namespace and p-namespace as well as XML new-line-per-attribute formatting.

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

Modified: trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml?rev=5222&r1=5221&r2=5222&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml Tue Jan 21 14:43:32 2014
@@ -1,26 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.2.xsd
+<beans
+    xmlns="http://www.springframework.org/schema/beans"
+    xmlns:c="http://www.springframework.org/schema/c"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:p="http://www.springframework.org/schema/p"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.2.xsd
                            http://www.springframework.org/schema/context classpath:/org/springframework/context/config/spring-context-3.2.xsd
                            http://www.springframework.org/schema/util classpath:/org/springframework/beans/factory/xml/spring-util-3.2.xsd"
-       default-init-method="initialize"
-       default-destroy-method="destroy">
+    default-init-method="initialize"
+    default-destroy-method="destroy">
 
     <context:property-placeholder location="file://${idp.home}/conf/idp.properties" />
-    
-    <!-- Note: Don't define DecodeMessage action here, that is defined in beans definition for concrete flow. -->
+
+    <!-- Note: The DecodeMessage action is defined in the non-abstract beans definition file. -->
 
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
-    <bean id="InitializeProfileRequestContext" class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext">
-        <property name="profileId">
-            <util:constant static-field="net.shibboleth.idp.saml.profile.config.saml1.BrowserSSOProfileConfiguration.PROFILE_ID" />
-        </property>
-    </bean>
-    
-    <bean id="RecordResponseComplete" class="net.shibboleth.idp.profile.impl.RecordResponseComplete" />
-    
-</beans>
+    <bean
+        id="InitializeProfileRequestContext"
+        class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext"
+        p:profileId="#{T(net.shibboleth.idp.saml.profile.config.saml1.BrowserSSOProfileConfiguration).PROFILE_ID}" />
+
+    <bean
+        id="InitializeRelyingPartyContext"
+        class="net.shibboleth.idp.profile.impl.InitializeRelyingPartyContext" />
+
+    <bean
+        id="SelectRelyingPartyConfiguration"
+        class="net.shibboleth.idp.profile.impl.SelectRelyingPartyConfiguration"
+        scope="prototype"
+        c:resolver-ref="ConditionalRelyingPartyConfigurationResolver" />
+
+    <bean
+        id="ConditionalRelyingPartyConfigurationResolver"
+        class="net.shibboleth.idp.relyingparty.impl.ConditionalRelyingPartyConfigurationResolver"
+        p:id="ConditionalRelyingPartyConfigurationResolver"
+        p:relyingPartyConfigurations-ref="ConditionalRelyingPartyConfiguration" />
+
+    <bean
+        id="SecurityConfiguration"
+        class="net.shibboleth.idp.profile.config.SecurityConfiguration" />
+
+    <bean
+        id="SAML1BrowserSSOProfileConfiguration"
+        class="net.shibboleth.idp.saml.profile.config.saml1.BrowserSSOProfileConfiguration"
+        p:securityConfiguration-ref="SecurityConfiguration" />
+
+    <!-- TODO replace responderId "https://idp.example.org" with something else -->
+    <bean
+        id="ConditionalRelyingPartyConfiguration"
+        class="net.shibboleth.idp.relyingparty.impl.ConditionalRelyingPartyConfiguration"
+        c:configurationId="ActivatedRelyingPartyConfiguration"
+        c:responderId="https://idp.example.org"
+        c:detailedErrorsFlag="true"
+        c:configurations-ref="SAML1BrowserSSOProfileConfiguration"
+        c:condition-ref="AlwaysTruePredicate" />
+
+    <bean
+        id="SelectProfileConfiguration"

[... 59 lines stripped ...]