[java-identity-provider] 03/03: Extend help for IdPInstallerCLI

[Rod Widdowson]

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=b61f88efd7bee6a6928bb665c63513e2fc455cdc

commit b61f88efd7bee6a6928bb665c63513e2fc455cdc
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jun 2 17:27:53 2023 +0100

    Extend help for IdPInstallerCLI
---
 .../idp/installer/impl/IdPInstallerArguments.java          |  5 +++++
 .../net/shibboleth/idp/installer/TestInstallerCLI.java     | 14 ++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/IdPInstallerArguments.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/IdPInstallerArguments.java
index e89c2d94d..c2dd8861e 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/IdPInstallerArguments.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/IdPInstallerArguments.java
@@ -188,7 +188,12 @@ public class IdPInstallerArguments extends AbstractCommandLineArguments {
         out.println();
         out.println(String.format("  %-22s %s", "-t, --targetDir", "Where to install the IdP or location to update"));
         out.println(String.format("  %-22s %s", "--propertyFile", "Property file containing other parameterization"));
+        out.println(String.format("  %-22s %s", "-h, --hostName", "DNS name for the IdP"));
+        out.println(String.format("  %-22s %s", "-e, --entityID", "Entity ID for the IdP"));
+        out.println(String.format("  %-22s %s", "-kp, --keystorePassword", "Password for the generated KeyStore"));
+        out.println(String.format("  %-22s %s", "-sp, --slearePassword", "Password for the generated Data Sealer"));
         out.println(String.format("  %-22s %s", "--noPrompt", "Unattended Install"));
+
         out.println(String.format("  %-22s %s", "-hc, --http-client", "Bean name for an http client (for Module and Plugin Operations"));
         out.println(String.format("  %-22s %s", "-hs, --http-securityt", "Bean name for http security parameters (for Module and Plugin Operations"));
         out.println();
diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/TestInstallerCLI.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/TestInstallerCLI.java
index d441fec9d..1848a2216 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/TestInstallerCLI.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/TestInstallerCLI.java
@@ -34,30 +34,24 @@ public class TestInstallerCLI {
         System.setProperty(InstallerProperties.SEALER_PASSWORD, "p1");
         System.setProperty(InstallerProperties.HOST_NAME, "machine.org.uk");
         System.setProperty(InstallerProperties.TARGET_DIR,  "h:\\downloads\\idp");
-//        System.setProperty(InstallerProperties.SEALER_KEYSIZE, "256");
         IdPInstallerCLI.runMain(new String[] {
+                "-t", "h:\\downloads\\idp",
                 "-s",
                 "h:\\Perforce\\Juno\\V5\\java-identity-provider\\idp-distribution\\target\\shibboleth-identity-provider-5.0.0-SNAPSHOT",
-                "--home", "classpath:/net/shibboleth/idp/module",
-                "-hc", "shibboleth.InternalHttpClient"
                });
     }
 
     @Test(enabled = false)
     public void silentInstall() {
 
-        System.setProperty(InstallerProperties.KEY_STORE_PASSWORD, "p1");
-        System.setProperty(InstallerProperties.SEALER_PASSWORD, "p1");
-        System.setProperty(InstallerProperties.HOST_NAME, "machine.org.uk");
- //       System.setProperty(InstallerProperties.TARGET_DIR,  "h:\\downloads\\idp");
-//        System.setProperty(InstallerProperties.SEALER_KEYSIZE, "256");
         IdPInstallerCLI.runMain(new String[] {
                 "-ks", "p1",
                 "--sealerPassword", "p1",
                 "-e", "https://test.example.org/id",
-                "-h", "machine.org",
+                "--hostName", "machine.org",
                 "--scope", "machine.org",
-                "-t", "h:\\downloads\\idp",
+                "--noPrompt",
+                "-t", "h:\\downloads\\idp2",
                 "-s", "h:\\Perforce\\Juno\\V5\\java-identity-provider\\idp-distribution\\target\\shibboleth-identity-provider-5.0.0-SNAPSHOT",
                 "-hc", "shibboleth.InternalHttpClient"
                });

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.