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

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Dec 16 16:00:22 2014
New Revision: 7119

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7119&view=rev
Log:
Update parsers and factory to use non-deprecated methods.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/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/AbstractDynamicHTTPMetadataProviderParser.java?rev=7119&r1=7118&r2=7119&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java Tue Dec 16 16:00:22 2014
@@ -149,7 +149,7 @@
         }
 
         if (element.hasAttributeNS(null, "disregardSslCertificate")) {
-            clientBuilder.addPropertyValue("connectionDisregardSslCertificate",
+            clientBuilder.addPropertyValue("connectionDisregardTLSCertificate",
                     element.getAttributeNS(null, "disregardSslCertificate"));
         }
 

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java?rev=7119&r1=7118&r2=7119&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java Tue Dec 16 16:00:22 2014
@@ -158,7 +158,7 @@
         }
 
         if (element.hasAttributeNS(null, "disregardSslCertificate")) {
-            clientBuilder.addPropertyValue("connectionDisregardSslCertificate",
+            clientBuilder.addPropertyValue("connectionDisregardTLSCertificate",
                     element.getAttributeNS(null, "disregardSslCertificate"));
         }
 

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java?rev=7119&r1=7118&r2=7119&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java Tue Dec 16 16:00:22 2014
@@ -72,12 +72,24 @@
     }
 
     /**
-     * Sets whether the responder's SSL certificate should be ignored.
+     * Sets whether the responder's SSL/TLS certificate should be ignored.
      * 
-     * @param disregard whether the responder's SSL certificate should be ignored
+     * @param disregard whether the responder's SSL/TLS certificate should be ignored
+     * 
+     * @deprecated use {@link #setConnectionDisregardTLSCertificate(boolean)}
      */
+    @Deprecated
     public void setConnectionDisregardSslCertificate(final boolean disregard) {
         builder.setConnectionDisregardSslCertificate(disregard);
+    }
+    
+    /**
+     * Sets whether the responder's SSL/TLS certificate should be ignored.
+     * 
+     * @param disregard whether the responder's SSL/TLS certificate should be ignored
+     */
+    public void setConnectionDisregardTLSCertificate(final boolean disregard) {
+        builder.setConnectionDisregardTLSCertificate(disregard);
     }
 
     /**