[java-idp-plugin-scripting] 01/04: JSCRIPTING-9 Create a scripting plugin distribution which includes the JDK Nashorn
Rod Widdowson
rdw at steadingsoftware.com
Sun Aug 22 13:21:59 UTC 2021
This is an automated email from the git hooks/post-receive script.
rdw 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=7f21ea45363f3408969faa229cfa6fce10557869
commit 7f21ea45363f3408969faa229cfa6fce10557869
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Aug 22 13:42:34 2021 +0100
JSCRIPTING-9 Create a scripting plugin distribution which includes the JDK Nashorn
https://shibboleth.atlassian.net/browse/JSCRIPTING-9
Move the graalVM projects into a suitably labeled directory and name
built artifacts appropriately
---
{nashorn-dist => nashorn-graalvm-dist}/pom.xml | 4 +-
.../src/main/assembly/plugin-assembly-tgz.xml | 8 +--
.../src/main/assembly/plugin-assembly-zip.xml | 8 +--
.../src/main/resources/bootstrap/keys.txt | 0
{nashorn-impl => nashorn-graalvm-impl}/pom.xml | 2 +-
.../idp/plugin/scripting/nashorn/GraalEngine.java | 0
.../idp/plugin/scripting/nashorn/GraalFactory.java | 0
.../plugin/scripting/nashorn/NashornPlugin.java | 0
.../idp/plugin/scripting/nashorn/package-info.java | 0
.../services/javax.script.ScriptEngineFactory | 0
.../services/net.shibboleth.idp.plugin.IdPPlugin | 0
.../idp/plugin/scripting/nashorn/doc/LICENSE.txt | 0
.../idp/plugin/scripting/nashorn/plugin.properties | 0
.../idp/plugin/scripting/nashorn/EngineTests.java | 0
.../src/test/resources/logback-test.xml | 0
pom.xml | 4 +-
src/resources/main/plugins.props | 69 ----------------------
17 files changed, 13 insertions(+), 82 deletions(-)
diff --git a/nashorn-dist/pom.xml b/nashorn-graalvm-dist/pom.xml
similarity index 91%
rename from nashorn-dist/pom.xml
rename to nashorn-graalvm-dist/pom.xml
index 36d9c38..5ee66a3 100644
--- a/nashorn-dist/pom.xml
+++ b/nashorn-graalvm-dist/pom.xml
@@ -11,7 +11,7 @@
</parent>
<name>Shibboleth IdP :: Plugins :: Nashorn Distribution</name>
- <artifactId>idp-plugin-nashorn-dist</artifactId>
+ <artifactId>idp-plugin-nashorn-grallvm-dist</artifactId>
<packaging>pom</packaging>
<description>
@@ -20,7 +20,7 @@
<properties>
<checkstyle.configLocation>${project.basedir}/../checkstyle.xml</checkstyle.configLocation>
- <nashorn.finalName>shibboleth-idp-plugin-nashorn-${project.version}</nashorn.finalName>
+ <nashorn.finalName>shibboleth-idp-plugin-nashorn-graalvm-${project.version}</nashorn.finalName>
</properties>
<build>
diff --git a/nashorn-dist/src/main/assembly/plugin-assembly-tgz.xml b/nashorn-graalvm-dist/src/main/assembly/plugin-assembly-tgz.xml
similarity index 81%
rename from nashorn-dist/src/main/assembly/plugin-assembly-tgz.xml
rename to nashorn-graalvm-dist/src/main/assembly/plugin-assembly-tgz.xml
index feba5ea..ded3ebb 100644
--- a/nashorn-dist/src/main/assembly/plugin-assembly-tgz.xml
+++ b/nashorn-graalvm-dist/src/main/assembly/plugin-assembly-tgz.xml
@@ -6,10 +6,10 @@
<fileSets>
<fileSet>
<!-- Our impl -->
- <directory>../nashorn-impl/target</directory>
+ <directory>../nashorn-graalvm-impl/target</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
- <include>idp-plugin-nashorn-impl-*.jar</include>
+ <include>idp-plugin-nashorn-graalvm-impl-*.jar</include>
</includes>
<excludes>
<exclude>*test*.jar</exclude>
@@ -19,7 +19,7 @@
</fileSet>
<fileSet>
<!-- Our dependencies -->
- <directory>../nashorn-impl/target/dependency</directory>
+ <directory>../nashorn-graalvm-impl/target/dependency</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
<include>*.jar</include>
@@ -32,7 +32,7 @@
</fileSet>
<fileSet>
<!-- The shared property file -->
- <directory>../nashorn-impl/target/classes/net/shibboleth/idp/plugin/scripting/nashorn</directory>
+ <directory>../nashorn-graalvm-impl/target/classes/net/shibboleth/idp/plugin/scripting/nashorn</directory>
<outputDirectory>bootstrap</outputDirectory>
<includes>
<include>plugin.properties</include>
diff --git a/nashorn-dist/src/main/assembly/plugin-assembly-zip.xml b/nashorn-graalvm-dist/src/main/assembly/plugin-assembly-zip.xml
similarity index 82%
rename from nashorn-dist/src/main/assembly/plugin-assembly-zip.xml
rename to nashorn-graalvm-dist/src/main/assembly/plugin-assembly-zip.xml
index 2668b1f..9a002be 100644
--- a/nashorn-dist/src/main/assembly/plugin-assembly-zip.xml
+++ b/nashorn-graalvm-dist/src/main/assembly/plugin-assembly-zip.xml
@@ -6,10 +6,10 @@
<fileSets>
<fileSet>
<!-- Our impl -->
- <directory>../nashorn-impl/target</directory>
+ <directory>../nashorn-graalvm-impl/target</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
- <include>idp-plugin-nashorn-impl-*.jar</include>
+ <include>idp-plugin-nashorn-graalvm-impl-*.jar</include>
</includes>
<excludes>
<exclude>*test*.jar</exclude>
@@ -19,7 +19,7 @@
</fileSet>
<fileSet>
<!-- Our dependencies -->
- <directory>../nashorn-impl/target/dependency</directory>
+ <directory>../nashorn-graalvm-impl/target/dependency</directory>
<outputDirectory>webapp/WEB-INF/lib</outputDirectory>
<includes>
<include>*.jar</include>
@@ -32,7 +32,7 @@
</fileSet>
<fileSet>
<!-- The shared property file -->
- <directory>../nashorn-impl/target/classes/net/shibboleth/idp/plugin/scripting/nashorn</directory>
+ <directory>../nashorn-graalvm-impl/target/classes/net/shibboleth/idp/plugin/scripting/nashorn</directory>
<outputDirectory>bootstrap</outputDirectory>
<includes>
<include>plugin.properties</include>
diff --git a/nashorn-dist/src/main/resources/bootstrap/keys.txt b/nashorn-graalvm-dist/src/main/resources/bootstrap/keys.txt
similarity index 100%
rename from nashorn-dist/src/main/resources/bootstrap/keys.txt
rename to nashorn-graalvm-dist/src/main/resources/bootstrap/keys.txt
diff --git a/nashorn-impl/pom.xml b/nashorn-graalvm-impl/pom.xml
similarity index 99%
rename from nashorn-impl/pom.xml
rename to nashorn-graalvm-impl/pom.xml
index 567df48..4513c51 100644
--- a/nashorn-impl/pom.xml
+++ b/nashorn-graalvm-impl/pom.xml
@@ -11,7 +11,7 @@
</parent>
<name>Shibboleth IdP :: Plugins :: Nashorn GraalVM Scripting Impl</name>
- <artifactId>idp-plugin-nashorn-impl</artifactId>
+ <artifactId>idp-plugin-nashorn-graalvm-impl</artifactId>
<packaging>jar</packaging>
<properties>
diff --git a/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalEngine.java b/nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalEngine.java
similarity index 100%
rename from nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalEngine.java
rename to nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalEngine.java
diff --git a/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalFactory.java b/nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalFactory.java
similarity index 100%
rename from nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalFactory.java
rename to nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalFactory.java
diff --git a/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornPlugin.java b/nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornPlugin.java
similarity index 100%
rename from nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornPlugin.java
rename to nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornPlugin.java
diff --git a/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/package-info.java b/nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/package-info.java
similarity index 100%
rename from nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/package-info.java
rename to nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/package-info.java
diff --git a/nashorn-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory b/nashorn-graalvm-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
similarity index 100%
rename from nashorn-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
rename to nashorn-graalvm-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
diff --git a/nashorn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin b/nashorn-graalvm-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
similarity index 100%
rename from nashorn-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
rename to nashorn-graalvm-impl/src/main/resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin
diff --git a/nashorn-impl/src/main/resources/net/shibboleth/idp/plugin/scripting/nashorn/doc/LICENSE.txt b/nashorn-graalvm-impl/src/main/resources/net/shibboleth/idp/plugin/scripting/nashorn/doc/LICENSE.txt
similarity index 100%
rename from nashorn-impl/src/main/resources/net/shibboleth/idp/plugin/scripting/nashorn/doc/LICENSE.txt
rename to nashorn-graalvm-impl/src/main/resources/net/shibboleth/idp/plugin/scripting/nashorn/doc/LICENSE.txt
diff --git a/nashorn-impl/src/main/resources/net/shibboleth/idp/plugin/scripting/nashorn/plugin.properties b/nashorn-graalvm-impl/src/main/resources/net/shibboleth/idp/plugin/scripting/nashorn/plugin.properties
similarity index 100%
rename from nashorn-impl/src/main/resources/net/shibboleth/idp/plugin/scripting/nashorn/plugin.properties
rename to nashorn-graalvm-impl/src/main/resources/net/shibboleth/idp/plugin/scripting/nashorn/plugin.properties
diff --git a/nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/EngineTests.java b/nashorn-graalvm-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/EngineTests.java
similarity index 100%
rename from nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/EngineTests.java
rename to nashorn-graalvm-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/EngineTests.java
diff --git a/nashorn-impl/src/test/resources/logback-test.xml b/nashorn-graalvm-impl/src/test/resources/logback-test.xml
similarity index 100%
rename from nashorn-impl/src/test/resources/logback-test.xml
rename to nashorn-graalvm-impl/src/test/resources/logback-test.xml
diff --git a/pom.xml b/pom.xml
index 1f7cbfb..aa522b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,8 +87,8 @@
<modules>
<module>scripting-api</module>
- <module>nashorn-impl</module>
- <module>nashorn-dist</module>
+ <module>nashorn-graalvm-impl</module>
+ <module>nashorn-graalvm-dist</module>
<module>nashorn-jdk-impl</module>
<module>nashorn-jdk-dist</module>
<module>rhino-impl</module>
diff --git a/src/resources/main/plugins.props b/src/resources/main/plugins.props
deleted file mode 100644
index 515b2f8..0000000
--- a/src/resources/main/plugins.props
+++ /dev/null
@@ -1,69 +0,0 @@
-net.shibboleth.idp.plugin.rhino.versions=0.1.0 0.1.1 0.1.2 0.1.3 0.1.4
-net.shibboleth.idp.plugin.nashorn.versions=0.1.0 0.1.1 0.1.2 0.1.3 0.1.4
-#
-# NASHORN
-# 0.1.0
-#
-net.shibboleth.idp.plugin.nashorn.idpVersionMax.0.1.0=5.0.0
-net.shibboleth.idp.plugin.nashorn.idpVersionMin.0.1.0=4.1.0
-net.shibboleth.idp.plugin.nashorn.supportLevel.0.1.0 = Withdrawn
-#
-# 0.1.1
-#
-net.shibboleth.idp.plugin.nashorn.idpVersionMax.0.1.1=5.0.0
-net.shibboleth.idp.plugin.nashorn.idpVersionMin.0.1.1=4.1.0
-net.shibboleth.idp.plugin.nashorn.supportLevel.0.1.1 = Withdrawn
-#
-# 0.1.2
-#
-net.shibboleth.idp.plugin.nashorn.idpVersionMax.0.1.2=5.0.0
-net.shibboleth.idp.plugin.nashorn.idpVersionMin.0.1.2=4.1.0
-net.shibboleth.idp.plugin.nashorn.supportLevel.0.1.2 = Withdrawn
-#
-# 0.1.3
-#
-net.shibboleth.idp.plugin.nashorn.idpVersionMax.0.1.3=5.0.0
-net.shibboleth.idp.plugin.nashorn.idpVersionMin.0.1.3=4.1.0
-net.shibboleth.idp.plugin.nashorn.supportLevel.0.1.3 = Current
-net.shibboleth.idp.plugin.nashorn.downloadURL.0.1.3 = https://build.shibboleth.net/nexus/service/local/repositories/releases/content/net/shibboleth/idp/plugin/scripting/idp-plugin-nashorn-dist/0.1.3
-net.shibboleth.idp.plugin.nashorn.baseName.0.1.3 = idp-plugin-nashorn-dist-0.1.3
-#
-# 0.1.4
-#
-net.shibboleth.idp.plugin.nashorn.idpVersionMax.0.1.4=5.0.0
-net.shibboleth.idp.plugin.nashorn.idpVersionMin.0.1.4=4.1.0
-net.shibboleth.idp.plugin.nashorn.supportLevel.0.1.4 = Current
-#
-# RHINO
-#
-# 0.1.0
-#
-net.shibboleth.idp.plugin.rhino.idpVersionMax.0.1.0=5.0.0
-net.shibboleth.idp.plugin.rhino.idpVersionMin.0.1.0=4.1.0
-net.shibboleth.idp.plugin.rhino.supportLevel.0.1.0 = Withdrawn
-#
-# 0.1.1
-#
-net.shibboleth.idp.plugin.rhino.idpVersionMax.0.1.1=5.0.0
-net.shibboleth.idp.plugin.rhino.idpVersionMin.0.1.1=4.1.0
-net.shibboleth.idp.plugin.rhino.supportLevel.0.1.1 = Withdrawn
-#
-# 0.1.2
-#
-net.shibboleth.idp.plugin.rhino.idpVersionMax.0.1.2=5.0.0
-net.shibboleth.idp.plugin.rhino.idpVersionMin.0.1.2=4.1.0
-net.shibboleth.idp.plugin.rhino.supportLevel.0.1.2 = Withdrawn
-#
-# 0.1.3
-#
-net.shibboleth.idp.plugin.rhino.idpVersionMax.0.1.3=5.0.0
-net.shibboleth.idp.plugin.rhino.idpVersionMin.0.1.3=4.1.0
-net.shibboleth.idp.plugin.rhino.supportLevel.0.1.3 = Current
-net.shibboleth.idp.plugin.rhino.downloadURL.0.1.3 = https://build.shibboleth.net/nexus/service/local/repositories/releases/content/net/shibboleth/idp/plugin/scripting/idp-plugin-rhino-dist/0.1.3
-net.shibboleth.idp.plugin.rhino.baseName.0.1.3 = idp-plugin-rhino-dist-0.1.3
-#
-# 0.1.4
-#
-net.shibboleth.idp.plugin.rhino.idpVersionMax.0.1.4=5.0.0
-net.shibboleth.idp.plugin.rhino.idpVersionMin.0.1.4=4.1.0
-net.shibboleth.idp.plugin.rhino.supportLevel.0.1.4 = Current
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list