svn commit: r1734598 - in /manifoldcf/trunk: ./ connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/ connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/

[kwright]

Author: kwright
Date: Fri Mar 11 17:31:48 2016
New Revision: 1734598

URL: http://svn.apache.org/viewvc?rev=1734598&view=rev
Log:
Fix for CONNECTORS-1288.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
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/crawler/connectors/sharepoint/SharePointRepository.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1734598&r1=1734597&r2=1734598&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Mar 11 17:31:48 2016
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.4-dev =====================
 
+CONNECTORS-1288: SharePoint connector proxy password obfuscation
+was breaking this feature.
+(Markus Schuch, Karl Wright)
+
 CONNECTORS-1284: SharePoint fields that do not have a different
 display name from their field name (or which are defined in some way
 as yet not well understood) were being overlooked in SharePoint crawling.

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=1734598&r1=1734597&r2=1734598&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
 Fri Mar 11 17:31:48 2016
@@ -218,7 +218,7 @@ public class SharePointAuthority extends
     proxyHost = params.getParameter(SharePointConfig.PARAM_PROXYHOST);
     proxyPortString = params.getParameter(SharePointConfig.PARAM_PROXYPORT);
     proxyUsername = params.getParameter(SharePointConfig.PARAM_PROXYUSER);
-    proxyPassword = params.getParameter(SharePointConfig.PARAM_PROXYPASSWORD);
+    proxyPassword = 
params.getObfuscatedParameter(SharePointConfig.PARAM_PROXYPASSWORD);
     proxyDomain = params.getParameter(SharePointConfig.PARAM_PROXYDOMAIN);
 
     keystoreData = params.getParameter(SharePointConfig.PARAM_SERVERKEYSTORE);
@@ -518,7 +518,7 @@ public class SharePointAuthority extends
     if (proxyUser == null)
       proxyUser = "";
     
-    String proxyPassword = 
parameters.getParameter(SharePointConfig.PARAM_PROXYPASSWORD);
+    String proxyPassword = 
parameters.getObfuscatedParameter(SharePointConfig.PARAM_PROXYPASSWORD);
     if (proxyPassword == null)
       proxyPassword = "";
     else

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=1734598&r1=1734597&r2=1734598&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
 Fri Mar 11 17:31:48 2016
@@ -235,7 +235,7 @@ public class SharePointRepository extend
         }
       }
       String proxyUsername = 
params.getParameter(SharePointConfig.PARAM_PROXYUSER);
-      String proxyPassword = 
params.getParameter(SharePointConfig.PARAM_PROXYPASSWORD);
+      String proxyPassword = 
params.getObfuscatedParameter(SharePointConfig.PARAM_PROXYPASSWORD);
       String proxyDomain = 
params.getParameter(SharePointConfig.PARAM_PROXYDOMAIN);
       
       serverUrl = serverProtocol + "://" + serverName;
@@ -2469,7 +2469,7 @@ public class SharePointRepository extend
     if (proxyUser == null)
       proxyUser = "";
     
-    String proxyPassword = 
parameters.getParameter(SharePointConfig.PARAM_PROXYPASSWORD);
+    String proxyPassword = 
parameters.getObfuscatedParameter(SharePointConfig.PARAM_PROXYPASSWORD);
     if (proxyPassword == null)
       proxyPassword = "";
     else