[ofbiz-tools] branch master updated: 10 mins is too short for testing, 20 mins is OK Updates fop.xconf.patch and solr.config.patch in next

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git


The following commit(s) were added to refs/heads/master by this push:
     new 23eefb8  10 mins is too short for testing, 20 mins is OK Updates 
fop.xconf.patch and solr.config.patch in next
23eefb8 is described below

commit 23eefb8f475ba8c125013282f6450bf1d4311d94
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Fri Mar 25 17:37:34 2022 +0100

    10 mins is too short for testing, 20 mins is OK
    Updates fop.xconf.patch and solr.config.patch in next
---
 demo-backup/check-svn-update.sh          |  2 +-
 demo-backup/patch/next/fop.xconf.patch   | 14 ++++++------
 demo-backup/patch/next/solr.config.patch | 37 ++++++++++++++++++++++++++------
 3 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/demo-backup/check-svn-update.sh b/demo-backup/check-svn-update.sh
index 03f01ec..6078865 100755
--- a/demo-backup/check-svn-update.sh
+++ b/demo-backup/check-svn-update.sh
@@ -4,7 +4,7 @@
 # for ofbizDemo user
 # sudo crontab -e
 # 0 3 * * * nice -n 19 ionice -c2 -n7 /home/ofbizDemo/check-svn-update.sh > 
/home/ofbizDemo/cronlog-svn-update.log 2>&1
-# to test:  */10 * * * *
+# to test:  */20 * * * *
 
 cd /home/ofbizDemo/
 
diff --git a/demo-backup/patch/next/fop.xconf.patch 
b/demo-backup/patch/next/fop.xconf.patch
index ab41ec2..2e1b90e 100644
--- a/demo-backup/patch/next/fop.xconf.patch
+++ b/demo-backup/patch/next/fop.xconf.patch
@@ -1,13 +1,11 @@
-Index: framework/webapp/config/fop.xconf
-===================================================================
---- framework/webapp/config/fop.xconf   (revision 1785051)
-+++ framework/webapp/config/fop.xconf   (working copy)
-@@ -31,7 +31,7 @@
- <fop version="1.0">
-
+--- framework/webapp/config/fop.xconf
++++ framework/webapp/config/fop.xconf
+@@ -32,7 +32,7 @@ the location of this file.
+ 
    <!-- Base URL for resolving relative URLs -->
+   <!-- We have to keep HTTP URL , FOP does not support HTTPS baseUrl for 
external graphics due to certificate issue (not remember exact reason) -->
 -  <base>http://localhost:8080</base>
 +  <base>https://demo-next.ofbiz.apache.org</base>
-
+ 
    <!-- Source resolution in dpi (dots/pixels per inch) for determining the 
size of pixels in SVG and bitmap images, default: 72dpi -->
    <source-resolution>72</source-resolution>
diff --git a/demo-backup/patch/next/solr.config.patch 
b/demo-backup/patch/next/solr.config.patch
index aa00494..1b4dd67 100644
--- a/demo-backup/patch/next/solr.config.patch
+++ b/demo-backup/patch/next/solr.config.patch
@@ -17,14 +17,39 @@ diff --git 
solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java solr/src/main/
 index 3e05b70..50c8bad 100644
 --- solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
 +++ solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
-@@ -76,6 +76,10 @@ public final class SolrUtil {
-     private static final boolean trustSelfSignedCert = 
getTrustSelfSignedCert();
-     
+@@ -32,11 +32,6 @@ import org.apache.http.client.methods.HttpGet;
+ import org.apache.http.client.protocol.HttpClientContext;
+ import org.apache.http.impl.client.CloseableHttpClient;
+ import org.apache.http.impl.client.HttpClients;
+-import org.apache.solr.client.solrj.SolrQuery;
+-import org.apache.solr.client.solrj.SolrRequest.METHOD;
+-import org.apache.solr.client.solrj.impl.HttpSolrClient;
+-import org.apache.solr.client.solrj.response.QueryResponse;
+-import org.apache.solr.common.SolrInputDocument;
+ import org.apache.ofbiz.base.component.ComponentConfig;
+ import org.apache.ofbiz.base.component.ComponentConfig.WebappInfo;
+ import org.apache.ofbiz.base.component.ComponentException;
+@@ -46,6 +41,11 @@ import org.apache.ofbiz.base.util.UtilHttp;
+ import org.apache.ofbiz.base.util.UtilProperties;
+ import org.apache.ofbiz.base.util.UtilValidate;
+ import org.apache.ofbiz.entity.GenericEntityException;
++import org.apache.solr.client.solrj.SolrQuery;
++import org.apache.solr.client.solrj.SolrRequest.METHOD;
++import org.apache.solr.client.solrj.impl.HttpSolrClient;
++import org.apache.solr.client.solrj.response.QueryResponse;
++import org.apache.solr.common.SolrInputDocument;
+ 
+ /**
+  * Solr utility class.
+@@ -78,6 +78,11 @@ public final class SolrUtil {
+     private static final boolean TRUST_SELF_SIGNED_CERT = 
getTrustSelfSignedCert();
+ 
      public static String makeSolrWebappUrl() {
 +        final String solrCompleteUrl = 
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.complete.url");
 +        if (UtilValidate.isNotEmpty(solrCompleteUrl)) {
 +            return solrCompleteUrl;
 +        }
-         final String solrWebappProtocol = 
UtilProperties.getPropertyValue(solrConfigName, "solr.webapp.protocol");
-         final String solrWebappDomainName = 
UtilProperties.getPropertyValue(solrConfigName, "solr.webapp.domainName");
-         final String solrWebappPath = 
UtilProperties.getPropertyValue(solrConfigName, "solr.webapp.path");
++
+         final String solrWebappProtocol = 
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.webapp.protocol");
+         final String solrWebappDomainName = 
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.webapp.domainName");
+         final String solrWebappPath = 
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.webapp.path");