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/11/17 19:10:04 UTC
svn commit: r1640199 [1/2] - in /manifoldcf/trunk: ./ connectors/sharepoint/
connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/
connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/cra...
Author: kwright
Date: Mon Nov 17 18:10:04 2014
New Revision: 1640199
URL: http://svn.apache.org/r1640199
Log:
Tentative fix for CONNECTORS-1104.
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/sharepoint/ (props changed)
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties
manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties
manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_zh_CN.properties
manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_en_US.properties
manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_ja_JP.properties
manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_zh_CN.properties
manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js
manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js
manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html
manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html
manifoldcf/trunk/framework/connector-common/src/main/resources/org/ (props changed)
manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/ (props changed)
manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/manifoldcf/ (props changed)
manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/ (props changed)
manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/ (props changed)
manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/manifoldcf/connectorcommon/common/client-config.wsdd (props changed)
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-1104:r1640149-1640198
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Nov 17 18:10:04 2014
@@ -3,6 +3,9 @@ $Id$
======================= 2.0-dev =====================
+CONNECTORS-1104: Add proxy support to SharePoint connector.
+(Karl Wright)
+
CONNECTORS-1102: Don't do a hard reindex on jobqueue.restart,
since it is expensive and may be unnecessary.
(Aeham Abushwashi, Karl Wright)
Propchange: manifoldcf/trunk/connectors/sharepoint/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint:r1640149-1640198
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java Mon Nov 17 18:10:04 2014
@@ -56,6 +56,7 @@ import org.apache.http.impl.client.Defau
import org.apache.http.util.EntityUtils;
import org.apache.http.client.HttpRequestRetryHandler;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.HttpHost;
/** This is the native SharePoint implementation of the IAuthorityConnector interface.
@@ -90,6 +91,12 @@ public class SharePointAuthority extends
private String encodedServerLocation = null;
private String keystoreData = null;
+ private String proxyHost = null;
+ private String proxyPortString = null;
+ private String proxyUsername = null;
+ private String proxyPassword = null;
+ private String proxyDomain = null;
+
private String cacheLRUsize = null;
private String cacheLifetime = null;
@@ -205,6 +212,12 @@ public class SharePointAuthority extends
ntlmDomain = null;
}
+ proxyHost = params.getParameter(SharePointConfig.PARAM_PROXYHOST);
+ proxyPortString = params.getParameter(SharePointConfig.PARAM_PROXYPORT);
+ proxyUsername = params.getParameter(SharePointConfig.PARAM_PROXYUSER);
+ proxyPassword = params.getParameter(SharePointConfig.PARAM_PROXYPASSWORD);
+ proxyDomain = params.getParameter(SharePointConfig.PARAM_PROXYDOMAIN);
+
keystoreData = params.getParameter(SharePointConfig.PARAM_SERVERKEYSTORE);
}
@@ -289,6 +302,12 @@ public class SharePointAuthority extends
encodedServerLocation = null;
serverPort = -1;
+ proxyHost = null;
+ proxyPortString = null;
+ proxyUsername = null;
+ proxyPassword = null;
+ proxyDomain = null;
+
keystoreData = null;
keystoreManager = null;
@@ -484,6 +503,28 @@ public class SharePointAuthority extends
certificates.add(certificate);
}
+ String proxyHost = parameters.getParameter(SharePointConfig.PARAM_PROXYHOST);
+ if (proxyHost == null)
+ proxyHost = "";
+
+ String proxyPort = parameters.getParameter(SharePointConfig.PARAM_PROXYPORT);
+ if (proxyPort == null)
+ proxyPort = "";
+
+ String proxyUser = parameters.getParameter(SharePointConfig.PARAM_PROXYUSER);
+ if (proxyUser == null)
+ proxyUser = "";
+
+ String proxyPassword = parameters.getParameter(SharePointConfig.PARAM_PROXYPASSWORD);
+ if (proxyPassword == null)
+ proxyPassword = "";
+ else
+ proxyPassword = out.mapPasswordToKey(proxyPassword);
+
+ String proxyDomain = parameters.getParameter(SharePointConfig.PARAM_PROXYDOMAIN);
+ if (proxyDomain == null)
+ proxyDomain = "";
+
// Fill in context
velocityContext.put("SERVERVERSION", serverVersion);
velocityContext.put("SERVERCLAIMSPACE", serverClaimSpace);
@@ -491,12 +532,18 @@ public class SharePointAuthority extends
velocityContext.put("SERVERNAME", serverName);
velocityContext.put("SERVERPORT", serverPort);
velocityContext.put("SERVERLOCATION", serverLocation);
- velocityContext.put("USERNAME", userName);
- velocityContext.put("PASSWORD", password);
+ velocityContext.put("SERVERUSERNAME", userName);
+ velocityContext.put("SERVERPASSWORD", password);
if (keystore != null)
velocityContext.put("KEYSTORE", keystore);
velocityContext.put("CERTIFICATELIST", certificates);
-
+
+ velocityContext.put("PROXYHOST", proxyHost);
+ velocityContext.put("PROXYPORT", proxyPort);
+ velocityContext.put("PROXYUSER", proxyUser);
+ velocityContext.put("PROXYPASSWORD", proxyPassword);
+ velocityContext.put("PROXYDOMAIN", proxyDomain);
+
}
protected static void fillInCacheTab(Map<String,Object> velocityContext, IPasswordMapperActivity mapper, ConfigParams parameters)
@@ -560,14 +607,34 @@ public class SharePointAuthority extends
if (serverLocation != null)
parameters.setParameter(SharePointConfig.PARAM_SERVERLOCATION,serverLocation);
- String userName = variableContext.getParameter("userName");
+ String userName = variableContext.getParameter("serverUserName");
if (userName != null)
parameters.setParameter(SharePointConfig.PARAM_SERVERUSERNAME,userName);
- String password = variableContext.getParameter("password");
+ String password = variableContext.getParameter("serverPassword");
if (password != null)
parameters.setObfuscatedParameter(SharePointConfig.PARAM_SERVERPASSWORD,variableContext.mapKeyToPassword(password));
+ String proxyHost = variableContext.getParameter("proxyhost");
+ if (proxyHost != null)
+ parameters.setParameter(SharePointConfig.PARAM_PROXYHOST,proxyHost);
+
+ String proxyPort = variableContext.getParameter("proxyport");
+ if (proxyPort != null)
+ parameters.setParameter(SharePointConfig.PARAM_PROXYPORT,proxyPort);
+
+ String proxyUser = variableContext.getParameter("proxyuser");
+ if (proxyUser != null)
+ parameters.setParameter(SharePointConfig.PARAM_PROXYUSER,proxyUser);
+
+ String proxyPassword = variableContext.getParameter("proxypassword");
+ if (proxyPassword != null)
+ parameters.setObfuscatedParameter(SharePointConfig.PARAM_PROXYPASSWORD,variableContext.mapKeyToPassword(proxyPassword));
+
+ String proxyDomain = variableContext.getParameter("proxydomain");
+ if (proxyDomain != null)
+ parameters.setParameter(SharePointConfig.PARAM_PROXYDOMAIN,proxyDomain);
+
String keystoreValue = variableContext.getParameter("keystoredata");
if (keystoreValue != null)
parameters.setParameter(SharePointConfig.PARAM_SERVERKEYSTORE,keystoreValue);
@@ -693,6 +760,19 @@ public class SharePointAuthority extends
throw new ManifoldCFException(e.getMessage(),e);
}
+ int proxyPort = 8080;
+ if (proxyPortString != null && proxyPortString.length() > 0)
+ {
+ try
+ {
+ proxyPort = Integer.parseInt(proxyPortString);
+ }
+ catch (NumberFormatException e)
+ {
+ throw new ManifoldCFException(e.getMessage(),e);
+ }
+ }
+
serverUrl = serverProtocol + "://" + serverName;
if (serverProtocol.equals("https"))
{
@@ -738,6 +818,28 @@ public class SharePointAuthority extends
.setConnectTimeout(connectionTimeout)
.setConnectionRequestTimeout(socketTimeout);
+ // If there's a proxy, set that too.
+ if (proxyHost != null && proxyHost.length() > 0)
+ {
+
+ // Configure proxy authentication
+ if (proxyUsername != null && proxyUsername.length() > 0)
+ {
+ if (proxyPassword == null)
+ proxyPassword = "";
+ if (proxyDomain == null)
+ proxyDomain = "";
+
+ credentialsProvider.setCredentials(
+ new AuthScope(proxyHost, proxyPort),
+ new NTCredentials(proxyUsername, proxyPassword, currentHost, proxyDomain));
+ }
+
+ HttpHost proxy = new HttpHost(proxyHost, proxyPort);
+
+ requestBuilder.setProxy(proxy);
+ }
+
HttpClientBuilder builder = HttpClients.custom()
.setConnectionManager(connectionManager)
.setMaxConnTotal(1)
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java Mon Nov 17 18:10:04 2014
@@ -50,6 +50,16 @@ public class SharePointConfig
public static final String PARAM_SERVERPASSWORD = "password";
/** SharePoint server certificate store */
public static final String PARAM_SERVERKEYSTORE = "keystore";
+ /** Proxy host */
+ public static final String PARAM_PROXYHOST = "proxyHost";
+ /** Proxy port */
+ public static final String PARAM_PROXYPORT = "proxyPort";
+ /** Proxy user name */
+ public static final String PARAM_PROXYUSER = "proxyUser";
+ /** Proxy password */
+ public static final String PARAM_PROXYPASSWORD = "proxyPassword";
+ /** Proxy authentication domain */
+ public static final String PARAM_PROXYDOMAIN = "proxyDomain";
// Nodes
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java Mon Nov 17 18:10:04 2014
@@ -43,7 +43,17 @@ public class SharePointConfig
public static final String PARAM_SERVERPASSWORD = "password";
/** SharePoint server certificate store */
public static final String PARAM_SERVERKEYSTORE = "keystore";
-
+ /** Proxy host */
+ public static final String PARAM_PROXYHOST = "proxyHost";
+ /** Proxy port */
+ public static final String PARAM_PROXYPORT = "proxyPort";
+ /** Proxy user name */
+ public static final String PARAM_PROXYUSER = "proxyUser";
+ /** Proxy password */
+ public static final String PARAM_PROXYPASSWORD = "proxyPassword";
+ /** Proxy authentication domain */
+ public static final String PARAM_PROXYDOMAIN = "proxyDomain";
+
/** Authority type */
public static final String PARAM_AUTHORITYTYPE = "authorityType";
}
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java Mon Nov 17 18:10:04 2014
@@ -66,6 +66,7 @@ import org.apache.http.impl.client.Defau
import org.apache.http.util.EntityUtils;
import org.apache.http.client.HttpRequestRetryHandler;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.HttpHost;
/** This is the "repository connector" for Microsoft SharePoint.
* Document identifiers for this connector come in three forms:
@@ -216,6 +217,24 @@ public class SharePointRepository extend
ntlmDomain = null;
}
+ String proxyHost = params.getParameter(SharePointConfig.PARAM_PROXYHOST);
+ String proxyPortString = params.getParameter(SharePointConfig.PARAM_PROXYPORT);
+ int proxyPort = 8080;
+ if (proxyPortString != null && proxyPortString.length() > 0)
+ {
+ try
+ {
+ proxyPort = Integer.parseInt(proxyPortString);
+ }
+ catch (NumberFormatException e)
+ {
+ throw new ManifoldCFException(e.getMessage(),e);
+ }
+ }
+ String proxyUsername = params.getParameter(SharePointConfig.PARAM_PROXYUSER);
+ String proxyPassword = params.getParameter(SharePointConfig.PARAM_PROXYPASSWORD);
+ String proxyDomain = params.getParameter(SharePointConfig.PARAM_PROXYDOMAIN);
+
serverUrl = serverProtocol + "://" + serverName;
if (serverProtocol.equals("https"))
{
@@ -262,6 +281,28 @@ public class SharePointRepository extend
.setConnectTimeout(connectionTimeout)
.setConnectionRequestTimeout(socketTimeout);
+ // If there's a proxy, set that too.
+ if (proxyHost != null && proxyHost.length() > 0)
+ {
+
+ // Configure proxy authentication
+ if (proxyUsername != null && proxyUsername.length() > 0)
+ {
+ if (proxyPassword == null)
+ proxyPassword = "";
+ if (proxyDomain == null)
+ proxyDomain = "";
+
+ credentialsProvider.setCredentials(
+ new AuthScope(proxyHost, proxyPort),
+ new NTCredentials(proxyUsername, proxyPassword, currentHost, proxyDomain));
+ }
+
+ HttpHost proxy = new HttpHost(proxyHost, proxyPort);
+
+ requestBuilder.setProxy(proxy);
+ }
+
HttpClientBuilder builder = HttpClients.custom()
.setConnectionManager(connectionManager)
.setMaxConnTotal(1)
@@ -2228,14 +2269,34 @@ public class SharePointRepository extend
if (serverLocation != null)
parameters.setParameter(SharePointConfig.PARAM_SERVERLOCATION,serverLocation);
- String userName = variableContext.getParameter("userName");
+ String userName = variableContext.getParameter("serverUserName");
if (userName != null)
parameters.setParameter(SharePointConfig.PARAM_SERVERUSERNAME,userName);
- String password = variableContext.getParameter("password");
+ String password = variableContext.getParameter("serverPassword");
if (password != null)
parameters.setObfuscatedParameter(SharePointConfig.PARAM_SERVERPASSWORD,variableContext.mapKeyToPassword(password));
+ String proxyHost = variableContext.getParameter("proxyhost");
+ if (proxyHost != null)
+ parameters.setParameter(SharePointConfig.PARAM_PROXYHOST,proxyHost);
+
+ String proxyPort = variableContext.getParameter("proxyport");
+ if (proxyPort != null)
+ parameters.setParameter(SharePointConfig.PARAM_PROXYPORT,proxyPort);
+
+ String proxyUser = variableContext.getParameter("proxyuser");
+ if (proxyUser != null)
+ parameters.setParameter(SharePointConfig.PARAM_PROXYUSER,proxyUser);
+
+ String proxyPassword = variableContext.getParameter("proxypassword");
+ if (proxyPassword != null)
+ parameters.setObfuscatedParameter(SharePointConfig.PARAM_PROXYPASSWORD,variableContext.mapKeyToPassword(proxyPassword));
+
+ String proxyDomain = variableContext.getParameter("proxydomain");
+ if (proxyDomain != null)
+ parameters.setParameter(SharePointConfig.PARAM_PROXYDOMAIN,proxyDomain);
+
String keystoreValue = variableContext.getParameter("keystoredata");
if (keystoreValue != null)
parameters.setParameter(SharePointConfig.PARAM_SERVERKEYSTORE,keystoreValue);
@@ -2385,18 +2446,45 @@ public class SharePointRepository extend
certificates.add(certificate);
}
+ String proxyHost = parameters.getParameter(SharePointConfig.PARAM_PROXYHOST);
+ if (proxyHost == null)
+ proxyHost = "";
+
+ String proxyPort = parameters.getParameter(SharePointConfig.PARAM_PROXYPORT);
+ if (proxyPort == null)
+ proxyPort = "";
+
+ String proxyUser = parameters.getParameter(SharePointConfig.PARAM_PROXYUSER);
+ if (proxyUser == null)
+ proxyUser = "";
+
+ String proxyPassword = parameters.getParameter(SharePointConfig.PARAM_PROXYPASSWORD);
+ if (proxyPassword == null)
+ proxyPassword = "";
+ else
+ proxyPassword = out.mapPasswordToKey(proxyPassword);
+
+ String proxyDomain = parameters.getParameter(SharePointConfig.PARAM_PROXYDOMAIN);
+ if (proxyDomain == null)
+ proxyDomain = "";
+
// Fill in context
velocityContext.put("SERVERVERSION", serverVersion);
velocityContext.put("SERVERPROTOCOL", serverProtocol);
velocityContext.put("SERVERNAME", serverName);
velocityContext.put("SERVERPORT", serverPort);
velocityContext.put("SERVERLOCATION", serverLocation);
- velocityContext.put("USERNAME", userName);
- velocityContext.put("PASSWORD", password);
+ velocityContext.put("SERVERUSERNAME", userName);
+ velocityContext.put("SERVERPASSWORD", password);
if (keystore != null)
velocityContext.put("KEYSTORE", keystore);
velocityContext.put("CERTIFICATELIST", certificates);
+ velocityContext.put("PROXYHOST", proxyHost);
+ velocityContext.put("PROXYPORT", proxyPort);
+ velocityContext.put("PROXYUSER", proxyUser);
+ velocityContext.put("PROXYPASSWORD", proxyPassword);
+ velocityContext.put("PROXYDOMAIN", proxyDomain);
}
/** Output the specification header section.
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties Mon Nov 17 18:10:04 2014
@@ -76,6 +76,11 @@ SharePointAuthority.AuthorizationModelCo
SharePointAuthority.Classic=Classic
SharePointAuthority.ClaimSpace=Claim Space
+SharePointAuthority.ProxyHost=Proxy host:
+SharePointAuthority.ProxyPort=Proxy port:
+SharePointAuthority.ProxyUser=Proxy user name:
+SharePointAuthority.ProxyPassword=Proxy password:
+SharePointAuthority.ProxyDomain=Proxy domain:
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties Mon Nov 17 18:10:04 2014
@@ -75,3 +75,9 @@ SharePointAuthority.AuthorizationModel=A
SharePointAuthority.AuthorizationModelColon=Authorization model:
SharePointAuthority.Classic=Classic
SharePointAuthority.ClaimSpace=Claim Space
+
+SharePointAuthority.ProxyHost=Proxy host:
+SharePointAuthority.ProxyPort=Proxy port:
+SharePointAuthority.ProxyUser=Proxy user name:
+SharePointAuthority.ProxyPassword=Proxy password:
+SharePointAuthority.ProxyDomain=Proxy domain:
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_zh_CN.properties?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_zh_CN.properties (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_zh_CN.properties Mon Nov 17 18:10:04 2014
@@ -75,3 +75,9 @@ SharePointAuthority.AuthorizationModel=�
SharePointAuthority.AuthorizationModelColon=ææ模å:
SharePointAuthority.Classic=ç»å
¸
SharePointAuthority.ClaimSpace=Claim空é´
+
+SharePointAuthority.ProxyHost=Proxy host:
+SharePointAuthority.ProxyPort=Proxy port:
+SharePointAuthority.ProxyUser=Proxy user name:
+SharePointAuthority.ProxyPassword=Proxy password:
+SharePointAuthority.ProxyDomain=Proxy domain:
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_en_US.properties?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_en_US.properties (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_en_US.properties Mon Nov 17 18:10:04 2014
@@ -143,4 +143,8 @@ SharePointRepository.AddTextToMetadataRu
SharePointRepository.DeleteMapping=Delete mapping #
SharePointRepository.DeletePathMapping=Delete Path Mapping
SharePointRepository.Enabled2=Enabled
-
+SharePointRepository.ProxyHost=Proxy host:
+SharePointRepository.ProxyPort=Proxy port:
+SharePointRepository.ProxyUser=Proxy user name:
+SharePointRepository.ProxyPassword=Proxy password:
+SharePointRepository.ProxyDomain=Proxy domain:
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_ja_JP.properties?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_ja_JP.properties (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_ja_JP.properties Mon Nov 17 18:10:04 2014
@@ -148,3 +148,9 @@ SharePointRepository.DeleteMapping=ã�
SharePointRepository.DeletePathMapping=ãã¹ããããåé¤
SharePointRepository.Enabled2=æå¹
+SharePointRepository.ProxyHost=Proxy host:
+SharePointRepository.ProxyPort=Proxy port:
+SharePointRepository.ProxyUser=Proxy user name:
+SharePointRepository.ProxyPassword=Proxy password:
+SharePointRepository.ProxyDomain=Proxy domain:
+
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_zh_CN.properties?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_zh_CN.properties (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_zh_CN.properties Mon Nov 17 18:10:04 2014
@@ -148,3 +148,8 @@ SharePointRepository.DeleteMapping=å�
SharePointRepository.DeletePathMapping=å é¤è·¯å¾æ å°
SharePointRepository.Enabled2=ææ
+SharePointRepository.ProxyHost=Proxy host:
+SharePointRepository.ProxyPort=Proxy port:
+SharePointRepository.ProxyUser=Proxy user name:
+SharePointRepository.ProxyPassword=Proxy password:
+SharePointRepository.ProxyDomain=Proxy domain:
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js Mon Nov 17 18:10:04 2014
@@ -25,6 +25,12 @@ function checkConfig()
editconnection.serverPort.focus();
return false;
}
+ if (editconnection.proxyport.value != "" && !isInteger(editconnection.proxyport.value))
+ {
+ alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.PleaseSupplyAValidNumber'))");
+ editconnection.proxyport.focus();
+ return false;
+ }
if (editconnection.serverName.value.indexOf("/") >= 0)
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.PleaseSpecifyAnyServerPathInformation'))");
@@ -44,10 +50,10 @@ function checkConfig()
editconnection.serverLocation.focus();
return false;
}
- if (editconnection.userName.value != "" && editconnection.userName.value.indexOf("\\") <= 0)
+ if (editconnection.serverUserName.value != "" && editconnection.serverUserName.value.indexOf("\\") <= 0)
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.AValidSharePointUserNameHasTheForm'))");
- editconnection.userName.focus();
+ editconnection.serverUserName.focus();
return false;
}
return true;
@@ -119,11 +125,11 @@ function checkConfigForSave()
editconnection.serverPort.focus();
return false;
}
- if (editconnection.userName.value != "" && editconnection.userName.value.indexOf("\\") <= 0)
+ if (editconnection.serverUserName.value != "" && editconnection.serverUserName.value.indexOf("\\") <= 0)
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.TheConnectionRequiresAValidSharePointUserName'))");
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointAuthority.Server'))");
- editconnection.userName.focus();
+ editconnection.serverUserName.focus();
return false;
}
return true;
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html Mon Nov 17 18:10:04 2014
@@ -98,12 +98,34 @@
</tr>
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.UserName'))</nobr></td>
- <td class="value"><input type="text" size="32" name="userName" value="$Encoder.attributeEscape($USERNAME)"/></td>
+ <td class="value"><input type="text" size="32" name="serverUserName" value="$Encoder.attributeEscape($SERVERUSERNAME)"/></td>
</tr>
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.Password'))</nobr></td>
- <td class="value"><input type="password" size="32" name="password" value="$Encoder.attributeEscape($PASSWORD)"/></td>
+ <td class="value"><input type="password" size="32" name="serverPassword" value="$Encoder.attributeEscape($SERVERPASSWORD)"/></td>
</tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ProxyHost'))</nobr></td>
+ <td class="value"><input type="text" size="64" name="proxyhost" value="$Encoder.attributeEscape($PROXYHOST)"/></td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ProxyPort'))</nobr></td>
+ <td class="value"><input type="text" size="5" name="proxyport" value="$PROXYPORT"/></td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ProxyUser'))</nobr></td>
+ <td class="value"><input type="text" size="32" name="proxyuser" value="$Encoder.attributeEscape($PROXYUSER)"/></td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ProxyPassword'))</nobr></td>
+ <td class="value"><input type="password" size="32" name="proxypassword" value="$Encoder.attributeEscape($PROXYPASSWORD)"/></td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ProxyDomain'))</nobr></td>
+ <td class="value"><input type="text" size="32" name="proxydomain" value="$Encoder.attributeEscape($PROXYDOMAIN)"/></td>
+ </tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.SSLCertificateList'))</nobr></td>
<td class="value">
@@ -140,7 +162,12 @@
<input type="hidden" name="serverName" value="$Encoder.attributeEscape($SERVERNAME)"/>
<input type="hidden" name="serverPort" value="$SERVERPORT"/>
<input type="hidden" name="serverLocation" value="$Encoder.attributeEscape($SERVERLOCATION)"/>
-<input type="hidden" name="userName" value="$Encoder.attributeEscape($USERNAME)"/>
-<input type="hidden" name="password" value="$Encoder.attributeEscape($PASSWORD)"/>
+<input type="hidden" name="serverUserName" value="$Encoder.attributeEscape($SERVERUSERNAME)"/>
+<input type="hidden" name="serverPassword" value="$Encoder.attributeEscape($SERVERPASSWORD)"/>
+<input type="hidden" name="proxyhost" value="$Encoder.attributeEscape($PROXYHOST)"/>
+<input type="hidden" name="proxyport" value="$Encoder.attributeEscape($PROXYPORT)"/>
+<input type="hidden" name="proxyuser" value="$Encoder.attributeEscape($PROXYUSER)"/>
+<input type="hidden" name="proxypassword" value="$Encoder.attributeEscape($PROXYPASSWORD)"/>
+<input type="hidden" name="proxydomain" value="$Encoder.attributeEscape($PROXYDOMAIN)"/>
#end
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html Mon Nov 17 18:10:04 2014
@@ -71,7 +71,7 @@
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.UserName'))</nobr></td>
<td class="value">
- $Encoder.bodyEscape($USERNAME)
+ $Encoder.bodyEscape($SERVERUSERNAME)
</td>
</tr>
<tr>
@@ -80,6 +80,42 @@
********
</td>
</tr>
+
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ProxyHost'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($PROXYHOST)
+ </td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ProxyPort'))</nobr></td>
+ <td class="value">
+ $PROXYPORT
+ </td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ProxyUser'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($PROXYUSER)
+ </td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ProxyPassword'))</nobr></td>
+ <td class="value">
+ ********
+ </td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.ProxyDomain'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($PROXYDOMAIN)
+ </td>
+ </tr>
+
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointAuthority.SSLCertificateList'))</nobr></td>
<td class="value">
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js Mon Nov 17 18:10:04 2014
@@ -46,6 +46,12 @@ function checkConfig()
editconnection.serverPort.focus();
return false;
}
+ if (editconnection.proxyport.value != "" && !isInteger(editconnection.proxyport.value))
+ {
+ alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointRepository.PleaseSupplyAValidNumber'))");
+ editconnection.proxyport.focus();
+ return false;
+ }
if (editconnection.serverName.value.indexOf("/") >= 0)
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointRepository.PleaseSpecifyAnyServerPathInformation'))");
@@ -65,10 +71,10 @@ function checkConfig()
editconnection.serverLocation.focus();
return false;
}
- if (editconnection.userName.value != "" && editconnection.userName.value.indexOf("\\") <= 0)
+ if (editconnection.serverUserName.value != "" && editconnection.serverUserName.value.indexOf("\\") <= 0)
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointRepository.AValidSharePointUserNameHasTheForm'))");
- editconnection.userName.focus();
+ editconnection.serverUserName.focus();
return false;
}
return true;
@@ -112,11 +118,11 @@ function checkConfigForSave()
editconnection.serverPort.focus();
return false;
}
- if (editconnection.userName.value != "" && editconnection.userName.value.indexOf("\\") <= 0)
+ if (editconnection.serverUserName.value != "" && editconnection.serverUserName.value.indexOf("\\") <= 0)
{
alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointRepository.TheConnectionRequiresAValidSharePointUserName'))");
SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('SharePointRepository.Server'))");
- editconnection.userName.focus();
+ editconnection.serverUserName.focus();
return false;
}
return true;
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html Mon Nov 17 18:10:04 2014
@@ -81,12 +81,34 @@
</tr>
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.UserName'))</nobr></td>
- <td class="value"><input type="text" size="32" name="userName" value="$Encoder.attributeEscape($USERNAME)"/></td>
+ <td class="value"><input type="text" size="32" name="serverUserName" value="$Encoder.attributeEscape($SERVERUSERNAME)"/></td>
</tr>
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.Password'))</nobr></td>
- <td class="value"><input type="password" size="32" name="password" value="$Encoder.attributeEscape($PASSWORD)"/></td>
+ <td class="value"><input type="password" size="32" name="serverPassword" value="$Encoder.attributeEscape($SERVERPASSWORD)"/></td>
</tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.ProxyHost'))</nobr></td>
+ <td class="value"><input type="text" size="64" name="proxyhost" value="$Encoder.attributeEscape($PROXYHOST)"/></td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.ProxyPort'))</nobr></td>
+ <td class="value"><input type="text" size="5" name="proxyport" value="$PROXYPORT"/></td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.ProxyUser'))</nobr></td>
+ <td class="value"><input type="text" size="32" name="proxyuser" value="$Encoder.attributeEscape($PROXYUSER)"/></td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.ProxyPassword'))</nobr></td>
+ <td class="value"><input type="password" size="32" name="proxypassword" value="$Encoder.attributeEscape($PROXYPASSWORD)"/></td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.ProxyDomain'))</nobr></td>
+ <td class="value"><input type="text" size="32" name="proxydomain" value="$Encoder.attributeEscape($PROXYDOMAIN)"/></td>
+ </tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.SSLCertificateList'))</nobr></td>
<td class="value">
@@ -113,6 +135,7 @@
<input name="shpcertificate" size="50" type="file"/>
</td>
</tr>
+
</table>
#else
@@ -121,7 +144,12 @@
<input type="hidden" name="serverName" value="$Encoder.attributeEscape($SERVERNAME)"/>
<input type="hidden" name="serverPort" value="$SERVERPORT"/>
<input type="hidden" name="serverLocation" value="$Encoder.attributeEscape($SERVERLOCATION)"/>
-<input type="hidden" name="userName" value="$Encoder.attributeEscape($USERNAME)"/>
-<input type="hidden" name="password" value="$Encoder.attributeEscape($PASSWORD)"/>
+<input type="hidden" name="serverUserName" value="$Encoder.attributeEscape($SERVERUSERNAME)"/>
+<input type="hidden" name="serverPassword" value="$Encoder.attributeEscape($SERVERPASSWORD)"/>
+<input type="hidden" name="proxyhost" value="$Encoder.attributeEscape($PROXYHOST)"/>
+<input type="hidden" name="proxyport" value="$Encoder.attributeEscape($PROXYPORT)"/>
+<input type="hidden" name="proxyuser" value="$Encoder.attributeEscape($PROXYUSER)"/>
+<input type="hidden" name="proxypassword" value="$Encoder.attributeEscape($PROXYPASSWORD)"/>
+<input type="hidden" name="proxydomain" value="$Encoder.attributeEscape($PROXYDOMAIN)"/>
#end
Modified: manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html?rev=1640199&r1=1640198&r2=1640199&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html (original)
+++ manifoldcf/trunk/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html Mon Nov 17 18:10:04 2014
@@ -59,7 +59,7 @@
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.UserName'))</nobr></td>
<td class="value">
- $Encoder.bodyEscape($USERNAME)
+ $Encoder.bodyEscape($SERVERUSERNAME)
</td>
</tr>
<tr>
@@ -68,6 +68,42 @@
********
</td>
</tr>
+
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.ProxyHost'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($PROXYHOST)
+ </td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.ProxyPort'))</nobr></td>
+ <td class="value">
+ $PROXYPORT
+ </td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.ProxyUser'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($PROXYUSER)
+ </td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.ProxyPassword'))</nobr></td>
+ <td class="value">
+ ********
+ </td>
+ </tr>
+ <tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.ProxyDomain'))</nobr></td>
+ <td class="value">
+ $Encoder.bodyEscape($PROXYDOMAIN)
+ </td>
+ </tr>
+
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
+
<tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SharePointRepository.SSLCertificateList'))</nobr></td>
<td class="value">
Propchange: manifoldcf/trunk/framework/connector-common/src/main/resources/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 17 18:10:04 2014
@@ -0,0 +1,118 @@
+/incubator/lcf/branches/CONNECTORS-151-branch/framework/connector-common/src/main/resources/org:1063444-1071206
+/incubator/lcf/branches/CONNECTORS-160-branch/framework/connector-common/src/main/resources/org:1071241-1071534
+/incubator/lcf/branches/CONNECTORS-195/framework/connector-common/src/main/resources/org:1098950-1099321
+/incubator/lcf/branches/CONNECTORS-203/framework/connector-common/src/main/resources/org:1128152-1130460
+/incubator/lcf/branches/CONNECTORS-221/framework/connector-common/src/main/resources/org:1143785-1151084
+/incubator/lcf/branches/CONNECTORS-223/framework/connector-common/src/main/resources/org:1146689-1146810
+/incubator/lcf/branches/CONNECTORS-224/framework/connector-common/src/main/resources/org:1154884-1158633
+/incubator/lcf/branches/CONNECTORS-236/framework/connector-common/src/main/resources/org:1153921-1154314
+/incubator/lcf/branches/CONNECTORS-240/framework/connector-common/src/main/resources/org:1163953-1166425
+/incubator/lcf/branches/CONNECTORS-256/framework/connector-common/src/main/resources/org:1172846-1182809
+/incubator/lcf/branches/CONNECTORS-277/framework/connector-common/src/main/resources/org:1185949-1187036
+/incubator/lcf/branches/CONNECTORS-284/framework/connector-common/src/main/resources/org:1189305-1190398
+/incubator/lcf/branches/CONNECTORS-287/framework/connector-common/src/main/resources/org:1200390-1210394
+/incubator/lcf/branches/CONNECTORS-288/framework/connector-common/src/main/resources/org:1240833-1299573
+/incubator/lcf/branches/CONNECTORS-290/framework/connector-common/src/main/resources/org:1204836-1205502
+/incubator/lcf/branches/CONNECTORS-313/framework/connector-common/src/main/resources/org:1213173-1214848
+/incubator/lcf/branches/CONNECTORS-314/framework/connector-common/src/main/resources/org:1221058,1221068
+/incubator/lcf/branches/CONNECTORS-32/framework/connector-common/src/main/resources/org:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335/framework/connector-common/src/main/resources/org:1222285-1225060
+/incubator/lcf/branches/CONNECTORS-336/framework/connector-common/src/main/resources/org:1222382-1231874
+/incubator/lcf/branches/CONNECTORS-353/framework/connector-common/src/main/resources/org:1226361-1226428
+/incubator/lcf/branches/CONNECTORS-388/framework/connector-common/src/main/resources/org:1233014-1234466
+/incubator/lcf/branches/CONNECTORS-402/framework/connector-common/src/main/resources/org:1242059-1242965
+/incubator/lcf/branches/CONNECTORS-420/framework/connector-common/src/main/resources/org:1295533-1295923
+/incubator/lcf/branches/CONNECTORS-422/framework/connector-common/src/main/resources/org:1298811-1299486
+/incubator/lcf/branches/CONNECTORS-423/framework/connector-common/src/main/resources/org:1301010-1302518
+/incubator/lcf/branches/CONNECTORS-437/framework/connector-common/src/main/resources/org:1306096-1308128
+/incubator/lcf/branches/CONNECTORS-443/framework/connector-common/src/main/resources/org:1308492-1308863
+/incubator/lcf/branches/CONNECTORS-459/framework/connector-common/src/main/resources/org:1326580-1327781
+/incubator/lcf/branches/CONNECTORS-460/framework/connector-common/src/main/resources/org:1324786-1326539
+/incubator/lcf/branches/CONNECTORS-470/framework/connector-common/src/main/resources/org:1337828-1349740
+/incubator/lcf/branches/CONNECTORS-474/framework/connector-common/src/main/resources/org:1340041-1349740
+/incubator/lcf/branches/CONNECTORS-96/framework/connector-common/src/main/resources/org:1335360-1336940
+/manifoldcf/branches/CONNECTORS-1027/framework/connector-common/src/main/resources/org:1624243-1624462
+/manifoldcf/branches/CONNECTORS-1037/framework/connector-common/src/main/resources/org:1628690-1629377
+/manifoldcf/branches/CONNECTORS-1044/framework/connector-common/src/main/resources/org:1627162-1627342
+/manifoldcf/branches/CONNECTORS-1048/framework/connector-common/src/main/resources/org:1627756-1627957
+/manifoldcf/branches/CONNECTORS-1050/framework/connector-common/src/main/resources/org:1628142-1628796
+/manifoldcf/branches/CONNECTORS-1060/framework/connector-common/src/main/resources/org:1632947-1634129
+/manifoldcf/branches/CONNECTORS-1067/framework/connector-common/src/main/resources/org:1630049-1630186
+/manifoldcf/branches/CONNECTORS-1068/framework/connector-common/src/main/resources/org:1630245-1630621
+/manifoldcf/branches/CONNECTORS-1074/framework/connector-common/src/main/resources/org:1632228-1632283
+/manifoldcf/branches/CONNECTORS-1085/framework/connector-common/src/main/resources/org:1634276-1634533
+/manifoldcf/branches/CONNECTORS-1089/framework/connector-common/src/main/resources/org:1635610-1635937
+/manifoldcf/branches/CONNECTORS-120/framework/connector-common/src/main/resources/org:1406712-1407974,1407982-1411043,1411049-1416451
+/manifoldcf/branches/CONNECTORS-120-1/framework/connector-common/src/main/resources/org:1416450-1417056
+/manifoldcf/branches/CONNECTORS-13/framework/connector-common/src/main/resources/org:1525862-1527182,1539324-1541634
+/manifoldcf/branches/CONNECTORS-470/framework/connector-common/src/main/resources/org:1349741-1360750,1360808
+/manifoldcf/branches/CONNECTORS-474/framework/connector-common/src/main/resources/org:1349741-1353803
+/manifoldcf/branches/CONNECTORS-488/framework/connector-common/src/main/resources/org:1363249-1364203
+/manifoldcf/branches/CONNECTORS-492/framework/connector-common/src/main/resources/org:1368611-1381230
+/manifoldcf/branches/CONNECTORS-497/framework/connector-common/src/main/resources/org:1368852-1371018
+/manifoldcf/branches/CONNECTORS-501/framework/connector-common/src/main/resources/org:1370450-1372223
+/manifoldcf/branches/CONNECTORS-515/framework/connector-common/src/main/resources/org:1379845-1384619
+/manifoldcf/branches/CONNECTORS-518/framework/connector-common/src/main/resources/org:1381596-1384051
+/manifoldcf/branches/CONNECTORS-523/framework/connector-common/src/main/resources/org:1381033-1382537
+/manifoldcf/branches/CONNECTORS-552-2/framework/connector-common/src/main/resources/org:1438584-1439172
+/manifoldcf/branches/CONNECTORS-553/framework/connector-common/src/main/resources/org:1534730-1550120,1550125-1550463,1550467-1552343,1552346-1552899
+/manifoldcf/branches/CONNECTORS-553-2/framework/connector-common/src/main/resources/org:1550121-1550124,1550464-1550466,1552306-1552345
+/manifoldcf/branches/CONNECTORS-563/framework/connector-common/src/main/resources/org:1405810-1419032
+/manifoldcf/branches/CONNECTORS-565/framework/connector-common/src/main/resources/org:1545907-1550085,1550088-1550498,1550501-1567621,1567624-1584007,1584010-1601659,1601663-1603324,1603327-1613086,1613090-1613193
+/manifoldcf/branches/CONNECTORS-565-2/framework/connector-common/src/main/resources/org:1550086-1550087,1550498-1550500,1567622-1567623,1584007-1584009,1601658-1601662,1603325-1603326,1613086-1613089
+/manifoldcf/branches/CONNECTORS-566/framework/connector-common/src/main/resources/org:1406653-1419070
+/manifoldcf/branches/CONNECTORS-578/framework/connector-common/src/main/resources/org:1418127-1421420
+/manifoldcf/branches/CONNECTORS-581/framework/connector-common/src/main/resources/org:1419077-1419175
+/manifoldcf/branches/CONNECTORS-584/framework/connector-common/src/main/resources/org:1419859-1419961,1420512
+/manifoldcf/branches/CONNECTORS-586/framework/connector-common/src/main/resources/org:1477601-1477875
+/manifoldcf/branches/CONNECTORS-590/framework/connector-common/src/main/resources/org:1425803-1464871
+/manifoldcf/branches/CONNECTORS-590-2/framework/connector-common/src/main/resources/org:1464872-1465654
+/manifoldcf/branches/CONNECTORS-594/framework/connector-common/src/main/resources/org:1426180-1427546
+/manifoldcf/branches/CONNECTORS-63/framework/connector-common/src/main/resources/org:1449286-1449525
+/manifoldcf/branches/CONNECTORS-633/framework/connector-common/src/main/resources/org:1442813-1444626
+/manifoldcf/branches/CONNECTORS-663/framework/connector-common/src/main/resources/org:1455911-1457304
+/manifoldcf/branches/CONNECTORS-664/framework/connector-common/src/main/resources/org:1457694-1459944
+/manifoldcf/branches/CONNECTORS-676/framework/connector-common/src/main/resources/org:1470161-1477628
+/manifoldcf/branches/CONNECTORS-689/framework/connector-common/src/main/resources/org:1482853-1484123
+/manifoldcf/branches/CONNECTORS-693/framework/connector-common/src/main/resources/org:1487471-1488671
+/manifoldcf/branches/CONNECTORS-694/framework/connector-common/src/main/resources/org:1488166-1488663
+/manifoldcf/branches/CONNECTORS-703/framework/connector-common/src/main/resources/org:1494936-1498126
+/manifoldcf/branches/CONNECTORS-710/framework/connector-common/src/main/resources/org:1491769-1492603
+/manifoldcf/branches/CONNECTORS-714/framework/connector-common/src/main/resources/org:1492346-1493217,1493724,1493761
+/manifoldcf/branches/CONNECTORS-723/framework/connector-common/src/main/resources/org:1494650-1495933
+/manifoldcf/branches/CONNECTORS-727/framework/connector-common/src/main/resources/org:1495363-1496843
+/manifoldcf/branches/CONNECTORS-728/framework/connector-common/src/main/resources/org:1495840-1496915
+/manifoldcf/branches/CONNECTORS-731/framework/connector-common/src/main/resources/org:1499391-1501632
+/manifoldcf/branches/CONNECTORS-737/framework/connector-common/src/main/resources/org:1501867-1503249
+/manifoldcf/branches/CONNECTORS-754/framework/connector-common/src/main/resources/org:1528374-1535986
+/manifoldcf/branches/CONNECTORS-754-2/framework/connector-common/src/main/resources/org:1535987-1543763
+/manifoldcf/branches/CONNECTORS-772/framework/connector-common/src/main/resources/org:1521196-1521498,1523842-1524559
+/manifoldcf/branches/CONNECTORS-773/framework/connector-common/src/main/resources/org:1521767-1522759
+/manifoldcf/branches/CONNECTORS-774/framework/connector-common/src/main/resources/org:1521768-1523232
+/manifoldcf/branches/CONNECTORS-778/framework/connector-common/src/main/resources/org:1524564-1525413
+/manifoldcf/branches/CONNECTORS-781/framework/connector-common/src/main/resources/org:1541770-1542875,1542879-1545621,1545632-1546964,1546969-1547166,1547171-1548079,1548085-1549104
+/manifoldcf/branches/CONNECTORS-792/framework/connector-common/src/main/resources/org:1534965-1535981
+/manifoldcf/branches/CONNECTORS-813/framework/connector-common/src/main/resources/org:1544010-1544792
+/manifoldcf/branches/CONNECTORS-829/framework/connector-common/src/main/resources/org:1550233-1551705,1551753-1552095
+/manifoldcf/branches/CONNECTORS-833/framework/connector-common/src/main/resources/org:1565133-1565451
+/manifoldcf/branches/CONNECTORS-840/framework/connector-common/src/main/resources/org:1556412-1557896
+/manifoldcf/branches/CONNECTORS-840-2/framework/connector-common/src/main/resources/org:1557897-1558265
+/manifoldcf/branches/CONNECTORS-867/framework/connector-common/src/main/resources/org:1560403-1560560,1560679-1560840
+/manifoldcf/branches/CONNECTORS-880/framework/connector-common/src/main/resources/org:1564439-1564786
+/manifoldcf/branches/CONNECTORS-891/framework/connector-common/src/main/resources/org:1568778-1568807
+/manifoldcf/branches/CONNECTORS-911/framework/connector-common/src/main/resources/org:1580649-1584049,1584052-1585344
+/manifoldcf/branches/CONNECTORS-911-2/framework/connector-common/src/main/resources/org:1584050-1584051
+/manifoldcf/branches/CONNECTORS-912/framework/connector-common/src/main/resources/org:1579605-1582723
+/manifoldcf/branches/CONNECTORS-916/framework/connector-common/src/main/resources/org:1585365-1585526,1585532-1596719
+/manifoldcf/branches/CONNECTORS-916-2/framework/connector-common/src/main/resources/org:1585527-1585531
+/manifoldcf/branches/CONNECTORS-916-rebased/framework/connector-common/src/main/resources/org:1596720-1596721
+/manifoldcf/branches/CONNECTORS-945/framework/connector-common/src/main/resources/org:1597788-1597822
+/manifoldcf/branches/CONNECTORS-946/framework/connector-common/src/main/resources/org:1597913-1601515,1601557
+/manifoldcf/branches/CONNECTORS-954/framework/connector-common/src/main/resources/org:1603545-1603647,1603652-1603686,1603693-1604108
+/manifoldcf/branches/CONNECTORS-961/framework/connector-common/src/main/resources/org:1601696-1601881
+/manifoldcf/branches/CONNECTORS-962/framework/connector-common/src/main/resources/org:1602048-1602679,1602683-1603198
+/manifoldcf/branches/CONNECTORS-971/framework/connector-common/src/main/resources/org:1603835-1603885
+/manifoldcf/branches/CONNECTORS-980/framework/connector-common/src/main/resources/org:1604127-1604211
+/manifoldcf/branches/CONNECTORS-981/framework/connector-common/src/main/resources/org:1605049-1605773
+/manifoldcf/branches/CONNECTORS-989/framework/connector-common/src/main/resources/org:1611600-1612101
+/manifoldcf/branches/CONNECTORS-990/framework/connector-common/src/main/resources/org:1610284-1610707
Propchange: manifoldcf/trunk/framework/connector-common/src/main/resources/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 17 18:10:04 2014
@@ -0,0 +1,118 @@
+/incubator/lcf/branches/CONNECTORS-151-branch/framework/connector-common/src/main/resources/org/apache:1063444-1071206
+/incubator/lcf/branches/CONNECTORS-160-branch/framework/connector-common/src/main/resources/org/apache:1071241-1071534
+/incubator/lcf/branches/CONNECTORS-195/framework/connector-common/src/main/resources/org/apache:1098950-1099321
+/incubator/lcf/branches/CONNECTORS-203/framework/connector-common/src/main/resources/org/apache:1128152-1130460
+/incubator/lcf/branches/CONNECTORS-221/framework/connector-common/src/main/resources/org/apache:1143785-1151084
+/incubator/lcf/branches/CONNECTORS-223/framework/connector-common/src/main/resources/org/apache:1146689-1146810
+/incubator/lcf/branches/CONNECTORS-224/framework/connector-common/src/main/resources/org/apache:1154884-1158633
+/incubator/lcf/branches/CONNECTORS-236/framework/connector-common/src/main/resources/org/apache:1153921-1154314
+/incubator/lcf/branches/CONNECTORS-240/framework/connector-common/src/main/resources/org/apache:1163953-1166425
+/incubator/lcf/branches/CONNECTORS-256/framework/connector-common/src/main/resources/org/apache:1172846-1182809
+/incubator/lcf/branches/CONNECTORS-277/framework/connector-common/src/main/resources/org/apache:1185949-1187036
+/incubator/lcf/branches/CONNECTORS-284/framework/connector-common/src/main/resources/org/apache:1189305-1190398
+/incubator/lcf/branches/CONNECTORS-287/framework/connector-common/src/main/resources/org/apache:1200390-1210394
+/incubator/lcf/branches/CONNECTORS-288/framework/connector-common/src/main/resources/org/apache:1240833-1299573
+/incubator/lcf/branches/CONNECTORS-290/framework/connector-common/src/main/resources/org/apache:1204836-1205502
+/incubator/lcf/branches/CONNECTORS-313/framework/connector-common/src/main/resources/org/apache:1213173-1214848
+/incubator/lcf/branches/CONNECTORS-314/framework/connector-common/src/main/resources/org/apache:1221058,1221068
+/incubator/lcf/branches/CONNECTORS-32/framework/connector-common/src/main/resources/org/apache:1092556-1094216
+/incubator/lcf/branches/CONNECTORS-335/framework/connector-common/src/main/resources/org/apache:1222285-1225060
+/incubator/lcf/branches/CONNECTORS-336/framework/connector-common/src/main/resources/org/apache:1222382-1231874
+/incubator/lcf/branches/CONNECTORS-353/framework/connector-common/src/main/resources/org/apache:1226361-1226428
+/incubator/lcf/branches/CONNECTORS-388/framework/connector-common/src/main/resources/org/apache:1233014-1234466
+/incubator/lcf/branches/CONNECTORS-402/framework/connector-common/src/main/resources/org/apache:1242059-1242965
+/incubator/lcf/branches/CONNECTORS-420/framework/connector-common/src/main/resources/org/apache:1295533-1295923
+/incubator/lcf/branches/CONNECTORS-422/framework/connector-common/src/main/resources/org/apache:1298811-1299486
+/incubator/lcf/branches/CONNECTORS-423/framework/connector-common/src/main/resources/org/apache:1301010-1302518
+/incubator/lcf/branches/CONNECTORS-437/framework/connector-common/src/main/resources/org/apache:1306096-1308128
+/incubator/lcf/branches/CONNECTORS-443/framework/connector-common/src/main/resources/org/apache:1308492-1308863
+/incubator/lcf/branches/CONNECTORS-459/framework/connector-common/src/main/resources/org/apache:1326580-1327781
+/incubator/lcf/branches/CONNECTORS-460/framework/connector-common/src/main/resources/org/apache:1324786-1326539
+/incubator/lcf/branches/CONNECTORS-470/framework/connector-common/src/main/resources/org/apache:1337828-1349740
+/incubator/lcf/branches/CONNECTORS-474/framework/connector-common/src/main/resources/org/apache:1340041-1349740
+/incubator/lcf/branches/CONNECTORS-96/framework/connector-common/src/main/resources/org/apache:1335360-1336940
+/manifoldcf/branches/CONNECTORS-1027/framework/connector-common/src/main/resources/org/apache:1624243-1624462
+/manifoldcf/branches/CONNECTORS-1037/framework/connector-common/src/main/resources/org/apache:1628690-1629377
+/manifoldcf/branches/CONNECTORS-1044/framework/connector-common/src/main/resources/org/apache:1627162-1627342
+/manifoldcf/branches/CONNECTORS-1048/framework/connector-common/src/main/resources/org/apache:1627756-1627957
+/manifoldcf/branches/CONNECTORS-1050/framework/connector-common/src/main/resources/org/apache:1628142-1628796
+/manifoldcf/branches/CONNECTORS-1060/framework/connector-common/src/main/resources/org/apache:1632947-1634129
+/manifoldcf/branches/CONNECTORS-1067/framework/connector-common/src/main/resources/org/apache:1630049-1630186
+/manifoldcf/branches/CONNECTORS-1068/framework/connector-common/src/main/resources/org/apache:1630245-1630621
+/manifoldcf/branches/CONNECTORS-1074/framework/connector-common/src/main/resources/org/apache:1632228-1632283
+/manifoldcf/branches/CONNECTORS-1085/framework/connector-common/src/main/resources/org/apache:1634276-1634533
+/manifoldcf/branches/CONNECTORS-1089/framework/connector-common/src/main/resources/org/apache:1635610-1635937
+/manifoldcf/branches/CONNECTORS-120/framework/connector-common/src/main/resources/org/apache:1406712-1407974,1407982-1411043,1411049-1416451
+/manifoldcf/branches/CONNECTORS-120-1/framework/connector-common/src/main/resources/org/apache:1416450-1417056
+/manifoldcf/branches/CONNECTORS-13/framework/connector-common/src/main/resources/org/apache:1525862-1527182,1539324-1541634
+/manifoldcf/branches/CONNECTORS-470/framework/connector-common/src/main/resources/org/apache:1349741-1360750,1360808
+/manifoldcf/branches/CONNECTORS-474/framework/connector-common/src/main/resources/org/apache:1349741-1353803
+/manifoldcf/branches/CONNECTORS-488/framework/connector-common/src/main/resources/org/apache:1363249-1364203
+/manifoldcf/branches/CONNECTORS-492/framework/connector-common/src/main/resources/org/apache:1368611-1381230
+/manifoldcf/branches/CONNECTORS-497/framework/connector-common/src/main/resources/org/apache:1368852-1371018
+/manifoldcf/branches/CONNECTORS-501/framework/connector-common/src/main/resources/org/apache:1370450-1372223
+/manifoldcf/branches/CONNECTORS-515/framework/connector-common/src/main/resources/org/apache:1379845-1384619
+/manifoldcf/branches/CONNECTORS-518/framework/connector-common/src/main/resources/org/apache:1381596-1384051
+/manifoldcf/branches/CONNECTORS-523/framework/connector-common/src/main/resources/org/apache:1381033-1382537
+/manifoldcf/branches/CONNECTORS-552-2/framework/connector-common/src/main/resources/org/apache:1438584-1439172
+/manifoldcf/branches/CONNECTORS-553/framework/connector-common/src/main/resources/org/apache:1534730-1550120,1550125-1550463,1550467-1552343,1552346-1552899
+/manifoldcf/branches/CONNECTORS-553-2/framework/connector-common/src/main/resources/org/apache:1550121-1550124,1550464-1550466,1552306-1552345
+/manifoldcf/branches/CONNECTORS-563/framework/connector-common/src/main/resources/org/apache:1405810-1419032
+/manifoldcf/branches/CONNECTORS-565/framework/connector-common/src/main/resources/org/apache:1545907-1550085,1550088-1550498,1550501-1567621,1567624-1584007,1584010-1601659,1601663-1603324,1603327-1613086,1613090-1613193
+/manifoldcf/branches/CONNECTORS-565-2/framework/connector-common/src/main/resources/org/apache:1550086-1550087,1550498-1550500,1567622-1567623,1584007-1584009,1601658-1601662,1603325-1603326,1613086-1613089
+/manifoldcf/branches/CONNECTORS-566/framework/connector-common/src/main/resources/org/apache:1406653-1419070
+/manifoldcf/branches/CONNECTORS-578/framework/connector-common/src/main/resources/org/apache:1418127-1421420
+/manifoldcf/branches/CONNECTORS-581/framework/connector-common/src/main/resources/org/apache:1419077-1419175
+/manifoldcf/branches/CONNECTORS-584/framework/connector-common/src/main/resources/org/apache:1419859-1419961,1420512
+/manifoldcf/branches/CONNECTORS-586/framework/connector-common/src/main/resources/org/apache:1477601-1477875
+/manifoldcf/branches/CONNECTORS-590/framework/connector-common/src/main/resources/org/apache:1425803-1464871
+/manifoldcf/branches/CONNECTORS-590-2/framework/connector-common/src/main/resources/org/apache:1464872-1465654
+/manifoldcf/branches/CONNECTORS-594/framework/connector-common/src/main/resources/org/apache:1426180-1427546
+/manifoldcf/branches/CONNECTORS-63/framework/connector-common/src/main/resources/org/apache:1449286-1449525
+/manifoldcf/branches/CONNECTORS-633/framework/connector-common/src/main/resources/org/apache:1442813-1444626
+/manifoldcf/branches/CONNECTORS-663/framework/connector-common/src/main/resources/org/apache:1455911-1457304
+/manifoldcf/branches/CONNECTORS-664/framework/connector-common/src/main/resources/org/apache:1457694-1459944
+/manifoldcf/branches/CONNECTORS-676/framework/connector-common/src/main/resources/org/apache:1470161-1477628
+/manifoldcf/branches/CONNECTORS-689/framework/connector-common/src/main/resources/org/apache:1482853-1484123
+/manifoldcf/branches/CONNECTORS-693/framework/connector-common/src/main/resources/org/apache:1487471-1488671
+/manifoldcf/branches/CONNECTORS-694/framework/connector-common/src/main/resources/org/apache:1488166-1488663
+/manifoldcf/branches/CONNECTORS-703/framework/connector-common/src/main/resources/org/apache:1494936-1498126
+/manifoldcf/branches/CONNECTORS-710/framework/connector-common/src/main/resources/org/apache:1491769-1492603
+/manifoldcf/branches/CONNECTORS-714/framework/connector-common/src/main/resources/org/apache:1492346-1493217,1493724,1493761
+/manifoldcf/branches/CONNECTORS-723/framework/connector-common/src/main/resources/org/apache:1494650-1495933
+/manifoldcf/branches/CONNECTORS-727/framework/connector-common/src/main/resources/org/apache:1495363-1496843
+/manifoldcf/branches/CONNECTORS-728/framework/connector-common/src/main/resources/org/apache:1495840-1496915
+/manifoldcf/branches/CONNECTORS-731/framework/connector-common/src/main/resources/org/apache:1499391-1501632
+/manifoldcf/branches/CONNECTORS-737/framework/connector-common/src/main/resources/org/apache:1501867-1503249
+/manifoldcf/branches/CONNECTORS-754/framework/connector-common/src/main/resources/org/apache:1528374-1535986
+/manifoldcf/branches/CONNECTORS-754-2/framework/connector-common/src/main/resources/org/apache:1535987-1543763
+/manifoldcf/branches/CONNECTORS-772/framework/connector-common/src/main/resources/org/apache:1521196-1521498,1523842-1524559
+/manifoldcf/branches/CONNECTORS-773/framework/connector-common/src/main/resources/org/apache:1521767-1522759
+/manifoldcf/branches/CONNECTORS-774/framework/connector-common/src/main/resources/org/apache:1521768-1523232
+/manifoldcf/branches/CONNECTORS-778/framework/connector-common/src/main/resources/org/apache:1524564-1525413
+/manifoldcf/branches/CONNECTORS-781/framework/connector-common/src/main/resources/org/apache:1541770-1542875,1542879-1545621,1545632-1546964,1546969-1547166,1547171-1548079,1548085-1549104
+/manifoldcf/branches/CONNECTORS-792/framework/connector-common/src/main/resources/org/apache:1534965-1535981
+/manifoldcf/branches/CONNECTORS-813/framework/connector-common/src/main/resources/org/apache:1544010-1544792
+/manifoldcf/branches/CONNECTORS-829/framework/connector-common/src/main/resources/org/apache:1550233-1551705,1551753-1552095
+/manifoldcf/branches/CONNECTORS-833/framework/connector-common/src/main/resources/org/apache:1565133-1565451
+/manifoldcf/branches/CONNECTORS-840/framework/connector-common/src/main/resources/org/apache:1556412-1557896
+/manifoldcf/branches/CONNECTORS-840-2/framework/connector-common/src/main/resources/org/apache:1557897-1558265
+/manifoldcf/branches/CONNECTORS-867/framework/connector-common/src/main/resources/org/apache:1560403-1560560,1560679-1560840
+/manifoldcf/branches/CONNECTORS-880/framework/connector-common/src/main/resources/org/apache:1564439-1564786
+/manifoldcf/branches/CONNECTORS-891/framework/connector-common/src/main/resources/org/apache:1568778-1568807
+/manifoldcf/branches/CONNECTORS-911/framework/connector-common/src/main/resources/org/apache:1580649-1584049,1584052-1585344
+/manifoldcf/branches/CONNECTORS-911-2/framework/connector-common/src/main/resources/org/apache:1584050-1584051
+/manifoldcf/branches/CONNECTORS-912/framework/connector-common/src/main/resources/org/apache:1579605-1582723
+/manifoldcf/branches/CONNECTORS-916/framework/connector-common/src/main/resources/org/apache:1585365-1585526,1585532-1596719
+/manifoldcf/branches/CONNECTORS-916-2/framework/connector-common/src/main/resources/org/apache:1585527-1585531
+/manifoldcf/branches/CONNECTORS-916-rebased/framework/connector-common/src/main/resources/org/apache:1596720-1596721
+/manifoldcf/branches/CONNECTORS-945/framework/connector-common/src/main/resources/org/apache:1597788-1597822
+/manifoldcf/branches/CONNECTORS-946/framework/connector-common/src/main/resources/org/apache:1597913-1601515,1601557
+/manifoldcf/branches/CONNECTORS-954/framework/connector-common/src/main/resources/org/apache:1603545-1603647,1603652-1603686,1603693-1604108
+/manifoldcf/branches/CONNECTORS-961/framework/connector-common/src/main/resources/org/apache:1601696-1601881
+/manifoldcf/branches/CONNECTORS-962/framework/connector-common/src/main/resources/org/apache:1602048-1602679,1602683-1603198
+/manifoldcf/branches/CONNECTORS-971/framework/connector-common/src/main/resources/org/apache:1603835-1603885
+/manifoldcf/branches/CONNECTORS-980/framework/connector-common/src/main/resources/org/apache:1604127-1604211
+/manifoldcf/branches/CONNECTORS-981/framework/connector-common/src/main/resources/org/apache:1605049-1605773
+/manifoldcf/branches/CONNECTORS-989/framework/connector-common/src/main/resources/org/apache:1611600-1612101
+/manifoldcf/branches/CONNECTORS-990/framework/connector-common/src/main/resources/org/apache:1610284-1610707