[java-idp-plugin-scripting] 03/04: JSCRIPTING-9 Create a scripting plugin distribution which includes the JDK Nashorn
Rod Widdowson
rdw at steadingsoftware.com
Sun Aug 22 13:22:01 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=08bbd9ee8ae8d69832f25f4d63dc06b70ecad382
commit 08bbd9ee8ae8d69832f25f4d63dc06b70ecad382
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Aug 22 14:00:02 2021 +0100
JSCRIPTING-9 Create a scripting plugin distribution which includes the JDK Nashorn
https://shibboleth.atlassian.net/browse/JSCRIPTING-9
Move GraalVM class files down to a graalvm folder.
---
nashorn-graalvm-dist/src/main/assembly/plugin-assembly-tgz.xml | 2 +-
nashorn-graalvm-dist/src/main/assembly/plugin-assembly-zip.xml | 2 +-
.../idp/plugin/scripting/nashorn/{ => graalvm}/GraalEngine.java | 2 +-
.../idp/plugin/scripting/nashorn/{ => graalvm}/GraalFactory.java | 2 +-
.../idp/plugin/scripting/nashorn/{ => graalvm}/NashornPlugin.java | 2 +-
.../idp/plugin/scripting/nashorn/{ => graalvm}/package-info.java | 2 +-
.../main/resources/META-INF/services/javax.script.ScriptEngineFactory | 2 +-
.../resources/META-INF/services/net.shibboleth.idp.plugin.IdPPlugin | 2 +-
.../idp/plugin/scripting/nashorn/{ => graalvm}/doc/LICENSE.txt | 0
.../idp/plugin/scripting/nashorn/{ => graalvm}/plugin.properties | 2 +-
10 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/nashorn-graalvm-dist/src/main/assembly/plugin-assembly-tgz.xml b/nashorn-graalvm-dist/src/main/assembly/plugin-assembly-tgz.xml
index ded3ebb..16a3da3 100644
--- a/nashorn-graalvm-dist/src/main/assembly/plugin-assembly-tgz.xml
+++ b/nashorn-graalvm-dist/src/main/assembly/plugin-assembly-tgz.xml
@@ -32,7 +32,7 @@
</fileSet>
<fileSet>
<!-- The shared property file -->
- <directory>../nashorn-graalvm-impl/target/classes/net/shibboleth/idp/plugin/scripting/nashorn</directory>
+ <directory>../nashorn-graalvm-impl/target/classes/net/shibboleth/idp/plugin/scripting/nashorn/graalvm</directory>
<outputDirectory>bootstrap</outputDirectory>
<includes>
<include>plugin.properties</include>
diff --git a/nashorn-graalvm-dist/src/main/assembly/plugin-assembly-zip.xml b/nashorn-graalvm-dist/src/main/assembly/plugin-assembly-zip.xml
index 9a002be..6727446 100644
--- a/nashorn-graalvm-dist/src/main/assembly/plugin-assembly-zip.xml
+++ b/nashorn-graalvm-dist/src/main/assembly/plugin-assembly-zip.xml
@@ -32,7 +32,7 @@
</fileSet>
<fileSet>
<!-- The shared property file -->
- <directory>../nashorn-graalvm-impl/target/classes/net/shibboleth/idp/plugin/scripting/nashorn</directory>
+ <directory>../nashorn-graalvm-impl/target/classes/net/shibboleth/idp/plugin/scripting/nashorn/graalvm</directory>
<outputDirectory>bootstrap</outputDirectory>
<includes>
<include>plugin.properties</include>
diff --git a/nashorn-graalvm-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/graalvm/GraalEngine.java
similarity index 98%
rename from nashorn-graalvm-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/graalvm/GraalEngine.java
index 20bd74c..446285d 100644
--- a/nashorn-graalvm-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/graalvm/GraalEngine.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.scripting.nashorn;
+package net.shibboleth.idp.plugin.scripting.nashorn.graalvm;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/nashorn-graalvm-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/graalvm/GraalFactory.java
similarity index 96%
rename from nashorn-graalvm-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/graalvm/GraalFactory.java
index 18620ef..74b9445 100644
--- a/nashorn-graalvm-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/graalvm/GraalFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.scripting.nashorn;
+package net.shibboleth.idp.plugin.scripting.nashorn.graalvm;
import java.util.List;
diff --git a/nashorn-graalvm-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/graalvm/NashornPlugin.java
similarity index 95%
rename from nashorn-graalvm-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/graalvm/NashornPlugin.java
index 6a2dcb4..9376cdf 100644
--- a/nashorn-graalvm-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/graalvm/NashornPlugin.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.idp.plugin.scripting.nashorn;
+package net.shibboleth.idp.plugin.scripting.nashorn.graalvm;
import java.io.IOException;
diff --git a/nashorn-graalvm-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/graalvm/package-info.java
similarity index 93%
rename from nashorn-graalvm-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/graalvm/package-info.java
index 0f59352..9cbe73b 100644
--- a/nashorn-graalvm-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/graalvm/package-info.java
@@ -17,4 +17,4 @@
/** Classes for working with JSR-223 scripting environments. */
-package net.shibboleth.idp.plugin.scripting.nashorn;
\ No newline at end of file
+package net.shibboleth.idp.plugin.scripting.nashorn.graalvm;
\ No newline at end of file
diff --git a/nashorn-graalvm-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory b/nashorn-graalvm-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
index 38c7ea2..1674999 100644
--- a/nashorn-graalvm-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
+++ b/nashorn-graalvm-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
@@ -1 +1 @@
-net.shibboleth.idp.plugin.scripting.nashorn.GraalFactory
+net.shibboleth.idp.plugin.scripting.nashorn.graalvm.GraalFactory
diff --git a/nashorn-graalvm-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
index 355fd53..3c9ffb7 100644
--- a/nashorn-graalvm-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
@@ -1 +1 @@
-net.shibboleth.idp.plugin.scripting.nashorn.NashornPlugin
+net.shibboleth.idp.plugin.scripting.nashorn.graalvm.NashornPlugin
diff --git a/nashorn-graalvm-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/graalvm/doc/LICENSE.txt
similarity index 100%
rename from nashorn-graalvm-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/graalvm/doc/LICENSE.txt
diff --git a/nashorn-graalvm-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/graalvm/plugin.properties
similarity index 69%
rename from nashorn-graalvm-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/graalvm/plugin.properties
index 289b311..9984b0d 100644
--- a/nashorn-graalvm-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/graalvm/plugin.properties
@@ -3,7 +3,7 @@
plugin.id = net.shibboleth.idp.plugin.nashorn
# Only used when package manifest is not available
plugin.version = 1.1.0
-plugin.license =/net/shibboleth/idp/plugin/scripting/nashorn/doc/LICENSE.txt
+plugin.license =/net/shibboleth/idp/plugin/scripting/nashorn/graalvm/doc/LICENSE.txt
# No prereqs
#plugin.modules.required =
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list