svn commit: r1531349 - in /ofbiz/branches/release12.04: ./ specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml

Author: jleroux
Date: Fri Oct 11 16:40:49 2013
New Revision: 1531349

URL: http://svn.apache.org/r1531349
Log:
"Applied fix from trunk for revision: 1347559"
------------------------------------------------------------------------
r1347559 | jacopoc | 2012-06-07 12:26:40 +0200 (jeu., 07 juin 2012) | 2 lines

Fixed xml validation for misplaced "error-page" element added by Hans in rev. 1208335.
Unfortunately the bug has been backported by Jacques to the 11.04 branch but I don't have time to backport the fix to the branches at the moment.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1347559

Modified: ofbiz/branches/release12.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1531349&r1=1531348&r2=1531349&view=diff
==============================================================================
--- ofbiz/branches/release12.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original)
+++ ofbiz/branches/release12.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Fri Oct 11 16:40:49 2013
@@ -100,11 +100,6 @@ under the License.
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-    <error-page>
-        <error-code>404</error-code>
-        <location>/error/404.jsp</location>
-    </error-page>
-
     <listener><listener-class>org.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
     <!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface -->
     <!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
@@ -162,4 +157,9 @@ under the License.
         <welcome-file>index.html</welcome-file>
         <welcome-file>index.htm</welcome-file>
     </welcome-file-list>
+
+    <error-page>
+        <error-code>404</error-code>
+        <location>/error/404.jsp</location>
+    </error-page>
 </web-app>