[java-identity-provider] branch main updated: Rename shared CLI package.
Scott Cantor
cantor.2 at osu.edu
Tue Sep 13 22:34:43 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5d0115ad515099283e4cbb1e9a5a888a92b8d148
The following commit(s) were added to refs/heads/main by this push:
new 5d0115ad5 Rename shared CLI package.
5d0115ad5 is described below
commit 5d0115ad515099283e4cbb1e9a5a888a92b8d148
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 13 18:34:40 2022 -0400
Rename shared CLI package.
---
.../java/net/shibboleth/idp/cli/AbstractIdPHomeAwareCommandLine.java | 2 +-
.../shibboleth/idp/cli/AbstractIdPHomeAwareCommandLineArguments.java | 4 ++--
.../net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java | 2 +-
.../java/net/shibboleth/idp/installer/plugin/impl/PluginCLITest.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/idp-core/src/main/java/net/shibboleth/idp/cli/AbstractIdPHomeAwareCommandLine.java b/idp-core/src/main/java/net/shibboleth/idp/cli/AbstractIdPHomeAwareCommandLine.java
index 3a708fe79..c5b41b8a8 100644
--- a/idp-core/src/main/java/net/shibboleth/idp/cli/AbstractIdPHomeAwareCommandLine.java
+++ b/idp-core/src/main/java/net/shibboleth/idp/cli/AbstractIdPHomeAwareCommandLine.java
@@ -24,8 +24,8 @@ import org.apache.http.client.HttpClient;
import org.opensaml.security.httpclient.HttpClientSecurityParameters;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import net.shibboleth.ext.spring.cli.AbstractCommandLine;
import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
+import net.shibboleth.shared.cli.AbstractCommandLine;
/**
* An extension to {@link AbstractCommandLine} that auto-adds our context initializer for idp.home
diff --git a/idp-core/src/main/java/net/shibboleth/idp/cli/AbstractIdPHomeAwareCommandLineArguments.java b/idp-core/src/main/java/net/shibboleth/idp/cli/AbstractIdPHomeAwareCommandLineArguments.java
index a90c67c40..c8d01ef6e 100644
--- a/idp-core/src/main/java/net/shibboleth/idp/cli/AbstractIdPHomeAwareCommandLineArguments.java
+++ b/idp-core/src/main/java/net/shibboleth/idp/cli/AbstractIdPHomeAwareCommandLineArguments.java
@@ -30,13 +30,13 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
- * An extension to {@link net.shibboleth.ext.spring.cli.AbstractCommandLineArguments}
+ * An extension to {@link net.shibboleth.shared.cli.AbstractCommandLineArguments}
* that allows idp.home override and includes HTTP client support.
*
* @since 4.1.0
*/
public abstract class AbstractIdPHomeAwareCommandLineArguments
- extends net.shibboleth.ext.spring.cli.AbstractCommandLineArguments {
+ extends net.shibboleth.shared.cli.AbstractCommandLineArguments {
/** IdP location. */
@Parameter(names = "--home")
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
index 0774d5374..26497339f 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
@@ -46,13 +46,13 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
-import net.shibboleth.ext.spring.cli.AbstractCommandLine;
import net.shibboleth.idp.Version;
import net.shibboleth.idp.cli.AbstractIdPHomeAwareCommandLine;
import net.shibboleth.idp.installer.impl.InstallationLogger;
import net.shibboleth.idp.installer.plugin.impl.PluginState.VersionInfo;
import net.shibboleth.idp.plugin.IdPPlugin;
import net.shibboleth.idp.plugin.PluginSupport.SupportLevel;
+import net.shibboleth.shared.cli.AbstractCommandLine;
import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
import net.shibboleth.idp.plugin.PluginVersion;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginCLITest.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginCLITest.java
index 30fe735db..56cb6d809 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginCLITest.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginCLITest.java
@@ -32,8 +32,8 @@ import org.springframework.core.io.Resource;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
-import net.shibboleth.ext.spring.cli.AbstractCommandLine;
import net.shibboleth.idp.installer.ProgressReportingOutputStream;
+import net.shibboleth.shared.cli.AbstractCommandLine;
import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list