Repository: incubator-ranger Updated Branches: refs/heads/master 433891169 -> 8e6acd5d5
RANGER-308: Fix previous commit Signed-off-by: Velmurugan Periasamy <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/8e6acd5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/8e6acd5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/8e6acd5d Branch: refs/heads/master Commit: 8e6acd5d5dc0164bc6d87714645b8715cee355f4 Parents: 4338911 Author: Gautam Borad <[email protected]> Authored: Tue Mar 17 12:40:26 2015 +0530 Committer: Velmurugan Periasamy <[email protected]> Committed: Tue Mar 17 13:20:34 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/ranger/service/RangerPolicyService.java | 6 ++++++ .../java/org/apache/ranger/service/RangerServiceService.java | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8e6acd5d/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java index d261151..e9ab1a4 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java @@ -26,6 +26,7 @@ import org.apache.ranger.entity.XXPolicyItemCondition; import org.apache.ranger.entity.XXPolicyResource; import org.apache.ranger.entity.XXPolicyResourceMap; import org.apache.ranger.entity.XXResourceDef; +import org.apache.ranger.entity.XXService; import org.apache.ranger.entity.XXTrxLog; import org.apache.ranger.plugin.model.RangerPolicy; import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItem; @@ -343,6 +344,11 @@ public class RangerPolicyService extends RangerPolicyServiceBase<XXPolicy, Range xTrxLog.setObjectClassType(AppConstants.CLASS_TYPE_RANGER_POLICY); xTrxLog.setObjectId(vObj.getId()); xTrxLog.setObjectName(objectName); + + XXService parentObj = daoMgr.getXXService().findByName(vObj.getName()); + xTrxLog.setParentObjectClassType(AppConstants.CLASS_TYPE_XA_SERVICE); + xTrxLog.setParentObjectId(parentObj.getId()); + xTrxLog.setParentObjectName(parentObj.getName()); return xTrxLog; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8e6acd5d/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java index 9f0b02a..ca9f7d4 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceService.java @@ -18,6 +18,7 @@ import org.apache.ranger.common.SortField; import org.apache.ranger.common.view.VTrxLogAttr; import org.apache.ranger.entity.XXService; import org.apache.ranger.entity.XXServiceConfigMap; +import org.apache.ranger.entity.XXServiceDef; import org.apache.ranger.entity.XXTrxLog; import org.apache.ranger.plugin.model.RangerService; import org.apache.ranger.plugin.util.SearchFilter; @@ -43,8 +44,6 @@ public class RangerServiceService extends RangerServiceServiceBase<XXService, Ra trxLogAttrs.put("description", new VTrxLogAttr("description", "Service Description", false)); trxLogAttrs.put("isEnabled", new VTrxLogAttr("isEnabled", "Service Status", false)); trxLogAttrs.put("configs", new VTrxLogAttr("configs", "Connection Configurations", false)); - trxLogAttrs.put("policyVersion", new VTrxLogAttr("policyVersion", "Policy Version", false)); - trxLogAttrs.put("policyUpdateTime", new VTrxLogAttr("policyUpdateTime", "Policy Update Time", false)); } public RangerServiceService() { @@ -246,6 +245,11 @@ public class RangerServiceService extends RangerServiceServiceBase<XXService, Ra xTrxLog.setObjectClassType(AppConstants.CLASS_TYPE_XA_SERVICE); xTrxLog.setObjectId(vObj.getId()); xTrxLog.setObjectName(objectName); + + XXServiceDef parentObj = daoMgr.getXXServiceDef().findByName(vObj.getType()); + xTrxLog.setParentObjectClassType(AppConstants.CLASS_TYPE_XA_SERVICE_DEF); + xTrxLog.setParentObjectId(parentObj.getId()); + xTrxLog.setParentObjectName(parentObj.getName()); return xTrxLog; }
