[java-identity-provider] 02/02: All plugin modules are IMPL

[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=61cfe4d4ad3ee7503be4dae790d01909ee5953a2

commit 61cfe4d4ad3ee7503be4dae790d01909ee5953a2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Sep 19 16:27:41 2020 +0100

    All plugin modules are IMPL
---
 idp-distribution/src/main/resources/bin/plugin.bat  |  2 +-
 idp-distribution/src/main/resources/bin/plugin.sh   |  2 +-
 .../plugin/{ => impl}/PluginInstallerArguments.java |  2 +-
 .../plugin/{ => impl}/PluginInstallerCLI.java       |  3 +--
 .../idp/installer/plugin/package-info.java          | 21 ---------------------
 .../installer/plugin/{ => impl}/BasePluginTest.java |  2 +-
 .../installer/plugin/{ => impl}/PluginCLITest.java  |  3 ++-
 .../installer/plugin/impl/PluginInstallerTest.java  |  1 -
 8 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/idp-distribution/src/main/resources/bin/plugin.bat b/idp-distribution/src/main/resources/bin/plugin.bat
index 5294c77cc..44b2dd51b 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\runclass.bat" net.shibboleth.idp.installer.plugin.impl.PluginInstallerCLI --home "%~dp0\.." %*
diff --git a/idp-distribution/src/main/resources/bin/plugin.sh b/idp-distribution/src/main/resources/bin/plugin.sh
index d62ccd65c..38161f961 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/runclass.sh net.shibboleth.idp.installer.plugin.impl.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/impl/PluginInstallerArguments.java
similarity index 99%
rename from idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/PluginInstallerArguments.java
rename to idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerArguments.java
index b385fc3a1..27ad886f0 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/impl/PluginInstallerArguments.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.installer.plugin;
+package net.shibboleth.idp.installer.plugin.impl;
 
 import java.io.File;
 import java.io.PrintStream;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/PluginInstallerCLI.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
similarity index 99%
rename from idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/PluginInstallerCLI.java
rename to idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
index ddb1f46e6..7c7d93557 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/PluginInstallerCLI.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerCLI.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.installer.plugin;
+package net.shibboleth.idp.installer.plugin.impl;
 
 import java.nio.file.Path;
 import java.security.Security;
@@ -39,7 +39,6 @@ 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.plugin.impl.PluginInstaller;
 import net.shibboleth.idp.plugin.PluginDescription;
 import net.shibboleth.idp.plugin.PluginSupport.SupportLevel;
 import net.shibboleth.idp.plugin.PluginVersion;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/package-info.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/package-info.java
deleted file mode 100644
index e55aa839e..000000000
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements.  See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/**
- * Public Classes for handling plugins.
- */
-package net.shibboleth.idp.installer.plugin;
-
diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/BasePluginTest.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/BasePluginTest.java
similarity index 98%
rename from idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/BasePluginTest.java
rename to idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/BasePluginTest.java
index 50188dfe2..5b377e467 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/BasePluginTest.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/BasePluginTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.installer.plugin;
+package net.shibboleth.idp.installer.plugin.impl;
 
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/PluginCLITest.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginCLITest.java
similarity index 97%
rename from idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/PluginCLITest.java
rename to idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginCLITest.java
index eebc2b35d..efe4ed1e4 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/PluginCLITest.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginCLITest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.installer.plugin;
+package net.shibboleth.idp.installer.plugin.impl;
 
 import static org.testng.Assert.assertEquals;
 
@@ -36,6 +36,7 @@ import net.shibboleth.ext.spring.cli.AbstractCommandLine;
 import net.shibboleth.ext.spring.resource.HTTPResource;
 import net.shibboleth.idp.installer.ProgressReportingOutputStream;
 import net.shibboleth.idp.installer.plugin.impl.PluginInstaller;
+import net.shibboleth.idp.installer.plugin.impl.PluginInstallerCLI;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
 
 @SuppressWarnings("javadoc")
diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerTest.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerTest.java
index 4f2281d21..48b2e1da4 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerTest.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerTest.java
@@ -35,7 +35,6 @@ import org.slf4j.LoggerFactory;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import net.shibboleth.idp.installer.plugin.BasePluginTest;
 import net.shibboleth.idp.plugin.AbstractPluginDescription;
 import net.shibboleth.idp.plugin.PluginDescription;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;

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