[java-shib-shared] branch main updated: Rename Spring resource package.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 14 18:35:37 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=17769dcfce4297d800fcda127a2cbc964d7db817
The following commit(s) were added to refs/heads/main by this push:
new 17769dcf Rename Spring resource package.
17769dcf is described below
commit 17769dcfce4297d800fcda127a2cbc964d7db817
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 14:35:35 2022 -0400
Rename Spring resource package.
---
.../src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java | 2 +-
.../shared/spring/httpclient/resource/ConditionalResourceTest.java | 4 ++--
.../ext/spring/context/FileSystemXmlWebApplicationContext.java | 2 +-
.../ext/spring/context/FilesystemGenericApplicationContext.java | 2 +-
.../ext/spring/context/FilesystemGenericWebApplicationContext.java | 2 +-
.../net/shibboleth/ext/spring/util/ApplicationContextBuilder.java | 4 ++--
.../shibboleth/shared/spring/config/StringToResourceConverter.java | 4 ++--
.../{ext => shared}/spring/resource/ConditionalResource.java | 2 +-
.../{ext => shared}/spring/resource/ConditionalResourceResolver.java | 2 +-
.../spring/resource/PreferFileSystemResourceLoader.java | 2 +-
.../shibboleth/{ext => shared}/spring/resource/ResourceHelper.java | 2 +-
.../{ext => shared}/spring/resource/RunnableFileSystemResource.java | 2 +-
.../net/shibboleth/{ext => shared}/spring/resource/package-info.java | 2 +-
.../java/net/shibboleth/{ext => shared}/spring/resource/Idp1326.java | 4 ++--
.../{ext => shared}/spring/resource/RunnableResourceTest.java | 4 ++--
.../shibboleth/{ext => shared}/spring/resource/RunnableResource.xml | 2 +-
.../net/shibboleth/{ext => shared}/spring/resource/document.xml | 0
.../net/shibboleth/{ext => shared}/spring/resource/idp1326-import.xml | 0
.../net/shibboleth/{ext => shared}/spring/resource/idp1326.xml | 0
19 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java b/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java
index 968493e2..b3ab9c8f 100644
--- a/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java
+++ b/shib-cli/src/main/java/net/shibboleth/shared/cli/AbstractCommandLine.java
@@ -38,8 +38,8 @@ import org.springframework.core.io.support.ResourcePropertySource;
import com.beust.jcommander.JCommander;
import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
-import net.shibboleth.ext.spring.resource.PreferFileSystemResourceLoader;
import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
+import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
index 609b6e31..88f61d44 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
@@ -19,9 +19,9 @@ package net.shibboleth.shared.spring.httpclient.resource;
import java.io.IOException;
-import net.shibboleth.ext.spring.resource.ConditionalResource;
-import net.shibboleth.ext.spring.resource.ConditionalResourceResolver;
import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
+import net.shibboleth.shared.spring.resource.ConditionalResource;
+import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/context/FileSystemXmlWebApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/ext/spring/context/FileSystemXmlWebApplicationContext.java
index de3a0dd8..ee44fa6f 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/context/FileSystemXmlWebApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/ext/spring/context/FileSystemXmlWebApplicationContext.java
@@ -24,8 +24,8 @@ import org.springframework.core.io.Resource;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.web.context.support.XmlWebApplicationContext;
-import net.shibboleth.ext.spring.resource.ConditionalResourceResolver;
import net.shibboleth.ext.spring.util.AnnotationParameterNameDiscoverer;
+import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java
index 40569129..a5f6edbd 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java
@@ -17,8 +17,8 @@
package net.shibboleth.ext.spring.context;
-import net.shibboleth.ext.spring.resource.ConditionalResourceResolver;
import net.shibboleth.ext.spring.util.AnnotationParameterNameDiscoverer;
+import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.ApplicationContext;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericWebApplicationContext.java b/shib-spring/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericWebApplicationContext.java
index 7ff90e41..afef8b4f 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericWebApplicationContext.java
+++ b/shib-spring/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericWebApplicationContext.java
@@ -17,8 +17,8 @@
package net.shibboleth.ext.spring.context;
-import net.shibboleth.ext.spring.resource.ConditionalResourceResolver;
import net.shibboleth.ext.spring.util.AnnotationParameterNameDiscoverer;
+import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.core.io.FileSystemResource;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java b/shib-spring/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
index 21dcaf21..7ef3ec30 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
+++ b/shib-spring/src/main/java/net/shibboleth/ext/spring/util/ApplicationContextBuilder.java
@@ -29,8 +29,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
-import net.shibboleth.ext.spring.resource.ConditionalResourceResolver;
-import net.shibboleth.ext.spring.resource.PreferFileSystemResourceLoader;
import net.shibboleth.shared.spring.config.BooleanToPredicateConverter;
import net.shibboleth.shared.spring.config.FunctionToFunctionConverter;
import net.shibboleth.shared.spring.config.PredicateToPredicateConverter;
@@ -38,6 +36,8 @@ import net.shibboleth.shared.spring.config.StringBooleanToPredicateConverter;
import net.shibboleth.shared.spring.config.StringToDurationConverter;
import net.shibboleth.shared.spring.config.StringToIPRangeConverter;
import net.shibboleth.shared.spring.config.StringToResourceConverter;
+import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
+import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToResourceConverter.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToResourceConverter.java
index 632623ec..97977192 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToResourceConverter.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToResourceConverter.java
@@ -20,8 +20,8 @@ package net.shibboleth.shared.spring.config;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.ext.spring.resource.PreferFileSystemResourceLoader;
-import net.shibboleth.ext.spring.resource.ResourceHelper;
+import net.shibboleth.shared.spring.resource.PreferFileSystemResourceLoader;
+import net.shibboleth.shared.spring.resource.ResourceHelper;
import net.shibboleth.utilities.java.support.resource.Resource;
import org.slf4j.Logger;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/resource/ConditionalResource.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java
similarity index 99%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/resource/ConditionalResource.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java
index c7f2d74b..2fd1ef9f 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/resource/ConditionalResource.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResource.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.resource;
+package net.shibboleth.shared.spring.resource;
import java.io.ByteArrayInputStream;
import java.io.File;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/resource/ConditionalResourceResolver.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/resource/ConditionalResourceResolver.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java
index 4eb5d281..16978de3 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/resource/ConditionalResourceResolver.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ConditionalResourceResolver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.resource;
+package net.shibboleth.shared.spring.resource;
import javax.annotation.Nonnull;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/resource/PreferFileSystemResourceLoader.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/PreferFileSystemResourceLoader.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/resource/PreferFileSystemResourceLoader.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/resource/PreferFileSystemResourceLoader.java
index 0d228e69..c75f808a 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/resource/PreferFileSystemResourceLoader.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/PreferFileSystemResourceLoader.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.resource;
+package net.shibboleth.shared.spring.resource;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.DefaultResourceLoader;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/resource/ResourceHelper.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/resource/ResourceHelper.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java
index b4ead6c5..c2218377 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/resource/ResourceHelper.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/ResourceHelper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.resource;
+package net.shibboleth.shared.spring.resource;
import java.io.File;
import java.io.IOException;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/resource/RunnableFileSystemResource.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java
similarity index 99%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/resource/RunnableFileSystemResource.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java
index 55a0eb55..2ec76756 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/resource/RunnableFileSystemResource.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/RunnableFileSystemResource.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.resource;
+package net.shibboleth.shared.spring.resource;
import java.io.File;
import java.io.IOException;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/resource/package-info.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/package-info.java
similarity index 95%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/resource/package-info.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/resource/package-info.java
index eefd69e9..1f661fda 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/resource/package-info.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/resource/package-info.java
@@ -20,4 +20,4 @@
* concrete implementations and a bridging class.
*/
-package net.shibboleth.ext.spring.resource;
\ No newline at end of file
+package net.shibboleth.shared.spring.resource;
\ No newline at end of file
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/resource/Idp1326.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java
similarity index 96%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/resource/Idp1326.java
rename to shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java
index d761ba90..8030ff06 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/resource/Idp1326.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/Idp1326.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.resource;
+package net.shibboleth.shared.spring.resource;
import java.io.IOException;
import java.nio.file.Path;
@@ -43,7 +43,7 @@ public class Idp1326{
private Resource resource;
@BeforeClass public void getFileSystemDetails() throws IOException {
- resource = new ClassPathResource("net/shibboleth/ext/spring/resource/idp1326.xml");
+ resource = new ClassPathResource("net/shibboleth/shared/spring/resource/idp1326.xml");
final Path path = resource.getFile().toPath();
separator = path.getFileSystem().getSeparator();
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/resource/RunnableResourceTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
similarity index 98%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/resource/RunnableResourceTest.java
rename to shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
index f8d21cba..eef6261f 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/resource/RunnableResourceTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/resource/RunnableResourceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.resource;
+package net.shibboleth.shared.spring.resource;
import java.io.File;
import java.io.FileOutputStream;
@@ -152,7 +152,7 @@ public class RunnableResourceTest {
final XmlBeanDefinitionReader beanDefinitionReader = new SchemaTypeAwareXMLBeanDefinitionReader(context);
beanDefinitionReader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
- beanDefinitionReader.loadBeanDefinitions("classpath:net/shibboleth/ext/spring/resource/RunnableResource.xml");
+ beanDefinitionReader.loadBeanDefinitions("classpath:net/shibboleth/shared/spring/resource/RunnableResource.xml");
context.refresh();
final Collection<Resource> beans = context.getBeansOfType(Resource.class).values();
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/resource/RunnableResource.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/RunnableResource.xml
similarity index 85%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/resource/RunnableResource.xml
rename to shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/RunnableResource.xml
index 8be8297b..660f2148 100644
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/resource/RunnableResource.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/RunnableResource.xml
@@ -14,5 +14,5 @@
<bean id="Runnable" class="net.shibboleth.utilities.java.support.scripting.ScriptedRunnable" p:script-ref="Script" init-method="initialize"/>
- <bean id="Resource" class="net.shibboleth.ext.spring.resource.RunnableFileSystemResource" c:path="file" c:runnable-ref="Runnable"/>
+ <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-spring/src/test/resources/net/shibboleth/ext/spring/resource/document.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/document.xml
similarity index 100%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/resource/document.xml
rename to shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/document.xml
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/resource/idp1326-import.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/idp1326-import.xml
similarity index 100%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/resource/idp1326-import.xml
rename to shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/idp1326-import.xml
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/resource/idp1326.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/idp1326.xml
similarity index 100%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/resource/idp1326.xml
rename to shib-spring/src/test/resources/net/shibboleth/shared/spring/resource/idp1326.xml
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list