[java-idp-plugin-scripting] 02/02: IDP-1595 Comvert Rhino plugin to new API

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-idp-plugin-scripting.

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

commit 0b47b2198abc4f8caad67909b9fa96b902a6b5bb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jul 15 15:27:20 2020 +0100

    IDP-1595 Comvert Rhino plugin to new API
    
    https://issues.shibboleth.net/jira/browse/IDP-1595
---
 rhino-impl/pom.xml                                 | 29 +++++++++++-----------
 .../plugin/scripting/rhino/RhinoDescription.java   |  2 +-
 ...=> net.shibboleth.idp.plugin.PluginDescription} |  0
 .../idp/plugin/scripting/rhino/PluginTest.java     |  4 +--
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/rhino-impl/pom.xml b/rhino-impl/pom.xml
index c0039fe..213e39b 100644
--- a/rhino-impl/pom.xml
+++ b/rhino-impl/pom.xml
@@ -29,6 +29,13 @@
             <artifactId>idp-plugin-scripting-api</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
+        
+        <dependency>
+            <groupId>net.shibboleth.idp</groupId>
+            <artifactId>idp-admin-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.mozilla</groupId>
             <artifactId>rhino</artifactId>
@@ -37,31 +44,25 @@
 
         <dependency>
 	    <groupId>net.shibboleth.utilities</groupId>
-	    <artifactId>java-support</artifactId>
+            <artifactId>java-support</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>net.shibboleth.ext</groupId>
-            <artifactId>spring-extensions</artifactId>
-	    <scope>provided</scope>
-        </dependency>
-        <dependency>
-	    <groupId>${spring.groupId}</groupId>
-	    <artifactId>spring-core</artifactId>
-	    <scope>provided</scope>
+            <groupId>${spring.groupId}</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-	    <groupId>${idp.groupId}</groupId>
-	    <artifactId>idp-installer</artifactId>
-	    <scope>test</scope>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-admin-impl</artifactId>
+            <scope>test</scope>
         </dependency>
 
-
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-beans</artifactId>
-	    <scope>provided</scope>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>
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/RhinoDescription.java
index 984069c..c4e097c 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/RhinoDescription.java
@@ -25,8 +25,8 @@ import java.util.List;
 
 import org.springframework.core.io.ClassPathResource;
 
+import net.shibboleth.idp.plugin.AbstractPluginDescription;
 import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.plugin.AbstractPluginDescription;
 
 /**
  * Details about the nashorn scripting plugin
diff --git a/rhino-impl/src/main/resources/META-INF/services/net.shibboleth.utilities.java.support.plugin.PluginDescription b/rhino-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription
similarity index 100%
rename from rhino-impl/src/main/resources/META-INF/services/net.shibboleth.utilities.java.support.plugin.PluginDescription
rename to rhino-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription
diff --git a/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/PluginTest.java b/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/PluginTest.java
index 5b450a7..b959826 100644
--- a/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/PluginTest.java
+++ b/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/PluginTest.java
@@ -24,9 +24,9 @@ import java.util.ServiceLoader;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import net.shibboleth.idp.installer.plugin.impl.PluginState;
+import net.shibboleth.idp.plugin.impl.PluginState;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.plugin.PluginDescription;
+import net.shibboleth.idp.plugin.PluginDescription;
 
 /**  basic sanity tests */
 @SuppressWarnings("javadoc")

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