Author: kwright
Date: Wed Oct 5 07:01:23 2022
New Revision: 1904412
URL: http://svn.apache.org/viewvc?rev=1904412&view=rev
Log:
Fix for CONNECTORS-1737.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/confluence/v6/ConfluenceAuthorityConnector.java
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceConfiguration.java
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/client/ConfluenceClient.java
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_en_US.properties
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_es_ES.properties
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_fr_FR.properties
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_ja_JP.properties
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_en_US.properties
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_es_ES.properties
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_fr_FR.properties
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_ja_JP.properties
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf_server.html
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/viewConfiguration_conf.html
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editConfiguration_conf_server.html
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/viewConfiguration_conf.html
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Oct 5 07:01:23 2022
@@ -3,6 +3,9 @@ $Id$
======================= 2.24-dev =====================
+CONNECTORS-1737: Add support for proxies in Confluence V6 connector.
+(Nguyen Huu)
+
CONNECTORS-1731: Better handling for ServiceInterruption exceptions.
(Nguyen Huu)
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/confluence/v6/ConfluenceAuthorityConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/confluence/v6/ConfluenceAuthorityConnector.java?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/confluence/v6/ConfluenceAuthorityConnector.java
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/confluence/v6/ConfluenceAuthorityConnector.java
Wed Oct 5 07:01:23 2022
@@ -106,7 +106,13 @@ public class ConfluenceAuthorityConnecto
private String cacheLRUsize = null;
private final long responseLifetime = 60000L;
private final int LRUsize = 1000;
-
+
+ protected String proxyUsername = null;
+ protected String proxyPassword = null;
+ protected String proxyProtocol = null;
+ protected String proxyHost = null;
+ protected String proxyPort = null;
+
/** Cache manager. */
private ICacheManager cacheManager = null;
@@ -178,6 +184,11 @@ public class ConfluenceAuthorityConnecto
connectionTimeout = null;
cacheLifetime = null;
cacheLRUsize = null;
+ proxyUsername = null;
+ proxyPassword = null;
+ proxyProtocol = null;
+ proxyHost = null;
+ proxyPort = null;
}
@@ -208,6 +219,11 @@ public class ConfluenceAuthorityConnecto
if (cacheLRUsize == null) {
cacheLRUsize = "1000";
}
+ proxyUsername =
params.getParameter(ConfluenceConfiguration.Server.PROXY_USERNAME);
+ proxyPassword =
params.getObfuscatedParameter(ConfluenceConfiguration.Server.PROXY_PASSWORD);
+ proxyProtocol =
params.getParameter(ConfluenceConfiguration.Server.PROXY_PORT);
+ proxyHost = params.getParameter(ConfluenceConfiguration.Server.PROXY_HOST);
+ proxyPort = params.getParameter(ConfluenceConfiguration.Server.PROXY_PORT);
try {
initConfluenceClient();
@@ -321,7 +337,7 @@ public class ConfluenceAuthorityConnecto
else
portInt = 443;
}
-
+
int socketTimeoutInt;
if (socketTimeout != null && socketTimeout.length() > 0) {
try {
@@ -346,9 +362,22 @@ public class ConfluenceAuthorityConnecto
connectionTimeoutInt = 60000;
}
+ int proxyPortInt;
+ if (proxyPort != null && proxyPort.length() > 0) {
+ try {
+ proxyPortInt = Integer.parseInt(proxyPort);
+ } catch (NumberFormatException e) {
+ throw new ManifoldCFException("Bad number: "
+ + e.getMessage(), e);
+ }
+ } else {
+ proxyPortInt = -1;
+ }
+
/* Generating a client to perform Confluence requests */
confluenceClient = new ConfluenceClient(protocol, host, portInt,
- path, username, password, socketTimeoutInt, connectionTimeoutInt);
+ path, username, password, socketTimeoutInt, connectionTimeoutInt,
+ proxyUsername, proxyPassword, proxyProtocol, proxyHost,
proxyPortInt);
}
}
@@ -396,6 +425,11 @@ public class ConfluenceAuthorityConnecto
.getParameter(ConfluenceConfiguration.Server.SOCKET_TIMEOUT);
String confluenceConnectionTimeout = parameters
.getParameter(ConfluenceConfiguration.Server.CONNECTION_TIMEOUT);
+ String confluenceProxyUsername =
parameters.getParameter(ConfluenceConfiguration.Server.PROXY_USERNAME);
+ String confluenceProxyPassword =
parameters.getObfuscatedParameter(ConfluenceConfiguration.Server.PROXY_PASSWORD);
+ String confluenceProxyProtocol =
parameters.getParameter(ConfluenceConfiguration.Server.PROXY_PROTOCOL);
+ String confluenceProxyHost =
parameters.getParameter(ConfluenceConfiguration.Server.PROXY_HOST);
+ String confluenceProxyPort =
parameters.getParameter(ConfluenceConfiguration.Server.PROXY_PORT);
if (confluenceProtocol == null)
confluenceProtocol =
ConfluenceConfiguration.Server.PROTOCOL_DEFAULT_VALUE;
@@ -419,6 +453,18 @@ public class ConfluenceAuthorityConnecto
if(confluenceConnectionTimeout == null) {
confluenceConnectionTimeout =
ConfluenceConfiguration.Server.CONNECTION_TIMEOUT_DEFAULT_VALUE;
}
+ if (confluenceProxyUsername == null)
+ confluenceProxyUsername =
ConfluenceConfiguration.Server.PROXY_USERNAME_DEFAULT_VALUE;
+ if (confluenceProxyPassword == null)
+ confluenceProxyPassword =
ConfluenceConfiguration.Server.PROXY_PASSWORD_DEFAULT_VALUE;
+ else
+ confluenceProxyPassword =
mapper.mapPasswordToKey(confluenceProxyPassword);
+ if (confluenceProxyProtocol == null)
+ confluenceProxyProtocol =
ConfluenceConfiguration.Server.PROXY_PROTOCOL_DEFAULT_VALUE;
+ if (confluenceProxyHost == null)
+ confluenceProxyHost =
ConfluenceConfiguration.Server.PROXY_HOST_DEFAULT_VALUE;
+ if (confluenceProxyPort == null)
+ confluenceProxyPort =
ConfluenceConfiguration.Server.PROXY_PORT_DEFAULT_VALUE;
serverMap.put(PARAMETER_PREFIX
+ ConfluenceConfiguration.Server.PROTOCOL, confluenceProtocol);
@@ -436,6 +482,16 @@ public class ConfluenceAuthorityConnecto
+ ConfluenceConfiguration.Server.SOCKET_TIMEOUT,
confluenceSocketTimeout);
serverMap.put(PARAMETER_PREFIX
+ ConfluenceConfiguration.Server.CONNECTION_TIMEOUT,
confluenceConnectionTimeout);
+ serverMap.put(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_USERNAME,
confluenceProxyUsername);
+ serverMap.put(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_PASSWORD,
confluenceProxyPassword);
+ serverMap.put(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_PROTOCOL,
confluenceProxyProtocol);
+ serverMap.put(PARAMETER_PREFIX + ConfluenceConfiguration.Server.PROXY_HOST,
+ confluenceProxyHost);
+ serverMap.put(PARAMETER_PREFIX + ConfluenceConfiguration.Server.PROXY_PORT,
+ confluenceProxyPort);
}
@Override
@@ -574,6 +630,39 @@ public class ConfluenceAuthorityConnecto
if (confluenceConnectionTimeout != null)
parameters.setParameter(ConfluenceConfiguration.Server.CONNECTION_TIMEOUT,
confluenceConnectionTimeout);
+ String confluenceProxyProtocol = variableContext
+ .getParameter(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_PROTOCOL);
+ if (confluenceProxyProtocol != null)
+ parameters.setParameter(ConfluenceConfiguration.Server.PROXY_PROTOCOL,
+ confluenceProxyProtocol);
+
+ String confluenceProxyHost = variableContext.getParameter(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_HOST);
+ if (confluenceProxyHost != null)
+ parameters.setParameter(ConfluenceConfiguration.Server.PROXY_HOST,
+ confluenceProxyHost);
+
+ String confluenceProxyPort = variableContext.getParameter(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_PORT);
+ if (confluenceProxyPort != null)
+ parameters.setParameter(ConfluenceConfiguration.Server.PROXY_PORT,
+ confluenceProxyPort);
+
+ String confluenceProxyUsername = variableContext
+ .getParameter(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_USERNAME);
+ if (confluenceProxyUsername != null)
+ parameters.setParameter(ConfluenceConfiguration.Server.PROXY_USERNAME,
+ confluenceProxyUsername);
+
+ String confluenceProxyPassword = variableContext
+ .getParameter(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_PASSWORD);
+ if (confluenceProxyPassword != null)
+ parameters.setObfuscatedParameter(
+ ConfluenceConfiguration.Server.PROXY_PASSWORD,
+ variableContext.mapKeyToPassword(confluenceProxyPassword));
/* null means process configuration has been successful */
return null;
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceConfiguration.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceConfiguration.java?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceConfiguration.java
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceConfiguration.java
Wed Oct 5 07:01:23 2022
@@ -42,6 +42,12 @@ public class ConfluenceConfiguration {
public static final String RETRY_NUMBER = "retryNumber";
public static final String RETRY_INTERVAL = "retryInterval";
+ public static final String PROXY_USERNAME = "proxy_username";
+ public static final String PROXY_PASSWORD = "proxy_password";
+ public static final String PROXY_PROTOCOL = "proxy_protocol";
+ public static final String PROXY_HOST = "proxy_host";
+ public static final String PROXY_PORT = "proxy_port";
+
public static final String PROTOCOL_DEFAULT_VALUE = "http";
public static final String HOST_DEFAULT_VALUE = "";
public static final String PORT_DEFAULT_VALUE = "8090";
@@ -52,6 +58,12 @@ public class ConfluenceConfiguration {
public static final String CONNECTION_TIMEOUT_DEFAULT_VALUE = "60000";
public static final String RETRY_NUMBER_DEFAULT_VALUE = "2";
public static final String RETRY_INTERVAL_DEFAULT_VALUE = "20000";
+
+ public static final String PROXY_USERNAME_DEFAULT_VALUE = "";
+ public static final String PROXY_PASSWORD_DEFAULT_VALUE = "";
+ public static final String PROXY_PROTOCOL_DEFAULT_VALUE = "http";
+ public static final String PROXY_HOST_DEFAULT_VALUE = "";
+ public static final String PROXY_PORT_DEFAULT_VALUE = "";
}
public static interface Authority {
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/ConfluenceRepositoryConnector.java
Wed Oct 5 07:01:23 2022
@@ -159,6 +159,12 @@ public class ConfluenceRepositoryConnect
protected String retryIntervalString = null;
protected String retryNumberString = null;
+ protected String proxyUsername = null;
+ protected String proxyPassword = null;
+ protected String proxyProtocol = null;
+ protected String proxyHost = null;
+ protected String proxyPort = null;
+
/** Retry interval */
protected long retryInterval = -1L;
@@ -214,6 +220,11 @@ public class ConfluenceRepositoryConnect
connectionTimeout = null;
retryIntervalString = null;
retryNumberString = null;
+ proxyUsername = null;
+ proxyPassword = null;
+ proxyProtocol = null;
+ proxyHost = null;
+ proxyPort = null;
}
@@ -237,6 +248,12 @@ public class ConfluenceRepositoryConnect
retryIntervalString =
configParams.getParameter(ConfluenceConfiguration.Server.RETRY_INTERVAL);
retryNumberString =
configParams.getParameter(ConfluenceConfiguration.Server.RETRY_NUMBER);
+ proxyUsername =
params.getParameter(ConfluenceConfiguration.Server.PROXY_USERNAME);
+ proxyPassword =
params.getObfuscatedParameter(ConfluenceConfiguration.Server.PROXY_PASSWORD);
+ proxyProtocol =
params.getParameter(ConfluenceConfiguration.Server.PROXY_PORT);
+ proxyHost = params.getParameter(ConfluenceConfiguration.Server.PROXY_HOST);
+ proxyPort = params.getParameter(ConfluenceConfiguration.Server.PROXY_PORT);
+
try {
initConfluenceClient();
} catch (final ManifoldCFException e) {
@@ -373,8 +390,21 @@ public class ConfluenceRepositoryConnect
throw new ManifoldCFException("Bad retry number: " +
retryNumberString);
}
+ int proxyPortInt;
+ if (proxyPort != null && proxyPort.length() > 0) {
+ try {
+ proxyPortInt = Integer.parseInt(proxyPort);
+ } catch (NumberFormatException e) {
+ throw new ManifoldCFException("Bad number: "
+ + e.getMessage(), e);
+ }
+ } else {
+ proxyPortInt = -1;
+ }
+
/* Generating a client to perform Confluence requests */
- confluenceClient = new ConfluenceClient(protocol, host, portInt, path,
username, password, socketTimeoutInt, connectionTimeoutInt);
+ confluenceClient = new ConfluenceClient(protocol, host, portInt, path,
username, password, socketTimeoutInt, connectionTimeoutInt,
+ proxyUsername, proxyPassword, proxyProtocol, proxyHost,
proxyPortInt);
lastSessionFetch = System.currentTimeMillis();
}
@@ -431,6 +461,12 @@ public class ConfluenceRepositoryConnect
String confluenceRetryNumber =
parameters.getParameter(ConfluenceConfiguration.Server.RETRY_NUMBER);
String confluenceRetryInterval =
parameters.getParameter(ConfluenceConfiguration.Server.RETRY_INTERVAL);
+ String confluenceProxyUsername =
parameters.getParameter(ConfluenceConfiguration.Server.PROXY_USERNAME);
+ String confluenceProxyPassword =
parameters.getObfuscatedParameter(ConfluenceConfiguration.Server.PROXY_PASSWORD);
+ String confluenceProxyProtocol =
parameters.getParameter(ConfluenceConfiguration.Server.PROXY_PROTOCOL);
+ String confluenceProxyHost =
parameters.getParameter(ConfluenceConfiguration.Server.PROXY_HOST);
+ String confluenceProxyPort =
parameters.getParameter(ConfluenceConfiguration.Server.PROXY_PORT);
+
if (confluenceProtocol == null) {
confluenceProtocol =
ConfluenceConfiguration.Server.PROTOCOL_DEFAULT_VALUE;
}
@@ -467,6 +503,19 @@ public class ConfluenceRepositoryConnect
confluenceRetryInterval =
ConfluenceConfiguration.Server.RETRY_INTERVAL_DEFAULT_VALUE;
}
+ if (confluenceProxyUsername == null)
+ confluenceProxyUsername =
ConfluenceConfiguration.Server.PROXY_USERNAME_DEFAULT_VALUE;
+ if (confluenceProxyPassword == null)
+ confluenceProxyPassword =
ConfluenceConfiguration.Server.PROXY_PASSWORD_DEFAULT_VALUE;
+ else
+ confluenceProxyPassword =
mapper.mapPasswordToKey(confluenceProxyPassword);
+ if (confluenceProxyProtocol == null)
+ confluenceProxyProtocol =
ConfluenceConfiguration.Server.PROXY_PROTOCOL_DEFAULT_VALUE;
+ if (confluenceProxyHost == null)
+ confluenceProxyHost =
ConfluenceConfiguration.Server.PROXY_HOST_DEFAULT_VALUE;
+ if (confluenceProxyPort == null)
+ confluenceProxyPort =
ConfluenceConfiguration.Server.PROXY_PORT_DEFAULT_VALUE;
+
serverMap.put(PARAMETER_PREFIX + ConfluenceConfiguration.Server.PROTOCOL,
confluenceProtocol);
serverMap.put(PARAMETER_PREFIX + ConfluenceConfiguration.Server.HOST,
confluenceHost);
serverMap.put(PARAMETER_PREFIX + ConfluenceConfiguration.Server.PORT,
confluencePort);
@@ -477,6 +526,16 @@ public class ConfluenceRepositoryConnect
serverMap.put(PARAMETER_PREFIX +
ConfluenceConfiguration.Server.CONNECTION_TIMEOUT, confluenceConnectionTimeout);
serverMap.put(PARAMETER_PREFIX +
ConfluenceConfiguration.Server.RETRY_NUMBER, confluenceRetryNumber);
serverMap.put(PARAMETER_PREFIX +
ConfluenceConfiguration.Server.RETRY_INTERVAL, confluenceRetryInterval);
+ serverMap.put(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_USERNAME,
confluenceProxyUsername);
+ serverMap.put(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_PASSWORD,
confluenceProxyPassword);
+ serverMap.put(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_PROTOCOL,
confluenceProxyProtocol);
+ serverMap.put(PARAMETER_PREFIX + ConfluenceConfiguration.Server.PROXY_HOST,
+ confluenceProxyHost);
+ serverMap.put(PARAMETER_PREFIX + ConfluenceConfiguration.Server.PROXY_PORT,
+ confluenceProxyPort);
}
@Override
@@ -580,6 +639,40 @@ public class ConfluenceRepositoryConnect
parameters.setParameter(ConfluenceConfiguration.Server.RETRY_INTERVAL,
confluenceRetryInterval);
}
+ String confluenceProxyProtocol = variableContext
+ .getParameter(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_PROTOCOL);
+ if (confluenceProxyProtocol != null)
+ parameters.setParameter(ConfluenceConfiguration.Server.PROXY_PROTOCOL,
+ confluenceProxyProtocol);
+
+ String confluenceProxyHost = variableContext.getParameter(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_HOST);
+ if (confluenceProxyHost != null)
+ parameters.setParameter(ConfluenceConfiguration.Server.PROXY_HOST,
+ confluenceProxyHost);
+
+ String confluenceProxyPort = variableContext.getParameter(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_PORT);
+ if (confluenceProxyPort != null)
+ parameters.setParameter(ConfluenceConfiguration.Server.PROXY_PORT,
+ confluenceProxyPort);
+
+ String confluenceProxyUsername = variableContext
+ .getParameter(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_USERNAME);
+ if (confluenceProxyUsername != null)
+ parameters.setParameter(ConfluenceConfiguration.Server.PROXY_USERNAME,
+ confluenceProxyUsername);
+
+ String confluenceProxyPassword = variableContext
+ .getParameter(PARAMETER_PREFIX
+ + ConfluenceConfiguration.Server.PROXY_PASSWORD);
+ if (confluenceProxyPassword != null)
+ parameters.setObfuscatedParameter(
+ ConfluenceConfiguration.Server.PROXY_PASSWORD,
+ variableContext.mapKeyToPassword(confluenceProxyPassword));
+
/* null means process configuration has been successful */
return null;
}
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/client/ConfluenceClient.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/client/ConfluenceClient.java?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/client/ConfluenceClient.java
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/v6/client/ConfluenceClient.java
Wed Oct 5 07:01:23 2022
@@ -28,8 +28,14 @@ import java.util.Locale;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
+import org.apache.http.HttpHost;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
@@ -116,6 +122,12 @@ public class ConfluenceClient {
private final String username;
private final String password;
+ protected String proxyUsername = null;
+ protected String proxyPassword = null;
+ protected String proxyProtocol = null;
+ protected String proxyHost = null;
+ protected int proxyPort = -1;
+
private int socketTimeout = 900000;
private int connectionTimeout = 60000;
@@ -136,7 +148,7 @@ public class ConfluenceClient {
* @throws ManifoldCFException
*/
public ConfluenceClient(final String protocol, final String host, final
Integer port, final String path, final String username, final String password,
final int socketTimeout,
- final int connectionTimeout) throws ManifoldCFException {
+ final int connectionTimeout, final String proxyUsername, final String
proxyPassword, final String proxyProtocol, final String proxyHost, final int
proxyPort) throws ManifoldCFException {
this.protocol = protocol;
this.host = host;
this.port = port;
@@ -145,6 +157,11 @@ public class ConfluenceClient {
this.password = password;
this.socketTimeout = socketTimeout;
this.connectionTimeout = connectionTimeout;
+ this.proxyUsername = proxyUsername;
+ this.proxyPassword = proxyPassword;
+ this.proxyProtocol = proxyProtocol;
+ this.proxyHost = proxyHost;
+ this.proxyPort = proxyPort;
connect();
}
@@ -157,7 +174,18 @@ public class ConfluenceClient {
* @throws ManifoldCFException
*/
private void connect() throws ManifoldCFException {
-
+ HttpHost proxy = null;
+ CredentialsProvider credentialsProvider = null;
+ if (this.proxyHost != null && this.proxyHost.length() > 0 &&
this.proxyPort != -1) {
+ proxy = new HttpHost(this.proxyHost, this.proxyPort);
+ if (this.proxyUsername != null && this.proxyUsername.length() > 0 &&
this.proxyPassword != null && this.proxyPassword.length() > 0) {
+ credentialsProvider = new BasicCredentialsProvider();
+ credentialsProvider.setCredentials(
+ new AuthScope(this.proxyHost, this.proxyPort),
+ new UsernamePasswordCredentials(this.proxyUsername,
this.proxyPassword)
+ );
+ }
+ }
final javax.net.ssl.SSLSocketFactory httpsSocketFactory =
KeystoreManagerFactory.getTrustingSecureSocketFactory();
final SSLConnectionSocketFactory myFactory = new
SSLConnectionSocketFactory(new InterruptibleSocketFactory(httpsSocketFactory,
connectionTimeout), NoopHostnameVerifier.INSTANCE);
@@ -170,7 +198,17 @@ public class ConfluenceClient {
final RequestConfig.Builder requestBuilder =
RequestConfig.custom().setCircularRedirectsAllowed(true).setSocketTimeout(socketTimeout).setExpectContinueEnabled(true)
.setConnectTimeout(connectionTimeout).setConnectionRequestTimeout(socketTimeout);
- httpClient =
HttpClients.custom().setConnectionManager(poolingConnectionManager).disableAutomaticRetries().setDefaultRequestConfig(requestBuilder.build())
+ if (proxy != null) {
+ requestBuilder.setProxy(proxy);
+ }
+
+ HttpClientBuilder clientBuilder = HttpClients.custom();
+
+ if (credentialsProvider != null) {
+ clientBuilder =
clientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+ }
+
+ httpClient =
clientBuilder.setConnectionManager(poolingConnectionManager).disableAutomaticRetries().setDefaultRequestConfig(requestBuilder.build())
.setRequestExecutor(new
HttpRequestExecutor(socketTimeout)).setRedirectStrategy(new
LaxRedirectStrategy()).build();
}
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_en_US.properties?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_en_US.properties
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_en_US.properties
Wed Oct 5 07:01:23 2022
@@ -41,3 +41,9 @@ ConfluenceAuthorityConnector.CacheLifeti
ConfluenceAuthorityConnector.CacheLRUSizeCannotBeNull=Cache LRU size cannot be
null
ConfluenceAuthorityConnector.CacheLRUSizeMustBeAnInteger=Cache LRU size must
be an integer
+ConfluenceAuthorityConnector.ProxyProtocolColon=Proxy Protocol:
+ConfluenceAuthorityConnector.ProxyHostColon=Proxy Host:
+ConfluenceAuthorityConnector.ProxyPortColon=Proxy Port:
+ConfluenceAuthorityConnector.ProxyUsernameColon=Proxy Username:
+ConfluenceAuthorityConnector.ProxyPasswordColon=Proxy Password:
+
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_es_ES.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_es_ES.properties?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_es_ES.properties
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_es_ES.properties
Wed Oct 5 07:01:23 2022
@@ -40,3 +40,9 @@ ConfluenceAuthorityConnector.CacheLifeti
ConfluenceAuthorityConnector.CacheLifetimeMustBeAnInteger=Vida útil de la
caché debe ser un entero
ConfluenceAuthorityConnector.CacheLRUSizeCannotBeNull=Tamaño de caché LRU no
puede ser nulo
ConfluenceAuthorityConnector.CacheLRUSizeMustBeAnInteger=Tamaño de caché LRU
debe ser un entero
+
+ConfluenceAuthorityConnector.ProxyProtocolColon=Proxy Protocol:
+ConfluenceAuthorityConnector.ProxyHostColon=Proxy Host:
+ConfluenceAuthorityConnector.ProxyPortColon=Proxy Port:
+ConfluenceAuthorityConnector.ProxyUsernameColon=Proxy Username:
+ConfluenceAuthorityConnector.ProxyPasswordColon=Proxy Password:
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_fr_FR.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_fr_FR.properties?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_fr_FR.properties
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_fr_FR.properties
Wed Oct 5 07:01:23 2022
@@ -41,3 +41,9 @@ ConfluenceAuthorityConnector.CacheLifeti
ConfluenceAuthorityConnector.CacheLifetimeMustBeAnInteger=Une durée de vie de
cache doit être un entier
ConfluenceAuthorityConnector.CacheLRUSizeCannotBeNull=La taille du cache LRU
ne peut être null
ConfluenceAuthorityConnector.CacheLRUSizeMustBeAnInteger=La taille du cache
LRU doit être un entier
+
+ConfluenceAuthorityConnector.ProxyProtocolColon=Proxy Protocol:
+ConfluenceAuthorityConnector.ProxyHostColon=Proxy Host:
+ConfluenceAuthorityConnector.ProxyPortColon=Proxy Port:
+ConfluenceAuthorityConnector.ProxyUsernameColon=Proxy Username:
+ConfluenceAuthorityConnector.ProxyPasswordColon=Proxy Password:
\ No newline at end of file
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_ja_JP.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_ja_JP.properties?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_ja_JP.properties
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/confluence/v6/common_ja_JP.properties
Wed Oct 5 07:01:23 2022
@@ -40,3 +40,9 @@ ConfluenceAuthorityConnector.CacheLifeti
ConfluenceAuthorityConnector.CacheLifetimeMustBeAnInteger=ãã£ãã·ã¥ã©ã¤ãã¿ã¤ã
ã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
ConfluenceAuthorityConnector.CacheLRUSizeCannotBeNull=ãã£ãã·ã¥LRUãµã¤ãºãå
¥åãã¦ãã ãã
ConfluenceAuthorityConnector.CacheLRUSizeMustBeAnInteger=ãã£ãã·ã¥LRUãµã¤ãºã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
+
+ConfluenceAuthorityConnector.ProxyProtocolColon=ãããã·ãããã³ã«:
+ConfluenceAuthorityConnector.ProxyHostColon=ãããã·ãã¹ãå:
+ConfluenceAuthorityConnector.ProxyPortColon=ãããã·ãã¼ãçªå·:
+ConfluenceAuthorityConnector.ProxyUsernameColon=ãããã·ã¦ã¼ã¶å:
+ConfluenceAuthorityConnector.ProxyPasswordColon=ãããã·ãã¹ã¯ã¼ã:
\ No newline at end of file
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_en_US.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_en_US.properties?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_en_US.properties
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_en_US.properties
Wed Oct 5 07:01:23 2022
@@ -30,6 +30,12 @@ ConfluenceRepositoryConnector.PasswordCo
ConfluenceRepositoryConnector.RetryInterval=Retry interval (in ms):
ConfluenceRepositoryConnector.RetryNumber=Number of retries:
+ConfluenceRepositoryConnector.ProxyProtocolColon=Proxy Protocol:
+ConfluenceRepositoryConnector.ProxyHostColon=Proxy Host:
+ConfluenceRepositoryConnector.ProxyPortColon=Proxy Port:
+ConfluenceRepositoryConnector.ProxyUsernameColon=Proxy Username:
+ConfluenceRepositoryConnector.ProxyPasswordColon=Proxy Password:
+
ConfluenceRepositoryConnector.HostMustNotBeNull=Confluence host must not be
null
ConfluenceRepositoryConnector.HostMustNotIncludeSlash=Confluence host must not
include a '/' character
ConfluenceRepositoryConnector.PortMustBeAnInteger=Confluence port must be an
integer
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_es_ES.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_es_ES.properties?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_es_ES.properties
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_es_ES.properties
Wed Oct 5 07:01:23 2022
@@ -30,6 +30,12 @@ ConfluenceRepositoryConnector.PasswordCo
ConfluenceRepositoryConnector.RetryInterval=Retry interval (in ms):
ConfluenceRepositoryConnector.RetryNumber=Number of retries:
+ConfluenceRepositoryConnector.ProxyProtocolColon=Proxy Protocol:
+ConfluenceRepositoryConnector.ProxyHostColon=Proxy Host:
+ConfluenceRepositoryConnector.ProxyPortColon=Proxy Port:
+ConfluenceRepositoryConnector.ProxyUsernameColon=Proxy Username:
+ConfluenceRepositoryConnector.ProxyPasswordColon=Proxy Password:
+
ConfluenceRepositoryConnector.HostMustNotBeNull=Confluencia de acogida no debe
ser nulo
ConfluenceRepositoryConnector.HostMustNotIncludeSlash=Confluencia de acogida
no debe incluir una '/' carácter
ConfluenceRepositoryConnector.PortMustBeAnInteger=El puerto de confluencia
debe ser un número entero
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_fr_FR.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_fr_FR.properties?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_fr_FR.properties
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_fr_FR.properties
Wed Oct 5 07:01:23 2022
@@ -30,6 +30,12 @@ ConfluenceRepositoryConnector.PasswordCo
ConfluenceRepositoryConnector.RetryInterval=Intervalle entre les tentatives
(en ms):
ConfluenceRepositoryConnector.RetryNumber=Nombre de tentatives:
+ConfluenceRepositoryConnector.ProxyProtocolColon=Proxy Protocol:
+ConfluenceRepositoryConnector.ProxyHostColon=Proxy Host:
+ConfluenceRepositoryConnector.ProxyPortColon=Proxy Port:
+ConfluenceRepositoryConnector.ProxyUsernameColon=Proxy Username:
+ConfluenceRepositoryConnector.ProxyPasswordColon=Proxy Password:
+
ConfluenceRepositoryConnector.HostMustNotBeNull=Le nom d'hôte Confluence ne
doit pas être vide
ConfluenceRepositoryConnector.HostMustNotIncludeSlash=Le nom d'hôte Confluence
ne doit pas contenir un caractère '/'
ConfluenceRepositoryConnector.PortMustBeAnInteger=Le port Confluence doit être
un entier
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_ja_JP.properties
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_ja_JP.properties?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_ja_JP.properties
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/confluence/v6/common_ja_JP.properties
Wed Oct 5 07:01:23 2022
@@ -30,6 +30,12 @@ ConfluenceRepositoryConnector.PasswordCo
ConfluenceRepositoryConnector.RetryInterval=Retry interval (in ms):
ConfluenceRepositoryConnector.RetryNumber=Number of retries:
+ConfluenceRepositoryConnector.ProxyProtocolColon=ãããã·ãããã³ã«:
+ConfluenceRepositoryConnector.ProxyHostColon=ãããã·ãã¹ãå:
+ConfluenceRepositoryConnector.ProxyPortColon=ãããã·ãã¼ãçªå·:
+ConfluenceRepositoryConnector.ProxyUsernameColon=ãããã·ã¦ã¼ã¶å:
+ConfluenceRepositoryConnector.ProxyPasswordColon=ãããã·ãã¹ã¯ã¼ã:
+
ConfluenceRepositoryConnector.HostMustNotBeNull=Confluence
ãã¹ãåãæªæå®ã§ã
ConfluenceRepositoryConnector.HostMustNotIncludeSlash=Confluence
ãã¹ãåã«æåã/ããå«ãã¦ã¯ããã¾ãã
ConfluenceRepositoryConnector.PortMustBeAnInteger=Confluence
ãã¼ãçªå·ã¯æ°å¤ã§ãªãã¦ã¯ããã¾ãã
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf_server.html
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf_server.html?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf_server.html
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/editConfiguration_conf_server.html
Wed Oct 5 07:01:23 2022
@@ -103,6 +103,64 @@
<input size="16" type="password" id="confluence_password"
name="confluence_password"
value="$Encoder.attributeEscape($CONFLUENCE_PASSWORD)" />
</td>
</tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ProxyProtocolColon'))</nobr>
+ </td>
+ <td class="value">
+ <select size="2" name="confluence_proxy_protocol">
+#if($CONFLUENCE_PROXY_PROTOCOL == 'http')
+ <option value="http" selected="true">http</option>
+#else
+ <option value="http">http</option>
+#end
+#if($CONFLUENCE_PROXY_PROTOCOL == 'https')
+ <option value="https" selected="true">https</option>
+#else
+ <option value="https">https</option>
+#end
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ProxyHostColon'))</nobr>
+ </td>
+ <td class="value">
+ <input size="32" type="text" id="confluence_proxy_host"
name="confluence_proxy_host"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_HOST)" />
+ </td>
+ </tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ProxyPortColon'))</nobr>
+ </td>
+ <td class="value">
+ <input size="5" type="text" id="confluence_proxy_port"
name="confluence_proxy_port"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_PORT)" />
+ </td>
+ </tr>
+
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ProxyUsernameColon'))</nobr>
+ </td>
+ <td class="value">
+ <input size="16" type="text" id="confluence_proxy_username"
name="confluence_proxy_username"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_USERNAME)" />
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ProxyPasswordColon'))</nobr>
+ </td>
+ <td class="value">
+ <input size="16" type="password" id="confluence_proxy_password"
name="confluence_proxy_password"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_PASSWORD)" />
+ </td>
+ </tr>
</table>
#else
@@ -115,5 +173,10 @@
<input type="hidden" name="confluence_password"
value="$Encoder.attributeEscape($CONFLUENCE_PASSWORD)" />
<input type="hidden" name="confluence_socket_timeout"
value="$Encoder.attributeEscape($CONFLUENCE_SOCKET_TIMEOUT)" />
<input type="hidden" name="confluence_connection_timeout"
value="$Encoder.attributeEscape($CONFLUENCE_CONNECTION_TIMEOUT)" />
+<input type="hidden" name="confluence_proxy_protocol"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_PROTOCOL)" />
+<input type="hidden" name="confluence_proxy_host"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_HOST)" />
+<input type="hidden" name="confluence_proxy_port"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_PORT)" />
+<input type="hidden" name="confluence_proxy_username"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_USERNAME)" />
+<input type="hidden" name="confluence_proxy_password"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_PASSWORD)" />
#end
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/viewConfiguration_conf.html
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/viewConfiguration_conf.html?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/viewConfiguration_conf.html
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/confluence/v6/viewConfiguration_conf.html
Wed Oct 5 07:01:23 2022
@@ -104,5 +104,55 @@
</td>
</tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ProxyProtocolColon'))</nobr>
+ </td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($CONFLUENCE_PROXY_PROTOCOL)</nobr>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ProxyHostColon'))</nobr>
+ </td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($CONFLUENCE_PROXY_HOST)</nobr>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ProxyPortColon'))</nobr>
+ </td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($CONFLUENCE_PROXY_PORT)</nobr>
+ </td>
+ </tr>
+
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ProxyUsernameColon'))</nobr>
+ </td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($CONFLUENCE_PROXY_USERNAME)</nobr>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceAuthorityConnector.ProxyPasswordColon'))</nobr>
+ </td>
+ <td class="value">
+ <nobr>********</nobr>
+ </td>
+ </tr>
+
</table>
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editConfiguration_conf_server.html
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editConfiguration_conf_server.html?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editConfiguration_conf_server.html
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/editConfiguration_conf_server.html
Wed Oct 5 07:01:23 2022
@@ -119,6 +119,64 @@
<input size="10" type="text" id="confluence_retryNumber"
name="confluence_retryNumber"
value="$Encoder.attributeEscape($CONFLUENCE_RETRYNUMBER)"/>
</td>
</tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ProxyProtocolColon'))</nobr>
+ </td>
+ <td class="value">
+ <select size="2" name="confluence_proxy_protocol">
+#if($CONFLUENCE_PROXY_PROTOCOL == 'http')
+ <option value="http" selected="true">http</option>
+#else
+ <option value="http">http</option>
+#end
+#if($CONFLUENCE_PROXY_PROTOCOL == 'https')
+ <option value="https" selected="true">https</option>
+#else
+ <option value="https">https</option>
+#end
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ProxyHostColon'))</nobr>
+ </td>
+ <td class="value">
+ <input size="32" type="text" id="confluence_proxy_host"
name="confluence_proxy_host"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_HOST)" />
+ </td>
+ </tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ProxyPortColon'))</nobr>
+ </td>
+ <td class="value">
+ <input size="5" type="text" id="confluence_proxy_port"
name="confluence_proxy_port"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_PORT)" />
+ </td>
+ </tr>
+
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ProxyUsernameColon'))</nobr>
+ </td>
+ <td class="value">
+ <input size="16" type="text" id="confluence_proxy_username"
name="confluence_proxy_username"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_USERNAME)" />
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ProxyPasswordColon'))</nobr>
+ </td>
+ <td class="value">
+ <input size="16" type="password" id="confluence_proxy_password"
name="confluence_proxy_password"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_PASSWORD)" />
+ </td>
+ </tr>
</table>
#else
@@ -133,5 +191,10 @@
<input type="hidden" name="confluence_connection_timeout"
value="$Encoder.attributeEscape($CONFLUENCE_CONNECTION_TIMEOUT)" />
<input type="hidden" name="confluence_retryInterval"
value="$Encoder.attributeEscape($CONFLUENCE_RETRYINTERVAL)"/>
<input type="hidden" name="confluence_retryNumber"
value="$Encoder.attributeEscape($CONFLUENCE_RETRYNUMBER)"/>
+<input type="hidden" name="confluence_proxy_protocol"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_PROTOCOL)" />
+<input type="hidden" name="confluence_proxy_host"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_HOST)" />
+<input type="hidden" name="confluence_proxy_port"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_PORT)" />
+<input type="hidden" name="confluence_proxy_username"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_USERNAME)" />
+<input type="hidden" name="confluence_proxy_password"
value="$Encoder.attributeEscape($CONFLUENCE_PROXY_PASSWORD)" />
#end
Modified:
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/viewConfiguration_conf.html
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/viewConfiguration_conf.html?rev=1904412&r1=1904411&r2=1904412&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/viewConfiguration_conf.html
(original)
+++
manifoldcf/trunk/connectors/confluence-v6/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/confluence/v6/viewConfiguration_conf.html
Wed Oct 5 07:01:23 2022
@@ -109,5 +109,55 @@
</td>
</tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ProxyProtocolColon'))</nobr>
+ </td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($CONFLUENCE_PROXY_PROTOCOL)</nobr>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ProxyHostColon'))</nobr>
+ </td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($CONFLUENCE_PROXY_HOST)</nobr>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ProxyPortColon'))</nobr>
+ </td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($CONFLUENCE_PROXY_PORT)</nobr>
+ </td>
+ </tr>
+
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ProxyUsernameColon'))</nobr>
+ </td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($CONFLUENCE_PROXY_USERNAME)</nobr>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.ProxyPasswordColon'))</nobr>
+ </td>
+ <td class="value">
+ <nobr>********</nobr>
+ </td>
+ </tr>
+
</table>
