[java-idp-plugin-oidc-config] branch main updated: Fix package structure
Phil Smart
philip.smart at jisc.ac.uk
Thu Feb 9 17:47:45 UTC 2023
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch main
in repository java-idp-plugin-oidc-config.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-oidc-config.git;a=commit;h=1c03d107e97c18b2708e224a15f5cec2be15ed24
The following commit(s) were added to refs/heads/main by this push:
new 1c03d10 Fix package structure
1c03d10 is described below
commit 1c03d107e97c18b2708e224a15f5cec2be15ed24
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Thu Feb 9 17:47:39 2023 +0000
Fix package structure
---
pom.xml | 1 +
.../net/shibboleth/idp/{ => plugin}/oidc/config/OIDCConfigModule.java | 4 ++--
.../net/shibboleth/idp/{ => plugin}/oidc/config/OIDCConfigPlugin.java | 3 ++-
.../net/shibboleth/idp/{ => plugin}/oidc/config/package-info.java | 2 +-
.../{oidc/common => idp/plugin/oidc}/config/module.properties | 2 +-
.../{oidc/common => idp/plugin/oidc}/config/plugin.properties | 0
.../resources/META-INF/services/net.shibboleth.idp.module.IdPModule | 2 +-
.../resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin | 2 +-
8 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8a5e96a..c005977 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,7 @@
<artifactId>parent</artifactId>
<version>11.3.5</version>
</parent>
+ <!-- Should group id have plugin in it? -->
<groupId>net.shibboleth.idp.oidc</groupId>
<artifactId>idp-plugin-oidc-config</artifactId>
<version>0.0.1-SNAPSHOT</version>
diff --git a/src/main/java/net/shibboleth/idp/oidc/config/OIDCConfigModule.java b/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule.java
similarity index 93%
rename from src/main/java/net/shibboleth/idp/oidc/config/OIDCConfigModule.java
rename to src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule.java
index 3a504a6..8557b47 100644
--- a/src/main/java/net/shibboleth/idp/oidc/config/OIDCConfigModule.java
+++ b/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigModule.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package net.shibboleth.idp.oidc.config;
+package net.shibboleth.idp.plugin.oidc.config;
import java.io.IOException;
import net.shibboleth.idp.module.ModuleException;
import net.shibboleth.idp.module.impl.PluginIdPModule;
-/** OIDC Common module implementation.*/
+/** OIDC/OAuth shared configuration module.*/
public class OIDCConfigModule extends PluginIdPModule {
/**
diff --git a/src/main/java/net/shibboleth/idp/oidc/config/OIDCConfigPlugin.java b/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigPlugin.java
similarity index 95%
rename from src/main/java/net/shibboleth/idp/oidc/config/OIDCConfigPlugin.java
rename to src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigPlugin.java
index c944cd6..3367e2d 100644
--- a/src/main/java/net/shibboleth/idp/oidc/config/OIDCConfigPlugin.java
+++ b/src/main/java/net/shibboleth/idp/plugin/oidc/config/OIDCConfigPlugin.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.oidc.config;
+package net.shibboleth.idp.plugin.oidc.config;
import java.io.IOException;
import java.util.Collections;
@@ -25,6 +25,7 @@ import net.shibboleth.idp.module.ModuleException;
import net.shibboleth.idp.plugin.PluginException;
import net.shibboleth.idp.plugin.impl.FirstPartyIdPPlugin;
+/** OIDC/OAuth shared configuration plugin.*/
public class OIDCConfigPlugin extends FirstPartyIdPPlugin{
diff --git a/src/main/java/net/shibboleth/idp/oidc/config/package-info.java b/src/main/java/net/shibboleth/idp/plugin/oidc/config/package-info.java
similarity index 95%
rename from src/main/java/net/shibboleth/idp/oidc/config/package-info.java
rename to src/main/java/net/shibboleth/idp/plugin/oidc/config/package-info.java
index 91e8d40..44bf245 100644
--- a/src/main/java/net/shibboleth/idp/oidc/config/package-info.java
+++ b/src/main/java/net/shibboleth/idp/plugin/oidc/config/package-info.java
@@ -19,4 +19,4 @@
* Plugin and module information about the OIDC common IdP configuration library.
*/
-package net.shibboleth.idp.oidc.config;
\ No newline at end of file
+package net.shibboleth.idp.plugin.oidc.config;
\ No newline at end of file
diff --git a/src/main/resources/META-INF/net/shibboleth/oidc/common/config/module.properties b/src/main/resources/META-INF/net/shibboleth/idp/plugin/oidc/config/module.properties
similarity index 82%
rename from src/main/resources/META-INF/net/shibboleth/oidc/common/config/module.properties
rename to src/main/resources/META-INF/net/shibboleth/idp/plugin/oidc/config/module.properties
index b77fe3b..cc42767 100644
--- a/src/main/resources/META-INF/net/shibboleth/oidc/common/config/module.properties
+++ b/src/main/resources/META-INF/net/shibboleth/idp/plugin/oidc/config/module.properties
@@ -1,7 +1,7 @@
# Properties defining this module.
# Class to Module ID mappings
-net.shibboleth.oidc.common.config.idp.OIDCCommonConfigModule = idp.oidc.config.1
+net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule = idp.oidc.config.1
# Module Owner
idp.oidc.config.1.plugin = net.shibboleth.idp.plugin.oidc.config
diff --git a/src/main/resources/META-INF/net/shibboleth/oidc/common/config/plugin.properties b/src/main/resources/META-INF/net/shibboleth/idp/plugin/oidc/config/plugin.properties
similarity index 100%
rename from src/main/resources/META-INF/net/shibboleth/oidc/common/config/plugin.properties
rename to src/main/resources/META-INF/net/shibboleth/idp/plugin/oidc/config/plugin.properties
diff --git a/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule b/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
index 91ae79e..b9ad9b3 100644
--- a/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
+++ b/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
@@ -1 +1 @@
-net.shibboleth.idp.oidc.config.OIDCConfigModule
+net.shibboleth.idp.plugin.oidc.config.OIDCConfigModule
diff --git a/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin b/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
index a6f4064..4f5c26c 100644
--- a/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
+++ b/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
@@ -1 +1 @@
-net.shibboleth.idp.oidc.config.OIDCConfigPlugin
+net.shibboleth.idp.plugin.oidc.config.OIDCConfigPlugin
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list