Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 432E918B3B for ; Sun, 29 Nov 2015 12:09:46 +0000 (UTC) Received: (qmail 71215 invoked by uid 500); 29 Nov 2015 12:09:46 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 71164 invoked by uid 500); 29 Nov 2015 12:09:46 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 71155 invoked by uid 99); 29 Nov 2015 12:09:46 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 29 Nov 2015 12:09:46 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 8D3BFC207E for ; Sun, 29 Nov 2015 12:09:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.79 X-Spam-Level: * X-Spam-Status: No, score=1.79 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id k8QDSo1Xyj0n for ; Sun, 29 Nov 2015 12:09:45 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id 579C020BF1 for ; Sun, 29 Nov 2015 12:09:44 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 878E2E0280 for ; Sun, 29 Nov 2015 12:09:43 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 465033A0234 for ; Sun, 29 Nov 2015 12:09:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1717052 - in /manifoldcf/trunk: CHANGES.txt connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java Date: Sun, 29 Nov 2015 12:09:43 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151129120943.465033A0234@svn01-us-west.apache.org> Author: kwright Date: Sun Nov 29 12:09:42 2015 New Revision: 1717052 URL: http://svn.apache.org/viewvc?rev=1717052&view=rev Log: Tentative fix for CONNECTORS-1251. Modified: manifoldcf/trunk/CHANGES.txt manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java Modified: manifoldcf/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1717052&r1=1717051&r2=1717052&view=diff ============================================================================== --- manifoldcf/trunk/CHANGES.txt (original) +++ manifoldcf/trunk/CHANGES.txt Sun Nov 29 12:09:42 2015 @@ -3,6 +3,9 @@ $Id$ ======================= 2.3-dev ===================== +CONNECTORS-1251: Confluence connector encoding issue. +(Karl Wright, Jens Grassel) + CONNECTORS-1260: Fix completely broken email connector. (Karl Wright, Julien Massiera) Modified: manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java?rev=1717052&r1=1717051&r2=1717052&view=diff ============================================================================== --- manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java (original) +++ manifoldcf/trunk/connectors/confluence/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/confluence/model/Page.java Sun Nov 29 12:09:42 2015 @@ -95,7 +95,7 @@ public class Page extends ConfluenceReso protected String creatorUsername; protected String lastModifier; protected String lastModifierUsername; - protected String mediaType = "text/html"; + protected String mediaType = "text/html; charset=utf-8"; protected long length; protected String content; protected List