[java-idp-plugin-scripting] 01/02: IDP-1595 Comvert Nashorn 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=c3b2b5fa6d4087850af61bf4bd2e261d1a15706e

commit c3b2b5fa6d4087850af61bf4bd2e261d1a15706e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jul 15 15:23:57 2020 +0100

    IDP-1595 Comvert Nashorn plugin to new API
    
    https://issues.shibboleth.net/jira/browse/IDP-1595
---
 nashorn-impl/pom.xml                               | 38 +++++++++++++---------
 .../scripting/nashorn/NashornDescription.java      |  3 +-
 ...=> net.shibboleth.idp.plugin.PluginDescription} |  0
 .../idp/plugin/scripting/nashorn/PluginTest.java   |  4 +--
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/nashorn-impl/pom.xml b/nashorn-impl/pom.xml
index a806aa9..bd561c9 100644
--- a/nashorn-impl/pom.xml
+++ b/nashorn-impl/pom.xml
@@ -26,15 +26,21 @@
     <dependencies>
 	<!-- All dependencies except the api and the dependencies of graal 
 	     (NOT GRAAL itself) are provided and test -->
-	<dependency>
+    	<dependency>
             <groupId>net.shibboleth.idp.plugin.scripting</groupId>
             <artifactId>idp-plugin-scripting-api</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-	    <groupId>net.shibboleth.utilities</groupId>
-	    <artifactId>java-support</artifactId>
+            <groupId>net.shibboleth.idp</groupId>
+            <artifactId>idp-admin-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.shibboleth.utilities</groupId>
+            <artifactId>java-support</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -43,26 +49,26 @@
 	    <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>
+        <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
-	    <scope>provided</scope>
-	</dependency>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-beans</artifactId>
-	    <scope>provided</scope>
+           <scope>provided</scope>
         </dependency>
 
-	<dependency>
+	    <dependency>
             <groupId>org.graalvm.sdk</groupId>
             <artifactId>graal-sdk</artifactId>
-	    <scope>provided</scope>
+            <scope>provided</scope>
             <version>${graalvm.version}</version>
         </dependency>
         <dependency>
@@ -72,10 +78,10 @@
             <scope>provided</scope>
         </dependency>
 
-	<dependency>
-	    <groupId>${idp.groupId}</groupId>
-	    <artifactId>idp-installer</artifactId>
-	    <scope>test</scope>
+        <dependency>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-admin-impl</artifactId>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>
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/NashornDescription.java
index 82663f3..01f1664 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/NashornDescription.java
@@ -25,8 +25,9 @@ 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/nashorn-impl/src/main/resources/META-INF/services/net.shibboleth.utilities.java.support.plugin.PluginDescription b/nashorn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription
similarity index 100%
rename from nashorn-impl/src/main/resources/META-INF/services/net.shibboleth.utilities.java.support.plugin.PluginDescription
rename to nashorn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.PluginDescription
diff --git a/nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/PluginTest.java b/nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/PluginTest.java
index e22831e..78e3565 100644
--- a/nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/PluginTest.java
+++ b/nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/PluginTest.java
@@ -28,10 +28,10 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import net.shibboleth.ext.spring.resource.HTTPResource;
-import net.shibboleth.idp.installer.plugin.impl.PluginState;
+import net.shibboleth.idp.plugin.PluginDescription;
+import net.shibboleth.idp.plugin.impl.PluginState;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
-import net.shibboleth.utilities.java.support.plugin.PluginDescription;
 
 /**  basic sanity tests */
 @SuppressWarnings("javadoc")

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