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

[kw...@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");