Author: jmssiera
Date: Fri Oct 22 17:17:42 2021
New Revision: 1894485
URL: http://svn.apache.org/viewvc?rev=1894485&view=rev
Log:
Fix CONNECTORS-1678
Modified:
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/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/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/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=1894485&r1=1894484&r2=1894485&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
Fri Oct 22 17:17:42 2021
@@ -39,6 +39,8 @@ public class ConfluenceConfiguration {
public static final String PATH = "path";
public static final String SOCKET_TIMEOUT = "socket_timeout";
public static final String CONNECTION_TIMEOUT = "connection_timeout";
+ public static final String RETRY_NUMBER = "retryNumber";
+ public static final String RETRY_INTERVAL = "retryInterval";
public static final String PROTOCOL_DEFAULT_VALUE = "http";
public static final String HOST_DEFAULT_VALUE = "";
@@ -48,6 +50,8 @@ public class ConfluenceConfiguration {
public static final String PASSWORD_DEFAULT_VALUE = "";
public static final String SOCKET_TIMEOUT_DEFAULT_VALUE = "900000";
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 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=1894485&r1=1894484&r2=1894485&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
Fri Oct 22 17:17:42 2021
@@ -156,6 +156,14 @@ public class ConfluenceRepositoryConnect
protected String password = null;
protected String socketTimeout = null;
protected String connectionTimeout = null;
+ protected String retryIntervalString = null;
+ protected String retryNumberString = null;
+
+ /** Retry interval */
+ protected long retryInterval = -1L;
+
+ /** Retry number */
+ protected int retryNumber = -1;
protected ConfluenceClient confluenceClient = null;
@@ -204,6 +212,8 @@ public class ConfluenceRepositoryConnect
password = null;
socketTimeout = null;
connectionTimeout = null;
+ retryIntervalString = null;
+ retryNumberString = null;
}
@@ -224,6 +234,8 @@ public class ConfluenceRepositoryConnect
password =
params.getObfuscatedParameter(ConfluenceConfiguration.Server.PASSWORD);
socketTimeout =
params.getParameter(ConfluenceConfiguration.Server.SOCKET_TIMEOUT);
connectionTimeout =
params.getParameter(ConfluenceConfiguration.Server.CONNECTION_TIMEOUT);
+ retryIntervalString =
configParams.getParameter(ConfluenceConfiguration.Server.RETRY_INTERVAL);
+ retryNumberString =
configParams.getParameter(ConfluenceConfiguration.Server.RETRY_NUMBER);
try {
initConfluenceClient();
@@ -349,6 +361,18 @@ public class ConfluenceRepositoryConnect
connectionTimeoutInt = 60000;
}
+ try {
+ this.retryInterval = Long.parseLong(retryIntervalString);
+ } catch (final NumberFormatException e) {
+ throw new ManifoldCFException("Bad retry interval number: " +
retryIntervalString);
+ }
+
+ try {
+ this.retryNumber = Integer.parseInt(retryNumberString);
+ } catch (final NumberFormatException e) {
+ throw new ManifoldCFException("Bad retry number: " +
retryNumberString);
+ }
+
/* Generating a client to perform Confluence requests */
confluenceClient = new ConfluenceClient(protocol, host, portInt, path,
username, password, socketTimeoutInt, connectionTimeoutInt);
lastSessionFetch = System.currentTimeMillis();
@@ -404,6 +428,8 @@ public class ConfluenceRepositoryConnect
String confluencePassword =
parameters.getObfuscatedParameter(ConfluenceConfiguration.Server.PASSWORD);
String confluenceSocketTimeout =
parameters.getParameter(ConfluenceConfiguration.Server.SOCKET_TIMEOUT);
String confluenceConnectionTimeout =
parameters.getParameter(ConfluenceConfiguration.Server.CONNECTION_TIMEOUT);
+ String confluenceRetryNumber =
parameters.getParameter(ConfluenceConfiguration.Server.RETRY_NUMBER);
+ String confluenceRetryInterval =
parameters.getParameter(ConfluenceConfiguration.Server.RETRY_INTERVAL);
if (confluenceProtocol == null) {
confluenceProtocol =
ConfluenceConfiguration.Server.PROTOCOL_DEFAULT_VALUE;
@@ -434,6 +460,13 @@ public class ConfluenceRepositoryConnect
confluenceConnectionTimeout =
ConfluenceConfiguration.Server.CONNECTION_TIMEOUT_DEFAULT_VALUE;
}
+ if (confluenceRetryNumber == null) {
+ confluenceRetryNumber =
ConfluenceConfiguration.Server.RETRY_NUMBER_DEFAULT_VALUE;
+ }
+ if (confluenceRetryInterval == null) {
+ confluenceRetryInterval =
ConfluenceConfiguration.Server.RETRY_INTERVAL_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);
@@ -442,6 +475,8 @@ public class ConfluenceRepositoryConnect
serverMap.put(PARAMETER_PREFIX + ConfluenceConfiguration.Server.PASSWORD,
confluencePassword);
serverMap.put(PARAMETER_PREFIX +
ConfluenceConfiguration.Server.SOCKET_TIMEOUT, confluenceSocketTimeout);
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);
}
@Override
@@ -535,6 +570,16 @@ public class ConfluenceRepositoryConnect
parameters.setParameter(ConfluenceConfiguration.Server.CONNECTION_TIMEOUT,
confluenceConnectionTimeout);
}
+ final String confluenceRetryNumber =
variableContext.getParameter(PARAMETER_PREFIX +
ConfluenceConfiguration.Server.RETRY_NUMBER);
+ if (confluenceRetryNumber != null) {
+ parameters.setParameter(ConfluenceConfiguration.Server.RETRY_NUMBER,
confluenceRetryNumber);
+ }
+
+ final String confluenceRetryInterval =
variableContext.getParameter(PARAMETER_PREFIX +
ConfluenceConfiguration.Server.RETRY_INTERVAL);
+ if (confluenceRetryInterval != null) {
+ parameters.setParameter(ConfluenceConfiguration.Server.RETRY_INTERVAL,
confluenceRetryInterval);
+ }
+
/* null means process configuration has been successful */
return null;
}
@@ -593,8 +638,8 @@ public class ConfluenceRepositoryConnect
/*
* Handle job specification post
*
- * @see org.apache.manifoldcf.crawler.connectors.BaseRepositoryConnector#
processSpecificationPost
- * (org.apache.manifoldcf.core.interfaces.IPostParameters,
org.apache.manifoldcf.crawler.interfaces.DocumentSpecification)
+ * @see org.apache.manifoldcf.crawler.connectors.BaseRepositoryConnector#
processSpecificationPost (org.apache.manifoldcf.core.interfaces.IPostParameters,
+ * org.apache.manifoldcf.crawler.interfaces.DocumentSpecification)
*/
@Override
@@ -694,9 +739,8 @@ public class ConfluenceRepositoryConnect
/*
* (non-Javadoc)
*
- * @see org.apache.manifoldcf.crawler.connectors.BaseRepositoryConnector#
outputSpecificationBody
- * (org.apache.manifoldcf.core.interfaces.IHTTPOutput, java.util.Locale,
org.apache.manifoldcf.crawler.interfaces.DocumentSpecification,
- * java.lang.String)
+ * @see org.apache.manifoldcf.crawler.connectors.BaseRepositoryConnector#
outputSpecificationBody (org.apache.manifoldcf.core.interfaces.IHTTPOutput,
java.util.Locale,
+ * org.apache.manifoldcf.crawler.interfaces.DocumentSpecification,
java.lang.String)
*/
@Override
public void outputSpecificationBody(final IHTTPOutput out, final Locale
locale, final Specification ds, final int connectionSequenceNumber, final int
actualSequenceNumber, final String tabName)
@@ -724,9 +768,8 @@ public class ConfluenceRepositoryConnect
/*
* Header for the specification
*
- * @see org.apache.manifoldcf.crawler.connectors.BaseRepositoryConnector#
outputSpecificationHeader
- * (org.apache.manifoldcf.core.interfaces.IHTTPOutput, java.util.Locale,
org.apache.manifoldcf.crawler.interfaces.DocumentSpecification,
- * java.util.List)
+ * @see org.apache.manifoldcf.crawler.connectors.BaseRepositoryConnector#
outputSpecificationHeader (org.apache.manifoldcf.core.interfaces.IHTTPOutput,
java.util.Locale,
+ * org.apache.manifoldcf.crawler.interfaces.DocumentSpecification,
java.util.List)
*/
@Override
public void outputSpecificationHeader(final IHTTPOutput out, final Locale
locale, final Specification ds, final int connectionSequenceNumber, final
List<String> tabsArray)
@@ -745,9 +788,8 @@ public class ConfluenceRepositoryConnect
/*
* Adding seed documents
*
- * @see org.apache.manifoldcf.crawler.connectors.BaseRepositoryConnector#
addSeedDocuments
- * (org.apache.manifoldcf.crawler.interfaces.ISeedingActivity,
org.apache.manifoldcf.crawler.interfaces.DocumentSpecification, long, long,
- * int)
+ * @see org.apache.manifoldcf.crawler.connectors.BaseRepositoryConnector#
addSeedDocuments (org.apache.manifoldcf.crawler.interfaces.ISeedingActivity,
+ * org.apache.manifoldcf.crawler.interfaces.DocumentSpecification, long,
long, int)
*/
@Override
public String addSeedDocuments(final ISeedingActivity activities, final
Specification spec, final String lastSeedVersion, final long seedTime, final
int jobMode)
@@ -760,9 +802,8 @@ public class ConfluenceRepositoryConnect
try {
/*
- * Not uses delta seeding because Confluence can't be queried using
dates or in a ordered way, only start and limit which can cause problems
- * if an already indexed document is deleted, because we will miss some
to-be indexed docs due to the last start parameter stored in the
- * last execution
+ * Not uses delta seeding because Confluence can't be queried using
dates or in a ordered way, only start and limit which can cause problems if an
already indexed document is
+ * deleted, because we will miss some to-be indexed docs due to the last
start parameter stored in the last execution
*/
// if(lastSeedVersion != null && !lastSeedVersion.isEmpty()) {
// StringTokenizer tokenizer = new
@@ -999,18 +1040,17 @@ public class ConfluenceRepositoryConnect
* Handle page exception : retry 3rd times with a 5 minutes interval without
aborting job in case of failure
*
* @param e
- * @param context
- * The error context (ex: 'page processing')
+ * @param context The error context (ex: 'page processing')
* @throws ManifoldCFException
* @throws ServiceInterruption
*/
- protected static void handlePageException(final Exception e, final String
context) throws ManifoldCFException, ServiceInterruption {
+ protected void handlePageException(final Exception e, final String context)
throws ManifoldCFException, ServiceInterruption {
final long currentTime = System.currentTimeMillis();
// Server doesn't appear to by up. Try for a brief time then give up.
final String message = "Server appears down during " + context + ": " +
e.getMessage();
Logging.connectors.warn(message, e);
- throw new ServiceInterruption(message, e, currentTime +
interruptionRetryTime, -1L, 3, false);
+ throw new ServiceInterruption(message, e, currentTime + retryInterval,
-1L, retryNumber, false);
}
/*
@@ -1098,16 +1138,11 @@ public class ConfluenceRepositoryConnect
* Process the specific page
* </p>
*
- * @param activeSecurity
- * Security enabled/disabled
- * @param documentIdentifier
- * The original documentIdentifier
- * @param parentRestrictions
- * The list of parent restrictions
- * @param pageId
- * The pageId being an attachment
- * @param version
- * The version of the page
+ * @param activeSecurity Security enabled/disabled
+ * @param documentIdentifier The original documentIdentifier
+ * @param parentRestrictions The list of parent restrictions
+ * @param pageId The pageId being an attachment
+ * @param version The version of the page
* @param activities
* @param doLog
*
@@ -1132,16 +1167,11 @@ public class ConfluenceRepositoryConnect
* Process the specific attachment
* </p>
*
- * @param activeSecurity
- * Security enabled/disabled
- * @param documentIdentifier
- * The original documentIdentifier
- * @param parentRestrictions
- * The list of parent restrictions
- * @param pageId
- * The pageId being an attachment
- * @param version
- * The version of the page
+ * @param activeSecurity Security enabled/disabled
+ * @param documentIdentifier The original documentIdentifier
+ * @param parentRestrictions The list of parent restrictions
+ * @param pageId The pageId being an attachment
+ * @param version The version of the page
* @param activities
* @param doLog
* @throws IOException
@@ -1168,15 +1198,11 @@ public class ConfluenceRepositoryConnect
* Process the specific page
* </p>
*
- * @param activeSecurity
- * Security enabled/disabled
- * @param parentRestrictions
- * The list of parent restrictions
- * @param page
- * The page to process
+ * @param activeSecurity Security enabled/disabled
+ * @param parentRestrictions The list of parent restrictions
+ * @param page The page to process
* @param manifoldDocumentIdentifier
- * @param version
- * The version of the page
+ * @param version The version of the page
* @param activities
* @param doLog
*
@@ -1197,8 +1223,8 @@ public class ConfluenceRepositoryConnect
final DateFormat df = DateFormat.getDateTimeInstance(DateFormat.MEDIUM,
DateFormat.MEDIUM, Locale.ROOT);
/*
- * Retain page in Manifold because it has not changed from last time This
is needed to keep the identifier in Manifold data, because by
- * default if a document is not retained nor ingested, it will be deleted
by the framework
+ * Retain page in Manifold because it has not changed from last time This
is needed to keep the identifier in Manifold data, because by default if a
document is not retained nor
+ * ingested, it will be deleted by the framework
*/
final StringBuilder versionBuilder = new StringBuilder();
versionBuilder.append(df.format(lastModified));
@@ -1342,18 +1368,17 @@ public class ConfluenceRepositoryConnect
* Handles IO Exception to manage whether the exception is an interruption
so that the process needs to be executed again later on
* </p>
*
- * @param e
- * The Exception
+ * @param e The Exception
* @throws ManifoldCFException
* @throws ServiceInterruption
*/
- private static void handleIOException(final IOException e) throws
ManifoldCFException, ServiceInterruption {
+ private void handleIOException(final IOException e) throws
ManifoldCFException, ServiceInterruption {
if (!(e instanceof java.net.SocketTimeoutException) && e instanceof
InterruptedIOException) {
throw new ManifoldCFException("Interrupted: " + e.getMessage(), e,
ManifoldCFException.INTERRUPTED);
}
Logging.connectors.warn("IO exception: " + e.getMessage(), e);
final long currentTime = System.currentTimeMillis();
- throw new ServiceInterruption("IO exception: " + e.getMessage(), e,
currentTime + 300000L, currentTime + 3 * 60 * 60000L, -1, false);
+ throw new ServiceInterruption("IO exception: " + e.getMessage(), e,
currentTime + retryInterval, currentTime + 3 * 60 * 60000L, -1, false);
}
/**
@@ -1361,8 +1386,7 @@ public class ConfluenceRepositoryConnect
* Handles general exceptions
* </p>
*
- * @param e
- * The Exception
+ * @param e The Exception
* @throws ServiceInterruption
* @throws ManifoldCFException
*/
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=1894485&r1=1894484&r2=1894485&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
Fri Oct 22 17:17:42 2021
@@ -27,6 +27,8 @@ ConfluenceRepositoryConnector.SocketTime
ConfluenceRepositoryConnector.ConnectionTimeoutColon=Connection timeout:
ConfluenceRepositoryConnector.UsernameColon=Username:
ConfluenceRepositoryConnector.PasswordColon=Password:
+ConfluenceRepositoryConnector.RetryInterval=Retry interval (in ms):
+ConfluenceRepositoryConnector.RetryNumber=Number of retries:
ConfluenceRepositoryConnector.HostMustNotBeNull=Confluence host must not be
null
ConfluenceRepositoryConnector.HostMustNotIncludeSlash=Confluence host must not
include a '/' character
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=1894485&r1=1894484&r2=1894485&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
Fri Oct 22 17:17:42 2021
@@ -27,6 +27,8 @@ ConfluenceRepositoryConnector.SocketTime
ConfluenceRepositoryConnector.ConnectionTimeoutColon=Connection timeout:
ConfluenceRepositoryConnector.UsernameColon=Nombre de usuario:
ConfluenceRepositoryConnector.PasswordColon=Contraseña:
+ConfluenceRepositoryConnector.RetryInterval=Retry interval (in ms):
+ConfluenceRepositoryConnector.RetryNumber=Number of retries:
ConfluenceRepositoryConnector.HostMustNotBeNull=Confluencia de acogida no debe
ser nulo
ConfluenceRepositoryConnector.HostMustNotIncludeSlash=Confluencia de acogida
no debe incluir una '/' carácter
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=1894485&r1=1894484&r2=1894485&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
Fri Oct 22 17:17:42 2021
@@ -27,6 +27,8 @@ ConfluenceRepositoryConnector.SocketTime
ConfluenceRepositoryConnector.ConnectionTimeoutColon=Connexion timeout:
ConfluenceRepositoryConnector.UsernameColon=Nom d'utilisateur:
ConfluenceRepositoryConnector.PasswordColon=Mot de passe:
+ConfluenceRepositoryConnector.RetryInterval=Intervalle entre les tentatives
(en ms):
+ConfluenceRepositoryConnector.RetryNumber=Nombre de tentatives:
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 '/'
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=1894485&r1=1894484&r2=1894485&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
Fri Oct 22 17:17:42 2021
@@ -27,6 +27,8 @@ ConfluenceRepositoryConnector.SocketTime
ConfluenceRepositoryConnector.ConnectionTimeoutColon=Connection timeout:
ConfluenceRepositoryConnector.UsernameColon=ã¦ã¼ã¶å:
ConfluenceRepositoryConnector.PasswordColon=ãã¹ã¯ã¼ã:
+ConfluenceRepositoryConnector.RetryInterval=Retry interval (in ms):
+ConfluenceRepositoryConnector.RetryNumber=Number of retries:
ConfluenceRepositoryConnector.HostMustNotBeNull=Confluence
ãã¹ãåãæªæå®ã§ã
ConfluenceRepositoryConnector.HostMustNotIncludeSlash=Confluence
ãã¹ãåã«æåã/ããå«ãã¦ã¯ããã¾ãã
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=1894485&r1=1894484&r2=1894485&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
Fri Oct 22 17:17:42 2021
@@ -103,6 +103,22 @@
<input size="16" type="password" id="confluence_password"
name="confluence_password"
value="$Encoder.attributeEscape($CONFLUENCE_PASSWORD)" />
</td>
</tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.RetryInterval'))</nobr>
+ </td>
+ <td class="value">
+ <input size="20" type="text" id="confluence_retryInterval"
name="confluence_retryInterval"
value="$Encoder.attributeEscape($CONFLUENCE_RETRYINTERVAL)"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.RetryNumber'))</nobr>
+ </td>
+ <td class="value">
+ <input size="10" type="text" id="confluence_retryNumber"
name="confluence_retryNumber"
value="$Encoder.attributeEscape($CONFLUENCE_RETRYNUMBER)"/>
+ </td>
+ </tr>
</table>
#else
@@ -115,5 +131,7 @@
<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_retryInterval"
value="$Encoder.attributeEscape($CONFLUENCE_RETRYINTERVAL)"/>
+<input type="hidden" name="confluence_retryNumber"
value="$Encoder.attributeEscape($CONFLUENCE_RETRYNUMBER)"/>
#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=1894485&r1=1894484&r2=1894485&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
Fri Oct 22 17:17:42 2021
@@ -90,6 +90,24 @@
<nobr>********</nobr>
</td>
</tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.RetryInterval'))</nobr>
+ </td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($CONFLUENCE_RETRYINTERVAL)</nobr>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="description">
+
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('ConfluenceRepositoryConnector.RetryNumber'))</nobr>
+ </td>
+ <td class="value">
+ <nobr>$Encoder.bodyEscape($CONFLUENCE_RETRYNUMBER)</nobr>
+ </td>
+ </tr>
</table>
