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/07 13:40:02 UTC
svn commit: r1500409 - in /manifoldcf/trunk:
connectors/alfresco/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfresco/
connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/
connectors/documentum/con...
Author: kwright
Date: Sun Jul 7 11:40:01 2013
New Revision: 1500409
URL: http://svn.apache.org/r1500409
Log:
Revert all changes for CONNECTORS-737.
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
manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.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=1500409&r1=1500408&r2=1500409&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 Sun Jul 7 11:40:01 2013
@@ -486,11 +486,6 @@ 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);
@@ -638,8 +633,7 @@ public class AlfrescoRepositoryConnector
String password = variableContext.getParameter(AlfrescoConfig.PASSWORD_PARAM);
if (password != null) {
- if (!password.equals(EXISTING_VALUE_PASSWORD))
- parameters.setParameter(AlfrescoConfig.PASSWORD_PARAM, 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=1500409&r1=1500408&r2=1500409&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 Sun Jul 7 11:40:01 2013
@@ -714,11 +714,6 @@ 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)
@@ -853,10 +848,7 @@ public class CmisRepositoryConnector ext
String password = variableContext.getParameter(CmisConfig.PASSWORD_PARAM);
if (password != null)
- {
- if (!password.equals(EXISTING_VALUE_PASSWORD))
- parameters.setParameter(CmisConfig.PASSWORD_PARAM, 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=1500409&r1=1500408&r2=1500409&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 Sun Jul 7 11:40:01 2013
@@ -1139,11 +1139,6 @@ 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)
@@ -1316,11 +1311,8 @@ 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=1500409&r1=1500408&r2=1500409&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 Sun Jul 7 11:40:01 2013
@@ -2023,11 +2023,6 @@ 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 = "";
@@ -2112,11 +2107,8 @@ public class DCTM extends org.apache.man
String docbasePassword = variableContext.getParameter("docbasepassword");
if (docbasePassword != null)
- {
- if (!docbasePassword.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.DCTM.DCTM.CONFIG_PARAM_PASSWORD,docbasePassword);
- }
-
+ 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=1500409&r1=1500408&r2=1500409&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 Sun Jul 7 11:40:01 2013
@@ -361,9 +361,6 @@ 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) {
@@ -371,9 +368,6 @@ public class DropboxRepositoryConnector
}
if (password == null) {
password = StringUtils.EMPTY;
- } else {
- if (password.length() > 0)
- password = EXISTING_VALUE_PASSWORD;
}
newMap.put("APP_KEY", app_key);
@@ -484,8 +478,7 @@ public class DropboxRepositoryConnector
String app_secret = variableContext.getParameter("app_secret");
if (app_secret != null) {
- if (!app_secret.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(DropboxConfig.APP_SECRET_PARAM, app_secret);
+ parameters.setObfuscatedParameter(DropboxConfig.APP_SECRET_PARAM, app_secret);
}
String key = variableContext.getParameter("key");
@@ -495,8 +488,7 @@ public class DropboxRepositoryConnector
String secret = variableContext.getParameter("secret");
if (secret != null) {
- if (!secret.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(DropboxConfig.SECRET_PARAM, secret);
+ parameters.setObfuscatedParameter(DropboxConfig.SECRET_PARAM, secret);
}
return null;
Modified: manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java (original)
+++ manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.java Sun Jul 7 11:40:01 2013
@@ -1567,50 +1567,44 @@ public class FilenetConnector extends or
Locale locale, ConfigParams parameters, String tabName)
throws ManifoldCFException, IOException
{
- String userID = parameters.getParameter(CONFIG_PARAM_USERID);
+ String userID = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_USERID);
if (userID == null)
userID = "";
- String password = parameters.getObfuscatedParameter(CONFIG_PARAM_PASSWORD);
+ String password = parameters.getObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_PASSWORD);
if (password == null)
password = "";
- else
- {
- if (password.length() > 0)
- password = EXISTING_VALUE_PASSWORD;
- }
-
- String filenetdomain = parameters.getParameter(CONFIG_PARAM_FILENETDOMAIN);
+ String filenetdomain = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_FILENETDOMAIN);
if (filenetdomain == null)
{
- filenetdomain = parameters.getParameter(CONFIG_PARAM_FILENETDOMAIN_OLD);
+ filenetdomain = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_FILENETDOMAIN_OLD);
if (filenetdomain == null)
filenetdomain = "";
}
- String objectstore = parameters.getParameter(CONFIG_PARAM_OBJECTSTORE);
+ String objectstore = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_OBJECTSTORE);
if (objectstore == null)
objectstore = "";
- String serverprotocol = parameters.getParameter(CONFIG_PARAM_SERVERPROTOCOL);
+ String serverprotocol = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERPROTOCOL);
if (serverprotocol == null)
serverprotocol = "http";
- String serverhostname = parameters.getParameter(CONFIG_PARAM_SERVERHOSTNAME);
+ String serverhostname = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERHOSTNAME);
if (serverhostname == null)
serverhostname = "";
- String serverport = parameters.getParameter(CONFIG_PARAM_SERVERPORT);
+ String serverport = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERPORT);
if (serverport == null)
serverport = "";
- String serverwsilocation = parameters.getParameter(CONFIG_PARAM_SERVERWSILOCATION);
+ String serverwsilocation = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERWSILOCATION);
if (serverwsilocation == null)
serverwsilocation = "wsi/FNCEWS40DIME";
- String urlprotocol = parameters.getParameter(CONFIG_PARAM_URLPROTOCOL);
+ String urlprotocol = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLPROTOCOL);
if (urlprotocol == null)
urlprotocol = "http";
- String urlhostname = parameters.getParameter(CONFIG_PARAM_URLHOSTNAME);
+ String urlhostname = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLHOSTNAME);
if (urlhostname == null)
urlhostname = "";
- String urlport = parameters.getParameter(CONFIG_PARAM_URLPORT);
+ String urlport = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLPORT);
if (urlport == null)
urlport = "";
- String urllocation = parameters.getParameter(CONFIG_PARAM_URLLOCATION);
+ String urllocation = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLLOCATION);
if (urllocation == null)
urllocation = "Workplace/Browse.jsp";
@@ -1757,54 +1751,51 @@ public class FilenetConnector extends or
{
String serverprotocol = variableContext.getParameter("serverprotocol");
if (serverprotocol != null)
- parameters.setParameter(CONFIG_PARAM_SERVERPROTOCOL,serverprotocol);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERPROTOCOL,serverprotocol);
String serverhostname = variableContext.getParameter("serverhostname");
if (serverhostname != null)
- parameters.setParameter(CONFIG_PARAM_SERVERHOSTNAME,serverhostname);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERHOSTNAME,serverhostname);
String serverport = variableContext.getParameter("serverport");
if (serverport != null && serverport.length() > 0)
- parameters.setParameter(CONFIG_PARAM_SERVERPORT,serverport);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERPORT,serverport);
String serverwsilocation = variableContext.getParameter("serverwsilocation");
if (serverwsilocation != null)
- parameters.setParameter(CONFIG_PARAM_SERVERWSILOCATION,serverwsilocation);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERWSILOCATION,serverwsilocation);
String urlprotocol = variableContext.getParameter("urlprotocol");
if (urlprotocol != null)
- parameters.setParameter(CONFIG_PARAM_URLPROTOCOL,urlprotocol);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLPROTOCOL,urlprotocol);
String urlhostname = variableContext.getParameter("urlhostname");
if (urlhostname != null)
- parameters.setParameter(CONFIG_PARAM_URLHOSTNAME,urlhostname);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLHOSTNAME,urlhostname);
String urlport = variableContext.getParameter("urlport");
if (urlport != null && urlport.length() > 0)
- parameters.setParameter(CONFIG_PARAM_URLPORT,urlport);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLPORT,urlport);
String urllocation = variableContext.getParameter("urllocation");
if (urllocation != null)
- parameters.setParameter(CONFIG_PARAM_URLLOCATION,urllocation);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLLOCATION,urllocation);
String userID = variableContext.getParameter("userid");
if (userID != null)
- parameters.setParameter(CONFIG_PARAM_USERID,userID);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_USERID,userID);
String password = variableContext.getParameter("password");
if (password != null)
- {
- if (!password.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(CONFIG_PARAM_PASSWORD,password);
- }
+ parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_PASSWORD,password);
String filenetdomain = variableContext.getParameter("filenetdomain");
if (filenetdomain != null)
- parameters.setParameter(CONFIG_PARAM_FILENETDOMAIN,filenetdomain);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_FILENETDOMAIN,filenetdomain);
String objectstore = variableContext.getParameter("objectstore");
if (objectstore != null)
- parameters.setParameter(CONFIG_PARAM_OBJECTSTORE,objectstore);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_OBJECTSTORE,objectstore);
return null;
}
@@ -1958,9 +1949,9 @@ public class FilenetConnector extends or
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(SPEC_NODE_DOCUMENTCLASS))
+ if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_DOCUMENTCLASS))
{
- String value = sn.getAttributeValue(SPEC_ATTRIBUTE_VALUE);
+ String value = sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE);
// Now, scan for metadata etc.
org.apache.manifoldcf.crawler.connectors.filenet.DocClassSpec spec = new org.apache.manifoldcf.crawler.connectors.filenet.DocClassSpec(sn);
documentClasses.put(value,spec);
@@ -2375,9 +2366,9 @@ public class FilenetConnector extends or
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(SPEC_NODE_MIMETYPE))
+ if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_MIMETYPE))
{
- String value = sn.getAttributeValue(SPEC_ATTRIBUTE_VALUE);
+ String value = sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE);
if (mimeTypes == null)
mimeTypes = new HashMap();
mimeTypes.put(value,value);
@@ -2603,7 +2594,7 @@ public class FilenetConnector extends or
i = 0;
while (i < ds.getChildCount())
{
- if (ds.getChild(i).getType().equals(SPEC_NODE_DOCUMENTCLASS))
+ if (ds.getChild(i).getType().equals(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_DOCUMENTCLASS))
ds.removeChild(i);
else
i++;
@@ -2615,14 +2606,14 @@ public class FilenetConnector extends or
while (i < x.length)
{
String value = x[i++];
- SpecificationNode node = new SpecificationNode(SPEC_NODE_DOCUMENTCLASS);
- node.setAttribute(SPEC_ATTRIBUTE_VALUE,value);
+ SpecificationNode node = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_DOCUMENTCLASS);
+ node.setAttribute(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE,value);
// Get the allmetadata value for this document class
String allmetadata = variableContext.getParameter("allmetadata_"+value);
if (allmetadata == null)
allmetadata = "false";
if (allmetadata.equals("true"))
- node.setAttribute(SPEC_ATTRIBUTE_ALLMETADATA,allmetadata);
+ node.setAttribute(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_ALLMETADATA,allmetadata);
else
{
String[] fields = variableContext.getParameterValues("metadatafield_"+value);
@@ -2632,8 +2623,8 @@ public class FilenetConnector extends or
while (j < fields.length)
{
String field = fields[j++];
- SpecificationNode sp2 = new SpecificationNode(SPEC_NODE_METADATAFIELD);
- sp2.setAttribute(SPEC_ATTRIBUTE_VALUE,field);
+ SpecificationNode sp2 = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_METADATAFIELD);
+ sp2.setAttribute(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE,field);
node.addChild(node.getChildCount(),sp2);
}
}
@@ -2651,12 +2642,12 @@ public class FilenetConnector extends or
String matchValue = variableContext.getParameter("matchvalue_"+value+"_"+Integer.toString(q));
if (matchOp == null || !matchOp.equals("Delete"))
{
- SpecificationNode matchNode = new SpecificationNode(SPEC_NODE_MATCH);
- matchNode.setAttribute(SPEC_ATTRIBUTE_MATCHTYPE,matchType);
- matchNode.setAttribute(SPEC_ATTRIBUTE_FIELDNAME,matchField);
+ SpecificationNode matchNode = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_MATCH);
+ matchNode.setAttribute(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_MATCHTYPE,matchType);
+ matchNode.setAttribute(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_FIELDNAME,matchField);
if (matchValue == null)
matchValue = "";
- matchNode.setAttribute(SPEC_ATTRIBUTE_VALUE,matchValue);
+ matchNode.setAttribute(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE,matchValue);
node.addChild(node.getChildCount(),matchNode);
}
q++;
@@ -2670,12 +2661,12 @@ public class FilenetConnector extends or
String matchType = variableContext.getParameter("matchtype_"+value);
String matchField = variableContext.getParameter("matchfield_"+value);
String matchValue = variableContext.getParameter("matchvalue_"+value);
- SpecificationNode matchNode = new SpecificationNode(SPEC_NODE_MATCH);
- matchNode.setAttribute(SPEC_ATTRIBUTE_MATCHTYPE,matchType);
- matchNode.setAttribute(SPEC_ATTRIBUTE_FIELDNAME,matchField);
+ SpecificationNode matchNode = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_MATCH);
+ matchNode.setAttribute(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_MATCHTYPE,matchType);
+ matchNode.setAttribute(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_FIELDNAME,matchField);
if (matchValue == null)
matchValue = "";
- matchNode.setAttribute(SPEC_ATTRIBUTE_VALUE,matchValue);
+ matchNode.setAttribute(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE,matchValue);
node.addChild(node.getChildCount(),matchNode);
}
@@ -2688,7 +2679,7 @@ public class FilenetConnector extends or
i = 0;
while (i < ds.getChildCount())
{
- if (ds.getChild(i).getType().equals(SPEC_NODE_MIMETYPE))
+ if (ds.getChild(i).getType().equals(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_MIMETYPE))
ds.removeChild(i);
else
i++;
@@ -2700,8 +2691,8 @@ public class FilenetConnector extends or
while (i < x.length)
{
String value = x[i++];
- SpecificationNode node = new SpecificationNode(SPEC_NODE_MIMETYPE);
- node.setAttribute(SPEC_ATTRIBUTE_VALUE,value);
+ SpecificationNode node = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_MIMETYPE);
+ node.setAttribute(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE,value);
ds.addChild(ds.getChildCount(),node);
}
}
@@ -2870,9 +2861,9 @@ public class FilenetConnector extends or
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(SPEC_NODE_DOCUMENTCLASS))
+ if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_DOCUMENTCLASS))
{
- String value = sn.getAttributeValue(SPEC_ATTRIBUTE_VALUE);
+ String value = sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE);
org.apache.manifoldcf.crawler.connectors.filenet.DocClassSpec spec = new org.apache.manifoldcf.crawler.connectors.filenet.DocClassSpec(sn);
documentClasses.put(value,spec);
}
@@ -2982,9 +2973,9 @@ public class FilenetConnector extends or
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(SPEC_NODE_MIMETYPE))
+ if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_MIMETYPE))
{
- String value = sn.getAttributeValue(SPEC_ATTRIBUTE_VALUE);
+ String value = sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE);
if (mimeTypes == null)
mimeTypes = new HashMap();
mimeTypes.put(value,value);
Modified: manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java (original)
+++ manifoldcf/trunk/connectors/googledrive/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/googledrive/GoogleDriveRepositoryConnector.java Sun Jul 7 11:40:01 2013
@@ -420,12 +420,8 @@ public class GoogleDriveRepositoryConnec
clientid = StringUtils.EMPTY;
}
- // Client password is secret, so don't put it unchanged into the form data.
if (clientsecret == null) {
clientsecret = StringUtils.EMPTY;
- } else {
- if (clientsecret.length() != 0)
- clientsecret = EXISTING_VALUE_PASSWORD;
}
if (refreshtoken == null) {
@@ -536,9 +532,7 @@ public class GoogleDriveRepositoryConnec
String clientsecret = variableContext.getParameter(GoogleDriveConfig.CLIENT_SECRET_PARAM);
if (clientsecret != null) {
- // Only set the password if it has been changed
- if (!clientsecret.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(GoogleDriveConfig.CLIENT_SECRET_PARAM, clientsecret);
+ parameters.setObfuscatedParameter(GoogleDriveConfig.CLIENT_SECRET_PARAM, clientsecret);
}
String refreshtoken = variableContext.getParameter(GoogleDriveConfig.REFRESH_TOKEN_PARAM);
Modified: manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java (original)
+++ manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java Sun Jul 7 11:40:01 2013
@@ -2635,25 +2635,15 @@ public class SharedDriveConnector extend
throws ManifoldCFException, IOException
{
String server = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveParameters.server);
- if (server==null)
- server = "";
+ if (server==null) server = "";
String domain = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveParameters.domain);
- if (domain==null)
- domain = "";
+ if (domain==null) domain = "";
String username = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveParameters.username);
- if (username==null)
- username = "";
+ if (username==null) username = "";
String password = parameters.getObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveParameters.password);
- if (password==null)
- password = "";
- else
- {
- if (password.length() > 0)
- password = EXISTING_VALUE_PASSWORD;
- }
+ if (password==null) password = "";
String resolvesids = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveParameters.useSIDs);
- if (resolvesids==null)
- resolvesids = "true";
+ if (resolvesids==null) resolvesids = "true";
// "Server" tab
if (tabName.equals(Messages.getString(locale,"SharedDriveConnector.Server")))
@@ -2726,11 +2716,8 @@ public class SharedDriveConnector extend
String password = variableContext.getParameter("password");
if (password != null)
- {
- if (!password.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveParameters.password,password);
- }
-
+ parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveParameters.password,password);
+
String resolvesidspresent = variableContext.getParameter("resolvesidspresent");
if (resolvesidspresent != null)
{
Modified: manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java (original)
+++ manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/jdbc/JDBCAuthority.java Sun Jul 7 11:40:01 2013
@@ -370,10 +370,6 @@ public class JDBCAuthority extends BaseA
String databasePassword = parameters.getObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databasePassword);
if (databasePassword == null) {
databasePassword = "";
- } else {
- if (databasePassword.length() > 0) {
- databasePassword = EXISTING_VALUE_PASSWORD;
- }
}
String lIdQuery = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databaseUserIdQuery);
if (lIdQuery == null) {
@@ -505,9 +501,7 @@ public class JDBCAuthority extends BaseA
String lPassword = variableContext.getParameter("password");
if (lPassword != null) {
- if (!lPassword.equals(EXISTING_VALUE_PASSWORD)) {
- parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databasePassword, lPassword);
- }
+ parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databasePassword, lPassword);
}
String lIdQuery = variableContext.getParameter("idquery");
Modified: manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java (original)
+++ manifoldcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnector.java Sun Jul 7 11:40:01 2013
@@ -740,29 +740,24 @@ public class JDBCConnector extends org.a
Locale locale, ConfigParams parameters, String tabName)
throws ManifoldCFException, IOException
{
- String jdbcProvider = parameters.getParameter(JDBCConstants.providerParameter);
+ String jdbcProvider = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.providerParameter);
if (jdbcProvider == null)
jdbcProvider = "oracle:thin:@";
- String accessMethod = parameters.getParameter(JDBCConstants.methodParameter);
+ String accessMethod = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.methodParameter);
if (accessMethod == null)
accessMethod = "name";
- String host = parameters.getParameter(JDBCConstants.hostParameter);
+ String host = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.hostParameter);
if (host == null)
host = "localhost";
- String databaseName = parameters.getParameter(JDBCConstants.databaseNameParameter);
+ String databaseName = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databaseNameParameter);
if (databaseName == null)
databaseName = "database";
- String databaseUser = parameters.getParameter(JDBCConstants.databaseUserName);
+ String databaseUser = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databaseUserName);
if (databaseUser == null)
databaseUser = "";
- String databasePassword = parameters.getObfuscatedParameter(JDBCConstants.databasePassword);
+ String databasePassword = parameters.getObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databasePassword);
if (databasePassword == null)
databasePassword = "";
- else
- {
- if (databasePassword.length() > 0)
- databasePassword = EXISTING_VALUE_PASSWORD;
- }
// "Database Type" tab
if (tabName.equals(Messages.getString(locale,"JDBCConnector.DatabaseType")))
@@ -864,30 +859,27 @@ public class JDBCConnector extends org.a
{
String type = variableContext.getParameter("databasetype");
if (type != null)
- parameters.setParameter(JDBCConstants.providerParameter,type);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.providerParameter,type);
String accessMethod = variableContext.getParameter("accessmethod");
if (accessMethod != null)
- parameters.setParameter(JDBCConstants.methodParameter,accessMethod);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.methodParameter,accessMethod);
String host = variableContext.getParameter("databasehost");
if (host != null)
- parameters.setParameter(JDBCConstants.hostParameter,host);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.hostParameter,host);
String databaseName = variableContext.getParameter("databasename");
if (databaseName != null)
- parameters.setParameter(JDBCConstants.databaseNameParameter,databaseName);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databaseNameParameter,databaseName);
String userName = variableContext.getParameter("username");
if (userName != null)
- parameters.setParameter(JDBCConstants.databaseUserName,userName);
+ parameters.setParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databaseUserName,userName);
String password = variableContext.getParameter("password");
if (password != null)
- {
- if (!password.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(JDBCConstants.databasePassword,password);
- }
+ parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databasePassword,password);
return null;
}
@@ -1071,19 +1063,19 @@ public class JDBCConnector extends org.a
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(JDBCConstants.idQueryNode))
+ if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.idQueryNode))
{
idQuery = sn.getValue();
if (idQuery == null)
idQuery = "";
}
- else if (sn.getType().equals(JDBCConstants.versionQueryNode))
+ else if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.versionQueryNode))
{
versionQuery = sn.getValue();
if (versionQuery == null)
versionQuery = "";
}
- else if (sn.getType().equals(JDBCConstants.dataQueryNode))
+ else if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.dataQueryNode))
{
dataQuery = sn.getValue();
if (dataQuery == null)
@@ -1231,12 +1223,12 @@ public class JDBCConnector extends org.a
int i = 0;
while (i < ds.getChildCount())
{
- if (ds.getChild(i).getType().equals(JDBCConstants.idQueryNode))
+ if (ds.getChild(i).getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.idQueryNode))
ds.removeChild(i);
else
i++;
}
- sn = new SpecificationNode(JDBCConstants.idQueryNode);
+ sn = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.idQueryNode);
sn.setValue(idQuery);
ds.addChild(ds.getChildCount(),sn);
}
@@ -1245,12 +1237,12 @@ public class JDBCConnector extends org.a
int i = 0;
while (i < ds.getChildCount())
{
- if (ds.getChild(i).getType().equals(JDBCConstants.versionQueryNode))
+ if (ds.getChild(i).getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.versionQueryNode))
ds.removeChild(i);
else
i++;
}
- sn = new SpecificationNode(JDBCConstants.versionQueryNode);
+ sn = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.versionQueryNode);
sn.setValue(versionQuery);
ds.addChild(ds.getChildCount(),sn);
}
@@ -1259,12 +1251,12 @@ public class JDBCConnector extends org.a
int i = 0;
while (i < ds.getChildCount())
{
- if (ds.getChild(i).getType().equals(JDBCConstants.dataQueryNode))
+ if (ds.getChild(i).getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.dataQueryNode))
ds.removeChild(i);
else
i++;
}
- sn = new SpecificationNode(JDBCConstants.dataQueryNode);
+ sn = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.dataQueryNode);
sn.setValue(dataQuery);
ds.addChild(ds.getChildCount(),sn);
}
@@ -1334,19 +1326,19 @@ public class JDBCConnector extends org.a
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(JDBCConstants.idQueryNode))
+ if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.idQueryNode))
{
idQuery = sn.getValue();
if (idQuery == null)
idQuery = "";
}
- else if (sn.getType().equals(JDBCConstants.versionQueryNode))
+ else if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.versionQueryNode))
{
versionQuery = sn.getValue();
if (versionQuery == null)
versionQuery = "";
}
- else if (sn.getType().equals(JDBCConstants.dataQueryNode))
+ else if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.dataQueryNode))
{
dataQuery = sn.getValue();
if (dataQuery == null)
@@ -1792,19 +1784,19 @@ public class JDBCConnector extends org.a
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(JDBCConstants.idQueryNode))
+ if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.idQueryNode))
{
idQuery = sn.getValue();
if (idQuery == null)
idQuery = "";
}
- else if (sn.getType().equals(JDBCConstants.versionQueryNode))
+ else if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.versionQueryNode))
{
versionQuery = sn.getValue();
if (versionQuery == null)
versionQuery = "";
}
- else if (sn.getType().equals(JDBCConstants.dataQueryNode))
+ else if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.dataQueryNode))
{
dataQuery = sn.getValue();
if (dataQuery == null)
Modified: manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java (original)
+++ manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraRepositoryConnector.java Sun Jul 7 11:40:01 2013
@@ -333,10 +333,6 @@ public class JiraRepositoryConnector ext
clientid = JiraConfig.CLIENT_ID_DEFAULT;
if (clientsecret == null)
clientsecret = JiraConfig.CLIENT_SECRET_DEFAULT;
- else {
- if (clientsecret.length() > 0)
- clientsecret = EXISTING_VALUE_PASSWORD;
- }
newMap.put("JIRAPROTOCOL", jiraprotocol);
newMap.put("JIRAHOST", jirahost);
@@ -459,10 +455,8 @@ public class JiraRepositoryConnector ext
parameters.setParameter(JiraConfig.CLIENT_ID_PARAM, clientid);
String clientsecret = variableContext.getParameter("clientsecret");
- if (clientsecret != null) {
- if (!clientsecret.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(JiraConfig.CLIENT_SECRET_PARAM, clientsecret);
- }
+ if (clientsecret != null)
+ parameters.setObfuscatedParameter(JiraConfig.CLIENT_SECRET_PARAM, clientsecret);
return null;
}
Modified: manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java (original)
+++ manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java Sun Jul 7 11:40:01 2013
@@ -541,13 +541,11 @@ public class LDAPAuthority extends org.a
boolean fGroupMemberDN = "1".equals(getParam(parameters, "ldapGroupMemberDn", ""));
String fBindUser = getParam(parameters, "ldapBindUser", "");
- String fBindPass = parameters.getObfuscatedParameter("ldapBindUser");
- if (fBindPass == null) {
- fBindPass = "";
- } else {
- if (fBindPass.length() > 0) {
- fBindPass = EXISTING_VALUE_PASSWORD;
- }
+ String fBindPass = "";
+ try {
+ fBindPass = ManifoldCF.deobfuscate(getParam(parameters, "ldapBindPass", ""));
+ } catch (ManifoldCFException ex) {
+ //ignore
}
if (tabName.equals(Messages.getString(locale, "LDAP.LDAP"))) {
@@ -687,9 +685,7 @@ public class LDAPAuthority extends org.a
copyParam(variableContext, parameters, "ldapBindUser");
String bindPass = variableContext.getParameter("ldapBindPass");
if (bindPass != null) {
- if (!bindPass.equals(EXISTING_VALUE_PASSWORD)) {
- parameters.setObfuscatedParameter("ldapBindPass", bindPass);
- }
+ parameters.setParameter("ldapBindPass", ManifoldCF.obfuscate(bindPass));
}
return null;
Modified: manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java (original)
+++ manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkAuthority.java Sun Jul 7 11:40:01 2013
@@ -716,11 +716,6 @@ public class LivelinkAuthority extends o
String serverPassword = parameters.getObfuscatedParameter(LiveLinkParameters.serverPassword);
if (serverPassword == null)
serverPassword = "";
- else
- {
- if (serverPassword.length() > 0)
- serverPassword = EXISTING_VALUE_PASSWORD;
- }
String serverHTTPCgiPath = parameters.getParameter(LiveLinkParameters.serverHTTPCgiPath);
if (serverHTTPCgiPath == null)
serverHTTPCgiPath = "/livelink/livelink.exe";
@@ -733,11 +728,6 @@ public class LivelinkAuthority extends o
String serverHTTPNTLMPassword = parameters.getObfuscatedParameter(LiveLinkParameters.serverHTTPNTLMPassword);
if (serverHTTPNTLMPassword == null)
serverHTTPNTLMPassword = "";
- else
- {
- if (serverHTTPNTLMPassword.length() > 0)
- serverHTTPNTLMPassword = EXISTING_VALUE_PASSWORD;
- }
String serverHTTPSKeystore = parameters.getParameter(LiveLinkParameters.serverHTTPSKeystore);
IKeystoreManager localServerHTTPSKeystore;
if (serverHTTPSKeystore == null)
@@ -984,10 +974,7 @@ public class LivelinkAuthority extends o
parameters.setParameter(LiveLinkParameters.serverUsername,serverUserName);
String serverPassword = variableContext.getParameter("serverpassword");
if (serverPassword != null)
- {
- if (!serverPassword.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(LiveLinkParameters.serverPassword,serverPassword);
- }
+ parameters.setObfuscatedParameter(LiveLinkParameters.serverPassword,serverPassword);
String serverHTTPCgiPath = variableContext.getParameter("serverhttpcgipath");
if (serverHTTPCgiPath != null)
parameters.setParameter(LiveLinkParameters.serverHTTPCgiPath,serverHTTPCgiPath);
@@ -999,10 +986,7 @@ public class LivelinkAuthority extends o
parameters.setParameter(LiveLinkParameters.serverHTTPNTLMUsername,serverHTTPNTLMUserName);
String serverHTTPNTLMPassword = variableContext.getParameter("serverhttpntlmpassword");
if (serverHTTPNTLMPassword != null)
- {
- if (!serverHTTPNTLMPassword.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(LiveLinkParameters.serverHTTPNTLMPassword,serverHTTPNTLMPassword);
- }
+ parameters.setObfuscatedParameter(LiveLinkParameters.serverHTTPNTLMPassword,serverHTTPNTLMPassword);
String serverHTTPSKeystoreValue = variableContext.getParameter("serverhttpskeystoredata");
if (serverHTTPSKeystoreValue != null)
parameters.setParameter(LiveLinkParameters.serverHTTPSKeystore,serverHTTPSKeystoreValue);
Modified: manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java (original)
+++ manifoldcf/trunk/connectors/livelink/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/livelink/LivelinkConnector.java Sun Jul 7 11:40:01 2013
@@ -1776,11 +1776,6 @@ public class LivelinkConnector extends o
String serverPassword = parameters.getObfuscatedParameter(LiveLinkParameters.serverPassword);
if (serverPassword == null)
serverPassword = "";
- else
- {
- if (serverPassword.length() > 0)
- serverPassword = EXISTING_VALUE_PASSWORD;
- }
String serverHTTPCgiPath = parameters.getParameter(LiveLinkParameters.serverHTTPCgiPath);
if (serverHTTPCgiPath == null)
serverHTTPCgiPath = "/livelink/livelink.exe";
@@ -1793,11 +1788,6 @@ public class LivelinkConnector extends o
String serverHTTPNTLMPassword = parameters.getObfuscatedParameter(LiveLinkParameters.serverHTTPNTLMPassword);
if (serverHTTPNTLMPassword == null)
serverHTTPNTLMPassword = "";
- else
- {
- if (serverHTTPNTLMPassword.length() > 0)
- serverHTTPNTLMPassword = EXISTING_VALUE_PASSWORD;
- }
String serverHTTPSKeystore = parameters.getParameter(LiveLinkParameters.serverHTTPSKeystore);
IKeystoreManager localServerHTTPSKeystore;
if (serverHTTPSKeystore == null)
@@ -2170,10 +2160,7 @@ public class LivelinkConnector extends o
parameters.setParameter(LiveLinkParameters.serverUsername,serverUserName);
String serverPassword = variableContext.getParameter("serverpassword");
if (serverPassword != null)
- {
- if (!serverPassword.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(LiveLinkParameters.serverPassword,serverPassword);
- }
+ parameters.setObfuscatedParameter(LiveLinkParameters.serverPassword,serverPassword);
String serverHTTPCgiPath = variableContext.getParameter("serverhttpcgipath");
if (serverHTTPCgiPath != null)
parameters.setParameter(LiveLinkParameters.serverHTTPCgiPath,serverHTTPCgiPath);
@@ -2185,10 +2172,7 @@ public class LivelinkConnector extends o
parameters.setParameter(LiveLinkParameters.serverHTTPNTLMUsername,serverHTTPNTLMUserName);
String serverHTTPNTLMPassword = variableContext.getParameter("serverhttpntlmpassword");
if (serverHTTPNTLMPassword != null)
- {
- if (!serverHTTPNTLMPassword.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(LiveLinkParameters.serverHTTPNTLMPassword,serverHTTPNTLMPassword);
- }
+ parameters.setObfuscatedParameter(LiveLinkParameters.serverHTTPNTLMPassword,serverHTTPNTLMPassword);
String serverHTTPSKeystoreValue = variableContext.getParameter("serverhttpskeystoredata");
if (serverHTTPSKeystoreValue != null)
parameters.setParameter(LiveLinkParameters.serverHTTPSKeystore,serverHTTPSKeystoreValue);
Modified: manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java (original)
+++ manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioAuthority.java Sun Jul 7 11:40:01 2013
@@ -946,11 +946,6 @@ public class MeridioAuthority extends or
String password = parameters.getObfuscatedParameter("Password");
if (password == null)
password = "";
- else
- {
- if (password.length() > 0)
- password = EXISTING_VALUE_PASSWORD;
- }
String meridioKeystore = parameters.getParameter("MeridioKeystore");
IKeystoreManager localKeystore;
@@ -1294,10 +1289,7 @@ public class MeridioAuthority extends or
String password = variableContext.getParameter("password");
if (password != null)
- {
- if (!password.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter("Password",password);
- }
+ parameters.setObfuscatedParameter("Password",password);
String configOp = variableContext.getParameter("configop");
if (configOp != null)
Modified: manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java (original)
+++ manifoldcf/trunk/connectors/meridio/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/meridio/MeridioConnector.java Sun Jul 7 11:40:01 2013
@@ -1690,11 +1690,6 @@ public class MeridioConnector extends or
String password = parameters.getObfuscatedParameter("Password");
if (password == null)
password = "";
- else
- {
- if (password.length() > 0)
- password = EXISTING_VALUE_PASSWORD;
- }
String webClientProtocol = parameters.getParameter("MeridioWebClientProtocol");
if (webClientProtocol == null)
@@ -2012,10 +2007,7 @@ public class MeridioConnector extends or
String password = variableContext.getParameter("password");
if (password != null)
- {
- if (!password.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter("Password",password);
- }
+ parameters.setObfuscatedParameter("Password",password);
String webClientProtocol = variableContext.getParameter("webClientProtocol");
if (webClientProtocol != null)
Modified: manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java (original)
+++ manifoldcf/trunk/connectors/rss/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/rss/RSSConnector.java Sun Jul 7 11:40:01 2013
@@ -1651,11 +1651,6 @@ public class RSSConnector extends org.ap
String proxyAuthPassword = parameters.getObfuscatedParameter(RSSConfig.PARAMETER_PROXYAUTHPASSWORD);
if (proxyAuthPassword == null)
proxyAuthPassword = "";
- else
- {
- if (proxyAuthPassword.length() > 0)
- proxyAuthPassword = EXISTING_VALUE_PASSWORD;
- }
// Email tab
if (tabName.equals(Messages.getString(locale,"RSSConnector.Email")))
@@ -1824,10 +1819,7 @@ public class RSSConnector extends org.ap
parameters.setParameter(RSSConfig.PARAMETER_PROXYAUTHUSERNAME,proxyAuthUsername);
String proxyAuthPassword = variableContext.getParameter("proxyauthpassword");
if (proxyAuthPassword != null)
- {
- if (!proxyAuthPassword.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(RSSConfig.PARAMETER_PROXYAUTHPASSWORD,proxyAuthPassword);
- }
+ parameters.setObfuscatedParameter(RSSConfig.PARAMETER_PROXYAUTHPASSWORD,proxyAuthPassword);
return null;
}
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=1500409&r1=1500408&r2=1500409&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 Sun Jul 7 11:40:01 2013
@@ -2103,11 +2103,6 @@ public class SharePointRepository extend
String password = parameters.getObfuscatedParameter("password");
if (password == null)
password = "";
- else
- {
- if (password.length() > 0)
- password = EXISTING_VALUE_PASSWORD;
- }
String keystore = parameters.getParameter("keystore");
IKeystoreManager localKeystore;
@@ -2268,10 +2263,7 @@ public class SharePointRepository extend
String password = variableContext.getParameter("password");
if (password != null)
- {
- if (!password.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter("password",password);
- }
+ parameters.setObfuscatedParameter("password",password);
String keystoreValue = variableContext.getParameter("keystoredata");
if (keystoreValue != null)
Modified: manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java Sun Jul 7 11:40:01 2013
@@ -1101,11 +1101,6 @@ public class SolrConnector extends org.a
String password = parameters.getObfuscatedParameter(SolrConfig.PARAM_PASSWORD);
if (password == null)
password = "";
- else
- {
- if (password.length() > 0)
- password = EXISTING_VALUE_PASSWORD;
- }
String commits = parameters.getParameter(SolrConfig.PARAM_COMMITS);
if (commits == null)
@@ -1868,10 +1863,7 @@ public class SolrConnector extends org.a
String password = variableContext.getParameter("password");
if (password != null)
- {
- if (!password.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(SolrConfig.PARAM_PASSWORD,password);
- }
+ parameters.setObfuscatedParameter(SolrConfig.PARAM_PASSWORD,password);
String maxLength = variableContext.getParameter("maxdocumentlength");
if (maxLength != null)
Modified: manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java (original)
+++ manifoldcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java Sun Jul 7 11:40:01 2013
@@ -1012,9 +1012,6 @@ public class WikiConnector extends org.a
String pass = parameters.getObfuscatedParameter(WikiConfig.PARAM_PASSWORD);
if (pass == null) {
pass = "";
- } else {
- if (pass.length() > 0)
- pass = EXISTING_VALUE_PASSWORD;
}
String domain = parameters.getParameter(WikiConfig.PARAM_DOMAIN);
if (domain == null) {
@@ -1034,10 +1031,6 @@ public class WikiConnector extends org.a
String accessPassword = parameters.getObfuscatedParameter(WikiConfig.PARAM_ACCESSPASSWORD);
if (accessPassword == null)
accessPassword = "";
- else {
- if (accessPassword.length() > 0)
- accessPassword = EXISTING_VALUE_PASSWORD;
- }
// Email tab
if (tabName.equals(Messages.getString(locale,"WikiConnector.Email")))
@@ -1190,8 +1183,7 @@ public class WikiConnector extends org.a
String pass = variableContext.getParameter("serverpass");
if (pass != null) {
- if (!pass.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(WikiConfig.PARAM_PASSWORD, pass);
+ parameters.setObfuscatedParameter(WikiConfig.PARAM_PASSWORD, pass);
}
String domain = variableContext.getParameter("serverdomain");
@@ -1206,8 +1198,7 @@ public class WikiConnector extends org.a
String accessPassword = variableContext.getParameter("accesspassword");
if (accessPassword != null) {
- if (!accessPassword.equals(EXISTING_VALUE_PASSWORD))
- parameters.setObfuscatedParameter(WikiConfig.PARAM_ACCESSPASSWORD, accessPassword);
+ parameters.setObfuscatedParameter(WikiConfig.PARAM_ACCESSPASSWORD, accessPassword);
}
String accessRealm = variableContext.getParameter("accessrealm");
Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java?rev=1500409&r1=1500408&r2=1500409&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java (original)
+++ manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/connector/BaseConnector.java Sun Jul 7 11:40:01 2013
@@ -28,12 +28,6 @@ public abstract class BaseConnector impl
{
public static final String _rcsid = "@(#)$Id: BaseConnector.java 988245 2010-08-23 18:39:35Z kwright $";
- /** This is a special password value that is used as a placeholder, so the real
- * password does not appear in HTML at any point in the crawler UI. Effectively,
- * a password with this value means "existing value".
- */
- protected static final String EXISTING_VALUE_PASSWORD = "\u0512\u0512\u0512\u0512\u0512\u0512\u0512\u0512";
-
// Config params
protected ConfigParams params = null;