[java-idp-plugin-scripting] 15/15: Rename to net.shibbboleth.idp.plugin.<whatever>
Ian Young
ian at iay.org.uk
Mon Jun 22 13:03:51 UTC 2020
This is an automated email from the git hooks/post-receive script.
iay 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=20cb5df965eb9fc8021717b963dffe1c086cbd91
commit 20cb5df965eb9fc8021717b963dffe1c086cbd91
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Jun 21 14:11:10 2020 +0100
Rename to net.shibbboleth.idp.plugin.<whatever>
---
nashorn-dist/pom.xml | 5 ++---
nashorn-dist/src/main/resources/bootstrap/id.property | 2 +-
nashorn-impl/pom.xml | 7 +++----
.../{plugins => idp/plugin}/scripting/nashorn/GraalEngine.java | 4 ++--
.../{plugins => idp/plugin}/scripting/nashorn/GraalFactory.java | 4 ++--
.../plugin}/scripting/nashorn/NashornDescription.java | 4 ++--
.../{plugins => idp/plugin}/scripting/nashorn/package-info.java | 2 +-
.../0.0.1/version.details.properties | 0
.../versions.properties | 1 +
.../net.shibboleth.plugins.scripting.nashorn/versions.properties | 1 -
.../resources/META-INF/services/javax.script.ScriptEngineFactory | 2 +-
.../net.shibboleth.utilities.java.support.plugin.PluginDescription | 2 +-
.../{plugins => idp/plugin}/scripting/nashorn/EngineTests.java | 2 +-
.../{plugins => idp/plugin}/scripting/nashorn/PluginTest.java | 4 ++--
pom.xml | 2 +-
rhino-dist/pom.xml | 4 ++--
rhino-dist/src/main/resources/bootstrap/id.property | 2 +-
rhino-impl/pom.xml | 7 ++++---
.../{plugins => idp/plugin}/scripting/rhino/RhinoDescription.java | 4 ++--
.../{plugins => idp/plugin}/scripting/rhino/RhinoEngine.java | 4 ++--
.../{plugins => idp/plugin}/scripting/rhino/RhinoFactory.java | 4 ++--
.../{plugins => idp/plugin}/scripting/rhino/package-info.java | 2 +-
.../0.0.1/version.details.properties | 0
.../net.shibboleth.idp.plugin.scripting.rhino/versions.properties | 1 +
.../net.shibboleth.plugins.scripting.rhino/versions.properties | 1 -
.../resources/META-INF/services/javax.script.ScriptEngineFactory | 2 +-
.../net.shibboleth.utilities.java.support.plugin.PluginDescription | 2 +-
.../{plugins => idp/plugin}/scripting/rhino/EngineTests.java | 2 +-
.../{plugins => idp/plugin}/scripting/rhino/PluginTest.java | 4 ++--
scripting-api/pom.xml | 6 +++---
.../{plugins => idp/plugin}/scripting/AbstractScriptEngine.java | 2 +-
.../plugin}/scripting/AbstractScriptEngineFactory.java | 2 +-
.../plugin}/scripting/RuntimeScriptingException.java | 2 +-
.../shibboleth/{plugins => idp/plugin}/scripting/package-info.java | 2 +-
34 files changed, 47 insertions(+), 48 deletions(-)
diff --git a/nashorn-dist/pom.xml b/nashorn-dist/pom.xml
index 7f87b28..23b6695 100644
--- a/nashorn-dist/pom.xml
+++ b/nashorn-dist/pom.xml
@@ -5,12 +5,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.shibboleth.plugin.scripting</groupId>
+ <groupId>net.shibboleth.idp.plugin.scripting</groupId>
<artifactId>scripting</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>net.shibboleth.plugin.scripting.nahsorn</groupId>
<artifactId>nashorn-dist</artifactId>
<packaging>pom</packaging>
@@ -20,7 +19,7 @@
</description>
<properties>
- <nashorn.finalName>shibboleth-idp-plugins-scripting-nashorn-${project.version}</nashorn.finalName>
+ <nashorn.finalName>shibboleth-idp-plugin-nashorn-${project.version}</nashorn.finalName>
</properties>
<build>
diff --git a/nashorn-dist/src/main/resources/bootstrap/id.property b/nashorn-dist/src/main/resources/bootstrap/id.property
index 5c867bc..b2c0d95 100644
--- a/nashorn-dist/src/main/resources/bootstrap/id.property
+++ b/nashorn-dist/src/main/resources/bootstrap/id.property
@@ -1 +1 @@
-pluginid=net.shibboleth.plugins.scripting.nashorn
+pluginid=net.shibboleth.idp.plugin.scripting.nashorn
diff --git a/nashorn-impl/pom.xml b/nashorn-impl/pom.xml
index 621e5b7..eb57dba 100644
--- a/nashorn-impl/pom.xml
+++ b/nashorn-impl/pom.xml
@@ -5,17 +5,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.shibboleth.plugin.scripting</groupId>
+ <groupId>net.shibboleth.idp.plugin.scripting</groupId>
<artifactId>scripting</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>net.shibboleth.plugin.scripting.nashorn</groupId>
<artifactId>nashorn-impl</artifactId>
<packaging>jar</packaging>
<properties>
- <automatic.module.name>net.shibboleth.plugins.scripting.nashorn</automatic.module.name>
+ <automatic.module.name>net.shibboleth.idp.plugin.scripting.nashorn</automatic.module.name>
</properties>
@@ -27,7 +26,7 @@
<dependencies>
<!-- All dependencies except the api are provided and test -->
<dependency>
- <groupId>net.shibboleth.plugin.scripting</groupId>
+ <groupId>net.shibboleth.idp.plugin.scripting</groupId>
<artifactId>scripting-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
diff --git a/nashorn-impl/src/main/java/net/shibboleth/plugins/scripting/nashorn/GraalEngine.java b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalEngine.java
similarity index 97%
rename from nashorn-impl/src/main/java/net/shibboleth/plugins/scripting/nashorn/GraalEngine.java
rename to nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalEngine.java
index f328d22..20bd74c 100644
--- a/nashorn-impl/src/main/java/net/shibboleth/plugins/scripting/nashorn/GraalEngine.java
+++ b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalEngine.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.plugins.scripting.nashorn;
+package net.shibboleth.idp.plugin.scripting.nashorn;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -30,7 +30,7 @@ import org.graalvm.polyglot.Context;
import org.graalvm.polyglot.Source;
import org.graalvm.polyglot.Value;
-import net.shibboleth.plugins.scripting.AbstractScriptEngine;
+import net.shibboleth.idp.plugin.scripting.AbstractScriptEngine;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
/**
diff --git a/nashorn-impl/src/main/java/net/shibboleth/plugins/scripting/nashorn/GraalFactory.java b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalFactory.java
similarity index 92%
rename from nashorn-impl/src/main/java/net/shibboleth/plugins/scripting/nashorn/GraalFactory.java
rename to nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalFactory.java
index fa459d1..18620ef 100644
--- a/nashorn-impl/src/main/java/net/shibboleth/plugins/scripting/nashorn/GraalFactory.java
+++ b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/GraalFactory.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package net.shibboleth.plugins.scripting.nashorn;
+package net.shibboleth.idp.plugin.scripting.nashorn;
import java.util.List;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
-import net.shibboleth.plugins.scripting.AbstractScriptEngineFactory;
+import net.shibboleth.idp.plugin.scripting.AbstractScriptEngineFactory;
/**
* A JSR-223 factory for {@link GraalEngine}.
diff --git a/nashorn-impl/src/main/java/net/shibboleth/plugins/scripting/nashorn/NashornDescription.java b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java
similarity index 97%
rename from nashorn-impl/src/main/java/net/shibboleth/plugins/scripting/nashorn/NashornDescription.java
rename to nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java
index 6faf15a..31c5388 100644
--- a/nashorn-impl/src/main/java/net/shibboleth/plugins/scripting/nashorn/NashornDescription.java
+++ b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/NashornDescription.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.plugins.scripting.nashorn;
+package net.shibboleth.idp.plugin.scripting.nashorn;
import java.io.IOException;
import java.nio.file.Path;
@@ -53,7 +53,7 @@ public class NashornDescription extends PluginDescription {
@Override
public String getPluginId() {
- return "net.shibboleth.plugins.scripting.nashorn";
+ return "net.shibboleth.idp.plugin.scripting.nashorn";
}
@Override
diff --git a/nashorn-impl/src/main/java/net/shibboleth/plugins/scripting/nashorn/package-info.java b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/package-info.java
similarity index 94%
rename from nashorn-impl/src/main/java/net/shibboleth/plugins/scripting/nashorn/package-info.java
rename to nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/package-info.java
index 0a4c7e2..0f59352 100644
--- a/nashorn-impl/src/main/java/net/shibboleth/plugins/scripting/nashorn/package-info.java
+++ b/nashorn-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/package-info.java
@@ -17,4 +17,4 @@
/** Classes for working with JSR-223 scripting environments. */
-package net.shibboleth.plugins.scripting.nashorn;
\ No newline at end of file
+package net.shibboleth.idp.plugin.scripting.nashorn;
\ No newline at end of file
diff --git a/nashorn-impl/src/main/resources/META-INF/plugins/net.shibboleth.plugins.scripting.nashorn/0.0.1/version.details.properties b/nashorn-impl/src/main/resources/META-INF/plugins/net.shibboleth.idp.plugin.scripting.nashorn/0.0.1/version.details.properties
similarity index 100%
rename from nashorn-impl/src/main/resources/META-INF/plugins/net.shibboleth.plugins.scripting.nashorn/0.0.1/version.details.properties
rename to nashorn-impl/src/main/resources/META-INF/plugins/net.shibboleth.idp.plugin.scripting.nashorn/0.0.1/version.details.properties
diff --git a/nashorn-impl/src/main/resources/META-INF/plugins/net.shibboleth.idp.plugin.scripting.nashorn/versions.properties b/nashorn-impl/src/main/resources/META-INF/plugins/net.shibboleth.idp.plugin.scripting.nashorn/versions.properties
new file mode 100644
index 0000000..0ab7d9f
--- /dev/null
+++ b/nashorn-impl/src/main/resources/META-INF/plugins/net.shibboleth.idp.plugin.scripting.nashorn/versions.properties
@@ -0,0 +1 @@
+net.shibboleth.idp.plugin.scripting.nashorn.versions=0.0.1
\ No newline at end of file
diff --git a/nashorn-impl/src/main/resources/META-INF/plugins/net.shibboleth.plugins.scripting.nashorn/versions.properties b/nashorn-impl/src/main/resources/META-INF/plugins/net.shibboleth.plugins.scripting.nashorn/versions.properties
deleted file mode 100644
index 60529b0..0000000
--- a/nashorn-impl/src/main/resources/META-INF/plugins/net.shibboleth.plugins.scripting.nashorn/versions.properties
+++ /dev/null
@@ -1 +0,0 @@
-net.shibboleth.plugins.scripting.nashorn.versions=0.0.1
\ No newline at end of file
diff --git a/nashorn-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory b/nashorn-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
index 0148718..38c7ea2 100644
--- a/nashorn-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
+++ b/nashorn-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
@@ -1 +1 @@
-net.shibboleth.plugins.scripting.nashorn.GraalFactory
+net.shibboleth.idp.plugin.scripting.nashorn.GraalFactory
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.utilities.java.support.plugin.PluginDescription
index 755ecaa..48421e4 100644
--- 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.utilities.java.support.plugin.PluginDescription
@@ -1 +1 @@
-net.shibboleth.plugins.scripting.nashorn.NashornDescription
+net.shibboleth.idp.plugin.scripting.nashorn.NashornDescription
diff --git a/nashorn-impl/src/test/java/net/shibboleth/plugins/scripting/nashorn/EngineTests.java b/nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/EngineTests.java
similarity index 98%
rename from nashorn-impl/src/test/java/net/shibboleth/plugins/scripting/nashorn/EngineTests.java
rename to nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/EngineTests.java
index e71fd65..afdd680 100644
--- a/nashorn-impl/src/test/java/net/shibboleth/plugins/scripting/nashorn/EngineTests.java
+++ b/nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/EngineTests.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.plugins.scripting.nashorn;
+package net.shibboleth.idp.plugin.scripting.nashorn;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
diff --git a/nashorn-impl/src/test/java/net/shibboleth/plugins/scripting/nashorn/PluginTest.java b/nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/PluginTest.java
similarity index 94%
rename from nashorn-impl/src/test/java/net/shibboleth/plugins/scripting/nashorn/PluginTest.java
rename to nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/PluginTest.java
index e794fd2..ae6c133 100644
--- a/nashorn-impl/src/test/java/net/shibboleth/plugins/scripting/nashorn/PluginTest.java
+++ b/nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/PluginTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.plugins.scripting.nashorn;
+package net.shibboleth.idp.plugin.scripting.nashorn;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
@@ -44,7 +44,7 @@ public class PluginTest {
public void SetupPlugin() {
final ServiceLoader<PluginDescription> loader = ServiceLoader.load(PluginDescription.class);
for (final PluginDescription service:loader) {
- if ("net.shibboleth.plugins.scripting.nashorn".contentEquals(service.getPluginId())) {
+ if ("net.shibboleth.idp.plugin.scripting.nashorn".contentEquals(service.getPluginId())) {
nashorn = service;
break;
}
diff --git a/pom.xml b/pom.xml
index 16ff32b..8a88977 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
</parent>
- <groupId>net.shibboleth.plugin.scripting</groupId>
+ <groupId>net.shibboleth.idp.plugin.scripting</groupId>
<artifactId>scripting</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/rhino-dist/pom.xml b/rhino-dist/pom.xml
index f19bea3..46d7b45 100644
--- a/rhino-dist/pom.xml
+++ b/rhino-dist/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.shibboleth.plugin.scripting</groupId>
+ <groupId>net.shibboleth.idp.plugin.scripting</groupId>
<artifactId>scripting</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -19,7 +19,7 @@
</description>
<properties>
- <rhino.finalName>shibboleth-idp-plugins-scripting-rhino-${project.version}</rhino.finalName>
+ <rhino.finalName>shibboleth-idp-plugin-rhino-${project.version}</rhino.finalName>
</properties>
<build>
diff --git a/rhino-dist/src/main/resources/bootstrap/id.property b/rhino-dist/src/main/resources/bootstrap/id.property
index e4c8cf7..88f58b1 100644
--- a/rhino-dist/src/main/resources/bootstrap/id.property
+++ b/rhino-dist/src/main/resources/bootstrap/id.property
@@ -1 +1 @@
-pluginid=net.shibboleth.plugins.scripting.rhino
+pluginid=net.shibboleth.idp.plugin.scripting.rhino
diff --git a/rhino-impl/pom.xml b/rhino-impl/pom.xml
index 3b420af..5e6febe 100644
--- a/rhino-impl/pom.xml
+++ b/rhino-impl/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.shibboleth.plugin.scripting</groupId>
+ <groupId>net.shibboleth.idp.plugin.scripting</groupId>
<artifactId>scripting</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -14,7 +14,7 @@
<packaging>jar</packaging>
<properties>
- <automatic.module.name>net.shibboleth.plugins.scripting.rhino</automatic.module.name>
+ <automatic.module.name>net.shibboleth.idp.plugin.scripting.rhino</automatic.module.name>
</properties>
@@ -25,7 +25,7 @@
<dependencies>
<dependency>
- <groupId>net.shibboleth.plugin.scripting</groupId>
+ <groupId>net.shibboleth.idp.plugin.scripting</groupId>
<artifactId>scripting-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
@@ -44,6 +44,7 @@
<executions>
<execution>
<id>copy-dependencies</id>
+ <phase>after-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
diff --git a/rhino-impl/src/main/java/net/shibboleth/plugins/scripting/rhino/RhinoDescription.java b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java
similarity index 94%
rename from rhino-impl/src/main/java/net/shibboleth/plugins/scripting/rhino/RhinoDescription.java
rename to rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java
index b62d0ea..e119783 100644
--- a/rhino-impl/src/main/java/net/shibboleth/plugins/scripting/rhino/RhinoDescription.java
+++ b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.plugins.scripting.rhino;
+package net.shibboleth.idp.plugin.scripting.rhino;
import java.io.IOException;
import java.nio.file.Path;
@@ -37,7 +37,7 @@ public class RhinoDescription extends PluginDescription {
@Override
public String getPluginId() {
- return "net.shibboleth.plugins.scripting.rhino";
+ return "net.shibboleth.idp.plugin.scripting.rhino";
}
@Override
diff --git a/rhino-impl/src/main/java/net/shibboleth/plugins/scripting/rhino/RhinoEngine.java b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoEngine.java
similarity index 97%
rename from rhino-impl/src/main/java/net/shibboleth/plugins/scripting/rhino/RhinoEngine.java
rename to rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoEngine.java
index efcc00a..8f689bc 100644
--- a/rhino-impl/src/main/java/net/shibboleth/plugins/scripting/rhino/RhinoEngine.java
+++ b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoEngine.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.plugins.scripting.rhino;
+package net.shibboleth.idp.plugin.scripting.rhino;
import javax.script.Bindings;
import javax.script.Compilable;
@@ -30,7 +30,7 @@ import org.mozilla.javascript.Script;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
-import net.shibboleth.plugins.scripting.AbstractScriptEngine;
+import net.shibboleth.idp.plugin.scripting.AbstractScriptEngine;
/**
* A subset of {@link ScriptEngine} implemented using Mozilla rhino with enough function
diff --git a/rhino-impl/src/main/java/net/shibboleth/plugins/scripting/rhino/RhinoFactory.java b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoFactory.java
similarity index 92%
rename from rhino-impl/src/main/java/net/shibboleth/plugins/scripting/rhino/RhinoFactory.java
rename to rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoFactory.java
index d131a69..6bf026f 100644
--- a/rhino-impl/src/main/java/net/shibboleth/plugins/scripting/rhino/RhinoFactory.java
+++ b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoFactory.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package net.shibboleth.plugins.scripting.rhino;
+package net.shibboleth.idp.plugin.scripting.rhino;
import java.util.List;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
-import net.shibboleth.plugins.scripting.AbstractScriptEngineFactory;
+import net.shibboleth.idp.plugin.scripting.AbstractScriptEngineFactory;
/**
* A JSR-223 factory for {@link RhinoEngine}.
diff --git a/rhino-impl/src/main/java/net/shibboleth/plugins/scripting/rhino/package-info.java b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/package-info.java
similarity index 94%
rename from rhino-impl/src/main/java/net/shibboleth/plugins/scripting/rhino/package-info.java
rename to rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/package-info.java
index 1057c48..5ba2ab1 100644
--- a/rhino-impl/src/main/java/net/shibboleth/plugins/scripting/rhino/package-info.java
+++ b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/package-info.java
@@ -17,4 +17,4 @@
/** Classes for working with JSR-223 scripting environments. */
-package net.shibboleth.plugins.scripting.rhino;
\ No newline at end of file
+package net.shibboleth.idp.plugin.scripting.rhino;
\ No newline at end of file
diff --git a/rhino-impl/src/main/resources/META-INF/plugins/net.shibboleth.plugins.scripting.rhino/0.0.1/version.details.properties b/rhino-impl/src/main/resources/META-INF/plugins/net.shibboleth.idp.plugin.scripting.rhino/0.0.1/version.details.properties
similarity index 100%
rename from rhino-impl/src/main/resources/META-INF/plugins/net.shibboleth.plugins.scripting.rhino/0.0.1/version.details.properties
rename to rhino-impl/src/main/resources/META-INF/plugins/net.shibboleth.idp.plugin.scripting.rhino/0.0.1/version.details.properties
diff --git a/rhino-impl/src/main/resources/META-INF/plugins/net.shibboleth.idp.plugin.scripting.rhino/versions.properties b/rhino-impl/src/main/resources/META-INF/plugins/net.shibboleth.idp.plugin.scripting.rhino/versions.properties
new file mode 100644
index 0000000..abb3627
--- /dev/null
+++ b/rhino-impl/src/main/resources/META-INF/plugins/net.shibboleth.idp.plugin.scripting.rhino/versions.properties
@@ -0,0 +1 @@
+net.shibboleth.idp.plugin.scripting.rhino.versions=0.0.1
\ No newline at end of file
diff --git a/rhino-impl/src/main/resources/META-INF/plugins/net.shibboleth.plugins.scripting.rhino/versions.properties b/rhino-impl/src/main/resources/META-INF/plugins/net.shibboleth.plugins.scripting.rhino/versions.properties
deleted file mode 100644
index 64ee821..0000000
--- a/rhino-impl/src/main/resources/META-INF/plugins/net.shibboleth.plugins.scripting.rhino/versions.properties
+++ /dev/null
@@ -1 +0,0 @@
-net.shibboleth.plugins.scripting.rhino.versions=0.0.1
\ No newline at end of file
diff --git a/rhino-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory b/rhino-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
index d2b426c..f96411d 100644
--- a/rhino-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
+++ b/rhino-impl/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
@@ -1 +1 @@
-net.shibboleth.plugins.scripting.rhino.RhinoFactory
+net.shibboleth.idp.plugin.scripting.rhino.RhinoFactory
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.utilities.java.support.plugin.PluginDescription
index 7127ada..b34b662 100644
--- 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.utilities.java.support.plugin.PluginDescription
@@ -1 +1 @@
-net.shibboleth.plugins.scripting.rhino.RhinoDescription
+net.shibboleth.idp.plugin.scripting.rhino.RhinoDescription
diff --git a/rhino-impl/src/test/java/net/shibboleth/plugins/scripting/rhino/EngineTests.java b/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/EngineTests.java
similarity index 98%
rename from rhino-impl/src/test/java/net/shibboleth/plugins/scripting/rhino/EngineTests.java
rename to rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/EngineTests.java
index 87785a2..de3fbc0 100644
--- a/rhino-impl/src/test/java/net/shibboleth/plugins/scripting/rhino/EngineTests.java
+++ b/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/EngineTests.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.plugins.scripting.rhino;
+package net.shibboleth.idp.plugin.scripting.rhino;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
diff --git a/rhino-impl/src/test/java/net/shibboleth/plugins/scripting/rhino/PluginTest.java b/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/PluginTest.java
similarity index 92%
rename from rhino-impl/src/test/java/net/shibboleth/plugins/scripting/rhino/PluginTest.java
rename to rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/PluginTest.java
index 17fbfa6..5b450a7 100644
--- a/rhino-impl/src/test/java/net/shibboleth/plugins/scripting/rhino/PluginTest.java
+++ b/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/PluginTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.plugins.scripting.rhino;
+package net.shibboleth.idp.plugin.scripting.rhino;
import static org.testng.Assert.assertNotNull;
@@ -38,7 +38,7 @@ public class PluginTest {
public void SetupPlugin() {
final ServiceLoader<PluginDescription> loader = ServiceLoader.load(PluginDescription.class);
for (final PluginDescription service:loader) {
- if ("net.shibboleth.plugins.scripting.rhino".contentEquals(service.getPluginId())) {
+ if ("net.shibboleth.idp.plugin.scripting.rhino".contentEquals(service.getPluginId())) {
rhino = service;
break;
}
diff --git a/scripting-api/pom.xml b/scripting-api/pom.xml
index 4711612..76d0fe3 100644
--- a/scripting-api/pom.xml
+++ b/scripting-api/pom.xml
@@ -5,17 +5,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.shibboleth.plugin.scripting</groupId>
+ <groupId>net.shibboleth.idp.plugin.scripting</groupId>
<artifactId>scripting</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <groupId>net.shibboleth.plugin.scripting</groupId>
+ <groupId>net.shibboleth.idp.plugin.scripting</groupId>
<artifactId>scripting-api</artifactId>
<packaging>jar</packaging>
<properties>
- <automatic.module.name>net.shibboleth.plugins.scripting.api</automatic.module.name>
+ <automatic.module.name>net.shibboleth.idp.plugin.scripting.api</automatic.module.name>
</properties>
diff --git a/scripting-api/src/main/java/net/shibboleth/plugins/scripting/AbstractScriptEngine.java b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngine.java
similarity index 98%
rename from scripting-api/src/main/java/net/shibboleth/plugins/scripting/AbstractScriptEngine.java
rename to scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngine.java
index 3b474bf..91654be 100644
--- a/scripting-api/src/main/java/net/shibboleth/plugins/scripting/AbstractScriptEngine.java
+++ b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngine.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.plugins.scripting;
+package net.shibboleth.idp.plugin.scripting;
import java.io.Reader;
diff --git a/scripting-api/src/main/java/net/shibboleth/plugins/scripting/AbstractScriptEngineFactory.java b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngineFactory.java
similarity index 98%
rename from scripting-api/src/main/java/net/shibboleth/plugins/scripting/AbstractScriptEngineFactory.java
rename to scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngineFactory.java
index 746d94a..1b85e9d 100644
--- a/scripting-api/src/main/java/net/shibboleth/plugins/scripting/AbstractScriptEngineFactory.java
+++ b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngineFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.plugins.scripting;
+package net.shibboleth.idp.plugin.scripting;
import java.util.Collections;
import java.util.List;
diff --git a/scripting-api/src/main/java/net/shibboleth/plugins/scripting/RuntimeScriptingException.java b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/RuntimeScriptingException.java
similarity index 96%
rename from scripting-api/src/main/java/net/shibboleth/plugins/scripting/RuntimeScriptingException.java
rename to scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/RuntimeScriptingException.java
index 1715870..6f72391 100644
--- a/scripting-api/src/main/java/net/shibboleth/plugins/scripting/RuntimeScriptingException.java
+++ b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/RuntimeScriptingException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.plugins.scripting;
+package net.shibboleth.idp.plugin.scripting;
/**
* A run time exception to handle ligatured off methods in our JRS-223 support.
diff --git a/scripting-api/src/main/java/net/shibboleth/plugins/scripting/package-info.java b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/package-info.java
similarity index 95%
rename from scripting-api/src/main/java/net/shibboleth/plugins/scripting/package-info.java
rename to scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/package-info.java
index 1f3dc97..b910728 100644
--- a/scripting-api/src/main/java/net/shibboleth/plugins/scripting/package-info.java
+++ b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/package-info.java
@@ -17,4 +17,4 @@
/** Classes for working with JSR-223 scripting environments. */
-package net.shibboleth.plugins.scripting;
+package net.shibboleth.idp.plugin.scripting;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list