[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: Thu Jan 23 21:43:01 2014
New Revision: 5236

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5236&view=rev
Log:
Switch RPConfig class from c'tor to property-based initialization

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-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.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
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/saml1/SAML1ActionSupport.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/saml2/SAML2ActionSupport.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/saml1/SAML1ActionTestingSupport.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/profile/saml2/SAML2ActionTestingSupport.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML1NameIdentifierGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML2NameIDGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddAuthnStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/AddResponseShell.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML1NameIdentifierGeneratorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DefaultSAML2NameIDGeneratorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddResponseShellTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponseTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/AddResponseShellTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/AddStatusToResponseTest.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=5236&r1=5235&r2=5236&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 Thu Jan 23 21:43:01 2014
@@ -85,18 +85,14 @@
         class="net.shibboleth.idp.saml.profile.config.saml1.BrowserSSOProfileConfiguration"
         p:securityConfiguration-ref="SecurityConfiguration" />
 
-    <!-- TODO replace configurationId with something else -->
-    <!-- TODO replace responderId "https://idp.example.org" with something else -->
-    <!-- TODO replace predicate with something else -->
-    <bean
-        id="RelyingPartyConfiguration"
-        class="net.shibboleth.idp.relyingparty.RelyingPartyConfiguration"
-        c:configurationId="ActivatedRelyingPartyConfiguration"
-        c:responderId="https://idp.example.org"
-        c:detailedErrorsFlag="true"
-        c:configurations-ref="SAML1BrowserSSOProfileConfiguration"
-        c:condition-ref="AlwaysTruePredicate" />
-
+    <!-- TODO replace with eventual relying-party.xml config -->
+    <bean id="RelyingPartyConfiguration" class="net.shibboleth.idp.relyingparty.RelyingPartyConfiguration"
+            p:id="ActivatedRelyingPartyConfiguration"
+            p:responderId="https://idp.example.org"
+            p:detailedErrors="true"
+            p:profileConfigurations-ref="SAML1BrowserSSOProfileConfiguration"
+            p:activationCondition-ref="AlwaysTruePredicate /">
+            
     <bean
         id="SelectProfileConfiguration"
         class="net.shibboleth.idp.profile.impl.SelectProfileConfiguration"

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=5236&r1=5235&r2=5236&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml (original)

[... 1018 lines stripped ...]