[java-idp-plugin-totp] branch main updated: Relocate POM coordinates, move license back to dist, rebase module.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-idp-plugin-totp.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-totp.git;a=commit;h=b04aad4419a2db8099fdcbc3e27ff45c8e9578bf

The following commit(s) were added to refs/heads/main by this push:
       new  b04aad4   Relocate POM coordinates, move license back to dist, rebase module.
b04aad4 is described below

commit b04aad4419a2db8099fdcbc3e27ff45c8e9578bf
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 30 18:38:51 2020 -0400

    Relocate POM coordinates, move license back to dist, rebase module.
---
 pom.xml                                                          | 2 +-
 totp-dist/pom.xml                                                | 2 +-
 .../src/main/resources}/doc/GoogleAuth-LICENSE.txt               | 0
 totp-impl/pom.xml                                                | 9 ++++++++-
 .../src/main/java/net/shibboleth/idp/plugin/totp/TOTPModule.java | 4 ++--
 .../resources/net/shibboleth/idp/plugin/totp/module.properties   | 5 +----
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 50873e8..68527c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <name>Shibboleth IdP :: Plugins :: TOTP Login Flow</name>
     <description>An IdP plugin providing TOTP login support.</description>
-    <groupId>net.shibboleth.idp.plugin</groupId>
+    <groupId>net.shibboleth.idp.plugin.authn</groupId>
     <artifactId>idp-plugin-totp</artifactId>
     <version>0.0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
diff --git a/totp-dist/pom.xml b/totp-dist/pom.xml
index d768e9c..30463ed 100644
--- a/totp-dist/pom.xml
+++ b/totp-dist/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.shibboleth.idp.plugin</groupId>
+        <groupId>net.shibboleth.idp.plugin.authn</groupId>
         <artifactId>idp-plugin-totp</artifactId>
         <version>0.0.2-SNAPSHOT</version>
     </parent>
diff --git a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/doc/GoogleAuth-LICENSE.txt b/totp-dist/src/main/resources/doc/GoogleAuth-LICENSE.txt
similarity index 100%
rename from totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/doc/GoogleAuth-LICENSE.txt
rename to totp-dist/src/main/resources/doc/GoogleAuth-LICENSE.txt
diff --git a/totp-impl/pom.xml b/totp-impl/pom.xml
index 08b4d38..30bab2f 100644
--- a/totp-impl/pom.xml
+++ b/totp-impl/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.shibboleth.idp.plugin</groupId>
+        <groupId>net.shibboleth.idp.plugin.authn</groupId>
         <artifactId>idp-plugin-totp</artifactId>
         <version>0.0.2-SNAPSHOT</version>
     </parent>
@@ -75,6 +75,13 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- Needed to allow module/plugin derivation. -->
+        <dependency>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-admin-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-messaging-api</artifactId>
diff --git a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPModule.java b/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPModule.java
index 671f81d..2aafd32 100644
--- a/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPModule.java
+++ b/totp-impl/src/main/java/net/shibboleth/idp/plugin/totp/TOTPModule.java
@@ -21,12 +21,12 @@ import java.io.IOException;
 
 import net.shibboleth.idp.module.IdPModule;
 import net.shibboleth.idp.module.ModuleException;
-import net.shibboleth.idp.module.PropertyDrivenIdPModule;
+import net.shibboleth.idp.module.impl.PluginIdPModule;
 
 /**
  * {@link IdPModule} implementation.
  */
-public final class TOTPModule extends PropertyDrivenIdPModule {
+public final class TOTPModule extends PluginIdPModule {
 
     /**
      * Constructor.
diff --git a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/module.properties b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/module.properties
index d67bdac..e28d8c5 100644
--- a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/module.properties
+++ b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/totp/module.properties
@@ -5,7 +5,7 @@ net.shibboleth.idp.plugin.totp.TOTPModule = idp.authn.TOTP
 
 idp.authn.TOTP.name = TOTP Authentication
 idp.authn.TOTP.desc = Login flow for TOTP tokens
-idp.authn.TOTP.url = https://wiki.shibboleth.net/confluence/display/IDPPLUG/TOTPConfiguration
+idp.authn.TOTP.url = /TOTPConfiguration
 idp.authn.TOTP.1.src = /net/shibboleth/idp/plugin/totp/bin/totpauth.bat
 idp.authn.TOTP.1.dest = bin/totpauth.bat
 idp.authn.TOTP.1.replace = true
@@ -16,6 +16,3 @@ idp.authn.TOTP.3.src = /net/shibboleth/idp/plugin/totp/views/totp.vm
 idp.authn.TOTP.3.dest = views/totp.vm
 idp.authn.TOTP.4.src = /net/shibboleth/idp/plugin/totp/views/totp-error.vm
 idp.authn.TOTP.4.dest = views/totp-error.vm
-idp.authn.TOTP.5.src = /net/shibboleth/idp/plugin/totp/doc/GoogleAuth-LICENSE.txt
-idp.authn.TOTP.5.dest = doc/GoogleAuth-LICENSE.txt
-idp.authn.TOTP.5.replace = true

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