svn commit: r1910246 [4/5] - in /manifoldcf/trunk: ./ connectors/solr/ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ connectors/solr/connector/src/main/native2ascii
Modified:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1910246=1910245=1910246=diff
==
---
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
(original)
+++
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
Tue Jun 6 01:35:45 2023
@@ -21,20 +21,21 @@ package org.apache.manifoldcf.agents.out
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import java.util.HashSet;
import org.apache.manifoldcf.agents.interfaces.IOutputAddActivity;
+import org.apache.manifoldcf.agents.interfaces.IOutputCheckActivity;
import org.apache.manifoldcf.agents.interfaces.IOutputNotifyActivity;
import org.apache.manifoldcf.agents.interfaces.IOutputRemoveActivity;
-import org.apache.manifoldcf.agents.interfaces.IOutputCheckActivity;
import org.apache.manifoldcf.agents.interfaces.RepositoryDocument;
import org.apache.manifoldcf.agents.interfaces.ServiceInterruption;
-import org.apache.manifoldcf.core.interfaces.Specification;
+import org.apache.manifoldcf.connectorcommon.interfaces.IKeystoreManager;
+import org.apache.manifoldcf.connectorcommon.interfaces.KeystoreManagerFactory;
import org.apache.manifoldcf.core.interfaces.ConfigNode;
import org.apache.manifoldcf.core.interfaces.ConfigParams;
import org.apache.manifoldcf.core.interfaces.ConfigurationNode;
@@ -43,16 +44,13 @@ import org.apache.manifoldcf.core.interf
import org.apache.manifoldcf.core.interfaces.IPostParameters;
import org.apache.manifoldcf.core.interfaces.IThreadContext;
import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
-import org.apache.manifoldcf.core.interfaces.SpecificationNode;
+import org.apache.manifoldcf.core.interfaces.Specification;
import org.apache.manifoldcf.core.interfaces.VersionContext;
-import org.apache.manifoldcf.connectorcommon.interfaces.KeystoreManagerFactory;
-import org.apache.manifoldcf.connectorcommon.interfaces.IKeystoreManager;
-
-/** This is the output connector for SOLR. Currently, no frills.
-*/
-public class SolrConnector extends
org.apache.manifoldcf.agents.output.BaseOutputConnector
-{
+/**
+ * This is the output connector for SOLR. Currently, no frills.
+ */
+public class SolrConnector extends
org.apache.manifoldcf.agents.output.BaseOutputConnector {
public static final String _rcsid = "@(#)$Id: SolrConnector.java 998081
2010-09-17 11:33:15Z kwright $";
// Activities we log
@@ -64,10 +62,10 @@ public class SolrConnector extends org.a
/** Local connection */
protected HttpPoster poster = null;
-
+
/** Expiration */
protected long expirationTime = -1L;
-
+
/** The allow attribute name */
protected String allowAttributeName = "allow_token_";
/** The deny attribute name */
@@ -82,7 +80,7 @@ public class SolrConnector extends org.a
protected String excludedMimeTypesString = null;
/** Excluded mime types */
protected Set excludedMimeTypes = null;
-
+
// Attributes going into Solr
protected String idAttributeName = null;
protected String originalSizeAttributeName = null;
@@ -94,7 +92,7 @@ public class SolrConnector extends org.a
protected String contentAttributeName = null;
/** Use extractiing update handler? */
protected boolean useExtractUpdateHandler = true;
- /** Allow compression? Currently static */
+ /** Allow compression? Currently static */
protected final static boolean allowCompression = true;
/** Whether or not to commit */
@@ -102,52 +100,48 @@ public class SolrConnector extends org.a
/** Collection name (non-empty only if SolrCloud) */
protected String collectionName = null;
-
+
/** Idle connection expiration interval */
protected final static long EXPIRATION_INTERVAL = 30L;
- static
- {
-System.setProperty("jdk.xml.maxGeneralEntitySizeLimit",new
Integer(Integer.MAX_VALUE).toString());
- }
-
- /** Constructor.
- */
- public SolrConnector()
- {
+ static {
+System.setProperty("jdk.xml.maxGeneralEntitySizeLimit", new
Integer(Integer.MAX_VALUE).toString());
+ }
+
+ /**
+ * Constructor.
+ */
+ public SolrConnector() {
}
- /** Return the list of activities that this connector supports (i.e. writes
into the log).
- *@return the list.
- */
+ /**
+ * Return the list of activities that this connector supports (i.e. writes
into the log).
+ *
+ * @return the list.
+ */
@Override
- public String[] getActivitiesList()
- {
-return new
svn commit: r1910246 [2/5] - in /manifoldcf/trunk: ./ connectors/solr/ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ connectors/solr/connector/src/main/native2ascii
Modified: manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1910246=1910245=1910246=diff == --- manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java (original) +++ manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java Tue Jun 6 01:35:45 2023 @@ -18,66 +18,61 @@ */ package org.apache.manifoldcf.agents.output.solr; -import org.apache.http.client.CredentialsProvider; -import org.apache.http.client.HttpClient; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.config.SocketConfig; -import org.apache.http.config.RegistryBuilder; -import org.apache.http.conn.socket.ConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.conn.socket.PlainConnectionSocketFactory; -import org.apache.http.conn.ssl.NoopHostnameVerifier; -import org.apache.http.impl.client.*; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.http.protocol.HttpRequestExecutor; -import org.apache.manifoldcf.core.interfaces.*; -import org.apache.manifoldcf.connectorcommon.interfaces.*; -import org.apache.manifoldcf.core.common.DateParser; -import org.apache.manifoldcf.agents.interfaces.*; -import org.apache.manifoldcf.agents.system.*; - -import java.io.*; -import java.net.MalformedURLException; -import java.util.*; -import java.util.regex.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.InterruptedIOException; +import java.io.Reader; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; +import org.apache.commons.lang.StringUtils; import org.apache.http.Consts; -import org.apache.http.auth.AuthScope; -import org.apache.http.auth.Credentials; -import org.apache.http.auth.UsernamePasswordCredentials; - +import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; +import org.apache.manifoldcf.agents.interfaces.IOutputAddActivity; +import org.apache.manifoldcf.agents.interfaces.IOutputRemoveActivity; +import org.apache.manifoldcf.agents.interfaces.RepositoryDocument; +import org.apache.manifoldcf.agents.interfaces.ServiceInterruption; +import org.apache.manifoldcf.agents.output.solr.ModifiedHttp2SolrClient.Builder; +import org.apache.manifoldcf.agents.system.Logging; +import org.apache.manifoldcf.connectorcommon.interfaces.IKeystoreManager; +import org.apache.manifoldcf.core.common.DateParser; +import org.apache.manifoldcf.core.interfaces.ManifoldCFException; import org.apache.solr.client.solrj.SolrClient; +import org.apache.solr.client.solrj.SolrRequest; +import org.apache.solr.client.solrj.SolrResponse; import org.apache.solr.client.solrj.SolrServerException; -import org.apache.solr.client.solrj.impl.CloudSolrClient; -import org.apache.solr.client.solrj.impl.HttpSolrClient; +import org.apache.solr.client.solrj.impl.HttpClientUtil; +import org.apache.solr.client.solrj.impl.Krb5HttpClientBuilder; +import org.apache.solr.client.solrj.impl.SolrHttpClientBuilder; import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest; import org.apache.solr.client.solrj.request.UpdateRequest; -import org.apache.solr.client.solrj.impl.XMLResponseParser; -import org.apache.solr.common.util.ContentStreamBase; -import org.apache.solr.client.solrj.SolrResponse; import org.apache.solr.client.solrj.response.SolrPingResponse; import org.apache.solr.client.solrj.response.UpdateResponse; -import org.apache.solr.client.solrj.SolrRequest; +import org.apache.solr.common.SolrException; +import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.util.ContentStream; -import org.apache.solr.common.SolrException; -import org.apache.solr.client.solrj.impl.HttpClientUtil; -import org.apache.solr.common.SolrInputDocument; - -import org.apache.commons.lang.StringUtils; - -import org.apache.solr.client.solrj.impl.HttpClientUtil; -import org.apache.solr.client.solrj.impl.Krb5HttpClientBuilder; -import org.apache.solr.client.solrj.impl.SolrHttpClientBuilder; +import org.apache.solr.common.util.ContentStreamBase; /** -* Posts an input stream to SOLR -* -* @author James Sablatura, modified by Karl Wright -*/ -public class
svn commit: r1910246 [1/5] - in /manifoldcf/trunk: ./ connectors/solr/ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ connectors/solr/connector/src/main/native2ascii
Author: kwright Date: Tue Jun 6 01:35:45 2023 New Revision: 1910246 URL: http://svn.apache.org/viewvc?rev=1910246=rev Log: Merge CONNECTORS-1740 branch. Added: manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedCloudHttp2SolrClient.java - copied unchanged from r1910244, manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedCloudHttp2SolrClient.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedCloudSolrClient.java - copied unchanged from r1910244, manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedCloudSolrClient.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2ClusterStateProvider.java - copied unchanged from r1910244, manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2ClusterStateProvider.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2SolrClient.java - copied, changed from r1910244, manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2SolrClient.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpClientBuilderFactory.java - copied unchanged from r1910244, manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpClientBuilderFactory.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedKrb5HttpClientBuilder.java - copied unchanged from r1910244, manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedKrb5HttpClientBuilder.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBHttp2SolrClient.java - copied unchanged from r1910244, manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBHttp2SolrClient.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBSolrClient.java - copied unchanged from r1910244, manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBSolrClient.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedPreemptiveBasicAuthClientBuilderFactory.java - copied unchanged from r1910244, manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedPreemptiveBasicAuthClientBuilderFactory.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedUpdateRequest.java - copied unchanged from r1910244, manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedUpdateRequest.java Removed: manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpMultipart.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedLBHttpSolrClient.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedMultipartEntity.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/PreemptiveBasicAuthInterceptor.java manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/PreemptiveBasicAuthInterceptorTest.java Modified: manifoldcf/trunk/ (props changed) manifoldcf/trunk/build.xml manifoldcf/trunk/connectors/solr/build.xml manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConfig.java manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
svn commit: r1910246 [5/5] - in /manifoldcf/trunk: ./ connectors/solr/ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ connectors/solr/connector/src/main/native2ascii
Modified: manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties?rev=1910246=1910245=1910246=diff == --- manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties (original) +++ manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties Tue Jun 6 01:35:45 2023 @@ -38,8 +38,8 @@ SolrConnector.CoreName=Core/Collection n SolrConnector.CollectionName=Collection name: SolrConnector.ConnectionTimeout=Connection timeout (seconds): SolrConnector.SocketTimeout=Socket timeout (seconds): -SolrConnector.ZookeeperClientTimeout=ZooKeeper client timeout (seconds): -SolrConnector.ZookeeperConnectTimeout=ZooKeeper connect timeout (seconds): +SolrConnector.ZookeeperSocketTimeout=Socket timeout (seconds): +SolrConnector.ZookeeperConnectionTimeout=Connection timeout (seconds): SolrConnector.UpdateHandler=Update handler: SolrConnector.RemoveHandler=Remove handler: SolrConnector.StatusHandler=Status handler: Modified: manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_es_ES.properties URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_es_ES.properties?rev=1910246=1910245=1910246=diff == --- manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_es_ES.properties (original) +++ manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_es_ES.properties Tue Jun 6 01:35:45 2023 @@ -38,8 +38,8 @@ SolrConnector.CoreName=Core/nombre de Co SolrConnector.CollectionName=nombre de la colección: SolrConnector.ConnectionTimeout=El tiempo de conexión expiro (segundos): SolrConnector.SocketTimeout=Socket timeout (segundos): -SolrConnector.ZookeeperClientTimeout=Tiempo de espera del cliente ZooKeeper (segundos): -SolrConnector.ZookeeperConnectTimeout=ZooKeeper tiempo de espera de conexión (segundos): +SolrConnector.ZookeeperSocketTimeout=Socket timeout (segundos): +SolrConnector.ZookeeperConnectionTimeout=El tiempo de conexión expiro (segundos): SolrConnector.UpdateHandler=actualización de controlador: SolrConnector.RemoveHandler=Retire manejador: SolrConnector.StatusHandler=manejador de Estado: Modified: manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_fr_FR.properties URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_fr_FR.properties?rev=1910246=1910245=1910246=diff == --- manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_fr_FR.properties (original) +++ manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_fr_FR.properties Tue Jun 6 01:35:45 2023 @@ -37,8 +37,8 @@ SolrConnector.CoreName=Nom de Core/Colle SolrConnector.CollectionName=Nom de Collection: SolrConnector.ConnectionTimeout=Timeout de la connexion (secondes): SolrConnector.SocketTimeout=Timoute de la Socket (secondes): -SolrConnector.ZookeeperClientTimeout=Timeout du client ZooKeeper (secondes): -SolrConnector.ZookeeperConnectTimeout=Timetout du ZooKeeper connect (secondes): +SolrConnector.ZookeeperSocketTimeout=Timeout de socket (secondes): +SolrConnector.ZookeeperConnectionTimeout=Timeout de connection (secondes): SolrConnector.UpdateHandler=Update handler: SolrConnector.RemoveHandler=Remove handler: SolrConnector.StatusHandler=Status handler: Modified: manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties?rev=1910246=1910245=1910246=diff == --- manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties (original) +++ manifoldcf/trunk/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties Tue Jun 6 01:35:45 2023 @@ -38,8 +38,8 @@
svn commit: r1910246 [3/5] - in /manifoldcf/trunk: ./ connectors/solr/ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ connectors/solr/connector/src/main/native2ascii
Copied:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2SolrClient.java
(from r1910244,
manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2SolrClient.java)
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2SolrClient.java?p2=manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2SolrClient.java=manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2SolrClient.java=1910244=1910246=1910246=diff
==
---
manifoldcf/branches/CONNECTORS-1740/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2SolrClient.java
(original)
+++
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttp2SolrClient.java
Tue Jun 6 01:35:45 2023
@@ -197,7 +197,7 @@ public class ModifiedHttp2SolrClient ext
log.debug("Create Http2SolrClient with HTTP/1.1 transport");
}
transport = new HttpClientTransportOverHTTP(2);
- httpClient = sslEnabled ? new HttpClient(transport, sslContextFactory) :
new HttpClient(transport);
+ httpClient = sslEnabled ? new HttpClient(transport, sslContextFactory) :
new HttpClient(transport, null);
if (builder.maxConnectionsPerHost != null)
httpClient.setMaxConnectionsPerDestination(builder.maxConnectionsPerHost);
} else {
Modified:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConfig.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConfig.java?rev=1910246=1910245=1910246=diff
==
---
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConfig.java
(original)
+++
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConfig.java
Tue Jun 6 01:35:45 2023
@@ -18,11 +18,10 @@
*/
package org.apache.manifoldcf.agents.output.solr;
-
-/** Parameters and output data for SOLR output connector.
-*/
-public class SolrConfig
-{
+/**
+ * Parameters and output data for SOLR output connector.
+ */
+public class SolrConfig {
public static final String _rcsid = "@(#)$Id: SolrConfig.java 991374
2010-08-31 22:32:08Z kwright $";
// Configuration parameters
@@ -33,9 +32,9 @@ public class SolrConfig
public static final String SOLR_TYPE_STANDARD = "standard";
/** Type: Solr Cloud */
public static final String SOLR_TYPE_SOLRCLOUD = "solrcloud";
-
+
// SolrCloud zookeeper parameters
-
+
// Zookeeper hosts, as nodes
/** Zookeeper node */
public static final String NODE_ZOOKEEPER = "zookeeper";
@@ -43,26 +42,26 @@ public class SolrConfig
public static final String ATTR_HOST = "host";
/** Zookeeper port */
public static final String ATTR_PORT = "port";
-
+
/** Zookeeper znode path */
public static final String PARAM_ZOOKEEPER_ZNODE_PATH = "ZooKeeper znode
path";
-
+
/** ZooKeeper client timeout */
- public static final String PARAM_ZOOKEEPER_CLIENT_TIMEOUT = "ZooKeeper
client timeout";
+ public static final String PARAM_ZOOKEEPER_SOCKET_TIMEOUT = "ZooKeeper
socket timeout";
/** ZooKeeper connect timeout */
- public static final String PARAM_ZOOKEEPER_CONNECT_TIMEOUT = "ZooKeeper
connect timeout";
+ public static final String PARAM_ZOOKEEPER_CONNECTION_TIMEOUT = "ZooKeeper
connection timeout";
/** Collection name */
public static final String PARAM_COLLECTION = "Collection";
-
+
// General indexing parameters
-
+
/** Protocol */
public static final String PARAM_PROTOCOL = "Server protocol";
/** Protocol: http */
public static final String PROTOCOL_TYPE_HTTP = "http";
/** Protocol: https */
public static final String PROTOCOL_TYPE_HTTPS = "https";
-
+
/** Server name */
public static final String PARAM_SERVER = "Server name";
/** Port */
@@ -112,7 +111,7 @@ public class SolrConfig
/** Included mime types */
public static final String PARAM_INCLUDEDMIMETYPES = "Included mime types";
/** Excluded mime types */
- public static final String PARAM_EXCLUDEDMIMETYPES="Excluded mime types";
+ public static final String PARAM_EXCLUDEDMIMETYPES = "Excluded mime types";
/** Parameter describing the use of Extract Update handler */
public static final String PARAM_EXTRACTUPDATE = "Use extract update
handler";
/** Optional content field (if not using extract update handler) */
@@ -123,7 +122,7 @@ public class
svn commit: r1910244 - /manifoldcf/branches/CONNECTORS-1740/build.xml
Author: kwright Date: Tue Jun 6 00:29:32 2023 New Revision: 1910244 URL: http://svn.apache.org/viewvc?rev=1910244=rev Log: Roll back version of zookeeper to the last one that actually works Modified: manifoldcf/branches/CONNECTORS-1740/build.xml Modified: manifoldcf/branches/CONNECTORS-1740/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1740/build.xml?rev=1910244=1910243=1910244=diff == --- manifoldcf/branches/CONNECTORS-1740/build.xml (original) +++ manifoldcf/branches/CONNECTORS-1740/build.xml Tue Jun 6 00:29:32 2023 @@ -36,7 +36,7 @@ - + @@ -912,7 +912,7 @@ Use Apache Forrest version forrest-0.9-d -https://maven-eu.nuxeo.org/nexus/content/repositories/public-releases"/> +https://maven.nuxeo.org/nexus/content/repositories/public-releases"/>
