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 git clone git://git.apache.org/hbase.git cd hbase - mvn -Psecurity,localTests clean test -Dtest=TestZooKeeperACL + mvn -PlocalTests clean test -Dtest=TestZooKeeperACL 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 mvn test -P security +medium tests if they are executed. @@ -392,8 +391,6 @@ pass multiple, individual tests as a comma-delimited list: mvn test -P localTests -Dtest=MyTest1,MyTest2,MyTest3 You can also pass a package, which will run all tests under the package: mvn test -P localTests -Dtest=org.apache.hadoop.hbase.client.* -To run a single test with the security profile enabled: -mvn test -P security,localTests -Dtest=TestGet 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 @@ This describes how to set up HBase and HBase clients for connection to secure HBase resources.
Prerequisites - - HBase must have been built using the new maven profile for secure Hadoop/HBase: -P security. 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. - You need to have a working Kerberos KDC. @@ -115,10 +112,6 @@ hbase.security.authorization true - - hbase.rpc.engine - org.apache.hadoop.hbase.ipc.SecureRpcEngine - hbase.coprocessor.region.classes org.apache.hadoop.hbase.security.token.TokenProvider @@ -139,10 +132,6 @@ hbase.security.authentication kerberos - - hbase.rpc.engine - org.apache.hadoop.hbase.ipc.SecureRpcEngine - ]]> The client environment must be logged in to Kerberos from KDC or @@ -151,9 +140,8 @@ Be advised that if the hbase.security.authentication - and hbase.rpc.engine 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. Once HBase is configured for secure RPC it is possible to optionally