[java-shib-shared] branch main updated: Rename Spring factory bean package.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 14 17:15: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=0b5b828bf2786f7e0935265b1bb1b705ea6b48ad
The following commit(s) were added to refs/heads/main by this push:
new 0b5b828b Rename Spring factory bean package.
0b5b828b is described below
commit 0b5b828bf2786f7e0935265b1bb1b705ea6b48ad
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 13:15:17 2022 -0400
Rename Spring factory bean package.
---
.../spring/factory/AbstractComponentAwareFactoryBean.java | 2 +-
.../{ext => shared}/spring/factory/CombiningListFactoryBean.java | 2 +-
.../{ext => shared}/spring/factory/DOMDocumentFactoryBean.java | 2 +-
.../spring/factory/EvaluableScriptFactoryBean.java | 2 +-
.../{ext => shared}/spring/factory/PatternFactoryBean.java | 2 +-
.../shibboleth/{ext => shared}/spring/factory/package-info.java | 6 ++++--
.../spring/factory/CombiningListFactoryBeanTest.java | 6 +++---
.../spring/factory/DOMDocumentFactoryBeanTest.java | 2 +-
.../{ext => shared}/spring/factory/ResourceListBean.java | 2 +-
.../net/shibboleth/{ext => shared}/spring/factory/lists.xml | 4 ++--
.../shibboleth/{ext => shared}/spring/factory/resourceLists.xml | 8 ++++----
11 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwareFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/AbstractComponentAwareFactoryBean.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwareFactoryBean.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/factory/AbstractComponentAwareFactoryBean.java
index 009c43d4..a3d0372b 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwareFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/AbstractComponentAwareFactoryBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.factory;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.BeanCreationException;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/CombiningListFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBean.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/factory/CombiningListFactoryBean.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBean.java
index bd3f813e..50f165da 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/CombiningListFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.factory;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBean.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBean.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBean.java
index f8e94ee7..8e89a9e5 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.factory;
import java.io.InputStream;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java
index 2ed791f9..882ee475 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/EvaluableScriptFactoryBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.factory;
import java.io.InputStream;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/PatternFactoryBean.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/PatternFactoryBean.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/factory/PatternFactoryBean.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/factory/PatternFactoryBean.java
index 732576b1..597dada8 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/PatternFactoryBean.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/PatternFactoryBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.factory;
import java.util.regex.Pattern;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/package-info.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/package-info.java
similarity index 86%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/factory/package-info.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/factory/package-info.java
index 7a3a3d0a..c309e2bf 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/factory/package-info.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/factory/package-info.java
@@ -15,5 +15,7 @@
* limitations under the License.
*/
-/** Spring {@link org.springframework.beans.factory.FactoryBean} implementations.*/
-package net.shibboleth.ext.spring.factory;
+/**
+ * Spring factory beans.
+ */
+package net.shibboleth.shared.spring.factory;
\ No newline at end of file
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/CombiningListFactoryBeanTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBeanTest.java
similarity index 95%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/factory/CombiningListFactoryBeanTest.java
rename to shib-spring/src/test/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBeanTest.java
index fbd52924..6c9af781 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/CombiningListFactoryBeanTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/CombiningListFactoryBeanTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.factory;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
@@ -36,7 +36,7 @@ public class CombiningListFactoryBeanTest {
@Test
public void test() {
- final Resource r = new ClassPathResource("net/shibboleth/ext/spring/factory/lists.xml");
+ final Resource r = new ClassPathResource("net/shibboleth/shared/spring/factory/lists.xml");
final GenericApplicationContext ctx = new ApplicationContextBuilder()
.setName("appCtx")
@@ -59,7 +59,7 @@ public class CombiningListFactoryBeanTest {
@Test
public void resourceTest() {
- final Resource r = new ClassPathResource("net/shibboleth/ext/spring/factory/resourceLists.xml");
+ final Resource r = new ClassPathResource("net/shibboleth/shared/spring/factory/resourceLists.xml");
final GenericApplicationContext ctx = new ApplicationContextBuilder()
.setName("appCtx")
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBeanTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBeanTest.java
similarity index 98%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBeanTest.java
rename to shib-spring/src/test/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBeanTest.java
index dae9e31e..d17702bc 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBeanTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/DOMDocumentFactoryBeanTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.factory;
import net.shibboleth.utilities.java.support.xml.BasicParserPool;
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/ResourceListBean.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/ResourceListBean.java
similarity index 96%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/factory/ResourceListBean.java
rename to shib-spring/src/test/java/net/shibboleth/shared/spring/factory/ResourceListBean.java
index 03423c5f..bd795df9 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/factory/ResourceListBean.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/factory/ResourceListBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.factory;
+package net.shibboleth.shared.spring.factory;
import java.util.List;
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/lists.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/factory/lists.xml
similarity index 87%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/lists.xml
rename to shib-spring/src/test/resources/net/shibboleth/shared/spring/factory/lists.xml
index 9aebda1e..7842cdda 100644
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/lists.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/factory/lists.xml
@@ -31,9 +31,9 @@
</property>
</bean>
- <bean id="combined" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
+ <bean id="combined" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
p:firstList-ref="list" p:secondList-ref="child"/>
- <bean id="nulls" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"/>
+ <bean id="nulls" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"/>
</beans>
\ No newline at end of file
diff --git a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/resourceLists.xml b/shib-spring/src/test/resources/net/shibboleth/shared/spring/factory/resourceLists.xml
similarity index 73%
rename from shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/resourceLists.xml
rename to shib-spring/src/test/resources/net/shibboleth/shared/spring/factory/resourceLists.xml
index a85964a4..43f36ca0 100644
--- a/shib-spring/src/test/resources/net/shibboleth/ext/spring/factory/resourceLists.xml
+++ b/shib-spring/src/test/resources/net/shibboleth/shared/spring/factory/resourceLists.xml
@@ -10,19 +10,19 @@
>
<util:list id="first">
- <value>classpath:/net/shibboleth/ext/spring/factory/lists.xml</value>
+ <value>classpath:/net/shibboleth/shared/spring/factory/lists.xml</value>
</util:list>
<bean id="second" class="org.springframework.beans.factory.config.ListFactoryBean">
<property name="sourceList">
<list >
- <value>classpath:/net/shibboleth/ext/spring/factory/resourceLists.xml</value>
+ <value>classpath:/net/shibboleth/shared/spring/factory/resourceLists.xml</value>
</list>
</property>
</bean>
- <bean id="combined" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
+ <bean id="combined" class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean"
p:firstList-ref="first" p:secondList-ref="second"/>
- <bean id = "resourceList" class="net.shibboleth.ext.spring.factory.ResourceListBean" p:resources-ref="combined" />
+ <bean id = "resourceList" class="net.shibboleth.shared.spring.factory.ResourceListBean" p:resources-ref="combined" />
</beans>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list