[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/mvc-beans.xml system/conf/mvc-beans.xml

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Nov  3 13:46:39 2015
New Revision: 7924

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7924&view=rev
Log:
Minor adjustments to mvc-beans.xml boilerplate.

Don't peg MVC schema to specific version, use the latest like the others.
Add MVC schema to user-space config.

Modified:
    trunk/idp-conf/src/main/resources/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/mvc-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/mvc-beans.xml?rev=7924&r1=7923&r2=7924&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/mvc-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/mvc-beans.xml	Tue Nov  3 13:46:39 2015
@@ -1,11 +1,13 @@
 <?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:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       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"
                            

Modified: trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml?rev=7924&r1=7923&r2=7924&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml	Tue Nov  3 13:46:39 2015
@@ -7,7 +7,7 @@
        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-3.0.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">