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 94BA810188 for ; Fri, 17 Jan 2014 03:27:18 +0000 (UTC) Received: (qmail 12842 invoked by uid 500); 17 Jan 2014 03:27:17 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 12750 invoked by uid 500); 17 Jan 2014 03:27:14 -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 12736 invoked by uid 99); 17 Jan 2014 03:27:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jan 2014 03:27:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jan 2014 03:27:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 028822388860; Fri, 17 Jan 2014 03:26:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1559003 - in /manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf: agents/output/hdfs/HDFSOutputConnector.java agents/output/hdfs/ParameterEnum.java crawler/connectors/hdfs/HDFSRepositoryConnector.java Date: Fri, 17 Jan 2014 03:26:51 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140117032652.028822388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kwright Date: Fri Jan 17 03:26:50 2014 New Revision: 1559003 URL: http://svn.apache.org/r1559003 Log: Default HDFS protocol is hdfs, for backwards compatibility Modified: manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/ParameterEnum.java manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java Modified: manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java?rev=1559003&r1=1559002&r2=1559003&view=diff ============================================================================== --- manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java (original) +++ manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java Fri Jan 17 03:26:50 2014 @@ -115,7 +115,7 @@ public class HDFSOutputConnector extends super.connect(configParams); nameNodeProtocol = configParams.getParameter(ParameterEnum.namenodeprotocol.name()); if (nameNodeProtocol == null) - nameNodeProtocol = "file"; + nameNodeProtocol = "hdfs"; nameNodeHost = configParams.getParameter(ParameterEnum.namenodehost.name()); nameNodePort = configParams.getParameter(ParameterEnum.namenodeport.name()); user = configParams.getParameter(ParameterEnum.user.name()); @@ -182,7 +182,7 @@ public class HDFSOutputConnector extends protected HDFSSession getSession() throws ManifoldCFException, ServiceInterruption { if (session == null) { if (nameNodeProtocol == null) - nameNodeProtocol = "file"; + nameNodeProtocol = "hdfs"; if (nameNodeHost == null) throw new ManifoldCFException("Namenodehost must be specified"); Modified: manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/ParameterEnum.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/ParameterEnum.java?rev=1559003&r1=1559002&r2=1559003&view=diff ============================================================================== --- manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/ParameterEnum.java (original) +++ manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/ParameterEnum.java Fri Jan 17 03:26:50 2014 @@ -24,7 +24,7 @@ import java.util.Map; /** Parameters constants */ public enum ParameterEnum { - namenodeprotocol("file"), + namenodeprotocol("hdfs"), namenodehost("localhost"), namenodeport("9000"), user(""), Modified: manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java?rev=1559003&r1=1559002&r2=1559003&view=diff ============================================================================== --- manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java (original) +++ manifoldcf/trunk/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java Fri Jan 17 03:26:50 2014 @@ -123,7 +123,7 @@ public class HDFSRepositoryConnector ext nameNodeProtocol = configParams.getParameter("namenodeprotocol"); if (nameNodeProtocol == null) - nameNodeProtocol = "file"; + nameNodeProtocol = "hdfs"; nameNodeHost = configParams.getParameter("namenodehost"); nameNodePort = configParams.getParameter("namenodeport"); user = configParams.getParameter("user"); @@ -604,7 +604,7 @@ public class HDFSRepositoryConnector ext { String nameNodeProtocol = parameters.getParameter("namenodeprotocol"); if (nameNodeProtocol == null) { - nameNodeProtocol = "file"; + nameNodeProtocol = "hdfs"; } String nameNodeHost = parameters.getParameter("namenodehost"); @@ -722,7 +722,7 @@ public class HDFSRepositoryConnector ext { String nameNodeProtocol = parameters.getParameter("namenodeprotocol"); if (nameNodeProtocol == null) - nameNodeProtocol = "file"; + nameNodeProtocol = "hdfs"; String nameNodeHost = parameters.getParameter("namenodehost"); String nameNodePort = parameters.getParameter("namenodeport");