[java-opensaml] branch main updated: Rename httpclient package.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 21 15:13:48 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=d9e7b8872390826448b257b4e97625cc8f9a3fed
The following commit(s) were added to refs/heads/main by this push:
new d9e7b8872 Rename httpclient package.
d9e7b8872 is described below
commit d9e7b8872390826448b257b4e97625cc8f9a3fed
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 21 11:13:46 2022 -0400
Rename httpclient package.
---
.../resolver/impl/AbstractDynamicHTTPMetadataResolver.java | 8 ++++----
.../saml/metadata/resolver/impl/HTTPMetadataResolver.java | 8 ++++----
.../saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java | 2 +-
.../resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java | 2 +-
.../resolver/impl/FileBackedHTTPMetadataResolverTest.java | 2 +-
.../impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java | 2 +-
.../saml/metadata/resolver/impl/HTTPMetadataResolverTest.java | 2 +-
.../opensaml/security/httpclient/HttpClientSecurityConstants.java | 2 +-
.../security/httpclient/HttpClientSecurityContextHandler.java | 2 +-
.../security/httpclient/SecurityEnhancedHTTPResourceTest.java | 2 +-
.../httpclient/impl/SecurityEnhancedHttpClientSupport.java | 4 ++--
.../httpclient/impl/SecurityEnhancedTLSSocketFactory.java | 2 +-
.../httpclient/impl/ThreadLocalClientTLSCredentialHandler.java | 2 +-
.../security/httpclient/impl/ThreadLocalServerTLSHandler.java | 2 +-
.../httpclient/impl/SecurityEnhancedTLSSocketFactoryTest.java | 2 +-
.../java/org/opensaml/spring/tls/TLSSocketFactoryFactoryBean.java | 2 +-
16 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
index d94d5c0df..c36621f56 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
@@ -143,11 +143,11 @@ public abstract class AbstractDynamicHTTPMetadataResolver extends AbstractDynami
* </p>
* <ul>
* <li>
- * a {@link net.shibboleth.utilities.java.support.httpclient.TLSSocketFactory}
+ * a {@link net.shibboleth.shared.httpclient.TLSSocketFactory}
* </li>
* <li>
* a {@link org.opensaml.security.httpclient.impl.SecurityEnhancedTLSSocketFactory} which wraps
- * an instance of {@link net.shibboleth.utilities.java.support.httpclient.TLSSocketFactory}, with
+ * an instance of {@link net.shibboleth.shared.httpclient.TLSSocketFactory}, with
* the latter likely configured in a "no trust" configuration. This variant is required if either a
* trust engine or a client TLS credential is to be used.
* </li>
@@ -155,8 +155,8 @@ public abstract class AbstractDynamicHTTPMetadataResolver extends AbstractDynami
*
* <p>
* For convenience methods for building a
- * {@link net.shibboleth.utilities.java.support.httpclient.TLSSocketFactory},
- * see {@link net.shibboleth.utilities.java.support.httpclient.HttpClientSupport}.
+ * {@link net.shibboleth.shared.httpclient.TLSSocketFactory},
+ * see {@link net.shibboleth.shared.httpclient.HttpClientSupport}.
* </p>
*
* <p>
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
index 753dbcaa6..ed61b8e2c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
@@ -143,11 +143,11 @@ public class HTTPMetadataResolver extends AbstractReloadingMetadataResolver {
*
* <ul>
* <li>
- * a {@link net.shibboleth.utilities.java.support.httpclient.TLSSocketFactory}
+ * a {@link net.shibboleth.shared.httpclient.TLSSocketFactory}
* </li>
* <li>
* {@link org.opensaml.security.httpclient.impl.SecurityEnhancedTLSSocketFactory} which wraps
- * an instance of {@link net.shibboleth.utilities.java.support.httpclient.TLSSocketFactory}, with
+ * an instance of {@link net.shibboleth.shared.httpclient.TLSSocketFactory}, with
* the latter likely configured in a "no trust" configuration. This variant is required if either a
* trust engine or a client TLS credential is to be used.
* </li>
@@ -155,8 +155,8 @@ public class HTTPMetadataResolver extends AbstractReloadingMetadataResolver {
*
* <p>
* For convenience methods for building a
- * {@link net.shibboleth.utilities.java.support.httpclient.TLSSocketFactory},
- * see {@link net.shibboleth.utilities.java.support.httpclient.HttpClientSupport}.
+ * {@link net.shibboleth.shared.httpclient.TLSSocketFactory},
+ * see {@link net.shibboleth.shared.httpclient.HttpClientSupport}.
* </p>
*
* <p>
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java
index dae7b9152..107187443 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilterTest.java
@@ -34,8 +34,8 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.shared.httpclient.HttpClientBuilder;
import net.shibboleth.shared.testing.RepositorySupport;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
/**
* Unit tests for {@link EntityRoleFilter}.
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java
index b254946cd..63cd1596e 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolverTest.java
@@ -38,7 +38,7 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
+import net.shibboleth.shared.httpclient.HttpClientBuilder;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.Criterion;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
index 8ad1df516..96462d741 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
@@ -41,9 +41,9 @@ import org.testng.annotations.Test;
import com.google.common.io.Resources;
+import net.shibboleth.shared.httpclient.HttpClientBuilder;
import net.shibboleth.shared.testing.RepositorySupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
index e537d7975..f42f25303 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
@@ -36,11 +36,11 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import net.shibboleth.shared.httpclient.HttpClientBuilder;
import net.shibboleth.shared.testing.RepositorySupport;
import net.shibboleth.shared.testing.VelocityEngine;
import net.shibboleth.utilities.java.support.codec.StringDigester;
import net.shibboleth.utilities.java.support.codec.StringDigester.OutputFormat;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
index 83a97b00e..55cded4ae 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
@@ -50,9 +50,9 @@ import org.testng.annotations.Test;
import com.google.common.io.ByteStreams;
+import net.shibboleth.shared.httpclient.HttpClientBuilder;
import net.shibboleth.shared.testing.RepositorySupport;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
import net.shibboleth.utilities.java.support.resolver.ResolverException;
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityConstants.java b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityConstants.java
index ed623ca00..5e7fb37dd 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityConstants.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityConstants.java
@@ -17,7 +17,7 @@
package org.opensaml.security.httpclient;
-import net.shibboleth.utilities.java.support.httpclient.TLSSocketFactory;
+import net.shibboleth.shared.httpclient.TLSSocketFactory;
/**
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityContextHandler.java b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityContextHandler.java
index 3e3a13c09..1386d9cac 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityContextHandler.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityContextHandler.java
@@ -24,8 +24,8 @@ import javax.annotation.Nullable;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.client.protocol.HttpClientContext;
+import net.shibboleth.shared.httpclient.HttpClientContextHandler;
import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
/**
* An {@link HttpClientContextHandler} that supports this package's security capabilities.
diff --git a/opensaml-security-api/src/test/java/org/opensaml/security/httpclient/SecurityEnhancedHTTPResourceTest.java b/opensaml-security-api/src/test/java/org/opensaml/security/httpclient/SecurityEnhancedHTTPResourceTest.java
index 156f412e5..3885cf673 100644
--- a/opensaml-security-api/src/test/java/org/opensaml/security/httpclient/SecurityEnhancedHTTPResourceTest.java
+++ b/opensaml-security-api/src/test/java/org/opensaml/security/httpclient/SecurityEnhancedHTTPResourceTest.java
@@ -23,11 +23,11 @@ import java.util.Collections;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLSession;
+import net.shibboleth.shared.httpclient.HttpClientBuilder;
import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
import net.shibboleth.shared.testing.RepositorySupport;
import net.shibboleth.shared.testing.ResourceTestHelper;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import org.apache.http.client.HttpClient;
import org.springframework.core.io.ClassPathResource;
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedHttpClientSupport.java b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedHttpClientSupport.java
index 89d136944..7c6c5d3ae 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedHttpClientSupport.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedHttpClientSupport.java
@@ -31,8 +31,8 @@ import org.opensaml.security.trust.TrustEngine;
import org.opensaml.security.x509.tls.impl.ThreadLocalX509CredentialKeyManager;
import org.opensaml.security.x509.tls.impl.ThreadLocalX509TrustManager;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientSupport;
-import net.shibboleth.utilities.java.support.httpclient.TLSSocketFactoryBuilder;
+import net.shibboleth.shared.httpclient.HttpClientSupport;
+import net.shibboleth.shared.httpclient.TLSSocketFactoryBuilder;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
/**
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java
index c6f195073..c9c831da6 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java
@@ -45,7 +45,7 @@ import org.opensaml.security.x509.tls.impl.ThreadLocalX509TrustManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientSupport;
+import net.shibboleth.shared.httpclient.HttpClientSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/ThreadLocalClientTLSCredentialHandler.java b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/ThreadLocalClientTLSCredentialHandler.java
index 877c87ce7..462b748c3 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/ThreadLocalClientTLSCredentialHandler.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/ThreadLocalClientTLSCredentialHandler.java
@@ -27,7 +27,7 @@ import org.opensaml.security.x509.tls.impl.ThreadLocalX509CredentialContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
+import net.shibboleth.shared.httpclient.HttpClientContextHandler;
/**
* An implementation of {@link HttpClientContextHandler} which clears the thread local client TLS credential
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/ThreadLocalServerTLSHandler.java b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/ThreadLocalServerTLSHandler.java
index 5122f2ab5..ffdaa9a26 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/ThreadLocalServerTLSHandler.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/ThreadLocalServerTLSHandler.java
@@ -28,7 +28,7 @@ import org.opensaml.security.x509.tls.impl.ThreadLocalX509TrustEngineContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
+import net.shibboleth.shared.httpclient.HttpClientContextHandler;
/**
* An implementation of {@link HttpClientContextHandler} which handles cleanup and transfer of
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactoryTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactoryTest.java
index f1e1f95d3..8f5921b61 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactoryTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactoryTest.java
@@ -43,7 +43,7 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientSupport;
+import net.shibboleth.shared.httpclient.HttpClientSupport;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
public class SecurityEnhancedTLSSocketFactoryTest {
diff --git a/opensaml-spring/src/main/java/org/opensaml/spring/tls/TLSSocketFactoryFactoryBean.java b/opensaml-spring/src/main/java/org/opensaml/spring/tls/TLSSocketFactoryFactoryBean.java
index 3c11c406e..56f2b57ef 100644
--- a/opensaml-spring/src/main/java/org/opensaml/spring/tls/TLSSocketFactoryFactoryBean.java
+++ b/opensaml-spring/src/main/java/org/opensaml/spring/tls/TLSSocketFactoryFactoryBean.java
@@ -27,7 +27,7 @@ import org.opensaml.security.trust.TrustEngine;
import org.opensaml.security.x509.X509Credential;
import org.springframework.beans.factory.config.AbstractFactoryBean;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientSupport;
+import net.shibboleth.shared.httpclient.HttpClientSupport;
/**
* A factory bean for producing instances of {@link LayeredConnectionSocketFactory} for use in {@link HttpClient}.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list