[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataR...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Mar 28 15:12:46 2014
New Revision: 3742

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3742&view=rev
Log:
Change setter method name to work around Java property editor ambiguity vis-a-vis Spring usage.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java?rev=3742&r1=3741&r2=3742&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java Fri Mar 28 15:12:46 2014
@@ -127,12 +127,12 @@
      * Sets the username and password used to access the metadata URL. To disable BASIC authentication pass 
      * null for the credentials instance.
      * 
-     * An {@link AuthScope} will be generated based off of the metadata URI's hostname and port.
-     * 
-     * @param credentials the username and password credentials to user
+     * An {@link AuthScope} will be generated based off the metadata URI's hostname and port.
+     * 
+     * @param credentials the username and password credentials
      */
     public void setBasicCredentials(@Nullable final UsernamePasswordCredentials credentials) {
-        setBasicCredentials(credentials, null);
+        setBasicCredentialsWithScope(credentials, null);
     }
     
     /**
@@ -140,14 +140,14 @@
      * null for the credentials instance.
      * 
      * <p>
-     * If the <code>authScope</code> is null, an {@link AuthScope} will be generated based off of 
+     * If the <code>authScope</code> is null, an {@link AuthScope} will be generated based off
      * the metadata URI's hostname and port.
      * </p>
      * 
-     * @param
+     * @param credentials the username and password credentials
      * @param scope the HTTP client auth scope with which to scope the credentials, may be null
      */
-    public void setBasicCredentials(@Nullable final UsernamePasswordCredentials credentials, 
+    public void setBasicCredentialsWithScope(@Nullable final UsernamePasswordCredentials credentials, 
             @Nullable final AuthScope scope) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);