You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sn...@apache.org on 2014/09/23 03:34:40 UTC
git commit: ARGUS-76:Wrong duplicate message on policy name
Repository: incubator-argus
Updated Branches:
refs/heads/master 7bfb3cb9d -> acd088613
ARGUS-76:Wrong duplicate message on policy name
Signed-off-by: sneethiraj <sn...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/acd08861
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/acd08861
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/acd08861
Branch: refs/heads/master
Commit: acd088613c1e9cd8c684eda8ca7f441ee0623bbf
Parents: 7bfb3cb
Author: vperiasamy <vp...@hortonworks.com>
Authored: Mon Sep 22 17:17:06 2014 -0400
Committer: sneethiraj <sn...@apache.org>
Committed: Mon Sep 22 21:34:29 2014 -0400
----------------------------------------------------------------------
security-admin/src/main/java/com/xasecure/biz/AssetMgr.java | 4 ++--
.../src/main/java/com/xasecure/service/XResourceService.java | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/acd08861/security-admin/src/main/java/com/xasecure/biz/AssetMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/com/xasecure/biz/AssetMgr.java b/security-admin/src/main/java/com/xasecure/biz/AssetMgr.java
index 815b464..7cc6edd 100644
--- a/security-admin/src/main/java/com/xasecure/biz/AssetMgr.java
+++ b/security-admin/src/main/java/com/xasecure/biz/AssetMgr.java
@@ -240,7 +240,7 @@ public class AssetMgr extends AssetMgrBase {
vXResourceList=null;
if(vXResource.getPolicyName()!=null && !vXResource.getPolicyName().trim().isEmpty()){
searchCriteria=new SearchCriteria();
- searchCriteria.getParamList().put("policyName", vXResource.getPolicyName());
+ searchCriteria.getParamList().put("fullPolicyName", vXResource.getPolicyName());
vXResourceList=xResourceService.searchXResourcesWithoutLogin(searchCriteria);
//if policyname already exist then set null to generate from system
if(vXResourceList!=null && vXResourceList.getListSize()>0){
@@ -375,7 +375,7 @@ public class AssetMgr extends AssetMgrBase {
//policyName creation and validation logic start here
if(vXResource.getPolicyName()!=null && !vXResource.getPolicyName().trim().isEmpty()){
searchCriteria=new SearchCriteria();
- searchCriteria.getParamList().put("policyName", vXResource.getPolicyName());
+ searchCriteria.getParamList().put("fullPolicyName", vXResource.getPolicyName());
vXResourceList=xResourceService.searchXResourcesWithoutLogin(searchCriteria);
if(vXResourceList!=null && vXResourceList.getListSize()>0){
for (VXResource newVXResource : vXResourceList.getList()) {
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/acd08861/security-admin/src/main/java/com/xasecure/service/XResourceService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/com/xasecure/service/XResourceService.java b/security-admin/src/main/java/com/xasecure/service/XResourceService.java
index 1cf5973..4485c1b 100644
--- a/security-admin/src/main/java/com/xasecure/service/XResourceService.java
+++ b/security-admin/src/main/java/com/xasecure/service/XResourceService.java
@@ -110,6 +110,8 @@ public class XResourceService extends
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.FULL));
searchFields.add(new SearchField("policyName", "obj.policyName",
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL));
+ searchFields.add(new SearchField("fullPolicyName", "obj.policyName",
+ SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.FULL));
searchFields.add(new SearchField("columns", "obj.columns",
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL));
searchFields.add(new SearchField("columnFamilies",