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:12:48 UTC

svn commit: r1640200 - in /manifoldcf/branches/dev_1x: ./ connectors/sharepoint/ connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/ connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf...

Author: kwright
Date: Mon Nov 17 18:12:47 2014
New Revision: 1640200

URL: http://svn.apache.org/r1640200
Log:
Pull up fix for CONNECTORS-1104 from trunk

Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/CHANGES.txt
    manifoldcf/branches/dev_1x/connectors/sharepoint/   (props changed)
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_zh_CN.properties
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_en_US.properties
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_ja_JP.properties
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_zh_CN.properties
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html
    manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html
    manifoldcf/branches/dev_1x/framework/   (props changed)

Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/CONNECTORS-1104:r1640149-1640198
  Merged /manifoldcf/trunk:r1640199

Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Mon Nov 17 18:12:47 2014
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 1.8-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/branches/dev_1x/connectors/sharepoint/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk/connectors/sharepoint:r1640199
  Merged /manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint:r1640149-1640198

Modified: manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java Mon Nov 17 18:12:47 2014
@@ -55,6 +55,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.
@@ -89,6 +90,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;
   
@@ -204,6 +211,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);
 
   }
@@ -288,6 +301,12 @@ public class SharePointAuthority extends
     encodedServerLocation = null;
     serverPort = -1;
 
+    proxyHost = null;
+    proxyPortString = null;
+    proxyUsername = null;
+    proxyPassword = null;
+    proxyDomain = null;
+    
     keystoreData = null;
     keystoreManager = null;
 
@@ -483,6 +502,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);
@@ -490,12 +531,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)
@@ -559,14 +606,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);
@@ -692,6 +759,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"))
       {
@@ -737,6 +817,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/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java Mon Nov 17 18:12:47 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/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java Mon Nov 17 18:12:47 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/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java Mon Nov 17 18:12:47 2014
@@ -65,6 +65,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:
@@ -215,6 +216,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"))
       {
@@ -261,6 +280,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)
@@ -2227,14 +2268,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);
@@ -2384,18 +2445,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);
   }
 
   /** Obtain the name of the form check javascript method to call.

Modified: manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_en_US.properties Mon Nov 17 18:12:47 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/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_ja_JP.properties Mon Nov 17 18:12:47 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/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_zh_CN.properties?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_zh_CN.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/authorities/authorities/sharepoint/common_zh_CN.properties Mon Nov 17 18:12:47 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/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_en_US.properties?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_en_US.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_en_US.properties Mon Nov 17 18:12:47 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/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_ja_JP.properties?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_ja_JP.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_ja_JP.properties Mon Nov 17 18:12:47 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/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_zh_CN.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_zh_CN.properties?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_zh_CN.properties (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/sharepoint/common_zh_CN.properties Mon Nov 17 18:12:47 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/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration.js Mon Nov 17 18:12:47 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/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/editConfiguration_Server.html Mon Nov 17 18:12:47 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/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/sharepoint/viewConfiguration.html Mon Nov 17 18:12:47 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/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration.js Mon Nov 17 18:12:47 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/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/editConfiguration_Server.html Mon Nov 17 18:12:47 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/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html?rev=1640200&r1=1640199&r2=1640200&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html (original)
+++ manifoldcf/branches/dev_1x/connectors/sharepoint/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/sharepoint/viewConfiguration.html Mon Nov 17 18:12:47 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/branches/dev_1x/framework/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk/framework:r1640199