[java-identity-provider] branch master updated: Convert empty mvc-beans file into a conditional import.

[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=2c83daf5687bfd37cef83f68cfe74a4ccf614284

The following commit(s) were added to refs/heads/master by this push:
       new  2c83daf   Convert empty mvc-beans file into a conditional import.
2c83daf is described below

commit 2c83daf5687bfd37cef83f68cfe74a4ccf614284
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Jan 19 14:03:57 2018 -0500

    Convert empty mvc-beans file into a conditional import.
---
 idp-conf/src/main/resources/conf/mvc-beans.xml     | 23 ----------------------
 .../src/main/resources/system/conf/mvc-beans.xml   |  2 +-
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/mvc-beans.xml b/idp-conf/src/main/resources/conf/mvc-beans.xml
deleted file mode 100644
index 98d9bcd..0000000
--- a/idp-conf/src/main/resources/conf/mvc-beans.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!--
-    Use this file to define any custom MVC beans needed. Its contents are imported
-    by system/conf/mvc-beans.xml, which configures a lot of the low-level Spring Web
-    behavior of the IdP. You can ignore this file otherwise.
-    -->
-    
-</beans>
diff --git a/idp-conf/src/main/resources/system/conf/mvc-beans.xml b/idp-conf/src/main/resources/system/conf/mvc-beans.xml
index b24a5d1..de9468d 100644
--- a/idp-conf/src/main/resources/system/conf/mvc-beans.xml
+++ b/idp-conf/src/main/resources/system/conf/mvc-beans.xml
@@ -111,6 +111,6 @@
     </bean>
 
     <!-- Import any user defined beans or overrides for the MVC config. -->
-    <import resource="../../conf/mvc-beans.xml" />
+    <import resource="conditional:${idp.home}/conf/mvc-beans.xml" />
 
 </beans>

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