[java-identity-provider] 01/05: IDP-2012 New (maven) Module idp-cli
Rod Widdowson
rdw at steadingsoftware.com
Wed Sep 28 08:14:54 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw 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=c8b8034d4280cd2f43e7d2abd3b65001ac634fd8
commit c8b8034d4280cd2f43e7d2abd3b65001ac634fd8
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Sep 24 15:44:35 2022 +0100
IDP-2012 New (maven) Module idp-cli
https://shibboleth.atlassian.net/browse/IDP-2012
1) Create new maven module idp-cli.
2) Arrange for it to turn up in the distribution.
3) Move some classes from idp-admin-impl into it.
---
idp-admin-impl/pom.xml | 16 ------
idp-cli/.gitignore | 1 +
idp-cli/pom.xml | 67 ++++++++++++++++++++++
.../idp/cli}/impl/JarCheckArguments.java | 2 +-
.../net/shibboleth/idp/cli}/impl/JarCheckCLI.java | 2 +-
.../idp/cli}/impl/ModuleManagerArguments.java | 2 +-
.../shibboleth/idp/cli}/impl/ModuleManagerCLI.java | 2 +-
idp-distribution/pom.xml | 10 ++++
idp-installer/pom.xml | 6 ++
idp-parent/pom.xml | 1 +
10 files changed, 89 insertions(+), 20 deletions(-)
diff --git a/idp-admin-impl/pom.xml b/idp-admin-impl/pom.xml
index 91d917ea1..5a6d8cea0 100644
--- a/idp-admin-impl/pom.xml
+++ b/idp-admin-impl/pom.xml
@@ -56,10 +56,6 @@
<artifactId>opensaml-storage-api</artifactId>
</dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-cli</artifactId>
- </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-security</artifactId>
@@ -130,18 +126,6 @@
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
- <dependency>
- <groupId>com.beust</groupId>
- <artifactId>jcommander</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <!-- Only used in a command line -->
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Runtime Dependencies -->
<dependency>
diff --git a/idp-cli/.gitignore b/idp-cli/.gitignore
new file mode 100644
index 000000000..ea8c4bf7f
--- /dev/null
+++ b/idp-cli/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/idp-cli/pom.xml b/idp-cli/pom.xml
new file mode 100644
index 000000000..ac3844a57
--- /dev/null
+++ b/idp-cli/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.shibboleth.idp</groupId>
+ <artifactId>idp-parent</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
+ <relativePath>../idp-parent</relativePath>
+ </parent>
+
+ <name>Shibboleth IdP :: Command Line</name>
+ <description>Command Line Tools</description>
+ <artifactId>idp-cli</artifactId>
+ <packaging>jar</packaging>
+
+ <properties>
+ <automatic.module.name>net.shibboleth.idp.cli</automatic.module.name>
+ </properties>
+
+ <dependencies>
+ <!-- Provided Dependencies - All dependencies are provided, reflecting the fact that
+ IdP Distribution has to pull them together and all the installer stuff has a carefully
+ constructed classpath. -->
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-admin-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-cli</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>${shibboleth.scm.connection}java-identity-provider</connection>
+ <developerConnection>${shibboleth.scm.developerConnection}java-identity-provider</developerConnection>
+ <url>${shibboleth.scm.url}java-identity-provider.git</url>
+ </scm>
+
+ <distributionManagement>
+ <site>
+ <id>site</id>
+ <url>scp:${idp-module.site.url}</url>
+ </site>
+ </distributionManagement>
+
+</project>
diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/JarCheckArguments.java b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/JarCheckArguments.java
similarity index 98%
rename from idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/JarCheckArguments.java
rename to idp-cli/src/main/java/net/shibboleth/idp/cli/impl/JarCheckArguments.java
index 01a3c01e0..94e8b14ca 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/JarCheckArguments.java
+++ b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/JarCheckArguments.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.admin.impl;
+package net.shibboleth.idp.cli.impl;
import java.io.PrintStream;
diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/JarCheckCLI.java b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/JarCheckCLI.java
similarity index 99%
rename from idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/JarCheckCLI.java
rename to idp-cli/src/main/java/net/shibboleth/idp/cli/impl/JarCheckCLI.java
index 311c6bf09..6741d7b97 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/JarCheckCLI.java
+++ b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/JarCheckCLI.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.admin.impl;
+package net.shibboleth.idp.cli.impl;
import java.io.BufferedInputStream;
import java.io.File;
diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/module/impl/ModuleManagerArguments.java b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerArguments.java
similarity index 99%
rename from idp-admin-impl/src/main/java/net/shibboleth/idp/module/impl/ModuleManagerArguments.java
rename to idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerArguments.java
index 363fea275..aaf14d4fb 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/module/impl/ModuleManagerArguments.java
+++ b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerArguments.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.module.impl;
+package net.shibboleth.idp.cli.impl;
import java.io.PrintStream;
import java.util.ArrayList;
diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/module/impl/ModuleManagerCLI.java b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerCLI.java
similarity index 99%
rename from idp-admin-impl/src/main/java/net/shibboleth/idp/module/impl/ModuleManagerCLI.java
rename to idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerCLI.java
index cd9be0798..297de900b 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/module/impl/ModuleManagerCLI.java
+++ b/idp-cli/src/main/java/net/shibboleth/idp/cli/impl/ModuleManagerCLI.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.module.impl;
+package net.shibboleth.idp.cli.impl;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/idp-distribution/pom.xml b/idp-distribution/pom.xml
index 0a04e9dba..916f7589e 100644
--- a/idp-distribution/pom.xml
+++ b/idp-distribution/pom.xml
@@ -33,6 +33,12 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- Required if using classes with command line support. -->
<dependency>
<groupId>com.beust</groupId>
@@ -175,6 +181,10 @@
</goals>
<configuration>
<artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-cli</artifactId>
+ </artifactItem>
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>idp-installer</artifactId>
diff --git a/idp-installer/pom.xml b/idp-installer/pom.xml
index aabda839e..1a141127e 100644
--- a/idp-installer/pom.xml
+++ b/idp-installer/pom.xml
@@ -31,6 +31,12 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-cli</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>idp-admin-api</artifactId>
diff --git a/idp-parent/pom.xml b/idp-parent/pom.xml
index 13293ccb9..8b23d0d31 100644
--- a/idp-parent/pom.xml
+++ b/idp-parent/pom.xml
@@ -47,6 +47,7 @@
<module>../idp-war</module>
<module>../idp-war-distribution</module>
+ <module>../idp-cli</module>
<module>../idp-installer</module>
<module>../idp-conf</module>
<module>../idp-conf-impl</module>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list