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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Mar 19 13:00:34 2014
New Revision: 5604

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5604&view=rev
Log:
IDP-383 - wire in NameIDPolicy checking

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

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=5604&r1=5603&r2=5604&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml Wed Mar 19 13:00:34 2014
@@ -25,6 +25,12 @@
 
     <!-- TODO: remove once we get real metadata config in place -->
     <bean id="ExampleMetadata" class="org.springframework.core.io.FileSystemResource" c:path="${idp.home}/metadata/example-metadata.xml" />
+    <bean id="ExampleMetadataResolver" class="org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver"
+            p:parserPool-ref="shibboleth.ParserPool">
+        <constructor-arg>
+            <util:property-path path="ExampleMetadata.File" />
+        </constructor-arg>
+    </bean>
 
     <bean id="InitializeRelyingPartyContexFromSAMLPeer"
         class="net.shibboleth.idp.saml.impl.profile.InitializeRelyingPartyContextFromSAMLPeer" scope="prototype" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml?rev=5604&r1=5603&r2=5604&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml Wed Mar 19 13:00:34 2014
@@ -37,16 +37,8 @@
                 <!-- TODO: need to poke metadata source in from relying party config later -->
                 <bean class="org.opensaml.saml.common.binding.SAMLMetadataLookupHandler">
                     <property name="roleDescriptorResolver">
-                        <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver">
-                            <constructor-arg>
-                                <bean class="org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver"
-                                        p:parserPool-ref="shibboleth.ParserPool">
-                                    <constructor-arg>
-                                        <util:property-path path="ExampleMetadata.File" />
-                                    </constructor-arg>
-                                </bean>
-                            </constructor-arg>
-                        </bean>
+                        <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
+                            c:mdResolver-ref="ExampleMetadataResolver" />
                     </property>
                 </bean>
                 

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml?rev=5604&r1=5603&r2=5604&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml Wed Mar 19 13:00:34 2014
@@ -41,16 +41,8 @@
                 <!-- TODO: need to poke metadata source in from relying party config later -->
                 <bean class="org.opensaml.saml.common.binding.SAMLMetadataLookupHandler">
                     <property name="roleDescriptorResolver">
-                        <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver">
-                            <constructor-arg>
-                                <bean class="org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver"
-                                        p:parserPool-ref="shibboleth.ParserPool">
-                                    <constructor-arg>
-                                        <util:property-path path="ExampleMetadata.File" />
-                                    </constructor-arg>
-                                </bean>
-                            </constructor-arg>
-                        </bean>
+                        <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"

[... 16 lines stripped ...]