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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb 19 20:56:13 2014
New Revision: 5405

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5405&view=rev
Log:
Create a marker interface for RP config resolver.

Added:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
      - copied, changed from r5401, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/RelyingPartyConfigurationResolver.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolverTest.java
      - copied, changed from r5401, trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/RelyingPartyConfigurationResolverTest.java
Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfiguration.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/RelyingPartyConfigurationResolver.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/RelyingPartyConfigurationResolverTest.java

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=5405&r1=5404&r2=5405&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 Wed Feb 19 20:56:13 2014
@@ -103,11 +103,11 @@
         id="SelectRelyingPartyConfiguration"
         class="net.shibboleth.idp.profile.impl.SelectRelyingPartyConfiguration"
         scope="prototype"
-        c:resolver-ref="RelyingPartyConfigurationResolver" />
+        p:relyingPartyConfigurationResolver-ref="RelyingPartyConfigurationResolver" />
 
     <bean
         id="RelyingPartyConfigurationResolver"
-        class="net.shibboleth.idp.relyingparty.impl.RelyingPartyConfigurationResolver"
+        class="net.shibboleth.idp.relyingparty.impl.DefaultRelyingPartyConfigurationResolver"
         scope="prototype"
         p:id="RelyingPartyConfigurationResolver"
         p:relyingPartyConfigurations-ref="RelyingPartyConfiguration" />

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=5405&r1=5404&r2=5405&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 Feb 19 20:56:13 2014
@@ -221,7 +221,7 @@
         </property>
     </bean>
 
-    <bean id="RelyingPartyConfigurationResolver" p:id="RelyingPartyConfigurationResolver" class="net.shibboleth.idp.relyingparty.impl.RelyingPartyConfigurationResolver">
+    <bean id="RelyingPartyConfigurationResolver" p:id="RelyingPartyConfigurationResolver" class="net.shibboleth.idp.relyingparty.impl.DefaultRelyingPartyConfigurationResolver">
         <property name="relyingPartyConfigurations">
             <util:list>
                 <ref bean="RelyingPartyConfiguration" />
@@ -229,9 +229,8 @@
         </property>
     </bean>
 
-    <bean id="SelectRelyingPartyConfiguration" class="net.shibboleth.idp.profile.impl.SelectRelyingPartyConfiguration" scope="prototype">
-        <constructor-arg ref="RelyingPartyConfigurationResolver" />
-    </bean>
+    <bean id="SelectRelyingPartyConfiguration" class="net.shibboleth.idp.profile.impl.SelectRelyingPartyConfiguration" scope="prototype"
+        p:relyingPartyConfigurationResolver-ref="RelyingPartyConfigurationResolver" />
 
     <bean id="SelectProfileConfiguration" class="net.shibboleth.idp.profile.impl.SelectProfileConfiguration" scope="prototype"/>
 

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfiguration.java?rev=5405&r1=5404&r2=5405&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfiguration.java (original)

[... 383 lines stripped ...]