Return-Path: X-Original-To: apmail-argus-commits-archive@minotaur.apache.org Delivered-To: apmail-argus-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A6F9711B18 for ; Tue, 23 Sep 2014 01:35:03 +0000 (UTC) Received: (qmail 94469 invoked by uid 500); 23 Sep 2014 01:35:02 -0000 Delivered-To: apmail-argus-commits-archive@argus.apache.org Received: (qmail 94451 invoked by uid 500); 23 Sep 2014 01:35:02 -0000 Mailing-List: contact commits-help@argus.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@argus.incubator.apache.org Delivered-To: mailing list commits@argus.incubator.apache.org Received: (qmail 94442 invoked by uid 99); 23 Sep 2014 01:35:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Sep 2014 01:35:02 +0000 X-ASF-Spam-Status: No, hits=-2000.8 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 23 Sep 2014 01:35:00 +0000 Received: (qmail 94198 invoked by uid 99); 23 Sep 2014 01:34:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Sep 2014 01:34:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5EF648A6A88; Tue, 23 Sep 2014 01:34:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sneethir@apache.org To: commits@argus.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: ARGUS-76:Wrong duplicate message on policy name Date: Tue, 23 Sep 2014 01:34:40 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-argus Updated Branches: refs/heads/master 7bfb3cb9d -> acd088613 ARGUS-76:Wrong duplicate message on policy name Signed-off-by: sneethiraj 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 Authored: Mon Sep 22 17:17:06 2014 -0400 Committer: sneethiraj 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",