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 14:08:06 UTC
svn commit: r1640156 - in
/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf:
authorities/authorities/sharepoint/ crawler/connectors/sharepoint/
Author: kwright
Date: Mon Nov 17 13:08:06 2014
New Revision: 1640156
URL: http://svn.apache.org/r1640156
Log:
Java UI part
Modified:
manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java
manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java
manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
Modified: manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java?rev=1640156&r1=1640155&r2=1640156&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java (original)
+++ manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointAuthority.java Mon Nov 17 13:08:06 2014
@@ -484,6 +484,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);
@@ -496,7 +518,13 @@ public class SharePointAuthority extends
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)
@@ -568,6 +596,26 @@ public class SharePointAuthority extends
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);
Modified: manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java?rev=1640156&r1=1640155&r2=1640156&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java (original)
+++ manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/sharepoint/SharePointConfig.java Mon Nov 17 13:08:06 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/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java?rev=1640156&r1=1640155&r2=1640156&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java (original)
+++ manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointConfig.java Mon Nov 17 13:08:06 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/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1640156&r1=1640155&r2=1640156&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java (original)
+++ manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java Mon Nov 17 13:08:06 2014
@@ -2236,6 +2236,26 @@ public class SharePointRepository extend
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,6 +2405,28 @@ 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);
@@ -2397,6 +2439,11 @@ public class SharePointRepository extend
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.