svn commit: r1781664 - in /ofbiz/branches: release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/ release15.12/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/ release16.11/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/ release16.11/specia...

Author: jleroux
Date: Sat Feb  4 12:28:14 2017
New Revision: 1781664

URL: http://svn.apache.org/viewvc?rev=1781664&view=rev
Log:
"Applied fix from trunk for revision: 1781662  " (tree conflict handled by hand)
------------------------------------------------------------------------
r1781662 | jleroux | 2017-02-04 13:20:41 +0100 (sam. 04 févr. 2017) | 12 lignes

Fixed: Missing file results in error
(OFBIZ-9198)

When accessing a file/image in ecomseo (only seo version) that is physically
missing or the dataresource attribute isPublic=="N" the request results
in a loop.

jleroux: to break the loop in case or error, I simply decided to return a
response of type none. I also added the same for io-error which can be returned
by the DataEvents class, also in ecommerce controller

Thanks: Ingo Wolfmayr for report
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
    ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/controller.xml
    ofbiz/branches/release16.11/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
    ofbiz/branches/release16.11/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/controller.xml

Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1781664&r1=1781663&r2=1781664&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Sat Feb  4 12:28:14 2017
@@ -1374,6 +1374,7 @@ under the License.
         <event type="rome" invoke="generateBlogRssFeed"/>
         <response name="success" type="none"/>
         <response name="error" type="view" value="error"/>
+        <response name="io-error" type="none"/>
     </request-map>
 
     <request-map uri="ViewResponse">

Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/controller.xml?rev=1781664&r1=1781663&r2=1781664&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/controller.xml Sat Feb  4 12:28:14 2017
@@ -27,4 +27,12 @@ under the License.
     <description>OFBiz: eCommerce SEO Controller Configuration File</description>
     
     <handler name="jsp" type="view" class="org.ofbiz.ecommerce.webapp.view.JspViewHandler"/>
+    
+    <request-map uri="stream">
+        <event type="java" path="org.apache.ofbiz.content.data.DataEvents" invoke="serveObjectData"/>
+        <response name="success" type="none"/>
+        <response name="error" type="none"/>
+        <response name="io-error" type="none"/>
+    </request-map>
+    
 </site-conf>

Modified: ofbiz/branches/release16.11/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1781664&r1=1781663&r2=1781664&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Sat Feb  4 12:28:14 2017
@@ -1837,6 +1837,7 @@ under the License.
         <event type="java" path="org.apache.ofbiz.content.data.DataEvents" invoke="serveObjectData"/>
         <response name="success" type="none"/>
         <response name="error" type="view" value="error"/>
+        <response name="io-error" type="none"/>
     </request-map>
 
      <request-map uri="showShoppingList">

Modified: ofbiz/branches/release16.11/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/controller.xml?rev=1781664&r1=1781663&r2=1781664&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/controller.xml Sat Feb  4 12:28:14 2017
@@ -27,4 +27,12 @@ under the License.
     <description>OFBiz: eCommerce SEO Controller Configuration File</description>
     
     <handler name="jsp" type="view" class="org.apache.ofbiz.ecommerce.webapp.view.JspViewHandler"/>
+    
+    <request-map uri="stream">
+        <event type="java" path="org.apache.ofbiz.content.data.DataEvents" invoke="serveObjectData"/>
+        <response name="success" type="none"/>
+        <response name="error" type="none"/>
+        <response name="io-error" type="none"/>
+    </request-map>
+    
 </site-conf>