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

[noreply at shibboleth.net]

Author: putmanb
Date: Mon Feb 23 17:13:33 2015
New Revision: 4235

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4235&view=rev
Log:
Clean up imports and Javadocs.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
    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/AbstractDynamicHTTPMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java?rev=4235&r1=4234&r2=4235&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java Mon Feb 23 17:13:33 2015
@@ -54,7 +54,6 @@
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.security.httpclient.HttpClientSecurityConstants;
-import org.opensaml.security.httpclient.impl.TrustEngineTLSSocketFactory;
 import org.opensaml.security.trust.TrustEngine;
 import org.opensaml.security.x509.X509Credential;
 import org.slf4j.Logger;
@@ -125,7 +124,9 @@
      * 
      * <p>
      * Must be used in conjunction with an HttpClient instance which is configured with a 
-     * {@link TrustEngineTLSSocketFactory}, otherwise has no effect.
+     * {@link org.opensaml.security.httpclient.impl.TrustEngineTLSSocketFactory}. If this socket
+     * factory is not configured, then this will result in no TLS trust evaluation being performed
+     * and a {@link ResolverException} will ultimately be thrown.
      * </p>
      * 
      * @param engine the trust engine instance to use

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=4235&r1=4234&r2=4235&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 Mon Feb 23 17:13:33 2015
@@ -40,9 +40,7 @@
 import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.util.EntityUtils;
-import org.opensaml.security.credential.Credential;
 import org.opensaml.security.httpclient.HttpClientSecurityConstants;
-import org.opensaml.security.httpclient.impl.TrustEngineTLSSocketFactory;
 import org.opensaml.security.trust.TrustEngine;
 import org.opensaml.security.x509.X509Credential;
 import org.slf4j.Logger;
@@ -136,7 +134,9 @@
      * 
      * <p>
      * Must be used in conjunction with an HttpClient instance which is configured with a 
-     * {@link TrustEngineTLSSocketFactory}, otherwise has no effect.
+     * {@link org.opensaml.security.httpclient.impl.TrustEngineTLSSocketFactory}. If this socket
+     * factory is not configured, then this will result in no TLS trust evaluation being performed
+     * and a {@link ResolverException} will ultimately be thrown.
      * </p>
      * 
      * @param engine the trust engine instance to use