[java-idp-plugin-metadatagen] 04/06: Finish coping with the moved sources and names. Plugin appears to work

[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-metadatagen.

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

commit 91bfe8fc2a429e05e5cd38b9a0f5f469e0ba89c0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jun 3 16:43:02 2021 +0100

    Finish coping with the moved sources and names.  Plugin appears to work
---
 metadatagen-dist/src/main/assembly/assembly.xml                         | 2 +-
 .../resources/META-INF/services/net.shibboleth.idp.module.IdPModule     | 2 +-
 .../resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin     | 2 +-
 .../net/shibboleth/idp/plugin/metadatagen/{ => impl}/module.properties  | 2 +-
 .../net/shibboleth/idp/plugin/metadatagen/{ => impl}/plugin.properties  | 0
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/metadatagen-dist/src/main/assembly/assembly.xml b/metadatagen-dist/src/main/assembly/assembly.xml
index 58e7eea..a8b3fd3 100644
--- a/metadatagen-dist/src/main/assembly/assembly.xml
+++ b/metadatagen-dist/src/main/assembly/assembly.xml
@@ -17,7 +17,7 @@
 
         <!-- The plugin property file -->
 		<fileSet>			
-			<directory>../metadatagen-impl/target/classes/net/shibboleth/idp/plugin/metadatagen</directory>
+			<directory>../metadatagen-impl/target/classes/net/shibboleth/idp/plugin/metadatagen/impl</directory>
 			<outputDirectory>bootstrap</outputDirectory>
 			<includes>
 				<include>plugin.properties</include>
diff --git a/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule b/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
index a3d2ddd..31d3f43 100644
--- a/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
+++ b/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
@@ -1 +1 @@
-net.shibboleth.idp.plugin.metadatagen.MetadataGenModule
+net.shibboleth.idp.plugin.metadatagen.impl.MetadataGenModule
diff --git a/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin b/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
index b819685..37a62a4 100644
--- a/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
+++ b/metadatagen-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
@@ -1,2 +1,2 @@
-net.shibboleth.idp.plugin.metadatagen.MetadataGenPlugin
+net.shibboleth.idp.plugin.metadatagen.impl.MetadataGenPlugin
   
\ No newline at end of file
diff --git a/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/module.properties b/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/impl/module.properties
similarity index 89%
rename from metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/module.properties
rename to metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/impl/module.properties
index 4c17768..bfb717f 100644
--- a/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/module.properties
+++ b/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/impl/module.properties
@@ -1,7 +1,7 @@
 # Example Properties defining an authentication module.
 
 # Class to Module ID mappings
-net.shibboleth.idp.plugin.metadatagen.MetadataGenModule = idp.metadatagen
+net.shibboleth.idp.plugin.metadatagen.impl.MetadataGenModule = idp.metadatagen
 
 # Module Owner
 idp.metadatagen.plugin = net.shibboleth.idp.plugin.metadatagen
diff --git a/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/plugin.properties b/metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/impl/plugin.properties
similarity index 100%
rename from metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/plugin.properties
rename to metadatagen-impl/src/main/resources/net/shibboleth/idp/plugin/metadatagen/impl/plugin.properties

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