[java-identity-provider COMMIT] in /branches/3.3: ./ idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spri...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar  7 20:56:47 2017
New Revision: 8665

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8665&view=rev
Log:
BPr8605 - IDP-688 - Fix bug with deprecated property setter.

Added:
    branches/3.3/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicDeprecated.xml
      - copied unchanged from r8605, trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicDeprecated.xml
Modified:
    branches/3.3/   (props changed)
    branches/3.3/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java
    branches/3.3/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java
    branches/3.3/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml

Modified: branches/3.3/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/branches/3.3/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java?rev=8665&r1=8664&r2=8665&view=diff
==============================================================================
--- branches/3.3/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java	(original)
+++ branches/3.3/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java	Tue Mar  7 20:56:47 2017
@@ -125,7 +125,7 @@
         }
 
         if (element.hasAttributeNS(null, "credentialsProviderRef")) {
-            builder.addPropertyReference("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");

Modified: branches/3.3/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.3/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java?rev=8665&r1=8664&r2=8665&view=diff
==============================================================================
--- branches/3.3/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java	(original)
+++ branches/3.3/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java	Tue Mar  7 20:56:47 2017
@@ -76,7 +76,15 @@
         
         Assert.assertEquals(resolver.getRequestURLBuilder().getClass(), HTTPEntityIDRequestURLBuilder.class);
     }
-    
+
+    @Test
+    public void testDeprecated() throws Exception {
+        getBean(FunctionDrivenDynamicHTTPMetadataResolver.class, 
+                "dynamicDeprecated.xml", "beans.xml", "httpClient.xml");
+        
+        // We can't really test the actual values, this is just to test that parser, factory bean, etc are ok.
+    }
+
     @Test
     public void testClientSecurityParamsParams() throws Exception {
         getBean(FunctionDrivenDynamicHTTPMetadataResolver.class, 

Modified: branches/3.3/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.3/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml?rev=8665&r1=8664&r2=8665&view=diff
==============================================================================
--- branches/3.3/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml	(original)
+++ branches/3.3/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml	Tue Mar  7 20:56:47 2017
@@ -72,6 +72,8 @@
     <bean id="metadata.persistentCacheManager" class="org.opensaml.core.xml.persist.MapLoadSaveManager" />
     
     <bean id="metadata.HttpClientSecurityParameters" class="org.opensaml.security.httpclient.HttpClientSecurityParameters" />
+    
+    <bean id="metadata.CredentialsProvider" class="org.apache.http.impl.client.SystemDefaultCredentialsProvider" />
             
     <util:set id="metadata.Indexes">
         <bean class="org.opensaml.saml.metadata.resolver.index.impl.RoleMetadataIndex" />