[java-idp-plugin-totp] branch main updated: Plugin Installer Changes

[Rod Widdowson]

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

rdw 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=ae98d1273756cb45e6d7fe62292f89ac4ede4379

The following commit(s) were added to refs/heads/main by this push:
       new  ae98d12   Plugin Installer Changes
ae98d12 is described below

commit ae98d1273756cb45e6d7fe62292f89ac4ede4379
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Oct 10 16:55:10 2020 +0100

    Plugin Installer Changes
    
    Webapp contents go to a directory called webapp (not edit-webapp)
    The license goes into the impl jar and the property file points to it.
---
 totp-dist/src/main/assembly/plugin-assembly-tgz.xml                   | 4 ++--
 totp-dist/src/main/assembly/plugin-assembly-zip.xml                   | 4 ++--
 .../net/shibboleth/idp/plugin/authn/totp}/doc/GoogleAuth-LICENSE.txt  | 0
 .../resources/net/shibboleth/idp/plugin/authn/totp/plugin.properties  | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/totp-dist/src/main/assembly/plugin-assembly-tgz.xml b/totp-dist/src/main/assembly/plugin-assembly-tgz.xml
index 646ed79..2d4f928 100644
--- a/totp-dist/src/main/assembly/plugin-assembly-tgz.xml
+++ b/totp-dist/src/main/assembly/plugin-assembly-tgz.xml
@@ -6,7 +6,7 @@
     <fileSets>
         <fileSet>
             <directory>../totp-impl/target</directory>
-            <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+            <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
             <includes>
                 <include>idp-plugin-totp-impl-*.jar</include>
             </includes>
@@ -18,7 +18,7 @@
         </fileSet>
         <fileSet>
             <directory>../totp-impl/target/dependency</directory>
-            <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+            <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
             <includes>
                 <include>*.jar</include>
             </includes>
diff --git a/totp-dist/src/main/assembly/plugin-assembly-zip.xml b/totp-dist/src/main/assembly/plugin-assembly-zip.xml
index 13fd1b7..9a305d3 100644
--- a/totp-dist/src/main/assembly/plugin-assembly-zip.xml
+++ b/totp-dist/src/main/assembly/plugin-assembly-zip.xml
@@ -6,7 +6,7 @@
     <fileSets>
         <fileSet>
             <directory>../totp-impl/target</directory>
-            <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+            <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
             <includes>
                 <include>idp-plugin-totp-impl-*.jar</include>
             </includes>
@@ -18,7 +18,7 @@
         </fileSet>
         <fileSet>
             <directory>../totp-impl/target/dependency</directory>
-            <outputDirectory>edit-webapp/WEB-INF/lib</outputDirectory>
+            <outputDirectory>webapp/WEB-INF/lib</outputDirectory>
             <includes>
                 <include>*.jar</include>
             </includes>
diff --git a/totp-dist/src/main/resources/doc/GoogleAuth-LICENSE.txt b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/doc/GoogleAuth-LICENSE.txt
similarity index 100%
rename from totp-dist/src/main/resources/doc/GoogleAuth-LICENSE.txt
rename to totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/doc/GoogleAuth-LICENSE.txt
diff --git a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/plugin.properties b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/plugin.properties
index 97e6e32..c740406 100644
--- a/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/plugin.properties
+++ b/totp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/totp/plugin.properties
@@ -3,6 +3,7 @@
 plugin.id = net.shibboleth.idp.plugin.authn.totp
 # Only used when package manifest is not available
 plugin.version = 1.0.0
+plugin.license =/net/shibboleth/idp/plugin/authn/totp/doc/GoogleAuth-LICENSE.txt
 
 # No prereqs
-#plugin.modules.required =
\ No newline at end of file
+#plugin.modules.required =

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