svn commit: r1859802 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/order/webapp/ordermgr/WEB-INF/ applications/party/webapp/partymgr/WEB-INF/ applications/product/webapp/catalog/WEB-INF/ applications/product/webapp/facility/WEB-INF...

Author: jleroux
Date: Thu May 23 16:37:38 2019
New Revision: 1859802

URL: http://svn.apache.org/viewvc?rev=1859802&view=rev
Log:
"Applied fix from trunk for revision: 1859800"
------------------------------------------------------------------------
r1859800 | jleroux | 2019-05-23 18:36:37 +0200 (jeu. 23 mai 2019) | 8 lignes

Fixed: Replace request-redirect w/ no redirect-param attribute by
request-redirect-noparam
(OFBIZ-9997)

Reverts all the rest from r1816180, and, after reading carefully the code used
for "request-redirect" in RequestHandler (and downward), fixes the documentation
in site-conf.xsd

------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/catalog/WEB-INF/controller.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/facility/WEB-INF/controller.xml
    ofbiz/ofbiz-framework/branches/release17.12/framework/common/webcommon/WEB-INF/common-controller.xml
    ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/dtd/site-conf.xsd

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 23 16:37:38 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
 1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849165,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850914,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158,1851163,1851200,1851247,1851319,1851350,1851805,1851998,1852587,1852818,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,1856667,1857088,1857099,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858250,1858256,1858275,1858319,1858432,1858444,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
 1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849165,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850914,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158,1851163,1851200,1851247,1851319,1851350,1851805,1851998,1852587,1852818,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,1856667,1857088,1857099,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858250,1858256,1858275,1858319,1858432,1858444,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1859802&r1=1859801&r2=1859802&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/order/webapp/ordermgr/WEB-INF/controller.xml Thu May 23 16:37:38 2019
@@ -95,61 +95,61 @@ under the License.
     <request-map uri="massApproveOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massChangeOrderApproved"/>
-        <response name="success" type="request-redirect-noparam" value="findorders"/>
+        <response name="success" type="request-redirect" value="findorders"/>
         <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massProcessOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massProcessOrders"/>
-        <response name="success" type="request-redirect-noparam" value="findorders"/>
+        <response name="success" type="request-redirect" value="findorders"/>
         <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massHoldOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massHoldOrders"/>
-        <response name="success" type="request-redirect-noparam" value="findorders"/>
+        <response name="success" type="request-redirect" value="findorders"/>
         <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massCancelOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massCancelOrders"/>
-        <response name="success" type="request-redirect-noparam" value="findorders"/>
+        <response name="success" type="request-redirect" value="findorders"/>
         <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massCancelRemainingPurchaseOrderItems">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massCancelRemainingPurchaseOrderItems"/>
-        <response name="success" type="request-redirect-noparam" value="findorders"/>
+        <response name="success" type="request-redirect" value="findorders"/>
         <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massRejectOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massRejectOrders"/>
-        <response name="success" type="request-redirect-noparam" value="findorders"/>
+        <response name="success" type="request-redirect" value="findorders"/>
         <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massQuickShipOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massQuickShipOrders"/>
-        <response name="success" type="request-redirect-noparam" value="findorders"/>
+        <response name="success" type="request-redirect" value="findorders"/>
         <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massPickOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massPickOrders"/>
-        <response name="success" type="request-redirect-noparam" value="findorders"/>
+        <response name="success" type="request-redirect" value="findorders"/>
         <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massPrintOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massPrintOrders"/>
-        <response name="success" type="request-redirect-noparam" value="findorders"/>
+        <response name="success" type="request-redirect" value="findorders"/>
         <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massCreateFileForOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massCreateFileForOrders"/>
-        <response name="success" type="request-redirect-noparam" value="findorders"/>
+        <response name="success" type="request-redirect" value="findorders"/>
         <response name="error" type="view" value="findorders"/>
     </request-map>
 

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1859802&r1=1859801&r2=1859802&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml Thu May 23 16:37:38 2019
@@ -470,7 +470,7 @@ under the License.
     <request-map uri="createCustRequest">
         <security https="true" auth="true"/>
         <event type="service" invoke="createCustRequest"/>
-        <response name="success" type="request-redirect-noparam" value="viewprofile"/>
+        <response name="success" type="request-redirect" value="viewprofile"/>
         <response name="error" type="request-redirect" value="viewprofile"/>
     </request-map>
     <request-map uri="newrequest">

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1859802&r1=1859801&r2=1859802&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/catalog/WEB-INF/controller.xml Thu May 23 16:37:38 2019
@@ -3048,7 +3048,7 @@ under the License.
     <request-map uri="updateProductTag">
         <security https="true" auth="true"/>
         <event type="service-multi" path="" invoke="updateProductKeyword"/>
-        <response name="success" type="request-redirect-noparam" value="EditProductTag"/>
+        <response name="success" type="request-redirect" value="EditProductTag"/>
         <response name="error" type="view" value="EditProductTag"/>
     </request-map>
     <!-- end of request mappings -->

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1859802&r1=1859801&r2=1859802&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/webapp/facility/WEB-INF/controller.xml Thu May 23 16:37:38 2019
@@ -1139,7 +1139,7 @@ under the License.
     <request-map uri="dhlShipmentConfirm">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="dhlShipmentConfirm"/>
-        <response name="success" type="request-redirect-noparam" value="EditShipmentRouteSegments"/>
+        <response name="success" type="request-redirect" value="EditShipmentRouteSegments"/>
         <response name="error" type="view" value="EditShipmentRouteSegments"/>
     </request-map>
 
@@ -1160,7 +1160,7 @@ under the License.
     <request-map uri="fedexShipmentConfirm">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="fedexShipRequest"/>
-        <response name="success" type="request-redirect-noparam" value="EditShipmentRouteSegments"/>
+        <response name="success" type="request-redirect" value="EditShipmentRouteSegments"/>
         <response name="error" type="view" value="EditShipmentRouteSegments"/>
     </request-map>
 

Modified: ofbiz/ofbiz-framework/branches/release17.12/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1859802&r1=1859801&r2=1859802&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/framework/common/webcommon/WEB-INF/common-controller.xml Thu May 23 16:37:38 2019
@@ -63,7 +63,7 @@ under the License.
     <request-map uri="logout">
         <security https="true" auth="true"/>
         <event type="java" path="org.apache.ofbiz.webapp.control.LoginWorker" invoke="logout"/>
-        <response name="success" type="request-redirect-noparam" value="main"/>
+        <response name="success" type="request-redirect" value="main"/>
         <response name="error" type="view" value="main"/>
     </request-map>
     <request-map uri="forgotPassword">

Modified: ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/dtd/site-conf.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/dtd/site-conf.xsd?rev=1859802&r1=1859801&r2=1859802&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/dtd/site-conf.xsd (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/dtd/site-conf.xsd Thu May 23 16:37:38 2019
@@ -574,7 +574,7 @@ under the License.
                         <xs:annotation>
                             <xs:documentation>
                                 Internally chains to another request.
-                                Automatically redirect all current request parameters to the new request
+                                Automatically redirects all current request parameters to the new request
                             </xs:documentation>
                         </xs:annotation>
                     </xs:enumeration>
@@ -582,7 +582,8 @@ under the License.
                         <xs:annotation>
                             <xs:documentation>
                                 Send a redirect down to the browser telling it to go to the new request.
-                                Redirect only mentioned request parameters in controller.xml, using redirect-param attribute
+                                Automatically redirects all current request parameters to the new request
+                                or only redirected parameters specified using redirect-param attribute.
                             </xs:documentation>
                         </xs:annotation>
                     </xs:enumeration>