From 52ff1610cddf0fd3edae4a9e97ac793f54548a36 Mon Sep 17 00:00:00 2001
From: Andrew Wang <wang@apache.org>
Date: Mon, 1 Jun 2015 18:04:52 -0700
Subject: [PATCH] HADOOP-12037. Fix wrong classname in example configuration of
 hadoop-auth documentation. Contributed by Masatake Iwasaki.

(cherry picked from commit 990078b927fb1189a99055f3758a4f4f639f2a9d)
---
 .../src/site/markdown/Configuration.md         | 18 +++++++++++++++---
 .../hadoop-common/CHANGES.txt                  |  3 +++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/hadoop-common-project/hadoop-auth/src/site/markdown/Configuration.md b/hadoop-common-project/hadoop-auth/src/site/markdown/Configuration.md
index 9d076bb0bee..2f9b8606aa2 100644
--- a/hadoop-common-project/hadoop-auth/src/site/markdown/Configuration.md
+++ b/hadoop-common-project/hadoop-auth/src/site/markdown/Configuration.md
@@ -73,12 +73,13 @@ To use Kerberos SPNEGO as the authentication mechanism, the authentication filte
 
 **Example**:
 
+```xml
     <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee">
         ...
 
         <filter>
             <filter-name>kerberosFilter</filter-name>
-            <filter-class>org.apache.hadoop.security.auth.server.AuthenticationFilter</filter-class>
+            <filter-class>org.apache.hadoop.security.authentication.server.AuthenticationFilter</filter-class>
             <init-param>
                 <param-name>type</param-name>
                 <param-value>kerberos</param-value>
@@ -112,6 +113,7 @@ To use Kerberos SPNEGO as the authentication mechanism, the authentication filte
 
         ...
     </web-app>
+```
 
 ### Pseudo/Simple Configuration
 
@@ -125,12 +127,13 @@ To use Pseudo/Simple as the authentication mechanism (trusting the value of the
 
 **Example**:
 
+```xml
     <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee">
         ...
 
         <filter>
             <filter-name>simpleFilter</filter-name>
-            <filter-class>org.apache.hadoop.security.auth.server.AuthenticationFilter</filter-class>
+            <filter-class>org.apache.hadoop.security.authentication.server.AuthenticationFilter</filter-class>
             <init-param>
                 <param-name>type</param-name>
                 <param-value>simple</param-value>
@@ -160,6 +163,7 @@ To use Pseudo/Simple as the authentication mechanism (trusting the value of the
 
         ...
     </web-app>
+```
 
 ### AltKerberos Configuration
 
@@ -175,12 +179,13 @@ The AltKerberos authentication mechanism is a partially implemented derivative o
 
 **Example**:
 
+```xml
     <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee">
         ...
 
         <filter>
             <filter-name>kerberosFilter</filter-name>
-            <filter-class>org.apache.hadoop.security.auth.server.AuthenticationFilter</filter-class>
+            <filter-class>org.apache.hadoop.security.authentication.server.AuthenticationFilter</filter-class>
             <init-param>
                 <param-name>type</param-name>
                 <param-value>org.my.subclass.of.AltKerberosAuthenticationHandler</param-value>
@@ -218,6 +223,7 @@ The AltKerberos authentication mechanism is a partially implemented derivative o
 
         ...
     </web-app>
+```
 
 ### SignerSecretProvider Configuration
 
@@ -262,6 +268,7 @@ The following configuration properties are specific to the `zookeeper` implement
 
 **Example**:
 
+```xml
     <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee">
         ...
 
@@ -279,9 +286,11 @@ The following configuration properties are specific to the `zookeeper` implement
 
         ...
     </web-app>
+```
 
 **Example**:
 
+```xml
     <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee">
         ...
 
@@ -299,9 +308,11 @@ The following configuration properties are specific to the `zookeeper` implement
 
         ...
     </web-app>
+```
 
 **Example**:
 
+```xml
     <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee">
         ...
 
@@ -339,3 +350,4 @@ The following configuration properties are specific to the `zookeeper` implement
 
         ...
     </web-app>
+```
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index a663fb8d95c..24ad165ae0f 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -141,6 +141,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12043. Display warning if defaultFs is not set when running fs
     commands. (Lei Xu via wang)
 
+    HADOOP-12037. Fix wrong classname in example configuration of hadoop-auth
+    documentation. (Masatake Iwasaki via wang)
+
   OPTIMIZATIONS
 
     HADOOP-11785. Reduce the number of listStatus operation in distcp