svn commit: r1865336 - /ofbiz/ofbiz-plugins/trunk/solr/build.gradle

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 07:01:55 2019
New Revision: 1865336

URL: http://svn.apache.org/viewvc?rev=1865336=rev
Log:
Improved: Update build.gradle to the latest dependencies
(OFBIZ-11151)
We can update Guava to v28: 
https://mvnrepository.com/artifact/org.apache.solr/solr-core/8.2.0.

Modified:
ofbiz/ofbiz-plugins/trunk/solr/build.gradle

Modified: ofbiz/ofbiz-plugins/trunk/solr/build.gradle
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/build.gradle?rev=1865336=1865335=1865336=diff
==
--- ofbiz/ofbiz-plugins/trunk/solr/build.gradle (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/build.gradle Sat Aug 17 07:01:55 2019
@@ -20,13 +20,13 @@ dependencies {
 // Remember to change the version number in SearchWorker class when 
upgrading.
 // Also Solr et Lucene should use the same version, luceneMatchVersion 
should be updated in solrconfig.xml
 pluginLibsCompile 'org.apache.solr:solr-core:8.2.0'
-pluginLibsCompile 'com.google.guava:guava:20.0'
+pluginLibsCompile 'com.google.guava:guava:28.0-jre'
 }
 
 configurations.all {
 resolutionStrategy {
   dependencySubstitution {
-  substitute module('com.google.guava:guava') with 
module('com.google.guava:guava:20.0')
+  substitute module('com.google.guava:guava') with 
module('com.google.guava:guava:28.0-jre')
   }
 }
 }




svn commit: r1865348 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/base/config/jndi.properties

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 11:34:59 2019
New Revision: 1865348

URL: http://svn.apache.org/viewvc?rev=1865348=rev
Log:
"Applied fix from trunk for revision: 1865347" 

r1865347 | jleroux | 2019-08-17 13:34:01 +0200 (sam. 17 août 2019) | 9 lignes

Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment property for Solr to load faster

Fixes previous commit where I hastily harcoded in jndi.properties file

Used a system property which can be used to define a JNDI environment 
property


Modified:
ofbiz/ofbiz-framework/branches/release18.12/   (props changed)

ofbiz/ofbiz-framework/branches/release18.12/framework/base/config/jndi.properties

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 11:34:59 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:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 
1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103,1865344
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 
1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103,1865344,1865347

Modified: 
ofbiz/ofbiz-framework/branches/release18.12/framework/base/config/jndi.properties
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/base/config/jndi.properties?rev=1865348=1865347=1865348=diff
==
--- 
ofbiz/ofbiz-framework/branches/release18.12/framework/base/config/jndi.properties
 (original)
+++ 
ofbiz/ofbiz-framework/branches/release18.12/framework/base/config/jndi.properties
 Sat Aug 17 11:34:59 2019
@@ -31,5 +31,3 @@ java.naming.provider.url=rmi://127.0.0.1
 # Security settings - not enabled
 #java.naming.security.principal=
 #java.naming.security.credentials=
-
-solr/home=C:\projectsASF\ofbiz\plugins\solr\home
\ No newline at end of file




svn commit: r1865349 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ framework/base/config/jndi.properties

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 11:35:01 2019
New Revision: 1865349

URL: http://svn.apache.org/viewvc?rev=1865349=rev
Log:
"Applied fix from trunk for revision: 1865347" 

r1865347 | jleroux | 2019-08-17 13:34:01 +0200 (sam. 17 août 2019) | 9 lignes

Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment property for Solr to load faster

Fixes previous commit where I hastily harcoded in jndi.properties file

Used a system property which can be used to define a JNDI environment 
property


Modified:
ofbiz/ofbiz-framework/branches/release17.12/   (props changed)

ofbiz/ofbiz-framework/branches/release17.12/framework/base/config/jndi.properties

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 11:35:01 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,1835871,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,1859807,1859871,1859877,1859882,1859915,1859931,1859968,1859972,1859981,1860082,1860141,1860274,1860357,1860526,1860592,18606
 
13,1860797,1861615,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1864716,1864721,1864881,1864891,1864930,1865344
+/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,1835871,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,
 

svn commit: r1865347 - in /ofbiz: ofbiz-framework/trunk/framework/base/config/jndi.properties ofbiz-plugins/trunk/solr/config/solrconfig.properties ofbiz-plugins/trunk/solr/src/main/java/org/apache/of

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 11:34:01 2019
New Revision: 1865347

URL: http://svn.apache.org/viewvc?rev=1865347=rev
Log:
Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment property for Solr to load faster

Fixes previous commit where I hastily harcoded in jndi.properties file

Used a system property which can be used to define a JNDI environment 
property

Modified:
ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties
ofbiz/ofbiz-plugins/trunk/solr/config/solrconfig.properties

ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java

Modified: ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties?rev=1865347=1865346=1865347=diff
==
--- ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties Sat Aug 
17 11:34:01 2019
@@ -31,5 +31,3 @@ java.naming.provider.url=rmi://127.0.0.1
 # Security settings - not enabled
 #java.naming.security.principal=
 #java.naming.security.credentials=
-
-solr/home=C:\projectsASF\ofbiz\plugins\solr\home
\ No newline at end of file

Modified: ofbiz/ofbiz-plugins/trunk/solr/config/solrconfig.properties
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/config/solrconfig.properties?rev=1865347=1865346=1865347=diff
==
--- ofbiz/ofbiz-plugins/trunk/solr/config/solrconfig.properties (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/config/solrconfig.properties Sat Aug 17 
11:34:01 2019
@@ -50,3 +50,6 @@ solr.client.trust.selfsigned.cert=true
 solr.log.dir=runtime/logs/solr
 # Defines Solr log level
 solr.log.level=INFO
+
+# Define the location of its home, speeds loading
+solr/home=/plugins/solr/home

Modified: 
ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java?rev=1865347=1865346=1865347=diff
==
--- 
ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
 (original)
+++ 
ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
 Sat Aug 17 11:34:01 2019
@@ -66,6 +66,7 @@ public class OFBizSolrContextFilter exte
 Properties props = System.getProperties();
 props.setProperty("solr.log.dir", 
UtilProperties.getPropertyValue("solrconfig", "solr.log.dir", 
"runtime/logs/solr"));
 props.setProperty("solr.log.level", 
UtilProperties.getPropertyValue("solrconfig", "solr.log.level", "INFO"));
+props.setProperty("solr/home", 
UtilProperties.getPropertyValue("solrconfig", "solr/home"));
 super.init(config);
 }
 




svn commit: r1865350 - in /ofbiz/ofbiz-plugins/branches/release18.12: ./ solr/config/solrconfig.properties solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 11:39:20 2019
New Revision: 1865350

URL: http://svn.apache.org/viewvc?rev=1865350=rev
Log:
"Applied fix from plugins for revision: 1865347" 

r1865347 | jleroux | 2019-08-17 13:34:01 +0200 (sam. 17 août 2019) | 9 lignes

Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment property for Solr to load faster

Fixes previous commit where I hastily harcoded in jndi.properties file

Used a system property which can be used to define a JNDI environment 
property


Modified:
ofbiz/ofbiz-plugins/branches/release18.12/   (props changed)
ofbiz/ofbiz-plugins/branches/release18.12/solr/config/solrconfig.properties

ofbiz/ofbiz-plugins/branches/release18.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java

Propchange: ofbiz/ofbiz-plugins/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 11:39:20 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900
 /ofbiz/branches/multitenant20100310/plugins:921280-927264
 /ofbiz/branches/release13.07/plugins:1547657
-/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917,1857120,1857173,1858141,1858244,1858265,1858285,1858289,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466
+/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917,1857120,1857173,1858141,1858244,1858265,1858285,1858289,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466,1865347

Modified: 
ofbiz/ofbiz-plugins/branches/release18.12/solr/config/solrconfig.properties
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/solr/config/solrconfig.properties?rev=1865350=1865349=1865350=diff
==
--- ofbiz/ofbiz-plugins/branches/release18.12/solr/config/solrconfig.properties 
(original)
+++ ofbiz/ofbiz-plugins/branches/release18.12/solr/config/solrconfig.properties 
Sat Aug 17 11:39:20 2019
@@ -50,3 +50,6 @@ solr.client.trust.selfsigned.cert=true
 solr.log.dir=runtime/logs/solr
 # Defines Solr log level
 solr.log.level=INFO
+
+# Define the location of its home, speeds loading
+solr/home=/plugins/solr/home

Modified: 
ofbiz/ofbiz-plugins/branches/release18.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java?rev=1865350=1865349=1865350=diff
==
--- 
ofbiz/ofbiz-plugins/branches/release18.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
 (original)
+++ 
ofbiz/ofbiz-plugins/branches/release18.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
 Sat Aug 17 11:39:20 2019
@@ -68,6 +68,7 @@ public class OFBizSolrContextFilter exte
 Properties props = System.getProperties();
 props.setProperty("solr.log.dir", 
UtilProperties.getPropertyValue("solrconfig", "solr.log.dir", 
"runtime/logs/solr"));
 props.setProperty("solr.log.level", 
UtilProperties.getPropertyValue("solrconfig", "solr.log.level", "INFO"));
+props.setProperty("solr/home", 
UtilProperties.getPropertyValue("solrconfig", "solr/home"));
 super.init(config);
 }
 




svn commit: r1865351 - in /ofbiz/ofbiz-plugins/branches/release17.12: ./ solr/config/solrconfig.properties solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 11:39:37 2019
New Revision: 1865351

URL: http://svn.apache.org/viewvc?rev=1865351=rev
Log:
"Applied fix from plugins for revision: 1865347" 

r1865347 | jleroux | 2019-08-17 13:34:01 +0200 (sam. 17 août 2019) | 9 lignes

Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment property for Solr to load faster

Fixes previous commit where I hastily harcoded in jndi.properties file

Used a system property which can be used to define a JNDI environment 
property


Modified:
ofbiz/ofbiz-plugins/branches/release17.12/   (props changed)
ofbiz/ofbiz-plugins/branches/release17.12/solr/config/solrconfig.properties

ofbiz/ofbiz-plugins/branches/release17.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java

Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 11:39:37 2019
@@ -11,4 +11,4 @@
 /ofbiz/branches/multitenant20100310/plugins:921280-927264
 /ofbiz/branches/release13.07/plugins:1547657
 /ofbiz/ofbiz-framework/trunk:1836107
-/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838797,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838797,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466,1865347

Modified: 
ofbiz/ofbiz-plugins/branches/release17.12/solr/config/solrconfig.properties
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/solr/config/solrconfig.properties?rev=1865351=1865350=1865351=diff
==
--- ofbiz/ofbiz-plugins/branches/release17.12/solr/config/solrconfig.properties 
(original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/solr/config/solrconfig.properties 
Sat Aug 17 11:39:37 2019
@@ -50,3 +50,6 @@ solr.client.trust.selfsigned.cert=true
 solr.log.dir=runtime/logs/solr
 # Defines Solr log level
 solr.log.level=INFO
+
+# Define the location of its home, speeds loading
+solr/home=/plugins/solr/home

Modified: 
ofbiz/ofbiz-plugins/branches/release17.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java?rev=1865351=1865350=1865351=diff
==
--- 
ofbiz/ofbiz-plugins/branches/release17.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
 (original)
+++ 
ofbiz/ofbiz-plugins/branches/release17.12/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
 Sat Aug 17 11:39:37 2019
@@ -68,6 +68,7 @@ public class OFBizSolrContextFilter exte
 Properties props = System.getProperties();
 props.setProperty("solr.log.dir", 
UtilProperties.getPropertyValue("solrconfig", "solr.log.dir", 
"runtime/logs/solr"));
 props.setProperty("solr.log.level", 
UtilProperties.getPropertyValue("solrconfig", "solr.log.level", "INFO"));
+props.setProperty("solr/home", 
UtilProperties.getPropertyValue("solrconfig", "solr/home"));
 super.init(config);
 }
 




svn commit: r1865344 - /ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 11:07:01 2019
New Revision: 1865344

URL: http://svn.apache.org/viewvc?rev=1865344=rev
Log:
Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment Property for Solr to load faster

Modified:
ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties

Modified: ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties?rev=1865344=1865343=1865344=diff
==
--- ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/config/jndi.properties Sat Aug 
17 11:07:01 2019
@@ -31,3 +31,5 @@ java.naming.provider.url=rmi://127.0.0.1
 # Security settings - not enabled
 #java.naming.security.principal=
 #java.naming.security.credentials=
+
+solr/home=C:\projectsASF\ofbiz\plugins\solr\home
\ No newline at end of file




svn commit: r1865345 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/base/config/jndi.properties

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 11:07:37 2019
New Revision: 1865345

URL: http://svn.apache.org/viewvc?rev=1865345=rev
Log:
"Applied fix from trunk for revision: 1865344" 

r1865344 | jleroux | 2019-08-17 13:07:01 +0200 (sam. 17 août 2019) | 4 lignes

Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment Property for Solr to load faster


Modified:
ofbiz/ofbiz-framework/branches/release18.12/   (props changed)

ofbiz/ofbiz-framework/branches/release18.12/framework/base/config/jndi.properties

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 11:07:37 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:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 
1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 
1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103,1865344

Modified: 
ofbiz/ofbiz-framework/branches/release18.12/framework/base/config/jndi.properties
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/base/config/jndi.properties?rev=1865345=1865344=1865345=diff
==
--- 
ofbiz/ofbiz-framework/branches/release18.12/framework/base/config/jndi.properties
 (original)
+++ 
ofbiz/ofbiz-framework/branches/release18.12/framework/base/config/jndi.properties
 Sat Aug 17 11:07:37 2019
@@ -31,3 +31,5 @@ java.naming.provider.url=rmi://127.0.0.1
 # Security settings - not enabled
 #java.naming.security.principal=
 #java.naming.security.credentials=
+
+solr/home=C:\projectsASF\ofbiz\plugins\solr\home
\ No newline at end of file




svn commit: r1865346 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ framework/base/config/jndi.properties

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 11:07:40 2019
New Revision: 1865346

URL: http://svn.apache.org/viewvc?rev=1865346=rev
Log:
"Applied fix from trunk for revision: 1865344" 

r1865344 | jleroux | 2019-08-17 13:07:01 +0200 (sam. 17 août 2019) | 4 lignes

Fixed: Issue loading solr component (JNDI timeout)
(OFBIZ-11156)

We need to provide a JNDI environment Property for Solr to load faster


Modified:
ofbiz/ofbiz-framework/branches/release17.12/   (props changed)

ofbiz/ofbiz-framework/branches/release17.12/framework/base/config/jndi.properties

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 11:07:40 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,1835871,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,1859807,1859871,1859877,1859882,1859915,1859931,1859968,1859972,1859981,1860082,1860141,1860274,1860357,1860526,1860592,18606
 
13,1860797,1861615,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1864716,1864721,1864881,1864891,1864930
+/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,1835871,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,
 

svn commit: r1865367 - in /ofbiz/ofbiz-framework/trunk/themes: bluelight/widget/Theme.xml flatgrey/widget/Theme.xml tomahawk/widget/Theme.xml

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 18:08:14 2019
New Revision: 1865367

URL: http://svn.apache.org/viewvc?rev=1865367=rev
Log:
Fixed:  of  in Theme.xml does not work
(OFBIZ-9867)

There is no str:label in UelFunctions class but util:label

Modified:
ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml
ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml
ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml

Modified: ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml?rev=1865367=1865366=1865367=diff
==
--- ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/bluelight/widget/Theme.xml Sat Aug 17 
18:08:14 2019
@@ -23,7 +23,7 @@ under the License.
xmlns="http://ofbiz.apache.org/Widget-Theme; 
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Theme 
http://ofbiz.apache.org/dtds/widget-theme.xsd;>
 
 
-${str:label('CommonEntityLabels', 
'VisualTheme.description.BLUELIGHT', locale)}
+${util:label('CommonEntityLabels', 
'VisualTheme.description.BLUELIGHT', locale)}
 
 
 

Modified: ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml?rev=1865367=1865366=1865367=diff
==
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml Sat Aug 17 
18:08:14 2019
@@ -23,7 +23,7 @@ under the License.
 xmlns="http://ofbiz.apache.org/Widget-Theme; 
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Theme 
http://ofbiz.apache.org/dtds/widget-theme.xsd;>
 
 
-${str:label('CommonEntityLabels', 
'VisualTheme.description.FLAT_GREY', locale)}
+${util:label('CommonEntityLabels', 
'VisualTheme.description.FLAT_GREY', locale)}
 
 
 

Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml?rev=1865367=1865366=1865367=diff
==
--- ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml Sat Aug 17 
18:08:14 2019
@@ -23,7 +23,7 @@ under the License.
xmlns="http://ofbiz.apache.org/Widget-Theme; 
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Theme 
http://ofbiz.apache.org/dtds/widget-theme.xsd;>
 
 
-${str:label('CommonEntityLabels', 
'VisualTheme.description.TOMAHAWK', locale)}
+${util:label('CommonEntityLabels', 
'VisualTheme.description.TOMAHAWK', locale)}
 
 
 




svn commit: r1865372 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ framework/common/config/CommonEntityLabels.xml themes/rainbowstone/widget/Theme.xml

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 18:29:09 2019
New Revision: 1865372

URL: http://svn.apache.org/viewvc?rev=1865372=rev
Log:
"Applied fix from trunk for revision: 1865370"  (labels fixed by hand)

r1865370 | jleroux | 2019-08-17 20:26:42 +0200 (sam. 17 août 2019) | 7 lignes

Improved: Use Labels in themes names
(OFBIZ-9863)

Adds labels and necessary calls in Theme.xml

While at it, improves other backend themes labels by removing redundancy, at
least in French and English.


Modified:
ofbiz/ofbiz-framework/branches/release17.12/   (props changed)

ofbiz/ofbiz-framework/branches/release17.12/framework/common/config/CommonEntityLabels.xml

ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/widget/Theme.xml

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 18:29:09 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,1835871,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,1859807,1859871,1859877,1859882,1859915,1859931,1859968,1859972,1859981,1860082,1860141,1860274,1860357,1860526,1860592,18606
 
13,1860797,1861615,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1864716,1864721,1864881,1864891,1864930,1865344,1865347,1865367
+/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,1835871,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,
 

buildbot failure in on ofbizBranch17FrameworkPlugins

2019-08-17 Thread buildbot
The Buildbot has detected a new failure on builder 
ofbizBranch17FrameworkPlugins while building . Full details are available at:
https://ci.apache.org/builders/ofbizBranch17FrameworkPlugins/builds/369

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: downstream
Build Source Stamp: [branch ofbiz/ofbiz-framework/branches/release17.12] 1865369
Blamelist: jleroux

BUILD FAILED: failed shell_5

Sincerely,
 -The Buildbot





svn commit: r1865369 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ themes/bluelight/widget/Theme.xml themes/flatgrey/widget/Theme.xml themes/tomahawk/widget/Theme.xml

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 18:08:56 2019
New Revision: 1865369

URL: http://svn.apache.org/viewvc?rev=1865369=rev
Log:
"Applied fix from trunk for revision: 1865367" 

r1865367 | jleroux | 2019-08-17 20:08:14 +0200 (sam. 17 août 2019) | 4 lignes

Fixed:  of  in Theme.xml does not work
(OFBIZ-9867)

There is no str:label in UelFunctions class but util:label


Modified:
ofbiz/ofbiz-framework/branches/release17.12/   (props changed)

ofbiz/ofbiz-framework/branches/release17.12/themes/bluelight/widget/Theme.xml
ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/widget/Theme.xml
ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/widget/Theme.xml

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 18:08:56 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,1835871,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,1859807,1859871,1859877,1859882,1859915,1859931,1859968,1859972,1859981,1860082,1860141,1860274,1860357,1860526,1860592,18606
 
13,1860797,1861615,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1864716,1864721,1864881,1864891,1864930,1865344,1865347
+/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,1835871,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,
 

svn commit: r1865368 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ themes/bluelight/widget/Theme.xml themes/flatgrey/widget/Theme.xml themes/tomahawk/widget/Theme.xml

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 18:08:53 2019
New Revision: 1865368

URL: http://svn.apache.org/viewvc?rev=1865368=rev
Log:
"Applied fix from trunk for revision: 1865367" 

r1865367 | jleroux | 2019-08-17 20:08:14 +0200 (sam. 17 août 2019) | 4 lignes

Fixed:  of  in Theme.xml does not work
(OFBIZ-9867)

There is no str:label in UelFunctions class but util:label


Modified:
ofbiz/ofbiz-framework/branches/release18.12/   (props changed)

ofbiz/ofbiz-framework/branches/release18.12/themes/bluelight/widget/Theme.xml
ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/widget/Theme.xml
ofbiz/ofbiz-framework/branches/release18.12/themes/tomahawk/widget/Theme.xml

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 18:08:53 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:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 
1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103,1865344,1865347
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 
1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103,1865344,1865347,1865367

Modified: 
ofbiz/ofbiz-framework/branches/release18.12/themes/bluelight/widget/Theme.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/bluelight/widget/Theme.xml?rev=1865368=1865367=1865368=diff
==
--- 
ofbiz/ofbiz-framework/branches/release18.12/themes/bluelight/widget/Theme.xml 
(original)
+++ 
ofbiz/ofbiz-framework/branches/release18.12/themes/bluelight/widget/Theme.xml 
Sat Aug 17 18:08:53 2019
@@ -23,7 +23,7 @@ under the License.
xmlns="http://ofbiz.apache.org/Widget-Theme; 
xsi:schemaLocation="http://ofbiz.apache.org/Widget-Theme 
http://ofbiz.apache.org/dtds/widget-theme.xsd;>
 
 
-${str:label('CommonEntityLabels', 
'VisualTheme.description.BLUELIGHT', locale)}
+${util:label('CommonEntityLabels', 
'VisualTheme.description.BLUELIGHT', locale)}
 
 
 

Modified: 
ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/widget/Theme.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/themes/flatgrey/widget/Theme.xml?rev=1865368=1865367=1865368=diff

svn commit: r1865370 - in /ofbiz/ofbiz-framework/trunk: framework/common/config/CommonEntityLabels.xml themes/rainbowstone/widget/Theme.xml

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 18:26:42 2019
New Revision: 1865370

URL: http://svn.apache.org/viewvc?rev=1865370=rev
Log:
Improved: Use Labels in themes names
(OFBIZ-9863)

Adds labels and necessary calls in Theme.xml

While at it, improves other backend themes labels by removing redundancy, at 
least in French and English.

Modified:
ofbiz/ofbiz-framework/trunk/framework/common/config/CommonEntityLabels.xml
ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml

Modified: 
ofbiz/ofbiz-framework/trunk/framework/common/config/CommonEntityLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/config/CommonEntityLabels.xml?rev=1865370=1865369=1865370=diff
==
--- ofbiz/ofbiz-framework/trunk/framework/common/config/CommonEntityLabels.xml 
(original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/config/CommonEntityLabels.xml 
Sat Aug 17 18:26:42 2019
@@ -21886,9 +21886,9 @@
 
 
 BlueLight Theme: navigační řádek, menu a 
zakulacené rohy
-BlueLight Theme: breadcrumbs, drop-down menus and 
rounded corners
+: breadcrumbs, drop-down menus and rounded 
corners
 BlueLight: Migas de pan, menús desplegables y 
las esquinas redondeadas
-BlueLight Theme: fil d'ariane, menus déroulants 
et coins arrondis
+ : fil d'ariane, menus déroulants et coins 
arrondis
 ブルーライト: 
パンくずリスト、ドロップダウンメニュー、そして丸いコーナー
 Bluelight Tema: breadcrumbs, menus drop-down e 
cantos arredondados
 Светло-голубая тема: 
Бреадкрамбсы, раскрывающиеся меню с 
закругленным углами
@@ -21898,9 +21898,9 @@
 
 
 Flat Grey - Plovoucí rozložení, podpora 
obousměrného textu
-Flat Grey - Floating Layout, Sight-Impaired 
Accessible, Bidirectional
+ - Floating Layout, Sight-Impaired Accessible, 
Bidirectional
 Flat Grey - Diseño flotante, accesible para 
personas con discapacidad visual, bidireccional
-Flat Grey : mise en page dynamique, 
accessibilité, support de texte bidirectionnel
+ : mise en page dynamique, accessibilité, 
support de texte bidirectionnel
 フラットグレー: 
以前のOFBiz標準フローティングレイアウト
 Apartamento Grey - Layout padrão antigo OFBiz 
flutuante
 Плоские серые - Плавающие 
лейауты, Слабовидящий доступ, 
Двунаправленный
@@ -21921,10 +21921,10 @@
 電子商務的替代視覺風格
 
 
-Tomahawk: evoluční verze BlueLight
+: evoluční verze BlueLight
 Tomahawk: the evolution of the BlueLight 
theme
 Tomahawk: la evolución del tema BlueLight
-Tomahawk: évolution de BlueLight dans les tons 
noir et orange
+ : évolution de BlueLight dans les tons noir et 
orange
 トマホーク: パンくずの改良
 Tomahawk: a evolução do tema Migalhas 
Descartando
 Томахавк: эволюция 
падающих крамбов темы
@@ -21932,4 +21932,24 @@
 印第安战斧:下拉多级风æ 
¼çš„演化版
 印第安戰斧:下拉多級風æ 
¼çš„演化版
 
-
\ No newline at end of file
+
+: Rainbowstone theme in blue
+ : le thème Rainbowstone en bleu
+
+
+: Rainbowstone theme in orange
+ : le thème Rainbowstone en orange
+
+
+: Rainbowstone theme in red
+ : le thème Rainbowstone en rouge
+
+
+: Rainbowstone theme in green
+ : le thème Rainbowstone en vert
+
+
+: Rainbowstone theme in blue
+ : le thème Rainbowstone en bleu
+
+

Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml?rev=1865370=1865369=1865370=diff
==
--- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml Sat Aug 17 
18:26:42 2019
@@ -35,6 +35,25 @@ under the License.
 
 
 
+
+
+${util:label('CommonEntityLabels', 
'VisualTheme.description.RAINBOWSTONE_SAPHIR', locale)}
+
+
+
+${util:label('CommonEntityLabels', 
'VisualTheme.description.RAINBOWSTONE_AMBER', locale)}
+
+
+
+${util:label('CommonEntityLabels', 
'VisualTheme.description.RAINBOWSTONE_RUBY', locale)}
+
+
+
+${util:label('CommonEntityLabels', 
'VisualTheme.description.RAINBOWSTONE_EMERALD', locale)}
+
+  

svn commit: r1865371 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/common/config/CommonEntityLabels.xml themes/rainbowstone/widget/Theme.xml

2019-08-17 Thread jleroux
Author: jleroux
Date: Sat Aug 17 18:27:19 2019
New Revision: 1865371

URL: http://svn.apache.org/viewvc?rev=1865371=rev
Log:
"Applied fix from trunk for revision: 1865370" 

r1865370 | jleroux | 2019-08-17 20:26:42 +0200 (sam. 17 août 2019) | 7 lignes

Improved: Use Labels in themes names
(OFBIZ-9863)

Adds labels and necessary calls in Theme.xml

While at it, improves other backend themes labels by removing redundancy, at 
least in French and English.


Modified:
ofbiz/ofbiz-framework/branches/release18.12/   (props changed)

ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml

ofbiz/ofbiz-framework/branches/release18.12/themes/rainbowstone/widget/Theme.xml

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 17 18:27:19 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:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 
1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103,1865344,1865347,1865367
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915,1859931,1859968,1859972,1859981,1860082,1860141,
 
1860274,1860357,1860526,1860592,1860597,1860613,1860797,1861615,1861811,1861815,1861828,1861834,1861837,1861849,1861859,1861869,1862045-1862046,1862207,1862271,1862278,1862466,1862648,1863560,1863838,1863965,1864216,1864716,1864721,1864881,1864891,1864930,1865103,1865344,1865347,1865367,1865370

Modified: 
ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml?rev=1865371=1865370=1865371=diff
==
--- 
ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml
 (original)
+++ 
ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/CommonEntityLabels.xml
 Sat Aug 17 18:27:19 2019
@@ -21886,9 +21886,9 @@
 
 
 BlueLight Theme: navigační řádek, menu a 
zakulacené rohy
-BlueLight Theme: breadcrumbs, drop-down menus and 
rounded corners
+: breadcrumbs, drop-down menus and rounded 
corners
 BlueLight: Migas de pan, menús desplegables y 
las esquinas redondeadas
-BlueLight Theme: fil d'ariane, menus déroulants 
et coins arrondis
+ : fil d'ariane, menus déroulants et coins 
arrondis
 ブルーライト: 
パンくずリスト、ドロップダウンメニュー、そして丸いコーナー
 

buildbot success in on ofbizBranch17FrameworkPlugins

2019-08-17 Thread buildbot
The Buildbot has detected a restored build on builder 
ofbizBranch17FrameworkPlugins while building . Full details are available at:
https://ci.apache.org/builders/ofbizBranch17FrameworkPlugins/builds/370

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf947_ubuntu

Build Reason: downstream
Build Source Stamp: [branch ofbiz/ofbiz-framework/branches/release17.12] 1865372
Blamelist: jleroux

Build succeeded!

Sincerely,
 -The Buildbot





buildbot success in on ofbizBranch18FrameworkPlugins

2019-08-17 Thread buildbot
The Buildbot has detected a restored build on builder 
ofbizBranch18FrameworkPlugins while building . Full details are available at:
https://ci.apache.org/builders/ofbizBranch18FrameworkPlugins/builds/188

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: downstream
Build Source Stamp: [branch ofbiz/ofbiz-framework/branches/release18.12] 1865371
Blamelist: jleroux

Build succeeded!

Sincerely,
 -The Buildbot