[java-identity-provider COMMIT] in /trunk: idp-conf/.settings/com.springsource.sts.config.flow.prefs idp-conf/src/mai...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jan 22 20:03:18 2014
New Revision: 5229

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5229&view=rev
Log:
Collapse out RelyingPartyConfiguration subclass.

Added:
    trunk/idp-conf/.settings/com.springsource.sts.config.flow.prefs   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/logic/package-info.java   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/RelyingPartyConfigurationResolver.java
      - copied, changed from r5228, trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationResolver.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/RelyingPartyConfigurationResolverTest.java
      - copied, changed from r5228, trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationResolverTest.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-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfiguration.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationResolver.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationResolverTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/relyingparty/impl/ConditionalRelyingPartyConfigurationTest.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=5229&r1=5228&r2=5229&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 Jan 22 20:03:18 2014
@@ -68,13 +68,13 @@
         id="SelectRelyingPartyConfiguration"
         class="net.shibboleth.idp.profile.impl.SelectRelyingPartyConfiguration"
         scope="prototype"
-        c:resolver-ref="ConditionalRelyingPartyConfigurationResolver" />
+        c:resolver-ref="RelyingPartyConfigurationResolver" />
 
     <bean
-        id="ConditionalRelyingPartyConfigurationResolver"
-        class="net.shibboleth.idp.relyingparty.impl.ConditionalRelyingPartyConfigurationResolver"
-        p:id="ConditionalRelyingPartyConfigurationResolver"
-        p:relyingPartyConfigurations-ref="ConditionalRelyingPartyConfiguration" />
+        id="RelyingPartyConfigurationResolver"
+        class="net.shibboleth.idp.relyingparty.impl.RelyingPartyConfigurationResolver"
+        p:id="RelyingPartyConfigurationResolver"
+        p:relyingPartyConfigurations-ref="RelyingPartyConfiguration" />
 
     <bean
         id="SecurityConfiguration"
@@ -89,8 +89,8 @@
     <!-- TODO replace responderId "https://idp.example.org" with something else -->
     <!-- TODO replace predicate with something else -->
     <bean
-        id="ConditionalRelyingPartyConfiguration"
-        class="net.shibboleth.idp.relyingparty.impl.ConditionalRelyingPartyConfiguration"
+        id="RelyingPartyConfiguration"
+        class="net.shibboleth.idp.relyingparty.RelyingPartyConfiguration"
         c:configurationId="ActivatedRelyingPartyConfiguration"
         c:responderId="https://idp.example.org"
         c:detailedErrorsFlag="true"

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=5229&r1=5228&r2=5229&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 Jan 22 20:03:18 2014
@@ -193,7 +193,7 @@
     </bean>
 
     <!-- TODO replace responderId "https://idp.example.org" with something else -->
-    <bean id="ConditionalRelyingPartyConfiguration" class="net.shibboleth.idp.relyingparty.impl.ConditionalRelyingPartyConfiguration">
+    <bean id="RelyingPartyConfiguration" class="net.shibboleth.idp.relyingparty.RelyingPartyConfiguration">
         <constructor-arg value="ActivatedRelyingPartyConfiguration" />
         <constructor-arg value="https://idp.example.org" />
         <constructor-arg value="true" />
@@ -211,16 +211,16 @@
         </constructor-arg>
     </bean>
 

[... 342 lines stripped ...]