From b1ab069bddb7301a84c071fd235696935135e3c2 Mon Sep 17 00:00:00 2001
From: Zhihong Yu <tedyu@apache.org>
Date: Wed, 4 Jul 2012 04:19:46 +0000
Subject: [PATCH] HBASE-6027 Update the reference guide to reflect the changes
 in the security profile (Devaraj Das)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1357063 13f79535-47bb-0310-9956-ffa450edef68
---
 src/docbkx/configuration.xml |  2 +-
 src/docbkx/developer.xml     |  5 +----
 src/docbkx/security.xml      | 16 ++--------------
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/docbkx/configuration.xml b/src/docbkx/configuration.xml
index f6b57883d08..4d8b5e993a0 100644
--- a/src/docbkx/configuration.xml
+++ b/src/docbkx/configuration.xml
@@ -1176,7 +1176,7 @@ ${HBASE_HOME}/bin/hbase-daemons.sh {start,stop} zookeeper
                 <programlisting>
                 git clone git://git.apache.org/hbase.git
                 cd hbase
-                mvn -Psecurity,localTests clean test -Dtest=TestZooKeeperACL
+                mvn -PlocalTests clean test -Dtest=TestZooKeeperACL
                 </programlisting>
 
                 Then configure HBase as described above.
diff --git a/src/docbkx/developer.xml b/src/docbkx/developer.xml
index b3f1a540e02..fa738d67f3e 100644
--- a/src/docbkx/developer.xml
+++ b/src/docbkx/developer.xml
@@ -369,8 +369,7 @@ the developer machine as well.
 (no fork) and then medium tests in a separate JVM for each test instance.
 Medium tests are NOT executed if there is an error in a small test.
 Large tests are NOT executed.  There is one report for small tests, and one report for
-medium tests if they are executed. To run small and medium tests with the security
-profile enabled, do <programlisting>mvn test -P security</programlisting>
+medium tests if they are executed. 
 </para>
 </section>
 
@@ -392,8 +391,6 @@ pass multiple, individual tests as a comma-delimited list:
 <programlisting>mvn test -P localTests -Dtest=MyTest1,MyTest2,MyTest3</programlisting>
 You can also pass a package, which will run all tests under the package:
 <programlisting>mvn test -P localTests -Dtest=org.apache.hadoop.hbase.client.*</programlisting>
-To run a single test with the security profile enabled:
-<programlisting>mvn test -P security,localTests -Dtest=TestGet</programlisting>
 </para>
 
 <para>
diff --git a/src/docbkx/security.xml b/src/docbkx/security.xml
index 8d6a33e253d..345545d987d 100644
--- a/src/docbkx/security.xml
+++ b/src/docbkx/security.xml
@@ -33,9 +33,6 @@
     <para>This describes how to set up HBase and HBase clients for connection to secure HBase resources. </para>
 
     <section><title>Prerequisites</title>
-    <para>
-       HBase must have been built using the new maven profile for secure Hadoop/HBase: <code>-P security</code>. Secure Hadoop dependent classes are separated under a pseudo-module in the security/ directory and are only included if built with the secure Hadoop profile. 
-    </para>
     <para>
         You need to have a working Kerberos KDC.
     </para>
@@ -115,10 +112,6 @@
         <name>hbase.security.authorization</name>
         <value>true</value>
       </property>
-      <property>
-        <name>hbase.rpc.engine</name>
-        <value>org.apache.hadoop.hbase.ipc.SecureRpcEngine</value>
-      </property>
       <property>
       <name>hbase.coprocessor.region.classes</name>
         <value>org.apache.hadoop.hbase.security.token.TokenProvider</value>
@@ -139,10 +132,6 @@
         <name>hbase.security.authentication</name>
         <value>kerberos</value>
       </property> 
-      <property>
-        <name>hbase.rpc.engine</name>
-        <value>org.apache.hadoop.hbase.ipc.SecureRpcEngine</value>
-      </property>
     ]]></programlisting>
     <para>
         The client environment must be logged in to Kerberos from KDC or
@@ -151,9 +140,8 @@
     </para>
     <para>
         Be advised that if the <code>hbase.security.authentication</code>
-        and <code>hbase.rpc.engine</code> properties in the client- and
-        server-side site files do not match, the client will not be able to
-        communicate with the cluster.
+        in the client- and server-side site files do not match, the client will 
+        not be able to communicate with the cluster.
     </para>
     <para>
         Once HBase is configured for secure RPC it is possible to optionally