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

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Apr 22 07:24:13 2014
New Revision: 5761

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5761&view=rev
Log:
Update idp-war web.xml based on java-idp-testbed.

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=5761&r1=5760&r2=5761&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/web.xml Tue Apr 22 07:24:13 2014
@@ -10,21 +10,53 @@
         that the cookie will only ever be sent to the IdP host. -->
     <!-- <context-param> <param-name>cookieDomain</param-name> <param-value>example.org</param-value> </context-param> -->
 
-    <!-- Spring 2.0 application context files. Files are loaded in the order they appear with subsequent files overwriting 
+    <!-- Spring application context files. Files are loaded in the order they appear with subsequent files overwriting 
         same named beans in previous files. -->
-    
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <!-- 
-        <param-value>/opt/idp/conf/internal.xml; $IDP_HOME$/conf/service.xml;</param-value>
-         -->
-         <param-value>file:/opt/idp/conf/internal.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 2.0 listener used to load up the configuration -->
+    <!-- Spring listener used to load up the configuration -->
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
+    
+    <!-- Filters and filter mappings -->
+    <filter>
+        <filter-name>CookieBufferingFilter</filter-name>
+        <filter-class>net.shibboleth.utilities.java.support.net.CookieBufferingFilter</filter-class>
+    </filter>
+    <filter>
+        <filter-name>DelegatingFilterProxy</filter-name>
+        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+        <init-param>
+            <param-name>targetBeanName</param-name>
+            <param-value>shibboleth.ClientStorageService</param-value>
+        </init-param>
+    </filter>
+    <filter>
+        <filter-name>RequestResponseContextFilter</filter-name>
+        <filter-class>net.shibboleth.utilities.java.support.net.RequestResponseContextFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>CookieBufferingFilter</filter-name>
+        <url-pattern>/idp/Shibboleth/SSO</url-pattern>
+        <url-pattern>/idp/SAML2/Unsolicited/SSO</url-pattern>
+        <url-pattern>/idp/SAML2/Redirect/SSO</url-pattern>
+        <url-pattern>/idp/SAML2/POST/SSO</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>DelegatingFilterProxy</filter-name>
+        <url-pattern>/idp/Shibboleth/SSO</url-pattern>
+        <url-pattern>/idp/SAML2/Unsolicited/SSO</url-pattern>
+        <url-pattern>/idp/SAML2/Redirect/SSO</url-pattern>
+        <url-pattern>/idp/SAML2/POST/SSO</url-pattern>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>RequestResponseContextFilter</filter-name>
+        <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> -->
@@ -41,70 +73,48 @@
     <!-- <filter> <filter-name>IdPNoCacheFilter</filter-name> <filter-class>edu.internet2.middleware.shibboleth.idp.util.NoCacheFilter</filter-class> 
         </filter> <filter-mapping> <filter-name>IdPNoCacheFilter</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> -->
 
-    <!-- Profile Request Dispatcher -->
-    <!-- <servlet> <servlet-name>ProfileRequestDispatcher</servlet-name> <servlet-class>edu.internet2.middleware.shibboleth.common.profile.ProfileRequestDispatcherServlet</servlet-class> 
-        <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> <servlet-name>ProfileRequestDispatcher</servlet-name> <url-pattern>/profile/*</url-pattern> 
-        </servlet-mapping> -->
-        
+    <!-- Servlets and servlet mappings -->    
     <servlet>
-        <servlet-name>profile</servlet-name>
+        <servlet-name>idp</servlet-name>
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
         <init-param>
             <param-name>contextConfigLocation</param-name>
-            <param-value>file:/opt/idp/conf/profile-servlet.xml</param-value>
+            <param-value>file://${idp.home}/system/conf/mvc-beans.xml file://${idp.home}/conf/webflow-config.xml</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
-
     <servlet-mapping>

[... 56 lines stripped ...]