[java-support] branch master updated: Move existing data sealer strategy to impl package.

Scott Cantor cantor.2 at osu.edu
Mon Jun 10 09:53:10 EDT 2019


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-support.

View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=ac011fd648b477a7289c4c46fb7e65f99a9ffbab

The following commit(s) were added to refs/heads/master by this push:
       new  ac011fd   Move existing data sealer strategy to impl package.
ac011fd is described below

commit ac011fd648b477a7289c4c46fb7e65f99a9ffbab
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 10 09:53:05 2019 -0400

    Move existing data sealer strategy to impl package.
---
 .../security/BasicKeystoreKeyStrategyTool.java     |  1 +
 .../{ => impl}/BasicKeystoreKeyStrategy.java       |  4 +++-
 .../java/support/security/impl/package-info.java   | 22 ++++++++++++++++++++++
 .../java/support/security/DataSealerTest.java      |  1 +
 .../{ => impl}/BasicKeystoreKeyStrategyTest.java   |  4 +++-
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java b/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java
index 8a1cad0..ca329e3 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java
@@ -33,6 +33,7 @@ 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/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java
similarity index 98%
rename from src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java
rename to src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java
index d699d64..1064188 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategy.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.utilities.java.support.security.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -46,6 +46,8 @@ 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;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/net/shibboleth/utilities/java/support/security/impl/package-info.java b/src/main/java/net/shibboleth/utilities/java/support/security/impl/package-info.java
new file mode 100644
index 0000000..5648c56
--- /dev/null
+++ b/src/main/java/net/shibboleth/utilities/java/support/security/impl/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements.  See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Implementations of security interfaces.
+ */
+
+package net.shibboleth.utilities.java.support.security.impl;
\ No newline at end of file
diff --git a/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java b/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java
index 9897c44..afd6271 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java
@@ -21,6 +21,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.resource.Resource;
 import net.shibboleth.utilities.java.support.resource.TestResourceConverter;
+import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
 
 import java.time.Duration;
 import java.time.Instant;
diff --git a/src/test/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTest.java b/src/test/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategyTest.java
similarity index 93%
rename from src/test/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTest.java
rename to src/test/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategyTest.java
index 2e5f6c6..7184077 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/security/impl/BasicKeystoreKeyStrategyTest.java
@@ -15,13 +15,15 @@
  * limitations under the License.
  */
 
-package net.shibboleth.utilities.java.support.security;
+package net.shibboleth.utilities.java.support.security.impl;
 
 import java.io.File;
 import java.security.KeyException;
 import java.time.Duration;
 
 import net.shibboleth.utilities.java.support.resource.TestResourceConverter;
+import net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategyTool;
+import net.shibboleth.utilities.java.support.security.impl.BasicKeystoreKeyStrategy;
 
 import org.springframework.core.io.FileSystemResource;
 import org.testng.Assert;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list