You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/01/17 01:36:34 UTC
svn commit: r1558968 - in /manifoldcf/branches/release-1.5-branch: ./
connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/
connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/
connectors/hd...
Author: kwright
Date: Fri Jan 17 00:36:33 2014
New Revision: 1558968
URL: http://svn.apache.org/r1558968
Log:
Pull up remainder of fix for CONNECTORS-858 from trunk.
Modified:
manifoldcf/branches/release-1.5-branch/ (props changed)
manifoldcf/branches/release-1.5-branch/CHANGES.txt
manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConfig.java
manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java
manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/ParameterEnum.java
manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java
manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/hdfs/common_en_US.properties
manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/hdfs/common_ja_JP.properties
manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/hdfs/common_en_US.properties
manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/hdfs/common_ja_JP.properties
manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/resources/org/apache/manifoldcf/agents/output/hdfs/editConfiguration.html
manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/resources/org/apache/manifoldcf/agents/output/hdfs/viewConfiguration.html
Propchange: manifoldcf/branches/release-1.5-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1558967
Modified: manifoldcf/branches/release-1.5-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/CHANGES.txt?rev=1558968&r1=1558967&r2=1558968&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.5-branch/CHANGES.txt Fri Jan 17 00:36:33 2014
@@ -3,6 +3,10 @@ $Id$
======================= Release 1.5 =====================
+CONNECTORS-858: HDFS repository and output connectors need to be
+fully compatible with multiple Hadoop 2.2.0 file system protocols.
+(Minoru Osuka, Karl Wright)
+
CONNECTORS-859: Authority tokens should be prefixed with the group name,
not the connection name.
(Fran Alvarez, Karl Wright)
Modified: manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConfig.java?rev=1558968&r1=1558967&r2=1558968&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConfig.java (original)
+++ manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConfig.java Fri Jan 17 00:36:33 2014
@@ -32,6 +32,7 @@ public class HDFSOutputConfig extends HD
/** Parameters used for the configuration */
final private static ParameterEnum[] CONFIGURATIONLIST = {
+ ParameterEnum.namenodeprotocol,
ParameterEnum.namenodehost,
ParameterEnum.namenodeport,
ParameterEnum.user
Modified: manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java?rev=1558968&r1=1558967&r2=1558968&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java (original)
+++ manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/HDFSOutputConnector.java Fri Jan 17 00:36:33 2014
@@ -84,6 +84,7 @@ public class HDFSOutputConnector extends
/** Forward to the template to view the specification parameters for the job */
private static final String VIEW_SPECIFICATION_HTML = "viewSpecification.html";
+ protected String nameNodeProtocol = null;
protected String nameNodeHost = null;
protected String nameNodePort = null;
protected String user = null;
@@ -112,6 +113,9 @@ public class HDFSOutputConnector extends
@Override
public void connect(ConfigParams configParams) {
super.connect(configParams);
+ nameNodeProtocol = configParams.getParameter(ParameterEnum.namenodeprotocol.name());
+ if (nameNodeProtocol == null)
+ nameNodeProtocol = "file";
nameNodeHost = configParams.getParameter(ParameterEnum.namenodehost.name());
nameNodePort = configParams.getParameter(ParameterEnum.namenodeport.name());
user = configParams.getParameter(ParameterEnum.user.name());
@@ -132,6 +136,7 @@ public class HDFSOutputConnector extends
@Override
public void disconnect() throws ManifoldCFException {
closeSession();
+ nameNodeProtocol = null;
nameNodeHost = null;
nameNodePort = null;
user = null;
@@ -176,19 +181,19 @@ public class HDFSOutputConnector extends
/** Set up a session */
protected HDFSSession getSession() throws ManifoldCFException, ServiceInterruption {
if (session == null) {
- String nameNodeHost = params.getParameter(ParameterEnum.namenodehost.name());
+ if (nameNodeProtocol == null)
+ nameNodeProtocol = "file";
+
if (nameNodeHost == null)
throw new ManifoldCFException("Namenodehost must be specified");
- String nameNodePort = params.getParameter(ParameterEnum.namenodeport.name());
if (nameNodePort == null)
throw new ManifoldCFException("Namenodeport must be specified");
- String user = params.getParameter(ParameterEnum.user.name());
if (user == null)
throw new ManifoldCFException("User must be specified");
- String nameNode = "file://"+nameNodeHost+":"+nameNodePort;
+ String nameNode = nameNodeProtocol + "://"+nameNodeHost+":"+nameNodePort;
//System.out.println("Namenode = '"+nameNode+"'");
/*
Modified: manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/ParameterEnum.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/ParameterEnum.java?rev=1558968&r1=1558967&r2=1558968&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/ParameterEnum.java (original)
+++ manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/agents/output/hdfs/ParameterEnum.java Fri Jan 17 00:36:33 2014
@@ -24,6 +24,7 @@ import java.util.Map;
/** Parameters constants */
public enum ParameterEnum {
+ namenodeprotocol("file"),
namenodehost("localhost"),
namenodeport("9000"),
user(""),
Modified: manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java?rev=1558968&r1=1558967&r2=1558968&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java (original)
+++ manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/hdfs/HDFSRepositoryConnector.java Fri Jan 17 00:36:33 2014
@@ -53,6 +53,7 @@ public class HDFSRepositoryConnector ext
// Activities list
protected static final String[] activitiesList = new String[]{ACTIVITY_READ};
+ protected String nameNodeProtocol = null;
protected String nameNodeHost = null;
protected String nameNodePort = null;
protected String user = null;
@@ -120,6 +121,9 @@ public class HDFSRepositoryConnector ext
public void connect(ConfigParams configParams) {
super.connect(configParams);
+ nameNodeProtocol = configParams.getParameter("namenodeprotocol");
+ if (nameNodeProtocol == null)
+ nameNodeProtocol = "file";
nameNodeHost = configParams.getParameter("namenodehost");
nameNodePort = configParams.getParameter("namenodeport");
user = configParams.getParameter("user");
@@ -133,6 +137,7 @@ public class HDFSRepositoryConnector ext
public void disconnect() throws ManifoldCFException {
closeSession();
user = null;
+ nameNodeProtocol = null;
nameNodeHost = null;
nameNodePort = null;
super.disconnect();
@@ -143,6 +148,12 @@ public class HDFSRepositoryConnector ext
*/
protected HDFSSession getSession() throws ManifoldCFException, ServiceInterruption {
if (session == null) {
+ if (StringUtils.isEmpty(nameNodeProtocol)) {
+ throw new ManifoldCFException("Parameter namenodeprotocol required but not set");
+ }
+ if (Logging.connectors.isDebugEnabled()) {
+ Logging.connectors.debug("HDFS: NameNodeProtocol = '" + nameNodeProtocol + "'");
+ }
if (StringUtils.isEmpty(nameNodeHost)) {
throw new ManifoldCFException("Parameter namenodehost required but not set");
}
@@ -163,7 +174,7 @@ public class HDFSRepositoryConnector ext
Logging.connectors.debug("HDFS: User = '" + user + "'");
}
- String nameNode = "file://"+nameNodeHost+":"+nameNodePort;
+ String nameNode = nameNodeProtocol+"://"+nameNodeHost+":"+nameNodePort;
GetSessionThread t = new GetSessionThread(nameNode,user);
try {
@@ -591,6 +602,11 @@ public class HDFSRepositoryConnector ext
public void outputConfigurationBody(IThreadContext threadContext, IHTTPOutput out, Locale locale, ConfigParams parameters, String tabName)
throws ManifoldCFException, IOException
{
+ String nameNodeProtocol = parameters.getParameter("namenodeprotocol");
+ if (nameNodeProtocol == null) {
+ nameNodeProtocol = "file";
+ }
+
String nameNodeHost = parameters.getParameter("namenodehost");
if (nameNodeHost == null) {
nameNodeHost = "localhost";
@@ -611,6 +627,19 @@ public class HDFSRepositoryConnector ext
out.print(
"<table class=\"displaytable\">\n"+
" <tr>\n"+
+" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"HDFSRepositoryConnector.NameNodeProtocol") + "</nobr></td>\n"+
+" <td class=\"value\">\n"+
+" <select name=\"namenodeprotocol\" size=\"2\">\n"+
+" <option value=\"file\"" + (nameNodeProtocol.equals("file")?" selected=\"true\"":"") + ">file</option>\n"+
+" <option value=\"ftp\"" + (nameNodeProtocol.equals("ftp")?" selected=\"true\"":"") + ">ftp</option>\n"+
+" <option value=\"har\"" + (nameNodeProtocol.equals("har")?" selected=\"true\"":"") + ">har</option>\n"+
+" <option value=\"s3\"" + (nameNodeProtocol.equals("s3")?" selected=\"true\"":"") + ">s3</option>\n"+
+" <option value=\"s3n\"" + (nameNodeProtocol.equals("s3n")?" selected=\"true\"":"") + ">s3n</option>\n"+
+" <option value=\"viewfs\"" + (nameNodeProtocol.equals("viewfs")?" selected=\"true\"":"") + ">viewfs</option>\n"+
+" </select>\n"+
+" </td>\n"+
+" </tr>\n"+
+" <tr>\n"+
" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"HDFSRepositoryConnector.NameNodeHost") + "</nobr></td>\n"+
" <td class=\"value\">\n"+
" <input name=\"namenodehost\" type=\"text\" size=\"32\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(nameNodeHost)+"\"/>\n"+
@@ -635,6 +664,7 @@ public class HDFSRepositoryConnector ext
{
// Server tab hiddens
out.print(
+"<input type=\"hidden\" name=\"namenodeprotocol\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(nameNodeProtocol)+"\"/>\n"+
"<input type=\"hidden\" name=\"namenodehost\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(nameNodeHost)+"\"/>\n"+
"<input type=\"hidden\" name=\"namenodeport\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(nameNodePort)+"\"/>\n"+
"<input type=\"hidden\" name=\"user\" value=\""+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(user)+"\"/>\n"
@@ -655,6 +685,11 @@ public class HDFSRepositoryConnector ext
public String processConfigurationPost(IThreadContext threadContext, IPostParameters variableContext, ConfigParams parameters)
throws ManifoldCFException
{
+ String nameNodeProtocol = variableContext.getParameter("namenodeprotocol");
+ if (nameNodeProtocol != null) {
+ parameters.setParameter("namenodeprotocol", nameNodeProtocol);
+ }
+
String nameNodeHost = variableContext.getParameter("namenodehost");
if (nameNodeHost != null) {
parameters.setParameter("namenodehost", nameNodeHost);
@@ -684,6 +719,10 @@ public class HDFSRepositoryConnector ext
public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out, Locale locale, ConfigParams parameters)
throws ManifoldCFException, IOException
{
+ String nameNodeProtocol = parameters.getParameter("namenodeprotocol");
+ if (nameNodeProtocol == null)
+ nameNodeProtocol = "file";
+
String nameNodeHost = parameters.getParameter("namenodehost");
String nameNodePort = parameters.getParameter("namenodeport");
String user = parameters.getParameter("user");
@@ -691,6 +730,10 @@ public class HDFSRepositoryConnector ext
out.print(
"<table class=\"displaytable\">\n"+
" <tr>\n"+
+" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"HDFSRepositoryConnector.NameNodeProtocol") + "</nobr></td>\n"+
+" <td class=\"value\">\n"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(nameNodeProtocol)+"</td>\n"+
+" </tr>\n"+
+" <tr>\n"+
" <td class=\"description\"><nobr>" + Messages.getBodyString(locale,"HDFSRepositoryConnector.NameNodeHost") + "</nobr></td>\n"+
" <td class=\"value\">\n"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(nameNodeHost)+"</td>\n"+
" </tr>\n"+
Modified: manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/hdfs/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/hdfs/common_en_US.properties?rev=1558968&r1=1558967&r2=1558968&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/hdfs/common_en_US.properties (original)
+++ manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/hdfs/common_en_US.properties Fri Jan 17 00:36:33 2014
@@ -14,6 +14,7 @@
# limitations under the License.
HDFSOutputConnector.ServerTabName=Server
+HDFSOutputConnector.NameNodeProtocol=Name node protocol:
HDFSOutputConnector.NameNodeHost=Name node host:
HDFSOutputConnector.NameNodePort=Name node port:
HDFSOutputConnector.User=User:
Modified: manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/hdfs/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/hdfs/common_ja_JP.properties?rev=1558968&r1=1558967&r2=1558968&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/hdfs/common_ja_JP.properties (original)
+++ manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/hdfs/common_ja_JP.properties Fri Jan 17 00:36:33 2014
@@ -14,6 +14,7 @@
# limitations under the License.
HDFSOutputConnector.ServerTabName=ãµã¼ãã¼
+HDFSOutputConnector.NameNodeProtocol=Name node protocol:
HDFSOutputConnector.NameNodeHost=Name node host:
HDFSOutputConnector.NameNodePort=Name node port:
HDFSOutputConnector.User=ã¦ã¼ã¶ã¼:
Modified: manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/hdfs/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/hdfs/common_en_US.properties?rev=1558968&r1=1558967&r2=1558968&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/hdfs/common_en_US.properties (original)
+++ manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/hdfs/common_en_US.properties Fri Jan 17 00:36:33 2014
@@ -14,6 +14,7 @@
# limitations under the License.
HDFSRepositoryConnector.ServerTabName=Server
+HDFSRepositoryConnector.NameNodeProtocol=Name node protocol:
HDFSRepositoryConnector.NameNodeHost=Name node host:
HDFSRepositoryConnector.NameNodePort=Name node port:
HDFSRepositoryConnector.User=User:
Modified: manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/hdfs/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/hdfs/common_ja_JP.properties?rev=1558968&r1=1558967&r2=1558968&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/hdfs/common_ja_JP.properties (original)
+++ manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/connectors/hdfs/common_ja_JP.properties Fri Jan 17 00:36:33 2014
@@ -14,6 +14,7 @@
# limitations under the License.
HDFSRepositoryConnector.ServerTabName=ãµã¼ãã¼
+HDFSRepositoryConnector.NameNodeProtocol=Name node protocol:
HDFSRepositoryConnector.NameNodeHost=Name node host:
HDFSRepositoryConnector.NameNodePort=Name node port:
HDFSRepositoryConnector.User=ã¦ã¼ã¶ã¼ï¼
Modified: manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/resources/org/apache/manifoldcf/agents/output/hdfs/editConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/resources/org/apache/manifoldcf/agents/output/hdfs/editConfiguration.html?rev=1558968&r1=1558967&r2=1558968&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/resources/org/apache/manifoldcf/agents/output/hdfs/editConfiguration.html (original)
+++ manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/resources/org/apache/manifoldcf/agents/output/hdfs/editConfiguration.html Fri Jan 17 00:36:33 2014
@@ -20,6 +20,43 @@
<table class="displaytable">
<tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('HDFSOutputConnector.NameNodeProtocol'))</nobr></td>
+ <td class="value">
+ <select name="namenodeprotocol" size="2">
+ #if($NAMENODEPROTOCOL == 'file')
+ <option value="file" selected="true">file</option>
+ #else
+ <option value="file">file</option>
+ #end
+ #if($NAMENODEPROTOCOL == 'ftp')
+ <option value="ftp" selected="true">ftp</option>
+ #else
+ <option value="ftp">ftp</option>
+ #end
+ #if($NAMENODEPROTOCOL == 'har')
+ <option value="har" selected="true">har</option>
+ #else
+ <option value="har">har</option>
+ #end
+ #if($NAMENODEPROTOCOL == 's3')
+ <option value="s3" selected="true">s3</option>
+ #else
+ <option value="s3">s3</option>
+ #end
+ #if($NAMENODEPROTOCOL == 's3n')
+ <option value="s3n" selected="true">s3n</option>
+ #else
+ <option value="s3n">s3n</option>
+ #end
+ #if($NAMENODEPROTOCOL == 'viewfs')
+ <option value="viewfs" selected="true">viewfs</option>
+ #else
+ <option value="viewfs">viewfs</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('HDFSOutputConnector.NameNodeHost'))</nobr></td>
<td class="value"><input name="namenodehost" type="text" value="$Encoder.attributeEscape($NAMENODEHOST)" size="32" /></td>
</tr>
Modified: manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/resources/org/apache/manifoldcf/agents/output/hdfs/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/resources/org/apache/manifoldcf/agents/output/hdfs/viewConfiguration.html?rev=1558968&r1=1558967&r2=1558968&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/resources/org/apache/manifoldcf/agents/output/hdfs/viewConfiguration.html (original)
+++ manifoldcf/branches/release-1.5-branch/connectors/hdfs/connector/src/main/resources/org/apache/manifoldcf/agents/output/hdfs/viewConfiguration.html Fri Jan 17 00:36:33 2014
@@ -17,6 +17,10 @@
<table class="displaytable">
<tr>
+ <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('HDFSOutputConnector.NameNodeProtocol'))</nobr></td>
+ <td class="value">$Encoder.bodyEscape($NAMENODEPROTOCOL)</td>
+ </tr>
+ <tr>
<td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('HDFSOutputConnector.NameNodeHost'))</nobr></td>
<td class="value">$Encoder.bodyEscape($NAMENODEHOST)</td>
</tr>