Author: kwright
Date: Tue Oct 6 11:41:43 2015
New Revision: 1707008
URL: http://svn.apache.org/viewvc?rev=1707008&view=rev
Log:
Fix for CONNECTORS-1245.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/confluence/ConfluenceAuthorityConnector.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1707008&r1=1707007&r2=1707008&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Oct 6 11:41:43 2015
@@ -3,6 +3,9 @@ $Id$
======================= 2.3-dev =====================
+CONNECTORS-1245: Using wrong logger for confluence authority.
+(Jens Grassel, Karl Wright)
+
CONNECTORS-1237: Upgrade the CMIS Connector to OpenCMIS 0.13.0
(Piergiorgio Lucidi)
Modified:
manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/confluence/ConfluenceAuthorityConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/confluence/ConfluenceAuthorityConnector.java?rev=1707008&r1=1707007&r2=1707008&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/confluence/ConfluenceAuthorityConnector.java
(original)
+++
manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/confluence/ConfluenceAuthorityConnector.java
Tue Oct 6 11:41:43 2015
@@ -19,7 +19,7 @@ import org.apache.manifoldcf.core.interf
import
org.apache.manifoldcf.crawler.connectors.confluence.ConfluenceConfiguration;
import
org.apache.manifoldcf.crawler.connectors.confluence.client.ConfluenceClient;
import
org.apache.manifoldcf.crawler.connectors.confluence.model.ConfluenceUser;
-import org.apache.manifoldcf.crawler.system.Logging;
+import org.apache.manifoldcf.authorities.system.Logging;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -177,8 +177,8 @@ public class ConfluenceAuthorityConnecto
+ " required but not set");
}
- if (Logging.connectors.isDebugEnabled()) {
- Logging.connectors.debug("Confluence protocol =
'" + protocol
+ if (Logging.authorityConnectors.isDebugEnabled()) {
+ Logging.authorityConnectors.debug("Confluence
protocol = '" + protocol
+ "'");
}
@@ -188,12 +188,12 @@ public class ConfluenceAuthorityConnecto
+ " required but not set");
}
- if (Logging.connectors.isDebugEnabled()) {
- Logging.connectors.debug("Confluence host = '"
+ host + "'");
+ if (Logging.authorityConnectors.isDebugEnabled()) {
+ Logging.authorityConnectors.debug("Confluence
host = '" + host + "'");
}
- if (Logging.connectors.isDebugEnabled()) {
- Logging.connectors.debug("Confluence port = '"
+ port + "'");
+ if (Logging.authorityConnectors.isDebugEnabled()) {
+ Logging.authorityConnectors.debug("Confluence
port = '" + port + "'");
}
if (StringUtils.isEmpty(path)) {
@@ -202,17 +202,17 @@ public class ConfluenceAuthorityConnecto
+ " required but not set");
}
- if (Logging.connectors.isDebugEnabled()) {
- Logging.connectors.debug("Confluence path = '"
+ path + "'");
+ if (Logging.authorityConnectors.isDebugEnabled()) {
+ Logging.authorityConnectors.debug("Confluence
path = '" + path + "'");
}
- if (Logging.connectors.isDebugEnabled()) {
- Logging.connectors.debug("Confluence username =
'" + username
+ if (Logging.authorityConnectors.isDebugEnabled()) {
+ Logging.authorityConnectors.debug("Confluence
username = '" + username
+ "'");
}
- if (Logging.connectors.isDebugEnabled()) {
- Logging.connectors
+ if (Logging.authorityConnectors.isDebugEnabled()) {
+ Logging.authorityConnectors
.debug("Confluence password '"
+ password != null ? "set"
: "not set" +
"'");
}