Author: deepak
Date: Fri May 4 19:35:37 2018
New Revision: 1830938
URL: http://svn.apache.org/viewvc?rev=1830938&view=rev
Log:
Applied fix from trunk for revision: 1830936
===
Fixed: Fix typo 'paramters' => 'parameters'
(OFBIZ-10394)
Thanks Mathieu Lirzin for your contribution
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/applications/content/servicedef/services.xml
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 4 19:35:37 2018
@@ -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,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,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,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,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936
Modified:
ofbiz/ofbiz-framework/branches/release17.12/applications/content/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/content/servicedef/services.xml?rev=1830938&r1=1830937&r2=1830938&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/applications/content/servicedef/services.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/applications/content/servicedef/services.xml
Fri May 4 19:35:37 2018
@@ -25,7 +25,7 @@
<!-- interfaces -->
<service name="uploadFileInterface" engine="interface">
- <description>Contains necessary paramters for all file upload requests
via service event handler</description>
+ <description>Contains necessary parameters for all file upload
requests via service event handler</description>
<attribute name="uploadedFile" type="java.nio.ByteBuffer" mode="IN"
optional="true"/>
<attribute name="_uploadedFile_fileName" type="String" mode="IN"
optional="true"/>
<attribute name="_uploadedFile_contentType" type="String" mode="IN"
optional="true"/>
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java?rev=1830938&r1=1830937&r2=1830938&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
Fri May 4 19:35:37 2018
@@ -1245,7 +1245,7 @@ public final class UtilHttp {
/**
* Utility to make a composite parameter from the given prefix and suffix.
- * The prefix should be a regular paramter name such as meetingDate. The
+ * The prefix should be a regular parameter name such as meetingDate. The
* suffix is the composite field, such as the hour of the meeting. The
* result would be meetingDate_${COMPOSITE_DELIMITER}_hour.
*