update to 4.0.0 (release)

docker · Mar 11, 2020 · 4fcaca0 · 4fcaca0
1 parent 58f1282
commit 4fcaca0
Show file tree

Hide file tree

Showing 17 changed files with 534 additions and 1,494 deletions.
diff --git a/conf/attribute-registry.xml b/conf/attribute-registry.xml
@@ -16,11 +16,14 @@
     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,
-    or drop property files into the directory noted below.
+    You can add mappings here, add more XML resource files, or drop property
+    files into the directory noted below, but they won't be monitored for changes
+    themselves.
     -->
 
     <!-- Default directory for custom mappings. -->
-    <bean parent="shibboleth.TranscodingRuleLoader" c:_0="%{idp.home}/conf/attributes/custom" />
+    <bean parent="shibboleth.TranscodingRuleLoader"
+        c:dir="%{idp.home}/conf/attributes/custom"
+        c:extensions="#{{'.txt', '.props', '.properties', '.rule'}}" />
 
 </beans>
diff --git a/conf/attribute-resolver-full.xml b/conf/attribute-resolver-full.xml