[java-identity-provider] branch main updated: IDP-2002 - Migrate all unmanaged config files into core module

Scott Cantor cantor.2 at osu.edu
Wed May 10 19:10:11 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=0af7960c1b454cc4b044d26e6d86346a42f5c59f

The following commit(s) were added to refs/heads/main by this push:
     new 0af7960c1 IDP-2002 - Migrate all unmanaged config files into core module
0af7960c1 is described below

commit 0af7960c1b454cc4b044d26e6d86346a42f5c59f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed May 10 15:10:07 2023 -0400

    IDP-2002 - Migrate all unmanaged config files into core module
    
    https://shibboleth.atlassian.net/browse/IDP-2002
    
    Moved almost all of idp-conf under idp-conf-impl.
    Test files rebased under parallel classpath tree.
    Edited tests to run with idp.home pointing to module tree.
    Testbed lightly tested using the same classpath value.
---
 .../shibboleth/idp/module}/conf/access-control.xml |   0
 .../idp/module}/conf/admin/admin.properties        |   0
 .../shibboleth/idp/module}/conf/admin/metrics.xml  |   0
 .../idp/module/conf/admin/unlock-keys.xml          |   8 +-
 .../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/custom/README      |   0
 .../idp/module}/conf/attributes/default-rules.xml  |   0
 .../idp/module}/conf/attributes/eduCourse.xml      |   0
 .../idp/module}/conf/attributes/eduPerson.xml      |   0
 .../idp/module}/conf/attributes/inetOrgPerson.xml  |   0
 .../idp/module}/conf/attributes/samlSubject.xml    |   0
 .../idp/module}/conf/attributes/schac.xml          |   0
 .../net/shibboleth/idp/module}/conf/audit.xml      |   0
 .../idp/module}/conf/authn/authn-comparison.xml    |   0
 .../idp/module}/conf/authn/authn-events-flow.xml   |   0
 .../idp/module}/conf/authn/authn.properties        |   0
 .../module}/conf/c14n/subject-c14n-events-flow.xml |   0
 .../idp/module}/conf/c14n/subject-c14n.properties  |   0
 .../idp/module}/conf/c14n/subject-c14n.xml         |   0
 .../shibboleth/idp/module}/conf/credentials.xml    |   0
 .../net/shibboleth/idp/module}/conf/errors.xml     |   0
 .../conf/examples/attribute-resolver-ldap.xml      |   0
 .../net/shibboleth/idp/module}/conf/global.xml     |   0
 .../net/shibboleth/idp/module}/conf/idp.properties |   0
 .../conf/intercept/intercept-events-flow.xml       |   0
 .../shibboleth/idp/module}/conf/ldap.properties    |   0
 .../net/shibboleth/idp/module}/conf/logback.xml    |   2 +-
 .../idp/module}/conf/metadata-providers.xml        |   0
 .../shibboleth/idp/module}/conf/relying-party.xml  |   0
 .../idp/module}/conf/saml-nameid.properties        |   0
 .../shibboleth/idp/module}/conf/saml-nameid.xml    |   0
 .../idp/module}/conf/services.properties           |   0
 .../net/shibboleth/idp/module}/conf/services.xml   |   0
 .../idp/module/core/impl/module.properties         | 109 ++++++++++++++++++---
 .../idp/module}/messages/messages.properties       |   0
 .../main/resources/{credentials => conf}/.gitkeep  |   0
 .../main/resources/{credentials => flows}/.gitkeep |   0
 .../resources/{credentials => messages}/.gitkeep   |   0
 .../main/resources/{credentials => views}/.gitkeep |   0
 ...stEnvironmentApplicationContextInitializer.java |   2 +-
 .../flows/saml1/SAML1TestResponseValidator.java    |   1 -
 .../flows/saml2/SAML2TestResponseValidator.java    |   2 +-
 ...ropertiesApplicationContextInitializerTest.java |   6 +-
 .../shibboleth/idp/module}/conf/access-control.xml |   0
 .../idp/module}/conf/attribute-filter.xml          |   0
 .../idp/module}/conf/attribute-registry.xml        |   8 +-
 .../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   |   7 --
 .../shibboleth/idp/module}/conf/credentials.xml    |   0
 .../shibboleth/idp/module}/conf/global.xml         |   4 -
 .../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
 .../shibboleth/idp/module}/conf/mvc-beans.xml      |   0
 .../idp/module}/conf/oidc-clientinfo-resolvers.xml |   0
 .../idp/module}/conf/oidc-credentials.xml          |   0
 .../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
 idp-conf/src/test/resources/test/test-beans.xml    |   2 +-
 .../src/test/resources/test/test-cas-beans.xml     |   2 +-
 idp-distribution/pom.xml                           |   2 +-
 80 files changed, 117 insertions(+), 38 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/access-control.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/access-control.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/access-control.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/access-control.xml
diff --git a/idp-conf/src/main/resources/conf/admin/admin.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/admin.properties
similarity index 100%
rename from idp-conf/src/main/resources/conf/admin/admin.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/admin.properties
diff --git a/idp-conf/src/main/resources/conf/admin/metrics.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/metrics.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/admin/metrics.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/metrics.xml
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/unlock-keys.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/unlock-keys.xml
index c444facd5..fe876380e 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/unlock-keys.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/unlock-keys.xml
@@ -15,18 +15,18 @@
     <!-- Enumerate the system key strategy beans to unlock, typically just one. -->
      
     <util:list id="shibboleth.unlock-keys.KeyStrategies">
-        <ref bean="shibboleth.DataSealerKeyStrategy" />
+<!--         <ref bean="shibboleth.DataSealerKeyStrategy" /> -->
     </util:list>
      
     <!-- Enumerate credential bean refs and private key resources. -->
      
     <util:list id="shibboleth.unlock-keys.Credentials">
-        <ref bean="shibboleth.DefaultSigningCredential" />
+<!--         <ref bean="shibboleth.DefaultSigningCredential" /> -->
     </util:list>
      
     <util:list id="shibboleth.unlock-keys.PrivateKeys">
-        <bean class="org.springframework.core.io.FileSystemResource"
-            c:_0="%{idp.signing.key}"/>
+<!--         <bean class="org.springframework.core.io.FileSystemResource" -->
+<!--             c:_0="%{idp.signing.key}"/> -->
     </util:list>
 
     <!-- Uncomment to move the definition of this bean from credentials.xml --> 
diff --git a/idp-conf/src/main/resources/conf/attribute-filter.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attribute-filter.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/attribute-filter.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attribute-filter.xml
diff --git a/idp-conf/src/main/resources/conf/attribute-registry.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
similarity index 100%
copy from idp-conf/src/main/resources/conf/attribute-registry.xml
copy to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
diff --git a/idp-conf/src/main/resources/conf/attribute-resolver.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attribute-resolver.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/attribute-resolver.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attribute-resolver.xml
diff --git a/idp-conf/src/main/resources/conf/attributes/custom/README b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/custom/README
similarity index 100%
rename from idp-conf/src/main/resources/conf/attributes/custom/README
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/custom/README
diff --git a/idp-conf/src/main/resources/conf/attributes/default-rules.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/attributes/default-rules.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
diff --git a/idp-conf/src/main/resources/conf/attributes/eduCourse.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/eduCourse.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/attributes/eduCourse.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/eduCourse.xml
diff --git a/idp-conf/src/main/resources/conf/attributes/eduPerson.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/eduPerson.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/attributes/eduPerson.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/eduPerson.xml
diff --git a/idp-conf/src/main/resources/conf/attributes/inetOrgPerson.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/inetOrgPerson.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/attributes/inetOrgPerson.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/inetOrgPerson.xml
diff --git a/idp-conf/src/main/resources/conf/attributes/samlSubject.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/samlSubject.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/attributes/samlSubject.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/samlSubject.xml
diff --git a/idp-conf/src/main/resources/conf/attributes/schac.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/schac.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/attributes/schac.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/attributes/schac.xml
diff --git a/idp-conf/src/main/resources/conf/audit.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/audit.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/audit.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/audit.xml
diff --git a/idp-conf/src/main/resources/conf/authn/authn-comparison.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/authn-comparison.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/authn/authn-comparison.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/authn-comparison.xml
diff --git a/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/authn-events-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/authn/authn-events-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/authn-events-flow.xml
diff --git a/idp-conf/src/main/resources/conf/authn/authn.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/authn.properties
similarity index 100%
rename from idp-conf/src/main/resources/conf/authn/authn.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/authn.properties
diff --git a/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/c14n/subject-c14n-events-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/c14n/subject-c14n-events-flow.xml
diff --git a/idp-conf/src/main/resources/conf/c14n/subject-c14n.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/c14n/subject-c14n.properties
similarity index 100%
rename from idp-conf/src/main/resources/conf/c14n/subject-c14n.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/c14n/subject-c14n.properties
diff --git a/idp-conf/src/main/resources/conf/c14n/subject-c14n.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/c14n/subject-c14n.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/c14n/subject-c14n.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/c14n/subject-c14n.xml
diff --git a/idp-conf/src/main/resources/conf/credentials.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/credentials.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/credentials.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/credentials.xml
diff --git a/idp-conf/src/main/resources/conf/errors.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/errors.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/errors.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/errors.xml
diff --git a/idp-conf/src/main/resources/conf/examples/attribute-resolver-ldap.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/examples/attribute-resolver-ldap.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/examples/attribute-resolver-ldap.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/examples/attribute-resolver-ldap.xml
diff --git a/idp-conf/src/main/resources/conf/global.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/global.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/global.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/global.xml
diff --git a/idp-conf/src/main/resources/conf/idp.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/idp.properties
similarity index 100%
rename from idp-conf/src/main/resources/conf/idp.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/idp.properties
diff --git a/idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/intercept-events-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/intercept/intercept-events-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/intercept/intercept-events-flow.xml
diff --git a/idp-conf/src/main/resources/conf/ldap.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/ldap.properties
similarity index 100%
rename from idp-conf/src/main/resources/conf/ldap.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/ldap.properties
diff --git a/idp-conf/src/main/resources/conf/logback.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/logback.xml
similarity index 99%
rename from idp-conf/src/main/resources/conf/logback.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/logback.xml
index 85e6cc0fd..eb5335a0e 100644
--- a/idp-conf/src/main/resources/conf/logback.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/logback.xml
@@ -21,7 +21,7 @@
     <!-- <variable name="idp.process.appender" value="ASYNC_PROCESS" /> -->
     
     <!-- Logging level shortcuts. -->
-    <variable name="idp.loglevel.idp" value="${idp.loglevel.idp:-INFO}" />
+    <variable name="idp.loglevel.idp" value="${idp.loglevel.idp:-DEBUG}" />
     <variable name="idp.loglevel.ldap" value="${idp.loglevel.ldap:-WARN}" />
     <variable name="idp.loglevel.messages" value="${idp.loglevel.messages:-INFO}" />
     <variable name="idp.loglevel.encryption" value="${idp.loglevel.encryption:-INFO}" />
diff --git a/idp-conf/src/main/resources/conf/metadata-providers.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/metadata-providers.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/metadata-providers.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/metadata-providers.xml
diff --git a/idp-conf/src/main/resources/conf/relying-party.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/relying-party.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/relying-party.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/relying-party.xml
diff --git a/idp-conf/src/main/resources/conf/saml-nameid.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/saml-nameid.properties
similarity index 100%
rename from idp-conf/src/main/resources/conf/saml-nameid.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/saml-nameid.properties
diff --git a/idp-conf/src/main/resources/conf/saml-nameid.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/saml-nameid.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/saml-nameid.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/saml-nameid.xml
diff --git a/idp-conf/src/main/resources/conf/services.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.properties
similarity index 100%
rename from idp-conf/src/main/resources/conf/services.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.properties
diff --git a/idp-conf/src/main/resources/conf/services.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.xml
similarity index 100%
rename from idp-conf/src/main/resources/conf/services.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/services.xml
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/core/impl/module.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/core/impl/module.properties
index b7410f9e6..6703a80fe 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/core/impl/module.properties
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/core/impl/module.properties
@@ -4,17 +4,28 @@
 net.shibboleth.idp.module.core.impl.Core = idp.Core
 net.shibboleth.idp.module.core.impl.UserPrefs = idp.UserPrefs
 
+idp.UserPrefs.name = User Preferences Flow
+idp.UserPrefs.desc = Flow that renders a view allowing manipulation of preference cookies
+idp.UserPrefs.url = /
+idp.UserPrefs.1.src = /net/shibboleth/idp/module/flows/user/prefs/prefs-flow.xml
+idp.UserPrefs.1.dest = flows/user/prefs/prefs-flow.xml
+idp.UserPrefs.2.src = /net/shibboleth/idp/module/views/user-prefs.vm
+idp.UserPrefs.2.dest = views/user-prefs.vm
+idp.UserPrefs.3.src = /net/shibboleth/idp/module/views/user-prefs.js
+idp.UserPrefs.3.dest = views/user-prefs.js
+
 
 idp.Core.name = Core IdP Functions
 idp.Core.desc = Module that provides built-in IdP functionality
 idp.Core.url = /
 
+# views
 idp.Core.1.src = /net/shibboleth/idp/module/views/client-storage/client-storage-read.vm
 idp.Core.1.dest = views/client-storage/client-storage-read.vm
 idp.Core.2.src = /net/shibboleth/idp/module/views/client-storage/client-storage-write.vm
 idp.Core.2.dest = views/client-storage/client-storage-write.vm
-idp.Core.3.src = /net/shibboleth/idp/module/views/errors.vm
-idp.Core.3.dest = views/errors.vm
+idp.Core.3.src = /net/shibboleth/idp/module/views/error.vm
+idp.Core.3.dest = views/error.vm
 idp.Core.4.src = /net/shibboleth/idp/module/views/logout.vm
 idp.Core.4.dest = views/logout.vm
 idp.Core.5.src = /net/shibboleth/idp/module/views/logout-complete.vm
@@ -22,13 +33,89 @@ idp.Core.5.dest = views/logout-complete.vm
 idp.Core.6.src = /net/shibboleth/idp/module/views/logout-propagate.vm
 idp.Core.6.dest = views/logout-propagate.vm
 
+# conf/examples
+idp.Core.7.src = /net.shibboleth/idp/module/conf/examples/attribute-resolver-ldap.xml
+idp.Core.7.dest = conf/examples/attribute-resolver-ldap.xml
 
-idp.UserPrefs.name = User Preferences Flow
-idp.UserPrefs.desc = Flow that renders a view allowing manipulation of preference cookies
-idp.UserPrefs.url = /
-idp.UserPrefs.1.src = /net/shibboleth/idp/module/flows/user/prefs/prefs-flow.xml
-idp.UserPrefs.1.dest = flows/user/prefs/prefs-flow.xml
-idp.UserPrefs.2.src = /net/shibboleth/idp/module/views/user-prefs.vm
-idp.UserPrefs.2.dest = views/user-prefs.vm
-idp.UserPrefs.3.src = /net/shibboleth/idp/module/views/user-prefs.js
-idp.UserPrefs.3.dest = views/user-prefs.js
+# conf/admin
+idp.Core.8.src = /net/shibboleth/idp/module/conf/admin/admin.properties
+idp.Core.8.dest = conf/admin/admin.properties
+idp.Core.9.src = /net/shibboleth/idp/module/conf/admin/metrics.xml
+idp.Core.9.dest = conf/admin/metrics.xml
+
+# conf/attributes
+idp.Core.10.src = /net/shibboleth/idp/module/conf/attributes/default-rules.xml
+idp.Core.10.dest = conf/attributes/default-rules.xml
+idp.Core.11.src = /net/shibboleth/idp/module/conf/attributes/eduCourse.xml
+idp.Core.11.dest = conf/attributes/eduCourse.xml
+idp.Core.12.src = /net/shibboleth/idp/module/conf/attributes/eduPerson.xml
+idp.Core.12.dest = conf/attributes/eduPerson.xml
+idp.Core.13.src = /net/shibboleth/idp/module/conf/attributes/inetOrgPerson.xml
+idp.Core.13.dest = conf/attributes/inetOrgPerson.xml
+idp.Core.14.src = /net/shibboleth/idp/module/conf/attributes/samlSubject.xml
+idp.Core.14.dest = conf/attributes/samlSubject.xml
+idp.Core.15.src = /net/shibboleth/idp/module/conf/attributes/schac.xml
+idp.Core.15.dest = conf/attributes/schac.xml
+idp.Core.16.src = /net/shibboleth/idp/module/conf/attributes/custom/README
+idp.Core.16.dest = conf/attributes/custom/README
+idp.Core.16.replace = true
+
+# conf/authn
+idp.Core.17.src = /net/shibboleth/idp/module/conf/authn/authn.properties
+idp.Core.17.dest = conf/authn/authn.properties
+idp.Core.18.src = /net/shibboleth/idp/module/conf/authn/authn-comparison.xml
+idp.Core.18.dest = conf/authn/authn-comparison.xml
+idp.Core.19.src = /net/shibboleth/idp/module/conf/authn/authn-events-flow.xml
+idp.Core.19.dest = conf/authn/authn-events-flow.xml
+
+# conf/c14n
+idp.Core.20.src = /net/shibboleth/idp/module/conf/c14n/subject-c14n.properties
+idp.Core.20.dest = conf/c14n/subject-c14n.properties
+idp.Core.21.src = /net/shibboleth/idp/module/conf/c14n/subject-c14n.xml
+idp.Core.21.dest = conf/c14n/subject-c14n.xml
+idp.Core.22.src = /net/shibboleth/idp/module/conf/c14n/subject-c14n-events-flow.xml
+idp.Core.22.dest = conf/c14n/subject-c14n-events-flow.xml
+
+# conf/intercept
+idp.Core.23.src = /net/shibboleth/idp/module/conf/intercept/intercept-events-flow.xml
+idp.Core.23.dest = conf/intercept/intercept-events-flow.xml
+
+# conf
+idp.Core.24.src = /net/shibboleth/idp/module/conf/access-control.xml
+idp.Core.24.dest = conf/access-control.xml
+idp.Core.25.src = /net/shibboleth/idp/module/conf/attribute-filter.xml
+idp.Core.25.dest = conf/attribute-filter.xml
+idp.Core.26.src = /net/shibboleth/idp/module/conf/attribute-registry.xml
+idp.Core.26.dest = conf/attribute-registry.xml
+idp.Core.27.src = /net/shibboleth/idp/module/conf/attribute-resolver.xml
+idp.Core.27.dest = conf/attribute-resolver.xml
+idp.Core.28.src = /net/shibboleth/idp/module/conf/audit.xml
+idp.Core.28.dest = conf/audit.xml
+idp.Core.29.src = /net/shibboleth/idp/module/conf/credentials.xml
+idp.Core.29.dest = conf/credentials.xml
+idp.Core.30.src = /net/shibboleth/idp/module/conf/errors.xml
+idp.Core.30.dest = conf/errors.xml
+idp.Core.31.src = /net/shibboleth/idp/module/conf/global.xml
+idp.Core.31.dest = conf/global.xml
+idp.Core.32.src = /net/shibboleth/idp/module/conf/idp.properties
+idp.Core.32.dest = conf/idp.properties
+idp.Core.33.src = /net/shibboleth/idp/module/conf/ldap.properties
+idp.Core.33.dest = conf/ldap.properties
+idp.Core.34.src = /net/shibboleth/idp/module/conf/logback.xml
+idp.Core.34.dest = conf/logback.xml
+idp.Core.35.src = /net/shibboleth/idp/module/conf/metadata-providers.xml
+idp.Core.35.dest = conf/metadata-providers.xml
+idp.Core.36.src = /net/shibboleth/idp/module/conf/relying-party.xml
+idp.Core.36.dest = conf/relying-party.xml
+idp.Core.37.src = /net/shibboleth/idp/module/conf/saml-nameid.properties
+idp.Core.37.dest = conf/saml-nameid.properties
+idp.Core.38.src = /net/shibboleth/idp/module/conf/saml-nameid.xml
+idp.Core.38.dest = conf/saml-nameid.xml
+idp.Core.39.src = /net/shibboleth/idp/module/conf/services.properties
+idp.Core.39.dest = conf/services.properties
+idp.Core.40.src = /net/shibboleth/idp/module/conf/services.xml
+idp.Core.40.dest = conf/services.xml
+
+# messages
+idp.Core.41.src = /net/shibboleth/idp/module/messages/messages.properties
+idp.Core.41.dest = messages/messages.properties
diff --git a/idp-conf/src/main/resources/messages/messages.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/messages/messages.properties
similarity index 100%
rename from idp-conf/src/main/resources/messages/messages.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/module/messages/messages.properties
diff --git a/idp-conf/src/main/resources/credentials/.gitkeep b/idp-conf/src/main/resources/conf/.gitkeep
similarity index 100%
copy from idp-conf/src/main/resources/credentials/.gitkeep
copy to idp-conf/src/main/resources/conf/.gitkeep
diff --git a/idp-conf/src/main/resources/credentials/.gitkeep b/idp-conf/src/main/resources/flows/.gitkeep
similarity index 100%
copy from idp-conf/src/main/resources/credentials/.gitkeep
copy to idp-conf/src/main/resources/flows/.gitkeep
diff --git a/idp-conf/src/main/resources/credentials/.gitkeep b/idp-conf/src/main/resources/messages/.gitkeep
similarity index 100%
copy from idp-conf/src/main/resources/credentials/.gitkeep
copy to idp-conf/src/main/resources/messages/.gitkeep
diff --git a/idp-conf/src/main/resources/credentials/.gitkeep b/idp-conf/src/main/resources/views/.gitkeep
similarity index 100%
rename from idp-conf/src/main/resources/credentials/.gitkeep
rename to idp-conf/src/main/resources/views/.gitkeep
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/TestEnvironmentApplicationContextInitializer.java b/idp-conf/src/test/java/net/shibboleth/idp/test/TestEnvironmentApplicationContextInitializer.java
index 5a5e0254c..016d081ff 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/TestEnvironmentApplicationContextInitializer.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/TestEnvironmentApplicationContextInitializer.java
@@ -59,7 +59,7 @@ public class TestEnvironmentApplicationContextInitializer
         assert idpHome!=null && flow!= null;
         //mock.setProperty("idp.home", idpHome);
         //mock.setProperty("idp.webflows", flow);
-        mock.setProperty("idp.home", "classpath:");
+        mock.setProperty("idp.home", "classpath:/net/shibboleth/idp/module");
         mock.setProperty("idp.webflows", "classpath*:/flows");
         mock.setProperty("idp.storage.htmlLocalStorage", "false");
         mock.setProperty("idp.session.trackSPSessions", "false");
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java
index 654c77128..48af306f5 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1TestResponseValidator.java
@@ -51,7 +51,6 @@ import net.shibboleth.idp.saml.xml.SAMLConstants;
 /**
  * Validate a test SAML 1 Response.
  */
- at SuppressWarnings({"null"})
 public class SAML1TestResponseValidator {
 
     /** Expected IdP entity ID. */
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java
index c125bc083..90289091f 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java
@@ -72,7 +72,7 @@ import com.google.common.net.InetAddresses;
 /**
  * SAML 2 {@link Response} validator.
  */
- at SuppressWarnings({"javadoc", "null"})
+ at SuppressWarnings({"null"})
 public class SAML2TestResponseValidator extends SAML2TestStatusResponseTypeValidator {
 
     /** Authentication context class reference. */
diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
index 66cd40c1f..fa7b58344 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
@@ -93,11 +93,11 @@ public class IdPPropertiesApplicationContextInitializerTest {
     }
 
     @Test public void testUserDefinedFound() {
-        sc.addInitParameter("idp.home", "classpath:");
+        sc.addInitParameter("idp.home", "classpath:/net/shibboleth/idp/module");
         listener.contextInitialized(new ServletContextEvent(sc));
         final WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
         Assert.assertTrue(wac.getEnvironment().containsProperty("idp.home"));
-        Assert.assertEquals(wac.getEnvironment().getProperty("idp.home"), "classpath:");
+        Assert.assertEquals(wac.getEnvironment().getProperty("idp.home"), "classpath:/net/shibboleth/idp/module");
     }
 
     @Test(expectedExceptions = ConstraintViolationException.class) public void testUserDefinedEndsWithSlash() {
@@ -115,7 +115,7 @@ public class IdPPropertiesApplicationContextInitializerTest {
     }
 
     @Test public void testAdditionalProperties() {
-        sc.addInitParameter("idp.home", "classpath:");
+        sc.addInitParameter("idp.home", "classpath:/net/shibboleth/idp/module");
         listener.contextInitialized(new ServletContextEvent(sc));
         final WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(sc);
         Assert.assertEquals(wac.getEnvironment().getProperty("idp.authn.LDAP.ldapURL"), "ldap://localhost:10389");
diff --git a/idp-conf/src/test/resources/conf/access-control.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/access-control.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/access-control.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/access-control.xml
diff --git a/idp-conf/src/test/resources/conf/attribute-filter.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attribute-filter.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/attribute-filter.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attribute-filter.xml
diff --git a/idp-conf/src/main/resources/conf/attribute-registry.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
similarity index 92%
rename from idp-conf/src/main/resources/conf/attribute-registry.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
index 133930b5d..4d9081bb8 100644
--- a/idp-conf/src/main/resources/conf/attribute-registry.xml
+++ b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attribute-registry.xml
@@ -21,9 +21,13 @@
     themselves.
     -->
 
-    <!-- Default directory for custom mappings. -->
+    <!--
+    Default directory for custom mappings, commented due to classpath usage in tests.
+    -->
+    <!--
     <bean parent="shibboleth.TranscodingRuleLoader"
         c:dir="%{idp.home}/conf/attributes/custom"
         c:extensions="#{{'.txt', '.props', '.properties', '.rule'}}" />
-   
+    -->
+    
 </beans>
diff --git a/idp-conf/src/test/resources/conf/attribute-resolver.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attribute-resolver.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/attribute-resolver.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attribute-resolver.xml
diff --git a/idp-conf/src/test/resources/conf/attributes/default-rules.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/attributes/default-rules.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attributes/default-rules.xml
diff --git a/idp-conf/src/test/resources/conf/attributes/oidc-claim-rules.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attributes/oidc-claim-rules.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/attributes/oidc-claim-rules.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/attributes/oidc-claim-rules.xml
diff --git a/idp-conf/src/test/resources/conf/authn/authn.properties b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/authn/authn.properties
similarity index 100%
rename from idp-conf/src/test/resources/conf/authn/authn.properties
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/authn/authn.properties
diff --git a/idp-conf/src/test/resources/conf/authn/password-authn-config.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
similarity index 95%
rename from idp-conf/src/test/resources/conf/authn/password-authn-config.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
index 811b0bf42..32ddfe457 100644
--- a/idp-conf/src/test/resources/conf/authn/password-authn-config.xml
+++ b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/authn/password-authn-config.xml
@@ -44,7 +44,6 @@
         <entry key="UnknownUsername">
             <list>
                 <value>NoCredentials</value>
-                <value>UnknownUsername</value>
                 <value>CLIENT_NOT_FOUND</value>
                 <value>Client not found</value>
                 <value>DN_RESOLUTION_FAILURE</value>
@@ -60,7 +59,6 @@
         </entry>
         <entry key="AccountLocked">
             <list>
-                <value>AccountLocked</value>
                 <value>Clients credentials have been revoked</value>
             </list>
         </entry>
@@ -74,11 +72,6 @@
                 <value>ACCOUNT_WARNING</value>
             </list>
         </entry>
-        <entry key="RequestUnsupported">
-            <list>
-                <value>RequestUnsupported</value>
-            </list>
-        </entry>
     </util:map>
 
     <!--
diff --git a/idp-conf/src/test/resources/conf/credentials.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/credentials.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/credentials.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/credentials.xml
diff --git a/idp-conf/src/test/resources/conf/global.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/global.xml
similarity index 96%
rename from idp-conf/src/test/resources/conf/global.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/global.xml
index 9c2678528..e25be30dd 100644
--- a/idp-conf/src/test/resources/conf/global.xml
+++ b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/global.xml
@@ -72,10 +72,6 @@
     <bean id="exampleMetadata-sp123" class="org.springframework.core.io.ClassPathResource">
         <constructor-arg value="/metadata/example-sp123-metadata.xml"/>
     </bean>
-
-    <bean id="duoMetadata" class="org.springframework.core.io.ClassPathResource">
-        <constructor-arg value="/metadata/duo-metadata.xml"/>
-    </bean>
       
     <util:list id="testbed.MetadataResolverResources">
         <value>%{idp.home}/conf/metadata-providers.xml</value>
diff --git a/idp-conf/src/test/resources/conf/idp.properties b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/idp.properties
similarity index 100%
rename from idp-conf/src/test/resources/conf/idp.properties
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/idp.properties
diff --git a/idp-conf/src/test/resources/conf/intercept/profile-intercept.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/intercept/profile-intercept.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/intercept/profile-intercept.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/intercept/profile-intercept.xml
diff --git a/idp-conf/src/test/resources/conf/logback-include-console.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/logback-include-console.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/logback-include-console.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/logback-include-console.xml
diff --git a/idp-conf/src/test/resources/conf/metadata-filters.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/metadata-filters.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/metadata-filters.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/metadata-filters.xml
diff --git a/idp-conf/src/test/resources/conf/metadata-providers.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/metadata-providers.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/metadata-providers.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/metadata-providers.xml
diff --git a/idp-conf/src/test/resources/conf/mvc-beans.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/mvc-beans.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/mvc-beans.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/mvc-beans.xml
diff --git a/idp-conf/src/test/resources/conf/oidc-clientinfo-resolvers.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/oidc-clientinfo-resolvers.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/oidc-clientinfo-resolvers.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/oidc-clientinfo-resolvers.xml
diff --git a/idp-conf/src/test/resources/conf/oidc-credentials.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/oidc-credentials.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/oidc-credentials.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/oidc-credentials.xml
diff --git a/idp-conf/src/test/resources/conf/oidc.properties b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/oidc.properties
similarity index 100%
rename from idp-conf/src/test/resources/conf/oidc.properties
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/oidc.properties
diff --git a/idp-conf/src/test/resources/conf/relying-party.xml b/idp-conf/src/test/resources/net/shibboleth/idp/module/conf/relying-party.xml
similarity index 100%
rename from idp-conf/src/test/resources/conf/relying-party.xml
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/conf/relying-party.xml
diff --git a/idp-conf/src/test/resources/credentials/demo.htpasswd b/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/demo.htpasswd
similarity index 100%
rename from idp-conf/src/test/resources/credentials/demo.htpasswd
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/demo.htpasswd
diff --git a/idp-conf/src/test/resources/credentials/idp-encryption-rsa.jwk b/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption-rsa.jwk
similarity index 100%
rename from idp-conf/src/test/resources/credentials/idp-encryption-rsa.jwk
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption-rsa.jwk
diff --git a/idp-conf/src/test/resources/credentials/idp-encryption.crt b/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption.crt
similarity index 100%
rename from idp-conf/src/test/resources/credentials/idp-encryption.crt
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption.crt
diff --git a/idp-conf/src/test/resources/credentials/idp-encryption.key b/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption.key
similarity index 100%
rename from idp-conf/src/test/resources/credentials/idp-encryption.key
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-encryption.key
diff --git a/idp-conf/src/test/resources/credentials/idp-signing-es.jwk b/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing-es.jwk
similarity index 100%
rename from idp-conf/src/test/resources/credentials/idp-signing-es.jwk
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing-es.jwk
diff --git a/idp-conf/src/test/resources/credentials/idp-signing-rs.jwk b/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing-rs.jwk
similarity index 100%
rename from idp-conf/src/test/resources/credentials/idp-signing-rs.jwk
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing-rs.jwk
diff --git a/idp-conf/src/test/resources/credentials/idp-signing.crt b/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing.crt
similarity index 100%
rename from idp-conf/src/test/resources/credentials/idp-signing.crt
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing.crt
diff --git a/idp-conf/src/test/resources/credentials/idp-signing.key b/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing.key
similarity index 100%
rename from idp-conf/src/test/resources/credentials/idp-signing.key
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/idp-signing.key
diff --git a/idp-conf/src/test/resources/credentials/ldap-server.crt b/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/ldap-server.crt
similarity index 100%
rename from idp-conf/src/test/resources/credentials/ldap-server.crt
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/ldap-server.crt
diff --git a/idp-conf/src/test/resources/credentials/sealer.jks b/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/sealer.jks
similarity index 100%
rename from idp-conf/src/test/resources/credentials/sealer.jks
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/sealer.jks
diff --git a/idp-conf/src/test/resources/credentials/sealer.kver b/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/sealer.kver
similarity index 100%
rename from idp-conf/src/test/resources/credentials/sealer.kver
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/sealer.kver
diff --git a/idp-conf/src/test/resources/credentials/secrets.properties b/idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/secrets.properties
similarity index 100%
rename from idp-conf/src/test/resources/credentials/secrets.properties
rename to idp-conf/src/test/resources/net/shibboleth/idp/module/credentials/secrets.properties
diff --git a/idp-conf/src/test/resources/test/test-beans.xml b/idp-conf/src/test/resources/test/test-beans.xml
index 201cffece..fb0e7a8ea 100644
--- a/idp-conf/src/test/resources/test/test-beans.xml
+++ b/idp-conf/src/test/resources/test/test-beans.xml
@@ -21,7 +21,7 @@
         p:entityId="https://sp.example.org" />
 
     <bean id="test.idp.X509Certificate" class="net.shibboleth.shared.spring.security.factory.X509CertificateFactoryBean"
-        p:resource="classpath:/credentials/idp-encryption.crt" />
+        p:resource="classpath:/net/shibboleth/idp/module/credentials/idp-encryption.crt" />
 
     <bean id="test.idp.Credential" class="org.opensaml.security.x509.BasicX509Credential"
         c:entityCertificate-ref="test.idp.X509Certificate"
diff --git a/idp-conf/src/test/resources/test/test-cas-beans.xml b/idp-conf/src/test/resources/test/test-cas-beans.xml
index 7852f4538..78624a4d7 100644
--- a/idp-conf/src/test/resources/test/test-cas-beans.xml
+++ b/idp-conf/src/test/resources/test/test-cas-beans.xml
@@ -26,7 +26,7 @@
 
     <util:list id="shibboleth.RelyingPartyResolverResources">
         <value>classpath:/test/test-relying-party-cas.xml</value>
-        <value>classpath:/conf/credentials.xml</value>
+        <value>classpath:/net/shibboleth/idp/module/conf/credentials.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.AttributeFilterResources">
diff --git a/idp-distribution/pom.xml b/idp-distribution/pom.xml
index dcf7ee75e..addcf317d 100644
--- a/idp-distribution/pom.xml
+++ b/idp-distribution/pom.xml
@@ -175,7 +175,7 @@
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <outputDirectory>${idp.assemblyDirectory}</outputDirectory>
-                                    <excludes>**/META-INF/**,**/logs/*,**/credentials/*</excludes>
+                                    <excludes>**/META-INF/**,**/logs/*</excludes>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>

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

More information about the commits mailing list