[java-shib-shared] branch main updated: Rename test package and data path.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 21 19:52:51 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=e123dc615a93e132f3993603e89b52d1a8c1cd2a
The following commit(s) were added to refs/heads/main by this push:
new e123dc61 Rename test package and data path.
e123dc61 is described below
commit e123dc615a93e132f3993603e89b52d1a8c1cd2a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 21 15:52:48 2022 -0400
Rename test package and data path.
---
.../spring/service/NonReloadableTestBean.java | 2 +-
.../spring/service/ReloadableBeanServiceTest.java | 4 ++--
.../service/ReloadableSpringServiceTest.java | 23 +++++++++++-----------
.../spring/service/ReloadableTestBean.java | 2 +-
.../spring/service/TestServiceableComponent.java | 4 +---
.../{ext => shared}/spring/service/BrokenBean1.xml | 0
.../{ext => shared}/spring/service/BrokenBean2.xml | 0
.../spring/service/ReloadableBeans1.xml | 2 +-
.../spring/service/ReloadableSpringService.xml | 0
.../spring/service/ServiceableBean1.xml | 0
.../spring/service/ServiceableBean2.xml | 0
11 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/shib-service/src/test/java/net/shibboleth/ext/spring/service/NonReloadableTestBean.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java
similarity index 98%
rename from shib-service/src/test/java/net/shibboleth/ext/spring/service/NonReloadableTestBean.java
rename to shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java
index 9fbf7196..1bf78ac8 100644
--- a/shib-service/src/test/java/net/shibboleth/ext/spring/service/NonReloadableTestBean.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/NonReloadableTestBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.service;
+package net.shibboleth.shared.spring.service;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableBeanServiceTest.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableBeanServiceTest.java
similarity index 94%
rename from shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableBeanServiceTest.java
rename to shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableBeanServiceTest.java
index 392af9e9..ca224a47 100644
--- a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableBeanServiceTest.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableBeanServiceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.service;
+package net.shibboleth.shared.spring.service;
import java.io.IOException;
import java.util.Collections;
@@ -38,7 +38,7 @@ public class ReloadableBeanServiceTest {
try (final GenericApplicationContext appCtx = new ApplicationContextBuilder()
.setName("appCtx")
.setServiceConfigurations(Collections.<Resource>singletonList(
- new ClassPathResource("net/shibboleth/ext/spring/service/ReloadableBeans1.xml")))
+ new ClassPathResource("net/shibboleth/shared/spring/service/ReloadableBeans1.xml")))
.build()) {
final NonReloadableTestBean bean = appCtx.getBean("nonReloadableBean", NonReloadableTestBean.class);
Assert.assertEquals(10, bean.getValue());
diff --git a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableSpringServiceTest.java
similarity index 91%
rename from shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java
rename to shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableSpringServiceTest.java
index a36c456b..d0ae391f 100644
--- a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableSpringServiceTest.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableSpringServiceTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.service;
+package net.shibboleth.shared.spring.service;
import java.io.File;
import java.io.FileOutputStream;
@@ -26,7 +26,6 @@ import java.time.Instant;
import java.util.Collections;
import net.shibboleth.shared.service.ServiceableComponent;
-import net.shibboleth.shared.spring.service.ReloadableSpringService;
import net.shibboleth.shared.spring.util.ApplicationContextBuilder;
import org.springframework.beans.factory.BeanInitializationException;
@@ -76,7 +75,7 @@ public class ReloadableSpringServiceTest {
final ReloadableSpringService<TestServiceableComponent> service =
new ReloadableSpringService<>(TestServiceableComponent.class);
- createPopulatedFile("net/shibboleth/ext/spring/service/ServiceableBean1.xml");
+ createPopulatedFile("net/shibboleth/shared/spring/service/ServiceableBean1.xml");
service.setFailFast(true);
service.setId("reloadableService");
@@ -92,7 +91,7 @@ public class ReloadableSpringServiceTest {
Assert.assertFalse(component.getComponent().isDestroyed());
serviceableComponent.unpinComponent();
- overwriteFileWith("net/shibboleth/ext/spring/service/ServiceableBean2.xml");
+ overwriteFileWith("net/shibboleth/shared/spring/service/ServiceableBean2.xml");
long count = 70;
while (count > 0 && !component.isDestroyed()) {
@@ -119,7 +118,7 @@ public class ReloadableSpringServiceTest {
final ReloadableSpringService<TestServiceableComponent> service =
new ReloadableSpringService<>(TestServiceableComponent.class);
- createPopulatedFile("net/shibboleth/ext/spring/service/ServiceableBean1.xml");
+ createPopulatedFile("net/shibboleth/shared/spring/service/ServiceableBean1.xml");
service.setFailFast(true);
service.setId("deferedReload");
@@ -140,7 +139,7 @@ public class ReloadableSpringServiceTest {
Thread.sleep(RELOAD_DELAY.toMillis() * 3);
Assert.assertEquals(x, service.getLastReloadAttemptInstant());
- overwriteFileWith("net/shibboleth/ext/spring/service/ServiceableBean2.xml");
+ overwriteFileWith("net/shibboleth/shared/spring/service/ServiceableBean2.xml");
//
// The reload will not have destroyed the old component yet
@@ -180,7 +179,7 @@ public class ReloadableSpringServiceTest {
final ReloadableSpringService<TestServiceableComponent> service =
new ReloadableSpringService<>(TestServiceableComponent.class);
- createPopulatedFile("net/shibboleth/ext/spring/service/BrokenBean1.xml");
+ createPopulatedFile("net/shibboleth/shared/spring/service/BrokenBean1.xml");
service.setFailFast(true);
service.setId("testFailFast");
@@ -195,7 +194,7 @@ public class ReloadableSpringServiceTest {
}
Assert.assertNull(service.getServiceableComponent());
- overwriteFileWith("net/shibboleth/ext/spring/service/ServiceableBean2.xml");
+ overwriteFileWith("net/shibboleth/shared/spring/service/ServiceableBean2.xml");
Thread.sleep(RELOAD_DELAY.toMillis() * 2);
Assert.assertNull(service.getServiceableComponent());
@@ -208,7 +207,7 @@ public class ReloadableSpringServiceTest {
final ReloadableSpringService<TestServiceableComponent> service =
new ReloadableSpringService<>(TestServiceableComponent.class);
- createPopulatedFile("net/shibboleth/ext/spring/service/BrokenBean1.xml");
+ createPopulatedFile("net/shibboleth/shared/spring/service/BrokenBean1.xml");
service.setFailFast(false);
service.setId("testNotFailFast");
@@ -218,7 +217,7 @@ public class ReloadableSpringServiceTest {
service.start();
Assert.assertNull(service.getServiceableComponent());
- overwriteFileWith("net/shibboleth/ext/spring/service/ServiceableBean2.xml");
+ overwriteFileWith("net/shibboleth/shared/spring/service/ServiceableBean2.xml");
long count = 700;
ServiceableComponent<TestServiceableComponent> serviceableComponent = service.getServiceableComponent();
@@ -247,7 +246,7 @@ public class ReloadableSpringServiceTest {
@Test public void testApplicationContextAware() {
- final Resource parentResource = new ClassPathResource("net/shibboleth/ext/spring/service/ReloadableSpringService.xml");
+ final Resource parentResource = new ClassPathResource("net/shibboleth/shared/spring/service/ReloadableSpringService.xml");
try (final GenericApplicationContext appCtx = new ApplicationContextBuilder()
.setName("appCtx")
@@ -261,7 +260,7 @@ public class ReloadableSpringServiceTest {
@Test public void testBeanNameAware() {
- final Resource parentResource = new ClassPathResource("net/shibboleth/ext/spring/service/ReloadableSpringService.xml");
+ final Resource parentResource = new ClassPathResource("net/shibboleth/shared/spring/service/ReloadableSpringService.xml");
try (final GenericApplicationContext appCtx = new ApplicationContextBuilder()
.setName("appCtx")
diff --git a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableTestBean.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java
similarity index 97%
rename from shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableTestBean.java
rename to shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java
index da5f6da8..f982666c 100644
--- a/shib-service/src/test/java/net/shibboleth/ext/spring/service/ReloadableTestBean.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/ReloadableTestBean.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.service;
+package net.shibboleth.shared.spring.service;
import javax.annotation.Nonnull;
diff --git a/shib-service/src/test/java/net/shibboleth/ext/spring/service/TestServiceableComponent.java b/shib-service/src/test/java/net/shibboleth/shared/spring/service/TestServiceableComponent.java
similarity index 92%
rename from shib-service/src/test/java/net/shibboleth/ext/spring/service/TestServiceableComponent.java
rename to shib-service/src/test/java/net/shibboleth/shared/spring/service/TestServiceableComponent.java
index 99861b6e..ba37895a 100644
--- a/shib-service/src/test/java/net/shibboleth/ext/spring/service/TestServiceableComponent.java
+++ b/shib-service/src/test/java/net/shibboleth/shared/spring/service/TestServiceableComponent.java
@@ -15,12 +15,10 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.service;
+package net.shibboleth.shared.spring.service;
import javax.annotation.Nonnull;
-import net.shibboleth.shared.spring.service.AbstractServiceableComponent;
-
@SuppressWarnings("javadoc")
public class TestServiceableComponent extends AbstractServiceableComponent<TestServiceableComponent> {
diff --git a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean1.xml b/shib-service/src/test/resources/net/shibboleth/shared/spring/service/BrokenBean1.xml
similarity index 100%
rename from shib-service/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean1.xml
rename to shib-service/src/test/resources/net/shibboleth/shared/spring/service/BrokenBean1.xml
diff --git a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean2.xml b/shib-service/src/test/resources/net/shibboleth/shared/spring/service/BrokenBean2.xml
similarity index 100%
rename from shib-service/src/test/resources/net/shibboleth/ext/spring/service/BrokenBean2.xml
rename to shib-service/src/test/resources/net/shibboleth/shared/spring/service/BrokenBean2.xml
diff --git a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ReloadableBeans1.xml b/shib-service/src/test/resources/net/shibboleth/shared/spring/service/ReloadableBeans1.xml
similarity index 98%
rename from shib-service/src/test/resources/net/shibboleth/ext/spring/service/ReloadableBeans1.xml
rename to shib-service/src/test/resources/net/shibboleth/shared/spring/service/ReloadableBeans1.xml
index 20cd21de..f7aac823 100644
--- a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ReloadableBeans1.xml
+++ b/shib-service/src/test/resources/net/shibboleth/shared/spring/service/ReloadableBeans1.xml
@@ -27,7 +27,7 @@
<beans profile="default">
<bean id="reloadableBeanService" class="net.shibboleth.shared.spring.service.ReloadableSpringService"
p:beanProfiles="reloadable"
- p:serviceConfigurations="classpath:/net/shibboleth/ext/spring/service/ReloadableBeans1.xml">
+ p:serviceConfigurations="classpath:/net/shibboleth/shared/spring/service/ReloadableBeans1.xml">
<constructor-arg name="claz" value="org.springframework.context.ApplicationContext" />
<constructor-arg name="strategy">
<bean class="net.shibboleth.shared.spring.service.ApplicationContextServiceStrategy" />
diff --git a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ReloadableSpringService.xml b/shib-service/src/test/resources/net/shibboleth/shared/spring/service/ReloadableSpringService.xml
similarity index 100%
rename from shib-service/src/test/resources/net/shibboleth/ext/spring/service/ReloadableSpringService.xml
rename to shib-service/src/test/resources/net/shibboleth/shared/spring/service/ReloadableSpringService.xml
diff --git a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean1.xml b/shib-service/src/test/resources/net/shibboleth/shared/spring/service/ServiceableBean1.xml
similarity index 100%
rename from shib-service/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean1.xml
rename to shib-service/src/test/resources/net/shibboleth/shared/spring/service/ServiceableBean1.xml
diff --git a/shib-service/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean2.xml b/shib-service/src/test/resources/net/shibboleth/shared/spring/service/ServiceableBean2.xml
similarity index 100%
rename from shib-service/src/test/resources/net/shibboleth/ext/spring/service/ServiceableBean2.xml
rename to shib-service/src/test/resources/net/shibboleth/shared/spring/service/ServiceableBean2.xml
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list