[java-shib-shared] branch main updated: Rename codec and scripting packages.
Scott Cantor
cantor.2 at osu.edu
Mon Sep 26 16:43:36 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-shared.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=8c0291704a0c01e18cfb74b286d88c660eaa5628
The following commit(s) were added to refs/heads/main by this push:
new 8c029170 Rename codec and scripting packages.
8c029170 is described below
commit 8c0291704a0c01e18cfb74b286d88c660eaa5628
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 26 12:43:34 2022 -0400
Rename codec and scripting packages.
---
.../net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java | 2 +-
.../net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java | 2 +-
.../shared/spring/error/ExtendedMappingExceptionResolver.java | 2 +-
.../shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java | 2 +-
.../net/shibboleth/shared/spring/resource/RunnableResourceTest.java | 4 ++--
.../net/shibboleth/shared/spring/resource/RunnableResource.xml | 4 ++--
.../{utilities/java/support => shared}/codec/Base32Support.java | 2 +-
.../{utilities/java/support => shared}/codec/Base64Support.java | 2 +-
.../{utilities/java/support => shared}/codec/CodecException.java | 2 +-
.../{utilities/java/support => shared}/codec/DecodingException.java | 2 +-
.../{utilities/java/support => shared}/codec/EncodingException.java | 2 +-
.../{utilities/java/support => shared}/codec/HTMLEncoder.java | 2 +-
.../{utilities/java/support => shared}/codec/StringDigester.java | 4 ++--
.../{utilities/java/support => shared}/codec/package-info.java | 2 +-
.../java/support => shared}/scripting/AbstractScriptEvaluator.java | 2 +-
.../java/support => shared}/scripting/EvaluableScript.java | 2 +-
.../java/support => shared}/scripting/ScriptContextExtender.java | 2 +-
.../java/support => shared}/scripting/ScriptedRunnable.java | 2 +-
.../{utilities/java/support => shared}/scripting/package-info.java | 2 +-
.../shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java | 4 ++--
.../shibboleth/utilities/java/support/logic/ScriptedBiFunction.java | 4 ++--
.../shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java | 4 ++--
.../shibboleth/utilities/java/support/logic/ScriptedConsumer.java | 4 ++--
.../shibboleth/utilities/java/support/logic/ScriptedFunction.java | 4 ++--
.../shibboleth/utilities/java/support/logic/ScriptedPredicate.java | 4 ++--
.../{utilities/java/support => shared}/codec/Base32SupportTest.java | 2 +-
.../{utilities/java/support => shared}/codec/Base64SupportTest.java | 2 +-
.../{utilities/java/support => shared}/codec/HTMLEncoderTest.java | 5 ++---
.../{utilities/java/support => shared}/codec/StringDigesterTest.java | 4 ++--
.../java/support => shared}/scripting/AbstractScriptEngine.java | 2 +-
.../java/support => shared}/scripting/EvaluableScriptTest.java | 2 +-
.../java/support => shared}/scripting/RuntimeScriptingException.java | 2 +-
32 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
index 7c5e49c9..08c41484 100644
--- a/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
@@ -40,10 +40,10 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.scripting.EvaluableScript;
import net.shibboleth.shared.security.DataSealerKeyStrategy;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.TimerSupport;
-import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
/**
diff --git a/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java
index 52a785bf..3c526e7a 100644
--- a/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java
@@ -30,7 +30,7 @@ import javax.crypto.KeyGenerator;
import javax.script.ScriptException;
import net.shibboleth.shared.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
+import net.shibboleth.shared.scripting.EvaluableScript;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/error/ExtendedMappingExceptionResolver.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/error/ExtendedMappingExceptionResolver.java
index 26122030..8e14bb7d 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/error/ExtendedMappingExceptionResolver.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/error/ExtendedMappingExceptionResolver.java
@@ -31,7 +31,7 @@ import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import net.shibboleth.utilities.java.support.codec.HTMLEncoder;
+import net.shibboleth.shared.codec.HTMLEncoder;
/**
* Custom Spring exception to view mapper that populates the view model with data
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java
index 882ee475..1e60d432 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java
@@ -19,8 +19,8 @@ package net.shibboleth.shared.spring.factory;
import java.io.InputStream;
+import net.shibboleth.shared.scripting.EvaluableScript;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
index 31ec44bc..b35ca61e 100644
--- a/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
@@ -35,9 +35,9 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.scripting.EvaluableScript;
+import net.shibboleth.shared.scripting.ScriptedRunnable;
import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
-import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
-import net.shibboleth.utilities.java.support.scripting.ScriptedRunnable;
/**
*
diff --git a/shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/RunnableResource.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/RunnableResource.xml
index 660f2148..e391e721 100644
--- a/shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/RunnableResource.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/RunnableResource.xml
@@ -6,13 +6,13 @@
<bean id="shibboleth.IdentifiableBeanPostProcessor" class="net.shibboleth.shared.spring.config.IdentifiableBeanPostProcessor" />
- <bean id="Script" class="net.shibboleth.utilities.java.support.scripting.EvaluableScript" init-method="initialize" p:script="
+ <bean id="Script" class="net.shibboleth.shared.scripting.EvaluableScript" init-method="initialize" p:script="
var i = 22;
var j = 7;
var pi = i/j;
"/>
- <bean id="Runnable" class="net.shibboleth.utilities.java.support.scripting.ScriptedRunnable" p:script-ref="Script" init-method="initialize"/>
+ <bean id="Runnable" class="net.shibboleth.shared.scripting.ScriptedRunnable" p:script-ref="Script" init-method="initialize"/>
<bean id="Resource" class="net.shibboleth.shared.spring.resource.RunnableFileSystemResource" c:path="file" c:runnable-ref="Runnable"/>
</beans>
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base32Support.java b/shib-support/src/main/java/net/shibboleth/shared/codec/Base32Support.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base32Support.java
rename to shib-support/src/main/java/net/shibboleth/shared/codec/Base32Support.java
index 5f6d714b..db8c2def 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base32Support.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/Base32Support.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.codec;
+package net.shibboleth.shared.codec;
import javax.annotation.Nonnull;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java b/shib-support/src/main/java/net/shibboleth/shared/codec/Base64Support.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java
rename to shib-support/src/main/java/net/shibboleth/shared/codec/Base64Support.java
index 58a682c9..87ee81a0 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/Base64Support.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/Base64Support.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.codec;
+package net.shibboleth.shared.codec;
import javax.annotation.Nonnull;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/CodecException.java b/shib-support/src/main/java/net/shibboleth/shared/codec/CodecException.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/CodecException.java
rename to shib-support/src/main/java/net/shibboleth/shared/codec/CodecException.java
index da9020bd..317b4551 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/CodecException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/CodecException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.codec;
+package net.shibboleth.shared.codec;
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/DecodingException.java b/shib-support/src/main/java/net/shibboleth/shared/codec/DecodingException.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/DecodingException.java
rename to shib-support/src/main/java/net/shibboleth/shared/codec/DecodingException.java
index 228c8773..4bd55a48 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/DecodingException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/DecodingException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.codec;
+package net.shibboleth.shared.codec;
import javax.annotation.Nullable;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/EncodingException.java b/shib-support/src/main/java/net/shibboleth/shared/codec/EncodingException.java
similarity index 97%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/EncodingException.java
rename to shib-support/src/main/java/net/shibboleth/shared/codec/EncodingException.java
index 1264d546..6aab4e3c 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/EncodingException.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/EncodingException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.codec;
+package net.shibboleth.shared.codec;
import javax.annotation.Nullable;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java b/shib-support/src/main/java/net/shibboleth/shared/codec/HTMLEncoder.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java
rename to shib-support/src/main/java/net/shibboleth/shared/codec/HTMLEncoder.java
index 4b4d8ed2..9849f76d 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/HTMLEncoder.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/HTMLEncoder.java
@@ -31,7 +31,7 @@
* @created 2007
*/
-package net.shibboleth.utilities.java.support.codec;
+package net.shibboleth.shared.codec;
import java.util.Collections;
import java.util.HashMap;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java b/shib-support/src/main/java/net/shibboleth/shared/codec/StringDigester.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java
rename to shib-support/src/main/java/net/shibboleth/shared/codec/StringDigester.java
index c35b6152..665deb3d 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/StringDigester.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/StringDigester.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.codec;
+package net.shibboleth.shared.codec;
import java.nio.charset.Charset;
import java.security.MessageDigest;
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
* and then returns the output in a specified format: Base32/64-encoded or hexadecimal with with lower or upper
* case characters.
*/
-public class StringDigester implements Function<String,String> {
+public final class StringDigester implements Function<String,String> {
/** The output format determining how the the digested byte[] is converted to the output String. */
public enum OutputFormat {
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/codec/package-info.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/package-info.java
rename to shib-support/src/main/java/net/shibboleth/shared/codec/package-info.java
index 760d3eee..1768f175 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/codec/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/codec/package-info.java
@@ -16,4 +16,4 @@
*/
/** A set of helper functions for encoding/decoding data to/from different formats. */
-package net.shibboleth.utilities.java.support.codec;
\ No newline at end of file
+package net.shibboleth.shared.codec;
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEvaluator.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/AbstractScriptEvaluator.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEvaluator.java
rename to shib-support/src/main/java/net/shibboleth/shared/scripting/AbstractScriptEvaluator.java
index dde9e1ef..e486d6ad 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEvaluator.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/AbstractScriptEvaluator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.scripting;
+package net.shibboleth.shared.scripting;
import java.util.Collection;
import java.util.Collections;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java
similarity index 99%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
rename to shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java
index d1e732e1..40bc28c5 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.scripting;
+package net.shibboleth.shared.scripting;
import java.io.File;
import java.io.IOException;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptContextExtender.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptContextExtender.java
similarity index 96%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptContextExtender.java
rename to shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptContextExtender.java
index ea8c49df..f78f7e53 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptContextExtender.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptContextExtender.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.scripting;
+package net.shibboleth.shared.scripting;
import javax.annotation.Nonnull;
import javax.script.ScriptContext;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptedRunnable.java
similarity index 98%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java
rename to shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptedRunnable.java
index a4d5aad1..34c2cb9a 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/ScriptedRunnable.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/ScriptedRunnable.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.scripting;
+package net.shibboleth.shared.scripting;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/package-info.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/package-info.java
similarity index 94%
rename from shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/package-info.java
rename to shib-support/src/main/java/net/shibboleth/shared/scripting/package-info.java
index 2547a5c9..a30be7d3 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/scripting/package-info.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/package-info.java
@@ -17,4 +17,4 @@
/** Classes for working with JSR-223 scripting environments. */
-package net.shibboleth.utilities.java.support.scripting;
\ No newline at end of file
+package net.shibboleth.shared.scripting;
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
index 92de413b..1e1085c0 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiConsumer.java
@@ -31,8 +31,8 @@ import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.resource.Resource;
-import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
-import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
+import net.shibboleth.shared.scripting.AbstractScriptEvaluator;
+import net.shibboleth.shared.scripting.EvaluableScript;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
index 92be2652..c591336f 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiFunction.java
@@ -31,8 +31,8 @@ import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.resource.Resource;
-import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
-import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
+import net.shibboleth.shared.scripting.AbstractScriptEvaluator;
+import net.shibboleth.shared.scripting.EvaluableScript;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
index 0e82d756..6efa260a 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedBiPredicate.java
@@ -31,8 +31,8 @@ import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.resource.Resource;
-import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
-import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
+import net.shibboleth.shared.scripting.AbstractScriptEvaluator;
+import net.shibboleth.shared.scripting.EvaluableScript;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java
index 6c1fbbf4..186ddc36 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedConsumer.java
@@ -30,8 +30,8 @@ import javax.script.ScriptException;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.resource.Resource;
-import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
-import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
+import net.shibboleth.shared.scripting.AbstractScriptEvaluator;
+import net.shibboleth.shared.scripting.EvaluableScript;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
index fe8c4ab1..74456a11 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
@@ -30,8 +30,8 @@ import javax.script.ScriptException;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.resource.Resource;
-import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
-import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
+import net.shibboleth.shared.scripting.AbstractScriptEvaluator;
+import net.shibboleth.shared.scripting.EvaluableScript;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
index 9caecf4a..610f2ecb 100644
--- a/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
@@ -29,8 +29,8 @@ import javax.script.ScriptException;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.resource.Resource;
-import net.shibboleth.utilities.java.support.scripting.AbstractScriptEvaluator;
-import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
+import net.shibboleth.shared.scripting.AbstractScriptEvaluator;
+import net.shibboleth.shared.scripting.EvaluableScript;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/codec/Base32SupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/codec/Base32SupportTest.java
similarity index 98%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/codec/Base32SupportTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/codec/Base32SupportTest.java
index d124c061..036751ea 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/codec/Base32SupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/codec/Base32SupportTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.codec;
+package net.shibboleth.shared.codec;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/codec/Base64SupportTest.java b/shib-support/src/test/java/net/shibboleth/shared/codec/Base64SupportTest.java
similarity index 99%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/codec/Base64SupportTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/codec/Base64SupportTest.java
index 918eff62..cfdcd300 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/codec/Base64SupportTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/codec/Base64SupportTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.codec;
+package net.shibboleth.shared.codec;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/codec/HTMLEncoderTest.java b/shib-support/src/test/java/net/shibboleth/shared/codec/HTMLEncoderTest.java
similarity index 97%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/codec/HTMLEncoderTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/codec/HTMLEncoderTest.java
index e40ed838..87ca7f95 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/codec/HTMLEncoderTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/codec/HTMLEncoderTest.java
@@ -31,13 +31,12 @@
* @created 2007
*/
-package net.shibboleth.utilities.java.support.codec;
-
-import net.shibboleth.utilities.java.support.codec.HTMLEncoder;
+package net.shibboleth.shared.codec;
import org.testng.Assert;
import org.testng.annotations.Test;
+
/**
* HTMLEncoder tests.
*
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/codec/StringDigesterTest.java b/shib-support/src/test/java/net/shibboleth/shared/codec/StringDigesterTest.java
similarity index 94%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/codec/StringDigesterTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/codec/StringDigesterTest.java
index 92d2f6f8..c2c4fb06 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/codec/StringDigesterTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/codec/StringDigesterTest.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.codec;
+package net.shibboleth.shared.codec;
import java.security.NoSuchAlgorithmException;
-import net.shibboleth.utilities.java.support.codec.StringDigester.OutputFormat;
+import net.shibboleth.shared.codec.StringDigester.OutputFormat;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import org.testng.Assert;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEngine.java b/shib-support/src/test/java/net/shibboleth/shared/scripting/AbstractScriptEngine.java
similarity index 98%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEngine.java
rename to shib-support/src/test/java/net/shibboleth/shared/scripting/AbstractScriptEngine.java
index 9c00efd9..66ab7910 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/AbstractScriptEngine.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/scripting/AbstractScriptEngine.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.scripting;
+package net.shibboleth.shared.scripting;
import java.io.Reader;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java b/shib-support/src/test/java/net/shibboleth/shared/scripting/EvaluableScriptTest.java
similarity index 99%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
rename to shib-support/src/test/java/net/shibboleth/shared/scripting/EvaluableScriptTest.java
index a4364739..17bd2c4b 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/scripting/EvaluableScriptTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.scripting;
+package net.shibboleth.shared.scripting;
import java.io.File;
import java.io.FileInputStream;
diff --git a/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/RuntimeScriptingException.java b/shib-support/src/test/java/net/shibboleth/shared/scripting/RuntimeScriptingException.java
similarity index 95%
rename from shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/RuntimeScriptingException.java
rename to shib-support/src/test/java/net/shibboleth/shared/scripting/RuntimeScriptingException.java
index 0d7ea3e7..a3abe8e7 100644
--- a/shib-support/src/test/java/net/shibboleth/utilities/java/support/scripting/RuntimeScriptingException.java
+++ b/shib-support/src/test/java/net/shibboleth/shared/scripting/RuntimeScriptingException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.scripting;
+package net.shibboleth.shared.scripting;
/**
* A run time exception to handle ligatured off methods in our JRS-223 support.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list