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

[noreply at shibboleth.net]

Author: rdw
Date: Sun May 18 07:35:00 2014
New Revision: 5951

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5951&view=rev
Log:
IDP- 251internally accessed jsp file move within WEB-INF.

Added:
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/error-404.jsp
      - copied unchanged from r5950, trunk/idp-war/src/main/webapp/error-404.jsp
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/error-500.jsp
      - copied unchanged from r5950, trunk/idp-war/src/main/webapp/error-500.jsp
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/error.jsp
      - copied unchanged from r5950, trunk/idp-war/src/main/webapp/error.jsp
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/login.jsp
      - copied unchanged from r5950, trunk/idp-war/src/main/webapp/login.jsp
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp
      - copied unchanged from r5950, trunk/idp-war/src/main/webapp/logout.jsp
Modified:
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/views/error.vm
    trunk/idp-conf/src/main/resources/views/login.vm
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml
    trunk/idp-war/src/main/webapp/error-404.jsp
    trunk/idp-war/src/main/webapp/error-500.jsp
    trunk/idp-war/src/main/webapp/error.jsp
    trunk/idp-war/src/main/webapp/login.jsp
    trunk/idp-war/src/main/webapp/logout.jsp

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=5951&r1=5950&r2=5951&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 Sun May 18 07:35:00 2014
@@ -68,7 +68,7 @@
 
     <bean id="shibboleth.InternalViewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
         <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
-        <property name="prefix" value="/"/>
+        <property name="prefix" value="/WEB-INF/jsp/"/>
         <property name="suffix" value=".jsp"/>
     </bean>
 

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=5951&r1=5950&r2=5951&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/web.xml Sun May 18 07:35:00 2014
@@ -96,13 +96,13 @@
 
     <error-page>
         <error-code>500</error-code>
-        <location>/error-500.jsp</location>
+        <location>/WEB-INF/jsp/error-500.jsp</location>
     </error-page>
     -->
 
     <error-page>
         <error-code>404</error-code>
-        <location>/error-404.jsp</location>
+        <location>/WEB-INF/jsp/error-404.jsp</location>
     </error-page>
 
     <!-- Uncomment to use container managed authentication -->