svn commit: r1735399 - in /ofbiz/branches/release15.12: ./ applications/content/webapp/contentimages/WEB-INF/web.xml

Author: jleroux
Date: Thu Mar 17 10:42:29 2016
New Revision: 1735399

URL: http://svn.apache.org/viewvc?rev=1735399&view=rev
Log:
"Applied fix from trunk for revision: 1735398  "
------------------------------------------------------------------------
r1735398 | jleroux | 2016-03-17 11:42:04 +0100 (jeu. 17 mars 2016) | 1 ligne

Completes r1726388 for the contentimages webapp placeholder (I did not notice it, because it's special I guess so not reported in log)
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/content/webapp/contentimages/WEB-INF/web.xml

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 17 10:42:29 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398

Modified: ofbiz/branches/release15.12/applications/content/webapp/contentimages/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/webapp/contentimages/WEB-INF/web.xml?rev=1735399&r1=1735398&r2=1735399&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/content/webapp/contentimages/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/applications/content/webapp/contentimages/WEB-INF/web.xml Thu Mar 17 10:42:29 2016
@@ -18,11 +18,7 @@
 
 
 <web-app version="3.0">
-    <display-name> version="3.0"
-      xmlns="http://java.sun.com/xml/ns/javaee"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"Empty placeholder</display-name>
+    <display-name>Apache OFBiz - Content Empty placeholder</display-name>
     <description>Empty placeholder, see http://svn.apache.org/viewvc?view=revision&amp;revision=1658621 </description>
     <session-config>
       <session-timeout>60</session-timeout> <!-- in minutes -->