[java-idp-plugin-scripting] branch main updated: Rename main plugin interface and classes.

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

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

The following commit(s) were added to refs/heads/main by this push:
       new  73b9fc7   Rename main plugin interface and classes.
73b9fc7 is described below

commit 73b9fc75e51cc666310e02ef57196beefb28ea85
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 1 12:14:47 2020 -0400

    Rename main plugin interface and classes.
---
 .../nashorn/{NashornDescription.java => NashornPlugin.java}    | 10 +++++-----
 .../META-INF/services/net.shibboleth.idp.plugin.IdPPlugin      |  1 +
 .../services/net.shibboleth.idp.plugin.PluginDescription       |  1 -
 .../rhino/{RhinoDescription.java => RhinoPlugin.java}          | 10 +++++-----
 .../META-INF/services/net.shibboleth.idp.plugin.IdPPlugin      |  1 +
 .../services/net.shibboleth.idp.plugin.PluginDescription       |  1 -
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornPlugin.java
similarity index 94%
rename from nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java
rename to nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornPlugin.java
index 768cb43..d028ea8 100644
--- a/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java
+++ b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornPlugin.java
@@ -26,7 +26,7 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.shibboleth.idp.plugin.AbstractPluginDescription;
+import net.shibboleth.idp.plugin.AbstractIdPPlugin;
 import net.shibboleth.idp.plugin.PluginVersion;
 import net.shibboleth.idp.plugin.scripting.Version;
 import net.shibboleth.utilities.java.support.collection.Pair;
@@ -35,7 +35,7 @@ import net.shibboleth.utilities.java.support.collection.Pair;
  * Details about the nashorn scripting plugin
  *
  */
-public class NashornDescription extends AbstractPluginDescription {
+public class NashornPlugin extends AbstractIdPPlugin {
 
     static final String GRAAL_VERSION = "20.0.0";
     static final String MAVEN_REPO = "https://repo1.maven.org/maven2/";
@@ -44,11 +44,11 @@ public class NashornDescription extends AbstractPluginDescription {
     final private PluginVersion myVersion;
 
     /** Constructor. */
-    public NashornDescription() {
+    public NashornPlugin() {
         final String versionAsString = Version.getVersion();
         if (versionAsString == null) {
-            final Logger log = LoggerFactory.getLogger(NashornDescription.class);
-            log.warn("{} must be run from a jar, taking a version of 0.1.2", NashornDescription.class);
+            final Logger log = LoggerFactory.getLogger(NashornPlugin.class);
+            log.warn("{} must be run from a jar, taking a version of 0.1.2", NashornPlugin.class);
             myVersion = new PluginVersion(0,1,2);
         } else {
             myVersion = new PluginVersion(versionAsString);
diff --git a/nashorn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin b/nashorn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
new file mode 100644
index 0000000..355fd53
--- /dev/null
+++ b/nashorn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
@@ -0,0 +1 @@
+net.shibboleth.idp.plugin.scripting.nashorn.NashornPlugin
diff --git a/nashorn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription b/nashorn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription
deleted file mode 100644
index 48421e4..0000000
--- a/nashorn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription
+++ /dev/null
@@ -1 +0,0 @@
-net.shibboleth.idp.plugin.scripting.nashorn.NashornDescription
diff --git a/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoPlugin.java
similarity index 91%
rename from rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java
rename to rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoPlugin.java
index 1ee8db4..e60528c 100644
--- a/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java
+++ b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoPlugin.java
@@ -28,7 +28,7 @@ import javax.annotation.Nonnull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.shibboleth.idp.plugin.AbstractPluginDescription;
+import net.shibboleth.idp.plugin.AbstractIdPPlugin;
 import net.shibboleth.idp.plugin.PluginVersion;
 import net.shibboleth.idp.plugin.scripting.Version;
 import net.shibboleth.utilities.java.support.collection.Pair;
@@ -36,17 +36,17 @@ import net.shibboleth.utilities.java.support.collection.Pair;
 /**
  * Details about the Rhino scripting plugin.
  */
-public class RhinoDescription extends AbstractPluginDescription {
+public class RhinoPlugin extends AbstractIdPPlugin {
 
     /** the version pof this plugin. */
     @Nonnull final private PluginVersion myVersion;
 
     /** Constructor. */
-    public RhinoDescription() {
+    public RhinoPlugin() {
         final String versionAsString = Version.getVersion();
         if (versionAsString == null) {
-            final Logger log = LoggerFactory.getLogger(RhinoDescription.class);
-            log.warn("{} must be run from a jar, taking a version of 0.1.2", RhinoDescription.class);
+            final Logger log = LoggerFactory.getLogger(RhinoPlugin.class);
+            log.warn("{} must be run from a jar, taking a version of 0.1.2", RhinoPlugin.class);
             myVersion = new PluginVersion(0,1,2);
         } else {
             myVersion = new PluginVersion(versionAsString);
diff --git a/rhino-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin b/rhino-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
new file mode 100644
index 0000000..b47762c
--- /dev/null
+++ b/rhino-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
@@ -0,0 +1 @@
+net.shibboleth.idp.plugin.scripting.rhino.RhinoPlugin
diff --git a/rhino-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription b/rhino-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription
deleted file mode 100644
index b34b662..0000000
--- a/rhino-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription
+++ /dev/null
@@ -1 +0,0 @@
-net.shibboleth.idp.plugin.scripting.rhino.RhinoDescription

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