[java-identity-provider COMMIT] in /trunk: idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Jan 27 06:01:01 2017
New Revision: 8606

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8606&view=rev
Log:
IDP-688 yank never functional, and deprecated credentialsProvderRef

https://issues.shibboleth.net/jira/browse/IDP-688


Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicDeprecated.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java?rev=8606&r1=8605&r2=8606&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java	Fri Jan 27 06:01:01 2017
@@ -124,16 +124,8 @@
                     httpClientSecurityParametersRef));
         }
 
-        if (element.hasAttributeNS(null, "credentialsProviderRef")) {
-            builder.addPropertyReference("credentialsProvider",
-                    StringSupport.trimOrNull(element.getAttributeNS(null, "credentialsProviderRef")));
-            if (element.hasAttributeNS(null, BASIC_AUTH_USER) || element.hasAttributeNS(null, BASIC_AUTH_PASSWORD)) {
-                log.warn("credentialsProviderRef overrides settings for basicAuthUser and basicAuthPassword");
-            }
-        } else {
-            if (element.hasAttributeNS(null, BASIC_AUTH_USER) || element.hasAttributeNS(null, BASIC_AUTH_PASSWORD)) {
-                builder.addPropertyValue("basicCredentials", buildBasicCredentials(element));
-            }
+        if (element.hasAttributeNS(null, BASIC_AUTH_USER) || element.hasAttributeNS(null, BASIC_AUTH_PASSWORD)) {
+            builder.addPropertyValue("basicCredentials", buildBasicCredentials(element));
         }
 
         if (element.hasAttributeNS(null, "supportedContentTypes")) {

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java?rev=8606&r1=8605&r2=8606&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java	(original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java	Fri Jan 27 06:01:01 2017
@@ -20,6 +20,9 @@
 import java.util.Arrays;
 import java.util.Collections;
 
+import net.shibboleth.idp.saml.metadata.RelyingPartyMetadataProvider;
+import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
+
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.core.xml.persist.FilesystemLoadSaveManager;
 import org.opensaml.core.xml.persist.XMLObjectLoadSaveManager;
@@ -34,14 +37,11 @@
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 
-import net.shibboleth.idp.saml.metadata.RelyingPartyMetadataProvider;
-import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
-
 public class DynamicHTTPMetadataProviderParserTest extends AbstractMetadataParserTest {
     
     @Test
     public void testDefaults() throws Exception {
-        FunctionDrivenDynamicHTTPMetadataResolver resolver = getBean(FunctionDrivenDynamicHTTPMetadataResolver.class, 
+        final FunctionDrivenDynamicHTTPMetadataResolver resolver = getBean(FunctionDrivenDynamicHTTPMetadataResolver.class, 
                 "dynamicDefaults.xml", "beans.xml");
         
         Assert.assertTrue(resolver.isInitialized());
@@ -77,7 +77,7 @@
         Assert.assertEquals(resolver.getRequestURLBuilder().getClass(), HTTPEntityIDRequestURLBuilder.class);
     }
 
-    @Test
+    @Test(enabled=false)
     public void testDeprecated() throws Exception {
         getBean(FunctionDrivenDynamicHTTPMetadataResolver.class, 
                 "dynamicDeprecated.xml", "beans.xml", "httpClient.xml");
@@ -111,12 +111,12 @@
     
     @Test

[... 338 lines stripped ...]