[ofbiz-tools] branch master updated: Updates trunk patch after OFBIZ-11926 changes

[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 389f1d6  Updates trunk patch after OFBIZ-11926 changes
389f1d6 is described below

commit 389f1d6749323c15e5550fd1bc7907f3b24d0aaf
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sun Aug 1 11:40:28 2021 +0200

    Updates trunk patch after OFBIZ-11926 changes
---
 demo-backup/patch/trunk/solr.config.patch | 38 +++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/demo-backup/patch/trunk/solr.config.patch 
b/demo-backup/patch/trunk/solr.config.patch
index 6606809..d145aae 100644
--- a/demo-backup/patch/trunk/solr.config.patch
+++ b/demo-backup/patch/trunk/solr.config.patch
@@ -14,17 +14,41 @@ index b87a305..b87142b 100644
  # Set to true to enable solr indexing using ECAs/SECAs.
  # If set to false, solr services meant to be triggered by ECA/SECA will not 
execute and will "succeed" silently.
 diff --git solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java 
solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
-index 3e05b70..50c8bad 100644
+index 4c0d2345..b216a6d1 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,10 @@ public final class SolrUtil {
+     private static final boolean TRUST_SELF_SIGNED_CERT = 
getTrustSelfSignedCert();
+ 
      public static String makeSolrWebappUrl() {
 +        final String solrCompleteUrl = 
UtilProperties.getPropertyValue(solrConfigName, "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");