[java-identity-provider] branch main updated: SpringCLI applications no longer require an input. So don't add one

[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=bd874ce51ab7fdce69a88e4c00f8b4e30a73f4f5

The following commit(s) were added to refs/heads/main by this push:
       new  bd874ce51 SpringCLI applications no longer require an input.  So don't add one
bd874ce51 is described below

commit bd874ce51ab7fdce69a88e4c00f8b4e30a73f4f5
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Sep 16 16:14:57 2020 +0100

    SpringCLI applications no longer require an input.  So don't add one
---
 .../src/main/resources/conf/admin/plugin-installer.xml    | 15 ---------------
 idp-distribution/src/main/resources/bin/plugin.bat        |  2 +-
 idp-distribution/src/main/resources/bin/plugin.sh         |  2 +-
 .../idp/installer/plugin/PluginInstallerArguments.java    |  4 ++++
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/admin/plugin-installer.xml b/idp-conf/src/main/resources/conf/admin/plugin-installer.xml
deleted file mode 100644
index ab93e1f31..000000000
--- a/idp-conf/src/main/resources/conf/admin/plugin-installer.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
-    default-init-method="initialize"
-    default-destroy-method="destroy">
-
-    <!--
-    <bean id="MyHttpClient" parent="shibboleth.HttpClientFactory"/>
-    -->
-</beans>
\ No newline at end of file
diff --git a/idp-distribution/src/main/resources/bin/plugin.bat b/idp-distribution/src/main/resources/bin/plugin.bat
index de299dde3..5294c77cc 100644
--- a/idp-distribution/src/main/resources/bin/plugin.bat
+++ b/idp-distribution/src/main/resources/bin/plugin.bat
@@ -1,4 +1,4 @@
 @echo off
 setlocal
 
-"%~dp0\runclass.bat" net.shibboleth.idp.installer.plugin.PluginInstallerCLI --home "%~dp0\.." "%~dp0\..\conf\admin\plugin-installer.xml" %*
+"%~dp0\runclass.bat" net.shibboleth.idp.installer.plugin.PluginInstallerCLI --home "%~dp0\.." %*
diff --git a/idp-distribution/src/main/resources/bin/plugin.sh b/idp-distribution/src/main/resources/bin/plugin.sh
index 5eeb562c2..d62ccd65c 100644
--- a/idp-distribution/src/main/resources/bin/plugin.sh
+++ b/idp-distribution/src/main/resources/bin/plugin.sh
@@ -4,4 +4,4 @@ declare LOCATION
 
 LOCATION=$(dirname $0)
 
-$LOCATION/runclass.sh net.shibboleth.idp.installer.plugin.PluginInstallerCLI --home "$LOCATION/.." $LOCATION/../conf/admin/plugin-installer.xml "$@"
+$LOCATION/runclass.sh net.shibboleth.idp.installer.plugin.PluginInstallerCLI --home "$LOCATION/.." "$@"
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/PluginInstallerArguments.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/PluginInstallerArguments.java
index e025ff24d..b385fc3a1 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/PluginInstallerArguments.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/PluginInstallerArguments.java
@@ -175,6 +175,10 @@ public class PluginInstallerArguments extends AbstractIdPHomeAwareCommandLineArg
     public void validate() throws IllegalArgumentException {
         super.validate();
 
+        if (getHttpClientSecurityParameterstName() != null) {
+            getLog().error("-hs / --http-security ignored");
+        }
+
         final List<String> otherArgs = getOtherArgs();
         if (otherArgs.size() > 1) {
             final StringBuffer output = new StringBuffer().append('"');

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