[java-identity-provider] branch main updated: IDP-1652 - Support easier integration into configuration by plugins

[Scott Cantor]

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=aad8ca4cc0507edf07e4d4d5e05b1157c4541659

The following commit(s) were added to refs/heads/main by this push:
       new  aad8ca4cc IDP-1652 - Support easier integration into configuration by plugins
aad8ca4cc is described below

commit aad8ca4cc0507edf07e4d4d5e05b1157c4541659
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 9 15:34:45 2020 -0500

    IDP-1652 - Support easier integration into configuration by plugins
    
    https://issues.shibboleth.net/jira/browse/IDP-1652
    
    Add wildcard imports to services with existing system files.
---
 .../main/resources/net/shibboleth/idp/conf/access-control-system.xml   | 3 +++
 .../resources/net/shibboleth/idp/conf/attribute-registry-system.xml    | 3 +++
 .../resources/net/shibboleth/idp/conf/metadata-providers-system.xml    | 3 +++
 .../main/resources/net/shibboleth/idp/conf/relying-party-system.xml    | 3 +++
 .../src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml  | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/access-control-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/access-control-system.xml
index e9db78ce7..b6fbb1632 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/access-control-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/access-control-system.xml
@@ -26,4 +26,7 @@
     <bean id="shibboleth.PredicateAccessControl" abstract="true"
         class="org.opensaml.profile.logic.PredicateAccessControl" />
 
+    <!-- Wildcard import hook for plugins. -->
+    <import resource="classpath*:/META-INF/net/shibboleth/idp/service/access-control/postconfig.xml" />
+
 </beans>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-registry-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-registry-system.xml
index 4471dd555..57c77cfb6 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-registry-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-registry-system.xml
@@ -51,4 +51,7 @@
         </property>
     </bean>
     
+    <!-- Wildcard import hook for plugins. -->
+    <import resource="classpath*:/META-INF/net/shibboleth/idp/service/attribute/registry/postconfig.xml" />
+    
 </beans>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metadata-providers-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metadata-providers-system.xml
index e32828cb3..2e5ac2c8b 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metadata-providers-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metadata-providers-system.xml
@@ -50,4 +50,7 @@
     <bean id="shibboleth.Metadata.MDQ.URLBuilder.SAMLArtifact" lazy-init="true"
         class="org.opensaml.saml.metadata.resolver.impl.SAMLArtifactURLBuilder" />
     
+    <!-- Wildcard import hook for plugins. -->
+    <import resource="classpath*:/META-INF/net/shibboleth/idp/service/saml/metadata/postconfig.xml" />
+    
 </beans>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
index 69ab5b74c..3b0cc4173 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
@@ -388,4 +388,7 @@
         </constructor-arg>
     </bean>
 
+    <!-- Wildcard import hook for plugins. -->
+    <import resource="classpath*:/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml" />
+
 </beans>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml
index ecb49dfd5..0073b49e7 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml
@@ -103,5 +103,8 @@
                 p:generators-ref="shibboleth.SAML2NameIDGenerators" />    
         </property>
     </bean>
+
+    <!-- Wildcard import hook for plugins. -->
+    <import resource="classpath*:/META-INF/net/shibboleth/idp/service/saml/nameid/postconfig.xml" />
         
 </beans>

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