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 04EAE17BC4 for ; Sun, 12 Oct 2014 21:25:36 +0000 (UTC) Received: (qmail 38478 invoked by uid 500); 12 Oct 2014 21:25:35 -0000 Delivered-To: apmail-argus-commits-archive@argus.apache.org Received: (qmail 38457 invoked by uid 500); 12 Oct 2014 21:25:35 -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 38448 invoked by uid 99); 12 Oct 2014 21:25:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Oct 2014 21:25:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_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; Sun, 12 Oct 2014 21:25:13 +0000 Received: (qmail 36860 invoked by uid 99); 12 Oct 2014 21:25:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Oct 2014 21:25:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 76FD689CF49; Sun, 12 Oct 2014 21:25:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: madhan@apache.org To: commits@argus.incubator.apache.org Date: Sun, 12 Oct 2014 21:25:14 -0000 Message-Id: <4388ba7cc481428ea2a0ca06e1a35bcb@git.apache.org> In-Reply-To: <6ec7ddd95083404683d18cacd23f070a@git.apache.org> References: <6ec7ddd95083404683d18cacd23f070a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-argus X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-argus Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/72d5a91b Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/72d5a91b Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/72d5a91b Branch: refs/heads/master Commit: 72d5a91bf1e4aa5e7945096feebb54f89c98bd75 Parents: b5dbed6 6beed95 Author: mneethiraj Authored: Sun Oct 12 14:24:58 2014 -0700 Committer: mneethiraj Committed: Sun Oct 12 14:24:58 2014 -0700 ---------------------------------------------------------------------- .../hadoop/client/config/BaseClient.java | 4 +- pom.xml | 4 +- security-admin/pom.xml | 11 +- .../main/java/com/xasecure/biz/XUserMgr.java | 2 +- .../webapp/scripts/views/asset/AssetCreate.js | 61 +- .../java/com/xasecure/biz/TestAssetMgr.java | 723 +++++++++++++ .../test/java/com/xasecure/biz/TestUserMgr.java | 557 ++++++++++ .../java/com/xasecure/biz/TestXABizUtil.java | 530 ++++++++++ .../java/com/xasecure/biz/TestXUserMgr.java | 382 +++++++ .../java/com/xasecure/common/TestDateUtil.java | 64 ++ .../java/com/xasecure/common/TestJSONUtil.java | 55 + .../com/xasecure/common/TestPropertiesUtil.java | 96 ++ .../com/xasecure/common/TestStringUtil.java | 177 ++++ .../com/xasecure/common/TestXAConfigUtil.java | 38 + .../java/com/xasecure/rest/TestPublicAPIs.java | 1000 ++++-------------- .../java/com/xasecure/util/TestXAEnumUtil.java | 108 ++ 16 files changed, 2974 insertions(+), 838 deletions(-) ----------------------------------------------------------------------