You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/08/03 20:15:06 UTC
svn commit: r1615426 - in /manifoldcf/trunk: ./
connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/
connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/op...
Author: kwright
Date: Sun Aug 3 18:15:05 2014
New Revision: 1615426
URL: http://svn.apache.org/r1615426
Log:
Fix for CONNECTORS-958, committed on behalf of Emmanuel Keller
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConfig.java
manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnection.java
manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerIndex.java
manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerParam.java
manifoldcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_en_US.properties
manifoldcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.html
manifoldcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration.html
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/included-connectors.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1615426&r1=1615425&r2=1615426&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sun Aug 3 18:15:05 2014
@@ -3,6 +3,10 @@ $Id$
======================= 1.7-dev =====================
+CONNECTORS-958: Update OpenSearchServer connector to handle
+metadata, and deal with more current versions of OpenSearchServer.
+(Emmanuel Keller)
+
CONNECTORS-565: Add connector and plugin support for SharePoint
2013.
(Will Parkinson, Karl Wright)
Modified: manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConfig.java?rev=1615426&r1=1615425&r2=1615426&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConfig.java (original)
+++ manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConfig.java Sun Aug 3 18:15:05 2014
@@ -32,7 +32,7 @@ public class OpenSearchServerConfig exte
*/
final private static ParameterEnum[] CONFIGURATIONLIST = {
ParameterEnum.SERVERLOCATION, ParameterEnum.INDEXNAME,
- ParameterEnum.USERNAME, ParameterEnum.APIKEY };
+ ParameterEnum.USERNAME, ParameterEnum.APIKEY, ParameterEnum.SCHEDULERJOB };
/**
* Build a set of OpenSearchServerParameters by reading ConfigParams. If the
@@ -89,4 +89,9 @@ public class OpenSearchServerConfig exte
final public String getApiKey() {
return get(ParameterEnum.APIKEY);
}
+
+ final public String getSchedulerJob() {
+ return get(ParameterEnum.SCHEDULERJOB);
+ }
+
}
Modified: manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnection.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnection.java?rev=1615426&r1=1615425&r2=1615426&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnection.java (original)
+++ manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnection.java Sun Aug 3 18:15:05 2014
@@ -140,7 +140,8 @@ public class OpenSearchServerConnection
{
HttpResponse resp = client.execute(method);
resultCode = resp.getStatusLine().getStatusCode();
- response = getResponseBodyAsString(resp.getEntity());
+ HttpEntity entity = resp.getEntity();
+ response = EntityUtils.toString(entity, StandardCharsets.UTF_8);
}
finally
{
@@ -171,9 +172,24 @@ public class OpenSearchServerConnection
return response;
}
- public Throwable getException()
+ public void finishUp()
+ throws InterruptedException, HttpException, IOException
{
- return exception;
+ join();
+ Throwable t = exception;
+ if (t != null)
+ {
+ if (t instanceof HttpException)
+ throw (HttpException)t;
+ else if (t instanceof IOException)
+ throw (IOException)t;
+ else if (t instanceof RuntimeException)
+ throw (RuntimeException)t;
+ else if (t instanceof Error)
+ throw (Error)t;
+ else
+ throw new RuntimeException("Unexpected exception thrown: "+t.getMessage(),t);
+ }
}
}
@@ -185,21 +201,7 @@ public class OpenSearchServerConnection
ct.start();
try
{
- ct.join();
- Throwable t = ct.getException();
- if (t != null)
- {
- if (t instanceof HttpException)
- throw (HttpException)t;
- else if (t instanceof IOException)
- throw (IOException)t;
- else if (t instanceof RuntimeException)
- throw (RuntimeException)t;
- else if (t instanceof Error)
- throw (Error)t;
- else
- throw new RuntimeException("Unexpected exception thrown: "+t.getMessage(),t);
- }
+ ct.finishUp();
if (!checkResultCode(ct.getResultCode()))
throw new ManifoldCFException(getResultDescription());
@@ -211,63 +213,26 @@ public class OpenSearchServerConnection
throw new ManifoldCFException("Interrupted: "+e.getMessage(),e,ManifoldCFException.INTERRUPTED);
}
}
- catch (HttpException e)
+ catch (java.net.SocketTimeoutException e)
{
setResult(Result.ERROR, e.getMessage());
- throw new ManifoldCFException(e);
+ throw new ManifoldCFException("SocketTimeoutException while calling " + method.getURI() +": " + e.getMessage(), e);
}
- catch (IOException e)
+ catch (InterruptedIOException e)
{
setResult(Result.ERROR, e.getMessage());
- throw new ManifoldCFException(e);
+ throw new ManifoldCFException("Interrupted: "+e.getMessage(), e, ManifoldCFException.INTERRUPTED);
}
- }
-
- private static String getResponseBodyAsString(HttpEntity entity)
- throws IOException, HttpException {
- InputStream is = entity.getContent();
- if (is != null)
+ catch (HttpException e)
{
- try
- {
- Charset charSet;
- try
- {
- ContentType ct = ContentType.get(entity);
- if (ct == null)
- charSet = StandardCharsets.UTF_8;
- else
- charSet = ct.getCharset();
- }
- catch (ParseException e)
- {
- charSet = StandardCharsets.UTF_8;
- }
- char[] buffer = new char[65536];
- Reader r = new InputStreamReader(is,charSet);
- Writer w = new StringWriter();
- try
- {
- while (true)
- {
- int amt = r.read(buffer);
- if (amt == -1)
- break;
- w.write(buffer,0,amt);
- }
- }
- finally
- {
- w.flush();
- }
- return w.toString();
- }
- finally
- {
- is.close();
- }
+ setResult(Result.ERROR, e.getMessage());
+ throw new ManifoldCFException("HttpException while calling " + method.getURI() +": " + e.getMessage(), e);
+ }
+ catch (IOException e)
+ {
+ setResult(Result.ERROR, e.getMessage());
+ throw new ManifoldCFException("IOException while calling " + method.getURI() +": " + e.getMessage(), e);
}
- return "";
}
private void readXmlResponse() throws ManifoldCFException {
Modified: manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java?rev=1615426&r1=1615425&r2=1615426&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java (original)
+++ manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java Sun Aug 3 18:15:05 2014
@@ -21,8 +21,6 @@ package org.apache.manifoldcf.agents.out
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-
-
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@@ -41,7 +39,6 @@ import org.apache.http.impl.client.Basic
import org.apache.http.config.SocketConfig;
import org.apache.http.client.HttpRequestRetryHandler;
import org.apache.http.protocol.HttpContext;
-
import org.apache.commons.io.FilenameUtils;
import org.apache.manifoldcf.agents.interfaces.IOutputAddActivity;
import org.apache.manifoldcf.agents.interfaces.IOutputNotifyActivity;
@@ -66,13 +63,13 @@ import org.json.JSONObject;
public class OpenSearchServerConnector extends BaseOutputConnector {
- private final static String OPENSEARCHSERVER_INDEXATION_ACTIVITY = "Optimize";
+ private final static String OPENSEARCHSERVER_INDEXATION_ACTIVITY = "Indexation";
private final static String OPENSEARCHSERVER_DELETION_ACTIVITY = "Deletion";
- private final static String OPENSEARCHSERVER_OPTIMIZE_ACTIVITY = "Indexation";
+ private final static String OPENSEARCHSERVER_SCHEDULER_ACTIVITY = "Scheduler";
private final static String[] OPENSEARCHSERVER_ACTIVITIES = {
OPENSEARCHSERVER_INDEXATION_ACTIVITY, OPENSEARCHSERVER_DELETION_ACTIVITY,
- OPENSEARCHSERVER_OPTIMIZE_ACTIVITY };
+ OPENSEARCHSERVER_SCHEDULER_ACTIVITY };
// Tab resources
@@ -130,31 +127,30 @@ public class OpenSearchServerConnector e
{
connectionManager = new PoolingHttpClientConnectionManager();
- int socketTimeout = 900000;
- int connectionTimeout = 60000;
-
- CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-
+ final int executorTimeout = 300000;
+ final int socketTimeout = 60000;
+ final int connectionTimeout = 60000;
+
RequestConfig.Builder requestBuilder = RequestConfig.custom()
- .setCircularRedirectsAllowed(true)
- .setSocketTimeout(socketTimeout)
- .setStaleConnectionCheckEnabled(true)
- .setExpectContinueEnabled(true)
- .setConnectTimeout(connectionTimeout)
- .setConnectionRequestTimeout(socketTimeout);
+ .setCircularRedirectsAllowed(true)
+ .setSocketTimeout(socketTimeout)
+ .setStaleConnectionCheckEnabled(true)
+ .setExpectContinueEnabled(true)
+ .setConnectTimeout(connectionTimeout)
+ .setConnectionRequestTimeout(socketTimeout);
+
+ HttpClientBuilder clientBuilder = HttpClients.custom()
+ .setConnectionManager(connectionManager)
+ .setMaxConnTotal(1)
+ .disableAutomaticRetries()
+ .setDefaultRequestConfig(requestBuilder.build())
+ .setRequestExecutor(new HttpRequestExecutor(executorTimeout))
+ .setDefaultSocketConfig(SocketConfig.custom()
+ .setTcpNoDelay(true)
+ .setSoTimeout(socketTimeout)
+ .build());
- client = HttpClients.custom()
- .setConnectionManager(connectionManager)
- .setMaxConnTotal(1)
- .disableAutomaticRetries()
- .setDefaultRequestConfig(requestBuilder.build())
- .setDefaultSocketConfig(SocketConfig.custom()
- //.setTcpNoDelay(true)
- .setSoTimeout(socketTimeout)
- .build())
- .setDefaultCredentialsProvider(credentialsProvider)
- .setRequestExecutor(new HttpRequestExecutor(socketTimeout))
- .build();
+ client = clientBuilder.build();
}
expirationTime = System.currentTimeMillis() + EXPIRATION_INTERVAL;
@@ -498,13 +494,13 @@ public class OpenSearchServerConnector e
OpenSearchServerConfig config = getConfigParameters(null);
Integer count = addInstance(config);
synchronized (count) {
- InputStream inputStream = document.getBinaryStream();
try {
long startTime = System.currentTimeMillis();
OpenSearchServerIndex oi = new OpenSearchServerIndex(
client,
documentURI,
- inputStream, config);
+ config,
+ document);
activities.recordActivity(startTime,
OPENSEARCHSERVER_INDEXATION_ACTIVITY, document.getBinaryLength(),
documentURI, oi.getResult().name(), oi.getResultDescription());
@@ -545,12 +541,16 @@ public class OpenSearchServerConnector e
throws ManifoldCFException, ServiceInterruption {
HttpClient client = getSession();
long startTime = System.currentTimeMillis();
- OpenSearchServerAction oo = new OpenSearchServerAction(
+ OpenSearchServerConfig config = getConfigParameters(null);
+ String schedulerJob = config.getSchedulerJob();
+ if (schedulerJob != null && schedulerJob.trim().length() > 0) {
+ OpenSearchServerAction oo = new OpenSearchServerAction(
client,
CommandEnum.optimize, getConfigParameters(null));
- activities.recordActivity(startTime, OPENSEARCHSERVER_OPTIMIZE_ACTIVITY,
- null, oo.getCallUrlSnippet(), oo.getResult().name(),
- oo.getResultDescription());
+ activities.recordActivity(startTime, OPENSEARCHSERVER_SCHEDULER_ACTIVITY,
+ null, oo.getCallUrlSnippet(), oo.getResult().name(),
+ oo.getResultDescription());
+ }
}
}
Modified: manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerIndex.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerIndex.java?rev=1615426&r1=1615425&r2=1615426&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerIndex.java (original)
+++ manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerIndex.java Sun Aug 3 18:15:05 2014
@@ -21,6 +21,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPut;
@@ -28,9 +33,10 @@ import org.apache.http.HttpEntity;
import org.apache.http.message.BasicHeader;
import org.apache.http.Header;
import org.apache.http.util.EntityUtils;
-
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.manifoldcf.agents.interfaces.RepositoryDocument;
import org.apache.manifoldcf.core.common.Base64;
import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
@@ -38,15 +44,15 @@ public class OpenSearchServerIndex exten
private static class IndexRequestEntity implements HttpEntity {
- private String documentURI;
+ private final String documentURI;
- private InputStream inputStream;
+ private final RepositoryDocument document;
- private String fileName;
+ private final String fileName;
- public IndexRequestEntity(String documentURI, InputStream inputStream) {
+ public IndexRequestEntity(String documentURI, RepositoryDocument document) {
this.documentURI = documentURI;
- this.inputStream = inputStream;
+ this.document = document;
this.fileName = FilenameUtils.getName(documentURI);
}
@@ -54,14 +60,13 @@ public class OpenSearchServerIndex exten
public boolean isChunked() {
return false;
}
-
+
@Override
@Deprecated
- public void consumeContent()
- throws IOException {
+ public void consumeContent() throws IOException {
EntityUtils.consume(this);
}
-
+
@Override
public boolean isRepeatable() {
return false;
@@ -69,35 +74,80 @@ public class OpenSearchServerIndex exten
@Override
public boolean isStreaming() {
- return false;
+ return true;
}
-
+
@Override
- public InputStream getContent()
- throws IOException, IllegalStateException {
- return inputStream;
+ public InputStream getContent() throws IOException, IllegalStateException {
+ return null;
}
-
+
@Override
public void writeTo(OutputStream out)
throws IOException {
PrintWriter pw = new PrintWriter(out);
- try {
+ boolean bUri = false;
+ try
+ {
pw.println("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
pw.println("<index>);");
- pw.print("<document><field name=\"uri\"><value>");
- pw.print(documentURI);
- pw.println("</value></field>");
- pw.print("<binary fileName=\"");
- pw.print(fileName);
- pw.println("\">");
- Base64 base64 = new Base64();
- base64.encodeStream(inputStream, pw);
- pw.println("</binary></document>");
+ pw.print("<document>");
+ List<String> values = new ArrayList<>(1);
+ Iterator<String> iter = document.getFields();
+ if (iter != null)
+ {
+ while (iter.hasNext())
+ {
+ String fieldName = iter.next();
+ Object[] fieldValues = document.getField(fieldName);
+ if (fieldValues != null && fieldValues.length > 0)
+ {
+ values.clear();
+ for (Object fieldValue : fieldValues)
+ if (fieldValue != null)
+ values.add(fieldValue.toString());
+ if (!values.isEmpty())
+ {
+ if ("uri".equals(fieldName))
+ bUri = true;
+ pw.print("<field name=\"");
+ pw.print(StringEscapeUtils.escapeXml(fieldName));
+ pw.print("\">");
+ for (String value : values)
+ {
+ pw.print("<value><![CDATA[");
+ pw.print(value);
+ pw.print("]]></value>");
+ pw.println("</field>");
+ }
+ }
+ }
+ }
+ }
+ if (!bUri)
+ {
+ pw.print("<document><field name=\"uri\"><value>");
+ pw.print(documentURI);
+ pw.println("</value>");
+ }
+ if (document.getBinaryLength() > 0)
+ {
+ Base64 base64 = new Base64();
+ pw.print("<binary fileName=\"");
+ pw.print(fileName);
+ pw.println("\">");
+ base64.encodeStream(document.getBinaryStream(), pw);
+ pw.println("</binary>");
+ }
+ pw.println("</document>");
pw.println("</index>");
- } catch (ManifoldCFException e) {
- throw new IOException(e.getMessage());
- } finally {
+ }
+ catch (ManifoldCFException e)
+ {
+ throw new IOException(e.getMessage(), e);
+ }
+ finally
+ {
IOUtils.closeQuietly(pw);
}
}
@@ -110,7 +160,7 @@ public class OpenSearchServerIndex exten
@Override
public Header getContentType() {
- return new BasicHeader("Content-type","text/xml; charset=utf-8");
+ return new BasicHeader("Content-type", "text/xml; charset=utf-8");
}
@Override
@@ -118,20 +168,21 @@ public class OpenSearchServerIndex exten
return null;
}
- }
+ }
- public OpenSearchServerIndex(HttpClient client, String documentURI, InputStream inputStream,
- OpenSearchServerConfig config) throws ManifoldCFException {
+ public OpenSearchServerIndex(HttpClient client, String documentURI,
+ OpenSearchServerConfig config, RepositoryDocument document)
+ throws ManifoldCFException {
super(client, config);
StringBuffer url = getApiUrl("update");
HttpPut put = new HttpPut(url.toString());
- put.setEntity(new IndexRequestEntity(documentURI, inputStream));
+ put.setEntity(new IndexRequestEntity(documentURI, document));
call(put);
if ("OK".equals(checkXPath(xPathStatus)))
return;
String error = checkXPath(xPathException);
setResult(Result.ERROR, error);
- System.err.println(getResponse());
+ throw new ManifoldCFException("Error, unexpected response: " + error);
}
}
Modified: manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerParam.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerParam.java?rev=1615426&r1=1615425&r2=1615426&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerParam.java (original)
+++ manifoldcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerParam.java Sun Aug 3 18:15:05 2014
@@ -35,6 +35,8 @@ public class OpenSearchServerParam exten
USERNAME(""),
APIKEY(""),
+
+ SCHEDULERJOB(""),
FIELDLIST(""),
Modified: manifoldcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_en_US.properties?rev=1615426&r1=1615425&r2=1615426&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_en_US.properties (original)
+++ manifoldcf/trunk/connectors/opensearchserver/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/opensearchserver/common_en_US.properties Sun Aug 3 18:15:05 2014
@@ -21,6 +21,7 @@ OpenSearchServerConnector.ServerLocation
OpenSearchServerConnector.IndexNameColon=Index name:
OpenSearchServerConnector.UserNameColon=User name:
OpenSearchServerConnector.APIKeyColon=API key:
+OpenSearchServerConnector.SchedulerJob=Final scheduler job:
OpenSearchServerConnector.PleaseSupplyValidLocation=Please supply a valid OpenSearchServer server location
OpenSearchServerConnector.PleaseSupplyValidIndexName=Please supply a valid index name
Modified: manifoldcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.html?rev=1615426&r1=1615425&r2=1615426&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.html (original)
+++ manifoldcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/editConfiguration.html Sun Aug 3 18:15:05 2014
@@ -42,6 +42,11 @@
<td class="value"><input name="apikey" type="text" value="$Encoder.attributeEscape($APIKEY)"
size="40" /></td>
</tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.SchedulerJob'))</nobr></td>
+ <td class="value"><input name="schedulerjob" type="text"
+ value="$Encoder.attributeEscape($SCHEDULERJOB)" size="24" /></td>
+ </tr>
</table>
#else
@@ -50,5 +55,6 @@
<input type="hidden" name="indexname" value="$Encoder.attributeEscape($INDEXNAME)" />
<input type="hidden" name="username" value="$Encoder.attributeEscape($USERNAME)" />
<input type="hidden" name="apikey" value="$Encoder.attributeEscape($APIKEY)" />
+<input type="hidden" name="schedulerjob" value="$Encoder.attributeEscape($SCHEDULERJOB)" />
#end
Modified: manifoldcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration.html?rev=1615426&r1=1615425&r2=1615426&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration.html (original)
+++ manifoldcf/trunk/connectors/opensearchserver/connector/src/main/resources/org/apache/manifoldcf/agents/output/opensearchserver/viewConfiguration.html Sun Aug 3 18:15:05 2014
@@ -32,4 +32,8 @@
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.APIKeyColon'))</nobr></td>
<td class="value">$Encoder.bodyEscape($APIKEY)</td>
</tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('OpenSearchServerConnector.SchedulerJob'))</nobr></td>
+ <td class="value">$Encoder.bodyEscape($SCHEDULERJOB)</td>
+ </tr>
</table>
\ No newline at end of file
Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/included-connectors.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/included-connectors.xml?rev=1615426&r1=1615425&r2=1615426&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/included-connectors.xml (original)
+++ manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/included-connectors.xml Sun Aug 3 18:15:05 2014
@@ -49,7 +49,7 @@
<tr><td>Wiki</td><td> Pure Java </td><td>N/A</td><td> N/A </td><td>Wiki version 1.8 and above </td></tr>
<tr><td>LiveLink (OpenText)</td><td> Pure Java </td><td> Win </td><td> LAPI 9.7.1, 10.2.0 </td><td> Tested with 9.2.0 - 10.2.0 </td></tr>
<tr><td>Solr</td><td> Pure Java </td><td> N/A </td><td> N/A</td><td> Tested with Solr 1.4, 3.6.2, 4.0.0, 4.1.0, 4.2.0, 4.3.0, 4.5.1 </td></tr>
- <tr><td>OpenSearchServer</td><td> Pure Java </td><td> N/A </td><td> N/A</td><td> Tested with OpenSearchServer 1.2.1, 1.2.2, 1.2.3 </td></tr>
+ <tr><td>OpenSearchServer</td><td> Pure Java </td><td> N/A </td><td> N/A</td><td> Tested with OpenSearchServer 1.2.1, 1.2.2, 1.2.3, 1.3, 1.4, 1.5.x </td></tr>
<tr><td>ElasticSearch</td><td> Pure Java </td><td> N/A </td><td> N/A</td><td> Tested with ElasticSearch 0.18.3, 0.18.4, 0.18.5, 0.18.6, 0.18.7 </td></tr>
<tr><td>Documentum (EMC)</td><td> Win, RedHat </td><td> Win, RedHat </td><td> Tested with DFC 5.3 SP5 </td><td> Tested against 5.3, 6.0, and 6.5 servers </td></tr>
<tr><td>SharePoint (MSFT)</td><td>Pure Java </td><td>Win</td><td> N/A </td><td> Tested with SharePoint 2003 (2.0), 2007 (3.0), 2010 (4.0), 2013 (5.0)</td></tr>