[java-identity-provider] branch main updated: IDP-2002 - Migrate all unmanaged config files into core module
Scott Cantor
cantor.2 at osu.edu
Thu May 11 12:47:06 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=fea7bfef5b80d62070ac69b02a728cae68f47539
The following commit(s) were added to refs/heads/main by this push:
new fea7bfef5 IDP-2002 - Migrate all unmanaged config files into core module
fea7bfef5 is described below
commit fea7bfef5b80d62070ac69b02a728cae68f47539
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu May 11 08:46:54 2023 -0400
IDP-2002 - Migrate all unmanaged config files into core module
https://shibboleth.atlassian.net/browse/IDP-2002
Move tests and test resources from conf to conf-impl.
---
idp-conf-impl/pom.xml | 242 +++++++++++++++
...ferFileSystemApplicationContextInitializer.java | 0
.../idp/test/PreferFileSystemContextLoader.java | 0
...stEnvironmentApplicationContextInitializer.java | 0
.../idp/test/flows/AbstractFlowTest.java | 0
.../idp/test/flows/SetupForResolver.java | 0
.../idp/test/flows/admin/ResolverTestFlowTest.java | 0
.../shibboleth/idp/test/flows/c14n/TestC14N.java | 0
.../test/flows/c14n/actions/SetupForSAML1C14N.java | 0
.../test/flows/c14n/actions/SetupForSAML2C14N.java | 0
.../idp/test/flows/c14n/actions/TestAfterC14N.java | 0
.../idp/test/flows/c14n/actions/package-info.java | 0
.../idp/test/flows/cas/LoginFlowTest.java | 0
.../cas/LoginFlowTicketCreationErrorTest.java | 0
.../idp/test/flows/cas/ProxyFlowTest.java | 0
.../idp/test/flows/cas/ProxyValidateFlowTest.java | 0
.../idp/test/flows/cas/SamlValidateFlowTest.java | 0
.../test/flows/cas/ServiceValidateFlowTest.java | 0
.../idp/test/flows/cas/TestProxyValidator.java | 0
.../idp/test/flows/cas/ThrowingTicketService.java | 0
.../idp/test/flows/cas/ToggleablePredicate.java | 0
.../idp/test/flows/cas/ValidateFlowTest.java | 0
.../test/flows/exception/ExceptionFlowTest.java | 0
.../idp/test/flows/exception/ThrowException.java | 0
.../test/flows/interceptor/InterceptFlowTest.java | 0
.../idp/test/flows/load/FlowLoadsFlowTest.java | 0
.../idp/test/flows/load/LoadThisBean.java | 0
.../idp/test/flows/mapper/MappingTest.java | 0
.../idp/test/flows/mapper/SpoofSAMLMessage.java | 0
.../idp/test/flows/mapper/TestAfterFilter.java | 0
.../idp/test/flows/mapper/package-info.java | 0
.../test/flows/saml1/AbstractSAML1FlowTest.java | 0
.../flows/saml1/SAML1AttributeQueryFlowTest.java | 0
.../flows/saml1/SAML1TestResponseValidator.java | 0
.../flows/saml1/SAML1UnsolicitedSSOFlowTest.java | 0
.../test/flows/saml2/AbstractSAML2FlowTest.java | 0
.../test/flows/saml2/AbstractSAML2SSOFlowTest.java | 0
.../flows/saml2/SAML2AttributeQueryFlowTest.java | 0
.../idp/test/flows/saml2/SAML2ECPSSOFlowTest.java | 0
.../idp/test/flows/saml2/SAML2POSTSSOFlowTest.java | 0
.../saml2/SAML2POSTSimpleSignSSOFlowTest.java | 0
.../test/flows/saml2/SAML2RedirectSSOFlowTest.java | 0
.../flows/saml2/SAML2TestResponseValidator.java | 0
.../SAML2TestStatusResponseTypeValidator.java | 0
.../flows/saml2/SAML2UnsolicitedSSOFlowTest.java | 0
...ropertiesApplicationContextInitializerTest.java | 2 +-
.../META-INF/net/shibboleth/idp/StoredIdStore.sql | 0
.../idp/flows/resolveAndFilter/beans.xml | 0
.../resolveAndFilter/resolveAndFilter-flow.xml | 0
.../src/test/resources/c14n/attribute-resolver.xml | 0
.../src/test/resources/c14n/locate-resolver.xml | 0
.../test/resources/c14n/test-webflow-config.xml | 0
.../src/test/resources/c14n/webflows/beans.xml | 0
.../c14n/webflows/cryptoTransientNameID-flow.xml | 0
.../cryptoTransientNameIdentifier-flow.xml | 0
.../c14n/webflows/transformNameID-flow.xml | 0
.../c14n/webflows/transformNameIdentifier-flow.xml | 0
.../c14n/webflows/transientNameID-flow.xml | 0
.../c14n/webflows/transientNameIdentifier-flow.xml | 0
.../test/resources/credentials/idp-backchannel.p12 | Bin
.../test/resources/credentials/idp-userfacing.p12 | Bin
.../test/resources/credentials/sp-untrusted.crt | 0
.../test/resources/credentials/sp-untrusted.key | 0
.../src/test/resources/credentials/sp.crt | 0
.../src/test/resources/credentials/sp.key | 0
.../exception/flows/test-committed-flow.xml | 0
.../exception/flows/test-exception-beans.xml | 0
.../exception/flows/test-exception-flow.xml | 0
.../resources/exception/test-webflow-config.xml | 0
.../flow-load-test/flows/import-beans.xml | 0
.../flow-load-test/flows/test-flow-loads-beans.xml | 0
.../flow-load-test/flows/test-flow-loads-flow.xml | 0
.../flow-load-test/test-webflow-config.xml | 0
.../client-storage/client-storage-test-beans.xml | 0
.../read/client-storage-read-test-flow.xml | 0
.../write/client-storage-write-test-flow.xml | 0
.../resources/intercept/flows/test-error-flow.xml | 0
.../intercept/flows/test-intercept-beans.xml | 0
.../intercept/flows/test-intercept-flow.xml | 0
.../intercept/flows/test-proceed-1-flow.xml | 0
.../intercept/flows/test-proceed-2-flow.xml | 0
.../resources/intercept/test-webflow-config.xml | 0
.../resources/mapping/configs/attribute-filter.xml | 0
.../mapping/configs/attribute-filter2.xml | 0
.../mapping/configs/attribute-resolver.xml | 0
.../mapping/configs/attribute-resolver2.xml | 0
.../test/resources/mapping/configs/override.xml | 0
.../test/resources/metadata/example-metadata.xml | 0
.../resources/metadata/example-sp123-metadata.xml | 0
.../shibboleth/idp/module/conf/access-control.xml | 0
.../idp/module/conf/attribute-filter.xml | 0
.../idp/module/conf/attribute-registry.xml | 0
.../idp/module/conf/attribute-resolver.xml | 0
.../idp/module/conf/attributes/default-rules.xml | 0
.../module/conf/attributes/oidc-claim-rules.xml | 0
.../idp/module/conf/authn/authn.properties | 0
.../module/conf/authn/password-authn-config.xml | 0
.../net/shibboleth/idp/module/conf/credentials.xml | 0
.../net/shibboleth/idp/module/conf/global.xml | 0
.../net/shibboleth/idp/module/conf/idp.properties | 0
.../module/conf/intercept/profile-intercept.xml | 0
.../idp/module/conf/logback-include-console.xml | 0
.../idp/module/conf/metadata-filters.xml | 0
.../idp/module/conf/metadata-providers.xml | 0
.../net/shibboleth/idp/module/conf/mvc-beans.xml | 0
.../idp/module/conf/oidc-clientinfo-resolvers.xml | 0
.../idp/module/conf/oidc-credentials.xml | 0
.../net/shibboleth/idp/module/conf/oidc.properties | 0
.../shibboleth/idp/module/conf/relying-party.xml | 0
.../idp/module/credentials/demo.htpasswd | 0
.../idp/module/credentials/idp-encryption-rsa.jwk | 0
.../idp/module/credentials/idp-encryption.crt | 0
.../idp/module/credentials/idp-encryption.key | 0
.../idp/module/credentials/idp-signing-es.jwk | 0
.../idp/module/credentials/idp-signing-rs.jwk | 0
.../idp/module/credentials/idp-signing.crt | 0
.../idp/module/credentials/idp-signing.key | 0
.../idp/module/credentials/ldap-server.crt | 0
.../shibboleth/idp/module/credentials/sealer.jks | Bin
.../shibboleth/idp/module/credentials/sealer.kver | 0
.../idp/module/credentials/secrets.properties | 0
.../resources/static/openid-configuration.json | 0
.../src/test/resources/test/override-beans.xml | 0
.../resources/test/test-attribute-filter-cas.xml | 0
.../src/test/resources/test/test-beans.xml | 0
.../src/test/resources/test/test-cas-beans.xml | 0
.../test/resources/test/test-cas-error-beans.xml | 0
.../src/test/resources/test/test-jdbc.sql | 0
.../src/test/resources/test/test-ldap.keystore | Bin
.../src/test/resources/test/test-ldap.ldif | 0
.../test/resources/test/test-relying-party-cas.xml | 0
.../src/test/resources/views-test/.gitkeep | 0
idp-conf/pom.xml | 340 +--------------------
133 files changed, 245 insertions(+), 339 deletions(-)
diff --git a/idp-conf-impl/pom.xml b/idp-conf-impl/pom.xml
index 00a4ad883..e50c70280 100644
--- a/idp-conf-impl/pom.xml
+++ b/idp-conf-impl/pom.xml
@@ -32,11 +32,51 @@
<artifactId>idp-admin-impl</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-networking</artifactId>
+ </dependency>
<dependency>
<groupId>${shib-shared.groupId}</groupId>
<artifactId>shib-networking-spring</artifactId>
</dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-support</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${slf4j.groupId}</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
<!-- Provided Dependencies -->
<dependency>
@@ -120,6 +160,208 @@
</dependency>
<!-- Test Dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-cas-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-consent-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-profile-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-spring</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-saml-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>idp-session-api</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-profile-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-attribute-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-attribute-filter-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-attribute-resolver-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-core-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-messaging-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-profile-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-saml-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-security-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-soap-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-storage-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-xmlsec-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${opensaml.groupId}</groupId>
+ <artifactId>opensaml-testing</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-security-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-service</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${shib-shared.groupId}</groupId>
+ <artifactId>shib-testing</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ldaptive</groupId>
+ <artifactId>ldaptive</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${httpclient.groupId}</groupId>
+ <artifactId>${httpclient.artifactId}</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-beans</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-expression</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring.groupId}</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring-webflow.groupId}</groupId>
+ <artifactId>spring-webflow</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${spring-webflow.groupId}</groupId>
+ <artifactId>spring-binding</artifactId>
+ <version>${spring-webflow.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.servlet.jsp</groupId>
+ <artifactId>jakarta.servlet.jsp-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- Managed Dependencies -->
</dependencies>
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemApplicationContextInitializer.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/PreferFileSystemApplicationContextInitializer.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemApplicationContextInitializer.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/PreferFileSystemApplicationContextInitializer.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemContextLoader.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/PreferFileSystemContextLoader.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemContextLoader.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/PreferFileSystemContextLoader.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/TestEnvironmentApplicationContextInitializer.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/TestEnvironmentApplicationContextInitializer.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/TestEnvironmentApplicationContextInitializer.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/TestEnvironmentApplicationContextInitializer.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/admin/ResolverTestFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/admin/ResolverTestFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/admin/ResolverTestFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/admin/ResolverTestFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/TestC14N.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/c14n/TestC14N.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/TestC14N.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/c14n/TestC14N.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML1C14N.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForSAML2C14N.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/TestAfterC14N.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/TestAfterC14N.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/TestAfterC14N.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/TestAfterC14N.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/package-info.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/package-info.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/package-info.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/package-info.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTicketCreationErrorTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTicketCreationErrorTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTicketCreationErrorTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/LoginFlowTicketCreationErrorTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyValidateFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyValidateFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyValidateFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/ProxyValidateFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/SamlValidateFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/ServiceValidateFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/TestProxyValidator.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/TestProxyValidator.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/TestProxyValidator.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/TestProxyValidator.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ThrowingTicketService.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/ThrowingTicketService.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ThrowingTicketService.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/ThrowingTicketService.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ToggleablePredicate.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/ToggleablePredicate.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ToggleablePredicate.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/ToggleablePredicate.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ValidateFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/ValidateFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/cas/ValidateFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/cas/ValidateFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/exception/ExceptionFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/exception/ExceptionFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/exception/ExceptionFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/exception/ExceptionFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/exception/ThrowException.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/exception/ThrowException.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/exception/ThrowException.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/exception/ThrowException.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/load/FlowLoadsFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/load/FlowLoadsFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/load/FlowLoadsFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/load/FlowLoadsFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/load/LoadThisBean.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/load/LoadThisBean.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/load/LoadThisBean.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/load/LoadThisBean.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/SpoofSAMLMessage.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/mapper/SpoofSAMLMessage.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/SpoofSAMLMessage.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/mapper/SpoofSAMLMessage.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/TestAfterFilter.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/mapper/TestAfterFilter.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/TestAfterFilter.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/mapper/TestAfterFilter.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/package-info.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/mapper/package-info.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/package-info.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/mapper/package-info.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/AbstractSAML1FlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml1/AbstractSAML1FlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/AbstractSAML1FlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml1/AbstractSAML1FlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2FlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2FlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2FlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2FlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2SSOFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2SSOFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2SSOFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/AbstractSAML2SSOFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2ECPSSOFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2ECPSSOFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2ECPSSOFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2ECPSSOFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSSOFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSSOFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSSOFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSSOFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSimpleSignSSOFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSimpleSignSSOFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSimpleSignSSOFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSimpleSignSSOFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2RedirectSSOFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2RedirectSSOFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2RedirectSSOFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2RedirectSSOFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestStatusResponseTypeValidator.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestStatusResponseTypeValidator.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestStatusResponseTypeValidator.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestStatusResponseTypeValidator.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2UnsolicitedSSOFlowTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2UnsolicitedSSOFlowTest.java
similarity index 100%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2UnsolicitedSSOFlowTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2UnsolicitedSSOFlowTest.java
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
similarity index 98%
rename from idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
rename to idp-conf-impl/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
index fa7b58344..29df77160 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
+++ b/idp-conf-impl/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
@@ -45,7 +45,7 @@ public class IdPPropertiesApplicationContextInitializerTest {
@BeforeMethod public void setUp() {
sc = new MockServletContext("");
- sc.addInitParameter(ContextLoader.CONTEXT_CLASS_PARAM, "net.shibboleth.ext.spring.context.DelimiterAwareApplicationContext");
+ sc.addInitParameter(ContextLoader.CONTEXT_CLASS_PARAM, "net.shibboleth.shared.spring.context.DelimiterAwareApplicationContext");
sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "classpath:/net/shibboleth/idp/conf/global-system.xml");
sc.addInitParameter(ContextLoader.CONTEXT_INITIALIZER_CLASSES_PARAM,
IdPPropertiesApplicationContextInitializer.class.getName());
diff --git a/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/StoredIdStore.sql b/idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/StoredIdStore.sql
similarity index 100%
rename from idp-conf/src/test/resources/META-INF/net/shibboleth/idp/StoredIdStore.sql
rename to idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/StoredIdStore.sql
diff --git a/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml b/idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml
similarity index 100%
rename from idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml
rename to idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml
diff --git a/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/resolveAndFilter-flow.xml b/idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/resolveAndFilter-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/resolveAndFilter-flow.xml
rename to idp-conf-impl/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/resolveAndFilter-flow.xml
diff --git a/idp-conf/src/test/resources/c14n/attribute-resolver.xml b/idp-conf-impl/src/test/resources/c14n/attribute-resolver.xml
similarity index 100%
rename from idp-conf/src/test/resources/c14n/attribute-resolver.xml
rename to idp-conf-impl/src/test/resources/c14n/attribute-resolver.xml
diff --git a/idp-conf/src/test/resources/c14n/locate-resolver.xml b/idp-conf-impl/src/test/resources/c14n/locate-resolver.xml
similarity index 100%
rename from idp-conf/src/test/resources/c14n/locate-resolver.xml
rename to idp-conf-impl/src/test/resources/c14n/locate-resolver.xml
diff --git a/idp-conf/src/test/resources/c14n/test-webflow-config.xml b/idp-conf-impl/src/test/resources/c14n/test-webflow-config.xml
similarity index 100%
rename from idp-conf/src/test/resources/c14n/test-webflow-config.xml
rename to idp-conf-impl/src/test/resources/c14n/test-webflow-config.xml
diff --git a/idp-conf/src/test/resources/c14n/webflows/beans.xml b/idp-conf-impl/src/test/resources/c14n/webflows/beans.xml
similarity index 100%
rename from idp-conf/src/test/resources/c14n/webflows/beans.xml
rename to idp-conf-impl/src/test/resources/c14n/webflows/beans.xml
diff --git a/idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml b/idp-conf-impl/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml
rename to idp-conf-impl/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml
diff --git a/idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml b/idp-conf-impl/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml
rename to idp-conf-impl/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml
diff --git a/idp-conf/src/test/resources/c14n/webflows/transformNameID-flow.xml b/idp-conf-impl/src/test/resources/c14n/webflows/transformNameID-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/c14n/webflows/transformNameID-flow.xml
rename to idp-conf-impl/src/test/resources/c14n/webflows/transformNameID-flow.xml
diff --git a/idp-conf/src/test/resources/c14n/webflows/transformNameIdentifier-flow.xml b/idp-conf-impl/src/test/resources/c14n/webflows/transformNameIdentifier-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/c14n/webflows/transformNameIdentifier-flow.xml
rename to idp-conf-impl/src/test/resources/c14n/webflows/transformNameIdentifier-flow.xml
diff --git a/idp-conf/src/test/resources/c14n/webflows/transientNameID-flow.xml b/idp-conf-impl/src/test/resources/c14n/webflows/transientNameID-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/c14n/webflows/transientNameID-flow.xml
rename to idp-conf-impl/src/test/resources/c14n/webflows/transientNameID-flow.xml
diff --git a/idp-conf/src/test/resources/c14n/webflows/transientNameIdentifier-flow.xml b/idp-conf-impl/src/test/resources/c14n/webflows/transientNameIdentifier-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/c14n/webflows/transientNameIdentifier-flow.xml
rename to idp-conf-impl/src/test/resources/c14n/webflows/transientNameIdentifier-flow.xml
diff --git a/idp-conf/src/test/resources/credentials/idp-backchannel.p12 b/idp-conf-impl/src/test/resources/credentials/idp-backchannel.p12
similarity index 100%
rename from idp-conf/src/test/resources/credentials/idp-backchannel.p12
rename to idp-conf-impl/src/test/resources/credentials/idp-backchannel.p12
diff --git a/idp-conf/src/test/resources/credentials/idp-userfacing.p12 b/idp-conf-impl/src/test/resources/credentials/idp-userfacing.p12
similarity index 100%
rename from idp-conf/src/test/resources/credentials/idp-userfacing.p12
rename to idp-conf-impl/src/test/resources/credentials/idp-userfacing.p12
diff --git a/idp-conf/src/test/resources/credentials/sp-untrusted.crt b/idp-conf-impl/src/test/resources/credentials/sp-untrusted.crt
similarity index 100%
rename from idp-conf/src/test/resources/credentials/sp-untrusted.crt
rename to idp-conf-impl/src/test/resources/credentials/sp-untrusted.crt
diff --git a/idp-conf/src/test/resources/credentials/sp-untrusted.key b/idp-conf-impl/src/test/resources/credentials/sp-untrusted.key
similarity index 100%
rename from idp-conf/src/test/resources/credentials/sp-untrusted.key
rename to idp-conf-impl/src/test/resources/credentials/sp-untrusted.key
diff --git a/idp-conf/src/test/resources/credentials/sp.crt b/idp-conf-impl/src/test/resources/credentials/sp.crt
similarity index 100%
rename from idp-conf/src/test/resources/credentials/sp.crt
rename to idp-conf-impl/src/test/resources/credentials/sp.crt
diff --git a/idp-conf/src/test/resources/credentials/sp.key b/idp-conf-impl/src/test/resources/credentials/sp.key
similarity index 100%
rename from idp-conf/src/test/resources/credentials/sp.key
rename to idp-conf-impl/src/test/resources/credentials/sp.key
diff --git a/idp-conf/src/test/resources/exception/flows/test-committed-flow.xml b/idp-conf-impl/src/test/resources/exception/flows/test-committed-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/exception/flows/test-committed-flow.xml
rename to idp-conf-impl/src/test/resources/exception/flows/test-committed-flow.xml
diff --git a/idp-conf/src/test/resources/exception/flows/test-exception-beans.xml b/idp-conf-impl/src/test/resources/exception/flows/test-exception-beans.xml
similarity index 100%
rename from idp-conf/src/test/resources/exception/flows/test-exception-beans.xml
rename to idp-conf-impl/src/test/resources/exception/flows/test-exception-beans.xml
diff --git a/idp-conf/src/test/resources/exception/flows/test-exception-flow.xml b/idp-conf-impl/src/test/resources/exception/flows/test-exception-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/exception/flows/test-exception-flow.xml
rename to idp-conf-impl/src/test/resources/exception/flows/test-exception-flow.xml
diff --git a/idp-conf/src/test/resources/exception/test-webflow-config.xml b/idp-conf-impl/src/test/resources/exception/test-webflow-config.xml
similarity index 100%
rename from idp-conf/src/test/resources/exception/test-webflow-config.xml
rename to idp-conf-impl/src/test/resources/exception/test-webflow-config.xml
diff --git a/idp-conf/src/test/resources/flow-load-test/flows/import-beans.xml b/idp-conf-impl/src/test/resources/flow-load-test/flows/import-beans.xml
similarity index 100%
rename from idp-conf/src/test/resources/flow-load-test/flows/import-beans.xml
rename to idp-conf-impl/src/test/resources/flow-load-test/flows/import-beans.xml
diff --git a/idp-conf/src/test/resources/flow-load-test/flows/test-flow-loads-beans.xml b/idp-conf-impl/src/test/resources/flow-load-test/flows/test-flow-loads-beans.xml
similarity index 100%
rename from idp-conf/src/test/resources/flow-load-test/flows/test-flow-loads-beans.xml
rename to idp-conf-impl/src/test/resources/flow-load-test/flows/test-flow-loads-beans.xml
diff --git a/idp-conf/src/test/resources/flow-load-test/flows/test-flow-loads-flow.xml b/idp-conf-impl/src/test/resources/flow-load-test/flows/test-flow-loads-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/flow-load-test/flows/test-flow-loads-flow.xml
rename to idp-conf-impl/src/test/resources/flow-load-test/flows/test-flow-loads-flow.xml
diff --git a/idp-conf/src/test/resources/flow-load-test/test-webflow-config.xml b/idp-conf-impl/src/test/resources/flow-load-test/test-webflow-config.xml
similarity index 100%
rename from idp-conf/src/test/resources/flow-load-test/test-webflow-config.xml
rename to idp-conf-impl/src/test/resources/flow-load-test/test-webflow-config.xml
diff --git a/idp-conf/src/test/resources/flows/test/client-storage/client-storage-test-beans.xml b/idp-conf-impl/src/test/resources/flows/test/client-storage/client-storage-test-beans.xml
similarity index 100%
rename from idp-conf/src/test/resources/flows/test/client-storage/client-storage-test-beans.xml
rename to idp-conf-impl/src/test/resources/flows/test/client-storage/client-storage-test-beans.xml
diff --git a/idp-conf/src/test/resources/flows/test/client-storage/read/client-storage-read-test-flow.xml b/idp-conf-impl/src/test/resources/flows/test/client-storage/read/client-storage-read-test-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/flows/test/client-storage/read/client-storage-read-test-flow.xml
rename to idp-conf-impl/src/test/resources/flows/test/client-storage/read/client-storage-read-test-flow.xml
diff --git a/idp-conf/src/test/resources/flows/test/client-storage/write/client-storage-write-test-flow.xml b/idp-conf-impl/src/test/resources/flows/test/client-storage/write/client-storage-write-test-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/flows/test/client-storage/write/client-storage-write-test-flow.xml
rename to idp-conf-impl/src/test/resources/flows/test/client-storage/write/client-storage-write-test-flow.xml
diff --git a/idp-conf/src/test/resources/intercept/flows/test-error-flow.xml b/idp-conf-impl/src/test/resources/intercept/flows/test-error-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/intercept/flows/test-error-flow.xml
rename to idp-conf-impl/src/test/resources/intercept/flows/test-error-flow.xml
diff --git a/idp-conf/src/test/resources/intercept/flows/test-intercept-beans.xml b/idp-conf-impl/src/test/resources/intercept/flows/test-intercept-beans.xml
similarity index 100%
rename from idp-conf/src/test/resources/intercept/flows/test-intercept-beans.xml
rename to idp-conf-impl/src/test/resources/intercept/flows/test-intercept-beans.xml
diff --git a/idp-conf/src/test/resources/intercept/flows/test-intercept-flow.xml b/idp-conf-impl/src/test/resources/intercept/flows/test-intercept-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/intercept/flows/test-intercept-flow.xml
rename to idp-conf-impl/src/test/resources/intercept/flows/test-intercept-flow.xml
diff --git a/idp-conf/src/test/resources/intercept/flows/test-proceed-1-flow.xml b/idp-conf-impl/src/test/resources/intercept/flows/test-proceed-1-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/intercept/flows/test-proceed-1-flow.xml
rename to idp-conf-impl/src/test/resources/intercept/flows/test-proceed-1-flow.xml
diff --git a/idp-conf/src/test/resources/intercept/flows/test-proceed-2-flow.xml b/idp-conf-impl/src/test/resources/intercept/flows/test-proceed-2-flow.xml
similarity index 100%
rename from idp-conf/src/test/resources/intercept/flows/test-proceed-2-flow.xml
rename to idp-conf-impl/src/test/resources/intercept/flows/test-proceed-2-flow.xml
diff --git a/idp-conf/src/test/resources/intercept/test-webflow-config.xml b/idp-conf-impl/src/test/resources/intercept/test-webflow-config.xml
similarity index 100%
rename from idp-conf/src/test/resources/intercept/test-webflow-config.xml
rename to idp-conf-impl/src/test/resources/intercept/test-webflow-config.xml
diff --git a/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml b/idp-conf-impl/src/test/resources/mapping/configs/attribute-filter.xml
similarity index 100%
rename from idp-conf/src/test/resources/mapping/configs/attribute-filter.xml
rename to idp-conf-impl/src/test/resources/mapping/configs/attribute-filter.xml
diff --git a/idp-conf/src/test/resources/mapping/configs/attribute-filter2.xml b/idp-conf-impl/src/test/resources/mapping/configs/attribute-filter2.xml
similarity index 100%
rename from idp-conf/src/test/resources/mapping/configs/attribute-filter2.xml
rename to idp-conf-impl/src/test/resources/mapping/configs/attribute-filter2.xml
diff --git a/idp-conf/src/test/resources/mapping/configs/attribute-resolver.xml b/idp-conf-impl/src/test/resources/mapping/configs/attribute-resolver.xml
similarity index 100%
rename from idp-conf/src/test/resources/mapping/configs/attribute-resolver.xml
rename to idp-conf-impl/src/test/resources/mapping/configs/attribute-resolver.xml
diff --git a/idp-conf/src/test/resources/mapping/configs/attribute-resolver2.xml b/idp-conf-impl/src/test/resources/mapping/configs/attribute-resolver2.xml
similarity index 100%
rename from idp-conf/src/test/resources/mapping/configs/attribute-resolver2.xml
rename to idp-conf-impl/src/test/resources/mapping/configs/attribute-resolver2.xml
diff --git a/idp-conf/src/test/resources/mapping/configs/override.xml b/idp-conf-impl/src/test/resources/mapping/configs/override.xml
similarity index 100%
rename from idp-conf/src/test/resources/mapping/configs/override.xml
rename to idp-conf-impl/src/test/resources/mapping/configs/override.xml
diff --git a/idp-conf/src/test/resources/metadata/example-metadata.xml b/idp-conf-impl/src/test/resources/metadata/example-metadata.xml
similarity index 100%
rename from idp-conf/src/test/resources/metadata/example-metadata.xml
rename to idp-conf-impl/src/test/resources/metadata/example-metadata.xml
diff --git a/idp-conf/src/test/resources/metadata/example-sp123-metadata.xml b/idp-conf-impl/src/test/resources/metadata/example-sp123-metadata.xml
similarity index 100%
rename from idp-conf/src/test/resources/metadata/example-sp123-metadata.xml
rename to idp-conf-impl/src/test/resources/metadata/example-sp123-metadata.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/access-control.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/access-control.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/access-control.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/access-control.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attribute-filter.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attribute-filter.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attribute-filter.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attribute-filter.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attribute-registry.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attribute-resolver.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attribute-resolver.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attribute-resolver.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attribute-resolver.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attributes/oidc-claim-rules.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/oidc-claim-rules.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attributes/oidc-claim-rules.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/attributes/oidc-claim-rules.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/authn/authn.properties b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/authn/authn.properties
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/authn/authn.properties
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/authn/authn.properties
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/credentials.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/credentials.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/credentials.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/credentials.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/global.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/global.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/global.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/global.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/idp.properties b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/idp.properties
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/idp.properties
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/idp.properties
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/intercept/profile-intercept.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/intercept/profile-intercept.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/intercept/profile-intercept.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/intercept/profile-intercept.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/logback-include-console.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/logback-include-console.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/logback-include-console.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/logback-include-console.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/metadata-filters.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/metadata-filters.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/metadata-filters.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/metadata-filters.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/metadata-providers.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/metadata-providers.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/metadata-providers.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/metadata-providers.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/mvc-beans.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/mvc-beans.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/mvc-beans.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/mvc-beans.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/oidc-clientinfo-resolvers.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc-clientinfo-resolvers.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/oidc-clientinfo-resolvers.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc-clientinfo-resolvers.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/oidc-credentials.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc-credentials.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/oidc-credentials.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc-credentials.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/oidc.properties b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc.properties
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/oidc.properties
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/oidc.properties
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/relying-party.xml b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/relying-party.xml
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/conf/relying-party.xml
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/conf/relying-party.xml
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/demo.htpasswd b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/demo.htpasswd
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/demo.htpasswd
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/demo.htpasswd
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption-rsa.jwk b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption-rsa.jwk
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption-rsa.jwk
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption-rsa.jwk
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption.crt b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption.crt
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption.crt
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption.crt
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption.key b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption.key
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption.key
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption.key
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing-es.jwk b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing-es.jwk
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing-es.jwk
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing-es.jwk
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing-rs.jwk b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing-rs.jwk
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing-rs.jwk
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing-rs.jwk
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing.crt b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing.crt
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing.crt
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing.crt
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing.key b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing.key
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing.key
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing.key
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/ldap-server.crt b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/ldap-server.crt
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/ldap-server.crt
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/ldap-server.crt
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/sealer.jks b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/sealer.jks
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/sealer.jks
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/sealer.jks
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/sealer.kver b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/sealer.kver
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/sealer.kver
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/sealer.kver
diff --git a/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/secrets.properties b/idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/secrets.properties
similarity index 100%
rename from idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/secrets.properties
rename to idp-conf-impl/src/test/resources/net/shibboleth/idp/module/credentials/secrets.properties
diff --git a/idp-conf/src/test/resources/static/openid-configuration.json b/idp-conf-impl/src/test/resources/static/openid-configuration.json
similarity index 100%
rename from idp-conf/src/test/resources/static/openid-configuration.json
rename to idp-conf-impl/src/test/resources/static/openid-configuration.json
diff --git a/idp-conf/src/test/resources/test/override-beans.xml b/idp-conf-impl/src/test/resources/test/override-beans.xml
similarity index 100%
rename from idp-conf/src/test/resources/test/override-beans.xml
rename to idp-conf-impl/src/test/resources/test/override-beans.xml
diff --git a/idp-conf/src/test/resources/test/test-attribute-filter-cas.xml b/idp-conf-impl/src/test/resources/test/test-attribute-filter-cas.xml
similarity index 100%
rename from idp-conf/src/test/resources/test/test-attribute-filter-cas.xml
rename to idp-conf-impl/src/test/resources/test/test-attribute-filter-cas.xml
diff --git a/idp-conf/src/test/resources/test/test-beans.xml b/idp-conf-impl/src/test/resources/test/test-beans.xml
similarity index 100%
rename from idp-conf/src/test/resources/test/test-beans.xml
rename to idp-conf-impl/src/test/resources/test/test-beans.xml
diff --git a/idp-conf/src/test/resources/test/test-cas-beans.xml b/idp-conf-impl/src/test/resources/test/test-cas-beans.xml
similarity index 100%
rename from idp-conf/src/test/resources/test/test-cas-beans.xml
rename to idp-conf-impl/src/test/resources/test/test-cas-beans.xml
diff --git a/idp-conf/src/test/resources/test/test-cas-error-beans.xml b/idp-conf-impl/src/test/resources/test/test-cas-error-beans.xml
similarity index 100%
rename from idp-conf/src/test/resources/test/test-cas-error-beans.xml
rename to idp-conf-impl/src/test/resources/test/test-cas-error-beans.xml
diff --git a/idp-conf/src/test/resources/test/test-jdbc.sql b/idp-conf-impl/src/test/resources/test/test-jdbc.sql
similarity index 100%
rename from idp-conf/src/test/resources/test/test-jdbc.sql
rename to idp-conf-impl/src/test/resources/test/test-jdbc.sql
diff --git a/idp-conf/src/test/resources/test/test-ldap.keystore b/idp-conf-impl/src/test/resources/test/test-ldap.keystore
similarity index 100%
rename from idp-conf/src/test/resources/test/test-ldap.keystore
rename to idp-conf-impl/src/test/resources/test/test-ldap.keystore
diff --git a/idp-conf/src/test/resources/test/test-ldap.ldif b/idp-conf-impl/src/test/resources/test/test-ldap.ldif
similarity index 100%
rename from idp-conf/src/test/resources/test/test-ldap.ldif
rename to idp-conf-impl/src/test/resources/test/test-ldap.ldif
diff --git a/idp-conf/src/test/resources/test/test-relying-party-cas.xml b/idp-conf-impl/src/test/resources/test/test-relying-party-cas.xml
similarity index 100%
rename from idp-conf/src/test/resources/test/test-relying-party-cas.xml
rename to idp-conf-impl/src/test/resources/test/test-relying-party-cas.xml
diff --git a/idp-conf/src/test/resources/views-test/.gitkeep b/idp-conf-impl/src/test/resources/views-test/.gitkeep
similarity index 100%
rename from idp-conf/src/test/resources/views-test/.gitkeep
rename to idp-conf-impl/src/test/resources/views-test/.gitkeep
diff --git a/idp-conf/pom.xml b/idp-conf/pom.xml
index 95bd9a232..7cfcb637c 100644
--- a/idp-conf/pom.xml
+++ b/idp-conf/pom.xml
@@ -11,8 +11,8 @@
<relativePath>../idp-parent</relativePath>
</parent>
- <name>Shibboleth IdP :: Configuration Files</name>
- <description>Configuration Files</description>
+ <name>Shibboleth IdP :: Configuration Files (Deprecated)</name>
+ <description>Configuration Files (Deprecated)</description>
<artifactId>idp-conf</artifactId>
<packaging>jar</packaging>
@@ -28,330 +28,6 @@
<!-- Runtime Dependencies -->
<!-- Test Dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-admin-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-authn-api</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-authn-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-cas-api</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-cas-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-conf-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-consent-api</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-consent-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-core</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-profile-api</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-profile-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-spring</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-saml-api</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-saml-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-session-api</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>idp-session-impl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-profile-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-profile-impl</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-attribute-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-attribute-filter-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-attribute-resolver-spring</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-core-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-messaging-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-messaging-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-profile-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-profile-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-saml-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-security-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-soap-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-storage-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-xmlsec-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-xmlsec-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${opensaml.groupId}</groupId>
- <artifactId>opensaml-testing</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-networking</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-security</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-security-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-service</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-support</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${shib-shared.groupId}</groupId>
- <artifactId>shib-testing</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${slf4j.groupId}</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>janino</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.ldaptive</groupId>
- <artifactId>ldaptive</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${httpclient.groupId}</groupId>
- <artifactId>${httpclient.artifactId}</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-beans</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-context</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-expression</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-jdbc</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring.groupId}</groupId>
- <artifactId>spring-web</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring-webflow.groupId}</groupId>
- <artifactId>spring-webflow</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${spring-webflow.groupId}</groupId>
- <artifactId>spring-binding</artifactId>
- <version>${spring-webflow.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.servlet.jsp</groupId>
- <artifactId>jakarta.servlet.jsp-api</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
@@ -389,16 +65,4 @@
</site>
</distributionManagement>
- <build>
- <!-- Exclude logs directory. -->
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/logs/*</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-
</project>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list