[java-identity-provider] branch master updated: Registry config and doc cleanup.

[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=19563342613afe5915ae1ae1d33319f660cde4bf

The following commit(s) were added to refs/heads/master by this push:
       new  1956334   Registry config and doc cleanup.
1956334 is described below

commit 19563342613afe5915ae1ae1d33319f660cde4bf
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jul 8 21:00:58 2019 -0400

    Registry config and doc cleanup.
---
 .../idp/attribute/transcoding/impl/TranscodingRuleLoader.java         | 4 ++--
 idp-conf/src/main/resources/conf/attribute-registry.xml               | 2 +-
 idp-conf/src/main/resources/conf/services.xml                         | 3 ++-
 idp-conf/src/main/resources/system/conf/attribute-registry-system.xml | 3 ---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/TranscodingRuleLoader.java b/idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/TranscodingRuleLoader.java
index fc2644a..375afba 100644
--- a/idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/TranscodingRuleLoader.java
+++ b/idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/transcoding/impl/TranscodingRuleLoader.java
@@ -41,8 +41,8 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElemen
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 /**
- * Wrapper around a {@link Map} representing a rule for transcoding, used to
- * detect and load the rules at runtime from a Spring context.
+ * A mechanism for loading a set of {@link TranscodingRule} objects from sources such as maps
+ * or directories of property files.
  */
 public class TranscodingRuleLoader {
     
diff --git a/idp-conf/src/main/resources/conf/attribute-registry.xml b/idp-conf/src/main/resources/conf/attribute-registry.xml
index b6774ba..d79e8c6 100644
--- a/idp-conf/src/main/resources/conf/attribute-registry.xml
+++ b/idp-conf/src/main/resources/conf/attribute-registry.xml
@@ -13,7 +13,7 @@
        default-destroy-method="destroy">
 
     <!--
-    The system comes preconfigured to load SAML mappings directly from resource files
+    The system comes preconfigured to load rules directly from resource files
     configured in services.xml so they're monitored for changes.
     
     You can add mappings here, add more XML resource files,
diff --git a/idp-conf/src/main/resources/conf/services.xml b/idp-conf/src/main/resources/conf/services.xml
index 8e6d9bf..37f1b36 100644
--- a/idp-conf/src/main/resources/conf/services.xml
+++ b/idp-conf/src/main/resources/conf/services.xml
@@ -78,8 +78,9 @@
 
     <!-- This set of resources uses only AttributeEncoders for compatibility. -->
     <util:list id ="shibboleth.LegacyAttributeRegistryResources">
-        <value>%{idp.home}/conf/attribute-resolver.xml</value>
+        <value>%{idp.home}/conf/attribute-registry.xml</value>
         <value>%{idp.home}/system/conf/attribute-registry-system.xml</value>
+        <value>%{idp.home}/conf/attribute-resolver.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.AttributeFilterResources">
diff --git a/idp-conf/src/main/resources/system/conf/attribute-registry-system.xml b/idp-conf/src/main/resources/system/conf/attribute-registry-system.xml
index 9890b2a..434f461 100644
--- a/idp-conf/src/main/resources/system/conf/attribute-registry-system.xml
+++ b/idp-conf/src/main/resources/system/conf/attribute-registry-system.xml
@@ -52,9 +52,6 @@
         
     <bean id="shibboleth.TranscodingRuleLoader"
         class="net.shibboleth.idp.attribute.transcoding.impl.TranscodingRuleLoader" abstract="true" />
-    
-    <util:map id="shibboleth.DefaultTranscodingProperties">
-    </util:map>
 
     <bean id="shibboleth.TranscodingProperties" lazy-init="true"
             class="org.springframework.beans.factory.config.MapFactoryBean">

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