svn commit: r1850648 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ build.gradle
Author: jleroux
Date: Mon Jan 7 14:47:57 2019
New Revision: 1850648
URL: http://svn.apache.org/viewvc?rev=1850648=rev
Log:
"Applied fix from trunk for revision: "
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/build.gradle
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 7 14:47:57 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:1850015,1850023,1850530
+/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647
Modified: ofbiz/ofbiz-framework/branches/release18.12/build.gradle
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/build.gradle?rev=1850648=1850647=1850648=diff
==
--- ofbiz/ofbiz-framework/branches/release18.12/build.gradle (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/build.gradle Mon Jan 7
14:47:57 2019
@@ -131,6 +131,7 @@ dependencies {
compile 'commons-cli:commons-cli:1.4'
compile 'commons-net:commons-net:3.6'
compile 'commons-validator:commons-validator:1.6'
+compile 'commons-fileupload:commons-fileupload:1.3.3'
compile 'de.odysseus.juel:juel-impl:2.2.7'
compile 'javax.el:javax.el-api:3.0.1-b06'
compile 'javax.servlet:javax.servlet-api:4.0.1'
svn commit: r1850647 - /ofbiz/ofbiz-framework/trunk/build.gradle
Author: jleroux
Date: Mon Jan 7 14:46:50 2019
New Revision: 1850647
URL: http://svn.apache.org/viewvc?rev=1850647=rev
Log:
Improved: Update Apache commons-fileupload to last version
(OFBIZ-10770)
This is an easy doing, we just need to add
compile 'commons-fileupload:commons-fileupload:1.3-3'
to the build.gradle file.
So far the dependency was not given directly but by other dependencies
Modified:
ofbiz/ofbiz-framework/trunk/build.gradle
Modified: ofbiz/ofbiz-framework/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/build.gradle?rev=1850647=1850646=1850647=diff
==
--- ofbiz/ofbiz-framework/trunk/build.gradle (original)
+++ ofbiz/ofbiz-framework/trunk/build.gradle Mon Jan 7 14:46:50 2019
@@ -131,6 +131,7 @@ dependencies {
compile 'commons-cli:commons-cli:1.4'
compile 'commons-net:commons-net:3.6'
compile 'commons-validator:commons-validator:1.6'
+compile 'commons-fileupload:commons-fileupload:1.3.3'
compile 'de.odysseus.juel:juel-impl:2.2.7'
compile 'javax.el:javax.el-api:3.0.1-b06'
compile 'javax.servlet:javax.servlet-api:4.0.1'
buildbot failure in on ofbizBranch18Framework
The Buildbot has detected a new failure on builder ofbizBranch18Framework while building . Full details are available at: https://ci.apache.org/builders/ofbizBranch18Framework/builds/3 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: lares_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onBranch18FrameworkCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/branches/release18.12] 1850648 Blamelist: jleroux BUILD FAILED: failed shell_2 Sincerely, -The Buildbot
svn commit: r1850649 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ build.gradle
Author: jleroux
Date: Mon Jan 7 14:48:20 2019
New Revision: 1850649
URL: http://svn.apache.org/viewvc?rev=1850649=rev
Log:
"Applied fix from trunk for revision: 1850647"
r1850647 | jleroux | 2019-01-07 15:46:50 +0100 (lun. 07 janv. 2019) | 11 lignes
Improved: Update Apache commons-fileupload to last version
(OFBIZ-10770)
This is an easy doing, we just need to add
compile 'commons-fileupload:commons-fileupload:1.3-3'
to the build.gradle file.
So far the dependency was not given directly but by other dependencies
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/build.gradle
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 7 14:48:20 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,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530
+/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,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647
Modified: ofbiz/ofbiz-framework/branches/release17.12/build.gradle
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/build.gradle?rev=1850649=1850648=1850649=diff
==
--- ofbiz/ofbiz-framework/branches/release17.12/build.gradle (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/build.gradle Mon Jan 7
14:48:20 2019
@@ -120,6 +120,7 @@ dependencies {
compile 'commons-cli:commons-cli:1.4'
compile 'commons-net:commons-net:3.6'
compile 'commons-validator:commons-validator:1.6'
+compile 'commons-fileupload:commons-fileupload:1.3.3'
compile 'de.odysseus.juel:juel-impl:2.2.7'
compile 'javax.el:javax.el-api:3.0.1-b04'
compile 'javax.servlet:javax.servlet-api:4.0.0'
svn commit: r1850640 - /ofbiz/branches/release16.11/build.gradle
Author: jleroux
Date: Mon Jan 7 13:32:44 2019
New Revision: 1850640
URL: http://svn.apache.org/viewvc?rev=1850640=rev
Log:
Improved: Update Apache commons-fileupload to last version
(OFBIZ-10770)
This is an easy doing, we just need to add
compile 'commons-fileupload:commons-fileupload:1.3-3'
to the build.gradle file.
So far the dependency was not given directly but by other dependencies
Modified:
ofbiz/branches/release16.11/build.gradle
Modified: ofbiz/branches/release16.11/build.gradle
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/build.gradle?rev=1850640=1850639=1850640=diff
==
--- ofbiz/branches/release16.11/build.gradle (original)
+++ ofbiz/branches/release16.11/build.gradle Mon Jan 7 13:32:44 2019
@@ -103,6 +103,7 @@ dependencies {
compile 'commons-cli:commons-cli:1.3.1'
compile 'commons-net:commons-net:3.3'
compile 'commons-validator:commons-validator:1.5.1'
+compile 'commons-fileupload:commons-fileupload:1.3-3'
compile 'de.odysseus.juel:juel-impl:2.2.7'
compile 'javax.el:javax.el-api:3.0.1-b04'
compile 'javax.servlet:javax.servlet-api:3.1.0'
svn commit: r1850688 - in /ofbiz/branches/release16.11: ./ framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWor
Author: jleroux Date: Mon Jan 7 20:42:02 2019 New Revision: 1850688 URL: http://svn.apache.org/viewvc?rev=1850688=rev Log: "Applied fix from trunk framework for revision: 1850685" r1850685 | jleroux | 2019-01-07 21:37:10 +0100 (lun. 07 janv. 2019) | 8 lignes Fixed: Impossible secure and autologin cookie names when mountpoint contains a slash inside its name (OFBIZ-10766) My previous commit was wrong this one fixes it. I made a mistake trying to generalise changing UtilHttp::getApplicationName. This method is used in other places where the name should not be changed. Only cookies are concerned. Modified: ofbiz/branches/release16.11/ (props changed) ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java ofbiz/branches/release16.11/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java Propchange: ofbiz/branches/release16.11/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 7 20:42:02 2019 @@ -10,5 +10,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289, 1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528,1849540,1849567,1849693,1850015,1850023,1850530 +/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289, 1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850685
svn commit: r1850686 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java framework/webapp/src/main/java/org/apache/ofbiz/webapp/
Author: jleroux
Date: Mon Jan 7 20:38:26 2019
New Revision: 1850686
URL: http://svn.apache.org/viewvc?rev=1850686=rev
Log:
"Applied fix from trunk for revision: 1850685"
r1850685 | jleroux | 2019-01-07 21:37:10 +0100 (lun. 07 janv. 2019) | 8 lignes
Fixed: Impossible secure and autologin cookie names when mountpoint contains a
slash inside its name
(OFBIZ-10766)
My previous commit was wrong this one fixes it.
I made a mistake trying to generalise changing UtilHttp::getApplicationName.
This method is used in other places where the name should not be changed.
Only cookies are concerned.
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 7 20:38:26 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:1850015,1850023,1850530,1850647
+/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java?rev=1850686=1850685=1850686=diff
==
---
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
Mon Jan 7 20:38:26 2019
@@ -668,7 +668,7 @@ public final class UtilHttp {
if (request.getContextPath().length() > 1) {
appName = request.getContextPath().substring(1);
}
-return appName.replaceAll("/","_");
+return appName;
}
public static void setInitialRequestInfo(HttpServletRequest request) {
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1850686=1850685=1850686=diff
==
---
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Mon Jan 7 20:38:26 2019
@@ -928,7 +928,7 @@ public class LoginWorker {
Cookie autoLoginCookie = new
Cookie(getAutoLoginCookieName(request), userLogin.getString("userLoginId"));
autoLoginCookie.setMaxAge(60 * 60 * 24 * 365);
autoLoginCookie.setDomain(EntityUtilProperties.getPropertyValue("url",
"cookie.domain", delegator));
-autoLoginCookie.setPath("/" +
UtilHttp.getApplicationName(request));
+autoLoginCookie.setPath("/" +
UtilHttp.getApplicationName(request).replaceAll("/","_"));
autoLoginCookie.setSecure(true);
autoLoginCookie.setHttpOnly(true);
response.addCookie(autoLoginCookie);
@@ -948,7 +948,7 @@ public class LoginWorker {
Cookie securedLoginIdCookie = new
Cookie(getSecuredLoginIdCookieName(request),
userLogin.getString("userLoginId"));
securedLoginIdCookie.setMaxAge(-1);
securedLoginIdCookie.setDomain(EntityUtilProperties.getPropertyValue("url",
"cookie.domain", delegator));
-securedLoginIdCookie.setPath("/" +
UtilHttp.getApplicationName(request));
+securedLoginIdCookie.setPath("/" +
UtilHttp.getApplicationName(request).replaceAll("/","_"));
securedLoginIdCookie.setSecure(true);
securedLoginIdCookie.setHttpOnly(true);
response.addCookie(securedLoginIdCookie);
svn commit: r1850685 - in /ofbiz/ofbiz-framework/trunk/framework: base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Author: jleroux
Date: Mon Jan 7 20:37:10 2019
New Revision: 1850685
URL: http://svn.apache.org/viewvc?rev=1850685=rev
Log:
Fixed: Impossible secure and autologin cookie names when mountpoint contains a
slash inside its name
(OFBIZ-10766)
My previous commit was wrong this one fixes it.
I made a mistake trying to generalise changing UtilHttp::getApplicationName.
This method is used in other places where the name should not be changed.
Only cookies are concerned.
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java?rev=1850685=1850684=1850685=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
Mon Jan 7 20:37:10 2019
@@ -668,7 +668,7 @@ public final class UtilHttp {
if (request.getContextPath().length() > 1) {
appName = request.getContextPath().substring(1);
}
-return appName.replaceAll("/","_");
+return appName;
}
public static void setInitialRequestInfo(HttpServletRequest request) {
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1850685=1850684=1850685=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Mon Jan 7 20:37:10 2019
@@ -928,7 +928,7 @@ public class LoginWorker {
Cookie autoLoginCookie = new
Cookie(getAutoLoginCookieName(request), userLogin.getString("userLoginId"));
autoLoginCookie.setMaxAge(60 * 60 * 24 * 365);
autoLoginCookie.setDomain(EntityUtilProperties.getPropertyValue("url",
"cookie.domain", delegator));
-autoLoginCookie.setPath("/" +
UtilHttp.getApplicationName(request));
+autoLoginCookie.setPath("/" +
UtilHttp.getApplicationName(request).replaceAll("/","_"));
autoLoginCookie.setSecure(true);
autoLoginCookie.setHttpOnly(true);
response.addCookie(autoLoginCookie);
@@ -948,7 +948,7 @@ public class LoginWorker {
Cookie securedLoginIdCookie = new
Cookie(getSecuredLoginIdCookieName(request),
userLogin.getString("userLoginId"));
securedLoginIdCookie.setMaxAge(-1);
securedLoginIdCookie.setDomain(EntityUtilProperties.getPropertyValue("url",
"cookie.domain", delegator));
-securedLoginIdCookie.setPath("/" +
UtilHttp.getApplicationName(request));
+securedLoginIdCookie.setPath("/" +
UtilHttp.getApplicationName(request).replaceAll("/","_"));
securedLoginIdCookie.setSecure(true);
securedLoginIdCookie.setHttpOnly(true);
response.addCookie(securedLoginIdCookie);
svn commit: r1850687 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java framework/webapp/src/main/java/org/apache/ofbiz/webapp/
Author: jleroux
Date: Mon Jan 7 20:41:58 2019
New Revision: 1850687
URL: http://svn.apache.org/viewvc?rev=1850687=rev
Log:
"Applied fix from trunk for revision: 1850685"
r1850685 | jleroux | 2019-01-07 21:37:10 +0100 (lun. 07 janv. 2019) | 8 lignes
Fixed: Impossible secure and autologin cookie names when mountpoint contains a
slash inside its name
(OFBIZ-10766)
My previous commit was wrong this one fixes it.
I made a mistake trying to generalise changing UtilHttp::getApplicationName.
This method is used in other places where the name should not be changed.
Only cookies are concerned.
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 7 20:41:58 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,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647
+/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,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685
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=1850687=1850686=1850687=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
Mon Jan 7 20:41:58 2019
@@ -668,7 +668,7 @@ public final class UtilHttp {
if (request.getContextPath().length() > 1) {
appName = request.getContextPath().substring(1);
}
-return appName.replaceAll("/","_");
+return appName;
}
public static void setInitialRequestInfo(HttpServletRequest request) {
Modified:
svn commit: r1850694 - /ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Author: jleroux
Date: Mon Jan 7 21:58:01 2019
New Revision: 1850694
URL: http://svn.apache.org/viewvc?rev=1850694=rev
Log:
Fixed: Correct behaviour of Autologin cookies
(OFBIZ-10635)
Michael spotted that I used "default-server" in r1845558:
Quoting him:
It only works for webapps using "default-server". This name is configurable
in the ofbiz-component.xml and and should not be hard-coded in the code.
This fixes it
Thanks: Michael Brohl
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1850694=1850693=1850694=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Mon Jan 7 21:58:01 2019
@@ -922,7 +922,8 @@ public class LoginWorker {
Delegator delegator = (Delegator) request.getAttribute("delegator");
HttpSession session = request.getSession();
GenericValue userLogin = (GenericValue)
session.getAttribute("userLogin");
-WebappInfo webappInfo =
ComponentConfig.getWebappInfo("default-server",
UtilHttp.getApplicationName(request));
+ServletContext context = request.getServletContext();
+WebappInfo webappInfo = ComponentConfig.getWebappInfo((String)
context.getAttribute("_serverId"), UtilHttp.getApplicationName(request));
if (userLogin != null && webappInfo != null &&
webappInfo.isAutologinCookieUsed()) {
Cookie autoLoginCookie = new
Cookie(getAutoLoginCookieName(request), userLogin.getString("userLoginId"));
svn commit: r1850696 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Author: jleroux
Date: Mon Jan 7 21:59:34 2019
New Revision: 1850696
URL: http://svn.apache.org/viewvc?rev=1850696=rev
Log:
"Applied fix from trunk for revision: 1850694"
r1850694 | jleroux | 2019-01-07 22:58:01 +0100 (lun. 07 janv. 2019) | 13 lignes
Fixed: Correct behaviour of Autologin cookies
(OFBIZ-10635)
Michael spotted that I used "default-server" in r1845558:
Quoting him:
It only works for webapps using "default-server". This name is configurable
in the ofbiz-component.xml and and should not be hard-coded in the code.
This fixes it
Thanks: Michael Brohl
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 7 21:59:34 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,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685
+/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,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1850696=1850695=1850696=diff
==
---
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Mon Jan 7 21:59:34 2019
@@ -710,7 +710,8 @@ public class LoginWorker {
Delegator delegator = (Delegator) request.getAttribute("delegator");
HttpSession session = request.getSession();
GenericValue userLogin = (GenericValue)
session.getAttribute("userLogin");
-WebappInfo webappInfo =
ComponentConfig.getWebappInfo("default-server",
UtilHttp.getApplicationName(request));
+ServletContext context = request.getServletContext();
+WebappInfo webappInfo = ComponentConfig.getWebappInfo((String)
svn commit: r1850695 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Author: jleroux
Date: Mon Jan 7 21:59:32 2019
New Revision: 1850695
URL: http://svn.apache.org/viewvc?rev=1850695=rev
Log:
"Applied fix from trunk for revision: 1850694"
r1850694 | jleroux | 2019-01-07 22:58:01 +0100 (lun. 07 janv. 2019) | 13 lignes
Fixed: Correct behaviour of Autologin cookies
(OFBIZ-10635)
Michael spotted that I used "default-server" in r1845558:
Quoting him:
It only works for webapps using "default-server". This name is configurable
in the ofbiz-component.xml and and should not be hard-coded in the code.
This fixes it
Thanks: Michael Brohl
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 7 21:59:32 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:1850015,1850023,1850530,1850647,1850685
+/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java?rev=1850695=1850694=1850695=diff
==
---
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
Mon Jan 7 21:59:32 2019
@@ -922,7 +922,8 @@ public class LoginWorker {
Delegator delegator = (Delegator) request.getAttribute("delegator");
HttpSession session = request.getSession();
GenericValue userLogin = (GenericValue)
session.getAttribute("userLogin");
-WebappInfo webappInfo =
ComponentConfig.getWebappInfo("default-server",
UtilHttp.getApplicationName(request));
+ServletContext context = request.getServletContext();
+WebappInfo webappInfo = ComponentConfig.getWebappInfo((String)
context.getAttribute("_serverId"), UtilHttp.getApplicationName(request));
if (userLogin != null && webappInfo != null &&
webappInfo.isAutologinCookieUsed()) {
Cookie autoLoginCookie = new
Cookie(getAutoLoginCookieName(request), userLogin.getString("userLoginId"));
buildbot success in on ofbizBranch18Framework
The Buildbot has detected a restored build on builder ofbizBranch18Framework while building . Full details are available at: https://ci.apache.org/builders/ofbizBranch18Framework/builds/4 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onBranch18FrameworkCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/branches/release18.12] 1850686 Blamelist: jleroux Build succeeded! Sincerely, -The Buildbot
buildbot failure in on ofbizBranch18Framework
The Buildbot has detected a new failure on builder ofbizBranch18Framework while building . Full details are available at: https://ci.apache.org/builders/ofbizBranch18Framework/builds/5 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onBranch18FrameworkCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/branches/release18.12] 1850695 Blamelist: jleroux BUILD FAILED: failed shell_2 Sincerely, -The Buildbot
svn commit: r1850713 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ applications/commonext/webapp/ordermgr-js/ themes/common-theme/webapp/common/js/plugins/date/ themes/common-theme/webapp/comm
Author: adityasharma
Date: Tue Jan 8 05:16:48 2019
New Revision: 1850713
URL: http://svn.apache.org/viewvc?rev=1850713=rev
Log:
Applied fix from trunk for revision: 1850711
===
Improved: Replace jQuery.bind() with jQuery.on()
(OFBIZ-10758)
As of jQuery 3.0, .bind() has been deprecated. It was superseded by the .on()
method for attaching event handlers to a document.
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/plugins/date/FromThruDateCheck.js
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/util/OfbizUtil.js
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/util/fieldlookup.js
ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/webapp/flatgrey/js/application.js
ofbiz/ofbiz-framework/branches/release18.12/themes/rainbowstone/webapp/rainbowstone/js/application.js
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 8 05:16:48 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:1850015,1850023,1850530,1850647,1850685,1850694
+/ofbiz/ofbiz-framework/trunk:1850015,1850023,1850530,1850647,1850685,1850694,1850711
Modified:
ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js?rev=1850713=1850712=1850713=diff
==
---
ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
Tue Jan 8 05:16:48 2019
@@ -59,12 +59,12 @@ function callStateAutocompleter(data){
jQuery('#shipToStateProvinceGeoId').value = "_NA_";
jQuery("#shipStates").fadeOut("fast");
jQuery("#advice-required-shipToStateProvinceGeo").fadeOut("fast");
-jQuery("#shipToStateProvinceGeo").unbind("blur");
+jQuery("#shipToStateProvinceGeo").off("blur");
} else {
jQuery('#shipToStateProvinceGeo').value = "";
jQuery('#shipToStateProvinceGeoId').value = "";
jQuery("#shipStates").fadeIn("fast");
-jQuery("#shipToStateProvinceGeo").bind("blur", function() {
+jQuery("#shipToStateProvinceGeo").on("blur", function() {
if (jQuery('#shipToStateProvinceGeo').val() == "") {
jQuery("#advice-required-shipToStateProvinceGeo").fadeIn("fast");
}
@@ -105,11 +105,11 @@ function getAssociatedStateList(countryI
if (jQuery("#" + divId).is(':visible') || jQuery("#" +
errorId).is(':visible')) {
jQuery("#divId").fadeOut("fast");
jQuery("#errorId").fadeOut("fast");
-jQuery("#stateId").unbind("blur");
+jQuery("#stateId").off("blur");
}
} else {
jQuery("#divId").fadeIn("fast");
-jQuery("#stateId").bind("blur", function() {
+jQuery("#stateId").on("blur", function() {
if (jQuery("#" + stateId).val() == "") {
jQuery("#errorId").fadeIn("fast")
}
Modified:
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/plugins/date/FromThruDateCheck.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/plugins/date/FromThruDateCheck.js?rev=1850713=1850712=1850713=diff
==
---
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/plugins/date/FromThruDateCheck.js
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/common/js/plugins/date/FromThruDateCheck.js
Tue Jan 8 05:16:48 2019
@@ -21,8 +21,8 @@
//this code needs modifications yet its specific.
jQuery(document).ready( function() {
- jQuery("input[name*='fromDate']").bind('focusout', checkDate);
- jQuery("input[name*='thruDate']").bind('focusout', checkDate);
+ jQuery("input[name*='fromDate']").on('focusout', checkDate);
+ jQuery("input[name*='thruDate']").on('focusout', checkDate);
});
function checkDate() {
Modified:
buildbot success in on ofbizBranch18Framework
The Buildbot has detected a restored build on builder ofbizBranch18Framework while building . Full details are available at: https://ci.apache.org/builders/ofbizBranch18Framework/builds/6 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: lares_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onBranch18FrameworkCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/branches/release18.12] 1850713 Blamelist: adityasharma Build succeeded! Sincerely, -The Buildbot
svn commit: r1850711 - in /ofbiz/ofbiz-framework/trunk: applications/commonext/webapp/ordermgr-js/ themes/common-theme/webapp/common/js/plugins/date/ themes/common-theme/webapp/common/js/util/ themes/
Author: adityasharma
Date: Tue Jan 8 05:06:43 2019
New Revision: 1850711
URL: http://svn.apache.org/viewvc?rev=1850711=rev
Log:
Improved: Replace jQuery.bind() with jQuery.on()
(OFBIZ-10758)
As of jQuery 3.0, .bind() has been deprecated. It was superseded by the .on()
method for attaching event handlers to a document.
Modified:
ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/plugins/date/FromThruDateCheck.js
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/util/OfbizUtil.js
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/util/fieldlookup.js
ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/js/application.js
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/js/application.js
Modified:
ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js?rev=1850711=1850710=1850711=diff
==
---
ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
Tue Jan 8 05:06:43 2019
@@ -59,12 +59,12 @@ function callStateAutocompleter(data){
jQuery('#shipToStateProvinceGeoId').value = "_NA_";
jQuery("#shipStates").fadeOut("fast");
jQuery("#advice-required-shipToStateProvinceGeo").fadeOut("fast");
-jQuery("#shipToStateProvinceGeo").unbind("blur");
+jQuery("#shipToStateProvinceGeo").off("blur");
} else {
jQuery('#shipToStateProvinceGeo').value = "";
jQuery('#shipToStateProvinceGeoId').value = "";
jQuery("#shipStates").fadeIn("fast");
-jQuery("#shipToStateProvinceGeo").bind("blur", function() {
+jQuery("#shipToStateProvinceGeo").on("blur", function() {
if (jQuery('#shipToStateProvinceGeo').val() == "") {
jQuery("#advice-required-shipToStateProvinceGeo").fadeIn("fast");
}
@@ -105,11 +105,11 @@ function getAssociatedStateList(countryI
if (jQuery("#" + divId).is(':visible') || jQuery("#" +
errorId).is(':visible')) {
jQuery("#divId").fadeOut("fast");
jQuery("#errorId").fadeOut("fast");
-jQuery("#stateId").unbind("blur");
+jQuery("#stateId").off("blur");
}
} else {
jQuery("#divId").fadeIn("fast");
-jQuery("#stateId").bind("blur", function() {
+jQuery("#stateId").on("blur", function() {
if (jQuery("#" + stateId).val() == "") {
jQuery("#errorId").fadeIn("fast")
}
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/plugins/date/FromThruDateCheck.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/plugins/date/FromThruDateCheck.js?rev=1850711=1850710=1850711=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/plugins/date/FromThruDateCheck.js
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/plugins/date/FromThruDateCheck.js
Tue Jan 8 05:06:43 2019
@@ -21,8 +21,8 @@
//this code needs modifications yet its specific.
jQuery(document).ready( function() {
- jQuery("input[name*='fromDate']").bind('focusout', checkDate);
- jQuery("input[name*='thruDate']").bind('focusout', checkDate);
+ jQuery("input[name*='fromDate']").on('focusout', checkDate);
+ jQuery("input[name*='thruDate']").on('focusout', checkDate);
});
function checkDate() {
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/util/OfbizUtil.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/util/OfbizUtil.js?rev=1850711=1850710=1850711=diff
==
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/util/OfbizUtil.js
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/common/js/util/OfbizUtil.js
Tue Jan 8 05:06:43 2019
@@ -633,7 +633,7 @@ function ajaxAutoCompleter(areaCsvString
if (showDescription) {
var lookupDescriptionLoader = new
lookupDescriptionLoaded(areaArray[i], areaArray[i + 1], areaArray[i + 2],
formName);
lookupDescriptionLoader.update();
-jQuery("#" + areaArray[i]).bind('change lookup:changed',
function(){
+jQuery("#" + areaArray[i]).on('change lookup:changed',
svn commit: r1850714 - in /ofbiz/ofbiz-plugins/branches/release18.12: ecommerce/webapp/ecommerce/images/ pricat/template/pricat/ webpos/template/shortcuts/ webpos/webapp/webpos/images/js/
Author: adityasharma
Date: Tue Jan 8 05:25:10 2019
New Revision: 1850714
URL: http://svn.apache.org/viewvc?rev=1850714=rev
Log:
Applied fix from trunk for revision: 1850712
===
Improved: Replace jQuery.bind() with jQuery.on()
(OFBIZ-10758)
As of jQuery 3.0, .bind() has been deprecated. It was superseded by the .on()
method for attaching event handlers to a document.
Additional change:
Improved boolean returns with single statement, replacing if blocks with
explicit boolean return.
Modified:
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/checkoutProcess.js
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/profile.js
ofbiz/ofbiz-plugins/branches/release18.12/pricat/template/pricat/pricatreport.ftl
ofbiz/ofbiz-plugins/branches/release18.12/pricat/template/pricat/report.ftl
ofbiz/ofbiz-plugins/branches/release18.12/webpos/template/shortcuts/Shortcuts.ftl
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/CategoryDetail.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ChooseVariant.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/CloseTerminal.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/EditAddress.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/OpenTerminal.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PaidOutAndIn.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayCheck.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayCreditCard.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PayGiftCard.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/PromoCode.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchParties.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchPartiesResults.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchProducts.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/SearchProductsResults.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ShowCart.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/ShowCartItemSelected.js
ofbiz/ofbiz-plugins/branches/release18.12/webpos/webapp/webpos/images/js/VoidOrder.js
Modified:
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/checkoutProcess.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=1850714=1850713=1850714=diff
==
---
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/checkoutProcess.js
(original)
+++
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/checkoutProcess.js
Tue Jan 8 05:25:10 2019
@@ -441,7 +441,7 @@ function initCartProcessObservers() {
});
var links = jQuery("#cartForm a[id^='removeItemLink_']");
jQuery.each(links, function() {
-jQuery(this).bind('click', function(){
+jQuery(this).on('click', function(){
removeItem(this);
});
});
Modified:
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/profile.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/profile.js?rev=1850714=1850713=1850714=diff
==
---
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/profile.js
(original)
+++
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/webapp/ecommerce/images/profile.js
Tue Jan 8 05:25:10 2019
@@ -297,12 +297,12 @@ function copyShipToBillAddress() {
}
function stopObservingShipToBillAddress() {
-jQuery('#shipToAddress1').unbind('change');
-jQuery('shipToAddress2').unbind('change');
-jQuery('shipToCity').unbind('change');
-jQuery('shipToStateProvinceGeoId').unbind('change');
-jQuery('shipToCountryGeoId').unbind('change',
copyShipToCountryToBillToCountry);
-jQuery('shipToPostalCode').unbind('change');
+jQuery('#shipToAddress1').off('change');
+jQuery('shipToAddress2').off('change');
+jQuery('shipToCity').off('change');
+jQuery('shipToStateProvinceGeoId').off('change');
+jQuery('shipToCountryGeoId').off('change',
copyShipToCountryToBillToCountry);
+jQuery('shipToPostalCode').off('change');
}
function showState(id) {
Modified:
ofbiz/ofbiz-plugins/branches/release18.12/pricat/template/pricat/pricatreport.ftl
URL:
svn commit: r1850712 - in /ofbiz/ofbiz-plugins/trunk: ecommerce/webapp/ecommerce/images/ pricat/template/pricat/ webpos/template/shortcuts/ webpos/webapp/webpos/images/js/
Author: adityasharma
Date: Tue Jan 8 05:08:40 2019
New Revision: 1850712
URL: http://svn.apache.org/viewvc?rev=1850712=rev
Log:
Improved: Replace jQuery.bind() with jQuery.on()
(OFBIZ-10758)
As of jQuery 3.0, .bind() has been deprecated. It was superseded by the .on()
method for attaching event handlers to a document.
Additional change:
Improved boolean returns with single statement, replacing if blocks with
explicit boolean return.
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/checkoutProcess.js
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/profile.js
ofbiz/ofbiz-plugins/trunk/pricat/template/pricat/pricatreport.ftl
ofbiz/ofbiz-plugins/trunk/pricat/template/pricat/report.ftl
ofbiz/ofbiz-plugins/trunk/webpos/template/shortcuts/Shortcuts.ftl
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/CategoryDetail.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/ChooseVariant.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/CloseTerminal.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/EditAddress.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/OpenTerminal.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/PaidOutAndIn.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/PayCheck.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/PayCreditCard.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/PayGiftCard.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/PromoCode.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/SearchParties.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/SearchPartiesResults.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/SearchProducts.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/SearchProductsResults.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/ShowCart.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/ShowCartItemSelected.js
ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/images/js/VoidOrder.js
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/checkoutProcess.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=1850712=1850711=1850712=diff
==
---
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/checkoutProcess.js
(original)
+++
ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/checkoutProcess.js
Tue Jan 8 05:08:40 2019
@@ -441,7 +441,7 @@ function initCartProcessObservers() {
});
var links = jQuery("#cartForm a[id^='removeItemLink_']");
jQuery.each(links, function() {
-jQuery(this).bind('click', function(){
+jQuery(this).on('click', function(){
removeItem(this);
});
});
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/profile.js
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/profile.js?rev=1850712=1850711=1850712=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/profile.js
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/images/profile.js Tue
Jan 8 05:08:40 2019
@@ -297,12 +297,12 @@ function copyShipToBillAddress() {
}
function stopObservingShipToBillAddress() {
-jQuery('#shipToAddress1').unbind('change');
-jQuery('shipToAddress2').unbind('change');
-jQuery('shipToCity').unbind('change');
-jQuery('shipToStateProvinceGeoId').unbind('change');
-jQuery('shipToCountryGeoId').unbind('change',
copyShipToCountryToBillToCountry);
-jQuery('shipToPostalCode').unbind('change');
+jQuery('#shipToAddress1').off('change');
+jQuery('shipToAddress2').off('change');
+jQuery('shipToCity').off('change');
+jQuery('shipToStateProvinceGeoId').off('change');
+jQuery('shipToCountryGeoId').off('change',
copyShipToCountryToBillToCountry);
+jQuery('shipToPostalCode').off('change');
}
function showState(id) {
Modified: ofbiz/ofbiz-plugins/trunk/pricat/template/pricat/pricatreport.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/template/pricat/pricatreport.ftl?rev=1850712=1850711=1850712=diff
==
--- ofbiz/ofbiz-plugins/trunk/pricat/template/pricat/pricatreport.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/pricat/template/pricat/pricatreport.ftl Tue Jan
8 05:08:40 2019
@@ -383,11 +383,7 @@ function doScroll() {
}
function isContinueChecked() {
-if (document.main.continuereport && document.main.continuereport.checked
== true) {
-return true;
-} else {
-return false;
-}
+return
buildbot success in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a restored build on builder ofbizTrunkFrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/650 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: downstream Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1850711 Blamelist: adityasharma Build succeeded! Sincerely, -The Buildbot
