[java-shib-shared] branch main updated: Rename shared security packages.
Scott Cantor
cantor.2 at osu.edu
Thu Sep 22 16:55:19 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=385474edcf766a809e972fb9012e363c039bdd21
The following commit(s) were added to refs/heads/main by this push:
new 385474ed Rename shared security packages.
385474ed is described below
commit 385474edcf766a809e972fb9012e363c039bdd21
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 22 12:55:16 2022 -0400
Rename shared security packages.
---
shib-security/pom.xml | 12 ++++++-----
.../support => shared}/security/AccessControl.java | 2 +-
.../security/AccessControlService.java | 2 +-
.../security/DataExpiredException.java | 2 +-
.../support => shared}/security/DataSealer.java | 2 +-
.../security/DataSealerException.java | 2 +-
.../security/DataSealerKeyStrategy.java | 2 +-
.../security/IdentifierGenerationStrategy.java | 2 +-
.../security/KeyNotFoundException.java | 2 +-
.../security/impl/BasicAccessControlService.java | 6 +++---
.../security/impl/BasicKeystoreKeyStrategy.java | 6 +++---
.../impl}/BasicKeystoreKeyStrategyTool.java | 3 +--
.../FixedStringIdentifierGenerationStrategy.java | 4 ++--
.../security/impl/IPRangeAccessControl.java | 4 ++--
.../impl/RandomIdentifierGenerationStrategy.java | 4 ++--
.../security/impl/ScriptedKeyStrategy.java | 4 ++--
.../SecureRandomIdentifierGenerationStrategy.java | 2 +-
.../impl}/SelfSignedCertificateGenerator.java | 2 +-
.../Type4UUIDIdentifierGenerationStrategy.java | 4 ++--
.../security/impl/package-info.java | 2 +-
.../support => shared}/security/package-info.java | 2 +-
.../security/DataSealerTest.java | 10 ++++-----
.../security/TestResourceConverter.java | 2 +-
.../impl/BasicKeystoreKeyStrategyTest.java | 11 +++++-----
...ixedStringIdentifierGenerationStrategyTest.java | 4 +---
.../RandomIdentifierGenerationStrategyTest.java | 7 +++----
.../security/impl/ScriptedKeyStrategyTest.java | 23 ++++++++++++++-------
...cureRandomIdentifierGenerationStrategyTest.java | 9 ++++----
.../Type4UUIDIdentifierGenerationStrategyTest.java | 7 +++----
.../support => shared}/security/SealerKeyStore.jks | Bin
.../security/SealerKeyStore.kver | 0
.../security/SealerKeyStore.kver2 | 0
.../security/impl}/keyStrategyScript.js | 0
.../impl/DelegatingAccessControlService.java | 4 ++--
.../impl/ReloadingAccessControlService.java | 4 ++--
.../impl/ServiceableAccessControlService.java | 4 ++--
36 files changed, 80 insertions(+), 76 deletions(-)
diff --git a/shib-security/pom.xml b/shib-security/pom.xml
index 03f6a9d6..5c1ff015 100644
--- a/shib-security/pom.xml
+++ b/shib-security/pom.xml
@@ -38,11 +38,6 @@
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>com.beust</groupId>
- <artifactId>jcommander</artifactId>
- </dependency>
-
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -57,6 +52,13 @@
<artifactId>bcpkix-jdk15on</artifactId>
</dependency>
+ <!-- Used for a couple of command line tools -->
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <optional>true</optional>
+ </dependency>
+
<!-- Provided Dependencies -->
<dependency>
<groupId>jakarta.servlet</groupId>
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/AccessControl.java b/shib-security/src/main/java/net/shibboleth/shared/security/AccessControl.java
similarity index 96%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/AccessControl.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/AccessControl.java
index 45aaed1f..12739c86 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/AccessControl.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/AccessControl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/AccessControlService.java b/shib-security/src/main/java/net/shibboleth/shared/security/AccessControlService.java
similarity index 97%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/AccessControlService.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/AccessControlService.java
index 08493a50..8a6383e9 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/AccessControlService.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/AccessControlService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/DataExpiredException.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataExpiredException.java
similarity index 97%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/DataExpiredException.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/DataExpiredException.java
index 2ff5aa11..0ad545d8 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/DataExpiredException.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataExpiredException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security;
import javax.annotation.Nullable;
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
similarity index 99%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
index 3e0e39fa..ff5d644d 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerException.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerException.java
similarity index 97%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerException.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/DataSealerException.java
index 2b214d25..095247f3 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerException.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security;
import javax.annotation.Nullable;
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java
similarity index 97%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerKeyStrategy.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java
index 1db994fd..e5e4c605 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/DataSealerKeyStrategy.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security;
import java.security.KeyException;
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/IdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/IdentifierGenerationStrategy.java
similarity index 96%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/IdentifierGenerationStrategy.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/IdentifierGenerationStrategy.java
index 92142aca..310746fc 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/IdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/IdentifierGenerationStrategy.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security;
import javax.annotation.Nonnull;
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/KeyNotFoundException.java b/shib-security/src/main/java/net/shibboleth/shared/security/KeyNotFoundException.java
similarity index 97%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/KeyNotFoundException.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/KeyNotFoundException.java
index ef6eaf1b..1861c9cc 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/KeyNotFoundException.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/KeyNotFoundException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security;
import java.security.KeyException;
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicAccessControlService.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java
similarity index 94%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicAccessControlService.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java
index eedd836c..38486d8e 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicAccessControlService.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicAccessControlService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security.impl;
+package net.shibboleth.shared.security.impl;
import java.util.Collections;
import java.util.HashMap;
@@ -28,11 +28,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.servlet.ServletRequest;
+import net.shibboleth.shared.security.AccessControl;
+import net.shibboleth.shared.security.AccessControlService;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.security.AccessControl;
-import net.shibboleth.utilities.java.support.security.AccessControlService;
/** Simple implementation that uses an in-memory map of policies. */
public class BasicAccessControlService extends AbstractIdentifiableInitializableComponent
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
similarity index 98%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
index 34262b84..baa9afbc 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategy.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security.impl;
+package net.shibboleth.shared.security.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -40,6 +40,8 @@ import javax.crypto.SecretKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import net.shibboleth.shared.security.DataSealerKeyStrategy;
+import net.shibboleth.shared.security.KeyNotFoundException;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.collection.Pair;
@@ -50,8 +52,6 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.primitive.TimerSupport;
import net.shibboleth.utilities.java.support.resource.Resource;
-import net.shibboleth.utilities.java.support.security.DataSealerKeyStrategy;
-import net.shibboleth.utilities.java.support.security.KeyNotFoundException;
/**
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTool.java
similarity index 98%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTool.java
index ce60c95f..c25b1fba 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTool.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security.impl;
import java.io.File;
import java.io.FileInputStream;
@@ -33,7 +33,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/FixedStringIdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/FixedStringIdentifierGenerationStrategy.java
similarity index 93%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/FixedStringIdentifierGenerationStrategy.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/impl/FixedStringIdentifierGenerationStrategy.java
index c2c0b72a..c3eef17f 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/FixedStringIdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/FixedStringIdentifierGenerationStrategy.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security.impl;
+package net.shibboleth.shared.security.impl;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.security.IdentifierGenerationStrategy;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
/**
* Identifier generation strategy using a fixed identifier string.
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java
similarity index 96%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java
index 60417607..d10b3ecf 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/IPRangeAccessControl.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security.impl;
+package net.shibboleth.shared.security.impl;
import java.util.Collection;
import java.util.Collections;
@@ -32,10 +32,10 @@ import com.google.common.net.InetAddresses;
import jakarta.servlet.ServletRequest;
import net.shibboleth.shared.net.HttpServletSupport;
import net.shibboleth.shared.net.IPRange;
+import net.shibboleth.shared.security.AccessControl;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.security.AccessControl;
/**
* Simple access control implementation based on IP address checking.
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/RandomIdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java
similarity index 96%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/RandomIdentifierGenerationStrategy.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java
index 77237019..bdf76039 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/RandomIdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategy.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security.impl;
+package net.shibboleth.shared.security.impl;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
@@ -23,9 +23,9 @@ import java.util.Random;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.security.IdentifierGenerationStrategy;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
import org.apache.commons.codec.BinaryEncoder;
import org.apache.commons.codec.EncoderException;
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
similarity index 98%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
index 7ce8811a..148069cd 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategy.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security.impl;
+package net.shibboleth.shared.security.impl;
import java.security.KeyException;
import java.time.Duration;
@@ -34,6 +34,7 @@ import javax.script.SimpleScriptContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import net.shibboleth.shared.security.DataSealerKeyStrategy;
import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -43,7 +44,6 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.TimerSupport;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
-import net.shibboleth.utilities.java.support.security.DataSealerKeyStrategy;
/**
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/SecureRandomIdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java
similarity index 97%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/SecureRandomIdentifierGenerationStrategy.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java
index 8ccb9e5d..3466160f 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/SecureRandomIdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategy.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security.impl;
+package net.shibboleth.shared.security.impl;
import java.security.SecureRandom;
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SelfSignedCertificateGenerator.java
similarity index 99%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/impl/SelfSignedCertificateGenerator.java
index f5df0134..e990550e 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/SelfSignedCertificateGenerator.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/SelfSignedCertificateGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security.impl;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/Type4UUIDIdentifierGenerationStrategy.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategy.java
similarity index 91%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/Type4UUIDIdentifierGenerationStrategy.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategy.java
index d031d3cf..0f83a83e 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/Type4UUIDIdentifierGenerationStrategy.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategy.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security.impl;
+package net.shibboleth.shared.security.impl;
import java.util.UUID;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
+import net.shibboleth.shared.security.IdentifierGenerationStrategy;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.security.IdentifierGenerationStrategy;
/** Generates a type 4 UUID as an identifier. */
@ThreadSafe
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/package-info.java b/shib-security/src/main/java/net/shibboleth/shared/security/impl/package-info.java
similarity index 93%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/package-info.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/impl/package-info.java
index 5648c565..629b8672 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/package-info.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/impl/package-info.java
@@ -19,4 +19,4 @@
* Implementations of security interfaces.
*/
-package net.shibboleth.utilities.java.support.security.impl;
\ No newline at end of file
+package net.shibboleth.shared.security.impl;
\ No newline at end of file
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/package-info.java b/shib-security/src/main/java/net/shibboleth/shared/security/package-info.java
similarity index 94%
rename from shib-security/src/main/java/net/shibboleth/utilities/java/support/security/package-info.java
rename to shib-security/src/main/java/net/shibboleth/shared/security/package-info.java
index d71028e8..2b051a0e 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/package-info.java
+++ b/shib-security/src/main/java/net/shibboleth/shared/security/package-info.java
@@ -17,4 +17,4 @@
/** Helpers for common security related tasks. */
-package net.shibboleth.utilities.java.support.security;
\ No newline at end of file
+package net.shibboleth.shared.security;
\ No newline at end of file
diff --git a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java
similarity index 95%
rename from shib-security/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java
rename to shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java
index 0b35de04..62710aef 100644
--- a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/DataSealerTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security;
+import net.shibboleth.shared.security.impl.BasicKeystoreKeyStrategy;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import net.shibboleth.utilities.java.support.resource.Resource;
-import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
import java.time.Duration;
import java.time.Instant;
@@ -53,17 +53,17 @@ public class DataSealerTest {
@BeforeClass public void initializeKeystoreResource() {
ClassPathResource resource =
- new ClassPathResource("/net/shibboleth/utilities/java/support/security/SealerKeyStore.jks");
+ new ClassPathResource("/net/shibboleth/shared/security/SealerKeyStore.jks");
Assert.assertTrue(resource.exists());
keystoreResource = TestResourceConverter.of(resource);
resource =
- new ClassPathResource("/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver");
+ new ClassPathResource("/net/shibboleth/shared/security/SealerKeyStore.kver");
Assert.assertTrue(resource.exists());
versionResource = TestResourceConverter.of(resource);
resource =
- new ClassPathResource("/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver2");
+ new ClassPathResource("/net/shibboleth/shared/security/SealerKeyStore.kver2");
Assert.assertTrue(resource.exists());
version2Resource = TestResourceConverter.of(resource);
}
diff --git a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/TestResourceConverter.java b/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java
similarity index 98%
rename from shib-security/src/test/java/net/shibboleth/utilities/java/support/security/TestResourceConverter.java
rename to shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java
index 6a22b7af..966db59a 100644
--- a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/TestResourceConverter.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/TestResourceConverter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security;
import java.io.File;
import java.io.IOException;
diff --git a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategyTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTest.java
similarity index 90%
rename from shib-security/src/test/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategyTest.java
rename to shib-security/src/test/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTest.java
index 7fee684f..1c2cc13d 100644
--- a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategyTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/impl/BasicKeystoreKeyStrategyTest.java
@@ -15,27 +15,26 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security.impl;
+package net.shibboleth.shared.security.impl;
import java.io.File;
import java.security.KeyException;
import java.time.Duration;
-import net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategyTool;
-import net.shibboleth.utilities.java.support.security.TestResourceConverter;
-
import org.springframework.core.io.FileSystemResource;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.shared.security.TestResourceConverter;
+
/**
* Test for {@link BasicKeystoreKeyStrategy}.
*/
public class BasicKeystoreKeyStrategyTest {
@Test public void testBasicKeystoreKeyStrategy() throws Exception {
- final File keystoreFile = new File("src/test/resources/net/shibboleth/utilities/java/support/security/Temp.jks");
- final File versionFile = new File("src/test/resources/net/shibboleth/utilities/java/support/security/Temp.kver");
+ final File keystoreFile = new File("src/test/resources/net/shibboleth/shared/security/impl/Temp.jks");
+ final File versionFile = new File("src/test/resources/net/shibboleth/shared/security/impl/Temp.kver");
keystoreFile.deleteOnExit();
versionFile.deleteOnExit();
diff --git a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/FixedStringIdentifierGenerationStrategyTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/impl/FixedStringIdentifierGenerationStrategyTest.java
similarity index 81%
rename from shib-security/src/test/java/net/shibboleth/utilities/java/support/security/FixedStringIdentifierGenerationStrategyTest.java
rename to shib-security/src/test/java/net/shibboleth/shared/security/impl/FixedStringIdentifierGenerationStrategyTest.java
index 8605911d..8b5e7f49 100644
--- a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/FixedStringIdentifierGenerationStrategyTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/impl/FixedStringIdentifierGenerationStrategyTest.java
@@ -1,11 +1,9 @@
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security.impl;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.security.impl.FixedStringIdentifierGenerationStrategy;
-
public class FixedStringIdentifierGenerationStrategyTest {
@Test
diff --git a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategyTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategyTest.java
similarity index 89%
rename from shib-security/src/test/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategyTest.java
rename to shib-security/src/test/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategyTest.java
index e24e9b08..ed5ca8bc 100644
--- a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/RandomIdentifierGenerationStrategyTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/impl/RandomIdentifierGenerationStrategyTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security.impl;
import java.util.HashSet;
import java.util.Set;
@@ -25,8 +25,7 @@ import java.util.regex.Pattern;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.security.impl.RandomIdentifierGenerationStrategy;
-
+/** Unit test for {@link RandomIdentifierGenerationStrategy}. */
public class RandomIdentifierGenerationStrategyTest {
/**
@@ -37,7 +36,7 @@ public class RandomIdentifierGenerationStrategyTest {
@Test
public void testGenerateIdentifier() {
final Pattern ncNamePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_\\-\\.]+$");
- final IdentifierGenerationStrategy strat = new RandomIdentifierGenerationStrategy();
+ final RandomIdentifierGenerationStrategy strat = new RandomIdentifierGenerationStrategy();
final int howMany = 1000;
final Set<String> values = new HashSet<>(1000);
for (int iteration = 1; iteration<=howMany; iteration++) {
diff --git a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategyTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java
similarity index 85%
rename from shib-security/src/test/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategyTest.java
rename to shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java
index 1940179b..f1a86e61 100644
--- a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/impl/ScriptedKeyStrategyTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/impl/ScriptedKeyStrategyTest.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security.impl;
+package net.shibboleth.shared.security.impl;
-import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.security.KeyException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
@@ -39,8 +40,6 @@ import org.testng.annotations.Test;
* Test for {@link ScriptedKeyStrategy}.
*/
public class ScriptedKeyStrategyTest {
-
- final String scriptPath = "src/test/resources/net/shibboleth/utilities/java/support/security/keyStrategyScript.js";
private Map<String,Object> customMap;
@@ -48,7 +47,7 @@ public class ScriptedKeyStrategyTest {
private ScriptedKeyStrategy strategy;
- @BeforeMethod public void setUp() throws ComponentInitializationException, NoSuchAlgorithmException, ScriptException {
+ @BeforeMethod public void setUp() throws ComponentInitializationException, NoSuchAlgorithmException, ScriptException, IOException {
final SecureRandom random = new SecureRandom();
keyGenerator = KeyGenerator.getInstance("AES");
@@ -57,9 +56,15 @@ public class ScriptedKeyStrategyTest {
customMap.put("secret1", keyGenerator.generateKey());
customMap.put("default", "secret1");
+ final EvaluableScript script = new EvaluableScript();
+ try (final InputStream in = getClass().getResourceAsStream("keyStrategyScript.js")) {
+ script.setScript(in);
+ }
+ script.initialize();
+
strategy = new ScriptedKeyStrategy();
strategy.setUpdateInterval(Duration.ofSeconds(1));
- strategy.setKeyScript(new EvaluableScript("javascript", new File(scriptPath)));
+ strategy.setKeyScript(script);
strategy.setCustomObject(customMap);
strategy.setCacheSize(1);
strategy.initialize();
@@ -72,8 +77,12 @@ public class ScriptedKeyStrategyTest {
@Test(expectedExceptions=ComponentInitializationException.class)
public void testScriptFailure() throws ComponentInitializationException, ScriptException {
+ final EvaluableScript script = new EvaluableScript();
+ script.setScript("null");
+ script.initialize();
+
final ScriptedKeyStrategy estrategy = new ScriptedKeyStrategy();
- estrategy.setKeyScript(new EvaluableScript("null"));
+ estrategy.setKeyScript(script);
estrategy.initialize();
}
diff --git a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/SecureRandomIdentifierGenerationStrategyTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategyTest.java
similarity index 91%
rename from shib-security/src/test/java/net/shibboleth/utilities/java/support/security/SecureRandomIdentifierGenerationStrategyTest.java
rename to shib-security/src/test/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategyTest.java
index 35cd3a43..bfdbe019 100644
--- a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/SecureRandomIdentifierGenerationStrategyTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/impl/SecureRandomIdentifierGenerationStrategyTest.java
@@ -16,7 +16,7 @@
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security.impl;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
@@ -29,8 +29,7 @@ import org.apache.commons.codec.binary.Hex;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.security.impl.SecureRandomIdentifierGenerationStrategy;
-
+/** Unit test for {@link SecureRandomIdentifierGenerationStrategy}. */
public class SecureRandomIdentifierGenerationStrategyTest {
/**
@@ -39,7 +38,7 @@ public class SecureRandomIdentifierGenerationStrategyTest {
*/
@Test public void testGenerateIdentifier() {
final Pattern ncNamePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_\\-\\.]+$");
- final IdentifierGenerationStrategy strat = new SecureRandomIdentifierGenerationStrategy();
+ final SecureRandomIdentifierGenerationStrategy strat = new SecureRandomIdentifierGenerationStrategy();
final int howMany = 1000;
final Set<String> values = new HashSet<>(1000);
for (int iteration = 1; iteration <= howMany; iteration++) {
@@ -67,7 +66,7 @@ public class SecureRandomIdentifierGenerationStrategyTest {
*/
@Test public void testConstructorWithSecureRandom() throws NoSuchAlgorithmException {
final Pattern ncNamePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_\\-\\.]+$");
- final IdentifierGenerationStrategy strat =
+ final SecureRandomIdentifierGenerationStrategy strat =
new SecureRandomIdentifierGenerationStrategy(SecureRandom.getInstance("SHA1PRNG"), 16, new Hex());
final int howMany = 1000;
final Set<String> values = new HashSet<>(1000);
diff --git a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategyTest.java b/shib-security/src/test/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategyTest.java
similarity index 89%
rename from shib-security/src/test/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategyTest.java
rename to shib-security/src/test/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategyTest.java
index 812ac4bf..49094af1 100644
--- a/shib-security/src/test/java/net/shibboleth/utilities/java/support/security/Type4UUIDIdentifierGenerationStrategyTest.java
+++ b/shib-security/src/test/java/net/shibboleth/shared/security/impl/Type4UUIDIdentifierGenerationStrategyTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.shared.security.impl;
import java.util.HashSet;
import java.util.Set;
@@ -25,8 +25,7 @@ import java.util.regex.Pattern;
import org.testng.Assert;
import org.testng.annotations.Test;
-import net.shibboleth.utilities.java.support.security.impl.Type4UUIDIdentifierGenerationStrategy;
-
+/** Unit test for {@link Type4UUIDIdentifierGenerationStrategy}. */
public class Type4UUIDIdentifierGenerationStrategyTest {
/**
@@ -37,7 +36,7 @@ public class Type4UUIDIdentifierGenerationStrategyTest {
@Test
public void testGenerateIdentifier() {
final Pattern ncNamePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_\\-\\.]+$");
- final IdentifierGenerationStrategy strat = new Type4UUIDIdentifierGenerationStrategy();
+ final Type4UUIDIdentifierGenerationStrategy strat = new Type4UUIDIdentifierGenerationStrategy();
final int howMany = 1000;
final Set<String> values = new HashSet<>(1000);
for (int iteration = 1; iteration<=howMany; iteration++) {
diff --git a/shib-security/src/test/resources/net/shibboleth/utilities/java/support/security/SealerKeyStore.jks b/shib-security/src/test/resources/net/shibboleth/shared/security/SealerKeyStore.jks
similarity index 100%
rename from shib-security/src/test/resources/net/shibboleth/utilities/java/support/security/SealerKeyStore.jks
rename to shib-security/src/test/resources/net/shibboleth/shared/security/SealerKeyStore.jks
diff --git a/shib-security/src/test/resources/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver b/shib-security/src/test/resources/net/shibboleth/shared/security/SealerKeyStore.kver
similarity index 100%
rename from shib-security/src/test/resources/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver
rename to shib-security/src/test/resources/net/shibboleth/shared/security/SealerKeyStore.kver
diff --git a/shib-security/src/test/resources/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver2 b/shib-security/src/test/resources/net/shibboleth/shared/security/SealerKeyStore.kver2
similarity index 100%
rename from shib-security/src/test/resources/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver2
rename to shib-security/src/test/resources/net/shibboleth/shared/security/SealerKeyStore.kver2
diff --git a/shib-security/src/test/resources/net/shibboleth/utilities/java/support/security/keyStrategyScript.js b/shib-security/src/test/resources/net/shibboleth/shared/security/impl/keyStrategyScript.js
similarity index 100%
rename from shib-security/src/test/resources/net/shibboleth/utilities/java/support/security/keyStrategyScript.js
rename to shib-security/src/test/resources/net/shibboleth/shared/security/impl/keyStrategyScript.js
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java
index 56c3ca0a..6bd2b180 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/DelegatingAccessControlService.java
@@ -24,13 +24,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import jakarta.servlet.ServletRequest;
+import net.shibboleth.shared.security.AccessControl;
+import net.shibboleth.shared.security.AccessControlService;
import net.shibboleth.shared.service.ReloadableService;
import net.shibboleth.shared.service.ServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.security.AccessControl;
-import net.shibboleth.utilities.java.support.security.AccessControlService;
/**
* This class uses the {@link ReloadableService} concept to implement {@link AccessControlService}
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java
index 901279ea..65748032 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ReloadingAccessControlService.java
@@ -19,12 +19,12 @@ package net.shibboleth.shared.service.security.impl;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.security.AccessControl;
+import net.shibboleth.shared.security.AccessControlService;
import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.security.AccessControl;
-import net.shibboleth.utilities.java.support.security.AccessControlService;
/**
* This class wraps an {@link AccessControlService} in a
diff --git a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java
index 46849201..0b424307 100644
--- a/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java
+++ b/shib-service/src/main/java/net/shibboleth/shared/service/security/impl/ServiceableAccessControlService.java
@@ -19,12 +19,12 @@ package net.shibboleth.shared.service.security.impl;
import javax.annotation.Nonnull;
+import net.shibboleth.shared.security.AccessControl;
+import net.shibboleth.shared.security.AccessControlService;
import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.security.AccessControl;
-import net.shibboleth.utilities.java.support.security.AccessControlService;
/**
* This class wraps an {@link AccessControlService} in a
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list