ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject [12/12] incubator-ranger git commit: RANGER-194: Rename classes under web-admin project
Date Tue, 16 Dec 2014 02:44:42 GMT
RANGER-194: Rename classes under web-admin project


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/06ca8538
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/06ca8538
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/06ca8538

Branch: refs/heads/master
Commit: 06ca85385867ab4274afa0852268e0875c814d17
Parents: ef7b11d
Author: Alok Lal <alal@hortonworks.com>
Authored: Mon Dec 15 18:43:44 2014 -0800
Committer: Madhan Neethiraj <madhan@apache.org>
Committed: Mon Dec 15 18:43:44 2014 -0800

----------------------------------------------------------------------
 .../unix/jaas/RoleUserAuthorityGranter.java     |    1 -
 .../apache/ranger/biz/AssetConnectionMgr.java   |   12 +-
 .../java/org/apache/ranger/biz/AssetMgr.java    |  169 +-
 .../org/apache/ranger/biz/AssetMgrBase.java     |   19 +-
 .../java/org/apache/ranger/biz/BaseMgr.java     |   16 +-
 .../java/org/apache/ranger/biz/HiveFSMgr.java   |    2 -
 .../org/apache/ranger/biz/RangerBizUtil.java    | 1311 ++++++++++++
 .../java/org/apache/ranger/biz/SessionMgr.java  |   24 +-
 .../java/org/apache/ranger/biz/UserMgr.java     |   46 +-
 .../java/org/apache/ranger/biz/UserMgrBase.java |   10 +-
 .../java/org/apache/ranger/biz/XABizUtil.java   | 1313 ------------
 .../org/apache/ranger/biz/XAuditMgrBase.java    |   13 +-
 .../java/org/apache/ranger/biz/XUserMgr.java    |   14 +-
 .../org/apache/ranger/biz/XUserMgrBase.java     |   25 +-
 .../org/apache/ranger/common/AppConstants.java  |    5 +-
 .../org/apache/ranger/common/ContextUtil.java   |   14 +-
 .../java/org/apache/ranger/common/DateUtil.java |    1 +
 .../java/org/apache/ranger/common/HTTPUtil.java |   14 +-
 .../apache/ranger/common/PropertiesUtil.java    |   16 +-
 .../org/apache/ranger/common/RESTErrorUtil.java |    1 -
 .../apache/ranger/common/RangerCommonEnums.java | 1441 +++++++++++++
 .../apache/ranger/common/RangerConfigUtil.java  |   90 +
 .../apache/ranger/common/RangerConstants.java   |  169 ++
 .../common/RangerJAXBContextResolver.java       |   71 +
 .../apache/ranger/common/RangerSearchUtil.java  |   68 +
 .../apache/ranger/common/RequestContext.java    |    2 +-
 .../apache/ranger/common/SearchCriteria.java    |    4 +-
 .../org/apache/ranger/common/SearchField.java   |    1 -
 .../org/apache/ranger/common/SearchUtil.java    |    2 +-
 .../apache/ranger/common/TimedEventUtil.java    |    5 -
 .../apache/ranger/common/UserSessionBase.java   |    5 +-
 .../org/apache/ranger/common/XACommonEnums.java | 1444 -------------
 .../org/apache/ranger/common/XAConfigUtil.java  |   91 -
 .../org/apache/ranger/common/XAConstants.java   |  169 --
 .../ranger/common/XAJAXBContextResolver.java    |   73 -
 .../org/apache/ranger/common/XASearchUtil.java  |   78 -
 .../annotation/RangerAnnotationClassName.java   |   32 +
 .../annotation/RangerAnnotationJSMgrName.java   |   35 +
 .../annotation/RangerAnnotationRestAPI.java     |   37 +
 .../annotation/XAAnnotationClassName.java       |   32 -
 .../annotation/XAAnnotationJSMgrName.java       |   35 -
 .../common/annotation/XAAnnotationRestAPI.java  |   36 -
 .../org/apache/ranger/common/db/BaseDao.java    |   16 +-
 .../ranger/common/db/JPABeanCallbacks.java      |    6 +-
 .../org/apache/ranger/common/view/VEnum.java    |    4 +-
 .../apache/ranger/common/view/VEnumElement.java |    4 +-
 .../org/apache/ranger/common/view/VList.java    |    2 +-
 .../apache/ranger/common/view/VTrxLogAttr.java  |    2 -
 .../apache/ranger/common/view/ViewBaseBean.java |    4 +-
 .../org/apache/ranger/db/RangerDaoManager.java  |   79 +
 .../apache/ranger/db/RangerDaoManagerBase.java  |  213 ++
 .../java/org/apache/ranger/db/XADaoManager.java |   77 -
 .../org/apache/ranger/db/XADaoManagerBase.java  |  216 --
 .../org/apache/ranger/db/XXAccessAuditDao.java  |    7 +-
 .../java/org/apache/ranger/db/XXAssetDao.java   |    8 +-
 .../org/apache/ranger/db/XXAuditMapDao.java     |    7 +-
 .../org/apache/ranger/db/XXAuthSessionDao.java  |    2 +-
 .../apache/ranger/db/XXCredentialStoreDao.java  |    7 +-
 .../java/org/apache/ranger/db/XXDBBaseDao.java  |    4 +-
 .../java/org/apache/ranger/db/XXGroupDao.java   |   10 +-
 .../org/apache/ranger/db/XXGroupGroupDao.java   |    7 +-
 .../org/apache/ranger/db/XXGroupUserDao.java    |    7 +-
 .../java/org/apache/ranger/db/XXPermMapDao.java |    7 +-
 .../ranger/db/XXPolicyExportAuditDao.java       |    7 +-
 .../org/apache/ranger/db/XXPortalUserDao.java   |    4 +-
 .../apache/ranger/db/XXPortalUserRoleDao.java   |    4 +-
 .../org/apache/ranger/db/XXResourceDao.java     |    6 +-
 .../java/org/apache/ranger/db/XXTrxLogDao.java  |    4 +-
 .../java/org/apache/ranger/db/XXUserDao.java    |    4 +-
 .../org/apache/ranger/entity/XXAccessAudit.java |   23 +-
 .../java/org/apache/ranger/entity/XXAsset.java  |   20 +-
 .../org/apache/ranger/entity/XXAuditMap.java    |   17 +-
 .../org/apache/ranger/entity/XXAuthSession.java |   23 +-
 .../apache/ranger/entity/XXCredentialStore.java |   17 +-
 .../java/org/apache/ranger/entity/XXDBBase.java |   14 +-
 .../java/org/apache/ranger/entity/XXGroup.java  |   25 +-
 .../org/apache/ranger/entity/XXGroupGroup.java  |   17 +-
 .../org/apache/ranger/entity/XXGroupUser.java   |   17 +-
 .../org/apache/ranger/entity/XXPermMap.java     |   20 +-
 .../ranger/entity/XXPolicyExportAudit.java      |   21 +-
 .../org/apache/ranger/entity/XXPortalUser.java  |   24 +-
 .../apache/ranger/entity/XXPortalUserRole.java  |   19 +-
 .../org/apache/ranger/entity/XXResource.java    |   28 +-
 .../java/org/apache/ranger/entity/XXTrxLog.java |   20 +-
 .../java/org/apache/ranger/entity/XXUser.java   |   20 +-
 .../apache/ranger/entity/view/VXXTrxLog.java    |   16 +-
 .../org/apache/ranger/patch/BaseLoader.java     |    1 -
 .../patch/PatchPasswordEncryption_J10001.java   |    4 +-
 .../java/org/apache/ranger/rest/AssetREST.java  |   33 +-
 .../java/org/apache/ranger/rest/PublicAPIs.java |   38 +-
 .../java/org/apache/ranger/rest/UserREST.java   |   28 +-
 .../java/org/apache/ranger/rest/XAuditREST.java |   29 +-
 .../java/org/apache/ranger/rest/XUserREST.java  |   63 +-
 .../security/context/RangerContextHolder.java   |   45 +
 .../security/context/RangerSecurityContext.java |   58 +
 .../security/context/XAContextHolder.java       |   45 -
 .../security/context/XASecurityContext.java     |   58 -
 .../RangerDomainObjectSecurityHandler.java      |  112 +
 .../handler/XADomainObjectSecurityHandler.java  |  112 -
 .../security/listener/SpringEventListener.java  |   18 +-
 .../standalone/StandaloneSecurityHandler.java   |   30 +-
 .../RangerAuthFailureHandler.java               |  108 +
 .../RangerAuthSuccessHandler.java               |  161 ++
 .../RangerAuthenticationEntryPoint.java         |  106 +
 .../authentication/XAAuthFailureHandler.java    |  108 -
 .../authentication/XAAuthSuccessHandler.java    |  161 --
 .../XAAuthenticationEntryPoint.java             |  106 -
 .../RangerSecurityContextFormationFilter.java   |  137 ++
 ...gerUsernamePasswordAuthenticationFilter.java |   52 +
 .../XASecurityContextFormationFilter.java       |  139 --
 .../XAUsernamePasswordAuthenticationFilter.java |   52 -
 .../service/AbstractBaseResourceService.java    |   20 +-
 .../ranger/service/AuthSessionService.java      |    6 +-
 .../org/apache/ranger/service/UserService.java  |    8 +-
 .../apache/ranger/service/UserServiceBase.java  |    8 +-
 .../ranger/service/XAccessAuditService.java     |   17 +-
 .../ranger/service/XAccessAuditServiceBase.java |    8 +-
 .../apache/ranger/service/XAgentService.java    |    8 -
 .../apache/ranger/service/XAssetService.java    |   17 +-
 .../ranger/service/XAssetServiceBase.java       |    8 +-
 .../apache/ranger/service/XAuditMapService.java |   25 +-
 .../ranger/service/XAuditMapServiceBase.java    |    8 +-
 .../ranger/service/XCredentialStoreService.java |    6 +-
 .../service/XCredentialStoreServiceBase.java    |    8 +-
 .../ranger/service/XGroupGroupService.java      |    6 +-
 .../ranger/service/XGroupGroupServiceBase.java  |    8 +-
 .../apache/ranger/service/XGroupService.java    |   27 +-
 .../ranger/service/XGroupServiceBase.java       |    8 +-
 .../ranger/service/XGroupUserService.java       |   26 +-
 .../ranger/service/XGroupUserServiceBase.java   |    8 +-
 .../apache/ranger/service/XPermMapService.java  |   38 +-
 .../ranger/service/XPermMapServiceBase.java     |    8 +-
 .../service/XPolicyExportAuditService.java      |    6 +-
 .../service/XPolicyExportAuditServiceBase.java  |    8 +-
 .../apache/ranger/service/XPolicyService.java   |    4 +-
 .../ranger/service/XPortalUserService.java      |   10 +-
 .../ranger/service/XPortalUserServiceBase.java  |    8 +-
 .../ranger/service/XRepositoryService.java      |   12 +-
 .../apache/ranger/service/XResourceService.java |   76 +-
 .../ranger/service/XResourceServiceBase.java    |    8 +-
 .../apache/ranger/service/XTrxLogService.java   |   23 +-
 .../ranger/service/XTrxLogServiceBase.java      |    8 +-
 .../org/apache/ranger/service/XUserService.java |   27 +-
 .../apache/ranger/service/XUserServiceBase.java |    8 +-
 .../service/filter/RangerRESTAPIFilter.java     |  278 +++
 .../ranger/service/filter/XARESTAPIFilter.java  |  280 ---
 .../java/org/apache/ranger/util/CLIUtil.java    |    2 +-
 .../org/apache/ranger/util/RangerEnumUtil.java  | 2025 ++++++++++++++++++
 .../org/apache/ranger/util/RangerRestUtil.java  |  156 ++
 .../java/org/apache/ranger/util/RestUtil.java   |    6 +-
 .../java/org/apache/ranger/util/XAEnumUtil.java | 2024 -----------------
 .../java/org/apache/ranger/util/XARestUtil.java |  156 --
 .../org/apache/ranger/view/VXAccessAudit.java   |   14 +-
 .../apache/ranger/view/VXAccessAuditList.java   |    9 +-
 .../java/org/apache/ranger/view/VXAsset.java    |    9 +-
 .../org/apache/ranger/view/VXAssetList.java     |    9 +-
 .../java/org/apache/ranger/view/VXAuditMap.java |    9 +-
 .../org/apache/ranger/view/VXAuditMapList.java  |    9 +-
 .../apache/ranger/view/VXAuditRecordList.java   |    3 +-
 .../org/apache/ranger/view/VXAuthSession.java   |    8 +-
 .../apache/ranger/view/VXAuthSessionList.java   |    9 +-
 .../apache/ranger/view/VXCredentialStore.java   |    9 +-
 .../ranger/view/VXCredentialStoreList.java      |    9 +-
 .../org/apache/ranger/view/VXDataObject.java    |    9 +-
 .../java/org/apache/ranger/view/VXGroup.java    |   13 +-
 .../org/apache/ranger/view/VXGroupGroup.java    |    9 +-
 .../apache/ranger/view/VXGroupGroupList.java    |    9 +-
 .../org/apache/ranger/view/VXGroupList.java     |    9 +-
 .../org/apache/ranger/view/VXGroupUser.java     |    9 +-
 .../org/apache/ranger/view/VXGroupUserList.java |    9 +-
 .../java/org/apache/ranger/view/VXLong.java     |   10 +-
 .../java/org/apache/ranger/view/VXMessage.java  |   10 +-
 .../apache/ranger/view/VXPasswordChange.java    |   10 +-
 .../java/org/apache/ranger/view/VXPermMap.java  |   14 +-
 .../org/apache/ranger/view/VXPermMapList.java   |    9 +-
 .../java/org/apache/ranger/view/VXPermObj.java  |    2 +-
 .../org/apache/ranger/view/VXPermObjList.java   |    9 +-
 .../java/org/apache/ranger/view/VXPolicy.java   |    6 +-
 .../apache/ranger/view/VXPolicyExportAudit.java |    8 +-
 .../ranger/view/VXPolicyExportAuditList.java    |    9 +-
 .../org/apache/ranger/view/VXPolicyList.java    |    9 +-
 .../org/apache/ranger/view/VXPortalUser.java    |    9 +-
 .../apache/ranger/view/VXPortalUserList.java    |    9 +-
 .../org/apache/ranger/view/VXRepository.java    |    4 +-
 .../apache/ranger/view/VXRepositoryList.java    |    9 +-
 .../java/org/apache/ranger/view/VXResource.java |   22 +-
 .../org/apache/ranger/view/VXResourceList.java  |    9 +-
 .../java/org/apache/ranger/view/VXResponse.java |   10 +-
 .../java/org/apache/ranger/view/VXString.java   |   10 +-
 .../org/apache/ranger/view/VXStringList.java    |    9 +-
 .../java/org/apache/ranger/view/VXTrxLog.java   |   13 +-
 .../org/apache/ranger/view/VXTrxLogList.java    |    9 +-
 .../java/org/apache/ranger/view/VXUser.java     |    9 +-
 .../java/org/apache/ranger/view/VXUserList.java |    9 +-
 .../conf.dist/security-applicationContext.xml   |   10 +-
 security-admin/src/main/webapp/WEB-INF/web.xml  |    4 +-
 .../org/apache/ranger/biz/TestAssetMgr.java     |   69 +-
 .../apache/ranger/biz/TestRangerBizUtil.java    |  547 +++++
 .../java/org/apache/ranger/biz/TestUserMgr.java |   17 +-
 .../org/apache/ranger/biz/TestXABizUtil.java    |  548 -----
 .../org/apache/ranger/biz/TestXUserMgr.java     |   17 +-
 .../org/apache/ranger/common/TestDateUtil.java  |    1 -
 .../org/apache/ranger/common/TestJSONUtil.java  |    6 -
 .../ranger/common/TestPropertiesUtil.java       |    4 -
 .../ranger/common/TestRangerConfigUtil.java     |   51 +
 .../apache/ranger/common/TestStringUtil.java    |    4 -
 .../apache/ranger/common/TestXAConfigUtil.java  |   55 -
 .../org/apache/ranger/rest/TestPublicAPIs.java  |    9 +-
 .../java/org/apache/ranger/util/BaseTest.java   |    3 +-
 .../apache/ranger/util/TestRangerEnumUtil.java  |  125 ++
 .../org/apache/ranger/util/TestXAEnumUtil.java  |  126 --
 211 files changed, 8627 insertions(+), 8570 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java b/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java
index 19d08f4..efb835f 100644
--- a/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java
+++ b/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java
@@ -23,7 +23,6 @@ import java.security.Principal;
 import java.util.Collections;
 import java.util.Set;
 
-import org.apache.ranger.authentication.unix.jaas.UnixGroupPrincipal;
 import org.springframework.security.authentication.jaas.AuthorityGranter;
 
 public class RoleUserAuthorityGranter implements AuthorityGranter {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/biz/AssetConnectionMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/AssetConnectionMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/AssetConnectionMgr.java
index c481e65..da86e1a 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/AssetConnectionMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/AssetConnectionMgr.java
@@ -30,7 +30,7 @@ import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.JSONUtil;
 import org.apache.ranger.common.StringUtil;
 import org.apache.ranger.common.TimedEventUtil;
-import org.apache.ranger.db.XADaoManager;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.entity.XXAsset;
 import org.apache.ranger.hadoop.client.HadoopFS;
 import org.apache.ranger.hbase.client.HBaseClient;
@@ -62,7 +62,7 @@ public class AssetConnectionMgr {
 	protected StringUtil stringUtil;
 	
 	@Autowired
-	protected XADaoManager xADaoManager;
+	protected RangerDaoManager rangerDaoManager;
 	
 	@Autowired
 	XAssetService xAssetService;
@@ -76,7 +76,7 @@ public class AssetConnectionMgr {
 	
 	public HadoopFS getHadoopConnection(final String dataSourceName) {
 		HadoopFS hadoopFS = null;
-		XXAsset asset = xADaoManager.getXXAsset().findByAssetName(dataSourceName);
+		XXAsset asset = rangerDaoManager.getXXAsset().findByAssetName(dataSourceName);
 		if (asset != null) {
 			// get it from the cache
 			synchronized (hadoopConnectionCache) {
@@ -148,7 +148,7 @@ public class AssetConnectionMgr {
 	
 	public HiveClient getHiveConnection(final String dataSourceName) {
 		HiveClient hiveClient = null;
-		XXAsset asset = xADaoManager.getXXAsset().findByAssetName(dataSourceName);
+		XXAsset asset = rangerDaoManager.getXXAsset().findByAssetName(dataSourceName);
 		if (asset != null) {
 			// get it from the cache
 			synchronized (hiveConnectionCache) {
@@ -196,7 +196,7 @@ public class AssetConnectionMgr {
 	public KnoxClient getKnoxClient(String dataSourceName) {
 		KnoxClient knoxClient = null;
 		logger.debug("Getting knoxClient for datasource: " + dataSourceName);
-		XXAsset asset = xADaoManager.getXXAsset().findByAssetName(dataSourceName);
+		XXAsset asset = rangerDaoManager.getXXAsset().findByAssetName(dataSourceName);
 		if (asset == null) {
 			logger.error("Asset not found with name " + dataSourceName, new Throwable());
 		} else {
@@ -268,7 +268,7 @@ public class AssetConnectionMgr {
 	
 	public HBaseClient getHBaseConnection(final String dataSourceName) {
 		HBaseClient client = null;
-		XXAsset asset = xADaoManager.getXXAsset().findByAssetName(
+		XXAsset asset = rangerDaoManager.getXXAsset().findByAssetName(
 				dataSourceName);
 		if (asset != null) {
 			// get it from the cache

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
index 3aebe39..2f42868 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
@@ -21,7 +21,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.UnknownHostException;
 import java.security.cert.X509Certificate;
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -41,8 +40,6 @@ import javax.naming.ldap.Rdn;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryUtils.VLong;
-import org.apache.hive.com.esotericsoftware.minlog.Log;
 import org.apache.log4j.Logger;
 import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.ContextUtil;
@@ -50,13 +47,13 @@ import org.apache.ranger.common.DateUtil;
 import org.apache.ranger.common.JSONUtil;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.PropertiesUtil;
+import org.apache.ranger.common.RangerCommonEnums;
+import org.apache.ranger.common.RangerConstants;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.StringUtil;
 import org.apache.ranger.common.TimedEventUtil;
 import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.common.XACommonEnums;
-import org.apache.ranger.common.XAConstants;
-import org.apache.ranger.db.XADaoManager;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.entity.XXAsset;
 import org.apache.ranger.entity.XXAuditMap;
 import org.apache.ranger.entity.XXGroup;
@@ -126,19 +123,19 @@ public class AssetMgr extends AssetMgrBase {
 	AssetConnectionMgr assetConnectionMgr;
 
 	@Autowired
-	XABizUtil msBizUtil;
+	RangerBizUtil msBizUtil;
 
 	@Autowired
 	StringUtil stringUtil;
 
 	@Autowired
-	XADaoManager xADaoManager;
+	RangerDaoManager rangerDaoManager;
 
 	@Autowired
 	XUserService xUserService;
 
 	@Autowired
-	XABizUtil xaBizUtil;
+	RangerBizUtil xaBizUtil;
 
 	@Autowired
 	XTrxLogService xTrxLogService;
@@ -171,14 +168,14 @@ public class AssetMgr extends AssetMgrBase {
 		}
 			
 		Long assetId = vXResource.getAssetId();
-		XXAsset xAsset = xADaoManager.getXXAsset().getById(assetId);
+		XXAsset xAsset = rangerDaoManager.getXXAsset().getById(assetId);
 		if (xAsset == null) {
 			logger.error("Repository not found for assetId : " + assetId);
 			throw restErrorUtil.create403RESTException("Repository for which"
 					+ " the policy is created, doesn't exist.");
 		}		
 		
-		if(xAsset.getActiveStatus()==XACommonEnums.ACT_STATUS_DISABLED){
+		if(xAsset.getActiveStatus()==RangerCommonEnums.ACT_STATUS_DISABLED){
 			if(!session.isUserAdmin()){
 				logger.error("Trying to create/update policy in disabled repository");
 				throw restErrorUtil.createRESTException("Resource "
@@ -239,7 +236,7 @@ public class AssetMgr extends AssetMgrBase {
 			throw restErrorUtil.createRESTException(vXResponse);
 		}
 
-		if (vXResource.getCheckParentPermission() != XAConstants.BOOL_FALSE) {
+		if (vXResource.getCheckParentPermission() != RangerConstants.BOOL_FALSE) {
 			// check parent access for user and group
 			xResourceService.checkAccess(vXResource);
 		}
@@ -316,14 +313,14 @@ public class AssetMgr extends AssetMgrBase {
 		}
 
 		Long assetId = vXResource.getAssetId();
-		XXAsset xAsset = xADaoManager.getXXAsset().getById(assetId);
+		XXAsset xAsset = rangerDaoManager.getXXAsset().getById(assetId);
 		if (xAsset == null) {
 			throw restErrorUtil.createRESTException("The repository for which "
 					+ "you're updating policy, doesn't exist.",
 					MessageEnums.INVALID_INPUT_DATA);
 		}
 		
-		if(xAsset.getActiveStatus()==XACommonEnums.STATUS_DISABLED){
+		if(xAsset.getActiveStatus()==RangerCommonEnums.STATUS_DISABLED){
 			if(!currentUserSession.isUserAdmin()){
 				logger.error("Trying to update policy in disabled repository");
 				throw restErrorUtil.createRESTException("Resource "
@@ -375,7 +372,7 @@ public class AssetMgr extends AssetMgrBase {
 			throw restErrorUtil.createRESTException(vXResponse);
 		}
 
-		if (vXResource.getCheckParentPermission() != XAConstants.BOOL_FALSE) {
+		if (vXResource.getCheckParentPermission() != RangerConstants.BOOL_FALSE) {
 			// check parent access for user and group
 			xResourceService.checkAccess(vXResource);
 		}
@@ -446,7 +443,7 @@ public class AssetMgr extends AssetMgrBase {
 		
 		//policyName creation and validation logic end here
 	
-		XXResource xResouce = xADaoManager.getXXResource().getById(
+		XXResource xResouce = rangerDaoManager.getXXResource().getById(
 				vXResource.getId());
 		
 		List<XXTrxLog> trxLogList = xResourceService.getTransactionLog(
@@ -475,7 +472,7 @@ public class AssetMgr extends AssetMgrBase {
 			for (VXPermMap newObj : newPermMapList) {
 				if (newObj.getUserId() == null && newObj.getGroupId() == null
 						&& !stringUtil.isEmpty(newObj.getUserName())) {
-					XXUser xxUser = xADaoManager.getXXUser().findByUserName(
+					XXUser xxUser = rangerDaoManager.getXXUser().findByUserName(
 							newObj.getUserName());
 					if (xxUser != null) {
 						newObj.setUserId(xxUser.getId());
@@ -634,14 +631,14 @@ public class AssetMgr extends AssetMgrBase {
 		}
 
 		Long assetId = vResource.getAssetId();
-		XXAsset xAsset = xADaoManager.getXXAsset().getById(assetId);
+		XXAsset xAsset = rangerDaoManager.getXXAsset().getById(assetId);
 		if (xAsset == null) {
 			throw restErrorUtil.createRESTException("The repository for which "
 					+ "you're deleting policy, doesn't exist.",
 					MessageEnums.INVALID_INPUT_DATA);
 		}
 
-		if(xAsset.getActiveStatus()==XACommonEnums.STATUS_DISABLED){
+		if(xAsset.getActiveStatus()==RangerCommonEnums.STATUS_DISABLED){
 			if(!currentUserSession.isUserAdmin()){
 				logger.error("Trying to delete policy in disabled repository");
 				throw restErrorUtil.createRESTException("Resource "
@@ -785,13 +782,13 @@ public class AssetMgr extends AssetMgrBase {
 			X509Certificate[] certchain, boolean httpEnabled, String epoch,
 			String ipAddress, boolean isSecure, String count, String agentId) {
 
-		XXAsset xAsset = xADaoManager.getXXAsset().findByAssetName(repository);
+		XXAsset xAsset = rangerDaoManager.getXXAsset().findByAssetName(repository);
 		if(xAsset==null){
 			logger.error("Requested repository not found");
 			throw restErrorUtil.createRESTException("No Data Found.",
 					MessageEnums.DATA_NOT_FOUND);
 		}
-		if(xAsset.getActiveStatus()==XACommonEnums.ACT_STATUS_DISABLED){
+		if(xAsset.getActiveStatus()==RangerCommonEnums.ACT_STATUS_DISABLED){
 			logger.error("Requested repository is disabled");
 			throw restErrorUtil.createRESTException("Unauthorized access.",
 					MessageEnums.OPER_NO_EXPORT);
@@ -923,7 +920,7 @@ public class AssetMgr extends AssetMgrBase {
 		// //////////////////////////////////////
 		// Get latest updated time of repository
 		// //////////////////////////////////////
-		Timestamp luTime = xADaoManager.getXXResource()
+		Timestamp luTime = rangerDaoManager.getXXResource()
 				.getMaxUpdateTimeForAssetName(repository);
 
 		HashMap<String, Object> updatedRepo = new HashMap<String, Object>();
@@ -943,7 +940,7 @@ public class AssetMgr extends AssetMgrBase {
 
 			if(epochTime == updatedTime) {
 				//TODO: instead of getting entire list, get just count(*) for the given repository
-				xResourceList = xADaoManager.getXXResource().findUpdatedResourcesByAssetName(repository, new Date(0L));
+				xResourceList = rangerDaoManager.getXXResource().findUpdatedResourcesByAssetName(repository, new Date(0L));
 				
 				int resourceListSz = (xResourceList == null) ? 0 : xResourceList.size() ;
 				
@@ -958,7 +955,7 @@ public class AssetMgr extends AssetMgrBase {
 				}
 				
 			} else {
-				xResourceList = xADaoManager.getXXResource().findUpdatedResourcesByAssetName(repository, new Date(0L));
+				xResourceList = rangerDaoManager.getXXResource().findUpdatedResourcesByAssetName(repository, new Date(0L));
 			}
 
 
@@ -970,13 +967,13 @@ public class AssetMgr extends AssetMgrBase {
 					resourceMap.put("resource", xResource.getName());
 					resourceMap.put("isRecursive",
 							getBooleanValue(xResource.getIsRecursive()));
-					resourceMap.put("policyStatus", XACommonEnums
+					resourceMap.put("policyStatus", RangerCommonEnums
 							.getLabelFor_ActiveStatus(xResource
 									.getResourceStatus()));
 					// resourceMap.put("isEncrypt",
 					// AKAConstants.getLabelFor_BooleanValue(xResource.getIsEncrypt()));
 					populatePermMap(xResource, resourceMap, AppConstants.ASSET_HDFS);
-					List<XXAuditMap> xAuditMaps = xADaoManager.getXXAuditMap()
+					List<XXAuditMap> xAuditMaps = rangerDaoManager.getXXAuditMap()
 							.findByResourceId(xResource.getId());
 					if (xAuditMaps.size() != 0) {
 						resourceMap.put("audit", 1);
@@ -991,7 +988,7 @@ public class AssetMgr extends AssetMgrBase {
 					HashMap<String, Object> resourceMap = new HashMap<String, Object>();
 					resourceMap.put("id", xResource.getId());
 					resourceMap.put("database_name", xResource.getDatabases());
-					resourceMap.put("policyStatus", XACommonEnums
+					resourceMap.put("policyStatus", RangerCommonEnums
 							.getLabelFor_ActiveStatus(xResource
 									.getResourceStatus()));
 					resourceMap.put("tablePolicyType", AppConstants
@@ -1009,7 +1006,7 @@ public class AssetMgr extends AssetMgrBase {
 					}
 
 					populatePermMap(xResource, resourceMap, AppConstants.ASSET_HIVE);
-					List<XXAuditMap> xAuditMaps = xADaoManager.getXXAuditMap()
+					List<XXAuditMap> xAuditMaps = rangerDaoManager.getXXAuditMap()
 							.findByResourceId(xResource.getId());
 					if (xAuditMaps.size() != 0) {
 						resourceMap.put("audit", 1);
@@ -1029,7 +1026,7 @@ public class AssetMgr extends AssetMgrBase {
 					resourceMap.put("column_name", xResource.getColumns());
 					resourceMap.put("column_families",
 							xResource.getColumnFamilies());
-					resourceMap.put("policyStatus", XACommonEnums
+					resourceMap.put("policyStatus", RangerCommonEnums
 							.getLabelFor_ActiveStatus(xResource
 									.getResourceStatus()));
 					if (xResource.getIsEncrypt() == 1) {
@@ -1040,7 +1037,7 @@ public class AssetMgr extends AssetMgrBase {
 					// resourceMap.put("isEncrypt",
 					// AKAConstants.getLabelFor_BooleanValue(xResource.getIsEncrypt()));
 					populatePermMap(xResource, resourceMap, AppConstants.ASSET_HBASE);
-					List<XXAuditMap> xAuditMaps = xADaoManager.getXXAuditMap()
+					List<XXAuditMap> xAuditMaps = rangerDaoManager.getXXAuditMap()
 							.findByResourceId(xResource.getId());
 					if (xAuditMaps.size() != 0) {
 						resourceMap.put("audit", 1);
@@ -1057,7 +1054,7 @@ public class AssetMgr extends AssetMgrBase {
 					resourceMap.put("id", xResource.getId());
 					resourceMap.put("topology_name", xResource.getTopologies()) ;
 					resourceMap.put("service_name", xResource.getServices()) ;
-					resourceMap.put("policyStatus", XACommonEnums
+					resourceMap.put("policyStatus", RangerCommonEnums
 							.getLabelFor_ActiveStatus(xResource
 									.getResourceStatus()));
 					if (xResource.getIsEncrypt() == 1) {
@@ -1068,7 +1065,7 @@ public class AssetMgr extends AssetMgrBase {
 					// resourceMap.put("isEncrypt",
 					// AKAConstants.getLabelFor_BooleanValue(xResource.getIsEncrypt()));
 					populatePermMap(xResource, resourceMap, AppConstants.ASSET_KNOX);
-					List<XXAuditMap> xAuditMaps = xADaoManager.getXXAuditMap()
+					List<XXAuditMap> xAuditMaps = rangerDaoManager.getXXAuditMap()
 							.findByResourceId(xResource.getId());
 					if (xAuditMaps.size() != 0) {
 						resourceMap.put("audit", 1);
@@ -1085,7 +1082,7 @@ public class AssetMgr extends AssetMgrBase {
 
                             resourceMap.put("id", xResource.getId());
                             resourceMap.put("topology_name", xResource.getTopologies()) ;
-                            resourceMap.put("policyStatus", XACommonEnums
+                            resourceMap.put("policyStatus", RangerCommonEnums
                                             .getLabelFor_ActiveStatus(xResource
                                                             .getResourceStatus()));
                             if (xResource.getIsEncrypt() == 1) {
@@ -1094,7 +1091,7 @@ public class AssetMgr extends AssetMgrBase {
                                     resourceMap.put("encrypt", 0);
                             }
                             populatePermMap(xResource, resourceMap, AppConstants.ASSET_STORM);
-                            List<XXAuditMap> xAuditMaps = xADaoManager.getXXAuditMap()
+                            List<XXAuditMap> xAuditMaps = rangerDaoManager.getXXAuditMap()
                                             .findByResourceId(xResource.getId());
                             if (xAuditMaps.size() != 0) {
                                     resourceMap.put("audit", 1);
@@ -1285,14 +1282,14 @@ public class AssetMgr extends AssetMgrBase {
 		vXResource = xResourceService.createResource(vXResource);
 
 		if (userName != null && !userName.isEmpty()) {
-			XXUser xxUser = xADaoManager.getXXUser().findByUserName(userName);
+			XXUser xxUser = rangerDaoManager.getXXUser().findByUserName(userName);
 			VXUser vXUser;
 			if (xxUser != null) {
 				vXUser = xUserService.populateViewBean(xxUser);
 			} else {
 				vXUser = new VXUser();
 				vXUser.setName(userName);
-				vXUser.setUserSource(XACommonEnums.USER_EXTERNAL);
+				vXUser.setUserSource(RangerCommonEnums.USER_EXTERNAL);
 				vXUser=xUserMgr.createXUser(vXUser);
 				//vXUser = xUserService.createResource(vXUser);
 			}
@@ -1366,10 +1363,10 @@ public class AssetMgr extends AssetMgrBase {
 				defaultConfig=xAssetService.getConfigWithEncryptedPassword(defaultConfig,true);
 				vXAsset.setConfig(defaultConfig);
 			}
-			XXAsset xAsset = xADaoManager.getXXAsset()
+			XXAsset xAsset = rangerDaoManager.getXXAsset()
 					.getById(vXAsset.getId());
 			
-			if (xAsset.getActiveStatus() == XACommonEnums.STATUS_DELETED) {
+			if (xAsset.getActiveStatus() == RangerCommonEnums.STATUS_DELETED) {
 				logger.error("Trying to update Asset which is soft deleted");
 				throw restErrorUtil.createRESTException(
 						"Repository that you want to update does not exist.",
@@ -1400,7 +1397,7 @@ public class AssetMgr extends AssetMgrBase {
 		if (usb != null && usb.isUserAdmin() && force) {
 			VXAsset vxAsset = xAssetService.readResource(id);
 			
-			if (vxAsset.getActiveStatus() == XACommonEnums.STATUS_DELETED) {
+			if (vxAsset.getActiveStatus() == RangerCommonEnums.STATUS_DELETED) {
 				logger.error("Trying to delete Asset which is already soft deleted");
 				throw restErrorUtil.createRESTException(
 						"Repository not found or its already deleted, for Id : "
@@ -1416,7 +1413,7 @@ public class AssetMgr extends AssetMgrBase {
 					deleteXResource(resource.getId(), true);
 				}
 			}
-			vxAsset.setActiveStatus(XACommonEnums.STATUS_DELETED);
+			vxAsset.setActiveStatus(RangerCommonEnums.STATUS_DELETED);
 			xAssetService.updateResource(vxAsset);
 			List<XXTrxLog> trxLogList = xAssetService.getTransactionLog(
 					vxAsset, "delete");
@@ -1570,7 +1567,7 @@ public class AssetMgr extends AssetMgrBase {
 
 	public VXResponse testConfig(VXAsset vXAsset) {
 		
-		if (vXAsset.getActiveStatus() == XACommonEnums.STATUS_DELETED) {
+		if (vXAsset.getActiveStatus() == RangerCommonEnums.STATUS_DELETED) {
 			logger.error("Trying to test Asset which is soft deleted");
 			throw restErrorUtil.createRESTException(
 					"Repository not found, Repository Name : " + vXAsset.getName(),
@@ -1592,7 +1589,7 @@ public class AssetMgr extends AssetMgrBase {
 		if (password != null && password.equals(hiddenPasswordString)) {
 			String assetName = vXAsset.getName();
 			if (assetName != null) {
-				XXAsset existingVXAsset = xADaoManager.getXXAsset()
+				XXAsset existingVXAsset = rangerDaoManager.getXXAsset()
 						.findByAssetName(assetName);
 				if (existingVXAsset != null
 						&& existingVXAsset.getConfig() != null) {
@@ -1968,7 +1965,7 @@ public class AssetMgr extends AssetMgrBase {
 	@SuppressWarnings("unchecked")
 	private HashMap<String, Object> populatePermMap(XXResource xResource,
 			HashMap<String, Object> resourceMap, int assetType) {
-		List<XXPermMap> xPermMapList = xADaoManager.getXXPermMap()
+		List<XXPermMap> xPermMapList = rangerDaoManager.getXXPermMap()
 				.findByResourceId(xResource.getId());
 
 		Set<Long> groupList = new HashSet<Long>();
@@ -1993,7 +1990,7 @@ public class AssetMgr extends AssetMgrBase {
 						if (groupId != null) {
 							Set<String> groups = (Set<String>) sortedPermMap
 									.get("groups");
-							XXGroup xGroup = xADaoManager.getXXGroup()
+							XXGroup xGroup = rangerDaoManager.getXXGroup()
 									.getById(groupId);
 							if(xGroup!=null && groups != null){
 								groups.add(xGroup.getName());
@@ -2002,7 +1999,7 @@ public class AssetMgr extends AssetMgrBase {
 						} else if (userId != null) {
 							Set<String> users = (Set<String>) sortedPermMap
 									.get("users");
-							XXUser xUser = xADaoManager.getXXUser().getById(
+							XXUser xUser = rangerDaoManager.getXXUser().getById(
 									userId);
 							if (users != null && xUser != null) {
 								users.add(xUser.getName());
@@ -2043,14 +2040,14 @@ public class AssetMgr extends AssetMgrBase {
 
 					if (groupId != null) {
 						Set<String> groupSet = new HashSet<String>();
-						XXGroup xGroup = xADaoManager.getXXGroup().getById(
+						XXGroup xGroup = rangerDaoManager.getXXGroup().getById(
 								xPermMap.getGroupId());
 						String group = xGroup.getName();
 						groupSet.add(group);
 						sortedPermMap.put("groups", groupSet);
 					} else if (userId != null) {
 						Set<String> userSet = new HashSet<String>();
-						XXUser xUser = xADaoManager.getXXUser()
+						XXUser xUser = rangerDaoManager.getXXUser()
 								.getById(userId);
 						String user = xUser.getName();
 						userSet.add(user);
@@ -2095,7 +2092,7 @@ public class AssetMgr extends AssetMgrBase {
 	public void UpdateDefaultPolicyUserAndPerm(VXResource vXResource,
 			String userName) {
 		if (userName != null && !userName.isEmpty()) {
-			XXUser xxUser = xADaoManager.getXXUser().findByUserName(userName);
+			XXUser xxUser = rangerDaoManager.getXXUser().findByUserName(userName);
 			VXUser vXUser;
 			if (xxUser != null) {
 				vXUser = xUserService.populateViewBean(xxUser);
@@ -2108,7 +2105,7 @@ public class AssetMgr extends AssetMgrBase {
 			}
 			// fetch old permission and consider only one permission for default
 			// policy
-			List<XXPermMap> xxPermMapList = xADaoManager.getXXPermMap()
+			List<XXPermMap> xxPermMapList = rangerDaoManager.getXXPermMap()
 					.findByResourceId(vXResource.getId());
 			VXPermMap vXPermMap = null;
 			if (xxPermMapList != null && xxPermMapList.size() != 0) {
@@ -2136,17 +2133,17 @@ public class AssetMgr extends AssetMgrBase {
 		List<XXResource> xxResourceList = new ArrayList<XXResource>();
 		if (assetType == AppConstants.ASSET_HDFS) {
 			resourceName = "/*";
-			xxResourceList = xADaoManager.getXXResource()
+			xxResourceList = rangerDaoManager.getXXResource()
 					.findByResourceNameAndAssetIdAndRecursiveFlag(resourceName,
 							assetId, AppConstants.BOOL_TRUE);
 		} else if (assetType == AppConstants.ASSET_HIVE) {
 			resourceName = "/*/*/*";
-			xxResourceList = xADaoManager.getXXResource()
+			xxResourceList = rangerDaoManager.getXXResource()
 					.findByResourceNameAndAssetIdAndResourceType(resourceName,
 							assetId, AppConstants.RESOURCE_UNKNOWN);
 		} else if (assetType == AppConstants.ASSET_HBASE) {
 			resourceName = "/*/*/*";
-			xxResourceList = xADaoManager.getXXResource()
+			xxResourceList = rangerDaoManager.getXXResource()
 					.findByResourceNameAndAssetIdAndResourceType(resourceName,
 							assetId, AppConstants.RESOURCE_UNKNOWN);
 		}
@@ -2184,7 +2181,7 @@ public class AssetMgr extends AssetMgrBase {
 								return null;
 							}
 						}
-						return xADaoManager.getXXPolicyExportAudit().create(
+						return rangerDaoManager.getXXPolicyExportAudit().create(
 								xXPolicyExportAudit);
 					}
 				});
@@ -2216,7 +2213,7 @@ public class AssetMgr extends AssetMgrBase {
 				searchCriteria.getParamList().put("endDate", temp);
 			}
 			if (searchCriteria.getParamList().containsKey("owner")) {
-				XXPortalUser xXPortalUser= xADaoManager.getXXPortalUser().findByLoginId(
+				XXPortalUser xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(
 						(searchCriteria.getParamList().get("owner").toString()));
 				if(xXPortalUser!=null){
 					searchCriteria.getParamList().put("owner", xXPortalUser.getId());
@@ -2268,7 +2265,7 @@ public class AssetMgr extends AssetMgrBase {
 	}
 
 	public VXTrxLogList getTransactionReport(String transactionId) {
-		List<XXTrxLog> xTrxLogList = xADaoManager.getXXTrxLog()
+		List<XXTrxLog> xTrxLogList = rangerDaoManager.getXXTrxLog()
 				.findByTransactionId(transactionId);
 		VXTrxLogList vXTrxLogList = new VXTrxLogList();
 		List<VXTrxLog> vXTrxLogs = vXTrxLogList.getVXTrxLogs();
@@ -2362,7 +2359,7 @@ public class AssetMgr extends AssetMgrBase {
 		VXAsset vXAsset=null;
 		if (currentUserSession.isUserAdmin()) {
 			vXAsset = xAssetService.readResource(id);
-			if (vXAsset.getActiveStatus() == XACommonEnums.STATUS_DELETED) {
+			if (vXAsset.getActiveStatus() == RangerCommonEnums.STATUS_DELETED) {
 				logger.error("Trying to read Asset which is soft deleted");
 				throw restErrorUtil.createRESTException(
 						"Repository not found for this Id : " + id,
@@ -2370,9 +2367,9 @@ public class AssetMgr extends AssetMgrBase {
 						"Repository does not exist for this Id : " + id);
 			}
 		}else{			
-			XXAsset  xXAsset=xADaoManager.getXXAsset().getById(id);	
+			XXAsset  xXAsset=rangerDaoManager.getXXAsset().getById(id);	
 			
-			if (xXAsset.getActiveStatus() == XACommonEnums.STATUS_DELETED) {
+			if (xXAsset.getActiveStatus() == RangerCommonEnums.STATUS_DELETED) {
 				logger.error("Trying to read Asset which is soft deleted");
 				throw restErrorUtil.createRESTException(
 						"Repository not found for this Id : " + id,
@@ -2381,13 +2378,13 @@ public class AssetMgr extends AssetMgrBase {
 			}
 			
 			vXAsset=xAssetService.populateViewBean(xXAsset);
-			/*List<XXResource>  xXResourceList=xADaoManager
+			/*List<XXResource>  xXResourceList=rangerDaoManager
 					.getXXResource().findByAssetId(id);
 			for (XXResource xXResource : xXResourceList) {
 				VXResponse vXResponse = xaBizUtil.hasPermission(xResourceService.populateViewBean(xXResource), 
 						AppConstants.XA_PERM_TYPE_ADMIN);
 				if(vXResponse.getStatusCode() == VXResponse.STATUS_SUCCESS){
-					XXAsset  xXAsset=xADaoManager.getXXAsset().getById(id);		
+					XXAsset  xXAsset=rangerDaoManager.getXXAsset().getById(id);		
 					vXAsset=xAssetService.populateViewBean(xXAsset);
 					break;
 				}
@@ -2419,14 +2416,14 @@ public class AssetMgr extends AssetMgrBase {
 		}
 		vXResource = xResourceService.createResource(vXResource);
 		if (userName != null && !userName.isEmpty()) {
-			XXUser xxUser = xADaoManager.getXXUser().findByUserName(userName);
+			XXUser xxUser = rangerDaoManager.getXXUser().findByUserName(userName);
 			VXUser vXUser;
 			if (xxUser != null) {
 				vXUser = xUserService.populateViewBean(xxUser);
 			} else {
 				vXUser = new VXUser();
 				vXUser.setName(userName);
-				vXUser.setUserSource(XACommonEnums.USER_EXTERNAL);
+				vXUser.setUserSource(RangerCommonEnums.USER_EXTERNAL);
 				vXUser=xUserMgr.createXUser(vXUser);
 				//vXUser = xUserService.createResource(vXUser);
 			}
@@ -2468,13 +2465,13 @@ public class AssetMgr extends AssetMgrBase {
 			throw restErrorUtil.createRESTException("Unauthorized access.",
 					MessageEnums.OPER_NOT_ALLOWED_FOR_ENTITY);
 		}
-		XXAsset xAsset = xADaoManager.getXXAsset().findByAssetName(repository);
+		XXAsset xAsset = rangerDaoManager.getXXAsset().findByAssetName(repository);
 		if(xAsset==null){
 			logger.error("Requested repository not found");
 			throw restErrorUtil.createRESTException("No Data Found.",
 					MessageEnums.DATA_NOT_FOUND);
 		}
-		if(xAsset.getActiveStatus()==XACommonEnums.ACT_STATUS_DISABLED){
+		if(xAsset.getActiveStatus()==RangerCommonEnums.ACT_STATUS_DISABLED){
 			logger.error("Requested repository is disabled");
 			throw restErrorUtil.createRESTException("Unauthorized access.",
 					MessageEnums.OPER_NOT_ALLOWED_FOR_STATE);
@@ -2538,25 +2535,25 @@ public class AssetMgr extends AssetMgrBase {
 		}
 		
 		//checks user exists or not
-		XXUser xUser = xADaoManager.getXXUser().findByUserName(vXResource.getOwner());		
+		XXUser xUser = rangerDaoManager.getXXUser().findByUserName(vXResource.getOwner());		
 		if(xUser==null){
 			throw restErrorUtil.createRESTException("User " +vXResource.getOwner() + " is Not Found",
 					MessageEnums.DATA_NOT_FOUND);
 		}	
-		XXPortalUser xXPortalUser= xADaoManager.getXXPortalUser().findByLoginId(vXResource.getOwner());
+		XXPortalUser xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(vXResource.getOwner());
 		if(xXPortalUser==null){
 			throw restErrorUtil.createRESTException("User " +vXResource.getOwner() + " is Not Found",
 					MessageEnums.DATA_NOT_FOUND);
 		}
 		//checks repository exists or not
-		XXAsset xAsset = xADaoManager.getXXAsset().findByAssetName(vXResource.getAssetName());
+		XXAsset xAsset = rangerDaoManager.getXXAsset().findByAssetName(vXResource.getAssetName());
 		if (xAsset == null) {
 			logger.error("Repository not found for asset : " + vXResource.getAssetName());
 			throw restErrorUtil.createRESTException("Repository for which"
 					+ " the policy is created, doesn't exist.",MessageEnums.DATA_NOT_FOUND);
 		}	
 		//checks repository active or not
-		if(xAsset.getActiveStatus()==XACommonEnums.ACT_STATUS_DISABLED){			
+		if(xAsset.getActiveStatus()==RangerCommonEnums.ACT_STATUS_DISABLED){			
 				logger.error("Trying to create/update policy in disabled repository");
 				throw restErrorUtil.createRESTException("Resource "
 						+ "creation/updation not allowed in disabled repository",MessageEnums.OPER_NO_PERMISSION);
@@ -2589,13 +2586,13 @@ public class AssetMgr extends AssetMgrBase {
 		}
 		
 		//checks user is admin in resource or not
-		List<XXResource> xResourceList=xADaoManager.getXXResource().findByAssetId(xAsset.getId());		
+		List<XXResource> xResourceList=rangerDaoManager.getXXResource().findByAssetId(xAsset.getId());		
 		if(xResourceList!=null){
 			boolean isAdmin=false;
-			List<XXPortalUserRole> xXPortalUserRoleList = xADaoManager.getXXPortalUserRole().findByParentId(xXPortalUser.getId());
+			List<XXPortalUserRole> xXPortalUserRoleList = rangerDaoManager.getXXPortalUserRole().findByParentId(xXPortalUser.getId());
 			if(xXPortalUserRoleList!=null && xXPortalUserRoleList.size()>0){
 				for(XXPortalUserRole xXPortalUserRole: xXPortalUserRoleList){
-					if(xXPortalUserRole.getUserRole().equalsIgnoreCase(XAConstants.ROLE_SYS_ADMIN)){
+					if(xXPortalUserRole.getUserRole().equalsIgnoreCase(RangerConstants.ROLE_SYS_ADMIN)){
 						isAdmin=true;
 						break;
 					}
@@ -2703,7 +2700,7 @@ public class AssetMgr extends AssetMgrBase {
 			}
 			if(vXPermMapTemp.getPermFor()==AppConstants.XA_PERM_FOR_USER){
 				if(vXPermMapTemp.getUserId()==null && !stringUtil.isEmpty(vXPermMapTemp.getUserName())){
-					xxUser = xADaoManager.getXXUser().findByUserName(vXPermMapTemp.getUserName());
+					xxUser = rangerDaoManager.getXXUser().findByUserName(vXPermMapTemp.getUserName());
 					if (xxUser != null) {
 						vXPermMapTemp.setUserId(xxUser.getId());
 					} else{
@@ -2714,7 +2711,7 @@ public class AssetMgr extends AssetMgrBase {
 			}
 			if(vXPermMapTemp.getPermFor()==AppConstants.XA_PERM_FOR_GROUP){
 				if(vXPermMapTemp.getGroupId()==null && !stringUtil.isEmpty(vXPermMapTemp.getGroupName())){
-					xxGroup = xADaoManager.getXXGroup().findByGroupName(
+					xxGroup = rangerDaoManager.getXXGroup().findByGroupName(
 							vXPermMapTemp.getGroupName());
 					if (xxGroup != null) {
 						vXPermMapTemp.setGroupId(xxGroup.getId());
@@ -2759,7 +2756,7 @@ public class AssetMgr extends AssetMgrBase {
 		if(vXResourceList!=null && vXResourceList.getListSize()>0){					
 			//replace perm map if true
 			if(vXPolicy.isReplacePerm()){
-				XXResource xXResource = xADaoManager.getXXResource().getById(vXResource.getId());
+				XXResource xXResource = rangerDaoManager.getXXResource().getById(vXResource.getId());
 				VXResource vXResourceDBObj=xResourceService.populateViewBean(xXResource);
 				List<XXTrxLog> trxLogListDelete = xResourceService.getTransactionLog(
 						vXResourceDBObj, xXResource, "delete");
@@ -2806,7 +2803,7 @@ public class AssetMgr extends AssetMgrBase {
 		
 		//update case
 		if(vXResourceList!=null && vXResourceList.getListSize()>0){
-			XXResource xXResource = xADaoManager.getXXResource().getById(vXResource.getId());
+			XXResource xXResource = rangerDaoManager.getXXResource().getById(vXResource.getId());
 			vXResource.setCreateDate(xXResource.getCreateTime());
 			vXResource.setUpdateDate(xXResource.getUpdateTime());
 			trxLogList = xResourceService.getTransactionLog(vXResource, xXResource, "update");
@@ -2912,26 +2909,26 @@ public class AssetMgr extends AssetMgrBase {
 			return vXResource;
 		}
 		//checks user exists or not
-		XXUser xUser = xADaoManager.getXXUser().findByUserName(vXResource.getOwner());		
+		XXUser xUser = rangerDaoManager.getXXUser().findByUserName(vXResource.getOwner());		
 		if(xUser==null){
 			throw restErrorUtil.createRESTException("User " +vXResource.getOwner() + " is Not Found",
 					MessageEnums.DATA_NOT_FOUND);
 		}
-		XXPortalUser xXPortalUser= xADaoManager.getXXPortalUser().findByLoginId(vXResource.getOwner());		
+		XXPortalUser xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(vXResource.getOwner());		
 		if(xXPortalUser==null){
 			throw restErrorUtil.createRESTException("User " +vXResource.getOwner() + " is Not Found",
 					MessageEnums.DATA_NOT_FOUND);
 		}
 		
 		//checks repository exists or not
-		XXAsset xAsset = xADaoManager.getXXAsset().findByAssetName(vXResource.getAssetName());
+		XXAsset xAsset = rangerDaoManager.getXXAsset().findByAssetName(vXResource.getAssetName());
 		if (xAsset == null) {
 			logger.error("Repository not found for asset : " + vXResource.getAssetName());
 			throw restErrorUtil.createRESTException("Repository for which"
 					+ " the policy is created, doesn't exist.",MessageEnums.DATA_NOT_FOUND);
 		}	
 		//checks repository active or not
-		if(xAsset.getActiveStatus()==XACommonEnums.ACT_STATUS_DISABLED){			
+		if(xAsset.getActiveStatus()==RangerCommonEnums.ACT_STATUS_DISABLED){			
 				logger.error("Trying to delete policy in disabled repository");
 				throw restErrorUtil.createRESTException("revoke "
 						+ " not allowed in disabled repository",MessageEnums.OPER_NO_PERMISSION);
@@ -2990,13 +2987,13 @@ public class AssetMgr extends AssetMgrBase {
 		}
 		
 		//checks grantor is admin in resource or not
-		List<XXPortalUserRole> xXPortalUserRoleList = xADaoManager.getXXPortalUserRole().findByParentId(xXPortalUser.getId());
-		List<XXResource> xResourceList=xADaoManager.getXXResource().findByAssetId(xAsset.getId());		
+		List<XXPortalUserRole> xXPortalUserRoleList = rangerDaoManager.getXXPortalUserRole().findByParentId(xXPortalUser.getId());
+		List<XXResource> xResourceList=rangerDaoManager.getXXResource().findByAssetId(xAsset.getId());		
 		if(xResourceList!=null){
 			boolean isAdmin=false;
 			if(xXPortalUserRoleList!=null && xXPortalUserRoleList.size()>0){
 				for(XXPortalUserRole xXPortalUserRole: xXPortalUserRoleList){
-					if(xXPortalUserRole.getUserRole().equalsIgnoreCase(XAConstants.ROLE_SYS_ADMIN)){
+					if(xXPortalUserRole.getUserRole().equalsIgnoreCase(RangerConstants.ROLE_SYS_ADMIN)){
 						isAdmin=true;
 						break;
 					}
@@ -3052,7 +3049,7 @@ public class AssetMgr extends AssetMgrBase {
 				}
 				if(vXPermMapTemp.getPermFor()==AppConstants.XA_PERM_FOR_USER){
 					if(vXPermMapTemp.getUserId()==null && !stringUtil.isEmpty(vXPermMapTemp.getUserName())){
-						xxUser = xADaoManager.getXXUser().findByUserName(vXPermMapTemp.getUserName());
+						xxUser = rangerDaoManager.getXXUser().findByUserName(vXPermMapTemp.getUserName());
 						if (xxUser != null) {
 							vXPermMapTemp.setUserId(xxUser.getId());
 						} else{
@@ -3063,7 +3060,7 @@ public class AssetMgr extends AssetMgrBase {
 				}
 				if(vXPermMapTemp.getPermFor()==AppConstants.XA_PERM_FOR_GROUP){
 					if(vXPermMapTemp.getGroupId()==null && !stringUtil.isEmpty(vXPermMapTemp.getGroupName())){
-						xxGroup = xADaoManager.getXXGroup().findByGroupName(
+						xxGroup = rangerDaoManager.getXXGroup().findByGroupName(
 								vXPermMapTemp.getGroupName());
 						if (xxGroup != null) {
 							vXPermMapTemp.setGroupId(xxGroup.getId());
@@ -3079,7 +3076,7 @@ public class AssetMgr extends AssetMgrBase {
 		vXResource.setPermMapList(permMapList);
 		
 		//permission deletion preprocessing
-		XXResource xResource = xADaoManager.getXXResource().getById(
+		XXResource xResource = rangerDaoManager.getXXResource().getById(
 				vXResource.getId());
 		vXResource.setCreateDate(xResource.getCreateTime());
 		vXResource.setUpdateDate(xResource.getUpdateTime());
@@ -3180,7 +3177,7 @@ public class AssetMgr extends AssetMgrBase {
 	
     public VXStringList getStormResources(final String dataSourceName,String topologyName) {
         VXStringList ret = null ;
-        XXAsset asset = xADaoManager.getXXAsset().findByAssetName(dataSourceName);
+        XXAsset asset = rangerDaoManager.getXXAsset().findByAssetName(dataSourceName);
         String config = asset.getConfig() ;
         if(!stringUtil.isEmpty(config)){
 			config=xAssetService.getConfigWithDecryptedPassword(config);

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/biz/AssetMgrBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgrBase.java b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgrBase.java
index 55320b8..9e8a596 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgrBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgrBase.java
@@ -19,9 +19,22 @@
 
  package org.apache.ranger.biz;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.MessageEnums;
+import org.apache.ranger.common.RESTErrorUtil;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.service.XAssetService;
+import org.apache.ranger.service.XCredentialStoreService;
+import org.apache.ranger.service.XPolicyExportAuditService;
+import org.apache.ranger.service.XResourceService;
+import org.apache.ranger.view.VXAsset;
+import org.apache.ranger.view.VXAssetList;
+import org.apache.ranger.view.VXCredentialStore;
+import org.apache.ranger.view.VXCredentialStoreList;
+import org.apache.ranger.view.VXLong;
+import org.apache.ranger.view.VXPolicyExportAudit;
+import org.apache.ranger.view.VXPolicyExportAuditList;
+import org.apache.ranger.view.VXResource;
+import org.apache.ranger.view.VXResourceList;
 import org.springframework.beans.factory.annotation.Autowired;
 public class AssetMgrBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/biz/BaseMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/BaseMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/BaseMgr.java
index be808de..174a56c 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/BaseMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/BaseMgr.java
@@ -22,27 +22,27 @@
  */
 package org.apache.ranger.biz;
 
-import org.apache.log4j.Logger;
+import org.apache.log4j.Logger;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.RESTErrorUtil;
-import org.apache.ranger.common.XAConstants;
+import org.apache.ranger.common.RangerConstants;
 import org.apache.ranger.common.db.BaseDao;
-import org.apache.ranger.db.XADaoManager;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.entity.XXDBBase;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 @Component
 public abstract class BaseMgr {
     static final Logger logger = Logger.getLogger(BaseMgr.class);
 
     @Autowired
-    XADaoManager daoManager;
+    RangerDaoManager daoManager;
 
     @Autowired
     RESTErrorUtil restErrorUtil;
 
-    public XADaoManager getDaoManager() {
+    public RangerDaoManager getDaoManager() {
 	return daoManager;
     }
 
@@ -72,7 +72,7 @@ public abstract class BaseMgr {
     protected void validateClassType(int objectClassType) {
 	// objectClassType
 	restErrorUtil.validateMinMax(objectClassType, 1,
-		XAConstants.ClassTypes_MAX, "Invalid classType", null,
+		RangerConstants.ClassTypes_MAX, "Invalid classType", null,
 		"objectClassType");
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/biz/HiveFSMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/HiveFSMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/HiveFSMgr.java
index e6924ea..8d84db7 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/HiveFSMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/HiveFSMgr.java
@@ -24,8 +24,6 @@ package org.apache.ranger.biz;
 
 import org.apache.log4j.Logger;
 import org.apache.ranger.hive.client.HiveClient;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
 
 /**
  * 


Mime
View raw message