[java-identity-provider COMMIT] in /trunk: idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingParty...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Jan  5 20:57:11 2014
New Revision: 5152

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5152&view=rev
Log:
- Fix up naming of some setters.
- SAML 1 Status setting action and unit test

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponse.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponseTest.java   (with props)
Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyContext.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectProfileConfiguration.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfiguration.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectProfileConfigurationTest.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/profile/saml1/AddResponseShell.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyContext.java?rev=5152&r1=5151&r2=5152&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyContext.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyContext.java Sun Jan  5 20:57:11 2014
@@ -71,7 +71,7 @@
      * 
      * @param config configuration to use when processing requests for this relying party, or null
      */
-    public void setRelyingPartyConfiguration(@Nullable final RelyingPartyConfiguration config) {
+    public void setConfiguration(@Nullable final RelyingPartyConfiguration config) {
         relyingPartyConfiguration = config;
     }
 
@@ -89,7 +89,7 @@
      * 
      * @param config configuration for the request profile currently being processed, or null
      */
-    public void setProfileConfiguration(@Nullable final ProfileConfiguration config) {
+    public void setProfileConfig(@Nullable final ProfileConfiguration config) {
         profileConfiguration = config;
     }
 }

Modified: trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java?rev=5152&r1=5151&r2=5152&view=diff
==============================================================================
--- trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java (original)
+++ trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/RequestContextBuilder.java Sun Jan  5 20:57:11 2014
@@ -493,8 +493,8 @@
         }
 
         final RelyingPartyConfiguration rpConfig = buildRelyingPartyConfiguration();
-        rpCtx.setRelyingPartyConfiguration(rpConfig);
-        rpCtx.setProfileConfiguration(selectProfileConfiguration(rpConfig.getProfileConfigurations()));
+        rpCtx.setConfiguration(rpConfig);
+        rpCtx.setProfileConfig(selectProfileConfiguration(rpConfig.getProfileConfigurations()));
 
         return rpCtx;
     }

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectProfileConfiguration.java?rev=5152&r1=5151&r2=5152&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectProfileConfiguration.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectProfileConfiguration.java Sun Jan  5 20:57:11 2014
@@ -114,7 +114,7 @@
             return;
         }
 
-        rpCtx.setProfileConfiguration(profileConfiguration);
+        rpCtx.setProfileConfig(profileConfiguration);
     }
     
 }

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=5152&r1=5151&r2=5152&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfiguration.java (original)

[... 102 lines stripped ...]