[java-identity-provider COMMIT] in /trunk/idp-war/src/main/webapp: WEB-INF/web.xml error-404.jsp error.jsp images/ im...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed May  1 18:59:50 2013
New Revision: 4442

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4442&view=rev
Log:
Make the idp war minimally deployable. The contextConfigLocation param has been removed and will hopefully be set by the Jetty context descriptor. The v2 elements have been commented out. The JSPs referencing v2 are obviously broken until more porting happens.

Added:
    trunk/idp-war/src/main/webapp/error-404.jsp   (with props)
    trunk/idp-war/src/main/webapp/error.jsp   (with props)
    trunk/idp-war/src/main/webapp/images/
    trunk/idp-war/src/main/webapp/images/dummylogo-mobile.png   (with props)
    trunk/idp-war/src/main/webapp/images/dummylogo.png   (with props)
    trunk/idp-war/src/main/webapp/shibboleth.jsp   (with props)
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=4442&r1=4441&r2=4442&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/web.xml Wed May  1 18:59:50 2013
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
 
+    <!-- TODO Quite incomplete work-in-progress. -->
+ 
     <display-name>Shibboleth Identity Provider</display-name>
 
     <!-- Parameter that allows the domain of all cookies to be explicitly set. If not set the domain is let empty which means 
@@ -9,107 +12,57 @@
 
     <!-- Spring 2.0 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>$IDP_HOME$/conf/internal.xml; $IDP_HOME$/conf/service.xml;</param-value>
     </context-param>
+    -->
 
     <!-- Spring 2.0 listener used to load up the configuration -->
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
 
+    <!-- <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>
-
+    <!-- <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> -->
 
     <!-- Add IdP Session object to incoming profile requests -->
-    <filter>
-        <filter-name>IdPSessionFilter</filter-name>
-        <filter-class>edu.internet2.middleware.shibboleth.idp.session.IdPSessionFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>IdPSessionFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
+    <!-- <filter> <filter-name>IdPSessionFilter</filter-name> <filter-class>edu.internet2.middleware.shibboleth.idp.session.IdPSessionFilter</filter-class> 
+        </filter> <filter-mapping> <filter-name>IdPSessionFilter</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> -->
 
     <!-- HTTP headers to every response in order to prevent response caching -->
-    <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>
+    <!-- <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>

[... 73 lines stripped ...]