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 2013/07/02 14:36:12 UTC
svn commit: r1498905 - in /manifoldcf/trunk/connectors:
alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/
cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/
documentum/connector/src/main/java/o...
Author: kwright
Date: Tue Jul 2 12:36:12 2013
New Revision: 1498905
URL: http://svn.apache.org/r1498905
Log:
More work on CONNECTORS-737. Do Alfresco, CMIS, Documentum, and Dropbox connectors.
Modified:
manifoldcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
Modified: manifoldcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java?rev=1498905&r1=1498904&r2=1498905&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java (original)
+++ manifoldcf/trunk/connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/AlfrescoRepositoryConnector.java Tue Jul 2 12:36:12 2013
@@ -486,6 +486,11 @@ public class AlfrescoRepositoryConnector
String password = parameters.getParameter(AlfrescoConfig.PASSWORD_PARAM);
if (password == null)
password = AlfrescoConfig.PASSWORD_DEFAULT_VALUE;
+ else
+ {
+ if (password.length() > 0)
+ password = EXISTING_VALUE_PASSWORD;
+ }
paramMap.put(AlfrescoConfig.PASSWORD_PARAM, password);
String protocol = parameters.getParameter(AlfrescoConfig.PROTOCOL_PARAM);
@@ -633,7 +638,8 @@ public class AlfrescoRepositoryConnector
String password = variableContext.getParameter(AlfrescoConfig.PASSWORD_PARAM);
if (password != null) {
- parameters.setParameter(AlfrescoConfig.PASSWORD_PARAM, password);
+ if (!password.equals(EXISTING_VALUE_PASSWORD))
+ parameters.setParameter(AlfrescoConfig.PASSWORD_PARAM, password);
}
String protocol = variableContext.getParameter(AlfrescoConfig.PROTOCOL_PARAM);
Modified: manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java?rev=1498905&r1=1498904&r2=1498905&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java (original)
+++ manifoldcf/trunk/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java Tue Jul 2 12:36:12 2013
@@ -714,6 +714,11 @@ public class CmisRepositoryConnector ext
username = StringUtils.EMPTY;
if(password == null)
password = StringUtils.EMPTY;
+ else
+ {
+ if (password.length() > 0)
+ password = EXISTING_VALUE_PASSWORD;
+ }
if(protocol == null)
protocol = CmisConfig.PROTOCOL_DEFAULT_VALUE;
if(server == null)
@@ -848,7 +853,10 @@ public class CmisRepositoryConnector ext
String password = variableContext.getParameter(CmisConfig.PASSWORD_PARAM);
if (password != null)
- parameters.setParameter(CmisConfig.PASSWORD_PARAM, password);
+ {
+ if (!password.equals(EXISTING_VALUE_PASSWORD))
+ parameters.setParameter(CmisConfig.PASSWORD_PARAM, password);
+ }
String protocol = variableContext.getParameter(CmisConfig.PROTOCOL_PARAM);
if (protocol != null) {
Modified: manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java?rev=1498905&r1=1498904&r2=1498905&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java (original)
+++ manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/authorities/DCTM/AuthorityConnector.java Tue Jul 2 12:36:12 2013
@@ -1139,6 +1139,11 @@ public class AuthorityConnector extends
String docbasePassword = parameters.getObfuscatedParameter(org.apache.manifoldcf.crawler.authorities.DCTM.AuthorityConnector.CONFIG_PARAM_PASSWORD);
if (docbasePassword == null)
docbasePassword = "";
+ else
+ {
+ if (docbasePassword.length() > 0)
+ docbasePassword = EXISTING_VALUE_PASSWORD;
+ }
String docbaseDomain = parameters.getParameter(org.apache.manifoldcf.crawler.authorities.DCTM.AuthorityConnector.CONFIG_PARAM_DOMAIN);
if (docbaseDomain == null)
@@ -1311,8 +1316,11 @@ public class AuthorityConnector extends
String docbasePassword = variableContext.getParameter("docbasepassword");
if (docbasePassword != null)
+ {
+ if (!docbasePassword.equals(EXISTING_VALUE_PASSWORD))
parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.authorities.DCTM.AuthorityConnector.CONFIG_PARAM_PASSWORD,docbasePassword);
-
+ }
+
String docbaseDomain = variableContext.getParameter("docbasedomain");
if (docbaseDomain != null)
parameters.setParameter(org.apache.manifoldcf.crawler.authorities.DCTM.AuthorityConnector.CONFIG_PARAM_DOMAIN,docbaseDomain);
Modified: manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java?rev=1498905&r1=1498904&r2=1498905&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java (original)
+++ manifoldcf/trunk/connectors/documentum/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/DCTM/DCTM.java Tue Jul 2 12:36:12 2013
@@ -2023,6 +2023,11 @@ public class DCTM extends org.apache.man
String docbasePassword = parameters.getObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.DCTM.DCTM.CONFIG_PARAM_PASSWORD);
if (docbasePassword == null)
docbasePassword = "";
+ else
+ {
+ if (docbasePassword.length() > 0)
+ docbasePassword = EXISTING_VALUE_PASSWORD;
+ }
String docbaseDomain = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.DCTM.DCTM.CONFIG_PARAM_DOMAIN);
if (docbaseDomain == null)
docbaseDomain = "";
@@ -2107,8 +2112,11 @@ public class DCTM extends org.apache.man
String docbasePassword = variableContext.getParameter("docbasepassword");
if (docbasePassword != null)
- parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.DCTM.DCTM.CONFIG_PARAM_PASSWORD,docbasePassword);
-
+ {
+ if (!docbasePassword.equals(EXISTING_VALUE_PASSWORD))
+ parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.DCTM.DCTM.CONFIG_PARAM_PASSWORD,docbasePassword);
+ }
+
String docbaseDomain = variableContext.getParameter("docbasedomain");
if (docbaseDomain != null)
parameters.setParameter(org.apache.manifoldcf.crawler.connectors.DCTM.DCTM.CONFIG_PARAM_DOMAIN,docbaseDomain);
Modified: manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java?rev=1498905&r1=1498904&r2=1498905&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java (original)
+++ manifoldcf/trunk/connectors/dropbox/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/dropbox/DropboxRepositoryConnector.java Tue Jul 2 12:36:12 2013
@@ -361,6 +361,9 @@ public class DropboxRepositoryConnector
if (app_secret == null) {
app_secret = StringUtils.EMPTY;
+ } else {
+ if (app_secret.length() > 0)
+ app_secret = EXISTING_VALUE_PASSWORD;
}
if (username == null) {
@@ -368,6 +371,9 @@ public class DropboxRepositoryConnector
}
if (password == null) {
password = StringUtils.EMPTY;
+ } else {
+ if (password.length() > 0)
+ password = EXISTING_VALUE_PASSWORD;
}
newMap.put("APP_KEY", app_key);
@@ -478,7 +484,8 @@ public class DropboxRepositoryConnector
String app_secret = variableContext.getParameter("app_secret");
if (app_secret != null) {
- parameters.setObfuscatedParameter(DropboxConfig.APP_SECRET_PARAM, app_secret);
+ if (!app_secret.equals(EXISTING_VALUE_PASSWORD))
+ parameters.setObfuscatedParameter(DropboxConfig.APP_SECRET_PARAM, app_secret);
}
String key = variableContext.getParameter("key");
@@ -488,7 +495,8 @@ public class DropboxRepositoryConnector
String secret = variableContext.getParameter("secret");
if (secret != null) {
- parameters.setObfuscatedParameter(DropboxConfig.SECRET_PARAM, secret);
+ if (!secret.equals(EXISTING_VALUE_PASSWORD))
+ parameters.setObfuscatedParameter(DropboxConfig.SECRET_PARAM, secret);
}
return null;