You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/02/17 10:03:52 UTC

svn commit: r1245350 - /incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml

Author: danhaywood
Date: Fri Feb 17 09:03:51 2012
New Revision: 1245350

URL: http://svn.apache.org/viewvc?rev=1245350&view=rev
Log:
ISIS-189: fixing validation errors in web.xml

Modified:
    incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml

Modified: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml?rev=1245350&r1=1245349&r2=1245350&view=diff
==============================================================================
--- incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml Fri Feb 17 09:03:51 2012
@@ -196,6 +196,9 @@
     <filter-mapping>
         <filter-name>IsisSessionFilterForHtml</filter-name>
         <servlet-name>HtmlLogin</servlet-name>
+    </filter-mapping>
+    <filter-mapping>
+        <filter-name>IsisSessionFilterForHtml</filter-name>
         <servlet-name>HtmlDispatcher</servlet-name>
     </filter-mapping>
 
@@ -238,15 +241,18 @@
     <servlet>
         <servlet-name>ScimpiDispatcher</servlet-name>
         <servlet-class>org.apache.isis.viewer.scimpi.servlet.DispatcherServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
         <init-param>
              <param-name>view</param-name>
              <param-value>login.shtml</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>
         <servlet-name>ScimpiDispatcher</servlet-name>
         <url-pattern>*.shtml</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ScimpiDispatcher</servlet-name>
         <url-pattern>*.app</url-pattern>
     </servlet-mapping>