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/06 15:42:52 UTC
svn commit: r1500263 - in /manifoldcf/trunk/connectors:
filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/
jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/
jdbc/connector/src/main/java/or...
Author: kwright
Date: Sat Jul 6 13:42:51 2013
New Revision: 1500263
URL: http://svn.apache.org/r1500263
Log:
More changes for CONNECTORS-737. All connectors now complete except for ActiveDirectory and Web connectors.
Modified:
manifoldcf/trunk/connectors/filenet/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/filenet/FilenetConnector.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/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
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=1500263&r1=1500262&r2=1500263&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 Sat Jul 6 13:42:51 2013
@@ -1567,44 +1567,50 @@ public class FilenetConnector extends or
Locale locale, ConfigParams parameters, String tabName)
throws ManifoldCFException, IOException
{
- String userID = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_USERID);
+ String userID = parameters.getParameter(CONFIG_PARAM_USERID);
if (userID == null)
userID = "";
- String password = parameters.getObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_PASSWORD);
+ String password = parameters.getObfuscatedParameter(CONFIG_PARAM_PASSWORD);
if (password == null)
password = "";
- String filenetdomain = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_FILENETDOMAIN);
+ else
+ {
+ if (password.length() > 0)
+ password = EXISTING_VALUE_PASSWORD;
+ }
+
+ String filenetdomain = parameters.getParameter(CONFIG_PARAM_FILENETDOMAIN);
if (filenetdomain == null)
{
- filenetdomain = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_FILENETDOMAIN_OLD);
+ filenetdomain = parameters.getParameter(CONFIG_PARAM_FILENETDOMAIN_OLD);
if (filenetdomain == null)
filenetdomain = "";
}
- String objectstore = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_OBJECTSTORE);
+ String objectstore = parameters.getParameter(CONFIG_PARAM_OBJECTSTORE);
if (objectstore == null)
objectstore = "";
- String serverprotocol = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERPROTOCOL);
+ String serverprotocol = parameters.getParameter(CONFIG_PARAM_SERVERPROTOCOL);
if (serverprotocol == null)
serverprotocol = "http";
- String serverhostname = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERHOSTNAME);
+ String serverhostname = parameters.getParameter(CONFIG_PARAM_SERVERHOSTNAME);
if (serverhostname == null)
serverhostname = "";
- String serverport = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERPORT);
+ String serverport = parameters.getParameter(CONFIG_PARAM_SERVERPORT);
if (serverport == null)
serverport = "";
- String serverwsilocation = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERWSILOCATION);
+ String serverwsilocation = parameters.getParameter(CONFIG_PARAM_SERVERWSILOCATION);
if (serverwsilocation == null)
serverwsilocation = "wsi/FNCEWS40DIME";
- String urlprotocol = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLPROTOCOL);
+ String urlprotocol = parameters.getParameter(CONFIG_PARAM_URLPROTOCOL);
if (urlprotocol == null)
urlprotocol = "http";
- String urlhostname = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLHOSTNAME);
+ String urlhostname = parameters.getParameter(CONFIG_PARAM_URLHOSTNAME);
if (urlhostname == null)
urlhostname = "";
- String urlport = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLPORT);
+ String urlport = parameters.getParameter(CONFIG_PARAM_URLPORT);
if (urlport == null)
urlport = "";
- String urllocation = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLLOCATION);
+ String urllocation = parameters.getParameter(CONFIG_PARAM_URLLOCATION);
if (urllocation == null)
urllocation = "Workplace/Browse.jsp";
@@ -1751,51 +1757,54 @@ public class FilenetConnector extends or
{
String serverprotocol = variableContext.getParameter("serverprotocol");
if (serverprotocol != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERPROTOCOL,serverprotocol);
+ parameters.setParameter(CONFIG_PARAM_SERVERPROTOCOL,serverprotocol);
String serverhostname = variableContext.getParameter("serverhostname");
if (serverhostname != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERHOSTNAME,serverhostname);
+ parameters.setParameter(CONFIG_PARAM_SERVERHOSTNAME,serverhostname);
String serverport = variableContext.getParameter("serverport");
if (serverport != null && serverport.length() > 0)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERPORT,serverport);
+ parameters.setParameter(CONFIG_PARAM_SERVERPORT,serverport);
String serverwsilocation = variableContext.getParameter("serverwsilocation");
if (serverwsilocation != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_SERVERWSILOCATION,serverwsilocation);
+ parameters.setParameter(CONFIG_PARAM_SERVERWSILOCATION,serverwsilocation);
String urlprotocol = variableContext.getParameter("urlprotocol");
if (urlprotocol != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLPROTOCOL,urlprotocol);
+ parameters.setParameter(CONFIG_PARAM_URLPROTOCOL,urlprotocol);
String urlhostname = variableContext.getParameter("urlhostname");
if (urlhostname != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLHOSTNAME,urlhostname);
+ parameters.setParameter(CONFIG_PARAM_URLHOSTNAME,urlhostname);
String urlport = variableContext.getParameter("urlport");
if (urlport != null && urlport.length() > 0)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLPORT,urlport);
+ parameters.setParameter(CONFIG_PARAM_URLPORT,urlport);
String urllocation = variableContext.getParameter("urllocation");
if (urllocation != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_URLLOCATION,urllocation);
+ parameters.setParameter(CONFIG_PARAM_URLLOCATION,urllocation);
String userID = variableContext.getParameter("userid");
if (userID != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_USERID,userID);
+ parameters.setParameter(CONFIG_PARAM_USERID,userID);
String password = variableContext.getParameter("password");
if (password != null)
- parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_PASSWORD,password);
+ {
+ if (!password.equals(EXISTING_VALUE_PASSWORD))
+ parameters.setObfuscatedParameter(CONFIG_PARAM_PASSWORD,password);
+ }
String filenetdomain = variableContext.getParameter("filenetdomain");
if (filenetdomain != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_FILENETDOMAIN,filenetdomain);
+ parameters.setParameter(CONFIG_PARAM_FILENETDOMAIN,filenetdomain);
String objectstore = variableContext.getParameter("objectstore");
if (objectstore != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.CONFIG_PARAM_OBJECTSTORE,objectstore);
+ parameters.setParameter(CONFIG_PARAM_OBJECTSTORE,objectstore);
return null;
}
@@ -1949,9 +1958,9 @@ public class FilenetConnector extends or
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_DOCUMENTCLASS))
+ if (sn.getType().equals(SPEC_NODE_DOCUMENTCLASS))
{
- String value = sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE);
+ String value = sn.getAttributeValue(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);
@@ -2366,9 +2375,9 @@ public class FilenetConnector extends or
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_MIMETYPE))
+ if (sn.getType().equals(SPEC_NODE_MIMETYPE))
{
- String value = sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE);
+ String value = sn.getAttributeValue(SPEC_ATTRIBUTE_VALUE);
if (mimeTypes == null)
mimeTypes = new HashMap();
mimeTypes.put(value,value);
@@ -2594,7 +2603,7 @@ public class FilenetConnector extends or
i = 0;
while (i < ds.getChildCount())
{
- if (ds.getChild(i).getType().equals(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_DOCUMENTCLASS))
+ if (ds.getChild(i).getType().equals(SPEC_NODE_DOCUMENTCLASS))
ds.removeChild(i);
else
i++;
@@ -2606,14 +2615,14 @@ public class FilenetConnector extends or
while (i < x.length)
{
String value = x[i++];
- 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);
+ SpecificationNode node = new SpecificationNode(SPEC_NODE_DOCUMENTCLASS);
+ node.setAttribute(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(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_ALLMETADATA,allmetadata);
+ node.setAttribute(SPEC_ATTRIBUTE_ALLMETADATA,allmetadata);
else
{
String[] fields = variableContext.getParameterValues("metadatafield_"+value);
@@ -2623,8 +2632,8 @@ public class FilenetConnector extends or
while (j < fields.length)
{
String field = fields[j++];
- 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);
+ SpecificationNode sp2 = new SpecificationNode(SPEC_NODE_METADATAFIELD);
+ sp2.setAttribute(SPEC_ATTRIBUTE_VALUE,field);
node.addChild(node.getChildCount(),sp2);
}
}
@@ -2642,12 +2651,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(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);
+ SpecificationNode matchNode = new SpecificationNode(SPEC_NODE_MATCH);
+ matchNode.setAttribute(SPEC_ATTRIBUTE_MATCHTYPE,matchType);
+ matchNode.setAttribute(SPEC_ATTRIBUTE_FIELDNAME,matchField);
if (matchValue == null)
matchValue = "";
- matchNode.setAttribute(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE,matchValue);
+ matchNode.setAttribute(SPEC_ATTRIBUTE_VALUE,matchValue);
node.addChild(node.getChildCount(),matchNode);
}
q++;
@@ -2661,12 +2670,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(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);
+ SpecificationNode matchNode = new SpecificationNode(SPEC_NODE_MATCH);
+ matchNode.setAttribute(SPEC_ATTRIBUTE_MATCHTYPE,matchType);
+ matchNode.setAttribute(SPEC_ATTRIBUTE_FIELDNAME,matchField);
if (matchValue == null)
matchValue = "";
- matchNode.setAttribute(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE,matchValue);
+ matchNode.setAttribute(SPEC_ATTRIBUTE_VALUE,matchValue);
node.addChild(node.getChildCount(),matchNode);
}
@@ -2679,7 +2688,7 @@ public class FilenetConnector extends or
i = 0;
while (i < ds.getChildCount())
{
- if (ds.getChild(i).getType().equals(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_MIMETYPE))
+ if (ds.getChild(i).getType().equals(SPEC_NODE_MIMETYPE))
ds.removeChild(i);
else
i++;
@@ -2691,8 +2700,8 @@ public class FilenetConnector extends or
while (i < x.length)
{
String value = x[i++];
- 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);
+ SpecificationNode node = new SpecificationNode(SPEC_NODE_MIMETYPE);
+ node.setAttribute(SPEC_ATTRIBUTE_VALUE,value);
ds.addChild(ds.getChildCount(),node);
}
}
@@ -2861,9 +2870,9 @@ public class FilenetConnector extends or
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_DOCUMENTCLASS))
+ if (sn.getType().equals(SPEC_NODE_DOCUMENTCLASS))
{
- String value = sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE);
+ String value = sn.getAttributeValue(SPEC_ATTRIBUTE_VALUE);
org.apache.manifoldcf.crawler.connectors.filenet.DocClassSpec spec = new org.apache.manifoldcf.crawler.connectors.filenet.DocClassSpec(sn);
documentClasses.put(value,spec);
}
@@ -2973,9 +2982,9 @@ public class FilenetConnector extends or
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_NODE_MIMETYPE))
+ if (sn.getType().equals(SPEC_NODE_MIMETYPE))
{
- String value = sn.getAttributeValue(org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector.SPEC_ATTRIBUTE_VALUE);
+ String value = sn.getAttributeValue(SPEC_ATTRIBUTE_VALUE);
if (mimeTypes == null)
mimeTypes = new HashMap();
mimeTypes.put(value,value);
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=1500263&r1=1500262&r2=1500263&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 Sat Jul 6 13:42:51 2013
@@ -2635,15 +2635,25 @@ 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 = "";
+ if (password==null)
+ password = "";
+ else
+ {
+ if (password.length() > 0)
+ password = EXISTING_VALUE_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")))
@@ -2716,8 +2726,11 @@ public class SharedDriveConnector extend
String password = variableContext.getParameter("password");
if (password != null)
- parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveParameters.password,password);
-
+ {
+ if (!password.equals(EXISTING_VALUE_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=1500263&r1=1500262&r2=1500263&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 Sat Jul 6 13:42:51 2013
@@ -370,6 +370,10 @@ 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) {
@@ -501,7 +505,9 @@ public class JDBCAuthority extends BaseA
String lPassword = variableContext.getParameter("password");
if (lPassword != null) {
- parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databasePassword, lPassword);
+ if (!lPassword.equals(EXISTING_VALUE_PASSWORD)) {
+ 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=1500263&r1=1500262&r2=1500263&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 Sat Jul 6 13:42:51 2013
@@ -740,24 +740,29 @@ public class JDBCConnector extends org.a
Locale locale, ConfigParams parameters, String tabName)
throws ManifoldCFException, IOException
{
- String jdbcProvider = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.providerParameter);
+ String jdbcProvider = parameters.getParameter(JDBCConstants.providerParameter);
if (jdbcProvider == null)
jdbcProvider = "oracle:thin:@";
- String accessMethod = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.methodParameter);
+ String accessMethod = parameters.getParameter(JDBCConstants.methodParameter);
if (accessMethod == null)
accessMethod = "name";
- String host = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.hostParameter);
+ String host = parameters.getParameter(JDBCConstants.hostParameter);
if (host == null)
host = "localhost";
- String databaseName = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databaseNameParameter);
+ String databaseName = parameters.getParameter(JDBCConstants.databaseNameParameter);
if (databaseName == null)
databaseName = "database";
- String databaseUser = parameters.getParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databaseUserName);
+ String databaseUser = parameters.getParameter(JDBCConstants.databaseUserName);
if (databaseUser == null)
databaseUser = "";
- String databasePassword = parameters.getObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databasePassword);
+ String databasePassword = parameters.getObfuscatedParameter(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")))
@@ -859,27 +864,30 @@ public class JDBCConnector extends org.a
{
String type = variableContext.getParameter("databasetype");
if (type != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.providerParameter,type);
+ parameters.setParameter(JDBCConstants.providerParameter,type);
String accessMethod = variableContext.getParameter("accessmethod");
if (accessMethod != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.methodParameter,accessMethod);
+ parameters.setParameter(JDBCConstants.methodParameter,accessMethod);
String host = variableContext.getParameter("databasehost");
if (host != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.hostParameter,host);
+ parameters.setParameter(JDBCConstants.hostParameter,host);
String databaseName = variableContext.getParameter("databasename");
if (databaseName != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databaseNameParameter,databaseName);
+ parameters.setParameter(JDBCConstants.databaseNameParameter,databaseName);
String userName = variableContext.getParameter("username");
if (userName != null)
- parameters.setParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databaseUserName,userName);
+ parameters.setParameter(JDBCConstants.databaseUserName,userName);
String password = variableContext.getParameter("password");
if (password != null)
- parameters.setObfuscatedParameter(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.databasePassword,password);
+ {
+ if (!password.equals(EXISTING_VALUE_PASSWORD))
+ parameters.setObfuscatedParameter(JDBCConstants.databasePassword,password);
+ }
return null;
}
@@ -1063,19 +1071,19 @@ public class JDBCConnector extends org.a
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.idQueryNode))
+ if (sn.getType().equals(JDBCConstants.idQueryNode))
{
idQuery = sn.getValue();
if (idQuery == null)
idQuery = "";
}
- else if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.versionQueryNode))
+ else if (sn.getType().equals(JDBCConstants.versionQueryNode))
{
versionQuery = sn.getValue();
if (versionQuery == null)
versionQuery = "";
}
- else if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.dataQueryNode))
+ else if (sn.getType().equals(JDBCConstants.dataQueryNode))
{
dataQuery = sn.getValue();
if (dataQuery == null)
@@ -1223,12 +1231,12 @@ public class JDBCConnector extends org.a
int i = 0;
while (i < ds.getChildCount())
{
- if (ds.getChild(i).getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.idQueryNode))
+ if (ds.getChild(i).getType().equals(JDBCConstants.idQueryNode))
ds.removeChild(i);
else
i++;
}
- sn = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.idQueryNode);
+ sn = new SpecificationNode(JDBCConstants.idQueryNode);
sn.setValue(idQuery);
ds.addChild(ds.getChildCount(),sn);
}
@@ -1237,12 +1245,12 @@ public class JDBCConnector extends org.a
int i = 0;
while (i < ds.getChildCount())
{
- if (ds.getChild(i).getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.versionQueryNode))
+ if (ds.getChild(i).getType().equals(JDBCConstants.versionQueryNode))
ds.removeChild(i);
else
i++;
}
- sn = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.versionQueryNode);
+ sn = new SpecificationNode(JDBCConstants.versionQueryNode);
sn.setValue(versionQuery);
ds.addChild(ds.getChildCount(),sn);
}
@@ -1251,12 +1259,12 @@ public class JDBCConnector extends org.a
int i = 0;
while (i < ds.getChildCount())
{
- if (ds.getChild(i).getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.dataQueryNode))
+ if (ds.getChild(i).getType().equals(JDBCConstants.dataQueryNode))
ds.removeChild(i);
else
i++;
}
- sn = new SpecificationNode(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.dataQueryNode);
+ sn = new SpecificationNode(JDBCConstants.dataQueryNode);
sn.setValue(dataQuery);
ds.addChild(ds.getChildCount(),sn);
}
@@ -1326,19 +1334,19 @@ public class JDBCConnector extends org.a
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.idQueryNode))
+ if (sn.getType().equals(JDBCConstants.idQueryNode))
{
idQuery = sn.getValue();
if (idQuery == null)
idQuery = "";
}
- else if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.versionQueryNode))
+ else if (sn.getType().equals(JDBCConstants.versionQueryNode))
{
versionQuery = sn.getValue();
if (versionQuery == null)
versionQuery = "";
}
- else if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.dataQueryNode))
+ else if (sn.getType().equals(JDBCConstants.dataQueryNode))
{
dataQuery = sn.getValue();
if (dataQuery == null)
@@ -1784,19 +1792,19 @@ public class JDBCConnector extends org.a
while (i < ds.getChildCount())
{
SpecificationNode sn = ds.getChild(i++);
- if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.idQueryNode))
+ if (sn.getType().equals(JDBCConstants.idQueryNode))
{
idQuery = sn.getValue();
if (idQuery == null)
idQuery = "";
}
- else if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.versionQueryNode))
+ else if (sn.getType().equals(JDBCConstants.versionQueryNode))
{
versionQuery = sn.getValue();
if (versionQuery == null)
versionQuery = "";
}
- else if (sn.getType().equals(org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConstants.dataQueryNode))
+ else if (sn.getType().equals(JDBCConstants.dataQueryNode))
{
dataQuery = sn.getValue();
if (dataQuery == 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=1500263&r1=1500262&r2=1500263&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 Sat Jul 6 13:42:51 2013
@@ -541,11 +541,13 @@ public class LDAPAuthority extends org.a
boolean fGroupMemberDN = "1".equals(getParam(parameters, "ldapGroupMemberDn", ""));
String fBindUser = getParam(parameters, "ldapBindUser", "");
- String fBindPass = "";
- try {
- fBindPass = ManifoldCF.deobfuscate(getParam(parameters, "ldapBindPass", ""));
- } catch (ManifoldCFException ex) {
- //ignore
+ String fBindPass = parameters.getObfuscatedParameter("ldapBindUser");
+ if (fBindPass == null) {
+ fBindPass = "";
+ } else {
+ if (fBindPass.length() > 0) {
+ fBindPass = EXISTING_VALUE_PASSWORD;
+ }
}
if (tabName.equals(Messages.getString(locale, "LDAP.LDAP"))) {
@@ -685,7 +687,9 @@ public class LDAPAuthority extends org.a
copyParam(variableContext, parameters, "ldapBindUser");
String bindPass = variableContext.getParameter("ldapBindPass");
if (bindPass != null) {
- parameters.setParameter("ldapBindPass", ManifoldCF.obfuscate(bindPass));
+ if (!bindPass.equals(EXISTING_VALUE_PASSWORD)) {
+ parameters.setObfuscatedParameter("ldapBindPass", 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=1500263&r1=1500262&r2=1500263&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 Sat Jul 6 13:42:51 2013
@@ -716,6 +716,11 @@ 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";
@@ -728,6 +733,11 @@ 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)
@@ -974,7 +984,10 @@ public class LivelinkAuthority extends o
parameters.setParameter(LiveLinkParameters.serverUsername,serverUserName);
String serverPassword = variableContext.getParameter("serverpassword");
if (serverPassword != null)
- parameters.setObfuscatedParameter(LiveLinkParameters.serverPassword,serverPassword);
+ {
+ if (!serverPassword.equals(EXISTING_VALUE_PASSWORD))
+ parameters.setObfuscatedParameter(LiveLinkParameters.serverPassword,serverPassword);
+ }
String serverHTTPCgiPath = variableContext.getParameter("serverhttpcgipath");
if (serverHTTPCgiPath != null)
parameters.setParameter(LiveLinkParameters.serverHTTPCgiPath,serverHTTPCgiPath);
@@ -986,7 +999,10 @@ public class LivelinkAuthority extends o
parameters.setParameter(LiveLinkParameters.serverHTTPNTLMUsername,serverHTTPNTLMUserName);
String serverHTTPNTLMPassword = variableContext.getParameter("serverhttpntlmpassword");
if (serverHTTPNTLMPassword != null)
- parameters.setObfuscatedParameter(LiveLinkParameters.serverHTTPNTLMPassword,serverHTTPNTLMPassword);
+ {
+ if (!serverHTTPNTLMPassword.equals(EXISTING_VALUE_PASSWORD))
+ 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=1500263&r1=1500262&r2=1500263&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 Sat Jul 6 13:42:51 2013
@@ -1776,6 +1776,11 @@ 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";
@@ -1788,6 +1793,11 @@ 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)
@@ -2160,7 +2170,10 @@ public class LivelinkConnector extends o
parameters.setParameter(LiveLinkParameters.serverUsername,serverUserName);
String serverPassword = variableContext.getParameter("serverpassword");
if (serverPassword != null)
- parameters.setObfuscatedParameter(LiveLinkParameters.serverPassword,serverPassword);
+ {
+ if (!serverPassword.equals(EXISTING_VALUE_PASSWORD))
+ parameters.setObfuscatedParameter(LiveLinkParameters.serverPassword,serverPassword);
+ }
String serverHTTPCgiPath = variableContext.getParameter("serverhttpcgipath");
if (serverHTTPCgiPath != null)
parameters.setParameter(LiveLinkParameters.serverHTTPCgiPath,serverHTTPCgiPath);
@@ -2172,7 +2185,10 @@ public class LivelinkConnector extends o
parameters.setParameter(LiveLinkParameters.serverHTTPNTLMUsername,serverHTTPNTLMUserName);
String serverHTTPNTLMPassword = variableContext.getParameter("serverhttpntlmpassword");
if (serverHTTPNTLMPassword != null)
- parameters.setObfuscatedParameter(LiveLinkParameters.serverHTTPNTLMPassword,serverHTTPNTLMPassword);
+ {
+ if (!serverHTTPNTLMPassword.equals(EXISTING_VALUE_PASSWORD))
+ 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=1500263&r1=1500262&r2=1500263&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 Sat Jul 6 13:42:51 2013
@@ -946,6 +946,11 @@ 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;
@@ -1289,7 +1294,10 @@ public class MeridioAuthority extends or
String password = variableContext.getParameter("password");
if (password != null)
- parameters.setObfuscatedParameter("Password",password);
+ {
+ if (!password.equals(EXISTING_VALUE_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=1500263&r1=1500262&r2=1500263&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 Sat Jul 6 13:42:51 2013
@@ -1690,6 +1690,11 @@ 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)
@@ -2007,7 +2012,10 @@ public class MeridioConnector extends or
String password = variableContext.getParameter("password");
if (password != null)
- parameters.setObfuscatedParameter("Password",password);
+ {
+ if (!password.equals(EXISTING_VALUE_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=1500263&r1=1500262&r2=1500263&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 Sat Jul 6 13:42:51 2013
@@ -1651,6 +1651,11 @@ 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")))
@@ -1819,7 +1824,10 @@ public class RSSConnector extends org.ap
parameters.setParameter(RSSConfig.PARAMETER_PROXYAUTHUSERNAME,proxyAuthUsername);
String proxyAuthPassword = variableContext.getParameter("proxyauthpassword");
if (proxyAuthPassword != null)
- parameters.setObfuscatedParameter(RSSConfig.PARAMETER_PROXYAUTHPASSWORD,proxyAuthPassword);
+ {
+ if (!proxyAuthPassword.equals(EXISTING_VALUE_PASSWORD))
+ 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=1500263&r1=1500262&r2=1500263&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 Sat Jul 6 13:42:51 2013
@@ -2103,6 +2103,11 @@ 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;
@@ -2263,7 +2268,10 @@ public class SharePointRepository extend
String password = variableContext.getParameter("password");
if (password != null)
- parameters.setObfuscatedParameter("password",password);
+ {
+ if (!password.equals(EXISTING_VALUE_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=1500263&r1=1500262&r2=1500263&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 Sat Jul 6 13:42:51 2013
@@ -1101,6 +1101,11 @@ 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)
@@ -1863,7 +1868,10 @@ public class SolrConnector extends org.a
String password = variableContext.getParameter("password");
if (password != null)
- parameters.setObfuscatedParameter(SolrConfig.PARAM_PASSWORD,password);
+ {
+ if (!password.equals(EXISTING_VALUE_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=1500263&r1=1500262&r2=1500263&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 Sat Jul 6 13:42:51 2013
@@ -1012,6 +1012,9 @@ 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) {
@@ -1031,6 +1034,10 @@ 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")))
@@ -1183,7 +1190,8 @@ public class WikiConnector extends org.a
String pass = variableContext.getParameter("serverpass");
if (pass != null) {
- parameters.setObfuscatedParameter(WikiConfig.PARAM_PASSWORD, pass);
+ if (!pass.equals(EXISTING_VALUE_PASSWORD))
+ parameters.setObfuscatedParameter(WikiConfig.PARAM_PASSWORD, pass);
}
String domain = variableContext.getParameter("serverdomain");
@@ -1198,7 +1206,8 @@ public class WikiConnector extends org.a
String accessPassword = variableContext.getParameter("accesspassword");
if (accessPassword != null) {
- parameters.setObfuscatedParameter(WikiConfig.PARAM_ACCESSPASSWORD, accessPassword);
+ if (!accessPassword.equals(EXISTING_VALUE_PASSWORD))
+ parameters.setObfuscatedParameter(WikiConfig.PARAM_ACCESSPASSWORD, accessPassword);
}
String accessRealm = variableContext.getParameter("accessrealm");