[java-identity-provider] branch main updated: IDP-1679 Move PluginState from admin-impl to installer (impl)
Rod Widdowson
rdw at steadingsoftware.com
Thu Sep 24 09:57:36 UTC 2020
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=4c7fb502021d060152a911918f9b90704878b403
The following commit(s) were added to refs/heads/main by this push:
new 4c7fb5020 IDP-1679 Move PluginState from admin-impl to installer (impl)
4c7fb5020 is described below
commit 4c7fb502021d060152a911918f9b90704878b403
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Sep 23 16:56:02 2020 +0100
IDP-1679 Move PluginState from admin-impl to installer (impl)
https://issues.shibboleth.net/jira/browse/IDP-1679
---
.../shibboleth/idp/plugin/impl/package-info.java | 21 ---------------------
.../idp/plugin/impl/testing/package-info.java | 21 ---------------------
.../installer/plugin/impl/PluginInstallerCLI.java | 3 +--
.../idp/installer}/plugin/impl/PluginState.java | 2 +-
.../idp/installer}/plugin/impl/PluginStateTest.java | 3 +--
.../idp/installer/plugin/impl}/TestPlugin.java | 2 +-
.../net/shibboleth/idp/plugin/plugins.props | 0
7 files changed, 4 insertions(+), 48 deletions(-)
diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/plugin/impl/package-info.java b/idp-admin-impl/src/main/java/net/shibboleth/idp/plugin/impl/package-info.java
deleted file mode 100644
index 7df4a807e..000000000
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/plugin/impl/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.
- */
-/**
- * Implementation classes for handling plugins.
- */
-
-package net.shibboleth.idp.plugin.impl;
\ No newline at end of file
diff --git a/idp-admin-impl/src/test/java/net/shibboleth/idp/plugin/impl/testing/package-info.java b/idp-admin-impl/src/test/java/net/shibboleth/idp/plugin/impl/testing/package-info.java
deleted file mode 100644
index e63e21759..000000000
--- a/idp-admin-impl/src/test/java/net/shibboleth/idp/plugin/impl/testing/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.
- */
-/**
- *
- */
-
-package net.shibboleth.idp.plugin.impl.testing;
\ No newline at end of file
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 4beffa8ca..d11feca42 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
@@ -39,11 +39,10 @@ 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.PluginState.VersionInfo;
import net.shibboleth.idp.plugin.PluginDescription;
import net.shibboleth.idp.plugin.PluginSupport.SupportLevel;
import net.shibboleth.idp.plugin.PluginVersion;
-import net.shibboleth.idp.plugin.impl.PluginState;
-import net.shibboleth.idp.plugin.impl.PluginState.VersionInfo;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/plugin/impl/PluginState.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginState.java
similarity index 99%
rename from idp-admin-impl/src/main/java/net/shibboleth/idp/plugin/impl/PluginState.java
rename to idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginState.java
index d3c2fa228..e876e2348 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/plugin/impl/PluginState.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginState.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.impl;
+package net.shibboleth.idp.installer.plugin.impl;
import java.io.IOException;
import java.net.MalformedURLException;
diff --git a/idp-admin-impl/src/test/java/net/shibboleth/idp/plugin/impl/PluginStateTest.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginStateTest.java
similarity index 97%
rename from idp-admin-impl/src/test/java/net/shibboleth/idp/plugin/impl/PluginStateTest.java
rename to idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginStateTest.java
index d4a1a4186..9636c5720 100644
--- a/idp-admin-impl/src/test/java/net/shibboleth/idp/plugin/impl/PluginStateTest.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/PluginStateTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.impl;
+package net.shibboleth.idp.installer.plugin.impl;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
@@ -31,7 +31,6 @@ import org.testng.annotations.Test;
import net.shibboleth.idp.plugin.PluginDescription;
import net.shibboleth.idp.plugin.PluginVersion;
-import net.shibboleth.idp.plugin.impl.testing.TestPlugin;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
diff --git a/idp-admin-impl/src/test/java/net/shibboleth/idp/plugin/impl/testing/TestPlugin.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/TestPlugin.java
similarity index 97%
rename from idp-admin-impl/src/test/java/net/shibboleth/idp/plugin/impl/testing/TestPlugin.java
rename to idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/TestPlugin.java
index 36e302ce6..fa709b474 100644
--- a/idp-admin-impl/src/test/java/net/shibboleth/idp/plugin/impl/testing/TestPlugin.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/TestPlugin.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.impl.testing;
+package net.shibboleth.idp.installer.plugin.impl;
import java.io.IOException;
import java.net.URL;
diff --git a/idp-admin-impl/src/test/resources/net/shibboleth/idp/plugin/plugins.props b/idp-installer/src/test/resources/net/shibboleth/idp/plugin/plugins.props
similarity index 100%
rename from idp-admin-impl/src/test/resources/net/shibboleth/idp/plugin/plugins.props
rename to idp-installer/src/test/resources/net/shibboleth/idp/plugin/plugins.props
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list