[java-identity-provider] branch master updated: IDP-1642 - Migrate configuration into jars where feasible

[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=19d26d7de0436e454f59e7043a48394cb587231d

The following commit(s) were added to refs/heads/master by this push:
       new  19d26d7de IDP-1642 - Migrate configuration into jars where feasible
19d26d7de is described below

commit 19d26d7de0436e454f59e7043a48394cb587231d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jul 27 18:32:39 2020 -0400

    IDP-1642 - Migrate configuration into jars where feasible
    
    https://issues.shibboleth.net/jira/browse/IDP-1642
    
    Move system message source into idp-conf-impl.
    Ensure system source is appended to user-supplied sources.
---
 .../net/shibboleth/idp}/messages/messages.properties         |  0
 .../net/shibboleth/idp}/messages/messages_de.properties      |  0
 .../net/shibboleth/idp}/messages/messages_de_CH.properties   |  0
 .../net/shibboleth/idp}/messages/messages_fr.properties      |  0
 .../net/shibboleth/idp}/messages/messages_it.properties      |  0
 .../net/shibboleth/idp}/messages/messages_ja.properties      |  0
 idp-conf/src/main/resources/conf/services.xml                |  1 -
 idp-conf/src/main/resources/system/conf/global-system.xml    | 12 +++++++++++-
 8 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/idp-conf/src/main/resources/system/messages/messages.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/messages/messages.properties
similarity index 100%
rename from idp-conf/src/main/resources/system/messages/messages.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/messages/messages.properties
diff --git a/idp-conf/src/main/resources/system/messages/messages_de.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/messages/messages_de.properties
similarity index 100%
rename from idp-conf/src/main/resources/system/messages/messages_de.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/messages/messages_de.properties
diff --git a/idp-conf/src/main/resources/system/messages/messages_de_CH.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/messages/messages_de_CH.properties
similarity index 100%
rename from idp-conf/src/main/resources/system/messages/messages_de_CH.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/messages/messages_de_CH.properties
diff --git a/idp-conf/src/main/resources/system/messages/messages_fr.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/messages/messages_fr.properties
similarity index 100%
rename from idp-conf/src/main/resources/system/messages/messages_fr.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/messages/messages_fr.properties
diff --git a/idp-conf/src/main/resources/system/messages/messages_it.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/messages/messages_it.properties
similarity index 100%
rename from idp-conf/src/main/resources/system/messages/messages_it.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/messages/messages_it.properties
diff --git a/idp-conf/src/main/resources/system/messages/messages_ja.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/messages/messages_ja.properties
similarity index 100%
rename from idp-conf/src/main/resources/system/messages/messages_ja.properties
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/messages/messages_ja.properties
diff --git a/idp-conf/src/main/resources/conf/services.xml b/idp-conf/src/main/resources/conf/services.xml
index 350f29891..f384909eb 100644
--- a/idp-conf/src/main/resources/conf/services.xml
+++ b/idp-conf/src/main/resources/conf/services.xml
@@ -63,7 +63,6 @@
     -->
     <util:list id="shibboleth.MessageSourceResources">
         <value>%{idp.home}/messages/messages</value>
-        <value>%{idp.home}/system/messages/messages</value>
     </util:list>
     
 </beans>
diff --git a/idp-conf/src/main/resources/system/conf/global-system.xml b/idp-conf/src/main/resources/system/conf/global-system.xml
index 76f790572..a6b6954c9 100644
--- a/idp-conf/src/main/resources/system/conf/global-system.xml
+++ b/idp-conf/src/main/resources/system/conf/global-system.xml
@@ -35,9 +35,19 @@
     <bean id="shibboleth.IdentifiableBeanPostProcessor"
         class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
+    <!-- This extends the original user-space resource list with the classpath-embedded message tree. -->
+    <bean id ="ExtendedMessageSourceResources" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
+          p:firstList-ref="#{'%{idp.message.resources:shibboleth.MessageSourceResources}'.trim()}" >
+        <property name="secondList">
+            <util:list >
+                <value>classpath:/net/shibboleth/idp/messages/messages</value>
+            </util:list>
+        </property>
+    </bean>
+
     <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource"
             p:cacheSeconds="%{idp.message.cacheSeconds:300}"
-            p:basenames-ref="#{'%{idp.message.resources:shibboleth.MessageSourceResources}'.trim()}"
+            p:basenames-ref="ExtendedMessageSourceResources"
             p:defaultEncoding="UTF-8" />
 
     <import resource="../../conf/global.xml" />

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