----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/73852/ -----------------------------------------------------------
(Updated 三月 3, 2022, 2:28 a.m.) Review request for ranger, Dhaval Shah, Dineshkumar Yadav, Gautam Borad, Jayendra Parab, Kishor Gollapalliwar, Abhay Kulkarni, Mateen Mansoori, Mehul Parikh, pengjianhua, Pradeep Agrawal, VaradreawiZTV VaradreawiZTV, Vishal Suvagia, Velmurugan Periasamy, and Qiang Zhang. Changes ------- rebase to HEAD of master Bugs: RANGER-3595 https://issues.apache.org/jira/browse/RANGER-3595 Repository: ranger Description ------- There are lots of .class files under ews/webapp/, and never used. 1. place web.xml at correct location 2. setup.sh want to patch hadoop-common.jar at runtime, it requires some file inside ranger-kms.jar. But the patching of hadoop-common.jar is unnecessary. Regular webapp should have its own class files under ews/webapp/WEB-INF/classes, and dependencies under ews/webapp/WEB-INF/lib, and the Container should put its libraries under ews/lib. But at current, we use directories sucn as ews/webapp/lib, ews/webapp/WEB-INF/classes/lib. It looks dirty and ugly. My patch here makes KMS no longer bring ranger-kms.jar, and place classes and web.xml at correct location. as a alternative of https://reviews.apache.org/r/73816/ Now: ews/lib contains ews bootstrap jars, ews/webapp/WEB-INF/classes contains KMS app itself, ews/webapp/WEB-INF/lib contains KMS dependencies, ews/webapp/WEB-INF/lib/ranger-kms-plugin-impl contains ranger-kms-plugin. Additionaly, kms/pom.xml even depends on original hadoop-kms, which can confuse developers, so I removed it. BTW: the bootstrap embedded server looks like too heavy and too much dependeices. Diffs (updated) ----- distro/src/main/assembly/kms.xml f7605076e6294d9e76ca2f9205e0716932f4daf9 kms/pom.xml ade563f9479cf1519f222c6eddc6d9991f8422e5 kms/scripts/DBMK2HSM.sh 001199d97b21158795dbf7ae31e12d1500333541 kms/scripts/DBMKTOAZUREKEYVAULT.sh cfe5a6b5e65438ba7d50349a36c2dd3219c7092a kms/scripts/DBMKTOKEYSECURE.sh c0aa6e58c27c7a827bcb557d7a7714eb55ecee63 kms/scripts/HSMMK2DB.sh 6c77f7340d9c761f980560f3cbf06f65f7c505ed kms/scripts/KEYSECUREMKTOKMSDB.sh 340e05e2c215e5c046be5cd4c6832b7f0733822a kms/scripts/VerifyIsDBMasterkeyCorrect.sh 1c9a2e148959d8fe72e8d7e7b0fa4a810e942337 kms/scripts/exportKeysToJCEKS.sh f3205789b1da6df95c5e8cf174f4e96ef02b2164 kms/scripts/importJCEKSKeys.sh 5d4fe978fd00f3d86ef48299755689cee34b8331 kms/scripts/ranger-kms 429a31e5aac38e3bbcfc6bdd258818d9ecbf0161 kms/scripts/setup.sh 448042e9d1e9e0caaabf713282a4d509fb09c2e3 kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java c899bdf98327de5a86cf51470e96c6ad8e7e4079 kms/src/main/resources/META-INF/context.xml kms/src/main/resources/WEB-INF/web.xml 5e2d489fe632a16a5ed440bbbff41f558d2a2338 Diff: https://reviews.apache.org/r/73852/diff/2/ Changes: https://reviews.apache.org/r/73852/diff/1-2/ Testing ------- mvn clean pacakge fresh install and upgrade from 2.2.0 Thanks, Kirby Zhou