Author: kwright
Date: Fri Feb 24 16:47:55 2017
New Revision: 1784298
URL: http://svn.apache.org/viewvc?rev=1784298&view=rev
Log:
Fix for CONNECTORS-1385.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1784298&r1=1784297&r2=1784298&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Feb 24 16:47:55 2017
@@ -3,6 +3,10 @@ $Id$
======================= 2.7-dev =====================
+CONNECTORS-1385: Confluence connector was constructing bad paths
+which confused CF 6.4.
+(Andrew Shumway, Karl Wright)
+
CONNECTORS-1382: Slack notification connector now treats the webhook url
as sensitive information
(Markus Schuch)
@@ -16,6 +20,7 @@ CONNECTORS-1380: DropBox connector editS
CONNECTORS-1378: History reports End time year resets to Start Time year
(Kishore Kumar)
+>>>>>>> .r1784297
CONNECTORS-1372: Bizarre errors while reading data out of a RepositoryDocument
in some cases. This was due to the implicit conversion of Readers to
Strings.
Modified:
manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java?rev=1784298&r1=1784297&r2=1784298&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
(original)
+++
manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/client/ConfluenceClient.java
Fri Feb 24 16:47:55 2017
@@ -201,7 +201,7 @@ public class ConfluenceClient {
connect();
}
- String url = String.format(Locale.ROOT, "%s://%s:%s/%s/%s?limit=1",
protocol, host,
+ String url = String.format(Locale.ROOT, "%s://%s:%s%s%s?limit=1",
protocol, host,
port, path, CONTENT_PATH);
logger.debug(
"[Processing] Hitting url: {} for confluence status check fetching :
",
@@ -296,7 +296,7 @@ public class ConfluenceClient {
@SuppressWarnings("unchecked")
public ConfluenceResponse<Page> getPages(int start, int limit,
Optional<String> space) throws Exception {
- String url = String.format(Locale.ROOT,
"%s://%s:%s/%s/%s?limit=%s&start=%s", protocol,
+ String url = String.format(Locale.ROOT,
"%s://%s:%s%s%s?limit=%s&start=%s", protocol,
host, port, path, CONTENT_PATH, limit, start);
if (space.isPresent()) {
url = String.format(Locale.ROOT, "%s&spaceKey=%s", url, space.get());
@@ -375,7 +375,7 @@ public class ConfluenceClient {
*/
public ConfluenceResponse<Attachment> getPageAttachments(String pageId, int
start,
int limit) throws Exception {
- String url = String.format(Locale.ROOT,
"%s://%s:%s/%s/%s/%s%s?limit=%s&start=%s",
+ String url = String.format(Locale.ROOT,
"%s://%s:%s%s%s/%s%s?limit=%s&start=%s",
protocol, host, port, path, CONTENT_PATH, pageId,
CHILD_ATTACHMENTS_PATH,
limit, start);
@SuppressWarnings("unchecked")
@@ -394,7 +394,7 @@ public class ConfluenceClient {
*/
public Attachment getAttachment(String attachmentId) {
String url = String
- .format(Locale.ROOT, "%s://%s:%s/%s/%s/%s?%s",
+ .format(Locale.ROOT, "%s://%s:%s%s%s/%s?%s",
protocol, host, port, path, CONTENT_PATH, attachmentId,
EXPANDABLE_PARAMETERS);
logger.debug(
"[Processing] Hitting url for getting document content : {}",
@@ -461,7 +461,7 @@ public class ConfluenceClient {
*/
public Page getPage(String pageId) {
String url = String
- .format(Locale.ROOT, "%s://%s:%s/%s/%s/%s?%s",
+ .format(Locale.ROOT, "%s://%s:%s%s%s/%s?%s",
protocol, host, port, path, CONTENT_PATH, pageId,
EXPANDABLE_PARAMETERS);
url = sanitizeUrl(url);
logger.debug(
@@ -497,7 +497,7 @@ public class ConfluenceClient {
boolean isLast = false;
do {
String url = String
- .format(Locale.ROOT, "%s://%s:%s/%s/%s/%s/%s?start=%s&limit=%s",
+ .format(Locale.ROOT, "%s://%s:%s%s%s/%s/%s?start=%s&limit=%s",
protocol, host, port, path, CONTENT_PATH, pageId, LABEL_PATH,
lastStart, limit);
url = sanitizeUrl(url);
logger.debug(
