Merge branch 'master' into tag-policy
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/9a6e641f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/9a6e641f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/9a6e641f Branch: refs/heads/tag-policy Commit: 9a6e641fa9a79ef7558cc01ea212f8f974abaac0 Parents: 31a65f4 e169b27 Author: Madhan Neethiraj <[email protected]> Authored: Mon Aug 10 09:49:06 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Mon Aug 10 09:49:06 2015 -0700 ---------------------------------------------------------------------- .../plugin/errors/ValidationErrorCode.java | 123 + .../model/validation/RangerPolicyValidator.java | 361 +-- .../validation/RangerServiceDefValidator.java | 113 +- .../validation/RangerServiceValidator.java | 68 +- .../validation/ValidationFailureDetails.java | 21 +- .../ValidationFailureDetailsBuilder.java | 2 +- .../plugin/errors/TestValidationErrorCode.java | 86 + .../TestValidationFailureDetails.java | 58 - .../src/test/resources/log4j.properties | 3 +- agents-cred/src/test/resources/log4j.properties | 16 + hbase-agent/src/test/resources/log4j.properties | 5 +- hive-agent/src/test/resource/log4j.properties | 9 +- kms/scripts/db_setup.py | 23 +- kms/scripts/dba_script.py | 26 +- .../bin/import_ranger_to_ambari.py | 1214 ++++++++++ .../bin/ranger_admin_install.properties | 33 + .../ambari2.0-hdp2.2-ranger0.40/doc/README.TXT | 74 + .../bin/import_ranger_to_ambari.py | 2253 ++++++++++++++++++ .../bin/ranger_admin_install.properties | 33 + .../ambari2.1-hdp2.3-ranger0.50/doc/README.TXT | 78 + migration-util/bin/import_ranger_to_ambari.py | 1214 ---------- .../bin/ranger_admin_install.properties | 33 - migration-util/doc/README.TXT | 74 - security-admin/scripts/setup.sh | 16 + .../src/test/resources/log4j.properties | 3 +- .../ranger/unixusersync/model/XUserInfo.java | 9 - 26 files changed, 4182 insertions(+), 1766 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a6e641f/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java ---------------------------------------------------------------------- diff --cc agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java index 7c8c552,847bc9a..9169fd9 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java @@@ -26,9 -26,9 +26,10 @@@ import java.util.Set import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.apache.ranger.plugin.errors.ValidationErrorCode; import org.apache.ranger.plugin.model.RangerService; import org.apache.ranger.plugin.model.RangerServiceDef; +import org.apache.ranger.plugin.store.EmbeddedServiceDefsUtil; import org.apache.ranger.plugin.store.ServiceStore; import com.google.common.collect.Sets;
