[java-identity-provider] branch master updated: Move attributes directory underneath conf

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=6572cc9969805d56cfccba7c108f5084fff136e5

The following commit(s) were added to refs/heads/master by this push:
       new  6572cc9   Move attributes directory underneath conf
6572cc9 is described below

commit 6572cc9969805d56cfccba7c108f5084fff136e5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jul 11 11:07:08 2019 -0400

    Move attributes directory underneath conf
---
 idp-conf/src/main/resources/conf/attribute-registry.xml             | 2 +-
 idp-conf/src/main/resources/{ => conf}/attributes/custom/README.txt | 0
 idp-conf/src/main/resources/{ => conf}/attributes/default-rules.xml | 0
 idp-conf/src/main/resources/conf/services.xml                       | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/attribute-registry.xml b/idp-conf/src/main/resources/conf/attribute-registry.xml
index d79e8c6..8890f4b 100644
--- a/idp-conf/src/main/resources/conf/attribute-registry.xml
+++ b/idp-conf/src/main/resources/conf/attribute-registry.xml
@@ -21,6 +21,6 @@
     -->
 
     <!-- Default directory for custom mappings. -->
-    <bean parent="shibboleth.TranscodingRuleLoader" c:_0="%{idp.home}/attributes/custom" />
+    <bean parent="shibboleth.TranscodingRuleLoader" c:_0="%{idp.home}/conf/attributes/custom" />
    
 </beans>
diff --git a/idp-conf/src/main/resources/attributes/custom/README.txt b/idp-conf/src/main/resources/conf/attributes/custom/README.txt
similarity index 100%
rename from idp-conf/src/main/resources/attributes/custom/README.txt
rename to idp-conf/src/main/resources/conf/attributes/custom/README.txt
diff --git a/idp-conf/src/main/resources/attributes/default-rules.xml b/idp-conf/src/main/resources/conf/attributes/default-rules.xml
similarity index 100%
rename from idp-conf/src/main/resources/attributes/default-rules.xml
rename to idp-conf/src/main/resources/conf/attributes/default-rules.xml
diff --git a/idp-conf/src/main/resources/conf/services.xml b/idp-conf/src/main/resources/conf/services.xml
index 37f1b36..bedfdce 100644
--- a/idp-conf/src/main/resources/conf/services.xml
+++ b/idp-conf/src/main/resources/conf/services.xml
@@ -73,7 +73,7 @@
     <util:list id ="shibboleth.AttributeRegistryResources">
         <value>%{idp.home}/conf/attribute-registry.xml</value>
         <value>%{idp.home}/system/conf/attribute-registry-system.xml</value>
-        <value>%{idp.home}/attributes/default-rules.xml</value>
+        <value>%{idp.home}/conf/attributes/default-rules.xml</value>
     </util:list>
 
     <!-- This set of resources uses only AttributeEncoders for compatibility. -->

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