[java-identity-provider COMMIT] /trunk/idp-war/src/main/webapp/WEB-INF/web.xml

[noreply at shibboleth.net]

Author: tzeller
Date: Tue May 13 14:08:06 2014
New Revision: 5921

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5921&view=rev
Log:
Add another slash to file:// URIs. Remove the DispatcherServlet declaration which was outside of the idp servlet.

Modified:
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml

Modified: trunk/idp-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/WEB-INF/web.xml?rev=5921&r1=5920&r2=5921&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/web.xml Tue May 13 14:08:06 2014
@@ -14,7 +14,7 @@
         same named beans in previous files. -->
     <context-param>
         <param-name>contextConfigLocation</param-name>
-         <param-value>file://${idp.home}/system/conf/global-system.xml file://${idp.home}/conf/global-user.xml</param-value>
+        <param-value>file:///${idp.home}/system/conf/global-system.xml file:///${idp.home}/conf/global-user.xml</param-value>
     </context-param>
 
     <!-- Spring listener used to load up the configuration -->
@@ -58,9 +58,6 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-    <!-- <servlet> <servlet-name>dispatcherServlet</servlet-name> <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> 
-        <load-on-startup>1</load-on-startup> </servlet> -->
-
     <!-- Add IdP SLF4J MDC cleanup filter to all requests -->
     <!-- <filter> <filter-name>SL4JCleanupFilter</filter-name> <filter-class>edu.internet2.middleware.shibboleth.common.log.SLF4JMDCCleanupFilter</filter-class> 
         </filter> <filter-mapping> <filter-name>SL4JCleanupFilter</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> -->
@@ -75,7 +72,7 @@
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
         <init-param>
             <param-name>contextConfigLocation</param-name>
-            <param-value>file://${idp.home}/system/conf/mvc-beans.xml file://${idp.home}/system/conf/webflow-config.xml</param-value>
+            <param-value>file:///${idp.home}/system/conf/mvc-beans.xml file:///${idp.home}/system/conf/webflow-config.xml</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>