You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@ranger.apache.org by ma...@apache.org on 2014/12/16 03:44:31 UTC

[01/12] incubator-ranger git commit: RANGER-194: Rename classes under web-admin project

Repository: incubator-ranger
Updated Branches:
  refs/heads/master ef7b11da4 -> 06ca85385


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/biz/TestXABizUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestXABizUtil.java b/security-admin/src/test/java/org/apache/ranger/biz/TestXABizUtil.java
deleted file mode 100644
index b56ceda..0000000
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestXABizUtil.java
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ranger.biz;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.ranger.biz.XABizUtil;
-import org.apache.ranger.common.AppConstants;
-import org.apache.ranger.common.ContextUtil;
-import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.common.XACommonEnums;
-import org.apache.ranger.common.XAConstants;
-import org.apache.ranger.common.db.BaseDao;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.db.XXAssetDao;
-import org.apache.ranger.db.XXPortalUserDao;
-import org.apache.ranger.db.XXResourceDao;
-import org.apache.ranger.db.XXUserDao;
-import org.apache.ranger.entity.XXAsset;
-import org.apache.ranger.entity.XXDBBase;
-import org.apache.ranger.entity.XXPortalUser;
-import org.apache.ranger.entity.XXResource;
-import org.apache.ranger.entity.XXUser;
-import org.apache.ranger.security.context.XAContextHolder;
-import org.apache.ranger.security.context.XASecurityContext;
-import org.apache.ranger.view.VXAsset;
-import org.apache.ranger.view.VXDataObject;
-import org.apache.ranger.view.VXPortalUser;
-import org.apache.ranger.view.VXResource;
-import org.apache.ranger.view.VXResponse;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class TestXABizUtil {
-	
-	private Long id = 1L;
-	private String resourceName = "hadoopdev";
-	
-	@InjectMocks
-	XABizUtil xABizUtil = new XABizUtil();
-	
-	@Mock
-	XADaoManager daoManager;
-	
-	@Mock
-	StringUtil stringUtil; 
-	
-	@Before
-	public void setup(){
-		XASecurityContext context = new XASecurityContext();
-		context.setUserSession(new UserSessionBase());
-		XAContextHolder.setSecurityContext(context);		
-	}
-	
-	@Test
-	public void testHasPermission_When_disableAccessControl(){
-		VXResource vXResource = null;
-		xABizUtil.enableResourceAccessControl = false;
-		VXResponse resp = xABizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN);
-		Assert.assertNotNull(resp);		
-	}
-	
-	@Test
-	public void testHasPermission_When_NoResource(){
-		VXResource vXResource = null;
-		VXResponse resp = xABizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN);
-		Assert.assertNotNull(resp);
-		Assert.assertEquals(VXResponse.STATUS_ERROR, resp.getStatusCode());
-		Assert.assertEquals("Please provide valid policy.", resp.getMsgDesc());
-	}
-	
-	@Test
-	public void testHasPermission_emptyResourceName(){
-		VXResource vXResource = new VXResource();
-		XXPortalUser portalUser = new XXPortalUser();
-		XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
-		XXPortalUserDao userDao = Mockito.mock(XXPortalUserDao.class);
-		XXUser xxUser = new XXUser(); 
-		XXAsset xxAsset = new XXAsset();
-		List<XXResource> lst = new ArrayList<XXResource>();
-		XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class);
-		XXAssetDao xxAssetDao = Mockito.mock(XXAssetDao.class);
-		Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao);
-		Mockito.when(userDao.getById(Mockito.anyLong())).thenReturn(portalUser);
-		Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao);
-		Mockito.when(xxUserDao.findByUserName(Mockito.anyString())).thenReturn(xxUser);	
-		Mockito.when(daoManager.getXXResource()).thenReturn(xxResourceDao);
-		Mockito.when(xxResourceDao.findByAssetIdAndResourceStatus(Mockito.anyLong(),Mockito.anyInt())).thenReturn(lst);
-		Mockito.when(daoManager.getXXAsset()).thenReturn(xxAssetDao);
-		Mockito.when(xxAssetDao.getById(Mockito.anyLong())).thenReturn(xxAsset);
-		VXResponse resp = xABizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN);
-		Mockito.verify(daoManager).getXXPortalUser();
-		Mockito.verify(userDao).getById(Mockito.anyLong());
-		Mockito.verify(daoManager).getXXUser();
-		Mockito.verify(xxUserDao).findByUserName(Mockito.anyString());
-		Assert.assertNotNull(resp);
-		Assert.assertEquals(VXResponse.STATUS_ERROR, resp.getStatusCode());
-		Assert.assertEquals("Permission Denied !", resp.getMsgDesc());		
-	}
-	
-	@Test
-	public void testHasPermission_isAdmin(){
-		VXResource vXResource = new VXResource();
-		vXResource.setName(resourceName);
-		vXResource.setAssetId(id);		
-		UserSessionBase currentUserSession = ContextUtil.getCurrentUserSession();
-		currentUserSession.setUserAdmin(true);
-		VXResponse resp = xABizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN);
-		Assert.assertNotNull(resp);
-		Assert.assertEquals(VXResponse.STATUS_SUCCESS, resp.getStatusCode());
-	}	
-	
-	@Test
-	public void testIsNotAdmin(){
-		boolean isAdminChk = xABizUtil.isAdmin();
-		Assert.assertFalse(isAdminChk);
-	}
-	
-	@Test
-	public void testIsAdmin(){
-		UserSessionBase currentUserSession = ContextUtil.getCurrentUserSession();
-		currentUserSession.setUserAdmin(true);
-		boolean isAdminChk = xABizUtil.isAdmin();
-		Assert.assertTrue(isAdminChk);
-	}	
-	
-	@Test
-	public void testUserSessionNull_forIsAdmin(){
-		XAContextHolder.setSecurityContext(null);	
-		boolean isAdminChk = xABizUtil.isAdmin();
-		Assert.assertFalse(isAdminChk);
-	}
-	
-	@Test
-	public void testGetXUserId_NoUserSession(){
-		XAContextHolder.setSecurityContext(null);
-		Long chk = xABizUtil.getXUserId();
-		Assert.assertNull(chk);
-	}
-	
-	@Test
-	public void testGetXUserId_NoUser(){
-		XASecurityContext context = new XASecurityContext();
-		context.setUserSession(new UserSessionBase());
-		XAContextHolder.setSecurityContext(context);	
-		XXPortalUser xxPortalUser = new XXPortalUser();
-		XXUser xxUser = new XXUser();
-		XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
-		XXPortalUserDao xxPortalUserDao = Mockito.mock(XXPortalUserDao.class);
-		Mockito.when(daoManager.getXXPortalUser()).thenReturn(xxPortalUserDao);
-		Mockito.when(xxPortalUserDao.getById(Mockito.anyLong())).thenReturn(xxPortalUser);
-		Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao);
-		Mockito.when(xxUserDao.findByUserName(Mockito.anyString())).thenReturn(xxUser);
-		Long chk = xABizUtil.getXUserId();
-		Mockito.verify(daoManager).getXXPortalUser();
-		Mockito.verify(xxPortalUserDao).getById(Mockito.anyLong());
-		Mockito.verify(daoManager).getXXUser();
-		Mockito.verify(xxUserDao).findByUserName(Mockito.anyString());
-		Assert.assertNull(chk);	
-	}
-	
-	@Test
-	public void testGetXUserId(){
-		XXPortalUser xxPortalUser = new XXPortalUser();
-		xxPortalUser.setId(id);
-		XXUser xxUser = new XXUser();
-		xxUser.setId(id);
-		XXPortalUserDao xxPortalUserDao = Mockito.mock(XXPortalUserDao.class);
-		XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
-		XASecurityContext context = new XASecurityContext();
-		UserSessionBase userSessionBase = new UserSessionBase();
-		userSessionBase.setUserAdmin(true);
-		context.setUserSession(userSessionBase);
-		userSessionBase.setXXPortalUser(xxPortalUser);
-		XAContextHolder.setSecurityContext(context);	
-		Mockito.when(daoManager.getXXPortalUser()).thenReturn(xxPortalUserDao);
-		Mockito.when(xxPortalUserDao.getById(Mockito.anyLong())).thenReturn(xxPortalUser);
-		Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao);
-		Mockito.when(xxUserDao.findByUserName(Mockito.anyString())).thenReturn(xxUser);		
-		Long chk = xABizUtil.getXUserId();
-		Mockito.verify(daoManager).getXXPortalUser();
-		Mockito.verify(xxPortalUserDao).getById(Mockito.anyLong());
-		Mockito.verify(daoManager).getXXUser();
-		Mockito.verify(xxUserDao).findByUserName(Mockito.anyString());
-		Assert.assertEquals(chk, id);		
-	}
-	
-	@Test
-	public void testReplaceMetaChars_PathEmpty(){
-		String path = "";
-		String pathChk = xABizUtil.replaceMetaChars(path);
-		Assert.assertFalse(pathChk.contains("\\*"));
-		Assert.assertFalse(pathChk.contains("\\?"));
-	}
-	
-	@Test
-	public void testReplaceMetaChars_NoMetaChars(){
-		String path = "\\Demo\\Test";
-		String pathChk = xABizUtil.replaceMetaChars(path);
-		Assert.assertFalse(pathChk.contains("\\*"));
-		Assert.assertFalse(pathChk.contains("\\?"));
-	}
-	
-	@Test
-	public void testReplaceMetaChars_PathNull(){
-		String path = null;
-		String pathChk = xABizUtil.replaceMetaChars(path);
-		Assert.assertNull(pathChk);
-	}
-	
-	@Test
-	public void testReplaceMetaChars(){
-		String path = "\\Demo\\Test\\*\\?";
-		String pathChk = xABizUtil.replaceMetaChars(path);
-		Assert.assertFalse(pathChk.contains("\\*"));
-		Assert.assertFalse(pathChk.contains("\\?"));
-	}
-	
-	@Test
-	public void testGeneratePublicName(){		
-		String firstName = "Test123456789123456789";
-		String lastName = "Unit";
-		String publicNameChk = xABizUtil.generatePublicName(firstName, lastName);
-		Assert.assertEquals("Test12345678... U.", publicNameChk);
-	}
-	
-	@Test
-	public void testGeneratePublicName_fNameLessThanMax(){		
-		String firstName = "Test";
-		String lastName = "";
-		String publicNameChk = xABizUtil.generatePublicName(firstName, lastName);
-		Assert.assertNull(publicNameChk);
-	}
-	
-	@Test
-	public void testGeneratePublicName_withPortalUser(){
-		VXPortalUser vXPortalUser = new VXPortalUser();
-		vXPortalUser.setFirstName("Test");
-		vXPortalUser.setLastName(null);
-		String publicNameChk = xABizUtil.generatePublicName(vXPortalUser, null);
-		Assert.assertNull(publicNameChk);
-	}
-	
-	@Test
-	public void testGetDisplayName_EmptyName() {
-		String displayNameChk = xABizUtil.getDisplayName(null);
-		Assert.assertEquals(xABizUtil.EMPTY_CONTENT_DISPLAY_NAME, displayNameChk);
-	}
-	
-	@Test
-	public void testGetDisplayName_AssetName() {
-		XXAsset obj = new XXAsset();
-		obj.setDescription(resourceName);
-		String displayNameChk = xABizUtil.getDisplayName(obj);
-		Assert.assertEquals(resourceName, displayNameChk);
-	}
-	
-	@Test
-	public void testGetDisplayName_MoreThanMaxLen() {
-		XXAsset obj = new XXAsset();
-		String name = resourceName;
-		for(int i=0;i<16;i++){
-			name = name + "_" + name + "1";
-		}
-		obj.setDescription(name);
-		String displayNameChk = xABizUtil.getDisplayName(obj);
-		Assert.assertEquals(displayNameChk.length(), 150);
-	}
-	
-	@Test
-	public void testGetDisplayNameForClassName(){
-		XXAsset obj = new XXAsset();
-		String displayNameChk = xABizUtil.getDisplayNameForClassName(obj);
-		Assert.assertEquals("Asset",displayNameChk);
-	}
-	
-	@Test
-	public void testGetFileNameWithoutExtension(){
-		File file = new File("test.txt");
-		String fileNameChk = xABizUtil.getFileNameWithoutExtension(file);
-		Assert.assertEquals("test",fileNameChk);
-	}
-	
-	@Test
-	public void testGetFileNameWithoutExtension_NoFile(){
-		String fileNameChk = xABizUtil.getFileNameWithoutExtension(null);
-		Assert.assertNull(fileNameChk);
-	}
-	
-	@Test
-	public void testGetFileNameWithoutExtension_noExt(){
-		File file = new File("test");
-		String fileNameChk = xABizUtil.getFileNameWithoutExtension(file);
-		Assert.assertEquals("test",fileNameChk);
-	}
-	
-	@Test
-	public void testGetImageExtension_TestJPG(){
-		String contentType = "img.JPG";
-		String extChk = xABizUtil.getImageExtension(contentType);
-		Assert.assertEquals("jpg",extChk);
-	}
-	
-	@Test
-	public void testGetImageExtension_TestJPEG(){
-		String contentType = "img.JPEG";
-		String extChk = xABizUtil.getImageExtension(contentType);
-		Assert.assertEquals("jpg",extChk);
-	}
-	
-	@Test
-	public void testGetImageExtension_TestPNG(){
-		String contentType = "img.PNG";
-		String extChk = xABizUtil.getImageExtension(contentType);
-		Assert.assertEquals("png",extChk);
-	}
-	
-	@Test
-	public void testGetImageExtension_NoExt(){
-		String contentType = "img";
-		String extChk = xABizUtil.getImageExtension(contentType);
-		Assert.assertEquals("",extChk);
-	}
-	
-	@Test
-	public void testGetMimeType_ForJPG(){
-		String mimeTypeChk = xABizUtil.getMimeType(XAConstants.MIME_JPEG);
-		Assert.assertEquals("jpg",mimeTypeChk);		
-	}
-	
-	@Test
-	public void testGetMimeType_ForPNG(){
-		String mimeTypeChk = xABizUtil.getMimeType(XAConstants.MIME_PNG);
-		Assert.assertEquals("png",mimeTypeChk);		
-	}
-	
-	@Test
-	public void testGetMimeType_ForEmpty(){
-		String mimeTypeChk = xABizUtil.getMimeType(1);
-		Assert.assertEquals("",mimeTypeChk);
-	}
-	
-	@Test
-	public void testGetMimeTypeInt_ForUnknow(){
-		int mimeTypeChk = xABizUtil.getMimeTypeInt("");
-		Assert.assertEquals(XAConstants.MIME_UNKNOWN, mimeTypeChk);
-	}
-	
-	@Test
-	public void testGetMimeTypeInt_Forjpg(){
-		int mimeTypeChk = xABizUtil.getMimeTypeInt("jpg");
-		Assert.assertEquals(XAConstants.MIME_JPEG, mimeTypeChk);
-	}
-	
-	@Test
-	public void testGetMimeTypeInt_ForJPEG(){
-		int mimeTypeChk = xABizUtil.getMimeTypeInt("JPEG");
-		Assert.assertEquals(XAConstants.MIME_JPEG, mimeTypeChk);
-	}
-	
-	@Test
-	public void testGetMimeTypeInt_EndsWithJPEG(){
-		int mimeTypeChk = xABizUtil.getMimeTypeInt("txt.jpeg");
-		Assert.assertEquals(XAConstants.MIME_JPEG, mimeTypeChk);
-	}
-	
-	@Test
-	public void testGetMimeTypeInt_EndsWithJPG(){
-		int mimeTypeChk = xABizUtil.getMimeTypeInt("txt.jpg");
-		Assert.assertEquals(XAConstants.MIME_JPEG, mimeTypeChk);
-	}
-	
-	@Test
-	public void testGetMimeTypeInt_EndsWithPNG(){
-		int mimeTypeChk = xABizUtil.getMimeTypeInt("txt.png");
-		Assert.assertEquals(XAConstants.MIME_PNG, mimeTypeChk);
-	}
-	
-	@Test
-	public void testGetMimeTypeInt_ForPNG(){
-		int mimeTypeChk = xABizUtil.getMimeTypeInt("png");
-		Assert.assertEquals(XAConstants.MIME_PNG, mimeTypeChk);		
-	}	
-	
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Test
-	public void testGetMObject(){
-		BaseDao baseDao = Mockito.mock(BaseDao.class);
-		Mockito.when(daoManager.getDaoForClassType(XACommonEnums.CLASS_TYPE_USER_PROFILE)).thenReturn(baseDao);
-		Mockito.when(baseDao.getById(id)).thenReturn(new XXAsset());
-		XXDBBase mObjChk = xABizUtil.getMObject(XACommonEnums.CLASS_TYPE_USER_PROFILE,id);
-		Assert.assertNotNull(mObjChk);
-	}
-	
-	@Test
-	public void testGetMObject_NoObjId(){
-		XXDBBase mObjChk = xABizUtil.getMObject(XACommonEnums.CLASS_TYPE_USER_PROFILE,null);
-		Assert.assertNull(mObjChk);
-	}
-	
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Test
-	public void testGetMObject_VXDataObject(){
-		VXAsset vXDataObject = new VXAsset();
-		vXDataObject.setId(id);	
-		BaseDao baseDao = Mockito.mock(BaseDao.class);
-		Mockito.when(daoManager.getDaoForClassType(vXDataObject.getMyClassType())).thenReturn(baseDao);
-		Mockito.when(baseDao.getById(vXDataObject.getId())).thenReturn(new XXAsset());
-		XXDBBase xXDBaseChk = xABizUtil.getMObject(vXDataObject);		
-		Assert.assertNotNull(xXDBaseChk);
-	}
-	
-	@Test
-	public void testGetMObject_NOVXDataObject(){
-		XXDBBase xXDBaseChk = xABizUtil.getMObject(null);		
-		Assert.assertNull(xXDBaseChk);
-	}
-	
-	@Test
-	public void testGetVObject_NOObjId(){
-		VXDataObject objchk = xABizUtil.getVObject(XAConstants.CLASS_TYPE_USER_PROFILE, null);
-		Assert.assertNull(objchk);
-	}	
-	
-	@Test
-	public void testMatchHdfsPolicy_NoResourceName(){
-		boolean bnlChk = xABizUtil.matchHbasePolicy(null, null, null, id, AppConstants.XA_PERM_TYPE_UNKNOWN);
-		Assert.assertFalse(bnlChk);
-	}
-	
-	@Test
-	public void testMatchHdfsPolicy_NoResourceList(){
-		boolean bnlChk = xABizUtil.matchHbasePolicy(resourceName, null, null, id, AppConstants.XA_PERM_TYPE_UNKNOWN);
-		Assert.assertFalse(bnlChk);
-	}
-	
-	@Test
-	public void testMatchHdfsPolicy_NoUserId(){
-		VXResponse vXResponse = new VXResponse();
-		List<XXResource> xResourceList = new ArrayList<XXResource>();
-		XXResource xXResource = new XXResource();
-		xXResource.setId(id);
-		xXResource.setName(resourceName);
-		xXResource.setIsRecursive(AppConstants.BOOL_TRUE);
-		xXResource.setResourceStatus(AppConstants.STATUS_ENABLED);
-		xResourceList.add(xXResource);
-		boolean bnlChk = xABizUtil.matchHbasePolicy(resourceName, xResourceList, vXResponse, null, AppConstants.XA_PERM_TYPE_UNKNOWN);
-		Assert.assertFalse(bnlChk);
-	}
-	
-	@Test
-	public void testMatchHdfsPolicy_NoPremission(){
-		VXResponse vXResponse = new VXResponse();
-		List<XXResource> xResourceList = new ArrayList<XXResource>();
-		XXResource xXResource = new XXResource();
-		xXResource.setId(id);
-		xXResource.setName(resourceName);
-		xXResource.setIsRecursive(AppConstants.BOOL_TRUE);
-		xXResource.setResourceStatus(AppConstants.STATUS_ENABLED);
-		xResourceList.add(xXResource);
-		Mockito.when(stringUtil.isEmpty(resourceName)).thenReturn(true);
-		Mockito.when(stringUtil.split(Mockito.anyString(), Mockito.anyString())).thenReturn(new String[0]);
-		boolean bnlChk = xABizUtil.matchHbasePolicy("/*/*/*", xResourceList, vXResponse, id, AppConstants.XA_PERM_TYPE_UNKNOWN);
-		Mockito.verify(stringUtil).split(Mockito.anyString(), Mockito.anyString());
-		Assert.assertFalse(bnlChk);
-	}
-	
-	@Test
-	public void testMatchHivePolicy_NoResourceName(){
-		boolean bnlChk = xABizUtil.matchHivePolicy(null, null, null, 0);
-		Assert.assertFalse(bnlChk);
-		
-	}
-	
-	@Test
-	public void testMatchHivePolicy_NoResourceList(){
-		boolean bnlChk = xABizUtil.matchHivePolicy(resourceName, null, null, 0);
-		Assert.assertFalse(bnlChk);
-		
-	}
-	
-	@Test
-	public void testMatchHivePolicy_NoUserId(){
-		List<XXResource> xResourceList = new ArrayList<XXResource>();
-		XXResource xXResource = new XXResource();
-		xXResource.setId(id);
-		xXResource.setName(resourceName);
-		xXResource.setIsRecursive(AppConstants.BOOL_TRUE);
-		xXResource.setResourceStatus(AppConstants.STATUS_ENABLED);
-		xResourceList.add(xXResource);
-		boolean bnlChk = xABizUtil.matchHivePolicy(resourceName, xResourceList, null, 0);
-		Assert.assertFalse(bnlChk);
-		
-	}
-	
-	@Test
-	public void testMatchHivePolicy_NoPremission(){
-		List<XXResource> xResourceList = new ArrayList<XXResource>();
-		XXResource xXResource = new XXResource();
-		xXResource.setId(id);
-		xXResource.setName(resourceName);
-		xXResource.setIsRecursive(AppConstants.BOOL_TRUE);
-		xXResource.setResourceStatus(AppConstants.STATUS_ENABLED);
-		xResourceList.add(xXResource);
-		Mockito.when(stringUtil.split(Mockito.anyString(), Mockito.anyString())).thenReturn(new String[0]);
-		boolean bnlChk = xABizUtil.matchHivePolicy("/*/*/*", xResourceList, id, 0);
-		Assert.assertFalse(bnlChk);		
-	}
-	
-	@Test
-	public void testMatchHivePolicy(){
-		List<XXResource> xResourceList = new ArrayList<XXResource>();
-		XXResource xXResource = new XXResource();
-		xXResource.setId(5L);
-		xXResource.setName(resourceName);
-		xXResource.setIsRecursive(AppConstants.BOOL_TRUE);
-		xXResource.setResourceStatus(AppConstants.STATUS_ENABLED);
-		xResourceList.add(xXResource);
-		Mockito.when(stringUtil.split(Mockito.anyString(), Mockito.anyString())).thenReturn(new String[0]);
-		boolean bnlChk = xABizUtil.matchHivePolicy("/*/*/*", xResourceList, id, 17);
-		Mockito.verify(stringUtil).split(Mockito.anyString(), Mockito.anyString());
-		Assert.assertFalse(bnlChk);		
-	}		
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java b/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java
index 336d7eb..972e7b7 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java
@@ -19,21 +19,18 @@ package org.apache.ranger.biz;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.apache.ranger.biz.UserMgr;
-import org.apache.ranger.biz.XABizUtil;
-import org.apache.ranger.biz.XUserMgr;
 import org.apache.ranger.common.ContextUtil;
 import org.apache.ranger.common.RESTErrorUtil;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.StringUtil;
 import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.db.XADaoManager;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.db.XXGroupDao;
 import org.apache.ranger.db.XXGroupUserDao;
 import org.apache.ranger.db.XXUserDao;
 import org.apache.ranger.entity.XXGroup;
-import org.apache.ranger.security.context.XAContextHolder;
-import org.apache.ranger.security.context.XASecurityContext;
+import org.apache.ranger.security.context.RangerContextHolder;
+import org.apache.ranger.security.context.RangerSecurityContext;
 import org.apache.ranger.service.XGroupService;
 import org.apache.ranger.service.XGroupUserService;
 import org.apache.ranger.service.XUserService;
@@ -69,7 +66,7 @@ public class TestXUserMgr {
 	XGroupService xGroupService;
 
 	@Mock
-	XADaoManager daoManager;
+	RangerDaoManager daoManager;
 
 	@Mock
 	RESTErrorUtil restErrorUtil;
@@ -81,7 +78,7 @@ public class TestXUserMgr {
 	StringUtil stringUtil;
 
 	@Mock
-	XABizUtil msBizUtil;
+	RangerBizUtil msBizUtil;
 
 	@Mock
 	UserMgr userMgr;
@@ -93,9 +90,9 @@ public class TestXUserMgr {
 	public ExpectedException thrown = ExpectedException.none();
 
 	public void setup() {
-		XASecurityContext context = new XASecurityContext();
+		RangerSecurityContext context = new RangerSecurityContext();
 		context.setUserSession(new UserSessionBase());
-		XAContextHolder.setSecurityContext(context);
+		RangerContextHolder.setSecurityContext(context);
 		UserSessionBase currentUserSession = ContextUtil
 				.getCurrentUserSession();
 		currentUserSession.setUserAdmin(true);

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/common/TestDateUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/common/TestDateUtil.java b/security-admin/src/test/java/org/apache/ranger/common/TestDateUtil.java
index d7adb26..0d330df 100644
--- a/security-admin/src/test/java/org/apache/ranger/common/TestDateUtil.java
+++ b/security-admin/src/test/java/org/apache/ranger/common/TestDateUtil.java
@@ -19,7 +19,6 @@ package org.apache.ranger.common;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.apache.ranger.common.DateUtil;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/common/TestJSONUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/common/TestJSONUtil.java b/security-admin/src/test/java/org/apache/ranger/common/TestJSONUtil.java
index 948dbc9..5b4787d 100644
--- a/security-admin/src/test/java/org/apache/ranger/common/TestJSONUtil.java
+++ b/security-admin/src/test/java/org/apache/ranger/common/TestJSONUtil.java
@@ -19,19 +19,13 @@ package org.apache.ranger.common;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.ranger.common.JSONUtil;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.transaction.TransactionConfiguration;
-import org.springframework.transaction.annotation.Transactional;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestJSONUtil {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/common/TestPropertiesUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/common/TestPropertiesUtil.java b/security-admin/src/test/java/org/apache/ranger/common/TestPropertiesUtil.java
index 9c4c46c..7abed8e 100644
--- a/security-admin/src/test/java/org/apache/ranger/common/TestPropertiesUtil.java
+++ b/security-admin/src/test/java/org/apache/ranger/common/TestPropertiesUtil.java
@@ -16,15 +16,11 @@
  */
 package org.apache.ranger.common;
 
-import org.apache.ranger.common.PropertiesUtil;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 public class TestPropertiesUtil {
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/common/TestRangerConfigUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/common/TestRangerConfigUtil.java b/security-admin/src/test/java/org/apache/ranger/common/TestRangerConfigUtil.java
new file mode 100644
index 0000000..19297f8
--- /dev/null
+++ b/security-admin/src/test/java/org/apache/ranger/common/TestRangerConfigUtil.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ranger.common;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class TestRangerConfigUtil {
+
+	@Autowired
+	RangerConfigUtil xaConfigUtil = new RangerConfigUtil();	
+
+	@Test
+	public void testGetDefaultMaxRows() {
+		int maxrow = xaConfigUtil.getDefaultMaxRows();
+		Assert.assertEquals(maxrow,xaConfigUtil.defaultMaxRows );
+	}
+	
+	@Test
+	public void testIsAccessFilterEnabled() {
+		boolean value = xaConfigUtil.isAccessFilterEnabled();
+        Assert.assertTrue(value);
+	}
+	
+	@Test
+	public void testGetWebAppRootURL(){
+		String returnValue = xaConfigUtil.getWebAppRootURL();
+		Assert.assertEquals(returnValue,xaConfigUtil.webappRootURL);
+	}
+	
+	@Test
+	public void testGetRoles(){
+		String[] str=xaConfigUtil.getRoles();
+		Assert.assertArrayEquals(str, xaConfigUtil.roles);
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java b/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java
index 6652bff..044aebb 100644
--- a/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java
+++ b/security-admin/src/test/java/org/apache/ranger/common/TestStringUtil.java
@@ -19,13 +19,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.StringUtil;
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 public class TestStringUtil {
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/common/TestXAConfigUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/common/TestXAConfigUtil.java b/security-admin/src/test/java/org/apache/ranger/common/TestXAConfigUtil.java
deleted file mode 100644
index b6787f5..0000000
--- a/security-admin/src/test/java/org/apache/ranger/common/TestXAConfigUtil.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ranger.common;
-
-import org.apache.ranger.common.XAConfigUtil;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-public class TestXAConfigUtil {
-
-	@Autowired
-	XAConfigUtil xaConfigUtil = new XAConfigUtil();	
-
-	@Test
-	public void testGetDefaultMaxRows() {
-		int maxrow = xaConfigUtil.getDefaultMaxRows();
-		Assert.assertEquals(maxrow,xaConfigUtil.defaultMaxRows );
-	}
-	
-	@Test
-	public void testIsAccessFilterEnabled() {
-		boolean value = xaConfigUtil.isAccessFilterEnabled();
-        Assert.assertTrue(value);
-	}
-	
-	@Test
-	public void testGetWebAppRootURL(){
-		String returnValue = xaConfigUtil.getWebAppRootURL();
-		Assert.assertEquals(returnValue,xaConfigUtil.webappRootURL);
-	}
-	
-	@Test
-	public void testGetRoles(){
-		String[] str=xaConfigUtil.getRoles();
-		Assert.assertArrayEquals(str, xaConfigUtil.roles);
-	}
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIs.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIs.java b/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIs.java
index f815e8f..c5b8a0f 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIs.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIs.java
@@ -23,11 +23,10 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.ranger.biz.AssetMgr;
 import org.apache.ranger.common.RESTErrorUtil;
+import org.apache.ranger.common.RangerSearchUtil;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.XASearchUtil;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.rest.PublicAPIs;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.service.AbstractBaseResourceService;
 import org.apache.ranger.service.XAssetService;
 import org.apache.ranger.service.XPolicyService;
@@ -63,7 +62,7 @@ public class TestPublicAPIs {
 	PublicAPIs publicAPIs = new PublicAPIs();
 
 	@Mock
-	XASearchUtil searchUtil;
+	RangerSearchUtil searchUtil;
 
 	@Mock
 	AssetMgr assetMgr;
@@ -87,7 +86,7 @@ public class TestPublicAPIs {
 	StringUtil stringUtil;
 
 	@Mock
-	XADaoManager xaDaoMgr;
+	RangerDaoManager xaDaoMgr;
 
 	@Test
 	public void testGetRepository(){

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/util/BaseTest.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/util/BaseTest.java b/security-admin/src/test/java/org/apache/ranger/util/BaseTest.java
index 3847113..7d56691 100644
--- a/security-admin/src/test/java/org/apache/ranger/util/BaseTest.java
+++ b/security-admin/src/test/java/org/apache/ranger/util/BaseTest.java
@@ -22,13 +22,12 @@
  */
 package org.apache.ranger.util;
 
-import org.apache.ranger.util.CLIUtil;
 import org.junit.runner.RunWith;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpSession;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
 import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
 import org.springframework.test.context.transaction.TransactionConfiguration;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/util/TestRangerEnumUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/util/TestRangerEnumUtil.java b/security-admin/src/test/java/org/apache/ranger/util/TestRangerEnumUtil.java
new file mode 100644
index 0000000..fa27cf3
--- /dev/null
+++ b/security-admin/src/test/java/org/apache/ranger/util/TestRangerEnumUtil.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ranger.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.ranger.common.view.VEnum;
+import org.apache.ranger.common.view.VEnumElement;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class TestRangerEnumUtil {
+
+	@Autowired
+	RangerEnumUtil xaEnumUtil = new RangerEnumUtil();
+
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+	@Test
+	public void testGetEnums() {
+
+		VEnumElement VEnumElement = new VEnumElement();
+		VEnumElement.setEnumName("test1");
+		VEnumElement.setElementName("test2");
+		VEnumElement.setElementLabel("test3");
+		VEnumElement.setElementValue(0);
+		VEnumElement.setRbKey("11");
+		List<VEnumElement> listVEnumElement = new ArrayList<VEnumElement>();
+
+		VEnum vEnum = new VEnum();
+		vEnum.setEnumName("test");
+		vEnum.setElementList(listVEnumElement);
+		             xaEnumUtil.enumList.add(vEnum);
+		 List<VEnum>  dbvEnum= xaEnumUtil.getEnums();
+	     Assert.assertNotNull(dbvEnum);
+	}
+	
+	@Test
+	public void testGetEnumEmpty() {
+		
+		String enumName = "";
+	        xaEnumUtil.getEnum(enumName);
+	    Assert.assertNotNull(xaEnumUtil.enumList.size() > 0);
+	}
+
+	@Test
+	public void testGetEnum() {
+
+		String enumName = "enumtest";
+
+		VEnumElement vEnumElement1 = new VEnumElement();
+		vEnumElement1.setEnumName(enumName);
+		vEnumElement1.setElementName("test12");
+		vEnumElement1.setElementLabel("test13");
+		vEnumElement1.setElementValue(1);
+		vEnumElement1.setRbKey("11");
+		List<VEnumElement> VEnumElement = new ArrayList<VEnumElement>();
+		                   VEnumElement.add(vEnumElement1);
+
+		VEnum vEnum = new VEnum();
+		vEnum.setEnumName(enumName);
+		vEnum.setElementList(VEnumElement);
+
+		xaEnumUtil.enumMap.put(enumName, vEnum);
+
+		VEnum dbvEnum = xaEnumUtil.getEnum(enumName);
+
+		Assert.assertNotNull(dbvEnum);
+		Assert.assertEquals(enumName, dbvEnum.getEnumName());
+	}
+
+	@Test
+	public void testGetLabelIsNUll() {
+		String enumName = "CommonEnums.ActiveStatus";
+		int enumValue = 1;		
+		String value = xaEnumUtil.getLabel(enumName, enumValue);
+		boolean checkValue=value.isEmpty();
+		Assert.assertFalse(checkValue);
+	}
+
+	@Test
+	public void testGetLabel() {
+		testGetEnum();
+		String enumName = "CommonEnums.ActiveStatus";
+		int enumValue = 1;		
+		String value = xaEnumUtil.getLabel(enumName, enumValue);
+		Assert.assertNotNull(value);
+	}
+	
+	@Test
+	public void testgetValueIsNull() {
+		String enumName = "CommonEnums.BooleanValue";
+		String elementName = "BOOL_NONE";	
+		int value = xaEnumUtil.getValue(enumName, elementName);
+		Assert.assertEquals(0, value);
+	}
+	
+	@Test
+	public void testgetValue() {
+		testGetEnum();
+		String enumName = "CommonEnums.ActivationStatus";
+		String elementName = "ACT_STATUS_DISABLED";	
+		int value = xaEnumUtil.getValue(enumName, elementName);
+		Assert.assertEquals(0, value);
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/util/TestXAEnumUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/util/TestXAEnumUtil.java b/security-admin/src/test/java/org/apache/ranger/util/TestXAEnumUtil.java
deleted file mode 100644
index e85cbb3..0000000
--- a/security-admin/src/test/java/org/apache/ranger/util/TestXAEnumUtil.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ranger.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.ranger.common.view.VEnum;
-import org.apache.ranger.common.view.VEnumElement;
-import org.apache.ranger.util.XAEnumUtil;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class TestXAEnumUtil {
-
-	@Autowired
-	XAEnumUtil xaEnumUtil = new XAEnumUtil();
-
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
-	@Test
-	public void testGetEnums() {
-
-		VEnumElement VEnumElement = new VEnumElement();
-		VEnumElement.setEnumName("test1");
-		VEnumElement.setElementName("test2");
-		VEnumElement.setElementLabel("test3");
-		VEnumElement.setElementValue(0);
-		VEnumElement.setRbKey("11");
-		List<VEnumElement> listVEnumElement = new ArrayList<VEnumElement>();
-
-		VEnum vEnum = new VEnum();
-		vEnum.setEnumName("test");
-		vEnum.setElementList(listVEnumElement);
-		             xaEnumUtil.enumList.add(vEnum);
-		 List<VEnum>  dbvEnum= xaEnumUtil.getEnums();
-	     Assert.assertNotNull(dbvEnum);
-	}
-	
-	@Test
-	public void testGetEnumEmpty() {
-		
-		String enumName = "";
-	        xaEnumUtil.getEnum(enumName);
-	    Assert.assertNotNull(xaEnumUtil.enumList.size() > 0);
-	}
-
-	@Test
-	public void testGetEnum() {
-
-		String enumName = "enumtest";
-
-		VEnumElement vEnumElement1 = new VEnumElement();
-		vEnumElement1.setEnumName(enumName);
-		vEnumElement1.setElementName("test12");
-		vEnumElement1.setElementLabel("test13");
-		vEnumElement1.setElementValue(1);
-		vEnumElement1.setRbKey("11");
-		List<VEnumElement> VEnumElement = new ArrayList<VEnumElement>();
-		                   VEnumElement.add(vEnumElement1);
-
-		VEnum vEnum = new VEnum();
-		vEnum.setEnumName(enumName);
-		vEnum.setElementList(VEnumElement);
-
-		xaEnumUtil.enumMap.put(enumName, vEnum);
-
-		VEnum dbvEnum = xaEnumUtil.getEnum(enumName);
-
-		Assert.assertNotNull(dbvEnum);
-		Assert.assertEquals(enumName, dbvEnum.getEnumName());
-	}
-
-	@Test
-	public void testGetLabelIsNUll() {
-		String enumName = "CommonEnums.ActiveStatus";
-		int enumValue = 1;		
-		String value = xaEnumUtil.getLabel(enumName, enumValue);
-		boolean checkValue=value.isEmpty();
-		Assert.assertFalse(checkValue);
-	}
-
-	@Test
-	public void testGetLabel() {
-		testGetEnum();
-		String enumName = "CommonEnums.ActiveStatus";
-		int enumValue = 1;		
-		String value = xaEnumUtil.getLabel(enumName, enumValue);
-		Assert.assertNotNull(value);
-	}
-	
-	@Test
-	public void testgetValueIsNull() {
-		String enumName = "CommonEnums.BooleanValue";
-		String elementName = "BOOL_NONE";	
-		int value = xaEnumUtil.getValue(enumName, elementName);
-		Assert.assertEquals(0, value);
-	}
-	
-	@Test
-	public void testgetValue() {
-		testGetEnum();
-		String enumName = "CommonEnums.ActivationStatus";
-		String elementName = "ACT_STATUS_DISABLED";	
-		int value = xaEnumUtil.getValue(enumName, elementName);
-		Assert.assertEquals(0, value);
-	}
-}
\ No newline at end of file

[03/12] incubator-ranger git commit: RANGER-194: Rename classes under web-admin project

Posted by ma...@apache.org.

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/util/XAEnumUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/util/XAEnumUtil.java b/security-admin/src/main/java/org/apache/ranger/util/XAEnumUtil.java
deleted file mode 100644
index c5ba2d5..0000000
--- a/security-admin/src/main/java/org/apache/ranger/util/XAEnumUtil.java
+++ /dev/null
@@ -1,2024 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- package org.apache.ranger.util;
-
-/**
- * 
- */
-
-import java.util.*;
-
-import org.apache.log4j.Logger;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.util.*;
-import org.apache.ranger.view.*;
-import org.springframework.stereotype.Component;
-
-@Component
-public class XAEnumUtil {
-
-    static final Logger logger = Logger.getLogger(XAEnumUtil.class);
-    public final static String ENUM_CommonEnums_ActiveStatus = "CommonEnums.ActiveStatus";
-    public final static String ENUM_CommonEnums_ActivationStatus = "CommonEnums.ActivationStatus";
-    public final static String ENUM_CommonEnums_BooleanValue = "CommonEnums.BooleanValue";
-    public final static String ENUM_CommonEnums_DataType = "CommonEnums.DataType";
-    public final static String ENUM_CommonEnums_DeviceType = "CommonEnums.DeviceType";
-    public final static String ENUM_CommonEnums_DiffLevel = "CommonEnums.DiffLevel";
-    public final static String ENUM_CommonEnums_FileType = "CommonEnums.FileType";
-    public final static String ENUM_CommonEnums_FreqType = "CommonEnums.FreqType";
-    public final static String ENUM_CommonEnums_MimeType = "CommonEnums.MimeType";
-    public final static String ENUM_CommonEnums_NumberFormat = "CommonEnums.NumberFormat";
-    public final static String ENUM_CommonEnums_ObjectStatus = "CommonEnums.ObjectStatus";
-    public final static String ENUM_CommonEnums_PasswordResetStatus = "CommonEnums.PasswordResetStatus";
-    public final static String ENUM_CommonEnums_PriorityType = "CommonEnums.PriorityType";
-    public final static String ENUM_CommonEnums_ProgressStatus = "CommonEnums.ProgressStatus";
-    public final static String ENUM_CommonEnums_RelationType = "CommonEnums.RelationType";
-    public final static String ENUM_CommonEnums_UserSource = "CommonEnums.UserSource";
-    public final static String ENUM_CommonEnums_AssetType = "CommonEnums.AssetType";
-    public final static String ENUM_CommonEnums_AccessResult = "CommonEnums.AccessResult";
-    public final static String ENUM_CommonEnums_PolicyType = "CommonEnums.PolicyType";
-    public final static String ENUM_CommonEnums_XAAuditType = "CommonEnums.XAAuditType";
-    public final static String ENUM_CommonEnums_ResourceType = "CommonEnums.ResourceType";
-    public final static String ENUM_CommonEnums_XAGroupType = "CommonEnums.XAGroupType";
-    public final static String ENUM_CommonEnums_XAPermForType = "CommonEnums.XAPermForType";
-    public final static String ENUM_CommonEnums_XAPermType = "CommonEnums.XAPermType";
-    public final static String ENUM_CommonEnums_ClassTypes = "CommonEnums.ClassTypes";
-    public final static String ENUM_XXAuthSession_AuthStatus = "XXAuthSession.AuthStatus";
-    public final static String ENUM_XXAuthSession_AuthType = "XXAuthSession.AuthType";
-    public final static String ENUM_XResponse_ResponseStatus = "XResponse.ResponseStatus";
-
-    protected Hashtable<String, VEnum> enumMap = new Hashtable<String, VEnum>();
-    protected List<VEnum> enumList = new ArrayList<VEnum>();
-
-    public List<VEnum> getEnums() {
-	if (enumList.size() == 0) {
-	    init();
-	}
-	return enumList;
-    }
-
-    public VEnum getEnum(String enumName) {
-	if (enumList.size() == 0) {
-	    init();
-	}
-	return enumMap.get(enumName);
-    }
-
-    public String getLabel(String enumName, int enumValue) {
-	VEnum vEnum = getEnum(enumName);
-	if (vEnum == null) {
-	    logger.error("Enum " + enumName + " not found.", new Throwable());
-	    return "";
-	}
-	for (VEnumElement vEnumElement : vEnum.getElementList()) {
-	    if (vEnumElement.getElementValue() == enumValue) {
-		return vEnumElement.getElementLabel();
-	    }
-	}
-	logger.error("Enum value not found. enum=" + enumName + ", value="
-		+ enumValue, new Throwable());
-	return "";
-    }
-
-	public int getValue(String enumName, String elementName) {
-		VEnum vEnum = getEnum(enumName);
-		if (vEnum == null) {
-			logger.error("Enum " + enumName + " not found.", new Throwable());
-			return -1;
-		}
-		for (VEnumElement vEnumElement : vEnum.getElementList()) {
-			if (vEnumElement.getElementName().equalsIgnoreCase(elementName)) {
-				return vEnumElement.getElementValue();
-			}
-		}
-		logger.error("Enum value not found. enum=" + enumName
-				+ ", elementName=" + elementName, new Throwable());
-		return -1;
-	}
-
-    protected void init() {
-	VEnum vEnum;
-	VEnumElement vElement;
-
-	///////////////////////////////////
-	// CommonEnums::ActiveStatus
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_ActiveStatus);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("STATUS_DISABLED");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Disabled");
-	vElement.setRbKey("xa.enum.ActiveStatus.STATUS_DISABLED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("STATUS_ENABLED");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Enabled");
-	vElement.setRbKey("xa.enum.ActiveStatus.STATUS_ENABLED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("STATUS_DELETED");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Deleted");
-	vElement.setRbKey("xa.enum.ActiveStatus.STATUS_DELETED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::ActivationStatus
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_ActivationStatus);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ACT_STATUS_DISABLED");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Disabled");
-	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_DISABLED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ACT_STATUS_ACTIVE");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Active");
-	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_ACTIVE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ACT_STATUS_PENDING_APPROVAL");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Pending Approval");
-	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_PENDING_APPROVAL");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ACT_STATUS_PENDING_ACTIVATION");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("Pending Activation");
-	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_PENDING_ACTIVATION");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ACT_STATUS_REJECTED");
-	vElement.setElementValue(4);
-	vElement.setElementLabel("Rejected");
-	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_REJECTED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ACT_STATUS_DEACTIVATED");
-	vElement.setElementValue(5);
-	vElement.setElementLabel("Deactivated");
-	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_DEACTIVATED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ACT_STATUS_PRE_REGISTRATION");
-	vElement.setElementValue(6);
-	vElement.setElementLabel("Registration Pending");
-	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_PRE_REGISTRATION");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ACT_STATUS_NO_LOGIN");
-	vElement.setElementValue(7);
-	vElement.setElementLabel("No login privilege");
-	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_NO_LOGIN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::BooleanValue
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_BooleanValue);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("BOOL_NONE");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("None");
-	vElement.setRbKey("xa.enum.BooleanValue.BOOL_NONE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("BOOL_TRUE");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("True");
-	vElement.setRbKey("xa.enum.BooleanValue.BOOL_TRUE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("BOOL_FALSE");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("False");
-	vElement.setRbKey("xa.enum.BooleanValue.BOOL_FALSE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::DataType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_DataType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DATA_TYPE_UNKNOWN");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Unknown");
-	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_UNKNOWN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DATA_TYPE_INTEGER");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Integer");
-	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_INTEGER");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DATA_TYPE_DOUBLE");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Double");
-	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_DOUBLE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DATA_TYPE_STRING");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("String");
-	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_STRING");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DATA_TYPE_BOOLEAN");
-	vElement.setElementValue(4);
-	vElement.setElementLabel("Boolean");
-	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_BOOLEAN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DATA_TYPE_DATE");
-	vElement.setElementValue(5);
-	vElement.setElementLabel("Date");
-	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_DATE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DATA_TYPE_STRING_ENUM");
-	vElement.setElementValue(6);
-	vElement.setElementLabel("String enumeration");
-	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_STRING_ENUM");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DATA_TYPE_LONG");
-	vElement.setElementValue(7);
-	vElement.setElementLabel("Long");
-	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_LONG");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DATA_TYPE_INTEGER_ENUM");
-	vElement.setElementValue(8);
-	vElement.setElementLabel("Integer enumeration");
-	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_INTEGER_ENUM");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::DeviceType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_DeviceType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DEVICE_UNKNOWN");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Unknown");
-	vElement.setRbKey("xa.enum.DeviceType.DEVICE_UNKNOWN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DEVICE_BROWSER");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Browser");
-	vElement.setRbKey("xa.enum.DeviceType.DEVICE_BROWSER");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DEVICE_IPHONE");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("iPhone");
-	vElement.setRbKey("xa.enum.DeviceType.DEVICE_IPHONE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DEVICE_IPAD");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("iPad");
-	vElement.setRbKey("xa.enum.DeviceType.DEVICE_IPAD");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DEVICE_IPOD");
-	vElement.setElementValue(4);
-	vElement.setElementLabel("iPod");
-	vElement.setRbKey("xa.enum.DeviceType.DEVICE_IPOD");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DEVICE_ANDROID");
-	vElement.setElementValue(5);
-	vElement.setElementLabel("Android");
-	vElement.setRbKey("xa.enum.DeviceType.DEVICE_ANDROID");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::DiffLevel
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_DiffLevel);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DIFF_UNKNOWN");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Unknown");
-	vElement.setRbKey("xa.enum.DiffLevel.DIFF_UNKNOWN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DIFF_LOW");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Low");
-	vElement.setRbKey("xa.enum.DiffLevel.DIFF_LOW");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DIFF_MEDIUM");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Medium");
-	vElement.setRbKey("xa.enum.DiffLevel.DIFF_MEDIUM");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("DIFF_HIGH");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("High");
-	vElement.setRbKey("xa.enum.DiffLevel.DIFF_HIGH");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::FileType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_FileType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("FILE_FILE");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("File");
-	vElement.setRbKey("xa.enum.FileType.FILE_FILE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("FILE_DIR");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Directory");
-	vElement.setRbKey("xa.enum.FileType.FILE_DIR");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::FreqType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_FreqType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("FREQ_NONE");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("None");
-	vElement.setRbKey("xa.enum.FreqType.FREQ_NONE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("FREQ_MANUAL");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Manual");
-	vElement.setRbKey("xa.enum.FreqType.FREQ_MANUAL");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("FREQ_HOURLY");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Hourly");
-	vElement.setRbKey("xa.enum.FreqType.FREQ_HOURLY");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("FREQ_DAILY");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("Daily");
-	vElement.setRbKey("xa.enum.FreqType.FREQ_DAILY");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("FREQ_WEEKLY");
-	vElement.setElementValue(4);
-	vElement.setElementLabel("Weekly");
-	vElement.setRbKey("xa.enum.FreqType.FREQ_WEEKLY");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("FREQ_BI_WEEKLY");
-	vElement.setElementValue(5);
-	vElement.setElementLabel("Bi Weekly");
-	vElement.setRbKey("xa.enum.FreqType.FREQ_BI_WEEKLY");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("FREQ_MONTHLY");
-	vElement.setElementValue(6);
-	vElement.setElementLabel("Monthly");
-	vElement.setRbKey("xa.enum.FreqType.FREQ_MONTHLY");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::MimeType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_MimeType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("MIME_UNKNOWN");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Unknown");
-	vElement.setRbKey("xa.enum.MimeType.MIME_UNKNOWN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("MIME_TEXT");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Text");
-	vElement.setRbKey("xa.enum.MimeType.MIME_TEXT");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("MIME_HTML");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Html");
-	vElement.setRbKey("xa.enum.MimeType.MIME_HTML");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("MIME_PNG");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("png");
-	vElement.setRbKey("xa.enum.MimeType.MIME_PNG");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("MIME_JPEG");
-	vElement.setElementValue(4);
-	vElement.setElementLabel("jpeg");
-	vElement.setRbKey("xa.enum.MimeType.MIME_JPEG");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::NumberFormat
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_NumberFormat);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("NUM_FORMAT_NONE");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("None");
-	vElement.setRbKey("xa.enum.NumberFormat.NUM_FORMAT_NONE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("NUM_FORMAT_NUMERIC");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Numeric");
-	vElement.setRbKey("xa.enum.NumberFormat.NUM_FORMAT_NUMERIC");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("NUM_FORMAT_ALPHA");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Alphabhet");
-	vElement.setRbKey("xa.enum.NumberFormat.NUM_FORMAT_ALPHA");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("NUM_FORMAT_ROMAN");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("Roman");
-	vElement.setRbKey("xa.enum.NumberFormat.NUM_FORMAT_ROMAN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::ObjectStatus
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_ObjectStatus);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("OBJ_STATUS_ACTIVE");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Active");
-	vElement.setRbKey("xa.enum.ObjectStatus.OBJ_STATUS_ACTIVE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("OBJ_STATUS_DELETED");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Deleted");
-	vElement.setRbKey("xa.enum.ObjectStatus.OBJ_STATUS_DELETED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("OBJ_STATUS_ARCHIVED");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Archived");
-	vElement.setRbKey("xa.enum.ObjectStatus.OBJ_STATUS_ARCHIVED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::PasswordResetStatus
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_PasswordResetStatus);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("PWD_RESET_ACTIVE");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Active");
-	vElement.setRbKey("xa.enum.PasswordResetStatus.PWD_RESET_ACTIVE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("PWD_RESET_USED");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Used");
-	vElement.setRbKey("xa.enum.PasswordResetStatus.PWD_RESET_USED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("PWD_RESET_EXPIRED");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Expired");
-	vElement.setRbKey("xa.enum.PasswordResetStatus.PWD_RESET_EXPIRED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("PWD_RESET_DISABLED");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("Disabled");
-	vElement.setRbKey("xa.enum.PasswordResetStatus.PWD_RESET_DISABLED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::PriorityType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_PriorityType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("PRIORITY_NORMAL");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Normal");
-	vElement.setRbKey("xa.enum.PriorityType.PRIORITY_NORMAL");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("PRIORITY_LOW");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Low");
-	vElement.setRbKey("xa.enum.PriorityType.PRIORITY_LOW");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("PRIORITY_MEDIUM");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Medium");
-	vElement.setRbKey("xa.enum.PriorityType.PRIORITY_MEDIUM");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("PRIORITY_HIGH");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("High");
-	vElement.setRbKey("xa.enum.PriorityType.PRIORITY_HIGH");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::ProgressStatus
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_ProgressStatus);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("PROGRESS_PENDING");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Pending");
-	vElement.setRbKey("xa.enum.ProgressStatus.PROGRESS_PENDING");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("PROGRESS_IN_PROGRESS");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("In Progress");
-	vElement.setRbKey("xa.enum.ProgressStatus.PROGRESS_IN_PROGRESS");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("PROGRESS_COMPLETE");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Complete");
-	vElement.setRbKey("xa.enum.ProgressStatus.PROGRESS_COMPLETE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("PROGRESS_ABORTED");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("Aborted");
-	vElement.setRbKey("xa.enum.ProgressStatus.PROGRESS_ABORTED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("PROGRESS_FAILED");
-	vElement.setElementValue(4);
-	vElement.setElementLabel("Failed");
-	vElement.setRbKey("xa.enum.ProgressStatus.PROGRESS_FAILED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::RelationType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_RelationType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("REL_NONE");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("None");
-	vElement.setRbKey("xa.enum.RelationType.REL_NONE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("REL_SELF");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Self");
-	vElement.setRbKey("xa.enum.RelationType.REL_SELF");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::UserSource
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_UserSource);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("USER_APP");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Application");
-	vElement.setRbKey("xa.enum.UserSource.USER_APP");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("USER_GOOGLE");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Google");
-	vElement.setRbKey("xa.enum.UserSource.USER_GOOGLE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("USER_FB");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("FaceBook");
-	vElement.setRbKey("xa.enum.UserSource.USER_FB");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::AssetType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_AssetType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ASSET_UNKNOWN");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Unknown");
-	vElement.setRbKey("xa.enum.AssetType.ASSET_UNKNOWN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ASSET_HDFS");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("HDFS");
-	vElement.setRbKey("xa.enum.AssetType.ASSET_HDFS");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ASSET_HBASE");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("HBase");
-	vElement.setRbKey("xa.enum.AssetType.ASSET_HBASE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ASSET_HIVE");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("Hive");
-	vElement.setRbKey("xa.enum.AssetType.ASSET_HIVE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ASSET_AGENT");
-	vElement.setElementValue(4);
-	vElement.setElementLabel("Agent");
-	vElement.setRbKey("xa.enum.AssetType.ASSET_AGENT");
-	vElement.setEnumName(vEnum.getEnumName());
-	
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("ASSET_KNOX");
-	vElement.setElementValue(5);
-	vElement.setElementLabel("Knox");
-	vElement.setRbKey("xa.enum.AssetType.ASSET_KNOX");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("ASSET_STORM");
-	vElement.setElementValue(6);
-	vElement.setElementLabel("Storm");
-	vElement.setRbKey("xa.enum.AssetType.ASSET_STORM");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	///////////////////////////////////
-	// CommonEnums::AccessResult
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_AccessResult);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ACCESS_RESULT_DENIED");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Denied");
-	vElement.setRbKey("xa.enum.AccessResult.ACCESS_RESULT_DENIED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("ACCESS_RESULT_ALLOWED");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Allowed");
-	vElement.setRbKey("xa.enum.AccessResult.ACCESS_RESULT_ALLOWED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::PolicyType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_PolicyType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("POLICY_INCLUSION");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Inclusion");
-	vElement.setRbKey("xa.enum.PolicyType.POLICY_INCLUSION");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("POLICY_EXCLUSION");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Exclusion");
-	vElement.setRbKey("xa.enum.PolicyType.POLICY_EXCLUSION");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::XAAuditType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_XAAuditType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_AUDIT_TYPE_UNKNOWN");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Unknown");
-	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_UNKNOWN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_AUDIT_TYPE_ALL");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("All");
-	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_ALL");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_AUDIT_TYPE_READ");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Read");
-	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_READ");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_AUDIT_TYPE_WRITE");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("Write");
-	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_WRITE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_AUDIT_TYPE_CREATE");
-	vElement.setElementValue(4);
-	vElement.setElementLabel("Create");
-	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_CREATE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_AUDIT_TYPE_DELETE");
-	vElement.setElementValue(5);
-	vElement.setElementLabel("Delete");
-	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_DELETE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_AUDIT_TYPE_LOGIN");
-	vElement.setElementValue(6);
-	vElement.setElementLabel("Login");
-	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_LOGIN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::ResourceType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_ResourceType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("RESOURCE_UNKNOWN");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Unknown");
-	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_UNKNOWN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("RESOURCE_PATH");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Path");
-	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_PATH");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("RESOURCE_DB");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Database");
-	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_DB");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("RESOURCE_TABLE");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("Table");
-	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_TABLE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("RESOURCE_COL_FAM");
-	vElement.setElementValue(4);
-	vElement.setElementLabel("Column Family");
-	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_COL_FAM");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("RESOURCE_COLUMN");
-	vElement.setElementValue(5);
-	vElement.setElementLabel("Column");
-	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_COLUMN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("RESOURCE_VIEW");
-	vElement.setElementValue(6);
-	vElement.setElementLabel("VIEW");
-	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_VIEW");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("RESOURCE_UDF");
-	vElement.setElementValue(7);
-	vElement.setElementLabel("UDF");
-	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_UDF");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("RESOURCE_VIEW_COL");
-	vElement.setElementValue(8);
-	vElement.setElementLabel("View Column");
-	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_VIEW_COL");
-	vElement.setEnumName(vEnum.getEnumName());
-	
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("RESOURCE_TOPOLOGY");
-	vElement.setElementValue(9);
-	vElement.setElementLabel("Topology");
-	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_TOPOLOGY");
-	vElement.setEnumName(vEnum.getEnumName());
-	
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("RESOURCE_SERVICE");
-	vElement.setElementValue(10);
-	vElement.setElementLabel("Service");
-	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_SERVICE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::XAGroupType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_XAGroupType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_GROUP_UNKNOWN");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Unknown");
-	vElement.setRbKey("xa.enum.XAGroupType.XA_GROUP_UNKNOWN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_GROUP_USER");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("User");
-	vElement.setRbKey("xa.enum.XAGroupType.XA_GROUP_USER");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_GROUP_GROUP");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Group");
-	vElement.setRbKey("xa.enum.XAGroupType.XA_GROUP_GROUP");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_GROUP_ROLE");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("Role");
-	vElement.setRbKey("xa.enum.XAGroupType.XA_GROUP_ROLE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::XAPermForType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_XAPermForType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_FOR_UNKNOWN");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Unknown");
-	vElement.setRbKey("xa.enum.XAPermForType.XA_PERM_FOR_UNKNOWN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_FOR_USER");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Permission for Users");
-	vElement.setRbKey("xa.enum.XAPermForType.XA_PERM_FOR_USER");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_FOR_GROUP");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Permission for Groups");
-	vElement.setRbKey("xa.enum.XAPermForType.XA_PERM_FOR_GROUP");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// CommonEnums::XAPermType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_XAPermType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_UNKNOWN");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Unknown");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_UNKNOWN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_RESET");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Reset");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_RESET");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_READ");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Read");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_READ");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_WRITE");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("Write");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_WRITE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_CREATE");
-	vElement.setElementValue(4);
-	vElement.setElementLabel("Create");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_CREATE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_DELETE");
-	vElement.setElementValue(5);
-	vElement.setElementLabel("Delete");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_DELETE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_ADMIN");
-	vElement.setElementValue(6);
-	vElement.setElementLabel("Admin");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_ADMIN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_OBFUSCATE");
-	vElement.setElementValue(7);
-	vElement.setElementLabel("Obfuscate");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_OBFUSCATE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_MASK");
-	vElement.setElementValue(8);
-	vElement.setElementLabel("Mask");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_MASK");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_EXECUTE");
-	vElement.setElementValue(9);
-	vElement.setElementLabel("Execute");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_EXECUTE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_SELECT");
-	vElement.setElementValue(10);
-	vElement.setElementLabel("Select");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_SELECT");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_UPDATE");
-	vElement.setElementValue(11);
-	vElement.setElementLabel("Update");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_UPDATE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_DROP");
-	vElement.setElementValue(12);
-	vElement.setElementLabel("Drop");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_DROP");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_ALTER");
-	vElement.setElementValue(13);
-	vElement.setElementLabel("Alter");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_ALTER");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_INDEX");
-	vElement.setElementValue(14);
-	vElement.setElementLabel("Index");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_INDEX");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_LOCK");
-	vElement.setElementValue(15);
-	vElement.setElementLabel("Lock");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_LOCK");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_ALL");
-	vElement.setElementValue(16);
-	vElement.setElementLabel("All");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_ALL");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_ALLOW");
-	vElement.setElementValue(17);
-	vElement.setElementLabel("Allow");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_ALLOW");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_SUBMIT_TOPOLOGY");
-	vElement.setElementValue(18);
-	vElement.setElementLabel("Submit Topology");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_SUBMIT_TOPOLOGY");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_FILE_UPLOAD");
-	vElement.setElementValue(19);
-	vElement.setElementLabel("File Upload");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_FILE_UPLOAD");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_GET_NIMBUS");
-	vElement.setElementValue(20);
-	vElement.setElementLabel("Get Nimbus Conf");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_GET_NIMBUS");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_GET_CLUSTER_INFO");
-	vElement.setElementValue(21);
-	vElement.setElementLabel("Get Cluster Info");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_GET_CLUSTER_INFO");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_FILE_DOWNLOAD");
-	vElement.setElementValue(22);
-	vElement.setElementLabel("File Download");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_FILE_DOWNLOAD");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_KILL_TOPOLOGY");
-	vElement.setElementValue(23);
-	vElement.setElementLabel("Kill Topology");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_KILL_TOPOLOGY");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_REBALANCE");
-	vElement.setElementValue(24);
-	vElement.setElementLabel("Rebalance");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_REBALANCE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_ACTIVATE");
-	vElement.setElementValue(25);
-	vElement.setElementLabel("Activate");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_ACTIVATE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_DEACTIVATE");
-	vElement.setElementValue(26);
-	vElement.setElementLabel("Deactivate");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_DEACTIVATE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_GET_TOPOLOGY_CONF");
-	vElement.setElementValue(27);
-	vElement.setElementLabel("Get Topology Conf");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_GET_TOPOLOGY_CONF");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_GET_TOPOLOGY");
-	vElement.setElementValue(28);
-	vElement.setElementLabel("Get Topology");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_GET_TOPOLOGY");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_GET_USER_TOPOLOGY");
-	vElement.setElementValue(29);
-	vElement.setElementLabel("Get User Topology");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_GET_USER_TOPOLOGY");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_GET_TOPOLOGY_INFO");
-	vElement.setElementValue(30);
-	vElement.setElementLabel("Get Topology Info");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_GET_TOPOLOGY_INFO");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-	
-	vElement = new VEnumElement();
-	vElement.setElementName("XA_PERM_TYPE_UPLOAD_NEW_CREDENTIAL");
-	vElement.setElementValue(31);
-	vElement.setElementLabel("Upload New Credential");
-	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_UPLOAD_NEW_CREDENTIAL");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	
-	///////////////////////////////////
-	// CommonEnums::ClassTypes
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_CommonEnums_ClassTypes);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_NONE");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("None");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_NONE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_MESSAGE");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Message");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_MESSAGE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_USER_PROFILE");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("User Profile");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_USER_PROFILE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_AUTH_SESS");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("Authentication Session");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_AUTH_SESS");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_DATA_OBJECT");
-	vElement.setElementValue(4);
-	vElement.setElementLabel("CLASS_TYPE_DATA_OBJECT");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_DATA_OBJECT");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_NAMEVALUE");
-	vElement.setElementValue(5);
-	vElement.setElementLabel("CLASS_TYPE_NAMEVALUE");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_NAMEVALUE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_LONG");
-	vElement.setElementValue(6);
-	vElement.setElementLabel("CLASS_TYPE_LONG");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_LONG");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_PASSWORD_CHANGE");
-	vElement.setElementValue(7);
-	vElement.setElementLabel("CLASS_TYPE_PASSWORD_CHANGE");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_PASSWORD_CHANGE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_STRING");
-	vElement.setElementValue(8);
-	vElement.setElementLabel("CLASS_TYPE_STRING");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_STRING");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_ENUM");
-	vElement.setElementValue(9);
-	vElement.setElementLabel("CLASS_TYPE_ENUM");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_ENUM");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_ENUM_ELEMENT");
-	vElement.setElementValue(10);
-	vElement.setElementLabel("CLASS_TYPE_ENUM_ELEMENT");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_ENUM_ELEMENT");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_RESPONSE");
-	vElement.setElementValue(11);
-	vElement.setElementLabel("Response");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_RESPONSE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_XA_ASSET");
-	vElement.setElementValue(1000);
-	vElement.setElementLabel("Asset");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_ASSET");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_XA_RESOURCE");
-	vElement.setElementValue(1001);
-	vElement.setElementLabel("Resource");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_RESOURCE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_XA_GROUP");
-	vElement.setElementValue(1002);
-	vElement.setElementLabel("XA Group");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_GROUP");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_XA_USER");
-	vElement.setElementValue(1003);
-	vElement.setElementLabel("XA User");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_USER");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_XA_GROUP_USER");
-	vElement.setElementValue(1004);
-	vElement.setElementLabel("XA Group of Users");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_GROUP_USER");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_XA_GROUP_GROUP");
-	vElement.setElementValue(1005);
-	vElement.setElementLabel("XA Group of groups");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_GROUP_GROUP");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_XA_PERM_MAP");
-	vElement.setElementValue(1006);
-	vElement.setElementLabel("XA permissions for resource");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_PERM_MAP");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_XA_AUDIT_MAP");
-	vElement.setElementValue(1007);
-	vElement.setElementLabel("XA audits for resource");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_AUDIT_MAP");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_XA_CRED_STORE");
-	vElement.setElementValue(1008);
-	vElement.setElementLabel("XA credential store");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_CRED_STORE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_XA_POLICY_EXPORT_AUDIT");
-	vElement.setElementValue(1009);
-	vElement.setElementLabel("XA Policy Export Audit");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_POLICY_EXPORT_AUDIT");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_TRX_LOG");
-	vElement.setElementValue(1010);
-	vElement.setElementLabel("Transaction log");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_TRX_LOG");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_XA_ACCESS_AUDIT");
-	vElement.setElementValue(1011);
-	vElement.setElementLabel("Access Audit");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_ACCESS_AUDIT");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE");
-	vElement.setElementValue(1012);
-	vElement.setElementLabel("Transaction log attribute");
-	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// XXAuthSession::AuthStatus
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_XXAuthSession_AuthStatus);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("AUTH_STATUS_UNKNOWN");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Unknown");
-	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_UNKNOWN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("AUTH_STATUS_SUCCESS");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Success");
-	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_SUCCESS");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("AUTH_STATUS_WRONG_PASSWORD");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Wrong Password");
-	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_WRONG_PASSWORD");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("AUTH_STATUS_DISABLED");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("Account Disabled");
-	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_DISABLED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("AUTH_STATUS_LOCKED");
-	vElement.setElementValue(4);
-	vElement.setElementLabel("Locked");
-	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_LOCKED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("AUTH_STATUS_PASSWORD_EXPIRED");
-	vElement.setElementValue(5);
-	vElement.setElementLabel("Password Expired");
-	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_PASSWORD_EXPIRED");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("AUTH_STATUS_USER_NOT_FOUND");
-	vElement.setElementValue(6);
-	vElement.setElementLabel("User not found");
-	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_USER_NOT_FOUND");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// XXAuthSession::AuthType
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_XXAuthSession_AuthType);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("AUTH_TYPE_UNKNOWN");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Unknown");
-	vElement.setRbKey("xa.enum.AuthType.AUTH_TYPE_UNKNOWN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("AUTH_TYPE_PASSWORD");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Username/Password");
-	vElement.setRbKey("xa.enum.AuthType.AUTH_TYPE_PASSWORD");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-	///////////////////////////////////
-	// XResponse::ResponseStatus
-	///////////////////////////////////
-	vEnum = new VEnum();
-	vEnum.setEnumName(ENUM_XResponse_ResponseStatus);
-	vEnum.setElementList(new ArrayList<VEnumElement>());
-	enumList.add(vEnum);
-	enumMap.put(vEnum.getEnumName(), vEnum);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("STATUS_SUCCESS");
-	vElement.setElementValue(0);
-	vElement.setElementLabel("Success");
-	vElement.setRbKey("xa.enum.ResponseStatus.STATUS_SUCCESS");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("STATUS_ERROR");
-	vElement.setElementValue(1);
-	vElement.setElementLabel("Error");
-	vElement.setRbKey("xa.enum.ResponseStatus.STATUS_ERROR");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("STATUS_VALIDATION");
-	vElement.setElementValue(2);
-	vElement.setElementLabel("Validation Error");
-	vElement.setRbKey("xa.enum.ResponseStatus.STATUS_VALIDATION");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("STATUS_WARN");
-	vElement.setElementValue(3);
-	vElement.setElementLabel("Warning");
-	vElement.setRbKey("xa.enum.ResponseStatus.STATUS_WARN");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("STATUS_INFO");
-	vElement.setElementValue(4);
-	vElement.setElementLabel("Information");
-	vElement.setRbKey("xa.enum.ResponseStatus.STATUS_INFO");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-	vElement = new VEnumElement();
-	vElement.setElementName("STATUS_PARTIAL_SUCCESS");
-	vElement.setElementValue(5);
-	vElement.setElementLabel("Partial Success");
-	vElement.setRbKey("xa.enum.ResponseStatus.STATUS_PARTIAL_SUCCESS");
-	vElement.setEnumName(vEnum.getEnumName());
-
-	vEnum.getElementList().add(vElement);
-
-
-    }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/util/XARestUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/util/XARestUtil.java b/security-admin/src/main/java/org/apache/ranger/util/XARestUtil.java
deleted file mode 100644
index a934c5c..0000000
--- a/security-admin/src/main/java/org/apache/ranger/util/XARestUtil.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- package org.apache.ranger.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.apache.ranger.common.MessageEnums;
-import org.apache.ranger.common.RESTErrorUtil;
-import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.XAConfigUtil;
-import org.apache.ranger.entity.XXPortalUser;
-import org.apache.ranger.view.VXMessage;
-import org.apache.ranger.view.VXPortalUser;
-import org.apache.ranger.view.VXResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class XARestUtil {
-	static final Logger logger = Logger.getLogger(XARestUtil.class);
-
-	@Autowired
-	StringUtil stringUtil;
-
-	@Autowired
-	RESTErrorUtil restErrorUtil;
-
-	@Autowired
-	XAConfigUtil configUtil;
-
-	void splitUserRoleList(Collection<String> collection) {
-		Collection<String> newCollection = new ArrayList<String>();
-		for (String role : collection) {
-			String roles[] = role.split(",");
-			for (int i = 0; i < roles.length; i++) {
-				String str = roles[i];
-				newCollection.add(str);
-			}
-		}
-		collection.clear();
-		collection.addAll(newCollection);
-	}
-
-	/**
-	 * This method cleans up the data provided by the user for update
-	 * 
-	 * @param userProfile
-	 * @return
-	 */
-	public void validateVUserProfileForUpdate(XXPortalUser gjUser,
-			VXPortalUser userProfile) {
-
-		List<VXMessage> messageList = new ArrayList<VXMessage>();
-
-		// Email Update is allowed.
-		// if (userProfile.getEmailAddress() != null
-		// && !userProfile.getEmailAddress().equalsIgnoreCase(
-		// gjUser.getEmailAddress())) {
-		// throw restErrorUtil.createRESTException(
-		// "Email address can't be updated",
-		// MessageEnums.DATA_NOT_UPDATABLE, null, "emailAddress",
-		// userProfile.getEmailAddress());
-		// }
-
-		// Login Id can't be changed
-		if (userProfile.getLoginId() != null
-				&& !gjUser.getLoginId().equalsIgnoreCase(
-						userProfile.getLoginId())) {
-			throw restErrorUtil.createRESTException(
-					"Username can't be updated",
-					MessageEnums.DATA_NOT_UPDATABLE, null, "loginId",
-					userProfile.getLoginId());
-		}
-		// }
-		userProfile.setFirstName(restErrorUtil.validateStringForUpdate(
-				userProfile.getFirstName(), gjUser.getFirstName(),
-				StringUtil.VALIDATION_NAME, "Invalid first name",
-				MessageEnums.INVALID_INPUT_DATA, null, "firstName"));
-
-		userProfile.setFirstName(restErrorUtil.validateStringForUpdate(
-				userProfile.getFirstName(), gjUser.getFirstName(),
-				StringUtil.VALIDATION_NAME, "Invalid first name",
-				MessageEnums.INVALID_INPUT_DATA, null, "firstName"));
-
-		userProfile.setLastName(restErrorUtil.validateStringForUpdate(
-				userProfile.getLastName(), gjUser.getLastName(),
-				StringUtil.VALIDATION_NAME, "Invalid last name",
-				MessageEnums.INVALID_INPUT_DATA, null, "lastName"));
-
-		// firstName
-		if (!stringUtil.isValidName(userProfile.getFirstName())) {
-			logger.info("Invalid first name." + userProfile);
-			messageList.add(MessageEnums.INVALID_INPUT_DATA.getMessage(null,
-					"firstName"));
-		}
-
-		// lastName
-		if (!stringUtil.isValidName(userProfile.getLastName())) {
-			logger.info("Invalid last name." + userProfile);
-			messageList.add(MessageEnums.INVALID_INPUT_DATA.getMessage(null,
-					"lastName"));
-		}
-
-		// create the public screen name
-		userProfile.setPublicScreenName(userProfile.getFirstName() + " "
-				+ userProfile.getLastName());
-
-		userProfile.setNotes(restErrorUtil.validateStringForUpdate(
-				userProfile.getNotes(), gjUser.getNotes(),
-				StringUtil.VALIDATION_NAME, "Invalid notes",
-				MessageEnums.INVALID_INPUT_DATA, null, "notes"));
-
-		// validate user roles
-		if (userProfile.getUserRoleList() != null) {
-			// First let's normalize it
-			splitUserRoleList(userProfile.getUserRoleList());
-			for (String userRole : userProfile.getUserRoleList()) {
-				restErrorUtil.validateStringList(userRole,
-						configUtil.getRoles(), "Invalid role", null,
-						"userRoleList");
-			}
-
-		}
-		if (messageList.size() > 0) {
-			VXResponse gjResponse = new VXResponse();
-			gjResponse.setStatusCode(VXResponse.STATUS_ERROR);
-			gjResponse.setMsgDesc("Validation failure");
-			gjResponse.setMessageList(messageList);
-			logger.info("Validation Error in updateUser() userProfile="
-					+ userProfile + ", error=" + gjResponse);
-			throw restErrorUtil.createRESTException(gjResponse);
-		}
-
-	}
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java
index 1a00d29..f46bc26 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java
@@ -24,14 +24,14 @@
  * 
  */
 
-import java.util.*;
+import java.util.Date;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.DateUtil;
+import org.apache.ranger.common.RangerConstants;
 import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -53,7 +53,7 @@ public class VXAccessAudit extends VXDataObject implements java.io.Serializable
 	 * Access Result
 	 * This attribute is of type enum CommonEnums::AccessResult
 	 */
-	protected int accessResult = XAConstants.ACCESS_RESULT_DENIED;
+	protected int accessResult = RangerConstants.ACCESS_RESULT_DENIED;
 	/**
 	 * Access Type
 	 */
@@ -124,7 +124,7 @@ public class VXAccessAudit extends VXDataObject implements java.io.Serializable
 	 * Default constructor. This will set all the attributes to default value.
 	 */
 	public VXAccessAudit ( ) {
-		accessResult = XAConstants.ACCESS_RESULT_DENIED;
+		accessResult = RangerConstants.ACCESS_RESULT_DENIED;
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java
index e039416..09f5120 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java
@@ -24,11 +24,14 @@
  * 
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java b/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java
index f7ddaca..0d44f5e 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java
@@ -24,14 +24,9 @@
  *
  */
 
-import java.util.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java
index 6d7e012..46d61ac 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java
@@ -24,11 +24,14 @@
  * 
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java
index 61c3355..dc94e28 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java
@@ -24,14 +24,9 @@
  * 
  */
 
-import java.util.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java
index f7ff5da..499d8f4 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java
@@ -24,11 +24,14 @@
  * 
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java
index ccc524a..42ff4d1 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java
@@ -19,7 +19,8 @@
 
  package org.apache.ranger.view;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java
index 4c237d2..6835456 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java
@@ -24,14 +24,12 @@
  * 
  */
 
-import java.util.*;
+import java.util.Date;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java
index 963b34f..a20c07a 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java
@@ -24,11 +24,14 @@
  * 
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java b/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java
index 2ed03cb..9a9aac2 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java
@@ -24,14 +24,9 @@
  
  */
 
-import java.util.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java b/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java
index fef0fa0..fe992a7 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java
@@ -24,11 +24,14 @@
 
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java b/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java
index 34c508a..476b054 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java
@@ -24,14 +24,13 @@
  * 
  */
 
-import java.util.*;
+import java.util.Date;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.view.ViewBaseBean;
 import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

[07/12] incubator-ranger git commit: RANGER-194: Rename classes under web-admin project

Posted by ma...@apache.org.

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java
new file mode 100644
index 0000000..61bcca5
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java
@@ -0,0 +1,213 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ package org.apache.ranger.db;
+
+/**
+ * 
+ */
+
+import javax.persistence.EntityManager;
+
+import org.apache.log4j.Logger;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.RESTErrorUtil;
+import org.apache.ranger.common.db.BaseDao;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+public abstract class RangerDaoManagerBase {
+	final static Logger logger = Logger.getLogger(RangerDaoManagerBase.class);
+
+	@Autowired
+	protected RESTErrorUtil restErrorUtil;
+	abstract public EntityManager getEntityManager();
+
+	public RangerDaoManagerBase() {
+	}
+
+	public BaseDao<?> getDaoForClassType(int classType) {
+		if (classType == AppConstants.CLASS_TYPE_AUTH_SESS) {
+			return getXXAuthSession();
+		}
+		if (classType == AppConstants.CLASS_TYPE_USER_PROFILE) {
+			return getXXPortalUser();
+		}
+		if (classType == AppConstants.CLASS_TYPE_XA_ASSET) {
+			return getXXAsset();
+		}
+		if (classType == AppConstants.CLASS_TYPE_XA_RESOURCE) {
+			return getXXResource();
+		}
+		if (classType == AppConstants.CLASS_TYPE_XA_CRED_STORE) {
+			return getXXCredentialStore();
+		}
+		if (classType == AppConstants.CLASS_TYPE_XA_GROUP) {
+			return getXXGroup();
+		}
+		if (classType == AppConstants.CLASS_TYPE_XA_USER) {
+			return getXXUser();
+		}
+		if (classType == AppConstants.CLASS_TYPE_XA_GROUP_USER) {
+			return getXXGroupUser();
+		}
+		if (classType == AppConstants.CLASS_TYPE_XA_GROUP_GROUP) {
+			return getXXGroupGroup();
+		}
+		if (classType == AppConstants.CLASS_TYPE_XA_PERM_MAP) {
+			return getXXPermMap();
+		}
+		if (classType == AppConstants.CLASS_TYPE_XA_AUDIT_MAP) {
+			return getXXAuditMap();
+		}
+		if (classType == AppConstants.CLASS_TYPE_XA_POLICY_EXPORT_AUDIT) {
+			return getXXPolicyExportAudit();
+		}
+		if (classType == AppConstants.CLASS_TYPE_TRX_LOG) {
+			return getXXTrxLog();
+		}
+		if (classType == AppConstants.CLASS_TYPE_XA_ACCESS_AUDIT) {
+			return getXXAccessAudit();
+		}
+
+		logger.error("No DaoManager found for classType=" + classType, new Throwable());
+		return null;
+	}
+
+	public BaseDao<?> getDaoForClassName(String className) {
+		if (className.equals("XXDBBase")) {
+			return getXXDBBase();
+		}
+		if (className.equals("XXAuthSession")) {
+			return getXXAuthSession();
+		}
+		if (className.equals("XXPortalUser")) {
+			return getXXPortalUser();
+		}
+		if (className.equals("XXPortalUserRole")) {
+			return getXXPortalUserRole();
+		}
+		if (className.equals("XXAsset")) {
+			return getXXAsset();
+		}
+		if (className.equals("XXResource")) {
+			return getXXResource();
+		}
+		if (className.equals("XXCredentialStore")) {
+			return getXXCredentialStore();
+		}
+		if (className.equals("XXGroup")) {
+			return getXXGroup();
+		}
+		if (className.equals("XXUser")) {
+			return getXXUser();
+		}
+		if (className.equals("XXGroupUser")) {
+			return getXXGroupUser();
+		}
+		if (className.equals("XXGroupGroup")) {
+			return getXXGroupGroup();
+		}
+		if (className.equals("XXPermMap")) {
+			return getXXPermMap();
+		}
+		if (className.equals("XXAuditMap")) {
+			return getXXAuditMap();
+		}
+		if (className.equals("XXPolicyExportAudit")) {
+			return getXXPolicyExportAudit();
+		}
+		if (className.equals("XXTrxLog")) {
+			return getXXTrxLog();
+		}
+		if (className.equals("XXAccessAudit")) {
+			return getXXAccessAudit();
+		}
+
+		logger.error("No DaoManager found for className=" + className, new Throwable());
+		return null;
+	}
+
+	public XXDBBaseDao getXXDBBase() {
+		return new XXDBBaseDao(this);
+	}
+
+	public XXAuthSessionDao getXXAuthSession() {
+		return new XXAuthSessionDao(this);
+	}
+
+	public XXPortalUserDao getXXPortalUser() {
+		return new XXPortalUserDao(this);
+	}
+
+	public XXPortalUserRoleDao getXXPortalUserRole() {
+		return new XXPortalUserRoleDao(this);
+	}
+
+	public XXAssetDao getXXAsset() {
+		return new XXAssetDao(this);
+	}
+
+	public XXResourceDao getXXResource() {
+		return new XXResourceDao(this);
+	}
+
+	public XXCredentialStoreDao getXXCredentialStore() {
+		return new XXCredentialStoreDao(this);
+	}
+
+	public XXGroupDao getXXGroup() {
+		return new XXGroupDao(this);
+	}
+
+	public XXUserDao getXXUser() {
+		return new XXUserDao(this);
+	}
+
+	public XXGroupUserDao getXXGroupUser() {
+		return new XXGroupUserDao(this);
+	}
+
+	public XXGroupGroupDao getXXGroupGroup() {
+		return new XXGroupGroupDao(this);
+	}
+
+	public XXPermMapDao getXXPermMap() {
+		return new XXPermMapDao(this);
+	}
+
+	public XXAuditMapDao getXXAuditMap() {
+		return new XXAuditMapDao(this);
+	}
+
+	public XXPolicyExportAuditDao getXXPolicyExportAudit() {
+		return new XXPolicyExportAuditDao(this);
+	}
+
+	public XXTrxLogDao getXXTrxLog() {
+		return new XXTrxLogDao(this);
+	}
+
+	public XXAccessAuditDao getXXAccessAudit() {
+		return new XXAccessAuditDao(this);
+	}
+
+
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XADaoManager.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XADaoManager.java b/security-admin/src/main/java/org/apache/ranger/db/XADaoManager.java
deleted file mode 100644
index 64f2148..0000000
--- a/security-admin/src/main/java/org/apache/ranger/db/XADaoManager.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- package org.apache.ranger.db;
-
-
-
-import javax.persistence.*;
-
-import org.apache.log4j.Logger;
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.db.BaseDao;
-import org.springframework.stereotype.Component;
-import org.springframework.beans.factory.annotation.Autowired;
-
-@Component
-public class XADaoManager extends XADaoManagerBase {
-	final static Logger logger = Logger.getLogger(XADaoManager.class);
-
-	@PersistenceContext(unitName = "defaultPU")
-	private EntityManager em;
-
-	@PersistenceContext(unitName = "loggingPU")
-	private EntityManager loggingEM;
-
-	@Autowired
-	StringUtil stringUtil;
-
-	@Override
-	public EntityManager getEntityManager() {
-		return em;
-	}
-
-	public EntityManager getEntityManager(String persistenceContextUnit) {
-		logger.error("XADaoManager.getEntityManager(" + persistenceContextUnit + ")");
-		if (persistenceContextUnit.equalsIgnoreCase("loggingPU")) {
-			return loggingEM;
-		}
-		return getEntityManager();
-	}
-
-	
-	/**
-	 * @return the stringUtil
-	 */
-	public StringUtil getStringUtil() {
-		return stringUtil;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 */
-	@Override
-	public BaseDao<?> getDaoForClassType(int classType) {
-		if (classType == XAConstants.CLASS_TYPE_NONE) {
-			return null;
-		}
-		return super.getDaoForClassType(classType);
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XADaoManagerBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XADaoManagerBase.java b/security-admin/src/main/java/org/apache/ranger/db/XADaoManagerBase.java
deleted file mode 100644
index e908447..0000000
--- a/security-admin/src/main/java/org/apache/ranger/db/XADaoManagerBase.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- package org.apache.ranger.db;
-
-/**
- * 
- */
-
-import javax.persistence.*;
-
-import java.util.*;
-
-import org.apache.log4j.Logger;
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.db.*;
-import org.apache.ranger.entity.*;
-import org.springframework.stereotype.Component;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-public abstract class XADaoManagerBase {
-	final static Logger logger = Logger.getLogger(XADaoManagerBase.class);
-
-	@Autowired
-	protected RESTErrorUtil restErrorUtil;
-	abstract public EntityManager getEntityManager();
-
-	public XADaoManagerBase() {
-	}
-
-	public BaseDao<?> getDaoForClassType(int classType) {
-		if (classType == AppConstants.CLASS_TYPE_AUTH_SESS) {
-			return getXXAuthSession();
-		}
-		if (classType == AppConstants.CLASS_TYPE_USER_PROFILE) {
-			return getXXPortalUser();
-		}
-		if (classType == AppConstants.CLASS_TYPE_XA_ASSET) {
-			return getXXAsset();
-		}
-		if (classType == AppConstants.CLASS_TYPE_XA_RESOURCE) {
-			return getXXResource();
-		}
-		if (classType == AppConstants.CLASS_TYPE_XA_CRED_STORE) {
-			return getXXCredentialStore();
-		}
-		if (classType == AppConstants.CLASS_TYPE_XA_GROUP) {
-			return getXXGroup();
-		}
-		if (classType == AppConstants.CLASS_TYPE_XA_USER) {
-			return getXXUser();
-		}
-		if (classType == AppConstants.CLASS_TYPE_XA_GROUP_USER) {
-			return getXXGroupUser();
-		}
-		if (classType == AppConstants.CLASS_TYPE_XA_GROUP_GROUP) {
-			return getXXGroupGroup();
-		}
-		if (classType == AppConstants.CLASS_TYPE_XA_PERM_MAP) {
-			return getXXPermMap();
-		}
-		if (classType == AppConstants.CLASS_TYPE_XA_AUDIT_MAP) {
-			return getXXAuditMap();
-		}
-		if (classType == AppConstants.CLASS_TYPE_XA_POLICY_EXPORT_AUDIT) {
-			return getXXPolicyExportAudit();
-		}
-		if (classType == AppConstants.CLASS_TYPE_TRX_LOG) {
-			return getXXTrxLog();
-		}
-		if (classType == AppConstants.CLASS_TYPE_XA_ACCESS_AUDIT) {
-			return getXXAccessAudit();
-		}
-
-		logger.error("No DaoManager found for classType=" + classType, new Throwable());
-		return null;
-	}
-
-	public BaseDao<?> getDaoForClassName(String className) {
-		if (className.equals("XXDBBase")) {
-			return getXXDBBase();
-		}
-		if (className.equals("XXAuthSession")) {
-			return getXXAuthSession();
-		}
-		if (className.equals("XXPortalUser")) {
-			return getXXPortalUser();
-		}
-		if (className.equals("XXPortalUserRole")) {
-			return getXXPortalUserRole();
-		}
-		if (className.equals("XXAsset")) {
-			return getXXAsset();
-		}
-		if (className.equals("XXResource")) {
-			return getXXResource();
-		}
-		if (className.equals("XXCredentialStore")) {
-			return getXXCredentialStore();
-		}
-		if (className.equals("XXGroup")) {
-			return getXXGroup();
-		}
-		if (className.equals("XXUser")) {
-			return getXXUser();
-		}
-		if (className.equals("XXGroupUser")) {
-			return getXXGroupUser();
-		}
-		if (className.equals("XXGroupGroup")) {
-			return getXXGroupGroup();
-		}
-		if (className.equals("XXPermMap")) {
-			return getXXPermMap();
-		}
-		if (className.equals("XXAuditMap")) {
-			return getXXAuditMap();
-		}
-		if (className.equals("XXPolicyExportAudit")) {
-			return getXXPolicyExportAudit();
-		}
-		if (className.equals("XXTrxLog")) {
-			return getXXTrxLog();
-		}
-		if (className.equals("XXAccessAudit")) {
-			return getXXAccessAudit();
-		}
-
-		logger.error("No DaoManager found for className=" + className, new Throwable());
-		return null;
-	}
-
-	public XXDBBaseDao getXXDBBase() {
-		return new XXDBBaseDao(this);
-	}
-
-	public XXAuthSessionDao getXXAuthSession() {
-		return new XXAuthSessionDao(this);
-	}
-
-	public XXPortalUserDao getXXPortalUser() {
-		return new XXPortalUserDao(this);
-	}
-
-	public XXPortalUserRoleDao getXXPortalUserRole() {
-		return new XXPortalUserRoleDao(this);
-	}
-
-	public XXAssetDao getXXAsset() {
-		return new XXAssetDao(this);
-	}
-
-	public XXResourceDao getXXResource() {
-		return new XXResourceDao(this);
-	}
-
-	public XXCredentialStoreDao getXXCredentialStore() {
-		return new XXCredentialStoreDao(this);
-	}
-
-	public XXGroupDao getXXGroup() {
-		return new XXGroupDao(this);
-	}
-
-	public XXUserDao getXXUser() {
-		return new XXUserDao(this);
-	}
-
-	public XXGroupUserDao getXXGroupUser() {
-		return new XXGroupUserDao(this);
-	}
-
-	public XXGroupGroupDao getXXGroupGroup() {
-		return new XXGroupGroupDao(this);
-	}
-
-	public XXPermMapDao getXXPermMap() {
-		return new XXPermMapDao(this);
-	}
-
-	public XXAuditMapDao getXXAuditMap() {
-		return new XXAuditMapDao(this);
-	}
-
-	public XXPolicyExportAuditDao getXXPolicyExportAudit() {
-		return new XXPolicyExportAuditDao(this);
-	}
-
-	public XXTrxLogDao getXXTrxLog() {
-		return new XXTrxLogDao(this);
-	}
-
-	public XXAccessAuditDao getXXAccessAudit() {
-		return new XXAccessAuditDao(this);
-	}
-
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java
index 614cea9..cd1add6 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java
@@ -19,13 +19,12 @@
 
  package org.apache.ranger.db;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.db.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.db.BaseDao;
+import org.apache.ranger.entity.XXAccessAudit;
 
 public class XXAccessAuditDao extends BaseDao<XXAccessAudit> {
 
-    public XXAccessAuditDao( XADaoManagerBase daoManager ) {
+    public XXAccessAuditDao( RangerDaoManagerBase daoManager ) {
 		super(daoManager, "loggingPU");
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java
index 08a1d2a..7aea48c 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java
@@ -22,14 +22,14 @@
 import javax.persistence.NoResultException;
 
 import org.apache.log4j.Logger;
-import org.apache.ranger.common.XACommonEnums;
-import org.apache.ranger.common.db.*;
+import org.apache.ranger.common.RangerCommonEnums;
+import org.apache.ranger.common.db.BaseDao;
 import org.apache.ranger.entity.XXAsset;
 
 public class XXAssetDao extends BaseDao<XXAsset> {
 	static final Logger logger = Logger.getLogger(XXAssetDao.class);
 
-    public XXAssetDao( XADaoManagerBase  daoManager ) {
+    public XXAssetDao( RangerDaoManagerBase  daoManager ) {
 		super(daoManager);
     }
     
@@ -42,7 +42,7 @@ public class XXAssetDao extends BaseDao<XXAsset> {
 			return getEntityManager()
 					.createNamedQuery("XXAsset.findByAssetName", XXAsset.class)
 					.setParameter("name", name.trim())
-					.setParameter("status",XACommonEnums.STATUS_DELETED)
+					.setParameter("status",RangerCommonEnums.STATUS_DELETED)
 					.getSingleResult();
 		} catch (NoResultException e) {
 			// ignore

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java
index 2b1a95f..481e486 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java
@@ -25,14 +25,13 @@ import java.util.List;
 import javax.persistence.NoResultException;
 
 import org.apache.log4j.Logger;
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.db.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.db.BaseDao;
+import org.apache.ranger.entity.XXAuditMap;
 
 public class XXAuditMapDao extends BaseDao<XXAuditMap> {
 	static final Logger logger = Logger.getLogger(XXAssetDao.class);
 
-    public XXAuditMapDao( XADaoManagerBase daoManager ) {
+    public XXAuditMapDao( RangerDaoManagerBase daoManager ) {
 		super(daoManager);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
index 4e592f4..4c9bdc5 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
@@ -28,7 +28,7 @@ import org.apache.ranger.entity.XXAuthSession;
 
 public class XXAuthSessionDao extends BaseDao<XXAuthSession> {
 
-    public XXAuthSessionDao( XADaoManagerBase daoManager ) {
+    public XXAuthSessionDao( RangerDaoManagerBase daoManager ) {
 		super(daoManager);
     }
     

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java
index 1ed278e..d95bfb4 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java
@@ -19,13 +19,12 @@
 
  package org.apache.ranger.db;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.db.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.db.BaseDao;
+import org.apache.ranger.entity.XXCredentialStore;
 
 public class XXCredentialStoreDao extends BaseDao<XXCredentialStore> {
 
-    public XXCredentialStoreDao( XADaoManagerBase daoManager ) {
+    public XXCredentialStoreDao( RangerDaoManagerBase daoManager ) {
 		super(daoManager);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java
index 3913f3d..d20fbff 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java
@@ -20,11 +20,11 @@
  package org.apache.ranger.db;
 
 import org.apache.ranger.common.db.BaseDao;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.entity.XXDBBase;
 
 public class XXDBBaseDao extends BaseDao<XXDBBase> {
 
-    public XXDBBaseDao( XADaoManagerBase daoManager ) {
+    public XXDBBaseDao( RangerDaoManagerBase daoManager ) {
 		super(daoManager);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java
index e0b7735..4736305 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java
@@ -23,16 +23,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-
-
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.db.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.db.BaseDao;
+import org.apache.ranger.entity.XXGroup;
 
 public class XXGroupDao extends BaseDao<XXGroup> {
 
-	public XXGroupDao(XADaoManagerBase daoManager) {
+	public XXGroupDao(RangerDaoManagerBase daoManager) {
 		super(daoManager);
 	}
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java
index 5b831a2..df2796c 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java
@@ -19,13 +19,12 @@
 
  package org.apache.ranger.db;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.db.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.db.BaseDao;
+import org.apache.ranger.entity.XXGroupGroup;
 
 public class XXGroupGroupDao extends BaseDao<XXGroupGroup> {
 
-    public XXGroupGroupDao( XADaoManagerBase daoManager ) {
+    public XXGroupGroupDao( RangerDaoManagerBase daoManager ) {
 		super(daoManager);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java
index 8b27c7f..9f5abfb 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java
@@ -26,14 +26,13 @@ import java.util.List;
 import javax.persistence.NoResultException;
 
 import org.apache.log4j.Logger;
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.db.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.db.BaseDao;
+import org.apache.ranger.entity.XXGroupUser;
 
 public class XXGroupUserDao extends BaseDao<XXGroupUser> {
 	static final Logger logger = Logger.getLogger(XXGroupUserDao.class);
 
-	public XXGroupUserDao(XADaoManagerBase daoManager) {
+	public XXGroupUserDao(RangerDaoManagerBase daoManager) {
 		super(daoManager);
 	}
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java
index 659b9be..23c5c48 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java
@@ -25,14 +25,13 @@ import java.util.List;
 import javax.persistence.NoResultException;
 
 import org.apache.log4j.Logger;
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.db.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.db.BaseDao;
+import org.apache.ranger.entity.XXPermMap;
 
 public class XXPermMapDao extends BaseDao<XXPermMap> {
 	static final Logger logger = Logger.getLogger(XXResourceDao.class);
 
-    public XXPermMapDao( XADaoManagerBase daoManager ) {
+    public XXPermMapDao( RangerDaoManagerBase daoManager ) {
 		super(daoManager);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java
index 9ac89b7..5f917cc 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java
@@ -19,13 +19,12 @@
 
  package org.apache.ranger.db;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.db.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.db.BaseDao;
+import org.apache.ranger.entity.XXPolicyExportAudit;
 
 public class XXPolicyExportAuditDao extends BaseDao<XXPolicyExportAudit> {
 
-    public XXPolicyExportAuditDao( XADaoManagerBase daoManager ) {
+    public XXPolicyExportAuditDao( RangerDaoManagerBase daoManager ) {
 		super(daoManager);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java
index ac11431..9069f29 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java
@@ -22,12 +22,12 @@
 
 import java.util.List;
 
-import org.apache.ranger.common.db.*;
+import org.apache.ranger.common.db.BaseDao;
 import org.apache.ranger.entity.XXPortalUser;
 
 public class XXPortalUserDao extends BaseDao<XXPortalUser> {
 
-	public XXPortalUserDao(XADaoManagerBase daoManager) {
+	public XXPortalUserDao(RangerDaoManagerBase daoManager) {
 		super(daoManager);
 	}
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java
index cf41d59..99d0fe2 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java
@@ -25,12 +25,12 @@ import java.util.List;
 
 import javax.persistence.NoResultException;
 
-import org.apache.ranger.common.db.*;
+import org.apache.ranger.common.db.BaseDao;
 import org.apache.ranger.entity.XXPortalUserRole;
 
 public class XXPortalUserRoleDao extends BaseDao<XXPortalUserRole> {
 
-	public XXPortalUserRoleDao(XADaoManagerBase daoManager) {
+	public XXPortalUserRoleDao(RangerDaoManagerBase daoManager) {
 		super(daoManager);
 	}
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java
index 0aa3f75..020a76c 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java
@@ -20,21 +20,21 @@
  package org.apache.ranger.db;
 
 
-import java.util.Date;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import javax.persistence.NoResultException;
 
 import org.apache.log4j.Logger;
-import org.apache.ranger.common.db.*;
+import org.apache.ranger.common.db.BaseDao;
 import org.apache.ranger.entity.XXResource;
 
 public class XXResourceDao extends BaseDao<XXResource> {
 	static final Logger logger = Logger.getLogger(XXResourceDao.class);
 
-	public XXResourceDao(XADaoManagerBase daoManager) {
+	public XXResourceDao(RangerDaoManagerBase daoManager) {
 		super(daoManager);
 	}
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java
index e5729fa..df73d72 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java
@@ -25,13 +25,13 @@ import java.util.List;
 import javax.persistence.NoResultException;
 
 import org.apache.log4j.Logger;
-import org.apache.ranger.common.db.*;
+import org.apache.ranger.common.db.BaseDao;
 import org.apache.ranger.entity.XXTrxLog;
 
 public class XXTrxLogDao extends BaseDao<XXTrxLog> {
 	private static Logger logger = Logger.getLogger(XXTrxLogDao.class);
 	
-    public XXTrxLogDao( XADaoManagerBase daoManager ) {
+    public XXTrxLogDao( RangerDaoManagerBase daoManager ) {
 		super(daoManager);
     }
     

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java
index 4d2cec4..fb5af98 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java
@@ -23,13 +23,13 @@
 import javax.persistence.NoResultException;
 
 import org.apache.log4j.Logger;
-import org.apache.ranger.common.db.*;
+import org.apache.ranger.common.db.BaseDao;
 import org.apache.ranger.entity.XXUser;
 
 public class XXUserDao extends BaseDao<XXUser> {
 	static final Logger logger = Logger.getLogger(XXResourceDao.class);
 
-	public XXUserDao(XADaoManagerBase daoManager) {
+	public XXUserDao(RangerDaoManagerBase daoManager) {
 		super(daoManager);
 	}
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
index 1e8f6e7..5696080 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
@@ -24,13 +24,22 @@
  * 
  */
 
-import java.util.*;
+import java.util.Date;
 
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.DateUtil;
+import org.apache.ranger.common.RangerConstants;
 
 
 @Entity
@@ -71,7 +80,7 @@ public class XXAccessAudit extends XXDBBase implements java.io.Serializable {
 	 *
 	 */
 	@Column(name="ACCESS_RESULT"   )
-	protected int accessResult = XAConstants.ACCESS_RESULT_DENIED;
+	protected int accessResult = RangerConstants.ACCESS_RESULT_DENIED;
 
 	/**
 	 * Access Type
@@ -236,7 +245,7 @@ public class XXAccessAudit extends XXDBBase implements java.io.Serializable {
 	 */
 	public XXAccessAudit ( ) {
 		auditType = AppConstants.ASSET_UNKNOWN;
-		accessResult = XAConstants.ACCESS_RESULT_DENIED;
+		accessResult = RangerConstants.ACCESS_RESULT_DENIED;
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
index f203cf6..3a40f01 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
@@ -24,13 +24,17 @@
  * 
  */
 
-import java.util.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.RangerConstants;
 
 
 @Entity
@@ -81,7 +85,7 @@ public class XXAsset extends XXDBBase implements java.io.Serializable {
 	 *
 	 */
 	@Column(name="ACT_STATUS"  , nullable=false )
-	protected int activeStatus = XAConstants.STATUS_DISABLED;
+	protected int activeStatus = RangerConstants.STATUS_DISABLED;
 
 	/**
 	 * Type of asset
@@ -116,7 +120,7 @@ public class XXAsset extends XXDBBase implements java.io.Serializable {
 	 * Default constructor. This will set all the attributes to default value.
 	 */
 	public XXAsset ( ) {
-		activeStatus = XAConstants.STATUS_DISABLED;
+		activeStatus = RangerConstants.STATUS_DISABLED;
 		assetType = AppConstants.ASSET_UNKNOWN;
 	}
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
index dd14898..719d472 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
@@ -24,13 +24,16 @@
  * 
  */
 
-import java.util.*;
-
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.ranger.common.AppConstants;
 
 
 @Entity

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
index d54ce72..f5c44ad 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
@@ -24,13 +24,22 @@
  * 
  */
 
-import java.util.*;
+import java.util.Date;
 
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.DateUtil;
+import org.apache.ranger.common.RangerConstants;
 
 
 @Entity
@@ -187,7 +196,7 @@ public class XXAuthSession extends XXDBBase implements java.io.Serializable {
 	 *
 	 */
 	@Column(name="DEVICE_TYPE"  , nullable=false )
-	protected int deviceType = XAConstants.DEVICE_UNKNOWN;
+	protected int deviceType = RangerConstants.DEVICE_UNKNOWN;
 
 	/**
 	 * IP where the request came from
@@ -216,7 +225,7 @@ public class XXAuthSession extends XXDBBase implements java.io.Serializable {
 		authStatus = AUTH_STATUS_UNKNOWN;
 		authType = AUTH_TYPE_UNKNOWN;
 		authProvider = AUTH_TYPE_UNKNOWN;
-		deviceType = XAConstants.DEVICE_UNKNOWN;
+		deviceType = RangerConstants.DEVICE_UNKNOWN;
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java b/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
index b300071..1b06d6e 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
@@ -24,13 +24,16 @@
  * 
  */
 
-import java.util.*;
-
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.ranger.common.AppConstants;
 
 
 @Entity

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
index 666f0f5..c5e7c9c 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
@@ -24,13 +24,17 @@
  * 
  */
 
-import java.util.*;
+import java.util.Date;
 
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
+import javax.persistence.Column;
+import javax.persistence.EntityListeners;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.DateUtil;
 
 
 @MappedSuperclass @EntityListeners( org.apache.ranger.common.db.JPABeanCallbacks.class)

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
index 1e25eb6..4224cc4 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
@@ -24,13 +24,18 @@
  * 
  */
 
-import java.util.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.RangerCommonEnums;
+import org.apache.ranger.common.RangerConstants;
 
 
 @Entity
@@ -80,7 +85,7 @@ public class XXGroup extends XXDBBase implements java.io.Serializable {
 	 *
 	 */
 	@Column(name="STATUS"  , nullable=false )
-	protected int status = XAConstants.STATUS_DISABLED;
+	protected int status = RangerConstants.STATUS_DISABLED;
 
 	/**
 	 * Type of group
@@ -93,7 +98,7 @@ public class XXGroup extends XXDBBase implements java.io.Serializable {
 	protected int groupType = AppConstants.XA_GROUP_UNKNOWN;
 	
 	@Column(name="GROUP_SRC"  , nullable=false )
-	protected int groupSource = XACommonEnums.GROUP_INTERNAL;
+	protected int groupSource = RangerCommonEnums.GROUP_INTERNAL;
 
 	/**
 	 * Id of the credential store
@@ -109,9 +114,9 @@ public class XXGroup extends XXDBBase implements java.io.Serializable {
 	 * Default constructor. This will set all the attributes to default value.
 	 */
 	public XXGroup ( ) {
-		status = XAConstants.STATUS_DISABLED;
+		status = RangerConstants.STATUS_DISABLED;
 		groupType = AppConstants.XA_GROUP_UNKNOWN;
-		groupSource = XACommonEnums.GROUP_INTERNAL;
+		groupSource = RangerCommonEnums.GROUP_INTERNAL;
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java
index d7997cb..f4e501b 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java
@@ -24,13 +24,16 @@
  * 
  */
 
-import java.util.*;
-
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.ranger.common.AppConstants;
 
 
 @Entity

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java
index 0c05f15..fef7caa 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java
@@ -24,13 +24,16 @@
  * 
  */
 
-import java.util.*;
-
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.ranger.common.AppConstants;
 
 
 @Entity

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java
index ecf22f7..d229f8c 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java
@@ -24,13 +24,17 @@
  * 
  */
 
-import java.util.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.RangerConstants;
 
 
 @Entity
@@ -123,7 +127,7 @@ public class XXPermMap extends XXDBBase implements java.io.Serializable {
 	 *
 	 */
 	@Column(name="IS_RECURSIVE"  , nullable=false )
-	protected int isRecursive = XAConstants.BOOL_NONE;
+	protected int isRecursive = RangerConstants.BOOL_NONE;
 
 	/**
 	 * Is wild card
@@ -158,7 +162,7 @@ public class XXPermMap extends XXDBBase implements java.io.Serializable {
 	public XXPermMap ( ) {
 		permFor = AppConstants.XA_PERM_FOR_UNKNOWN;
 		permType = AppConstants.XA_PERM_TYPE_UNKNOWN;
-		isRecursive = XAConstants.BOOL_NONE;
+		isRecursive = RangerConstants.BOOL_NONE;
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java
index fe0e542..6743b6a 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java
@@ -24,13 +24,20 @@
  *
  */
 
-import java.util.*;
-
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.ranger.common.AppConstants;
 
 
 @Entity

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java
index 2a2b938..71458d8 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java
@@ -24,13 +24,17 @@
  * 
  */
 
-import java.util.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.RangerConstants;
 
 
 @Entity
@@ -121,7 +125,7 @@ public class XXPortalUser extends XXDBBase implements java.io.Serializable {
 	 *
 	 */
 	@Column(name="STATUS"  , nullable=false )
-	protected int status = XAConstants.ACT_STATUS_DISABLED;
+	protected int status = RangerConstants.ACT_STATUS_DISABLED;
 
 	/**
 	 * Source of the user
@@ -131,7 +135,7 @@ public class XXPortalUser extends XXDBBase implements java.io.Serializable {
 	 *
 	 */
 	@Column(name="USER_SRC"  , nullable=false )
-	protected int userSource = XAConstants.USER_APP;
+	protected int userSource = RangerConstants.USER_APP;
 
 	/**
 	 * Note
@@ -147,8 +151,8 @@ public class XXPortalUser extends XXDBBase implements java.io.Serializable {
 	 * Default constructor. This will set all the attributes to default value.
 	 */
 	public XXPortalUser ( ) {
-		status = XAConstants.ACT_STATUS_DISABLED;
-		userSource = XAConstants.USER_APP;
+		status = RangerConstants.ACT_STATUS_DISABLED;
+		userSource = RangerConstants.USER_APP;
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java
index b2e4d67..d0fb38d 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java
@@ -24,13 +24,16 @@
  * 
  */
 
-import java.util.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.RangerConstants;
 
 
 @Entity
@@ -81,13 +84,13 @@ public class XXPortalUserRole extends XXDBBase implements java.io.Serializable {
 	 *
 	 */
 	@Column(name="STATUS"  , nullable=false )
-	protected int status = XAConstants.STATUS_DISABLED;
+	protected int status = RangerConstants.STATUS_DISABLED;
 
 	/**
 	 * Default constructor. This will set all the attributes to default value.
 	 */
 	public XXPortalUserRole ( ) {
-		status = XAConstants.STATUS_DISABLED;
+		status = RangerConstants.STATUS_DISABLED;
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java b/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java
index 0247ee7..c19f4df 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java
@@ -24,13 +24,17 @@
  * 
  */
 
-import java.util.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.RangerConstants;
 
 
 @Entity
@@ -123,7 +127,7 @@ public class XXResource extends XXDBBase implements java.io.Serializable {
 	 *
 	 */
 	@Column(name="IS_ENCRYPT"  , nullable=false )
-	protected int isEncrypt = XAConstants.BOOL_FALSE;
+	protected int isEncrypt = RangerConstants.BOOL_FALSE;
 
 	/**
 	 * Is recursive
@@ -133,7 +137,7 @@ public class XXResource extends XXDBBase implements java.io.Serializable {
 	 *
 	 */
 	@Column(name="IS_RECURSIVE"  , nullable=false )
-	protected int isRecursive = XAConstants.BOOL_NONE;
+	protected int isRecursive = RangerConstants.BOOL_NONE;
 
 	/**
 	 * Group to which this resource belongs to
@@ -203,7 +207,7 @@ public class XXResource extends XXDBBase implements java.io.Serializable {
 	 *
 	 */
 	@Column(name="RES_STATUS"  , nullable=false )
-	protected int resourceStatus = XAConstants.STATUS_ENABLED;
+	protected int resourceStatus = RangerConstants.STATUS_ENABLED;
 
 	/**
 	 * Table Type
@@ -248,9 +252,9 @@ public class XXResource extends XXDBBase implements java.io.Serializable {
 	 */
 	public XXResource ( ) {
 		resourceType = AppConstants.RESOURCE_PATH;
-		isEncrypt = XAConstants.BOOL_FALSE;
-		isRecursive = XAConstants.BOOL_NONE;
-		resourceStatus = XAConstants.STATUS_ENABLED;
+		isEncrypt = RangerConstants.BOOL_FALSE;
+		isRecursive = RangerConstants.BOOL_NONE;
+		resourceStatus = RangerConstants.STATUS_ENABLED;
 		tableType = AppConstants.POLICY_INCLUSION;
 		columnType = AppConstants.POLICY_INCLUSION;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java
index 731cf6a..117ab54 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java
@@ -24,13 +24,17 @@
  * 
  */
 
-import java.util.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.RangerConstants;
 
 
 @Entity
@@ -60,7 +64,7 @@ public class XXTrxLog extends XXDBBase implements java.io.Serializable {
 	 *
 	 */
 	@Column(name="CLASS_TYPE"  , nullable=false )
-	protected int objectClassType = XAConstants.CLASS_TYPE_NONE;
+	protected int objectClassType = RangerConstants.CLASS_TYPE_NONE;
 
 	/**
 	 * Id of the object to which this notes refers to
@@ -191,7 +195,7 @@ public class XXTrxLog extends XXDBBase implements java.io.Serializable {
 	 * Default constructor. This will set all the attributes to default value.
 	 */
 	public XXTrxLog ( ) {
-		objectClassType = XAConstants.CLASS_TYPE_NONE;
+		objectClassType = RangerConstants.CLASS_TYPE_NONE;
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java b/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
index 91bad2e..af339d2 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
@@ -24,13 +24,17 @@
  * 
  */
 
-import java.util.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.RangerConstants;
 
 
 @Entity
@@ -81,7 +85,7 @@ public class XXUser extends XXDBBase implements java.io.Serializable {
 	 *
 	 */
 	@Column(name="STATUS"  , nullable=false )
-	protected int status = XAConstants.STATUS_DISABLED;
+	protected int status = RangerConstants.STATUS_DISABLED;
 
 	/**
 	 * Id of the credential store
@@ -97,7 +101,7 @@ public class XXUser extends XXDBBase implements java.io.Serializable {
 	 * Default constructor. This will set all the attributes to default value.
 	 */
 	public XXUser ( ) {
-		status = XAConstants.STATUS_DISABLED;
+		status = RangerConstants.STATUS_DISABLED;
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java b/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java
index 37cc62d..c38efad 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java
@@ -22,11 +22,19 @@
 
 import java.util.Date;
 
-import javax.persistence.*;
-import javax.xml.bind.annotation.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.ranger.common.DateUtil;
-import org.apache.ranger.common.XAConstants;
+import org.apache.ranger.common.RangerConstants;
 
 @Entity
 @Table(name="vx_trx_log")
@@ -58,7 +66,7 @@ public class VXXTrxLog implements java.io.Serializable {
 	protected Long updatedByUserId;
 
 	@Column(name="CLASS_TYPE"  , nullable=false )
-	protected int objectClassType = XAConstants.CLASS_TYPE_NONE;
+	protected int objectClassType = RangerConstants.CLASS_TYPE_NONE;
 
 	@Column(name="OBJECT_ID"   )
 	protected Long objectId;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java b/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java
index f18cff9..61b46af 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java
@@ -23,7 +23,6 @@
 package org.apache.ranger.patch;
 
 import java.text.DecimalFormat;
-import java.util.Date;
 
 import org.apache.log4j.Logger;
 import org.apache.ranger.common.DateUtil;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/patch/PatchPasswordEncryption_J10001.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchPasswordEncryption_J10001.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchPasswordEncryption_J10001.java
index 08ace6c..832e963 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchPasswordEncryption_J10001.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchPasswordEncryption_J10001.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.db.XADaoManager;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.entity.XXAsset;
 import org.apache.ranger.service.XAssetService;
 import org.apache.ranger.util.CLIUtil;
@@ -33,7 +33,7 @@ public class PatchPasswordEncryption_J10001 extends BaseLoader {
 	int lineCount = 0;
 	
 	@Autowired
-	XADaoManager xaDaoManager;
+	RangerDaoManager xaDaoManager;
 	
 	@Autowired
 	StringUtil stringUtil;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
index ca373e6..27c3119 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
@@ -23,7 +23,6 @@ import java.io.File;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.DELETE;
@@ -40,15 +39,15 @@ import javax.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
 import org.apache.ranger.biz.AssetMgr;
-import org.apache.ranger.biz.XABizUtil;
+import org.apache.ranger.biz.RangerBizUtil;
 import org.apache.ranger.common.PropertiesUtil;
 import org.apache.ranger.common.RESTErrorUtil;
+import org.apache.ranger.common.RangerCommonEnums;
+import org.apache.ranger.common.RangerSearchUtil;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.XACommonEnums;
-import org.apache.ranger.common.XASearchUtil;
-import org.apache.ranger.common.annotation.XAAnnotationClassName;
-import org.apache.ranger.common.annotation.XAAnnotationJSMgrName;
+import org.apache.ranger.common.annotation.RangerAnnotationClassName;
+import org.apache.ranger.common.annotation.RangerAnnotationJSMgrName;
 import org.apache.ranger.service.AbstractBaseResourceService;
 import org.apache.ranger.service.XAccessAuditService;
 import org.apache.ranger.service.XAgentService;
@@ -64,13 +63,11 @@ 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.VXPermMap;
 import org.apache.ranger.view.VXPolicy;
 import org.apache.ranger.view.VXPolicyExportAuditList;
 import org.apache.ranger.view.VXResource;
 import org.apache.ranger.view.VXResourceList;
 import org.apache.ranger.view.VXResponse;
-import org.apache.ranger.view.VXString;
 import org.apache.ranger.view.VXStringList;
 import org.apache.ranger.view.VXTrxLogList;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -83,13 +80,13 @@ import org.springframework.transaction.annotation.Transactional;
 @Path("assets")
 @Component
 @Scope("request")
-@XAAnnotationJSMgrName("AssetMgr")
+@RangerAnnotationJSMgrName("AssetMgr")
 @Transactional(propagation = Propagation.REQUIRES_NEW)
 public class AssetREST {
 	static Logger logger = Logger.getLogger(AssetREST.class);
 
 	@Autowired
-	XASearchUtil searchUtil;
+	RangerSearchUtil searchUtil;
 
 	@Autowired
 	AssetMgr assetMgr;
@@ -119,7 +116,7 @@ public class AssetREST {
 	XTrxLogService xTrxLogService;
 	
 	@Autowired
-	XABizUtil msBizUtil;
+	RangerBizUtil msBizUtil;
 
 	@Autowired
 	XAccessAuditService xAccessAuditService;
@@ -148,7 +145,7 @@ public class AssetREST {
 	@DELETE
 	@Path("/assets/{id}")
 	@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
-	@XAAnnotationClassName(class_name = VXAsset.class)
+	@RangerAnnotationClassName(class_name = VXAsset.class)
 	public void deleteXAsset(@PathParam("id") Long id,
 			@Context HttpServletRequest request) {
 		boolean force = true;
@@ -177,8 +174,8 @@ public class AssetREST {
 		Object status = searchCriteria.getParamValue("status");
 		if (status == null || ((Collection) status).size() == 0) {
 			ArrayList<Integer> valueList = new ArrayList<Integer>();
-			valueList.add(XACommonEnums.STATUS_DISABLED);
-			valueList.add(XACommonEnums.STATUS_ENABLED);
+			valueList.add(RangerCommonEnums.STATUS_DISABLED);
+			valueList.add(RangerCommonEnums.STATUS_ENABLED);
 			searchCriteria.addParam("status", valueList);
 		}
 		return assetMgr.searchXAssets(searchCriteria);
@@ -196,8 +193,8 @@ public class AssetREST {
 		Object status = searchCriteria.getParamValue("status");
 		if (status == null || ((Collection) status).size() == 0) {
 			ArrayList<Integer> valueList = new ArrayList<Integer>();
-			valueList.add(XACommonEnums.STATUS_DISABLED);
-			valueList.add(XACommonEnums.STATUS_ENABLED);
+			valueList.add(RangerCommonEnums.STATUS_DISABLED);
+			valueList.add(RangerCommonEnums.STATUS_ENABLED);
 			searchCriteria.addParam("status", valueList);
 		}
 		return assetMgr.getXAssetSearchCount(searchCriteria);
@@ -229,7 +226,7 @@ public class AssetREST {
 	@DELETE
 	@Path("/resources/{id}")
 	@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
-	@XAAnnotationClassName(class_name = VXResource.class)
+	@RangerAnnotationClassName(class_name = VXResource.class)
 	public void deleteXResource(@PathParam("id") Long id,
 			@Context HttpServletRequest request) {
 		boolean force = false;
@@ -425,7 +422,7 @@ public class AssetREST {
 	@DELETE
 	@Path("/credstores/{id}")
 	@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
-	@XAAnnotationClassName(class_name = VXCredentialStore.class)
+	@RangerAnnotationClassName(class_name = VXCredentialStore.class)
 	public void deleteXCredentialStore(@PathParam("id") Long id,
 			@Context HttpServletRequest request) {
 		boolean force = false;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java b/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java
index e5d9254..0a62f8e 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java
@@ -37,14 +37,14 @@ import org.apache.ranger.biz.AssetMgr;
 import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.RESTErrorUtil;
+import org.apache.ranger.common.RangerCommonEnums;
+import org.apache.ranger.common.RangerConstants;
+import org.apache.ranger.common.RangerSearchUtil;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.XACommonEnums;
-import org.apache.ranger.common.XAConstants;
-import org.apache.ranger.common.XASearchUtil;
-import org.apache.ranger.common.annotation.XAAnnotationClassName;
-import org.apache.ranger.common.annotation.XAAnnotationJSMgrName;
-import org.apache.ranger.db.XADaoManager;
+import org.apache.ranger.common.annotation.RangerAnnotationClassName;
+import org.apache.ranger.common.annotation.RangerAnnotationJSMgrName;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.service.AbstractBaseResourceService;
 import org.apache.ranger.service.XAssetService;
 import org.apache.ranger.service.XPolicyService;
@@ -70,13 +70,13 @@ import org.springframework.transaction.annotation.Transactional;
 @Path("public")
 @Component
 @Scope("request")
-@XAAnnotationJSMgrName("PublicMgr")
+@RangerAnnotationJSMgrName("PublicMgr")
 @Transactional(propagation = Propagation.REQUIRES_NEW)
 public class PublicAPIs {
 	static Logger logger = Logger.getLogger(PublicAPIs.class);
 
 	@Autowired
-	XASearchUtil searchUtil;
+	RangerSearchUtil searchUtil;
 
 	@Autowired
 	AssetMgr assetMgr;
@@ -100,7 +100,7 @@ public class PublicAPIs {
 	StringUtil stringUtil;
 
 	@Autowired
-	XADaoManager xaDaoMgr;
+	RangerDaoManager xaDaoMgr;
 
 	@GET
 	@Path("/api/repository/{id}")
@@ -133,7 +133,7 @@ public class PublicAPIs {
 	@DELETE
 	@Path("/api/repository/{id}")
 	@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
-	@XAAnnotationClassName(class_name = VXAsset.class)
+	@RangerAnnotationClassName(class_name = VXAsset.class)
 	public void deleteRepository(@PathParam("id") Long id,
 			@Context HttpServletRequest request) {
 
@@ -182,8 +182,8 @@ public class PublicAPIs {
 				request, xAssetService.sortFields);
 
         ArrayList<Integer> valueList = new ArrayList<Integer>();
-        valueList.add(XAConstants.STATUS_DISABLED);
-        valueList.add(XAConstants.STATUS_ENABLED);
+        valueList.add(RangerConstants.STATUS_DISABLED);
+        valueList.add(RangerConstants.STATUS_ENABLED);
         searchCriteria.addParam("status", valueList);
 
 		return assetMgr.getXAssetSearchCount(searchCriteria);
@@ -224,7 +224,7 @@ public class PublicAPIs {
 	@DELETE
 	@Path("/api/policy/{id}")
 	@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
-	@XAAnnotationClassName(class_name = VXResource.class)
+	@RangerAnnotationClassName(class_name = VXResource.class)
 	public void deletePolicy(@PathParam("id") Long id,
 			@Context HttpServletRequest request) {
 		String forceStr = request.getParameter("force");
@@ -272,8 +272,8 @@ public class PublicAPIs {
 			boolean isRecursiveBool = restErrorUtil.parseBoolean(isRec,
 					"Invalid value for " + "isRecursive",
 					MessageEnums.INVALID_INPUT_DATA, null, "isRecursive");
-			int isRecursive = (isRecursiveBool == true) ? XAConstants.BOOL_TRUE
-					: XAConstants.BOOL_FALSE;
+			int isRecursive = (isRecursiveBool == true) ? RangerConstants.BOOL_TRUE
+					: RangerConstants.BOOL_FALSE;
 			searchCriteria.getParamList().put("isRecursive", isRecursive);
 		}
 			
@@ -285,14 +285,14 @@ public class PublicAPIs {
 		String resStatus = request.getParameter("isEnabled");
 		List<Integer> resList = new ArrayList<Integer>();
 		if (stringUtil.isEmpty(resStatus)) {
-			resList.add(XACommonEnums.STATUS_ENABLED);
-			resList.add(XACommonEnums.STATUS_DISABLED);
+			resList.add(RangerCommonEnums.STATUS_ENABLED);
+			resList.add(RangerCommonEnums.STATUS_DISABLED);
 		} else {
 			boolean policyStatus = restErrorUtil.parseBoolean(resStatus,
 					"Invalid value for " + "isEnabled",
 					MessageEnums.INVALID_INPUT_DATA, null, "isEnabled");
-			int policyStat = (policyStatus) ? XACommonEnums.STATUS_ENABLED
-					: XACommonEnums.STATUS_DISABLED;
+			int policyStat = (policyStatus) ? RangerCommonEnums.STATUS_ENABLED
+					: RangerCommonEnums.STATUS_DISABLED;
 			resList.add(policyStat);
 		}
 		searchCriteria.getParamList().put("resourceStatus", resList);

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java b/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java
index 16c401f..0bcba7d 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java
@@ -34,17 +34,17 @@ import org.apache.log4j.Logger;
 import org.apache.ranger.biz.UserMgr;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.RESTErrorUtil;
+import org.apache.ranger.common.RangerConfigUtil;
+import org.apache.ranger.common.RangerConstants;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.SearchUtil;
 import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.XAConfigUtil;
-import org.apache.ranger.common.XAConstants;
-import org.apache.ranger.common.annotation.XAAnnotationClassName;
-import org.apache.ranger.common.annotation.XAAnnotationJSMgrName;
-import org.apache.ranger.common.annotation.XAAnnotationRestAPI;
-import org.apache.ranger.db.XADaoManager;
+import org.apache.ranger.common.annotation.RangerAnnotationClassName;
+import org.apache.ranger.common.annotation.RangerAnnotationJSMgrName;
+import org.apache.ranger.common.annotation.RangerAnnotationRestAPI;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.entity.XXPortalUser;
-import org.apache.ranger.util.XARestUtil;
+import org.apache.ranger.util.RangerRestUtil;
 import org.apache.ranger.view.VXPasswordChange;
 import org.apache.ranger.view.VXPortalUser;
 import org.apache.ranger.view.VXPortalUserList;
@@ -61,7 +61,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Path("users")
 @Component
 @Scope("request")
-@XAAnnotationJSMgrName("UserMgr")
+@RangerAnnotationJSMgrName("UserMgr")
 @Transactional(propagation = Propagation.REQUIRES_NEW)
 public class UserREST {
 	static Logger logger = Logger.getLogger(UserREST.class);
@@ -70,10 +70,10 @@ public class UserREST {
 	StringUtil stringUtil;
 
 	@Autowired
-	XADaoManager daoManager;
+	RangerDaoManager daoManager;
 
 	@Autowired
-	XAConfigUtil configUtil;
+	RangerConfigUtil configUtil;
 
 	@Autowired
 	RESTErrorUtil restErrorUtil;
@@ -85,7 +85,7 @@ public class UserREST {
 	UserMgr userManager;
 
 	@Autowired
-	XARestUtil msRestUtil;
+	RangerRestUtil msRestUtil;
 
 	/**
 	 * Implements the traditional search functionalities for UserProfile
@@ -125,7 +125,7 @@ public class UserREST {
 
 		// status
 		searchUtil.extractEnum(request, searchCriteria, "status", "Status",
-				"statusList", XAConstants.ActivationStatus_MAX);
+				"statusList", RangerConstants.ActivationStatus_MAX);
 
 		// publicScreenName
 		searchUtil.extractString(request, searchCriteria, "publicScreenName",
@@ -191,7 +191,7 @@ public class UserREST {
 	@PUT
 	@Consumes({ "application/json", "application/xml" })
 	@Produces({ "application/xml", "application/json" })
-	@XAAnnotationRestAPI(updates_classes = "VUserProfile")
+	@RangerAnnotationRestAPI(updates_classes = "VUserProfile")
 	public VXPortalUser update(VXPortalUser userProfile,
 			@Context HttpServletRequest servletRequest) {
 		logger.info("update:" + userProfile.getEmailAddress());
@@ -232,7 +232,7 @@ public class UserREST {
 	@Path("{userId}/deactivate")
 	@Produces({ "application/xml", "application/json" })
 	@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
-	@XAAnnotationClassName(class_name = VXPortalUser.class)
+	@RangerAnnotationClassName(class_name = VXPortalUser.class)
 	public VXPortalUser deactivateUser(@PathParam("userId") Long userId) {
 		XXPortalUser gjUser = daoManager.getXXPortalUser().getById(userId);
 		if (gjUser == null) {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java b/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java
index 124bc43..531f395 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java
@@ -20,18 +20,27 @@
  package org.apache.ranger.rest;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
-import javax.ws.rs.core.*;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 
 import org.apache.log4j.Logger;
-import org.apache.ranger.biz.*;
+import org.apache.ranger.biz.XAuditMgr;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.SearchUtil;
-import org.apache.ranger.common.annotation.XAAnnotationClassName;
-import org.apache.ranger.common.annotation.XAAnnotationJSMgrName;
-import org.apache.ranger.rest.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.annotation.RangerAnnotationClassName;
+import org.apache.ranger.common.annotation.RangerAnnotationJSMgrName;
+import org.apache.ranger.service.XAccessAuditService;
+import org.apache.ranger.service.XTrxLogService;
+import org.apache.ranger.view.VXAccessAuditList;
+import org.apache.ranger.view.VXLong;
+import org.apache.ranger.view.VXTrxLog;
+import org.apache.ranger.view.VXTrxLogList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -42,7 +51,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Path("xaudit")
 @Component
 @Scope("request")
-@XAAnnotationJSMgrName("XAuditMgr")
+@RangerAnnotationJSMgrName("XAuditMgr")
 @Transactional(propagation = Propagation.REQUIRES_NEW)
 public class XAuditREST {
 	static Logger logger = Logger.getLogger(XAuditREST.class);
@@ -84,7 +93,7 @@ public class XAuditREST {
 	@DELETE
 	@Path("/trx_log/{id}")
 	@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
-	@XAAnnotationClassName(class_name = VXTrxLog.class)
+	@RangerAnnotationClassName(class_name = VXTrxLog.class)
 	public void deleteXTrxLog(@PathParam("id") Long id,
 			@Context HttpServletRequest request) {
 		 boolean force = false;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
index 7d8b3a7..5e6243e 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
@@ -20,24 +20,47 @@
  package org.apache.ranger.rest;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.*;
-import javax.ws.rs.core.*;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 
 import org.apache.log4j.Logger;
-import org.apache.ranger.biz.*;
-import org.apache.ranger.common.DateUtil;
+import org.apache.ranger.biz.SessionMgr;
+import org.apache.ranger.biz.XUserMgr;
 import org.apache.ranger.common.RESTErrorUtil;
 import org.apache.ranger.common.SearchCriteria;
-import org.apache.ranger.common.SearchField;
 import org.apache.ranger.common.SearchUtil;
 import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.XAConstants;
-import org.apache.ranger.common.annotation.XAAnnotationClassName;
-import org.apache.ranger.common.annotation.XAAnnotationJSMgrName;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.entity.XXAuthSession;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.annotation.RangerAnnotationClassName;
+import org.apache.ranger.common.annotation.RangerAnnotationJSMgrName;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.service.AuthSessionService;
+import org.apache.ranger.service.XAuditMapService;
+import org.apache.ranger.service.XGroupGroupService;
+import org.apache.ranger.service.XGroupService;
+import org.apache.ranger.service.XGroupUserService;
+import org.apache.ranger.service.XPermMapService;
+import org.apache.ranger.service.XUserService;
+import org.apache.ranger.view.VXAuditMap;
+import org.apache.ranger.view.VXAuditMapList;
+import org.apache.ranger.view.VXAuthSession;
+import org.apache.ranger.view.VXAuthSessionList;
+import org.apache.ranger.view.VXGroup;
+import org.apache.ranger.view.VXGroupGroup;
+import org.apache.ranger.view.VXGroupGroupList;
+import org.apache.ranger.view.VXGroupList;
+import org.apache.ranger.view.VXGroupUser;
+import org.apache.ranger.view.VXGroupUserList;
+import org.apache.ranger.view.VXLong;
+import org.apache.ranger.view.VXPermMap;
+import org.apache.ranger.view.VXPermMapList;
+import org.apache.ranger.view.VXUser;
+import org.apache.ranger.view.VXUserList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -48,7 +71,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Path("xusers")
 @Component
 @Scope("request")
-@XAAnnotationJSMgrName("XUserMgr")
+@RangerAnnotationJSMgrName("XUserMgr")
 @Transactional(propagation = Propagation.REQUIRES_NEW)
 public class XUserREST {
 	static Logger logger = Logger.getLogger(XUserREST.class);
@@ -81,7 +104,7 @@ public class XUserREST {
 	RESTErrorUtil restErrorUtil;
 
 	@Autowired
-	XADaoManager xADaoManager;
+	RangerDaoManager rangerDaoManager;
 
 	@Autowired
 	SessionMgr sessionMgr;
@@ -136,7 +159,7 @@ public class XUserREST {
 	@DELETE
 	@Path("/groups/{id}")
 	@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
-	@XAAnnotationClassName(class_name = VXGroup.class)
+	@RangerAnnotationClassName(class_name = VXGroup.class)
 	public void deleteXGroup(@PathParam("id") Long id,
 			@Context HttpServletRequest request) {
 		boolean force = true;
@@ -218,7 +241,7 @@ public class XUserREST {
 	@DELETE
 	@Path("/users/{id}")
 	@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
-	@XAAnnotationClassName(class_name = VXUser.class)
+	@RangerAnnotationClassName(class_name = VXUser.class)
 	public void deleteXUser(@PathParam("id") Long id,
 			@Context HttpServletRequest request) {
 		boolean force = true;
@@ -283,7 +306,7 @@ public class XUserREST {
 	@DELETE
 	@Path("/groupusers/{id}")
 	@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
-	@XAAnnotationClassName(class_name = VXGroupUser.class)
+	@RangerAnnotationClassName(class_name = VXGroupUser.class)
 	public void deleteXGroupUser(@PathParam("id") Long id,
 			@Context HttpServletRequest request) {
 		boolean force = true;
@@ -340,7 +363,7 @@ public class XUserREST {
 	@DELETE
 	@Path("/groupgroups/{id}")
 	@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
-	@XAAnnotationClassName(class_name = VXGroupGroup.class)
+	@RangerAnnotationClassName(class_name = VXGroupGroup.class)
 	public void deleteXGroupGroup(@PathParam("id") Long id,
 			@Context HttpServletRequest request) {
 		boolean force = false;
@@ -398,7 +421,7 @@ public class XUserREST {
 	@DELETE
 	@Path("/permmaps/{id}")
 	@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
-	@XAAnnotationClassName(class_name = VXPermMap.class)
+	@RangerAnnotationClassName(class_name = VXPermMap.class)
 	public void deleteXPermMap(@PathParam("id") Long id,
 			@Context HttpServletRequest request) {
 		boolean force = false;
@@ -455,7 +478,7 @@ public class XUserREST {
 	@DELETE
 	@Path("/auditmaps/{id}")
 	@PreAuthorize("hasRole('ROLE_SYS_ADMIN')")
-	@XAAnnotationClassName(class_name = VXAuditMap.class)
+	@RangerAnnotationClassName(class_name = VXAuditMap.class)
 	public void deleteXAuditMap(@PathParam("id") Long id,
 			@Context HttpServletRequest request) {
 		boolean force = false;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/context/RangerContextHolder.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/context/RangerContextHolder.java b/security-admin/src/main/java/org/apache/ranger/security/context/RangerContextHolder.java
new file mode 100644
index 0000000..a0969af
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/security/context/RangerContextHolder.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ /**
+ *
+ */
+package org.apache.ranger.security.context;
+
+public class RangerContextHolder {
+
+    private static final ThreadLocal<RangerSecurityContext> securityContextThreadLocal = new ThreadLocal<RangerSecurityContext>();
+
+    private RangerContextHolder() {
+
+    }
+
+    public static RangerSecurityContext getSecurityContext(){
+	return securityContextThreadLocal.get();
+    }
+
+    public static void setSecurityContext(RangerSecurityContext context){
+	securityContextThreadLocal.set(context);
+    }
+
+    public static void resetSecurityContext(){
+	securityContextThreadLocal.remove();
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/context/RangerSecurityContext.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/context/RangerSecurityContext.java b/security-admin/src/main/java/org/apache/ranger/security/context/RangerSecurityContext.java
new file mode 100644
index 0000000..b654c32
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/security/context/RangerSecurityContext.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ /**
+ *
+ */
+package org.apache.ranger.security.context;
+
+import java.io.Serializable;
+
+import org.apache.ranger.common.RequestContext;
+import org.apache.ranger.common.UserSessionBase;
+
+public class RangerSecurityContext implements Serializable{
+    private static final long serialVersionUID = 1L;
+    private UserSessionBase userSession;
+    private RequestContext requestContext;
+
+    public UserSessionBase getUserSession() {
+        return userSession;
+    }
+
+    public void setUserSession(UserSessionBase userSession) {
+        this.userSession = userSession;
+    }
+
+    /**
+     * @return the requestContext
+     */
+    public RequestContext getRequestContext() {
+        return requestContext;
+    }
+
+    /**
+     * @param requestContext the requestContext to set
+     */
+    public void setRequestContext(RequestContext requestContext) {
+        this.requestContext = requestContext;
+    }
+
+
+}

[11/12] incubator-ranger git commit: RANGER-194: Rename classes under web-admin project

Posted by ma...@apache.org.

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java b/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
new file mode 100644
index 0000000..b8659aa
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
@@ -0,0 +1,1311 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ package org.apache.ranger.biz;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOCase;
+import org.apache.log4j.Logger;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.ContextUtil;
+import org.apache.ranger.common.GUIDUtil;
+import org.apache.ranger.common.PropertiesUtil;
+import org.apache.ranger.common.RESTErrorUtil;
+import org.apache.ranger.common.RangerCommonEnums;
+import org.apache.ranger.common.RangerConstants;
+import org.apache.ranger.common.StringUtil;
+import org.apache.ranger.common.UserSessionBase;
+import org.apache.ranger.common.db.BaseDao;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.entity.XXAsset;
+import org.apache.ranger.entity.XXDBBase;
+import org.apache.ranger.entity.XXGroup;
+import org.apache.ranger.entity.XXPermMap;
+import org.apache.ranger.entity.XXPortalUser;
+import org.apache.ranger.entity.XXResource;
+import org.apache.ranger.entity.XXTrxLog;
+import org.apache.ranger.entity.XXUser;
+import org.apache.ranger.service.AbstractBaseResourceService;
+import org.apache.ranger.view.VXDataObject;
+import org.apache.ranger.view.VXPortalUser;
+import org.apache.ranger.view.VXResource;
+import org.apache.ranger.view.VXResponse;
+import org.apache.ranger.view.VXString;
+import org.apache.ranger.view.VXStringList;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RangerBizUtil {
+	static final Logger logger = Logger.getLogger(RangerBizUtil.class);
+
+	@Autowired
+	RESTErrorUtil restErrorUtil;
+
+	@Autowired
+	RangerDaoManager daoManager;
+
+	@Autowired
+	StringUtil stringUtil;
+
+	@Autowired
+	UserMgr userMgr;
+
+	Set<Class<?>> groupEditableClasses;
+	private Class<?>[] groupEditableClassesList = {};
+
+	Map<String, Integer> classTypeMappings = new HashMap<String, Integer>();
+	private int maxFirstNameLength;
+	int maxDisplayNameLength = 150;
+	boolean defaultAutoApprove = true;
+	boolean showBlockedContent = true;
+	public final String EMPTY_CONTENT_DISPLAY_NAME = "...";
+	boolean enableResourceAccessControl;
+	private Random random;
+	private static final String PATH_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrst0123456789-_.";
+	private static char[] PATH_CHAR_SET = PATH_CHARS.toCharArray();
+	private static int PATH_CHAR_SET_LEN = PATH_CHAR_SET.length;
+	
+	static String fileSeparator = PropertiesUtil.getProperty(
+			"xa.file.separator", "/");
+
+	public RangerBizUtil() {
+		maxFirstNameLength = Integer.parseInt(PropertiesUtil.getProperty(
+				"xa.user.firstname.maxlength", "16"));
+		maxDisplayNameLength = PropertiesUtil.getIntProperty(
+				"xa.bookmark.name.maxlen", maxDisplayNameLength);
+		showBlockedContent = PropertiesUtil.getBooleanProperty(
+				"xa.content.show_blocked", showBlockedContent);
+		defaultAutoApprove = PropertiesUtil.getBooleanProperty(
+				"xa.mod.default", defaultAutoApprove);
+
+		groupEditableClasses = new HashSet<Class<?>>(
+				Arrays.asList(groupEditableClassesList));
+		enableResourceAccessControl = PropertiesUtil.getBooleanProperty(
+				"xa.resource.accessControl.enabled", true);
+		random = new Random();
+	}
+
+	public <T extends XXDBBase> List<? extends XXDBBase> getParentObjects(T object) {
+		List<XXDBBase> parentObjectList = null;
+		// if (checkParentAcess.contains(object.getMyClassType())) {
+		// parentObjectList = new ArrayList<MBase>();
+		// }
+		return parentObjectList;
+	}
+
+	public int getClassType(Class<?> klass) {
+		String className = klass.getName();
+		// See if this mapping is already in the database
+		Integer classType = classTypeMappings.get(className);
+		if (classType == null) {
+			// Instantiate the class and call the getClassType method
+			if (XXDBBase.class.isAssignableFrom(klass)) {
+				try {
+					XXDBBase gjObj = (XXDBBase) klass.newInstance();
+					classType = gjObj.getMyClassType();
+					classTypeMappings.put(className, classType);
+				} catch (Throwable ex) {
+					logger.error("Error instantiating object for class "
+							+ className, ex);
+				}
+			}
+		}
+		if (classType == null) {
+			return RangerCommonEnums.CLASS_TYPE_NONE;
+		} else {
+			return classType;
+		}
+	}
+
+	// Access control methods
+	public void checkSystemAdminAccess() {
+		UserSessionBase currentUserSession = ContextUtil
+				.getCurrentUserSession();
+		if (currentUserSession != null && currentUserSession.isUserAdmin()) {
+			return;
+		}
+		throw restErrorUtil
+				.create403RESTException("Only System Administrators can add accounts");
+	}
+
+	/**
+	 * @param contentType
+	 * @return
+	 */
+	public int getMimeTypeInt(String contentType) {
+		if (contentType.equalsIgnoreCase("JPEG")
+				|| contentType.equalsIgnoreCase("JPG")
+				|| contentType.endsWith("jpg") || contentType.endsWith("jpeg")) {
+			return RangerConstants.MIME_JPEG;
+		}
+		if (contentType.equalsIgnoreCase("PNG") || contentType.endsWith("png")) {
+			return RangerConstants.MIME_PNG;
+		}
+		return RangerConstants.MIME_UNKNOWN;
+	}
+
+	/**
+	 * @param mimeType
+	 * @return
+	 */
+	public String getMimeType(int mimeType) {
+		switch (mimeType) {
+		case RangerConstants.MIME_JPEG:
+			return "jpg";
+		case RangerConstants.MIME_PNG:
+			return "png";
+		}
+		return "";
+	}
+
+	/**
+	 * @param contentType
+	 * @return
+	 */
+	public String getImageExtension(String contentType) {
+		if (contentType.toLowerCase().endsWith("jpg")
+				|| contentType.toLowerCase().endsWith("jpeg")) {
+			return "jpg";
+		} else if (contentType.toLowerCase().endsWith("png")) {
+			return "png";
+		}
+		return "";
+	}
+
+	/**
+	 * @param file
+	 * @return
+	 */
+	public String getFileNameWithoutExtension(File file) {
+		if (file != null) {
+			String fileName = file.getName();
+			if (fileName.indexOf(".") > 0) {
+				return fileName.substring(0, fileName.indexOf("."));
+			}
+			return fileName;
+
+		}
+		return null;
+	}
+
+	public String getDisplayNameForClassName(XXDBBase obj) {
+		String classTypeDisplayName = RangerConstants.getLabelFor_ClassTypes(obj
+				.getMyClassType());
+		if (classTypeDisplayName == null) {
+			logger.error(
+					"Error get name for class type. obj=" + obj.toString(),
+					new Throwable());
+		}
+		return classTypeDisplayName;
+	}
+
+	public String getDisplayName(XXDBBase obj) {
+		if (obj != null) {
+			return handleGetDisplayName(obj.getMyDisplayValue());
+		} else {
+			return handleGetDisplayName(null);
+		}
+	}
+
+	/**
+	 * @param displayValue
+	 * @return
+	 */
+	private String handleGetDisplayName(String displayValue) {
+		if (displayValue == null || displayValue.trim().isEmpty()) {
+			return EMPTY_CONTENT_DISPLAY_NAME;
+		}
+
+		if (displayValue.length() > maxDisplayNameLength) {
+			displayValue = displayValue.substring(0, maxDisplayNameLength - 3)
+					.concat("...");
+		}
+		return displayValue;
+	}
+
+	/**
+	 * @param userProfile
+	 * @return
+	 */
+	public String generatePublicName(VXPortalUser userProfile, XXPortalUser gjUser) {
+		return generatePublicName(userProfile.getFirstName(),
+				userProfile.getLastName());
+	}
+
+	public String generatePublicName(String firstName, String lastName) {
+		String publicName = null;
+		String fName = firstName;
+		if (firstName.length() > maxFirstNameLength) {
+			fName = firstName.substring(0, maxFirstNameLength - (1 + 3))
+					+ "...";
+		}
+		if (lastName != null && lastName.length() > 0) {
+			publicName = fName + " " + lastName.substring(0, 1) + ".";
+		}
+		return publicName;
+	}
+
+	public void updateCloneReferences(XXDBBase obj) {
+		if (obj == null) {
+			return;
+		}
+	}
+
+	public Long getForUserId(XXDBBase resource) {
+		return null;
+	}
+
+	public XXDBBase getMObject(int objClassType, Long objId) {
+		XXDBBase obj = null;
+
+		if (objId != null) {
+			BaseDao<?> dao = daoManager.getDaoForClassType(objClassType);
+
+			if (dao != null) {
+				obj = (XXDBBase) dao.getById(objId);
+			}
+		}
+
+		return obj;
+	}
+
+	public XXDBBase getMObject(VXDataObject vXDataObject) {
+		if (vXDataObject != null) {
+			return getMObject(vXDataObject.getMyClassType(), vXDataObject.getId());
+		}
+		return null;
+	}
+
+	public VXDataObject getVObject(int objClassType, Long objId) {
+		if (objId == null) {
+			return null;
+		}
+		if (objClassType == RangerConstants.CLASS_TYPE_USER_PROFILE) {
+			return userMgr.mapXXPortalUserVXPortalUser(daoManager.getXXPortalUser().getById(
+					objId));
+		}
+		try {
+			AbstractBaseResourceService<?, ?> myService = AbstractBaseResourceService
+					.getService(objClassType);
+			if (myService != null) {
+				return myService.readResource(objId);
+			}
+		} catch (Throwable t) {
+			logger.error("Error reading resource. objectClassType="
+					+ objClassType + ", objectId=" + objId, t);
+		}
+		return null;
+	}
+
+	public void deleteReferencedObjects(XXDBBase obj) {
+
+		if (obj == null) {
+			return;
+		}
+		if (obj.getMyClassType() == RangerConstants.CLASS_TYPE_NONE) {
+			return;
+		}
+
+	}
+
+	/**
+	 * @param obj
+	 */
+	void deleteObjects(List<XXDBBase> objs) {
+
+	}
+
+	void deleteObject(XXDBBase obj) {
+		AbstractBaseResourceService<?, ?> myService = AbstractBaseResourceService
+				.getService(obj.getMyClassType());
+		if (myService != null) {
+			myService.deleteResource(obj.getId());
+		} else {
+			logger.error("Service not found for obj=" + obj, new Throwable());
+		}
+	}
+
+	public <T extends XXDBBase> Class<? extends XXDBBase> getContextObject(
+			int objectClassType, Long objectId) {
+		return null;
+	}
+
+	public VXStringList mapStringListToVStringList(List<String> stringList) {
+		if (stringList == null) {
+			return null;
+		}
+
+		List<VXString> vStringList = new ArrayList<VXString>();
+		for (String str : stringList) {
+			VXString vXString = new VXString();
+			vXString.setValue(str);
+			vStringList.add(vXString);
+		}
+
+		return new VXStringList(vStringList);
+	}
+
+	/**
+	 * return response object if users is having permission on given resource
+	 * 
+	 * @param vXResource
+	 * @param permission
+	 * @return
+	 */
+	public VXResponse hasPermission(VXResource vXResource, int permission) {
+
+		VXResponse vXResponse = new VXResponse();
+		if (!enableResourceAccessControl) {
+			logger.debug("Resource Access Control is disabled !!!");
+			return vXResponse;
+		}
+
+		if (vXResource == null) {
+			vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
+			vXResponse.setMsgDesc("Please provide valid policy.");
+			return vXResponse;
+		}
+
+		String resourceNames = vXResource.getName();
+		if (stringUtil.isEmpty(resourceNames)) {
+			vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
+			vXResponse.setMsgDesc("Please provide valid policy.");
+			return vXResponse;
+		}
+
+		if (isAdmin()) {
+			return vXResponse;
+		}
+
+		Long xUserId = getXUserId();
+		Long assetId = vXResource.getAssetId();
+		List<XXResource> xResourceList = daoManager.getXXResource()
+				.findByAssetIdAndResourceStatus(assetId,
+						AppConstants.STATUS_ENABLED);
+
+		XXAsset xAsset = daoManager.getXXAsset().getById(assetId);
+		int assetType = xAsset.getAssetType();
+
+		vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
+		vXResponse.setMsgDesc("Permission Denied !");
+
+		if (assetType == AppConstants.ASSET_HIVE) {
+			String[] requestResNameList = resourceNames.split(",");
+			if (stringUtil.isEmpty(vXResource.getUdfs())) {
+				int reqTableType = vXResource.getTableType();
+				int reqColumnType = vXResource.getColumnType();
+				for (String resourceName : requestResNameList) {
+					boolean matchFound = matchHivePolicy(resourceName,
+							xResourceList, xUserId, permission, reqTableType,
+							reqColumnType, false);
+					if (!matchFound) {
+						vXResponse.setMsgDesc("You're not permitted to perform "
+								+ "the action for resource path : "
+								+ resourceName);
+						vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
+						return vXResponse;
+					}
+				}
+			} else {
+				for (String resourceName : requestResNameList) {
+					boolean matchFound = matchHivePolicy(resourceName,
+							xResourceList, xUserId, permission);
+					if (!matchFound) {
+						vXResponse.setMsgDesc("You're not permitted to perform "
+								+ "the action for resource path : "
+								+ resourceName);
+						vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
+						return vXResponse;
+					}
+				}
+			}
+			vXResponse.setStatusCode(VXResponse.STATUS_SUCCESS);
+			return vXResponse;
+		} else if (assetType == AppConstants.ASSET_HBASE) {
+			String[] requestResNameList = resourceNames.split(",");
+			for (String resourceName : requestResNameList) {
+				boolean matchFound = matchHbasePolicy(resourceName,
+						xResourceList, vXResponse, xUserId, permission);
+				if (!matchFound) {
+					vXResponse.setMsgDesc("You're not permitted to perform "
+							+ "the action for resource path : " + resourceName);
+					vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
+					return vXResponse;
+				}
+			}
+			vXResponse.setStatusCode(VXResponse.STATUS_SUCCESS);
+			return vXResponse;
+		} else if (assetType == AppConstants.ASSET_HDFS) {
+			String[] requestResNameList = resourceNames.split(",");
+			for (String resourceName : requestResNameList) {
+				boolean matchFound = matchHdfsPolicy(resourceName,
+						xResourceList, xUserId, permission);
+				if (!matchFound) {
+					vXResponse.setMsgDesc("You're not permitted to perform "
+							+ "the action for resource path : " + resourceName);
+					vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
+					return vXResponse;
+				}
+			}
+			vXResponse.setStatusCode(VXResponse.STATUS_SUCCESS);
+			return vXResponse;
+		} else if (assetType == AppConstants.ASSET_KNOX) {
+				String[] requestResNameList = resourceNames.split(",");
+				for (String resourceName : requestResNameList) {
+					boolean matchFound = matchKnoxPolicy(resourceName,
+							xResourceList, vXResponse, xUserId, permission);
+					if (!matchFound) {
+						vXResponse.setMsgDesc("You're not permitted to perform "
+								+ "the action for resource path : " + resourceName);
+						vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
+						return vXResponse;
+					}
+				}
+				vXResponse.setStatusCode(VXResponse.STATUS_SUCCESS);
+				return vXResponse;	
+        } else if (assetType == AppConstants.ASSET_STORM) {
+            String[] requestResNameList = resourceNames.split(",");
+            for (String resourceName : requestResNameList) {
+                boolean matchFound = matchStormPolicy(resourceName,
+                        xResourceList, vXResponse, xUserId, permission);
+                if (!matchFound) {
+                    vXResponse.setMsgDesc("You're not permitted to perform "
+                            + "the action for resource path : " + resourceName);
+                    vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
+                    return vXResponse;
+                }
+            }
+            vXResponse.setStatusCode(VXResponse.STATUS_SUCCESS);
+            return vXResponse;
+        }
+		return vXResponse;
+	}
+
+	/**
+	 * return true id current logged in session is owned by admin
+	 * 
+	 * @return
+	 */
+	public boolean isAdmin() {
+		UserSessionBase currentUserSession = ContextUtil
+				.getCurrentUserSession();
+		if (currentUserSession == null) {
+			logger.debug("Unable to find session.");
+			return false;
+		}
+
+		if (currentUserSession.isUserAdmin()) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * returns current user's userID from active user sessions
+	 * 
+	 * @return
+	 */
+	public Long getXUserId() {
+
+		UserSessionBase currentUserSession = ContextUtil
+				.getCurrentUserSession();
+		if (currentUserSession == null) {
+			logger.debug("Unable to find session.");
+			return null;
+		}
+
+		XXPortalUser user = daoManager.getXXPortalUser().getById(
+				currentUserSession.getUserId());
+		if (user == null) {
+			logger.debug("XXPortalUser not found with logged in user id : "
+					+ currentUserSession.getUserId());
+			return null;
+		}
+
+		XXUser xUser = daoManager.getXXUser().findByUserName(user.getLoginId());
+		if (xUser == null) {
+			logger.debug("XXPortalUser not found for user id :" + user.getId()
+					+ " with name " + user.getFirstName());
+			return null;
+		}
+
+		return xUser.getId();
+	}
+
+	/**
+	 * returns true if user is having required permission on given Hdfs resource
+	 * 
+	 * @param resourceName
+	 * @param xResourceList
+	 * @param xUserId
+	 * @param permission
+	 * @return
+	 */
+	private boolean matchHdfsPolicy(String resourceName,
+			List<XXResource> xResourceList, Long xUserId, int permission) {
+		boolean matchFound = false;
+		resourceName = replaceMetaChars(resourceName);
+
+		for (XXResource xResource : xResourceList) {
+			if (xResource.getResourceStatus() != AppConstants.STATUS_ENABLED) {
+				continue;
+			}
+			Long resourceId = xResource.getId();
+			matchFound = checkUsrPermForPolicy(xUserId, permission, resourceId);
+			if (matchFound) {
+				matchFound = false;
+				String resource = xResource.getName();
+				String[] dbResourceNameList = resource.split(",");
+				for (String dbResourceName : dbResourceNameList) {
+					if (comparePathsForExactMatch(resourceName, dbResourceName)) {
+						matchFound = true;
+					} else {
+						if (xResource.getIsRecursive() == AppConstants.BOOL_TRUE) {
+							matchFound = isRecursiveWildCardMatch(resourceName,
+									dbResourceName);
+						} else {
+							matchFound = nonRecursiveWildCardMatch(
+									resourceName, dbResourceName);
+						}
+					}
+					if (matchFound) {
+						break;
+					}
+				}
+				if (matchFound) {
+					break;
+				}
+			}
+		}
+		return matchFound;
+	}
+
+	/**
+	 * returns true if user is having required permission on given Hbase
+	 * resource
+	 * 
+	 * @param resourceName
+	 * @param xResourceList
+	 * @param vXResponse
+	 * @param xUserId
+	 * @param permission
+	 * @return
+	 */
+	public boolean matchHbasePolicy(String resourceName,
+			List<XXResource> xResourceList, VXResponse vXResponse, Long xUserId,
+			int permission) {
+		if(stringUtil.isEmpty(resourceName) || xResourceList==null || xUserId==null){
+			return false;
+		}
+
+		String[] splittedResources = stringUtil.split(resourceName, fileSeparator);
+		if (splittedResources.length < 1 || splittedResources.length > 3) {
+			logger.debug("Invalid resourceName name : " + resourceName);
+			return false;
+		}
+
+		String tblName    = splittedResources.length > 0 ? splittedResources[0] : StringUtil.WILDCARD_ASTERISK;
+		String colFamName = splittedResources.length > 1 ? splittedResources[1] : StringUtil.WILDCARD_ASTERISK;
+		String colName    = splittedResources.length > 2 ? splittedResources[2] : StringUtil.WILDCARD_ASTERISK;
+
+		boolean policyMatched = false;
+		// check all resources whether Hbase policy is enabled in any resource
+		// of provided resource list
+		for (XXResource xResource : xResourceList) {
+			if (xResource.getResourceStatus() != AppConstants.STATUS_ENABLED) {
+				continue;
+			}
+			Long resourceId = xResource.getId();
+			boolean hasPermission = checkUsrPermForPolicy(xUserId, permission, resourceId);
+			// if permission is enabled then load Tables,column family and
+			// columns list from resource
+			if (! hasPermission) {
+				continue;
+			}
+
+			// 1. does the policy match the table?
+			String[] xTables = stringUtil.isEmpty(xResource.getTables()) ? null : stringUtil.split(xResource.getTables(), ",");
+
+			boolean matchFound = (xTables == null || xTables.length == 0) ? true : matchPath(tblName, xTables);
+
+			if(matchFound) {
+				// 2. does the policy match the column?
+				String[] xColumnFamilies = stringUtil.isEmpty(xResource.getColumnFamilies()) ? null : stringUtil.split(xResource.getColumnFamilies(), ",");
+
+				matchFound = (xColumnFamilies == null || xColumnFamilies.length == 0) ? true : matchPath(colFamName, xColumnFamilies);
+				
+				if(matchFound) {
+					// 3. does the policy match the columnFamily?
+					String[] xColumns = stringUtil.isEmpty(xResource.getColumns()) ? null : stringUtil.split(xResource.getColumns(), ",");
+
+					matchFound = (xColumns == null || xColumns.length == 0) ? true : matchPath(colName, xColumns);
+				}
+			}
+
+			if (matchFound) {
+				policyMatched = true;
+				break;
+			}
+		}
+		return policyMatched;
+	}
+
+	public boolean matchHivePolicy(String resourceName,
+			List<XXResource> xResourceList, Long xUserId, int permission) {
+		return matchHivePolicy(resourceName, xResourceList, xUserId,
+				permission, 0, 0, true);
+	}
+
+	/**
+	 * returns true if user is having required permission on given Hive resource
+	 * 
+	 * @param resourceName
+	 * @param xResourceList
+	 * @param xUserId
+	 * @param permission
+	 * @param reqTableType
+	 * @param reqColumnType
+	 * @param isUdfPolicy
+	 * @return
+	 */
+	public boolean matchHivePolicy(String resourceName,
+			List<XXResource> xResourceList, Long xUserId, int permission,
+			int reqTableType, int reqColumnType, boolean isUdfPolicy) {
+
+		if(stringUtil.isEmpty(resourceName) || xResourceList==null || xUserId==null){
+			return false;
+		}
+
+		String[] splittedResources = stringUtil.split(resourceName, fileSeparator);// get list of resources
+		if (splittedResources.length < 1 || splittedResources.length > 3) {
+			logger.debug("Invalid resource name : " + resourceName);
+			return false;
+		}
+		
+		String dbName  = splittedResources.length > 0 ? splittedResources[0] : StringUtil.WILDCARD_ASTERISK;
+		String tblName = splittedResources.length > 1 ? splittedResources[1] : StringUtil.WILDCARD_ASTERISK;
+		String colName = splittedResources.length > 2 ? splittedResources[2] : StringUtil.WILDCARD_ASTERISK;
+
+		boolean policyMatched = false;
+		for (XXResource xResource : xResourceList) {
+			if (xResource.getResourceStatus() != AppConstants.STATUS_ENABLED) {
+				continue;
+			}
+
+			Long resourceId = xResource.getId();
+			boolean hasPermission = checkUsrPermForPolicy(xUserId, permission, resourceId);
+
+			if (! hasPermission) {
+				continue;
+			}
+
+			// 1. does the policy match the database?
+			String[] xDatabases = stringUtil.isEmpty(xResource.getDatabases()) ? null : stringUtil.split(xResource.getDatabases(), ",");
+
+			boolean matchFound = (xDatabases == null || xDatabases.length == 0) ? true : matchPath(dbName, xDatabases);
+
+			if (! matchFound) {
+				continue;
+			}
+			
+			// Type(either UDFs policy or non-UDFs policy) of current policy
+			// should be of same as type of policy being iterated
+			if (!stringUtil.isEmpty(xResource.getUdfs()) && !isUdfPolicy) {
+				continue;
+			}
+
+			if (isUdfPolicy) {
+				// 2. does the policy match the UDF?
+				String[] xUdfs = stringUtil.isEmpty(xResource.getUdfs()) ? null : stringUtil.split(xResource.getUdfs(), ",");
+				
+				if(! matchPath(tblName, xUdfs)) {
+					continue;
+				} else {
+					policyMatched = true;
+					break;
+				}
+			} else {
+				// 2. does the policy match the table?
+				String[] xTables = stringUtil.isEmpty(xResource.getTables()) ? null : stringUtil.split(xResource.getTables(), ",");
+
+				matchFound = (xTables == null || xTables.length == 0) ? true : matchPath(tblName, xTables);
+
+				if(xResource.getTableType() == AppConstants.POLICY_EXCLUSION) {
+					matchFound = !matchFound;
+				}
+
+				if (!matchFound) {
+					continue;
+				}
+
+				// 3. does current policy match the column?
+				String[] xColumns = stringUtil.isEmpty(xResource.getColumns()) ? null : stringUtil.split(xResource.getColumns(), ",");
+
+				matchFound = (xColumns == null || xColumns.length == 0) ? true : matchPath(colName, xColumns);
+
+				if(xResource.getColumnType() == AppConstants.POLICY_EXCLUSION) {
+					matchFound = !matchFound;
+				}
+
+				if (!matchFound) {
+					continue;
+				} else {
+					policyMatched = true;
+					break;
+				}
+			}
+		}
+		return policyMatched;
+	}
+	/**
+	 * returns true if user is having required permission on given Hbase
+	 * resource
+	 * 
+	 * @param resourceName
+	 * @param xResourceList
+	 * @param vXResponse
+	 * @param xUserId
+	 * @param permission
+	 * @return
+	 */
+	private boolean matchKnoxPolicy(String resourceName,
+			List<XXResource> xResourceList, VXResponse vXResponse, Long xUserId,
+			int permission) {
+
+		String[] splittedResources = stringUtil.split(resourceName,
+				fileSeparator);
+		int numberOfResources = splittedResources.length;
+		if (numberOfResources < 1 || numberOfResources > 3) {
+			logger.debug("Invalid policy name : " + resourceName);
+			return false;
+		}
+
+		boolean policyMatched = false;
+		// check all resources whether Knox policy is enabled in any resource
+		// of provided resource list
+		for (XXResource xResource : xResourceList) {
+			if (xResource.getResourceStatus() != AppConstants.STATUS_ENABLED) {
+				continue;
+			}
+			Long resourceId = xResource.getId();
+			boolean hasPermission = checkUsrPermForPolicy(xUserId, permission,
+					resourceId);
+			// if permission is enabled then load Topologies,services list from resource
+			if (hasPermission) {
+				String[] xTopologies = (xResource.getTopologies() == null || xResource
+						.getTopologies().equalsIgnoreCase("")) ? null : stringUtil
+						.split(xResource.getTopologies(), ",");
+				String[] xServices = (xResource.getServices() == null || xResource
+						.getServices().equalsIgnoreCase("")) ? null
+						: stringUtil.split(xResource.getServices(), ",");
+
+				boolean matchFound = false;
+
+				for (int index = 0; index < numberOfResources; index++) {
+					matchFound = false;
+					// check whether given table resource matches with any
+					// existing topology resource
+					if (index == 0) {
+						if(xTopologies!=null){
+						for (String xTopology : xTopologies) {
+							if (matchPath(splittedResources[index], xTopology)) {
+								matchFound = true;
+								continue;
+							}
+						}
+						}
+						if(!matchFound) {
+							break;
+						}
+					} // check whether given service resource matches with
+						// any existing service resource
+					else if (index == 1) {
+						if(xServices!=null){
+						for (String xService : xServices) {
+							if (matchPath(splittedResources[index],
+									xService)) {
+								matchFound = true;
+								continue;
+							}
+						}
+						}
+						if(!matchFound) {
+							break;
+						}
+					}
+				}
+				if (matchFound) {
+					policyMatched = true;
+					break;
+				}
+			}
+		}
+		return policyMatched;
+	}
+
+ 	/**
+ 	 * returns true if user is having required permission on given STORM
+ 	 * resource
+ 	 * 
+ 	 * @param resourceName
+ 	 * @param xResourceList
+ 	 * @param vXResponse
+ 	 * @param xUserId
+ 	 * @param permission
+ 	 * @return
+ 	 */
+ 	private boolean matchStormPolicy(String resourceName,
+ 			List<XXResource> xResourceList, VXResponse vXResponse, Long xUserId,
+ 			int permission) {
+ 
+ 		String[] splittedResources = stringUtil.split(resourceName,
+ 				fileSeparator);
+ 		int numberOfResources = splittedResources.length;
+ 		if (numberOfResources < 1 || numberOfResources > 3) {
+ 			logger.debug("Invalid policy name : " + resourceName);
+ 			return false;
+ 		}
+ 
+ 		boolean policyMatched = false;
+ 		// check all resources whether Knox policy is enabled in any resource
+ 		// of provided resource list
+ 		for (XXResource xResource : xResourceList) {
+ 			if (xResource.getResourceStatus() != AppConstants.STATUS_ENABLED) {
+ 				continue;
+ 			}
+ 			Long resourceId = xResource.getId();
+ 			boolean hasPermission = checkUsrPermForPolicy(xUserId, permission,
+ 					resourceId);
+ 			// if permission is enabled then load Topologies,services list from resource
+ 			if (hasPermission) {
+ 				String[] xTopologies = (xResource.getTopologies() == null || xResource
+ 						.getTopologies().equalsIgnoreCase("")) ? null : stringUtil
+ 						.split(xResource.getTopologies(), ",");
+ 				/*String[] xServices = (xResource.getServices() == null || xResource
+ 						.getServices().equalsIgnoreCase("")) ? null
+ 						: stringUtil.split(xResource.getServices(), ",");*/
+ 
+ 				boolean matchFound = false;
+ 
+ 				for (int index = 0; index < numberOfResources; index++) {
+ 					matchFound = false;
+ 					// check whether given table resource matches with any
+ 					// existing topology resource
+ 					if (index == 0) {
+ 						if(xTopologies!=null){
+ 						for (String xTopology : xTopologies) {
+ 							if (matchPath(splittedResources[index], xTopology)) {
+ 								matchFound = true;
+ 								continue;
+ 							}
+ 						}
+ 						}
+ 					} // check whether given service resource matches with
+ 						// any existing service resource
+ 					/*else if (index == 1) {
+ 						if(xServices!=null){
+ 						for (String xService : xServices) {
+ 							if (matchPath(splittedResources[index],
+ 									xService)) {
+ 								matchFound = true;
+ 								continue;
+ 							}
+ 						}
+ 						}
+ 					}*/
+ 				}
+ 				if (matchFound) {
+ 					policyMatched = true;
+ 					break;
+ 				}
+ 			}
+ 		}
+ 		return policyMatched;
+ 	}
+
+	/**
+	 * returns path without meta characters
+	 * 
+	 * @param path
+	 * @return
+	 */
+	public String replaceMetaChars(String path) {
+		if (path == null || path.isEmpty()) {
+			return path;
+		}
+
+		if (path.contains("*")) {
+			String replacement = getRandomString(5, 60);
+			path = path.replaceAll("\\*", replacement);
+		}
+		if (path.contains("?")) {
+			String replacement = getRandomString(1, 1);
+			path = path.replaceAll("\\?", replacement);
+		}
+		return path;
+	}
+
+	/**
+	 * returns random String of given length range
+	 * 
+	 * @param minLen
+	 * @param maxLen
+	 * @return
+	 */
+	private String getRandomString(int minLen, int maxLen) {
+		StringBuilder sb = new StringBuilder();
+		int len = getRandomInt(minLen, maxLen);
+		for (int i = 0; i < len; i++) {
+			int charIdx = random.nextInt(PATH_CHAR_SET_LEN);
+			sb.append(PATH_CHAR_SET[charIdx]);
+		}
+		return sb.toString();
+	}
+
+	/**
+	 * return random integer number for given range
+	 * 
+	 * @param min
+	 * @param max
+	 * @return
+	 */
+	private int getRandomInt(int min, int max) {
+		if (min == max) {
+			return min;
+		} else {
+			int interval = max - min;
+			int randomNum = random.nextInt();
+			return ((Math.abs(randomNum) % interval) + min);
+		}
+	}
+
+	/**
+	 * returns true if given userID is having specified permission on specified
+	 * resource
+	 * 
+	 * @param xUserId
+	 * @param permission
+	 * @param resourceId
+	 * @return
+	 */
+	private boolean checkUsrPermForPolicy(Long xUserId, int permission,
+			Long resourceId) {
+		// this snippet load user groups and permission map list from DB
+		List<XXGroup> userGroups = new ArrayList<XXGroup>();
+		List<XXPermMap> permMapList = new ArrayList<XXPermMap>();
+		userGroups = daoManager.getXXGroup().findByUserId(xUserId);
+		permMapList = daoManager.getXXPermMap().findByResourceId(resourceId);
+		Long publicGroupId = getPublicGroupId();
+		boolean matchFound = false;
+		for (XXPermMap permMap : permMapList) {
+			if (permMap.getPermType() == permission) {
+				if (permMap.getPermFor() == AppConstants.XA_PERM_FOR_GROUP) {
+					// check whether permission is enabled for public group or a group to which user belongs
+					matchFound = (publicGroupId != null && publicGroupId == permMap.getGroupId()) || isGroupInList(permMap.getGroupId(), userGroups);
+				} else if (permMap.getPermFor() == AppConstants.XA_PERM_FOR_USER) {
+					// check whether permission is enabled to user
+					matchFound = permMap.getUserId().equals(xUserId);
+				}
+			}
+			if (matchFound) {
+				break;
+			}
+		}
+		return matchFound;
+	}
+	
+	public Long getPublicGroupId() {
+		XXGroup xXGroupPublic = daoManager.getXXGroup().findByGroupName(RangerConstants.GROUP_PUBLIC);
+
+		return xXGroupPublic != null ? xXGroupPublic.getId() : null;
+	}
+
+	/**
+	 * returns true is given group id is in given group list
+	 * 
+	 * @param groupId
+	 * @param xGroupList
+	 * @return
+	 */
+	public boolean isGroupInList(Long groupId, List<XXGroup> xGroupList) {
+		for (XXGroup xGroup : xGroupList) {
+			if (xGroup.getId().equals(groupId)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * returns true if given path matches in same level or sub directories with
+	 * given wild card pattern
+	 * 
+	 * @param pathToCheck
+	 * @param wildcardPath
+	 * @return
+	 */
+	public boolean isRecursiveWildCardMatch(String pathToCheck,
+			String wildcardPath) {
+		if (pathToCheck != null) {
+			if (wildcardPath != null && wildcardPath.equals(fileSeparator)) {
+				return true;
+			}
+			StringBuilder sb = new StringBuilder();
+			for (String p : pathToCheck.split(fileSeparator)) {
+				sb.append(p);
+				boolean matchFound = FilenameUtils.wildcardMatch(sb.toString(),
+						wildcardPath);
+				if (matchFound) {
+					return true;
+				}
+				sb.append(fileSeparator);
+			}
+			sb = null;
+		}
+		return false;
+	}
+
+	/**
+	 * return List<Integer>
+	 * 
+	 * List of all possible parent return type for some specific resourceType
+	 * 
+	 * @param resourceType
+	 *            , assetType
+	 * 
+	 */
+	public List<Integer> getResorceTypeParentHirearchy(int resourceType,
+			int assetType) {
+		List<Integer> resourceTypeList = new ArrayList<Integer>();
+
+		if (assetType == AppConstants.ASSET_HDFS) {
+			resourceTypeList.add(AppConstants.RESOURCE_PATH);
+		} else if (assetType == AppConstants.ASSET_HIVE) {
+			resourceTypeList.add(AppConstants.RESOURCE_DB);
+			if (resourceType == AppConstants.RESOURCE_TABLE) {
+				resourceTypeList.add(AppConstants.RESOURCE_TABLE);
+			} else if (resourceType == AppConstants.RESOURCE_UDF) {
+				resourceTypeList.add(AppConstants.RESOURCE_UDF);
+			} else if (resourceType == AppConstants.RESOURCE_COLUMN) {
+				resourceTypeList.add(AppConstants.RESOURCE_TABLE);
+				resourceTypeList.add(AppConstants.RESOURCE_COLUMN);
+			}
+		} else if (assetType == AppConstants.ASSET_HBASE) {
+			resourceTypeList.add(AppConstants.RESOURCE_TABLE);
+			if (resourceType == AppConstants.RESOURCE_COL_FAM) {
+				resourceTypeList.add(AppConstants.RESOURCE_COL_FAM);
+			} else if (resourceType == AppConstants.RESOURCE_COLUMN) {
+				resourceTypeList.add(AppConstants.RESOURCE_COL_FAM);
+				resourceTypeList.add(AppConstants.RESOURCE_COLUMN);
+			}
+		}
+
+		return resourceTypeList;
+	}
+
+	/**
+	 * return true if both path matches exactly, wild card matching is not
+	 * checked
+	 * 
+	 * @param path1
+	 * @param path2
+	 * @return
+	 */
+	public boolean comparePathsForExactMatch(String path1, String path2) {
+		String pathSeparator = fileSeparator;
+		if (!path1.endsWith(pathSeparator)) {
+			path1 = path1.concat(pathSeparator);
+		}
+		if (!path2.endsWith(pathSeparator)) {
+			path2 = path2.concat(pathSeparator);
+		}
+		return path1.equalsIgnoreCase(path2);
+	}
+
+	/**
+	 * return true if both path matches at same level path, this function does
+	 * not match sub directories
+	 * 
+	 * @param pathToCheck
+	 * @param wildcardPath
+	 * @return
+	 */
+	public boolean nonRecursiveWildCardMatch(String pathToCheck,
+			String wildcardPath) {
+		if (pathToCheck != null && wildcardPath != null) {
+
+			List<String> pathToCheckArray = new ArrayList<String>();
+			List<String> wildcardPathArray = new ArrayList<String>();
+
+			for (String p : pathToCheck.split(fileSeparator)) {
+				pathToCheckArray.add(p);
+			}
+			for (String w : wildcardPath.split(fileSeparator)) {
+				wildcardPathArray.add(w);
+			}
+
+			if (pathToCheckArray.size() == wildcardPathArray.size()) {
+				boolean match = false;
+				for (int index = 0; index < pathToCheckArray.size(); index++) {
+					match = matchPath(pathToCheckArray.get(index),
+							wildcardPathArray.get(index));
+					if (!match)
+						return match;
+				}
+				return match;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * returns true if first and second path are same
+	 * 
+	 * @param pathToCheckFragment
+	 * @param wildCardPathFragment
+	 * @return
+	 */
+	private boolean matchPath(String pathToCheckFragment,
+			String wildCardPathFragment) {
+		if(pathToCheckFragment == null || wildCardPathFragment == null) {
+			return false;
+		}
+
+		if (pathToCheckFragment.contains("*")
+				|| pathToCheckFragment.contains("?")) {
+			pathToCheckFragment = replaceMetaChars(pathToCheckFragment);
+
+			if (wildCardPathFragment.contains("*")
+					|| wildCardPathFragment.contains("?")) {
+				return FilenameUtils.wildcardMatch(pathToCheckFragment,
+						wildCardPathFragment, IOCase.SENSITIVE);
+			} else {
+				return false;
+			}
+		} else {
+			if (wildCardPathFragment.contains("*")
+					|| wildCardPathFragment.contains("?")) {
+				return FilenameUtils.wildcardMatch(pathToCheckFragment,
+						wildCardPathFragment, IOCase.SENSITIVE);
+			} else {
+				return pathToCheckFragment.trim().equals(
+						wildCardPathFragment.trim());
+			}
+		}
+	}
+	
+	private boolean matchPath(String pathToCheck, String[] wildCardPaths) {
+		if (pathToCheck != null && wildCardPaths != null) {
+			for (String wildCardPath : wildCardPaths) {
+				if (matchPath(pathToCheck, wildCardPath)) {
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+
+	/**
+	 * This method returns true if first parameter value is equal to others
+	 * argument value passed
+	 * 
+	 * @param checkValue
+	 * @param otherValues
+	 * @return
+	 */
+	public static boolean areAllEqual(int checkValue, int... otherValues) {
+		for (int value : otherValues) {
+			if (value != checkValue) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public void createTrxLog(List<XXTrxLog> trxLogList) {
+		if (trxLogList == null) {
+			return;
+		}
+
+		UserSessionBase usb = ContextUtil.getCurrentUserSession();
+		Long authSessionId = null;
+		if (usb != null) {
+			authSessionId = ContextUtil.getCurrentUserSession().getSessionId();
+		}
+		Long trxId = GUIDUtil.genLong();
+
+		for (XXTrxLog xTrxLog : trxLogList) {
+			xTrxLog.setTransactionId(trxId.toString());
+			if (authSessionId != null) {
+				xTrxLog.setSessionId("" + authSessionId);
+			}
+			xTrxLog.setSessionType("Spring Authenticated Session");
+			xTrxLog.setRequestId(trxId.toString());
+			daoManager.getXXTrxLog().create(xTrxLog);
+		}
+	}
+
+	public static int getDBFlavor() {
+
+		String dbFlavor = "";
+		boolean dbFlavorPropFound = true;
+
+		dbFlavor = PropertiesUtil.getProperty("xa.db.flavor");
+		if (dbFlavor == null || dbFlavor.trim().isEmpty()) {
+			dbFlavor = PropertiesUtil.getProperty("jdbc.dialect");
+			dbFlavorPropFound = false;
+		}
+
+		if (dbFlavor != null && !dbFlavor.trim().isEmpty()) {
+			if (dbFlavorPropFound) {
+				if ("MYSQL".equalsIgnoreCase(dbFlavor)) {
+					return AppConstants.DB_FLAVOR_MYSQL;
+				} else if ("ORACLE".equalsIgnoreCase(dbFlavor)) {
+					return AppConstants.DB_FLAVOR_ORACLE;
+				} else {
+					return AppConstants.DB_FLAVOR_UNKNOWN;
+				}
+			} else {
+				if (dbFlavor.toUpperCase().contains("MYSQL")) {
+					return AppConstants.DB_FLAVOR_MYSQL;
+				} else if (dbFlavor.toUpperCase().contains("ORACLE")) {
+					return AppConstants.DB_FLAVOR_ORACLE;
+				} else {
+					return AppConstants.DB_FLAVOR_UNKNOWN;
+				}
+			}
+		} else {
+			logger.error("Property : xa.db.flavor or jdbc.dialect, not found");
+			return AppConstants.DB_FLAVOR_UNKNOWN;
+		}
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java
index f273f2b..fb918c5 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java
@@ -29,17 +29,17 @@ import org.apache.ranger.common.DateUtil;
 import org.apache.ranger.common.HTTPUtil;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.RESTErrorUtil;
+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.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.XXAuthSession;
 import org.apache.ranger.entity.XXPortalUser;
 import org.apache.ranger.entity.XXPortalUserRole;
-import org.apache.ranger.security.context.XAContextHolder;
-import org.apache.ranger.security.context.XASecurityContext;
+import org.apache.ranger.security.context.RangerContextHolder;
+import org.apache.ranger.security.context.RangerSecurityContext;
 import org.apache.ranger.service.AuthSessionService;
 import org.apache.ranger.util.RestUtil;
 import org.apache.ranger.view.VXAuthSession;
@@ -63,7 +63,7 @@ public class SessionMgr {
 	RESTErrorUtil restErrorUtil;
 	
 	@Autowired
-	XADaoManager daoManager;
+	RangerDaoManager daoManager;
 
 	@Autowired
 	AuthSessionService authSessionService;
@@ -87,7 +87,7 @@ public class SessionMgr {
 		boolean newSessionCreation = true;
 		UserSessionBase userSession = null;
 
-		XASecurityContext context = XAContextHolder.getSecurityContext();
+		RangerSecurityContext context = RangerContextHolder.getSecurityContext();
 		if (context != null) {
 			userSession = context.getUserSession();
 		}
@@ -177,7 +177,7 @@ public class SessionMgr {
 			String userRole = gjUserRole.getUserRole();
 
 			strRoleList.add(userRole);
-			if (userRole.equals(XAConstants.ROLE_SYS_ADMIN)) {
+			if (userRole.equals(RangerConstants.ROLE_SYS_ADMIN)) {
 				userSession.setUserAdmin(true);
 			}
 		}
@@ -192,7 +192,7 @@ public class SessionMgr {
 		gjAuthSession.setAuthTime(DateUtil.getUTCDate());
 		gjAuthSession.setAuthStatus(authStatus);
 		gjAuthSession.setAuthType(authType);
-		gjAuthSession.setDeviceType(XACommonEnums.DEVICE_UNKNOWN);
+		gjAuthSession.setDeviceType(RangerCommonEnums.DEVICE_UNKNOWN);
 		gjAuthSession.setExtSessionId(sessionId);
 		gjAuthSession.setRequestIP(remoteAddr);
 		gjAuthSession.setRequestUserAgent(null);
@@ -246,7 +246,7 @@ public class SessionMgr {
 		gjAuthSession.setAuthTime(DateUtil.getUTCDate());
 		gjAuthSession.setAuthStatus(XXAuthSession.AUTH_STATUS_SUCCESS);
 		gjAuthSession.setAuthType(authType);
-		gjAuthSession.setDeviceType(XACommonEnums.DEVICE_UNKNOWN);
+		gjAuthSession.setDeviceType(RangerCommonEnums.DEVICE_UNKNOWN);
 		gjAuthSession.setExtSessionId(null);
 		gjAuthSession.setRequestIP(ipAddress);
 		gjAuthSession.setRequestUserAgent(null);
@@ -258,9 +258,9 @@ public class SessionMgr {
 		userSession.setXXAuthSession(gjAuthSession);
 
 		// create context with user-session and set in thread-local
-		XASecurityContext context = new XASecurityContext();
+		RangerSecurityContext context = new RangerSecurityContext();
 		context.setUserSession(userSession);
-		XAContextHolder.setSecurityContext(context);
+		RangerContextHolder.setSecurityContext(context);
 
 		resetUserSessionForProfiles(userSession);
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
index 648d80a..c4997ab 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java
@@ -33,14 +33,14 @@ import org.apache.ranger.common.DateUtil;
 import org.apache.ranger.common.GUIDUtil;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.RESTErrorUtil;
+import org.apache.ranger.common.RangerCommonEnums;
+import org.apache.ranger.common.RangerConfigUtil;
+import org.apache.ranger.common.RangerConstants;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.SearchUtil;
 import org.apache.ranger.common.StringUtil;
 import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.common.XACommonEnums;
-import org.apache.ranger.common.XAConfigUtil;
-import org.apache.ranger.common.XAConstants;
-import org.apache.ranger.db.XADaoManager;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.entity.XXPortalUser;
 import org.apache.ranger.entity.XXPortalUserRole;
 import org.apache.ranger.entity.XXTrxLog;
@@ -65,7 +65,7 @@ public class UserMgr {
 	private static final Md5PasswordEncoder md5Encoder = new Md5PasswordEncoder();
 
 	@Autowired
-	XADaoManager daoManager;
+	RangerDaoManager daoManager;
 
 	@Autowired
 	RESTErrorUtil restErrorUtil;
@@ -77,7 +77,7 @@ public class UserMgr {
 	SearchUtil searchUtil;
 
 	@Autowired
-	XABizUtil msBizUtil;
+	RangerBizUtil msBizUtil;
 
 	@Autowired
 	SessionMgr sessionMgr;
@@ -90,13 +90,13 @@ public class UserMgr {
 	DateUtil dateUtil;
 
 	@Autowired
-	XAConfigUtil configUtil;
+	RangerConfigUtil configUtil;
 	
 	@Autowired
 	XPortalUserService xPortalUserService;
 
-	String publicRoles[] = new String[] { XAConstants.ROLE_USER,
-			XAConstants.ROLE_OTHER };
+	String publicRoles[] = new String[] { RangerConstants.ROLE_USER,
+			RangerConstants.ROLE_OTHER };
 
 	private static final List<String> DEFAULT_ROLE_LIST = new ArrayList<String>(
 			1);
@@ -104,9 +104,9 @@ public class UserMgr {
 	private static final List<String> VALID_ROLE_LIST = new ArrayList<String>(2);
 
 	static {
-		DEFAULT_ROLE_LIST.add(XAConstants.ROLE_USER);
-		VALID_ROLE_LIST.add(XAConstants.ROLE_SYS_ADMIN);
-		VALID_ROLE_LIST.add(XAConstants.ROLE_USER);
+		DEFAULT_ROLE_LIST.add(RangerConstants.ROLE_USER);
+		VALID_ROLE_LIST.add(RangerConstants.ROLE_SYS_ADMIN);
+		VALID_ROLE_LIST.add(RangerConstants.ROLE_USER);
 	}
 
 	public UserMgr() {
@@ -153,7 +153,7 @@ public class UserMgr {
 				roleList.add(role);
 			}
 		}else{
-			roleList.add(XAConstants.ROLE_USER);
+			roleList.add(RangerConstants.ROLE_USER);
 		}
 
 		return createUser(userProfile, userStatus, roleList);
@@ -483,9 +483,9 @@ public class UserMgr {
 	 */
 	public VXPortalUser deactivateUser(XXPortalUser gjUser) {
 		if (gjUser != null
-				&& gjUser.getStatus() != XAConstants.ACT_STATUS_DEACTIVATED) {
+				&& gjUser.getStatus() != RangerConstants.ACT_STATUS_DEACTIVATED) {
 			logger.info("Marking user " + gjUser.getLoginId() + " as deleted");
-			gjUser.setStatus(XAConstants.ACT_STATUS_DEACTIVATED);
+			gjUser.setStatus(RangerConstants.ACT_STATUS_DEACTIVATED);
 			gjUser = daoManager.getXXPortalUser().update(gjUser);
 			return mapXXPortalUserVXPortalUser(gjUser);
 		}
@@ -883,7 +883,7 @@ public class UserMgr {
 	}
 
 	public boolean deleteUserRole(Long userId, XXPortalUserRole gjUserRole) {
-		/*if (XAConstants.ROLE_USER.equals(gjUserRole.getUserRole())) {
+		/*if (RangerConstants.ROLE_USER.equals(gjUserRole.getUserRole())) {
 			return false;
 		}*/
 		boolean publicRole = false;
@@ -937,12 +937,12 @@ public class UserMgr {
 		XXPortalUserRole userRoleObj = new XXPortalUserRole();
 		userRoleObj.setUserRole(userRole.toUpperCase());
 		userRoleObj.setUserId(userId);
-		userRoleObj.setStatus(XAConstants.STATUS_ENABLED);
+		userRoleObj.setStatus(RangerConstants.STATUS_ENABLED);
 		daoManager.getXXPortalUserRole().create(userRoleObj);
 
 		// If role is not OTHER, then remove OTHER
-		if (!XAConstants.ROLE_OTHER.equalsIgnoreCase(userRole)) {
-			deleteUserRole(userId, XAConstants.ROLE_OTHER);
+		if (!RangerConstants.ROLE_OTHER.equalsIgnoreCase(userRole)) {
+			deleteUserRole(userId, RangerConstants.ROLE_OTHER);
 		}
 
 		sessionMgr.resetUserSessionForProfiles(ContextUtil
@@ -1024,13 +1024,13 @@ public class UserMgr {
 
 	public VXPortalUser createUser(VXPortalUser userProfile) {
 		XXPortalUser xXPortalUser = this
-				.createUser(userProfile, XACommonEnums.STATUS_ENABLED);
+				.createUser(userProfile, RangerCommonEnums.STATUS_ENABLED);
 		return mapXXPortalUserVXPortalUser(xXPortalUser);
 	}
 
 	public VXPortalUser createDefaultAccountUser(VXPortalUser userProfile) {
 		if(userProfile.getPassword()==null||userProfile.getPassword().trim().isEmpty()){
-			userProfile.setUserSource(XACommonEnums.USER_EXTERNAL);
+			userProfile.setUserSource(RangerCommonEnums.USER_EXTERNAL);
 		}
 		// access control
 		UserSessionBase session = ContextUtil.getCurrentUserSession();
@@ -1056,7 +1056,7 @@ public class UserMgr {
 					xXPortalUser = this.findByEmailAddress(emailAddress);
 					if (xXPortalUser == null) {
 						xXPortalUser = this.createUser(userProfile,
-								XACommonEnums.STATUS_ENABLED);
+								RangerCommonEnums.STATUS_ENABLED);
 					} else {
 						throw restErrorUtil
 								.createRESTException(
@@ -1070,7 +1070,7 @@ public class UserMgr {
 					String randomEmail = GUIDUtil.genGUI();
 					userProfile.setEmailAddress(randomEmail);
 					xXPortalUser = this.createUser(userProfile,
-							XACommonEnums.STATUS_ENABLED);
+							RangerCommonEnums.STATUS_ENABLED);
 				}
 			} else {
 				/*throw restErrorUtil

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/biz/UserMgrBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/UserMgrBase.java b/security-admin/src/main/java/org/apache/ranger/biz/UserMgrBase.java
index 568da26..6e3bb76 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/UserMgrBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/UserMgrBase.java
@@ -19,9 +19,13 @@
 
  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.XPortalUserService;
+import org.apache.ranger.view.VXLong;
+import org.apache.ranger.view.VXPortalUser;
+import org.apache.ranger.view.VXPortalUserList;
 import org.springframework.beans.factory.annotation.Autowired;
 public class UserMgrBase {

[06/12] incubator-ranger git commit: RANGER-194: Rename classes under web-admin project

Posted by ma...@apache.org.

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/context/XAContextHolder.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/context/XAContextHolder.java b/security-admin/src/main/java/org/apache/ranger/security/context/XAContextHolder.java
deleted file mode 100644
index 28ebc24..0000000
--- a/security-admin/src/main/java/org/apache/ranger/security/context/XAContextHolder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /**
- *
- */
-package org.apache.ranger.security.context;
-
-public class XAContextHolder {
-
-    private static final ThreadLocal<XASecurityContext> securityContextThreadLocal = new ThreadLocal<XASecurityContext>();
-
-    private XAContextHolder() {
-
-    }
-
-    public static XASecurityContext getSecurityContext(){
-	return securityContextThreadLocal.get();
-    }
-
-    public static void setSecurityContext(XASecurityContext context){
-	securityContextThreadLocal.set(context);
-    }
-
-    public static void resetSecurityContext(){
-	securityContextThreadLocal.remove();
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/context/XASecurityContext.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/context/XASecurityContext.java b/security-admin/src/main/java/org/apache/ranger/security/context/XASecurityContext.java
deleted file mode 100644
index 3de282b..0000000
--- a/security-admin/src/main/java/org/apache/ranger/security/context/XASecurityContext.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /**
- *
- */
-package org.apache.ranger.security.context;
-
-import java.io.Serializable;
-
-import org.apache.ranger.common.RequestContext;
-import org.apache.ranger.common.UserSessionBase;
-
-public class XASecurityContext implements Serializable{
-    private static final long serialVersionUID = 1L;
-    private UserSessionBase userSession;
-    private RequestContext requestContext;
-
-    public UserSessionBase getUserSession() {
-        return userSession;
-    }
-
-    public void setUserSession(UserSessionBase userSession) {
-        this.userSession = userSession;
-    }
-
-    /**
-     * @return the requestContext
-     */
-    public RequestContext getRequestContext() {
-        return requestContext;
-    }
-
-    /**
-     * @param requestContext the requestContext to set
-     */
-    public void setRequestContext(RequestContext requestContext) {
-        this.requestContext = requestContext;
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java
new file mode 100644
index 0000000..f9fea3f
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ package org.apache.ranger.security.handler;
+
+/**
+ *
+ */
+
+import java.io.Serializable;
+
+import org.apache.log4j.Logger;
+import org.apache.ranger.biz.RangerBizUtil;
+import org.apache.ranger.common.ContextUtil;
+import org.apache.ranger.common.PropertiesUtil;
+import org.apache.ranger.common.UserSessionBase;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.entity.XXDBBase;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RangerDomainObjectSecurityHandler {
+
+	public static Logger logger = Logger
+			.getLogger(RangerDomainObjectSecurityHandler.class);
+
+	@Autowired
+	public RangerDaoManager daoManager;
+
+	@Autowired
+	RangerBizUtil msBizUtil;
+
+	boolean checkParentObject = false;
+
+	public RangerDomainObjectSecurityHandler() {
+		checkParentObject = PropertiesUtil.getBooleanProperty(
+				"xa.db.access.filter.check.parentobject", checkParentObject);
+	}
+
+	/**
+	 * @return the daoManager
+	 */
+	public RangerDaoManager getDaoManager() {
+		return daoManager;
+	}
+
+	public <T extends XXDBBase> boolean hasAccess(T targetDomainObject,
+			Permission.permissionType permission) {
+		//TODO: Need to review this method and reimplement it properly
+		return true;
+	}
+
+	public boolean hasAccess(String targetType, Serializable targetId,
+			Permission.permissionType permission) {
+		try {
+			Class<?> clazz = Class.forName(targetType);
+			Class<? extends XXDBBase> gjClazz = clazz.asSubclass(XXDBBase.class);
+			return hasAccess(gjClazz, targetId, permission);
+
+		} catch (ClassNotFoundException cfe) {
+			logger.error("class not found:" + targetType, cfe);
+		} catch (Exception e) {
+			logger.error("Excepion targetType:" + targetType + " targetId:"
+					+ targetId, e);
+		}
+
+		return false;
+	}
+
+	public boolean hasAccess(Class<? extends XXDBBase> targetClass,
+			Serializable targetId, Permission.permissionType permission) {
+		try {
+			Class<? extends XXDBBase> gjClazz = targetClass
+					.asSubclass(XXDBBase.class);
+			XXDBBase base = getDaoManager().getEntityManager().find(gjClazz,
+					targetId);
+			return hasAccess(base, permission);
+
+		} catch (Exception e) {
+			logger.error("Excepion targetType:" + targetClass + " targetId:"
+					+ targetId, e);
+		}
+
+		return false;
+	}
+
+	public boolean hasModeratorPermission() {
+		UserSessionBase sess = ContextUtil.getCurrentUserSession();
+		if (sess != null && sess.isUserAdmin()) {
+			return true;
+		}
+		return false;
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/handler/XADomainObjectSecurityHandler.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/handler/XADomainObjectSecurityHandler.java b/security-admin/src/main/java/org/apache/ranger/security/handler/XADomainObjectSecurityHandler.java
deleted file mode 100644
index 04e681f..0000000
--- a/security-admin/src/main/java/org/apache/ranger/security/handler/XADomainObjectSecurityHandler.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- package org.apache.ranger.security.handler;
-
-/**
- *
- */
-
-import java.io.Serializable;
-
-import org.apache.log4j.Logger;
-import org.apache.ranger.biz.XABizUtil;
-import org.apache.ranger.common.ContextUtil;
-import org.apache.ranger.common.PropertiesUtil;
-import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.entity.XXDBBase;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class XADomainObjectSecurityHandler {
-
-	public static Logger logger = Logger
-			.getLogger(XADomainObjectSecurityHandler.class);
-
-	@Autowired
-	public XADaoManager daoManager;
-
-	@Autowired
-	XABizUtil msBizUtil;
-
-	boolean checkParentObject = false;
-
-	public XADomainObjectSecurityHandler() {
-		checkParentObject = PropertiesUtil.getBooleanProperty(
-				"xa.db.access.filter.check.parentobject", checkParentObject);
-	}
-
-	/**
-	 * @return the daoManager
-	 */
-	public XADaoManager getDaoManager() {
-		return daoManager;
-	}
-
-	public <T extends XXDBBase> boolean hasAccess(T targetDomainObject,
-			Permission.permissionType permission) {
-		//TODO: Need to review this method and reimplement it properly
-		return true;
-	}
-
-	public boolean hasAccess(String targetType, Serializable targetId,
-			Permission.permissionType permission) {
-		try {
-			Class<?> clazz = Class.forName(targetType);
-			Class<? extends XXDBBase> gjClazz = clazz.asSubclass(XXDBBase.class);
-			return hasAccess(gjClazz, targetId, permission);
-
-		} catch (ClassNotFoundException cfe) {
-			logger.error("class not found:" + targetType, cfe);
-		} catch (Exception e) {
-			logger.error("Excepion targetType:" + targetType + " targetId:"
-					+ targetId, e);
-		}
-
-		return false;
-	}
-
-	public boolean hasAccess(Class<? extends XXDBBase> targetClass,
-			Serializable targetId, Permission.permissionType permission) {
-		try {
-			Class<? extends XXDBBase> gjClazz = targetClass
-					.asSubclass(XXDBBase.class);
-			XXDBBase base = getDaoManager().getEntityManager().find(gjClazz,
-					targetId);
-			return hasAccess(base, permission);
-
-		} catch (Exception e) {
-			logger.error("Excepion targetType:" + targetClass + " targetId:"
-					+ targetId, e);
-		}
-
-		return false;
-	}
-
-	public boolean hasModeratorPermission() {
-		UserSessionBase sess = ContextUtil.getCurrentUserSession();
-		if (sess != null && sess.isUserAdmin()) {
-			return true;
-		}
-		return false;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java b/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java
index 1d0623c..ebdabed 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java
@@ -19,17 +19,17 @@
 
  package org.apache.ranger.security.listener;
 
-import org.apache.log4j.Logger;
+import org.apache.log4j.Logger;
 import org.apache.ranger.biz.SessionMgr;
 import org.apache.ranger.entity.XXAuthSession;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationListener;
-import org.springframework.security.authentication.event.AbstractAuthenticationEvent;
-import org.springframework.security.authentication.event.AuthenticationFailureBadCredentialsEvent;
-import org.springframework.security.authentication.event.AuthenticationFailureDisabledEvent;
-import org.springframework.security.authentication.event.AuthenticationSuccessEvent;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.WebAuthenticationDetails;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationListener;
+import org.springframework.security.authentication.event.AbstractAuthenticationEvent;
+import org.springframework.security.authentication.event.AuthenticationFailureBadCredentialsEvent;
+import org.springframework.security.authentication.event.AuthenticationFailureDisabledEvent;
+import org.springframework.security.authentication.event.AuthenticationSuccessEvent;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.WebAuthenticationDetails;
 
 
 public class SpringEventListener implements

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/standalone/StandaloneSecurityHandler.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/standalone/StandaloneSecurityHandler.java b/security-admin/src/main/java/org/apache/ranger/security/standalone/StandaloneSecurityHandler.java
index 3c1cbdc..ee275d3 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/standalone/StandaloneSecurityHandler.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/standalone/StandaloneSecurityHandler.java
@@ -22,23 +22,23 @@
  */
 package org.apache.ranger.security.standalone;
 
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Collection;
 
 import org.apache.ranger.biz.SessionMgr;
-import org.apache.ranger.common.XAConstants;
+import org.apache.ranger.common.RangerConstants;
 import org.apache.ranger.entity.XXAuthSession;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.access.vote.AffirmativeBased;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.access.SecurityConfig;
+import org.springframework.security.access.vote.AffirmativeBased;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
 
 @Component
 public class StandaloneSecurityHandler {
@@ -63,7 +63,7 @@ public class StandaloneSecurityHandler {
 		AffirmativeBased accessDecisionManager = (AffirmativeBased) context
 				.getBean(ACCESS_DECISION_MANAGER_BEAN_NAME);
 		Collection<ConfigAttribute> list = new ArrayList<ConfigAttribute>();
-		SecurityConfig config = new SecurityConfig(XAConstants.ROLE_SYS_ADMIN);
+		SecurityConfig config = new SecurityConfig(RangerConstants.ROLE_SYS_ADMIN);
 		list.add(config);
 		accessDecisionManager.decide(token, null, list);
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java
new file mode 100644
index 0000000..d3c188b
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ /**
+ *
+ */
+package org.apache.ranger.security.web.authentication;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.apache.ranger.common.JSONUtil;
+import org.apache.ranger.common.PropertiesUtil;
+import org.apache.ranger.view.VXResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.ExceptionMappingAuthenticationFailureHandler;
+
+/**
+ * 
+ *
+ */
+public class RangerAuthFailureHandler extends
+ExceptionMappingAuthenticationFailureHandler {
+    static Logger logger = Logger.getLogger(RangerAuthFailureHandler.class);
+
+    String ajaxLoginfailurePage = null;
+    
+    @Autowired
+    JSONUtil jsonUtil;
+
+    public RangerAuthFailureHandler() {
+	super();
+	if (ajaxLoginfailurePage == null) {
+	    ajaxLoginfailurePage = PropertiesUtil.getProperty(
+		    "xa.ajax.auth.failure.page", "/ajax_failure.jsp");
+	}
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.springframework.security.web.authentication.
+     * ExceptionMappingAuthenticationFailureHandler
+     * #onAuthenticationFailure(javax.servlet.http.HttpServletRequest,
+     * javax.servlet.http.HttpServletResponse,
+     * org.springframework.security.core.AuthenticationException)
+     */
+    @Override
+    public void onAuthenticationFailure(HttpServletRequest request,
+	    HttpServletResponse response, AuthenticationException exception)
+    throws IOException, ServletException {
+	String ajaxRequestHeader = request.getHeader("X-Requested-With");
+	if (logger.isDebugEnabled()) {
+	    logger.debug("commence() X-Requested-With=" + ajaxRequestHeader);
+	}
+	
+		response.setContentType("application/json;charset=UTF-8");
+		response.setHeader("Cache-Control", "no-cache");
+		String jsonResp = "";
+		try {
+			VXResponse vXResponse = new VXResponse();
+			vXResponse.setStatusCode(HttpServletResponse.SC_UNAUTHORIZED);
+			vXResponse.setMsgDesc("Bad Credentials");
+
+			jsonResp = jsonUtil.writeObjectAsString(vXResponse);
+			response.getWriter().write(jsonResp);
+			response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+		} catch (IOException e) {
+			logger.info("Error while writing JSON in HttpServletResponse");
+		}
+	
+	if (ajaxRequestHeader != null && ajaxRequestHeader.equalsIgnoreCase("XMLHttpRequest")) {
+//	    if (logger.isDebugEnabled()) {
+//		logger.debug("Forwarding AJAX login request failure to "
+//			+ ajaxLoginfailurePage);
+//	    }
+//	    request.getRequestDispatcher(ajaxLoginfailurePage).forward(request,
+//		    response);
+		if (logger.isDebugEnabled()) {
+			logger.debug("Sending login failed response : " + jsonResp);
+		}
+	} else {
+//	    super.onAuthenticationFailure(request, response, exception);
+	}
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java
new file mode 100644
index 0000000..0900cf0
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java
@@ -0,0 +1,161 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ /**
+ *
+ */
+package org.apache.ranger.security.web.authentication;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.apache.ranger.biz.SessionMgr;
+import org.apache.ranger.common.JSONUtil;
+import org.apache.ranger.common.PropertiesUtil;
+import org.apache.ranger.entity.XXAuthSession;
+import org.apache.ranger.view.VXResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
+import org.springframework.security.web.authentication.WebAuthenticationDetails;
+
+/**
+ * 
+ *
+ */
+public class RangerAuthSuccessHandler extends
+SavedRequestAwareAuthenticationSuccessHandler {
+    static Logger logger = Logger.getLogger(RangerAuthSuccessHandler.class);
+
+    String ajaxLoginSuccessPage = null;
+    
+    @Autowired
+    SessionMgr sessionMgr;
+    
+    @Autowired
+    JSONUtil jsonUtil;
+
+    public RangerAuthSuccessHandler() {
+	super();
+	if (ajaxLoginSuccessPage == null) {
+	    ajaxLoginSuccessPage = PropertiesUtil.getProperty(
+		    "xa.ajax.auth.success.page", "/ajax_success.html");
+	}
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.springframework.security.web.authentication.
+     * SavedRequestAwareAuthenticationSuccessHandler
+     * #onAuthenticationSuccess(javax.servlet.http.HttpServletRequest,
+     * javax.servlet.http.HttpServletResponse,
+     * org.springframework.security.core.Authentication)
+     */
+    @Override
+    public void onAuthenticationSuccess(HttpServletRequest request,
+	    HttpServletResponse response, Authentication authentication)
+    throws ServletException, IOException {
+    	
+    	WebAuthenticationDetails details = (WebAuthenticationDetails) authentication
+    		.getDetails();
+    	String remoteAddress = details != null ? details.getRemoteAddress()
+    		: "";
+    	String sessionId = details != null ? details.getSessionId() : "";
+    	
+    	boolean isValidUser = sessionMgr.isValidXAUser(authentication.getName());
+    	
+    	response.setContentType("application/json;charset=UTF-8");
+		response.setHeader("Cache-Control", "no-cache");
+
+		VXResponse vXResponse = new VXResponse();
+    	
+    	if(!isValidUser) {
+    		sessionMgr.processFailureLogin(
+    				XXAuthSession.AUTH_STATUS_USER_NOT_FOUND,
+    				XXAuthSession.AUTH_TYPE_PASSWORD, authentication.getName(),
+    				remoteAddress, sessionId);
+    		authentication.setAuthenticated(false);
+    		
+			vXResponse.setStatusCode(HttpServletResponse.SC_PRECONDITION_FAILED);
+			vXResponse.setMsgDesc("Auth Succeeded but user is not synced yet for " + authentication.getName());
+
+			response.setStatus(HttpServletResponse.SC_PRECONDITION_FAILED);
+			response.getWriter().write(jsonUtil.writeObjectAsString(vXResponse));
+
+			// response.sendError(HttpServletResponse.SC_PRECONDITION_FAILED);
+			logger.info("Auth Succeeded but user is not synced yet for "
+					+ authentication.getName());
+    		
+    	} else {
+    	
+			String ajaxRequestHeader = request.getHeader("X-Requested-With");
+			if (logger.isDebugEnabled()) {
+			    logger.debug("commence() X-Requested-With=" + ajaxRequestHeader);
+			}
+			if (ajaxRequestHeader != null && ajaxRequestHeader.equalsIgnoreCase("XMLHttpRequest")) {
+				// if (logger.isDebugEnabled()) {
+				// logger.debug("Forwarding AJAX login request success to "
+				// + ajaxLoginSuccessPage + " for user "
+				// + authentication.getName());
+				// }
+				// request.getRequestDispatcher(ajaxLoginSuccessPage).forward(request,
+				// response);
+				
+				String jsonResp = "";
+				try {
+					vXResponse.setStatusCode(HttpServletResponse.SC_OK);
+					vXResponse.setMsgDesc("Login Successful");
+
+					response.setStatus(HttpServletResponse.SC_OK);
+					jsonResp = jsonUtil.writeObjectAsString(vXResponse);
+					response.getWriter().write(jsonResp);
+				} catch (IOException e) {
+					logger.info("Error while writing JSON in HttpServletResponse");
+				}
+				if (logger.isDebugEnabled()) {
+					logger.debug("Sending login success response : " + jsonResp);
+				}
+			    clearAuthenticationAttributes(request);
+			} else {
+				String jsonResp = "";
+				try {
+					vXResponse.setStatusCode(HttpServletResponse.SC_OK);
+					vXResponse.setMsgDesc("Login Successful");
+
+					response.setStatus(HttpServletResponse.SC_OK);
+					jsonResp = jsonUtil.writeObjectAsString(vXResponse);
+					response.getWriter().write(jsonResp);
+				} catch (IOException e) {
+					logger.info("Error while writing JSON in HttpServletResponse");
+				}
+				if (logger.isDebugEnabled()) {
+					logger.debug("Sending login success response : " + jsonResp);
+				}
+				// super.onAuthenticationSuccess(request, response,
+				// authentication);
+			}
+    	}
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java
new file mode 100644
index 0000000..4ac24e8
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ /**
+ *
+ */
+package org.apache.ranger.security.web.authentication;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.apache.ranger.common.JSONUtil;
+import org.apache.ranger.common.PropertiesUtil;
+import org.apache.ranger.common.RangerConfigUtil;
+import org.apache.ranger.view.VXResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
+
+
+/**
+ * 
+ *
+ */
+public class RangerAuthenticationEntryPoint extends
+LoginUrlAuthenticationEntryPoint {
+    static Logger logger = Logger.getLogger(RangerAuthenticationEntryPoint.class);
+    static int ajaxReturnCode = -1;
+    
+    @Autowired
+    RangerConfigUtil configUtil;
+    
+    @Autowired
+    JSONUtil jsonUtil;
+
+    public RangerAuthenticationEntryPoint() {
+	super();
+	if (logger.isDebugEnabled()) {
+	    logger.debug("AjaxAwareAuthenticationEntryPoint(): constructor");
+	}
+
+	if (ajaxReturnCode < 0) {
+	    ajaxReturnCode = PropertiesUtil.getIntProperty(
+		    "xa.ajax.auth.required.code", 401);
+	}
+    }
+
+    @Override
+    public void commence(HttpServletRequest request,
+	    HttpServletResponse response, AuthenticationException authException)
+    throws IOException, ServletException {
+	String ajaxRequestHeader = request.getHeader("X-Requested-With");
+	if (logger.isDebugEnabled()) {
+	    logger.debug("commence() X-Requested-With=" + ajaxRequestHeader);
+	}
+
+	String requestURL = (request.getRequestURL() != null) ? request.getRequestURL().toString() : "";
+	String servletPath = PropertiesUtil.getProperty("xa.servlet.mapping.url.pattern", "service");
+	String reqServletPath = configUtil.getWebAppRootURL() + "/" + servletPath;
+
+	response.setContentType("application/json;charset=UTF-8");
+	response.setHeader("Cache-Control", "no-cache");
+	try {
+
+		VXResponse vXResponse = new VXResponse();
+
+		vXResponse.setStatusCode(HttpServletResponse.SC_UNAUTHORIZED);
+		vXResponse.setMsgDesc("Authentication Failed");
+
+		response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+		response.getWriter().write(jsonUtil.writeObjectAsString(vXResponse));
+	} catch (IOException e) {
+		logger.info("Error while writing JSON in HttpServletResponse");
+	}
+	
+	if (ajaxRequestHeader != null && ajaxRequestHeader.equalsIgnoreCase("XMLHttpRequest")) {
+	    if (logger.isDebugEnabled()) {
+		logger.debug("commence() AJAX request. Authentication required. Returning "
+			+ ajaxReturnCode + ". URL=" + request.getRequestURI());
+	    }
+    	response.sendError(ajaxReturnCode, "");
+	} else if(!(requestURL.startsWith(reqServletPath))) {
+		super.commence(request, response, authException);
+	}
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/web/authentication/XAAuthFailureHandler.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/XAAuthFailureHandler.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/XAAuthFailureHandler.java
deleted file mode 100644
index 720cfc4..0000000
--- a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/XAAuthFailureHandler.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /**
- *
- */
-package org.apache.ranger.security.web.authentication;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
-import org.apache.ranger.common.JSONUtil;
-import org.apache.ranger.common.PropertiesUtil;
-import org.apache.ranger.view.VXResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.authentication.ExceptionMappingAuthenticationFailureHandler;
-
-/**
- * 
- *
- */
-public class XAAuthFailureHandler extends
-ExceptionMappingAuthenticationFailureHandler {
-    static Logger logger = Logger.getLogger(XAAuthFailureHandler.class);
-
-    String ajaxLoginfailurePage = null;
-    
-    @Autowired
-    JSONUtil jsonUtil;
-
-    public XAAuthFailureHandler() {
-	super();
-	if (ajaxLoginfailurePage == null) {
-	    ajaxLoginfailurePage = PropertiesUtil.getProperty(
-		    "xa.ajax.auth.failure.page", "/ajax_failure.jsp");
-	}
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.springframework.security.web.authentication.
-     * ExceptionMappingAuthenticationFailureHandler
-     * #onAuthenticationFailure(javax.servlet.http.HttpServletRequest,
-     * javax.servlet.http.HttpServletResponse,
-     * org.springframework.security.core.AuthenticationException)
-     */
-    @Override
-    public void onAuthenticationFailure(HttpServletRequest request,
-	    HttpServletResponse response, AuthenticationException exception)
-    throws IOException, ServletException {
-	String ajaxRequestHeader = request.getHeader("X-Requested-With");
-	if (logger.isDebugEnabled()) {
-	    logger.debug("commence() X-Requested-With=" + ajaxRequestHeader);
-	}
-	
-		response.setContentType("application/json;charset=UTF-8");
-		response.setHeader("Cache-Control", "no-cache");
-		String jsonResp = "";
-		try {
-			VXResponse vXResponse = new VXResponse();
-			vXResponse.setStatusCode(HttpServletResponse.SC_UNAUTHORIZED);
-			vXResponse.setMsgDesc("Bad Credentials");
-
-			jsonResp = jsonUtil.writeObjectAsString(vXResponse);
-			response.getWriter().write(jsonResp);
-			response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-		} catch (IOException e) {
-			logger.info("Error while writing JSON in HttpServletResponse");
-		}
-	
-	if (ajaxRequestHeader != null && ajaxRequestHeader.equalsIgnoreCase("XMLHttpRequest")) {
-//	    if (logger.isDebugEnabled()) {
-//		logger.debug("Forwarding AJAX login request failure to "
-//			+ ajaxLoginfailurePage);
-//	    }
-//	    request.getRequestDispatcher(ajaxLoginfailurePage).forward(request,
-//		    response);
-		if (logger.isDebugEnabled()) {
-			logger.debug("Sending login failed response : " + jsonResp);
-		}
-	} else {
-//	    super.onAuthenticationFailure(request, response, exception);
-	}
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/web/authentication/XAAuthSuccessHandler.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/XAAuthSuccessHandler.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/XAAuthSuccessHandler.java
deleted file mode 100644
index 9d42aca..0000000
--- a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/XAAuthSuccessHandler.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /**
- *
- */
-package org.apache.ranger.security.web.authentication;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
-import org.apache.ranger.biz.SessionMgr;
-import org.apache.ranger.common.JSONUtil;
-import org.apache.ranger.common.PropertiesUtil;
-import org.apache.ranger.entity.XXAuthSession;
-import org.apache.ranger.view.VXResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
-import org.springframework.security.web.authentication.WebAuthenticationDetails;
-
-/**
- * 
- *
- */
-public class XAAuthSuccessHandler extends
-SavedRequestAwareAuthenticationSuccessHandler {
-    static Logger logger = Logger.getLogger(XAAuthSuccessHandler.class);
-
-    String ajaxLoginSuccessPage = null;
-    
-    @Autowired
-    SessionMgr sessionMgr;
-    
-    @Autowired
-    JSONUtil jsonUtil;
-
-    public XAAuthSuccessHandler() {
-	super();
-	if (ajaxLoginSuccessPage == null) {
-	    ajaxLoginSuccessPage = PropertiesUtil.getProperty(
-		    "xa.ajax.auth.success.page", "/ajax_success.html");
-	}
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.springframework.security.web.authentication.
-     * SavedRequestAwareAuthenticationSuccessHandler
-     * #onAuthenticationSuccess(javax.servlet.http.HttpServletRequest,
-     * javax.servlet.http.HttpServletResponse,
-     * org.springframework.security.core.Authentication)
-     */
-    @Override
-    public void onAuthenticationSuccess(HttpServletRequest request,
-	    HttpServletResponse response, Authentication authentication)
-    throws ServletException, IOException {
-    	
-    	WebAuthenticationDetails details = (WebAuthenticationDetails) authentication
-    		.getDetails();
-    	String remoteAddress = details != null ? details.getRemoteAddress()
-    		: "";
-    	String sessionId = details != null ? details.getSessionId() : "";
-    	
-    	boolean isValidUser = sessionMgr.isValidXAUser(authentication.getName());
-    	
-    	response.setContentType("application/json;charset=UTF-8");
-		response.setHeader("Cache-Control", "no-cache");
-
-		VXResponse vXResponse = new VXResponse();
-    	
-    	if(!isValidUser) {
-    		sessionMgr.processFailureLogin(
-    				XXAuthSession.AUTH_STATUS_USER_NOT_FOUND,
-    				XXAuthSession.AUTH_TYPE_PASSWORD, authentication.getName(),
-    				remoteAddress, sessionId);
-    		authentication.setAuthenticated(false);
-    		
-			vXResponse.setStatusCode(HttpServletResponse.SC_PRECONDITION_FAILED);
-			vXResponse.setMsgDesc("Auth Succeeded but user is not synced yet for " + authentication.getName());
-
-			response.setStatus(HttpServletResponse.SC_PRECONDITION_FAILED);
-			response.getWriter().write(jsonUtil.writeObjectAsString(vXResponse));
-
-			// response.sendError(HttpServletResponse.SC_PRECONDITION_FAILED);
-			logger.info("Auth Succeeded but user is not synced yet for "
-					+ authentication.getName());
-    		
-    	} else {
-    	
-			String ajaxRequestHeader = request.getHeader("X-Requested-With");
-			if (logger.isDebugEnabled()) {
-			    logger.debug("commence() X-Requested-With=" + ajaxRequestHeader);
-			}
-			if (ajaxRequestHeader != null && ajaxRequestHeader.equalsIgnoreCase("XMLHttpRequest")) {
-				// if (logger.isDebugEnabled()) {
-				// logger.debug("Forwarding AJAX login request success to "
-				// + ajaxLoginSuccessPage + " for user "
-				// + authentication.getName());
-				// }
-				// request.getRequestDispatcher(ajaxLoginSuccessPage).forward(request,
-				// response);
-				
-				String jsonResp = "";
-				try {
-					vXResponse.setStatusCode(HttpServletResponse.SC_OK);
-					vXResponse.setMsgDesc("Login Successful");
-
-					response.setStatus(HttpServletResponse.SC_OK);
-					jsonResp = jsonUtil.writeObjectAsString(vXResponse);
-					response.getWriter().write(jsonResp);
-				} catch (IOException e) {
-					logger.info("Error while writing JSON in HttpServletResponse");
-				}
-				if (logger.isDebugEnabled()) {
-					logger.debug("Sending login success response : " + jsonResp);
-				}
-			    clearAuthenticationAttributes(request);
-			} else {
-				String jsonResp = "";
-				try {
-					vXResponse.setStatusCode(HttpServletResponse.SC_OK);
-					vXResponse.setMsgDesc("Login Successful");
-
-					response.setStatus(HttpServletResponse.SC_OK);
-					jsonResp = jsonUtil.writeObjectAsString(vXResponse);
-					response.getWriter().write(jsonResp);
-				} catch (IOException e) {
-					logger.info("Error while writing JSON in HttpServletResponse");
-				}
-				if (logger.isDebugEnabled()) {
-					logger.debug("Sending login success response : " + jsonResp);
-				}
-				// super.onAuthenticationSuccess(request, response,
-				// authentication);
-			}
-    	}
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/web/authentication/XAAuthenticationEntryPoint.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/XAAuthenticationEntryPoint.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/XAAuthenticationEntryPoint.java
deleted file mode 100644
index 3a460bc..0000000
--- a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/XAAuthenticationEntryPoint.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /**
- *
- */
-package org.apache.ranger.security.web.authentication;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
-import org.apache.ranger.common.JSONUtil;
-import org.apache.ranger.common.PropertiesUtil;
-import org.apache.ranger.common.XAConfigUtil;
-import org.apache.ranger.view.VXResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
-
-
-/**
- * 
- *
- */
-public class XAAuthenticationEntryPoint extends
-LoginUrlAuthenticationEntryPoint {
-    static Logger logger = Logger.getLogger(XAAuthenticationEntryPoint.class);
-    static int ajaxReturnCode = -1;
-    
-    @Autowired
-    XAConfigUtil configUtil;
-    
-    @Autowired
-    JSONUtil jsonUtil;
-
-    public XAAuthenticationEntryPoint() {
-	super();
-	if (logger.isDebugEnabled()) {
-	    logger.debug("AjaxAwareAuthenticationEntryPoint(): constructor");
-	}
-
-	if (ajaxReturnCode < 0) {
-	    ajaxReturnCode = PropertiesUtil.getIntProperty(
-		    "xa.ajax.auth.required.code", 401);
-	}
-    }
-
-    @Override
-    public void commence(HttpServletRequest request,
-	    HttpServletResponse response, AuthenticationException authException)
-    throws IOException, ServletException {
-	String ajaxRequestHeader = request.getHeader("X-Requested-With");
-	if (logger.isDebugEnabled()) {
-	    logger.debug("commence() X-Requested-With=" + ajaxRequestHeader);
-	}
-
-	String requestURL = (request.getRequestURL() != null) ? request.getRequestURL().toString() : "";
-	String servletPath = PropertiesUtil.getProperty("xa.servlet.mapping.url.pattern", "service");
-	String reqServletPath = configUtil.getWebAppRootURL() + "/" + servletPath;
-
-	response.setContentType("application/json;charset=UTF-8");
-	response.setHeader("Cache-Control", "no-cache");
-	try {
-
-		VXResponse vXResponse = new VXResponse();
-
-		vXResponse.setStatusCode(HttpServletResponse.SC_UNAUTHORIZED);
-		vXResponse.setMsgDesc("Authentication Failed");
-
-		response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-		response.getWriter().write(jsonUtil.writeObjectAsString(vXResponse));
-	} catch (IOException e) {
-		logger.info("Error while writing JSON in HttpServletResponse");
-	}
-	
-	if (ajaxRequestHeader != null && ajaxRequestHeader.equalsIgnoreCase("XMLHttpRequest")) {
-	    if (logger.isDebugEnabled()) {
-		logger.debug("commence() AJAX request. Authentication required. Returning "
-			+ ajaxReturnCode + ". URL=" + request.getRequestURI());
-	    }
-    	response.sendError(ajaxReturnCode, "");
-	} else if(!(requestURL.startsWith(reqServletPath))) {
-		super.commence(request, response, authException);
-	}
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java
new file mode 100644
index 0000000..9febc23
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java
@@ -0,0 +1,137 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ /**
+ *
+ */
+package org.apache.ranger.security.web.filter;
+
+import java.io.IOException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Logger;
+import org.apache.ranger.biz.SessionMgr;
+import org.apache.ranger.common.GUIDUtil;
+import org.apache.ranger.common.HTTPUtil;
+import org.apache.ranger.common.PropertiesUtil;
+import org.apache.ranger.common.RequestContext;
+import org.apache.ranger.common.UserSessionBase;
+import org.apache.ranger.entity.XXAuthSession;
+import org.apache.ranger.security.context.RangerContextHolder;
+import org.apache.ranger.security.context.RangerSecurityContext;
+import org.apache.ranger.util.RestUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.filter.GenericFilterBean;
+
+public class RangerSecurityContextFormationFilter extends GenericFilterBean {
+
+	static Logger logger = Logger
+			.getLogger(RangerSecurityContextFormationFilter.class);
+
+	public static final String AKA_SC_SESSION_KEY = "AKA_SECURITY_CONTEXT";
+	public static final String USER_AGENT = "User-Agent";
+
+	@Autowired
+	SessionMgr sessionMgr;
+
+	@Autowired
+	HTTPUtil httpUtil;
+
+	String testIP = null;
+
+	public RangerSecurityContextFormationFilter() {
+		testIP = PropertiesUtil.getProperty("xa.env.ip");
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest,
+	 * javax.servlet.ServletResponse, javax.servlet.FilterChain)
+	 */
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		
+		try {
+			Authentication auth = SecurityContextHolder.getContext()
+					.getAuthentication();
+
+			if (auth instanceof AnonymousAuthenticationToken) {
+				// ignore
+			} else {
+				HttpServletRequest httpRequest = (HttpServletRequest) request;
+				HttpSession httpSession = httpRequest.getSession(false);
+
+				// [1]get the context from session
+				RangerSecurityContext context = (RangerSecurityContext) httpSession.getAttribute(AKA_SC_SESSION_KEY);
+				int clientTimeOffset = 0;
+				if (context == null) {
+					context = new RangerSecurityContext();
+					httpSession.setAttribute(AKA_SC_SESSION_KEY, context);					
+				}
+				String userAgent = httpRequest.getHeader(USER_AGENT);
+				if(httpRequest!=null){						
+					clientTimeOffset=RestUtil.getTimeOffset(httpRequest);	
+					
+				}
+				// Get the request specific info
+				RequestContext requestContext = new RequestContext();
+				String reqIP = testIP;
+				if (testIP == null) {
+					reqIP = httpRequest.getRemoteAddr();
+				}
+				requestContext.setIpAddress(reqIP);
+				requestContext.setUserAgent(userAgent);
+				requestContext.setDeviceType(httpUtil
+						.getDeviceType(httpRequest));
+				requestContext.setServerRequestId(GUIDUtil.genGUI());
+				requestContext.setRequestURL(httpRequest.getRequestURI());				
+										
+				requestContext.setClientTimeOffsetInMinute(clientTimeOffset);
+				context.setRequestContext(requestContext);			
+
+				RangerContextHolder.setSecurityContext(context);
+
+				UserSessionBase userSession = sessionMgr.processSuccessLogin(
+						XXAuthSession.AUTH_TYPE_PASSWORD, userAgent);
+				
+				if(userSession!=null && userSession.getClientTimeOffsetInMinute()==0){
+					userSession.setClientTimeOffsetInMinute(clientTimeOffset);
+				}
+				
+				context.setUserSession(userSession);
+			}
+			chain.doFilter(request, response);
+
+		} finally {
+			// [4]remove context from thread-local
+			RangerContextHolder.resetSecurityContext();
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerUsernamePasswordAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerUsernamePasswordAuthenticationFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerUsernamePasswordAuthenticationFilter.java
new file mode 100644
index 0000000..b3fcbf2
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerUsernamePasswordAuthenticationFilter.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ /**
+ *
+ */
+package org.apache.ranger.security.web.filter;
+
+import org.apache.log4j.Logger;
+import org.springframework.security.web.authentication.RememberMeServices;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+public class RangerUsernamePasswordAuthenticationFilter extends
+	UsernamePasswordAuthenticationFilter {
+
+    static Logger logger = Logger
+	    .getLogger(RangerUsernamePasswordAuthenticationFilter.class);
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.springframework.security.web.authentication.
+     * AbstractAuthenticationProcessingFilter
+     * #setRememberMeServices(org.springframework
+     * .security.web.authentication.RememberMeServices)
+     */
+    @Override
+    public void setRememberMeServices(RememberMeServices rememberMeServices) {
+	if (logger.isDebugEnabled()) {
+	    logger.debug("setRememberMeServices() enter: rememberMeServices="
+		    + rememberMeServices.toString());
+	}
+	super.setRememberMeServices(rememberMeServices);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/web/filter/XASecurityContextFormationFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/XASecurityContextFormationFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/XASecurityContextFormationFilter.java
deleted file mode 100644
index 343278d..0000000
--- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/XASecurityContextFormationFilter.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /**
- *
- */
-package org.apache.ranger.security.web.filter;
-
-import java.io.IOException;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.log4j.Logger;
-import org.apache.ranger.biz.SessionMgr;
-import org.apache.ranger.common.GUIDUtil;
-import org.apache.ranger.common.HTTPUtil;
-import org.apache.ranger.common.PropertiesUtil;
-import org.apache.ranger.common.RequestContext;
-import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.entity.XXAuthSession;
-import org.apache.ranger.security.context.XAContextHolder;
-import org.apache.ranger.security.context.XASecurityContext;
-import org.apache.ranger.util.RestUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.AnonymousAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.web.filter.GenericFilterBean;
-
-public class XASecurityContextFormationFilter extends GenericFilterBean {
-
-	static Logger logger = Logger
-			.getLogger(XASecurityContextFormationFilter.class);
-
-	public static final String AKA_SC_SESSION_KEY = "AKA_SECURITY_CONTEXT";
-	public static final String USER_AGENT = "User-Agent";
-
-	@Autowired
-	SessionMgr sessionMgr;
-
-	@Autowired
-	HTTPUtil httpUtil;
-
-	String testIP = null;
-
-	public XASecurityContextFormationFilter() {
-		testIP = PropertiesUtil.getProperty("xa.env.ip");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest,
-	 * javax.servlet.ServletResponse, javax.servlet.FilterChain)
-	 */
-	@Override
-	public void doFilter(ServletRequest request, ServletResponse response,
-			FilterChain chain) throws IOException, ServletException {
-		
-		try {
-			Authentication auth = SecurityContextHolder.getContext()
-					.getAuthentication();
-
-			if (auth instanceof AnonymousAuthenticationToken) {
-				// ignore
-			} else {
-				HttpServletRequest httpRequest = (HttpServletRequest) request;
-				HttpSession httpSession = httpRequest.getSession(false);
-
-				// [1]get the context from session
-				XASecurityContext context = (XASecurityContext) httpSession.getAttribute(AKA_SC_SESSION_KEY);
-				int clientTimeOffset = 0;
-				if (context == null) {
-					context = new XASecurityContext();
-					httpSession.setAttribute(AKA_SC_SESSION_KEY, context);					
-				}
-				String userAgent = httpRequest.getHeader(USER_AGENT);
-				if(httpRequest!=null){						
-					clientTimeOffset=RestUtil.getTimeOffset(httpRequest);	
-					
-				}
-				// Get the request specific info
-				RequestContext requestContext = new RequestContext();
-				String reqIP = testIP;
-				if (testIP == null) {
-					reqIP = httpRequest.getRemoteAddr();
-				}
-				requestContext.setIpAddress(reqIP);
-				requestContext.setUserAgent(userAgent);
-				requestContext.setDeviceType(httpUtil
-						.getDeviceType(httpRequest));
-				requestContext.setServerRequestId(GUIDUtil.genGUI());
-				requestContext.setRequestURL(httpRequest.getRequestURI());				
-										
-				requestContext.setClientTimeOffsetInMinute(clientTimeOffset);
-				context.setRequestContext(requestContext);			
-
-				XAContextHolder.setSecurityContext(context);
-
-				UserSessionBase userSession = sessionMgr.processSuccessLogin(
-						XXAuthSession.AUTH_TYPE_PASSWORD, userAgent);
-				
-				if(userSession!=null && userSession.getClientTimeOffsetInMinute()==0){
-					userSession.setClientTimeOffsetInMinute(clientTimeOffset);
-				}
-				
-				context.setUserSession(userSession);
-			}
-			chain.doFilter(request, response);
-
-		} finally {
-			// [4]remove context from thread-local
-			XAContextHolder.resetSecurityContext();
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/security/web/filter/XAUsernamePasswordAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/XAUsernamePasswordAuthenticationFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/XAUsernamePasswordAuthenticationFilter.java
deleted file mode 100644
index 2b28397..0000000
--- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/XAUsernamePasswordAuthenticationFilter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /**
- *
- */
-package org.apache.ranger.security.web.filter;
-
-import org.apache.log4j.Logger;
-import org.springframework.security.web.authentication.RememberMeServices;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-
-public class XAUsernamePasswordAuthenticationFilter extends
-	UsernamePasswordAuthenticationFilter {
-
-    static Logger logger = Logger
-	    .getLogger(XAUsernamePasswordAuthenticationFilter.class);
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.springframework.security.web.authentication.
-     * AbstractAuthenticationProcessingFilter
-     * #setRememberMeServices(org.springframework
-     * .security.web.authentication.RememberMeServices)
-     */
-    @Override
-    public void setRememberMeServices(RememberMeServices rememberMeServices) {
-	if (logger.isDebugEnabled()) {
-	    logger.debug("setRememberMeServices() enter: rememberMeServices="
-		    + rememberMeServices.toString());
-	}
-	super.setRememberMeServices(rememberMeServices);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java b/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java
index 669e1e7..0ddfb0e 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java
@@ -39,27 +39,27 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 import org.apache.log4j.Logger;
-import org.apache.ranger.biz.XABizUtil;
+import org.apache.ranger.biz.RangerBizUtil;
 import org.apache.ranger.common.ContextUtil;
 import org.apache.ranger.common.DateUtil;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.RESTErrorUtil;
+import org.apache.ranger.common.RangerConfigUtil;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.SearchField;
 import org.apache.ranger.common.SearchUtil;
 import org.apache.ranger.common.SortField;
+import org.apache.ranger.common.SortField.SORT_ORDER;
 import org.apache.ranger.common.StringUtil;
 import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.common.XAConfigUtil;
-import org.apache.ranger.common.SortField.SORT_ORDER;
 import org.apache.ranger.common.db.BaseDao;
 import org.apache.ranger.common.view.VList;
-import org.apache.ranger.db.XADaoManager;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.entity.XXAuthSession;
 import org.apache.ranger.entity.XXDBBase;
 import org.apache.ranger.entity.XXPortalUser;
 import org.apache.ranger.security.handler.Permission;
-import org.apache.ranger.security.handler.XADomainObjectSecurityHandler;
+import org.apache.ranger.security.handler.RangerDomainObjectSecurityHandler;
 import org.apache.ranger.view.VXDataObject;
 import org.apache.ranger.view.VXLong;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,7 +88,7 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
 	public List<SearchField> searchFields = new ArrayList<SearchField>();
 
 	@Autowired
-	XADaoManager daoManager;
+	RangerDaoManager daoManager;
 
 	protected static final HashMap<Class<?>, String> tEntityValueMap = new HashMap<Class<?>, String>();
 	static {
@@ -102,7 +102,7 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
 	StringUtil stringUtil;
 
 	@Autowired
-	protected XADaoManager daoMgr;
+	protected RangerDaoManager daoMgr;
 
 	@Autowired
 	protected SearchUtil searchUtil;
@@ -111,13 +111,13 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
 	protected RESTErrorUtil restErrorUtil;
 
 	@Autowired
-	XADomainObjectSecurityHandler objectSecurityHandler;
+	RangerDomainObjectSecurityHandler objectSecurityHandler;
 
 	@Autowired
-	XABizUtil bizUtil;
+	RangerBizUtil bizUtil;
 
 	@Autowired
-	XAConfigUtil msConfigUtil;
+	RangerConfigUtil msConfigUtil;
 
 	protected abstract void validateForCreate(V viewBaseBean);
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java b/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
index ddab7e9..c590bbc 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
@@ -22,11 +22,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.ranger.common.RangerConstants;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.SearchField;
 import org.apache.ranger.common.SortField;
 import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.XAConstants;
 import org.apache.ranger.common.db.BaseDao;
 import org.apache.ranger.entity.XXAuthSession;
 import org.apache.ranger.entity.XXPortalUser;
@@ -66,7 +66,7 @@ public class AuthSessionService extends
 				"obj.authType", "Authentication Type",
 				XXAuthSession.AuthType_MAX));
 		AUTH_SESSION_SEARCH_FLDS.add(SearchField.createEnum("deviceType",
-				"obj.deviceType", "Device Type", XAConstants.DeviceType_MAX));
+				"obj.deviceType", "Device Type", RangerConstants.DeviceType_MAX));
 		AUTH_SESSION_SEARCH_FLDS.add(SearchField.createString("requestIP",
 				"obj.requestIP", SearchField.SEARCH_TYPE.PARTIAL,
 				StringUtil.VALIDATION_IP_ADDRESS));
@@ -95,7 +95,7 @@ public class AuthSessionService extends
 
 	@Override
 	protected int getClassType() {
-		return XAConstants.CLASS_TYPE_AUTH_SESS;
+		return RangerConstants.CLASS_TYPE_AUTH_SESS;
 	}
 
 	/*

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/UserService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/UserService.java b/security-admin/src/main/java/org/apache/ranger/service/UserService.java
index 7af723c..5fdca49 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/UserService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/UserService.java
@@ -26,10 +26,10 @@ import java.util.List;
 import org.apache.log4j.Logger;
 import org.apache.ranger.common.ContextUtil;
 import org.apache.ranger.common.MessageEnums;
+import org.apache.ranger.common.RangerConfigUtil;
+import org.apache.ranger.common.RangerConstants;
 import org.apache.ranger.common.StringUtil;
 import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.common.XAConfigUtil;
-import org.apache.ranger.common.XAConstants;
 import org.apache.ranger.entity.XXPortalUser;
 import org.apache.ranger.entity.XXPortalUserRole;
 import org.apache.ranger.view.VXMessage;
@@ -47,7 +47,7 @@ public class UserService extends UserServiceBase<XXPortalUser, VXPortalUser> {
 	public static final String NAME = "User";
 
 	@Autowired
-	XAConfigUtil configUtil;
+	RangerConfigUtil configUtil;
 
 	private static UserService instance = null;
 
@@ -213,7 +213,7 @@ public class UserService extends UserServiceBase<XXPortalUser, VXPortalUser> {
 
 		// validate status
 		restErrorUtil.validateMinMax(userProfile.getStatus(), 0,
-				XAConstants.ActivationStatus_MAX, "Invalid status", null,
+				RangerConstants.ActivationStatus_MAX, "Invalid status", null,
 				"status");
 
 		// validate user roles

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/UserServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/UserServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/UserServiceBase.java
index 5a87901..043358a 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/UserServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/UserServiceBase.java
@@ -22,10 +22,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXPortalUser;
+import org.apache.ranger.view.VXPortalUser;
+import org.apache.ranger.view.VXPortalUserList;
 
 public abstract class UserServiceBase<T extends XXPortalUser, V extends VXPortalUser>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java b/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java
index 117f9ab..ef9bc46 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java
@@ -20,22 +20,19 @@
  package org.apache.ranger.service;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
-import javax.persistence.Query;
-
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.SearchField;
-import org.apache.ranger.common.SearchUtil;
-import org.apache.ranger.common.SortField;
 import org.apache.ranger.common.SearchField.DATA_TYPE;
 import org.apache.ranger.common.SearchField.SEARCH_TYPE;
+import org.apache.ranger.common.SearchUtil;
+import org.apache.ranger.common.SortField;
 import org.apache.ranger.common.SortField.SORT_ORDER;
-import org.apache.ranger.common.view.VList;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.entity.XXAccessAudit;
+import org.apache.ranger.view.VXAccessAudit;
+import org.apache.ranger.view.VXAccessAuditList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
@@ -51,7 +48,7 @@ public class XAccessAuditService extends XAccessAuditServiceBase<XXAccessAudit,
 	protected SearchUtil searchUtil;
 	
 	@Autowired
-	XADaoManager appDaoMgr;
+	RangerDaoManager appDaoMgr;
 
 	protected String queryStr;
 	protected final String distinctCountQueryStr;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditServiceBase.java
index d4535d0..2914ba1 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditServiceBase.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXAccessAudit;
+import org.apache.ranger.view.VXAccessAudit;
+import org.apache.ranger.view.VXAccessAuditList;
 
 public abstract class XAccessAuditServiceBase<T extends XXAccessAudit, V extends VXAccessAudit>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java b/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java
index 75c296d..3b43b93 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAgentService.java
@@ -19,12 +19,7 @@
 
  package org.apache.ranger.service;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.log4j.Logger;
 import org.apache.ranger.common.AppConstants;
@@ -32,9 +27,6 @@ import org.apache.ranger.common.DateUtil;
 import org.apache.ranger.common.PropertiesUtil;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.TimedEventUtil;
-import org.apache.ranger.view.VXAuditRecord;
-import org.apache.ranger.view.VXAuditRecordList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java b/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java
index d2a8841..6c99705 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java
@@ -26,8 +26,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.JSONUtil;
@@ -35,14 +33,15 @@ import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.PasswordUtils;
 import org.apache.ranger.common.PropertiesUtil;
 import org.apache.ranger.common.SearchField;
-import org.apache.ranger.common.StringUtil;
 import org.apache.ranger.common.SearchField.DATA_TYPE;
 import org.apache.ranger.common.SearchField.SEARCH_TYPE;
+import org.apache.ranger.common.StringUtil;
 import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.util.XAEnumUtil;
-import org.apache.ranger.view.*;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.entity.XXAsset;
+import org.apache.ranger.entity.XXTrxLog;
+import org.apache.ranger.util.RangerEnumUtil;
+import org.apache.ranger.view.VXAsset;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +56,7 @@ public class XAssetService extends XAssetServiceBase<XXAsset, VXAsset> {
 	JSONUtil jsonUtil;
 
 	@Autowired
-	XADaoManager appDaoMgr;
+	RangerDaoManager appDaoMgr;
 	
 	@Autowired
 	StringUtil stringUtil;
@@ -73,7 +72,7 @@ public class XAssetService extends XAssetServiceBase<XXAsset, VXAsset> {
 	private String hiddenPasswordString;
 	
 	@Autowired
-	XAEnumUtil xaEnumUtil;
+	RangerEnumUtil xaEnumUtil;
 	
 	public XAssetService(){
 		super();

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XAssetServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAssetServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XAssetServiceBase.java
index 194634e..d3e2dc5 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAssetServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAssetServiceBase.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXAsset;
+import org.apache.ranger.view.VXAsset;
+import org.apache.ranger.view.VXAssetList;
 
 public abstract class XAssetServiceBase<T extends XXAsset, V extends VXAsset>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java
index 10c0236..1355e95 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java
@@ -27,10 +27,13 @@ import java.util.List;
 import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.SearchField;
 import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.util.XAEnumUtil;
-import org.apache.ranger.view.*;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.entity.XXAuditMap;
+import org.apache.ranger.entity.XXPortalUser;
+import org.apache.ranger.entity.XXTrxLog;
+import org.apache.ranger.entity.XXUser;
+import org.apache.ranger.util.RangerEnumUtil;
+import org.apache.ranger.view.VXAuditMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
@@ -41,10 +44,10 @@ public class XAuditMapService extends
 		XAuditMapServiceBase<XXAuditMap, VXAuditMap> {
 
 	@Autowired
-	XAEnumUtil xaEnumUtil;
+	RangerEnumUtil xaEnumUtil;
 
 	@Autowired
-	XADaoManager xADaoManager;
+	RangerDaoManager rangerDaoManager;
 
 	static HashMap<String, VTrxLogAttr> trxLogAttrs = new HashMap<String, VTrxLogAttr>();
 	static {
@@ -103,7 +106,7 @@ public class XAuditMapService extends
 					value = xaEnumUtil.getLabel(enumName, enumValue);
 				} else {
 					value = ""+field.get(vObj);
-					XXUser xUser = xADaoManager.getXXUser().getById(Long.parseLong(value));
+					XXUser xUser = rangerDaoManager.getXXUser().getById(Long.parseLong(value));
 					value = xUser.getName();
 				}
 				
@@ -145,7 +148,7 @@ public class XAuditMapService extends
 			XXPortalUser xXPortalUser=null;
 			if(mObj.getAddedByUserId()==null || mObj.getAddedByUserId()==0){
 				if(!stringUtil.isEmpty(vObj.getOwner())){
-					xXPortalUser=xADaoManager.getXXPortalUser().findByLoginId(vObj.getOwner());	
+					xXPortalUser=rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getOwner());	
 					if(xXPortalUser!=null){
 						mObj.setAddedByUserId(xXPortalUser.getId());
 					}
@@ -153,7 +156,7 @@ public class XAuditMapService extends
 			}
 			if(mObj.getUpdatedByUserId()==null || mObj.getUpdatedByUserId()==0){
 				if(!stringUtil.isEmpty(vObj.getUpdatedBy())){
-					xXPortalUser= xADaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());			
+					xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());			
 					if(xXPortalUser!=null){
 						mObj.setUpdatedByUserId(xXPortalUser.getId());
 					}		
@@ -169,13 +172,13 @@ public class XAuditMapService extends
 		if(mObj!=null && vObj!=null){
 			XXPortalUser xXPortalUser=null;
 			if(stringUtil.isEmpty(vObj.getOwner())){
-				xXPortalUser= xADaoManager.getXXPortalUser().getById(mObj.getAddedByUserId());	
+				xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId());	
 				if(xXPortalUser!=null){
 					vObj.setOwner(xXPortalUser.getLoginId());
 				}
 			}
 			if(stringUtil.isEmpty(vObj.getUpdatedBy())){
-				xXPortalUser= xADaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());		
+				xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());		
 				if(xXPortalUser!=null){
 					vObj.setUpdatedBy(xXPortalUser.getLoginId());
 				}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XAuditMapServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapServiceBase.java
index 9936971..9da8012 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapServiceBase.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXAuditMap;
+import org.apache.ranger.view.VXAuditMap;
+import org.apache.ranger.view.VXAuditMapList;
 
 public abstract class XAuditMapServiceBase<T extends XXAuditMap, V extends VXAuditMap>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreService.java b/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreService.java
index 82c981a..68ab44a 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreService.java
@@ -19,10 +19,8 @@
 
  package org.apache.ranger.service;
 
-import org.apache.ranger.biz.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.entity.XXCredentialStore;
+import org.apache.ranger.view.VXCredentialStore;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreServiceBase.java
index fc7ff5e..db85bd9 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XCredentialStoreServiceBase.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXCredentialStore;
+import org.apache.ranger.view.VXCredentialStore;
+import org.apache.ranger.view.VXCredentialStoreList;
 
 public abstract class XCredentialStoreServiceBase<T extends XXCredentialStore, V extends VXCredentialStore>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupService.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupService.java
index c9098f3..b6a829b 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupService.java
@@ -19,10 +19,8 @@
 
  package org.apache.ranger.service;
 
-import org.apache.ranger.biz.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.entity.XXGroupGroup;
+import org.apache.ranger.view.VXGroupGroup;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;

[04/12] incubator-ranger git commit: RANGER-194: Rename classes under web-admin project

Posted by ma...@apache.org.

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java b/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java
new file mode 100644
index 0000000..613745e
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java
@@ -0,0 +1,2025 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ package org.apache.ranger.util;
+
+/**
+ * 
+ */
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.apache.ranger.common.view.VEnum;
+import org.apache.ranger.common.view.VEnumElement;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RangerEnumUtil {
+
+    static final Logger logger = Logger.getLogger(RangerEnumUtil.class);
+    public final static String ENUM_CommonEnums_ActiveStatus = "CommonEnums.ActiveStatus";
+    public final static String ENUM_CommonEnums_ActivationStatus = "CommonEnums.ActivationStatus";
+    public final static String ENUM_CommonEnums_BooleanValue = "CommonEnums.BooleanValue";
+    public final static String ENUM_CommonEnums_DataType = "CommonEnums.DataType";
+    public final static String ENUM_CommonEnums_DeviceType = "CommonEnums.DeviceType";
+    public final static String ENUM_CommonEnums_DiffLevel = "CommonEnums.DiffLevel";
+    public final static String ENUM_CommonEnums_FileType = "CommonEnums.FileType";
+    public final static String ENUM_CommonEnums_FreqType = "CommonEnums.FreqType";
+    public final static String ENUM_CommonEnums_MimeType = "CommonEnums.MimeType";
+    public final static String ENUM_CommonEnums_NumberFormat = "CommonEnums.NumberFormat";
+    public final static String ENUM_CommonEnums_ObjectStatus = "CommonEnums.ObjectStatus";
+    public final static String ENUM_CommonEnums_PasswordResetStatus = "CommonEnums.PasswordResetStatus";
+    public final static String ENUM_CommonEnums_PriorityType = "CommonEnums.PriorityType";
+    public final static String ENUM_CommonEnums_ProgressStatus = "CommonEnums.ProgressStatus";
+    public final static String ENUM_CommonEnums_RelationType = "CommonEnums.RelationType";
+    public final static String ENUM_CommonEnums_UserSource = "CommonEnums.UserSource";
+    public final static String ENUM_CommonEnums_AssetType = "CommonEnums.AssetType";
+    public final static String ENUM_CommonEnums_AccessResult = "CommonEnums.AccessResult";
+    public final static String ENUM_CommonEnums_PolicyType = "CommonEnums.PolicyType";
+    public final static String ENUM_CommonEnums_XAAuditType = "CommonEnums.XAAuditType";
+    public final static String ENUM_CommonEnums_ResourceType = "CommonEnums.ResourceType";
+    public final static String ENUM_CommonEnums_XAGroupType = "CommonEnums.XAGroupType";
+    public final static String ENUM_CommonEnums_XAPermForType = "CommonEnums.XAPermForType";
+    public final static String ENUM_CommonEnums_XAPermType = "CommonEnums.XAPermType";
+    public final static String ENUM_CommonEnums_ClassTypes = "CommonEnums.ClassTypes";
+    public final static String ENUM_XXAuthSession_AuthStatus = "XXAuthSession.AuthStatus";
+    public final static String ENUM_XXAuthSession_AuthType = "XXAuthSession.AuthType";
+    public final static String ENUM_XResponse_ResponseStatus = "XResponse.ResponseStatus";
+
+    protected Hashtable<String, VEnum> enumMap = new Hashtable<String, VEnum>();
+    protected List<VEnum> enumList = new ArrayList<VEnum>();
+
+    public List<VEnum> getEnums() {
+	if (enumList.size() == 0) {
+	    init();
+	}
+	return enumList;
+    }
+
+    public VEnum getEnum(String enumName) {
+	if (enumList.size() == 0) {
+	    init();
+	}
+	return enumMap.get(enumName);
+    }
+
+    public String getLabel(String enumName, int enumValue) {
+	VEnum vEnum = getEnum(enumName);
+	if (vEnum == null) {
+	    logger.error("Enum " + enumName + " not found.", new Throwable());
+	    return "";
+	}
+	for (VEnumElement vEnumElement : vEnum.getElementList()) {
+	    if (vEnumElement.getElementValue() == enumValue) {
+		return vEnumElement.getElementLabel();
+	    }
+	}
+	logger.error("Enum value not found. enum=" + enumName + ", value="
+		+ enumValue, new Throwable());
+	return "";
+    }
+
+	public int getValue(String enumName, String elementName) {
+		VEnum vEnum = getEnum(enumName);
+		if (vEnum == null) {
+			logger.error("Enum " + enumName + " not found.", new Throwable());
+			return -1;
+		}
+		for (VEnumElement vEnumElement : vEnum.getElementList()) {
+			if (vEnumElement.getElementName().equalsIgnoreCase(elementName)) {
+				return vEnumElement.getElementValue();
+			}
+		}
+		logger.error("Enum value not found. enum=" + enumName
+				+ ", elementName=" + elementName, new Throwable());
+		return -1;
+	}
+
+    protected void init() {
+	VEnum vEnum;
+	VEnumElement vElement;
+
+	///////////////////////////////////
+	// CommonEnums::ActiveStatus
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_ActiveStatus);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("STATUS_DISABLED");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Disabled");
+	vElement.setRbKey("xa.enum.ActiveStatus.STATUS_DISABLED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("STATUS_ENABLED");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Enabled");
+	vElement.setRbKey("xa.enum.ActiveStatus.STATUS_ENABLED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("STATUS_DELETED");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Deleted");
+	vElement.setRbKey("xa.enum.ActiveStatus.STATUS_DELETED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::ActivationStatus
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_ActivationStatus);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ACT_STATUS_DISABLED");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Disabled");
+	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_DISABLED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ACT_STATUS_ACTIVE");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Active");
+	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_ACTIVE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ACT_STATUS_PENDING_APPROVAL");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Pending Approval");
+	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_PENDING_APPROVAL");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ACT_STATUS_PENDING_ACTIVATION");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("Pending Activation");
+	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_PENDING_ACTIVATION");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ACT_STATUS_REJECTED");
+	vElement.setElementValue(4);
+	vElement.setElementLabel("Rejected");
+	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_REJECTED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ACT_STATUS_DEACTIVATED");
+	vElement.setElementValue(5);
+	vElement.setElementLabel("Deactivated");
+	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_DEACTIVATED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ACT_STATUS_PRE_REGISTRATION");
+	vElement.setElementValue(6);
+	vElement.setElementLabel("Registration Pending");
+	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_PRE_REGISTRATION");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ACT_STATUS_NO_LOGIN");
+	vElement.setElementValue(7);
+	vElement.setElementLabel("No login privilege");
+	vElement.setRbKey("xa.enum.ActivationStatus.ACT_STATUS_NO_LOGIN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::BooleanValue
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_BooleanValue);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("BOOL_NONE");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("None");
+	vElement.setRbKey("xa.enum.BooleanValue.BOOL_NONE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("BOOL_TRUE");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("True");
+	vElement.setRbKey("xa.enum.BooleanValue.BOOL_TRUE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("BOOL_FALSE");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("False");
+	vElement.setRbKey("xa.enum.BooleanValue.BOOL_FALSE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::DataType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_DataType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DATA_TYPE_UNKNOWN");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Unknown");
+	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_UNKNOWN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DATA_TYPE_INTEGER");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Integer");
+	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_INTEGER");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DATA_TYPE_DOUBLE");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Double");
+	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_DOUBLE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DATA_TYPE_STRING");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("String");
+	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_STRING");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DATA_TYPE_BOOLEAN");
+	vElement.setElementValue(4);
+	vElement.setElementLabel("Boolean");
+	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_BOOLEAN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DATA_TYPE_DATE");
+	vElement.setElementValue(5);
+	vElement.setElementLabel("Date");
+	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_DATE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DATA_TYPE_STRING_ENUM");
+	vElement.setElementValue(6);
+	vElement.setElementLabel("String enumeration");
+	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_STRING_ENUM");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DATA_TYPE_LONG");
+	vElement.setElementValue(7);
+	vElement.setElementLabel("Long");
+	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_LONG");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DATA_TYPE_INTEGER_ENUM");
+	vElement.setElementValue(8);
+	vElement.setElementLabel("Integer enumeration");
+	vElement.setRbKey("xa.enum.DataType.DATA_TYPE_INTEGER_ENUM");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::DeviceType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_DeviceType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DEVICE_UNKNOWN");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Unknown");
+	vElement.setRbKey("xa.enum.DeviceType.DEVICE_UNKNOWN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DEVICE_BROWSER");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Browser");
+	vElement.setRbKey("xa.enum.DeviceType.DEVICE_BROWSER");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DEVICE_IPHONE");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("iPhone");
+	vElement.setRbKey("xa.enum.DeviceType.DEVICE_IPHONE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DEVICE_IPAD");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("iPad");
+	vElement.setRbKey("xa.enum.DeviceType.DEVICE_IPAD");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DEVICE_IPOD");
+	vElement.setElementValue(4);
+	vElement.setElementLabel("iPod");
+	vElement.setRbKey("xa.enum.DeviceType.DEVICE_IPOD");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DEVICE_ANDROID");
+	vElement.setElementValue(5);
+	vElement.setElementLabel("Android");
+	vElement.setRbKey("xa.enum.DeviceType.DEVICE_ANDROID");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::DiffLevel
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_DiffLevel);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DIFF_UNKNOWN");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Unknown");
+	vElement.setRbKey("xa.enum.DiffLevel.DIFF_UNKNOWN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DIFF_LOW");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Low");
+	vElement.setRbKey("xa.enum.DiffLevel.DIFF_LOW");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DIFF_MEDIUM");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Medium");
+	vElement.setRbKey("xa.enum.DiffLevel.DIFF_MEDIUM");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("DIFF_HIGH");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("High");
+	vElement.setRbKey("xa.enum.DiffLevel.DIFF_HIGH");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::FileType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_FileType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("FILE_FILE");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("File");
+	vElement.setRbKey("xa.enum.FileType.FILE_FILE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("FILE_DIR");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Directory");
+	vElement.setRbKey("xa.enum.FileType.FILE_DIR");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::FreqType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_FreqType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("FREQ_NONE");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("None");
+	vElement.setRbKey("xa.enum.FreqType.FREQ_NONE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("FREQ_MANUAL");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Manual");
+	vElement.setRbKey("xa.enum.FreqType.FREQ_MANUAL");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("FREQ_HOURLY");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Hourly");
+	vElement.setRbKey("xa.enum.FreqType.FREQ_HOURLY");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("FREQ_DAILY");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("Daily");
+	vElement.setRbKey("xa.enum.FreqType.FREQ_DAILY");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("FREQ_WEEKLY");
+	vElement.setElementValue(4);
+	vElement.setElementLabel("Weekly");
+	vElement.setRbKey("xa.enum.FreqType.FREQ_WEEKLY");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("FREQ_BI_WEEKLY");
+	vElement.setElementValue(5);
+	vElement.setElementLabel("Bi Weekly");
+	vElement.setRbKey("xa.enum.FreqType.FREQ_BI_WEEKLY");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("FREQ_MONTHLY");
+	vElement.setElementValue(6);
+	vElement.setElementLabel("Monthly");
+	vElement.setRbKey("xa.enum.FreqType.FREQ_MONTHLY");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::MimeType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_MimeType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("MIME_UNKNOWN");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Unknown");
+	vElement.setRbKey("xa.enum.MimeType.MIME_UNKNOWN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("MIME_TEXT");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Text");
+	vElement.setRbKey("xa.enum.MimeType.MIME_TEXT");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("MIME_HTML");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Html");
+	vElement.setRbKey("xa.enum.MimeType.MIME_HTML");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("MIME_PNG");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("png");
+	vElement.setRbKey("xa.enum.MimeType.MIME_PNG");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("MIME_JPEG");
+	vElement.setElementValue(4);
+	vElement.setElementLabel("jpeg");
+	vElement.setRbKey("xa.enum.MimeType.MIME_JPEG");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::NumberFormat
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_NumberFormat);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("NUM_FORMAT_NONE");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("None");
+	vElement.setRbKey("xa.enum.NumberFormat.NUM_FORMAT_NONE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("NUM_FORMAT_NUMERIC");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Numeric");
+	vElement.setRbKey("xa.enum.NumberFormat.NUM_FORMAT_NUMERIC");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("NUM_FORMAT_ALPHA");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Alphabhet");
+	vElement.setRbKey("xa.enum.NumberFormat.NUM_FORMAT_ALPHA");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("NUM_FORMAT_ROMAN");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("Roman");
+	vElement.setRbKey("xa.enum.NumberFormat.NUM_FORMAT_ROMAN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::ObjectStatus
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_ObjectStatus);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("OBJ_STATUS_ACTIVE");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Active");
+	vElement.setRbKey("xa.enum.ObjectStatus.OBJ_STATUS_ACTIVE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("OBJ_STATUS_DELETED");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Deleted");
+	vElement.setRbKey("xa.enum.ObjectStatus.OBJ_STATUS_DELETED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("OBJ_STATUS_ARCHIVED");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Archived");
+	vElement.setRbKey("xa.enum.ObjectStatus.OBJ_STATUS_ARCHIVED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::PasswordResetStatus
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_PasswordResetStatus);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("PWD_RESET_ACTIVE");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Active");
+	vElement.setRbKey("xa.enum.PasswordResetStatus.PWD_RESET_ACTIVE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("PWD_RESET_USED");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Used");
+	vElement.setRbKey("xa.enum.PasswordResetStatus.PWD_RESET_USED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("PWD_RESET_EXPIRED");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Expired");
+	vElement.setRbKey("xa.enum.PasswordResetStatus.PWD_RESET_EXPIRED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("PWD_RESET_DISABLED");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("Disabled");
+	vElement.setRbKey("xa.enum.PasswordResetStatus.PWD_RESET_DISABLED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::PriorityType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_PriorityType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("PRIORITY_NORMAL");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Normal");
+	vElement.setRbKey("xa.enum.PriorityType.PRIORITY_NORMAL");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("PRIORITY_LOW");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Low");
+	vElement.setRbKey("xa.enum.PriorityType.PRIORITY_LOW");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("PRIORITY_MEDIUM");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Medium");
+	vElement.setRbKey("xa.enum.PriorityType.PRIORITY_MEDIUM");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("PRIORITY_HIGH");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("High");
+	vElement.setRbKey("xa.enum.PriorityType.PRIORITY_HIGH");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::ProgressStatus
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_ProgressStatus);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("PROGRESS_PENDING");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Pending");
+	vElement.setRbKey("xa.enum.ProgressStatus.PROGRESS_PENDING");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("PROGRESS_IN_PROGRESS");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("In Progress");
+	vElement.setRbKey("xa.enum.ProgressStatus.PROGRESS_IN_PROGRESS");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("PROGRESS_COMPLETE");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Complete");
+	vElement.setRbKey("xa.enum.ProgressStatus.PROGRESS_COMPLETE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("PROGRESS_ABORTED");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("Aborted");
+	vElement.setRbKey("xa.enum.ProgressStatus.PROGRESS_ABORTED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("PROGRESS_FAILED");
+	vElement.setElementValue(4);
+	vElement.setElementLabel("Failed");
+	vElement.setRbKey("xa.enum.ProgressStatus.PROGRESS_FAILED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::RelationType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_RelationType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("REL_NONE");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("None");
+	vElement.setRbKey("xa.enum.RelationType.REL_NONE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("REL_SELF");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Self");
+	vElement.setRbKey("xa.enum.RelationType.REL_SELF");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::UserSource
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_UserSource);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("USER_APP");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Application");
+	vElement.setRbKey("xa.enum.UserSource.USER_APP");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("USER_GOOGLE");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Google");
+	vElement.setRbKey("xa.enum.UserSource.USER_GOOGLE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("USER_FB");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("FaceBook");
+	vElement.setRbKey("xa.enum.UserSource.USER_FB");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::AssetType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_AssetType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ASSET_UNKNOWN");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Unknown");
+	vElement.setRbKey("xa.enum.AssetType.ASSET_UNKNOWN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ASSET_HDFS");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("HDFS");
+	vElement.setRbKey("xa.enum.AssetType.ASSET_HDFS");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ASSET_HBASE");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("HBase");
+	vElement.setRbKey("xa.enum.AssetType.ASSET_HBASE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ASSET_HIVE");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("Hive");
+	vElement.setRbKey("xa.enum.AssetType.ASSET_HIVE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ASSET_AGENT");
+	vElement.setElementValue(4);
+	vElement.setElementLabel("Agent");
+	vElement.setRbKey("xa.enum.AssetType.ASSET_AGENT");
+	vElement.setEnumName(vEnum.getEnumName());
+	
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("ASSET_KNOX");
+	vElement.setElementValue(5);
+	vElement.setElementLabel("Knox");
+	vElement.setRbKey("xa.enum.AssetType.ASSET_KNOX");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("ASSET_STORM");
+	vElement.setElementValue(6);
+	vElement.setElementLabel("Storm");
+	vElement.setRbKey("xa.enum.AssetType.ASSET_STORM");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	///////////////////////////////////
+	// CommonEnums::AccessResult
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_AccessResult);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ACCESS_RESULT_DENIED");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Denied");
+	vElement.setRbKey("xa.enum.AccessResult.ACCESS_RESULT_DENIED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("ACCESS_RESULT_ALLOWED");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Allowed");
+	vElement.setRbKey("xa.enum.AccessResult.ACCESS_RESULT_ALLOWED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::PolicyType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_PolicyType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("POLICY_INCLUSION");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Inclusion");
+	vElement.setRbKey("xa.enum.PolicyType.POLICY_INCLUSION");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("POLICY_EXCLUSION");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Exclusion");
+	vElement.setRbKey("xa.enum.PolicyType.POLICY_EXCLUSION");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::XAAuditType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_XAAuditType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_AUDIT_TYPE_UNKNOWN");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Unknown");
+	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_UNKNOWN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_AUDIT_TYPE_ALL");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("All");
+	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_ALL");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_AUDIT_TYPE_READ");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Read");
+	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_READ");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_AUDIT_TYPE_WRITE");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("Write");
+	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_WRITE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_AUDIT_TYPE_CREATE");
+	vElement.setElementValue(4);
+	vElement.setElementLabel("Create");
+	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_CREATE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_AUDIT_TYPE_DELETE");
+	vElement.setElementValue(5);
+	vElement.setElementLabel("Delete");
+	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_DELETE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_AUDIT_TYPE_LOGIN");
+	vElement.setElementValue(6);
+	vElement.setElementLabel("Login");
+	vElement.setRbKey("xa.enum.XAAuditType.XA_AUDIT_TYPE_LOGIN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::ResourceType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_ResourceType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("RESOURCE_UNKNOWN");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Unknown");
+	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_UNKNOWN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("RESOURCE_PATH");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Path");
+	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_PATH");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("RESOURCE_DB");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Database");
+	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_DB");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("RESOURCE_TABLE");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("Table");
+	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_TABLE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("RESOURCE_COL_FAM");
+	vElement.setElementValue(4);
+	vElement.setElementLabel("Column Family");
+	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_COL_FAM");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("RESOURCE_COLUMN");
+	vElement.setElementValue(5);
+	vElement.setElementLabel("Column");
+	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_COLUMN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("RESOURCE_VIEW");
+	vElement.setElementValue(6);
+	vElement.setElementLabel("VIEW");
+	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_VIEW");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("RESOURCE_UDF");
+	vElement.setElementValue(7);
+	vElement.setElementLabel("UDF");
+	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_UDF");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("RESOURCE_VIEW_COL");
+	vElement.setElementValue(8);
+	vElement.setElementLabel("View Column");
+	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_VIEW_COL");
+	vElement.setEnumName(vEnum.getEnumName());
+	
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("RESOURCE_TOPOLOGY");
+	vElement.setElementValue(9);
+	vElement.setElementLabel("Topology");
+	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_TOPOLOGY");
+	vElement.setEnumName(vEnum.getEnumName());
+	
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("RESOURCE_SERVICE");
+	vElement.setElementValue(10);
+	vElement.setElementLabel("Service");
+	vElement.setRbKey("xa.enum.ResourceType.RESOURCE_SERVICE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::XAGroupType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_XAGroupType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_GROUP_UNKNOWN");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Unknown");
+	vElement.setRbKey("xa.enum.XAGroupType.XA_GROUP_UNKNOWN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_GROUP_USER");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("User");
+	vElement.setRbKey("xa.enum.XAGroupType.XA_GROUP_USER");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_GROUP_GROUP");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Group");
+	vElement.setRbKey("xa.enum.XAGroupType.XA_GROUP_GROUP");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_GROUP_ROLE");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("Role");
+	vElement.setRbKey("xa.enum.XAGroupType.XA_GROUP_ROLE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::XAPermForType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_XAPermForType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_FOR_UNKNOWN");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Unknown");
+	vElement.setRbKey("xa.enum.XAPermForType.XA_PERM_FOR_UNKNOWN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_FOR_USER");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Permission for Users");
+	vElement.setRbKey("xa.enum.XAPermForType.XA_PERM_FOR_USER");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_FOR_GROUP");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Permission for Groups");
+	vElement.setRbKey("xa.enum.XAPermForType.XA_PERM_FOR_GROUP");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// CommonEnums::XAPermType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_XAPermType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_UNKNOWN");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Unknown");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_UNKNOWN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_RESET");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Reset");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_RESET");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_READ");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Read");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_READ");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_WRITE");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("Write");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_WRITE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_CREATE");
+	vElement.setElementValue(4);
+	vElement.setElementLabel("Create");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_CREATE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_DELETE");
+	vElement.setElementValue(5);
+	vElement.setElementLabel("Delete");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_DELETE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_ADMIN");
+	vElement.setElementValue(6);
+	vElement.setElementLabel("Admin");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_ADMIN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_OBFUSCATE");
+	vElement.setElementValue(7);
+	vElement.setElementLabel("Obfuscate");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_OBFUSCATE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_MASK");
+	vElement.setElementValue(8);
+	vElement.setElementLabel("Mask");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_MASK");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_EXECUTE");
+	vElement.setElementValue(9);
+	vElement.setElementLabel("Execute");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_EXECUTE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_SELECT");
+	vElement.setElementValue(10);
+	vElement.setElementLabel("Select");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_SELECT");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_UPDATE");
+	vElement.setElementValue(11);
+	vElement.setElementLabel("Update");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_UPDATE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_DROP");
+	vElement.setElementValue(12);
+	vElement.setElementLabel("Drop");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_DROP");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_ALTER");
+	vElement.setElementValue(13);
+	vElement.setElementLabel("Alter");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_ALTER");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_INDEX");
+	vElement.setElementValue(14);
+	vElement.setElementLabel("Index");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_INDEX");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_LOCK");
+	vElement.setElementValue(15);
+	vElement.setElementLabel("Lock");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_LOCK");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_ALL");
+	vElement.setElementValue(16);
+	vElement.setElementLabel("All");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_ALL");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_ALLOW");
+	vElement.setElementValue(17);
+	vElement.setElementLabel("Allow");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_ALLOW");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_SUBMIT_TOPOLOGY");
+	vElement.setElementValue(18);
+	vElement.setElementLabel("Submit Topology");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_SUBMIT_TOPOLOGY");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_FILE_UPLOAD");
+	vElement.setElementValue(19);
+	vElement.setElementLabel("File Upload");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_FILE_UPLOAD");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_GET_NIMBUS");
+	vElement.setElementValue(20);
+	vElement.setElementLabel("Get Nimbus Conf");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_GET_NIMBUS");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_GET_CLUSTER_INFO");
+	vElement.setElementValue(21);
+	vElement.setElementLabel("Get Cluster Info");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_GET_CLUSTER_INFO");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_FILE_DOWNLOAD");
+	vElement.setElementValue(22);
+	vElement.setElementLabel("File Download");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_FILE_DOWNLOAD");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_KILL_TOPOLOGY");
+	vElement.setElementValue(23);
+	vElement.setElementLabel("Kill Topology");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_KILL_TOPOLOGY");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_REBALANCE");
+	vElement.setElementValue(24);
+	vElement.setElementLabel("Rebalance");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_REBALANCE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_ACTIVATE");
+	vElement.setElementValue(25);
+	vElement.setElementLabel("Activate");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_ACTIVATE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_DEACTIVATE");
+	vElement.setElementValue(26);
+	vElement.setElementLabel("Deactivate");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_DEACTIVATE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_GET_TOPOLOGY_CONF");
+	vElement.setElementValue(27);
+	vElement.setElementLabel("Get Topology Conf");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_GET_TOPOLOGY_CONF");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_GET_TOPOLOGY");
+	vElement.setElementValue(28);
+	vElement.setElementLabel("Get Topology");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_GET_TOPOLOGY");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_GET_USER_TOPOLOGY");
+	vElement.setElementValue(29);
+	vElement.setElementLabel("Get User Topology");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_GET_USER_TOPOLOGY");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_GET_TOPOLOGY_INFO");
+	vElement.setElementValue(30);
+	vElement.setElementLabel("Get Topology Info");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_GET_TOPOLOGY_INFO");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+	
+	vElement = new VEnumElement();
+	vElement.setElementName("XA_PERM_TYPE_UPLOAD_NEW_CREDENTIAL");
+	vElement.setElementValue(31);
+	vElement.setElementLabel("Upload New Credential");
+	vElement.setRbKey("xa.enum.XAPermType.XA_PERM_TYPE_UPLOAD_NEW_CREDENTIAL");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	
+	///////////////////////////////////
+	// CommonEnums::ClassTypes
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_CommonEnums_ClassTypes);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_NONE");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("None");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_NONE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_MESSAGE");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Message");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_MESSAGE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_USER_PROFILE");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("User Profile");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_USER_PROFILE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_AUTH_SESS");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("Authentication Session");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_AUTH_SESS");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_DATA_OBJECT");
+	vElement.setElementValue(4);
+	vElement.setElementLabel("CLASS_TYPE_DATA_OBJECT");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_DATA_OBJECT");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_NAMEVALUE");
+	vElement.setElementValue(5);
+	vElement.setElementLabel("CLASS_TYPE_NAMEVALUE");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_NAMEVALUE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_LONG");
+	vElement.setElementValue(6);
+	vElement.setElementLabel("CLASS_TYPE_LONG");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_LONG");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_PASSWORD_CHANGE");
+	vElement.setElementValue(7);
+	vElement.setElementLabel("CLASS_TYPE_PASSWORD_CHANGE");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_PASSWORD_CHANGE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_STRING");
+	vElement.setElementValue(8);
+	vElement.setElementLabel("CLASS_TYPE_STRING");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_STRING");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_ENUM");
+	vElement.setElementValue(9);
+	vElement.setElementLabel("CLASS_TYPE_ENUM");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_ENUM");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_ENUM_ELEMENT");
+	vElement.setElementValue(10);
+	vElement.setElementLabel("CLASS_TYPE_ENUM_ELEMENT");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_ENUM_ELEMENT");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_RESPONSE");
+	vElement.setElementValue(11);
+	vElement.setElementLabel("Response");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_RESPONSE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_XA_ASSET");
+	vElement.setElementValue(1000);
+	vElement.setElementLabel("Asset");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_ASSET");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_XA_RESOURCE");
+	vElement.setElementValue(1001);
+	vElement.setElementLabel("Resource");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_RESOURCE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_XA_GROUP");
+	vElement.setElementValue(1002);
+	vElement.setElementLabel("XA Group");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_GROUP");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_XA_USER");
+	vElement.setElementValue(1003);
+	vElement.setElementLabel("XA User");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_USER");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_XA_GROUP_USER");
+	vElement.setElementValue(1004);
+	vElement.setElementLabel("XA Group of Users");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_GROUP_USER");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_XA_GROUP_GROUP");
+	vElement.setElementValue(1005);
+	vElement.setElementLabel("XA Group of groups");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_GROUP_GROUP");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_XA_PERM_MAP");
+	vElement.setElementValue(1006);
+	vElement.setElementLabel("XA permissions for resource");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_PERM_MAP");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_XA_AUDIT_MAP");
+	vElement.setElementValue(1007);
+	vElement.setElementLabel("XA audits for resource");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_AUDIT_MAP");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_XA_CRED_STORE");
+	vElement.setElementValue(1008);
+	vElement.setElementLabel("XA credential store");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_CRED_STORE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_XA_POLICY_EXPORT_AUDIT");
+	vElement.setElementValue(1009);
+	vElement.setElementLabel("XA Policy Export Audit");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_POLICY_EXPORT_AUDIT");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_TRX_LOG");
+	vElement.setElementValue(1010);
+	vElement.setElementLabel("Transaction log");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_TRX_LOG");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_XA_ACCESS_AUDIT");
+	vElement.setElementValue(1011);
+	vElement.setElementLabel("Access Audit");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_ACCESS_AUDIT");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE");
+	vElement.setElementValue(1012);
+	vElement.setElementLabel("Transaction log attribute");
+	vElement.setRbKey("xa.enum.ClassTypes.CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// XXAuthSession::AuthStatus
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_XXAuthSession_AuthStatus);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("AUTH_STATUS_UNKNOWN");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Unknown");
+	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_UNKNOWN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("AUTH_STATUS_SUCCESS");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Success");
+	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_SUCCESS");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("AUTH_STATUS_WRONG_PASSWORD");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Wrong Password");
+	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_WRONG_PASSWORD");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("AUTH_STATUS_DISABLED");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("Account Disabled");
+	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_DISABLED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("AUTH_STATUS_LOCKED");
+	vElement.setElementValue(4);
+	vElement.setElementLabel("Locked");
+	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_LOCKED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("AUTH_STATUS_PASSWORD_EXPIRED");
+	vElement.setElementValue(5);
+	vElement.setElementLabel("Password Expired");
+	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_PASSWORD_EXPIRED");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("AUTH_STATUS_USER_NOT_FOUND");
+	vElement.setElementValue(6);
+	vElement.setElementLabel("User not found");
+	vElement.setRbKey("xa.enum.AuthStatus.AUTH_STATUS_USER_NOT_FOUND");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// XXAuthSession::AuthType
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_XXAuthSession_AuthType);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("AUTH_TYPE_UNKNOWN");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Unknown");
+	vElement.setRbKey("xa.enum.AuthType.AUTH_TYPE_UNKNOWN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("AUTH_TYPE_PASSWORD");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Username/Password");
+	vElement.setRbKey("xa.enum.AuthType.AUTH_TYPE_PASSWORD");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+	///////////////////////////////////
+	// XResponse::ResponseStatus
+	///////////////////////////////////
+	vEnum = new VEnum();
+	vEnum.setEnumName(ENUM_XResponse_ResponseStatus);
+	vEnum.setElementList(new ArrayList<VEnumElement>());
+	enumList.add(vEnum);
+	enumMap.put(vEnum.getEnumName(), vEnum);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("STATUS_SUCCESS");
+	vElement.setElementValue(0);
+	vElement.setElementLabel("Success");
+	vElement.setRbKey("xa.enum.ResponseStatus.STATUS_SUCCESS");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("STATUS_ERROR");
+	vElement.setElementValue(1);
+	vElement.setElementLabel("Error");
+	vElement.setRbKey("xa.enum.ResponseStatus.STATUS_ERROR");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("STATUS_VALIDATION");
+	vElement.setElementValue(2);
+	vElement.setElementLabel("Validation Error");
+	vElement.setRbKey("xa.enum.ResponseStatus.STATUS_VALIDATION");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("STATUS_WARN");
+	vElement.setElementValue(3);
+	vElement.setElementLabel("Warning");
+	vElement.setRbKey("xa.enum.ResponseStatus.STATUS_WARN");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("STATUS_INFO");
+	vElement.setElementValue(4);
+	vElement.setElementLabel("Information");
+	vElement.setRbKey("xa.enum.ResponseStatus.STATUS_INFO");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+	vElement = new VEnumElement();
+	vElement.setElementName("STATUS_PARTIAL_SUCCESS");
+	vElement.setElementValue(5);
+	vElement.setElementLabel("Partial Success");
+	vElement.setRbKey("xa.enum.ResponseStatus.STATUS_PARTIAL_SUCCESS");
+	vElement.setEnumName(vEnum.getEnumName());
+
+	vEnum.getElementList().add(vElement);
+
+
+    }
+
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java b/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java
new file mode 100644
index 0000000..eb34b42
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java
@@ -0,0 +1,156 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ package org.apache.ranger.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.apache.ranger.common.MessageEnums;
+import org.apache.ranger.common.RESTErrorUtil;
+import org.apache.ranger.common.RangerConfigUtil;
+import org.apache.ranger.common.StringUtil;
+import org.apache.ranger.entity.XXPortalUser;
+import org.apache.ranger.view.VXMessage;
+import org.apache.ranger.view.VXPortalUser;
+import org.apache.ranger.view.VXResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RangerRestUtil {
+	static final Logger logger = Logger.getLogger(RangerRestUtil.class);
+
+	@Autowired
+	StringUtil stringUtil;
+
+	@Autowired
+	RESTErrorUtil restErrorUtil;
+
+	@Autowired
+	RangerConfigUtil configUtil;
+
+	void splitUserRoleList(Collection<String> collection) {
+		Collection<String> newCollection = new ArrayList<String>();
+		for (String role : collection) {
+			String roles[] = role.split(",");
+			for (int i = 0; i < roles.length; i++) {
+				String str = roles[i];
+				newCollection.add(str);
+			}
+		}
+		collection.clear();
+		collection.addAll(newCollection);
+	}
+
+	/**
+	 * This method cleans up the data provided by the user for update
+	 * 
+	 * @param userProfile
+	 * @return
+	 */
+	public void validateVUserProfileForUpdate(XXPortalUser gjUser,
+			VXPortalUser userProfile) {
+
+		List<VXMessage> messageList = new ArrayList<VXMessage>();
+
+		// Email Update is allowed.
+		// if (userProfile.getEmailAddress() != null
+		// && !userProfile.getEmailAddress().equalsIgnoreCase(
+		// gjUser.getEmailAddress())) {
+		// throw restErrorUtil.createRESTException(
+		// "Email address can't be updated",
+		// MessageEnums.DATA_NOT_UPDATABLE, null, "emailAddress",
+		// userProfile.getEmailAddress());
+		// }
+
+		// Login Id can't be changed
+		if (userProfile.getLoginId() != null
+				&& !gjUser.getLoginId().equalsIgnoreCase(
+						userProfile.getLoginId())) {
+			throw restErrorUtil.createRESTException(
+					"Username can't be updated",
+					MessageEnums.DATA_NOT_UPDATABLE, null, "loginId",
+					userProfile.getLoginId());
+		}
+		// }
+		userProfile.setFirstName(restErrorUtil.validateStringForUpdate(
+				userProfile.getFirstName(), gjUser.getFirstName(),
+				StringUtil.VALIDATION_NAME, "Invalid first name",
+				MessageEnums.INVALID_INPUT_DATA, null, "firstName"));
+
+		userProfile.setFirstName(restErrorUtil.validateStringForUpdate(
+				userProfile.getFirstName(), gjUser.getFirstName(),
+				StringUtil.VALIDATION_NAME, "Invalid first name",
+				MessageEnums.INVALID_INPUT_DATA, null, "firstName"));
+
+		userProfile.setLastName(restErrorUtil.validateStringForUpdate(
+				userProfile.getLastName(), gjUser.getLastName(),
+				StringUtil.VALIDATION_NAME, "Invalid last name",
+				MessageEnums.INVALID_INPUT_DATA, null, "lastName"));
+
+		// firstName
+		if (!stringUtil.isValidName(userProfile.getFirstName())) {
+			logger.info("Invalid first name." + userProfile);
+			messageList.add(MessageEnums.INVALID_INPUT_DATA.getMessage(null,
+					"firstName"));
+		}
+
+		// lastName
+		if (!stringUtil.isValidName(userProfile.getLastName())) {
+			logger.info("Invalid last name." + userProfile);
+			messageList.add(MessageEnums.INVALID_INPUT_DATA.getMessage(null,
+					"lastName"));
+		}
+
+		// create the public screen name
+		userProfile.setPublicScreenName(userProfile.getFirstName() + " "
+				+ userProfile.getLastName());
+
+		userProfile.setNotes(restErrorUtil.validateStringForUpdate(
+				userProfile.getNotes(), gjUser.getNotes(),
+				StringUtil.VALIDATION_NAME, "Invalid notes",
+				MessageEnums.INVALID_INPUT_DATA, null, "notes"));
+
+		// validate user roles
+		if (userProfile.getUserRoleList() != null) {
+			// First let's normalize it
+			splitUserRoleList(userProfile.getUserRoleList());
+			for (String userRole : userProfile.getUserRoleList()) {
+				restErrorUtil.validateStringList(userRole,
+						configUtil.getRoles(), "Invalid role", null,
+						"userRoleList");
+			}
+
+		}
+		if (messageList.size() > 0) {
+			VXResponse gjResponse = new VXResponse();
+			gjResponse.setStatusCode(VXResponse.STATUS_ERROR);
+			gjResponse.setMsgDesc("Validation failure");
+			gjResponse.setMessageList(messageList);
+			logger.info("Validation Error in updateUser() userProfile="
+					+ userProfile + ", error=" + gjResponse);
+			throw restErrorUtil.createRESTException(gjResponse);
+		}
+
+	}
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/util/RestUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/util/RestUtil.java b/security-admin/src/main/java/org/apache/ranger/util/RestUtil.java
index 9500cf8..cdb0a7d 100644
--- a/security-admin/src/main/java/org/apache/ranger/util/RestUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/util/RestUtil.java
@@ -22,7 +22,7 @@
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.ranger.security.context.XAContextHolder;
+import org.apache.ranger.security.context.RangerContextHolder;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -60,13 +60,13 @@ public class RestUtil {
 	public static int getClientTimeOffset(){
 		int clientTimeOffsetInMinute = 0;
 		try{
-			clientTimeOffsetInMinute= XAContextHolder.getSecurityContext().getRequestContext().getClientTimeOffsetInMinute();
+			clientTimeOffsetInMinute= RangerContextHolder.getSecurityContext().getRequestContext().getClientTimeOffsetInMinute();
 		}catch(Exception ex){
 			
 		}
 		if(clientTimeOffsetInMinute==0){
 			try{
-				clientTimeOffsetInMinute= XAContextHolder.getSecurityContext().getUserSession().getClientTimeOffsetInMinute();
+				clientTimeOffsetInMinute= RangerContextHolder.getSecurityContext().getUserSession().getClientTimeOffsetInMinute();
 			}catch(Exception ex){
 				
 			}

[05/12] incubator-ranger git commit: RANGER-194: Rename classes under web-admin project

Posted by ma...@apache.org.

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java
index ddbe4c6..680fa67 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupGroupServiceBase.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXGroupGroup;
+import org.apache.ranger.view.VXGroupGroup;
+import org.apache.ranger.view.VXGroupGroupList;
 
 public abstract class XGroupGroupServiceBase<T extends XXGroupGroup, V extends VXGroupGroup>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java
index c1e8956..6a45555 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java
@@ -24,21 +24,20 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import org.apache.ranger.biz.*;
 import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.PropertiesUtil;
 import org.apache.ranger.common.SearchField;
 import org.apache.ranger.common.SortField;
 import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.XACommonEnums;
-import org.apache.ranger.common.SortField.SORT_ORDER;
 import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.util.XAEnumUtil;
-import org.apache.ranger.view.*;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.entity.XXAsset;
+import org.apache.ranger.entity.XXGroup;
+import org.apache.ranger.entity.XXPortalUser;
+import org.apache.ranger.entity.XXTrxLog;
+import org.apache.ranger.util.RangerEnumUtil;
+import org.apache.ranger.view.VXGroup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
@@ -50,10 +49,10 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> {
 	public static Long createdByUserId = 1L;
 	
 	@Autowired
-	XADaoManager xADaoManager;
+	RangerDaoManager rangerDaoManager;
 	
 	@Autowired
-	XAEnumUtil xaEnumUtil;
+	RangerEnumUtil xaEnumUtil;
 	
 	@Autowired
 	StringUtil stringUtil;
@@ -77,7 +76,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> {
 
 	@Override
 	protected void validateForCreate(VXGroup vObj) {
-		XXGroup xxGroup = xADaoManager.getXXGroup().findByGroupName(
+		XXGroup xxGroup = rangerDaoManager.getXXGroup().findByGroupName(
 				vObj.getName());
 		if (xxGroup != null) {
 			throw restErrorUtil.createRESTException("XGroup already exists",
@@ -94,7 +93,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> {
 	}
 
 	public VXGroup getGroupByGroupName(String groupName) {
-		XXGroup xxGroup = xADaoManager.getXXGroup().findByGroupName(groupName);
+		XXGroup xxGroup = rangerDaoManager.getXXGroup().findByGroupName(groupName);
 
 		if (xxGroup == null) {
 			throw restErrorUtil.createRESTException(
@@ -104,7 +103,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> {
 	}
 	
 	public VXGroup createXGroupWithOutLogin(VXGroup vxGroup) {
-		XXGroup xxGroup = xADaoManager.getXXGroup().findByGroupName(
+		XXGroup xxGroup = rangerDaoManager.getXXGroup().findByGroupName(
 				vxGroup.getName());
 		boolean groupExists = true;
 
@@ -114,7 +113,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> {
 		}
 
 		xxGroup = mapViewToEntityBean(vxGroup, xxGroup, 0);
-		XXPortalUser xXPortalUser = xADaoManager.getXXPortalUser().getById(createdByUserId);
+		XXPortalUser xXPortalUser = rangerDaoManager.getXXPortalUser().getById(createdByUserId);
 		if (xXPortalUser != null) {
 			xxGroup.setAddedByUserId(createdByUserId);
 			xxGroup.setUpdatedByUserId(createdByUserId);

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java
index b6cb0ca..c3eebc0 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupServiceBase.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXGroup;
+import org.apache.ranger.view.VXGroup;
+import org.apache.ranger.view.VXGroupList;
 
 public abstract class XGroupServiceBase<T extends XXGroup, V extends VXGroup>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java
index 720a389..4af9049 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java
@@ -28,12 +28,16 @@ import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.PropertiesUtil;
 import org.apache.ranger.common.SearchField;
-import org.apache.ranger.common.XACommonEnums;
 import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.util.XAEnumUtil;
-import org.apache.ranger.view.*;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.entity.XXAsset;
+import org.apache.ranger.entity.XXGroup;
+import org.apache.ranger.entity.XXGroupUser;
+import org.apache.ranger.entity.XXPortalUser;
+import org.apache.ranger.entity.XXTrxLog;
+import org.apache.ranger.entity.XXUser;
+import org.apache.ranger.util.RangerEnumUtil;
+import org.apache.ranger.view.VXGroupUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
@@ -46,10 +50,10 @@ public class XGroupUserService extends
 	public static Long createdByUserId = 1L;
 	
 	@Autowired
-	XADaoManager xADaoManager;
+	RangerDaoManager rangerDaoManager;
 
 	@Autowired
-	XAEnumUtil xaEnumUtil;
+	RangerEnumUtil xaEnumUtil;
 	
 	static HashMap<String, VTrxLogAttr> trxLogAttrs = new HashMap<String, VTrxLogAttr>();
 	static {
@@ -84,7 +88,7 @@ public class XGroupUserService extends
 		XXGroup xGroup = daoManager.getXXGroup().findByGroupName(vxGroupUser.getName());
 		vxGroupUser.setParentGroupId(xGroup.getId());
 		xxGroupUser = mapViewToEntityBean(vxGroupUser, xxGroupUser, 0);
-		XXPortalUser xXPortalUser = xADaoManager.getXXPortalUser().getById(createdByUserId);
+		XXPortalUser xXPortalUser = rangerDaoManager.getXXPortalUser().getById(createdByUserId);
 		if (xXPortalUser != null) {
 			xxGroupUser.setAddedByUserId(createdByUserId);
 			xxGroupUser.setUpdatedByUserId(createdByUserId);
@@ -117,11 +121,11 @@ public class XGroupUserService extends
 //		}
 		
 		Long groupId = vObj.getParentGroupId();
-		XXGroup xGroup = xADaoManager.getXXGroup().getById(groupId);
+		XXGroup xGroup = rangerDaoManager.getXXGroup().getById(groupId);
 		String groupName = xGroup.getName();
 
 		Long userId = vObj.getUserId();
-		XXUser xUser = xADaoManager.getXXUser().getById(userId);
+		XXUser xUser = rangerDaoManager.getXXUser().getById(userId);
 		String userName = xUser.getName();
 
 		List<XXTrxLog> trxLogList = new ArrayList<XXTrxLog>();
@@ -148,7 +152,7 @@ public class XGroupUserService extends
 					value = xaEnumUtil.getLabel(enumName, enumValue);
 				} else {
 					value = ""+field.get(vObj);
-					XXGroup xXGroup = xADaoManager.getXXGroup().getById(Long.parseLong(value));
+					XXGroup xXGroup = rangerDaoManager.getXXGroup().getById(Long.parseLong(value));
 					value = xXGroup.getName();
 				}
 				

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java
index a27cf44..25779f2 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserServiceBase.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXGroupUser;
+import org.apache.ranger.view.VXGroupUser;
+import org.apache.ranger.view.VXGroupUserList;
 
 public abstract class XGroupUserServiceBase<T extends XXGroupUser, V extends VXGroupUser>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java b/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java
index ce1a2a1..146a953 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java
@@ -24,15 +24,21 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import org.apache.commons.lang.ArrayUtils;
 import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.SearchField;
 import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.util.XAEnumUtil;
-import org.apache.ranger.view.*;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.entity.XXGroup;
+import org.apache.ranger.entity.XXPermMap;
+import org.apache.ranger.entity.XXPortalUser;
+import org.apache.ranger.entity.XXTrxLog;
+import org.apache.ranger.entity.XXUser;
+import org.apache.ranger.util.RangerEnumUtil;
+import org.apache.ranger.view.VXGroup;
+import org.apache.ranger.view.VXPermMap;
+import org.apache.ranger.view.VXPermMapList;
+import org.apache.ranger.view.VXUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
@@ -48,10 +54,10 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
 	XUserService xUserService;
 	
 	@Autowired
-	XAEnumUtil xaEnumUtil;
+	RangerEnumUtil xaEnumUtil;
 
 	@Autowired
-	XADaoManager xADaoManager;
+	RangerDaoManager rangerDaoManager;
 
 	static HashMap<String, VTrxLogAttr> trxLogAttrs = new HashMap<String, VTrxLogAttr>();
 	static {
@@ -160,11 +166,11 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
 		
 		if(isGroupPolicy){
 			groupId = vObj.getGroupId();
-			XXGroup xGroup = xADaoManager.getXXGroup().getById(groupId);
+			XXGroup xGroup = rangerDaoManager.getXXGroup().getById(groupId);
 			groupName = xGroup.getName();
 		} else {
 			userId = vObj.getUserId();
-			XXUser xUser = xADaoManager.getXXUser().getById(userId);
+			XXUser xUser = rangerDaoManager.getXXUser().getById(userId);
 			userName = xUser.getName();
 		}
 
@@ -195,8 +201,8 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
 //						}
 //					}
 				}
-				Long assetId = xADaoManager.getXXResource().getById(vObj.getResourceId()).getAssetId();
-				int policyType = xADaoManager.getXXAsset().getById(assetId).getAssetType();
+				Long assetId = rangerDaoManager.getXXResource().getById(vObj.getResourceId()).getAssetId();
+				int policyType = rangerDaoManager.getXXAsset().getById(assetId).getAssetType();
 				if(policyType != AppConstants.ASSET_KNOX){
 					if(fieldName.equals("ipAddress"))
 						continue;
@@ -215,7 +221,7 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
 					value = xaEnumUtil.getLabel(enumName, enumValue);
 				} else {
 					value = ""+field.get(vObj);
-//					XXUser xUser = xADaoManager.getXXUser().getById(Long.parseLong(value));
+//					XXUser xUser = rangerDaoManager.getXXUser().getById(Long.parseLong(value));
 //					value = xUser.getName();
 					if(fieldName.equals("ipAddress") && action.equalsIgnoreCase("update")){
 						prevValue = ""+field.get(mObj);
@@ -273,7 +279,7 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
 			XXPortalUser xXPortalUser=null;
 			if(mObj.getAddedByUserId()==null || mObj.getAddedByUserId()==0){
 				if(!stringUtil.isEmpty(vObj.getOwner())){
-					xXPortalUser=xADaoManager.getXXPortalUser().findByLoginId(vObj.getOwner());	
+					xXPortalUser=rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getOwner());	
 					if(xXPortalUser!=null){
 						mObj.setAddedByUserId(xXPortalUser.getId());
 					}
@@ -281,7 +287,7 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
 			}
 			if(mObj.getUpdatedByUserId()==null || mObj.getUpdatedByUserId()==0){
 				if(!stringUtil.isEmpty(vObj.getUpdatedBy())){
-					xXPortalUser= xADaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());			
+					xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());			
 					if(xXPortalUser!=null){
 						mObj.setUpdatedByUserId(xXPortalUser.getId());
 					}		
@@ -297,13 +303,13 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
 		if(mObj!=null && vObj!=null){
 			XXPortalUser xXPortalUser=null;
 			if(stringUtil.isEmpty(vObj.getOwner())){
-				xXPortalUser= xADaoManager.getXXPortalUser().getById(mObj.getAddedByUserId());	
+				xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId());	
 				if(xXPortalUser!=null){
 					vObj.setOwner(xXPortalUser.getLoginId());
 				}
 			}
 			if(stringUtil.isEmpty(vObj.getUpdatedBy())){
-				xXPortalUser= xADaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());		
+				xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());		
 				if(xXPortalUser!=null){
 					vObj.setUpdatedBy(xXPortalUser.getLoginId());
 				}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java
index 3ff0d72..afcd307 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPermMapServiceBase.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXPermMap;
+import org.apache.ranger.view.VXPermMap;
+import org.apache.ranger.view.VXPermMapList;
 
 public abstract class XPermMapServiceBase<T extends XXPermMap, V extends VXPermMap>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java
index b242f0b..a8fe1de 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditService.java
@@ -20,12 +20,12 @@
  package org.apache.ranger.service;
 
 import org.apache.ranger.common.SearchField;
-import org.apache.ranger.common.SortField;
 import org.apache.ranger.common.SearchField.DATA_TYPE;
 import org.apache.ranger.common.SearchField.SEARCH_TYPE;
+import org.apache.ranger.common.SortField;
 import org.apache.ranger.common.SortField.SORT_ORDER;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.entity.XXPolicyExportAudit;
+import org.apache.ranger.view.VXPolicyExportAudit;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java
index 6b05c9e..af58706 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXPolicyExportAudit;
+import org.apache.ranger.view.VXPolicyExportAudit;
+import org.apache.ranger.view.VXPolicyExportAuditList;
 
 public abstract class XPolicyExportAuditServiceBase<T extends XXPolicyExportAudit, V extends VXPolicyExportAudit>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java b/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java
index b95a3e3..42de408 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java
@@ -37,7 +37,7 @@ import org.apache.ranger.common.PropertiesUtil;
 import org.apache.ranger.common.RESTErrorUtil;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.db.XADaoManager;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.entity.XXAsset;
 import org.apache.ranger.entity.XXGroup;
 import org.apache.ranger.entity.XXPermMap;
@@ -67,7 +67,7 @@ public class XPolicyService extends PublicAPIServiceBase<VXResource, VXPolicy> {
 	StringUtil stringUtil;
 
 	@Autowired
-	XADaoManager xaDaoMgr;
+	RangerDaoManager xaDaoMgr;
 
 	@Autowired
 	XPermMapService xPermMapService;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java
index aafedfe..9dffbcb 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPortalUserService.java
@@ -27,9 +27,11 @@ import java.util.List;
 import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.StringUtil;
 import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.util.XAEnumUtil;
-import org.apache.ranger.view.*;
+import org.apache.ranger.entity.XXAsset;
+import org.apache.ranger.entity.XXPortalUser;
+import org.apache.ranger.entity.XXTrxLog;
+import org.apache.ranger.util.RangerEnumUtil;
+import org.apache.ranger.view.VXPortalUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
@@ -40,7 +42,7 @@ public class XPortalUserService extends
 		XPortalUserServiceBase<XXPortalUser, VXPortalUser> {
 
 	@Autowired
-	XAEnumUtil xaEnumUtil;
+	RangerEnumUtil xaEnumUtil;
 
 	@Autowired
 	StringUtil stringUtil;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java
index 602e87d..c5fdec9 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPortalUserServiceBase.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXPortalUser;
+import org.apache.ranger.view.VXPortalUser;
+import org.apache.ranger.view.VXPortalUserList;
 
 public abstract class XPortalUserServiceBase<T extends XXPortalUser, V extends VXPortalUser>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java b/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java
index 5f00ced..fcaa4d8 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XRepositoryService.java
@@ -28,8 +28,8 @@ import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.PropertiesUtil;
 import org.apache.ranger.common.RESTErrorUtil;
+import org.apache.ranger.common.RangerCommonEnums;
 import org.apache.ranger.common.SearchCriteria;
-import org.apache.ranger.common.XACommonEnums;
 import org.apache.ranger.view.VXAsset;
 import org.apache.ranger.view.VXAssetList;
 import org.apache.ranger.view.VXRepository;
@@ -61,7 +61,7 @@ public class XRepositoryService extends
 		vRepo.setConfig(vXAsset.getConfig());
 		
 		int actStatus = vXAsset.getActiveStatus();
-		boolean isAct = (actStatus == XACommonEnums.STATUS_DISABLED) ? false
+		boolean isAct = (actStatus == RangerCommonEnums.STATUS_DISABLED) ? false
 				: true;
 
 		vRepo.setIsActive(isAct);
@@ -81,8 +81,8 @@ public class XRepositoryService extends
 				.getRepositoryType()));
 		vXAsset.setConfig(vXRepo.getConfig());
 		
-		int actStatus = (!vXRepo.getIsActive()) ? XACommonEnums.STATUS_DISABLED
-				: XACommonEnums.STATUS_ENABLED;
+		int actStatus = (!vXRepo.getIsActive()) ? RangerCommonEnums.STATUS_DISABLED
+				: RangerCommonEnums.STATUS_ENABLED;
 
 		vXAsset.setActiveStatus(actStatus);
 
@@ -97,8 +97,8 @@ public class XRepositoryService extends
 
 		ArrayList<Integer> statusList = new ArrayList<Integer>();
 		if (statusObj == null) {
-			statusList.add(XACommonEnums.STATUS_DISABLED);
-			statusList.add(XACommonEnums.STATUS_ENABLED);
+			statusList.add(RangerCommonEnums.STATUS_DISABLED);
+			statusList.add(RangerCommonEnums.STATUS_ENABLED);
 		} else {
 			boolean status = restErrorUtil.parseBoolean(
 					request.getParameter("status"), "Invalid value for "

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
index 3ee48a5..b85ae55 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
@@ -19,7 +19,6 @@
 
  package org.apache.ranger.service;
 
-import java.io.File;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,25 +27,36 @@ import java.util.List;
 import java.util.Map.Entry;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.ranger.biz.XABizUtil;
+import org.apache.ranger.biz.RangerBizUtil;
 import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.ContextUtil;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.PropertiesUtil;
+import org.apache.ranger.common.RangerConstants;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.SearchField;
+import org.apache.ranger.common.SearchField.DATA_TYPE;
+import org.apache.ranger.common.SearchField.SEARCH_TYPE;
 import org.apache.ranger.common.SortField;
 import org.apache.ranger.common.StringUtil;
 import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.common.XAConstants;
-import org.apache.ranger.common.SearchField.DATA_TYPE;
-import org.apache.ranger.common.SearchField.SEARCH_TYPE;
 import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.util.XAEnumUtil;
-import org.apache.ranger.view.*;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.entity.XXAsset;
+import org.apache.ranger.entity.XXGroup;
+import org.apache.ranger.entity.XXPermMap;
+import org.apache.ranger.entity.XXPortalUser;
+import org.apache.ranger.entity.XXResource;
+import org.apache.ranger.entity.XXTrxLog;
+import org.apache.ranger.entity.XXUser;
+import org.apache.ranger.util.RangerEnumUtil;
+import org.apache.ranger.view.VXAuditMap;
+import org.apache.ranger.view.VXAuditMapList;
+import org.apache.ranger.view.VXPermMap;
+import org.apache.ranger.view.VXPermMapList;
+import org.apache.ranger.view.VXResource;
+import org.apache.ranger.view.VXResourceList;
+import org.apache.ranger.view.VXResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
@@ -68,12 +78,12 @@ public class XResourceService extends
 	StringUtil stringUtil;
 	
 	@Autowired
-	XADaoManager xADaoManager;
+	RangerDaoManager rangerDaoManager;
 	@Autowired
-	XABizUtil xaBizUtil;
+	RangerBizUtil xaBizUtil;
 	
 	@Autowired
-	XAEnumUtil xaEnumUtil;
+	RangerEnumUtil xaEnumUtil;
 	
 	@Autowired
 	XPolicyService xPolicyService;
@@ -185,7 +195,7 @@ public class XResourceService extends
 		Long assetId = vObj.getAssetId();
 		int assetType;
 		if(assetId != null){
-			XXAsset xAsset = xADaoManager.getXXAsset().getById(assetId);
+			XXAsset xAsset = rangerDaoManager.getXXAsset().getById(assetId);
 			if(xAsset != null){
 				assetType = xAsset.getAssetType();
 			} else {
@@ -326,7 +336,7 @@ public class XResourceService extends
 	}
 
 	private void populateAssetProperties(VXResource vXResource) {
-		XXAsset xxAsset = xADaoManager.getXXAsset().getById(
+		XXAsset xxAsset = rangerDaoManager.getXXAsset().getById(
 				vXResource.getAssetId());
 		if (xxAsset != null) {
 			vXResource.setAssetName(xxAsset.getName());
@@ -420,7 +430,7 @@ public class XResourceService extends
 			XXPortalUser xXPortalUser= null;
 			if(mObj.getAddedByUserId()==null || mObj.getAddedByUserId()==0){
 				if(!stringUtil.isEmpty(vObj.getOwner())){
-					xXPortalUser=xADaoManager.getXXPortalUser().findByLoginId(vObj.getOwner());	
+					xXPortalUser=rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getOwner());	
 					if(xXPortalUser!=null){
 						mObj.setAddedByUserId(xXPortalUser.getId());
 					}
@@ -428,7 +438,7 @@ public class XResourceService extends
 			}
 			if(mObj.getUpdatedByUserId()==null || mObj.getUpdatedByUserId()==0){
 				if(!stringUtil.isEmpty(vObj.getUpdatedBy())){
-					xXPortalUser= xADaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());			
+					xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());			
 					if(xXPortalUser!=null){
 						mObj.setUpdatedByUserId(xXPortalUser.getId());
 					}		
@@ -447,13 +457,13 @@ public class XResourceService extends
 		if(mObj!=null && vObj!=null){			
 			XXPortalUser xXPortalUser= null;
 			if(stringUtil.isEmpty(vObj.getOwner())){
-				xXPortalUser=xADaoManager.getXXPortalUser().getById(mObj.getAddedByUserId());		
+				xXPortalUser=rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId());		
 				if(xXPortalUser!=null){
 					vObj.setOwner(xXPortalUser.getLoginId());
 				}
 			}
 			if(stringUtil.isEmpty(vObj.getUpdatedBy())){
-				xXPortalUser= xADaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());		
+				xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());		
 				if(xXPortalUser!=null){
 					vObj.setUpdatedBy(xXPortalUser.getLoginId());
 				}	
@@ -468,7 +478,7 @@ public class XResourceService extends
 	 */
 	public void checkAccess(VXResource vXResource) {
 		
-		XXAsset xxAsset = xADaoManager.getXXAsset().getById(
+		XXAsset xxAsset = rangerDaoManager.getXXAsset().getById(
 				vXResource.getAssetId());
 		if (xxAsset == null) {
 			throw restErrorUtil
@@ -531,7 +541,7 @@ public class XResourceService extends
 								resourceTypeList);
 
 						if (!access) {
-							XXUser xxUser = xADaoManager.getXXUser().getById(
+							XXUser xxUser = rangerDaoManager.getXXUser().getById(
 									vxPermMap.getUserId());
 							throw restErrorUtil.createRESTException(
 											xxUser.getName() + " may not have "
@@ -553,7 +563,7 @@ public class XResourceService extends
 								vXResource.getIsRecursive(), assetType,
 								resourceTypeList);
 						if (!access) {
-							XXGroup xxGroup = xADaoManager.getXXGroup()
+							XXGroup xxGroup = rangerDaoManager.getXXGroup()
 									.getById(vxPermMap.getGroupId());
 							throw restErrorUtil.createRESTException(xxGroup
 									.getName() + " may not have " + AppConstants
@@ -644,19 +654,19 @@ public class XResourceService extends
 			int isRecursive, List<Integer> resourceTypeList) {
 		HashMap<String, Object> accessMap = new HashMap<String, Object>();
 		boolean isAccess = false;
-		List<XXGroup> xGroupList = xADaoManager.getXXGroup().findByUserId(
+		List<XXGroup> xGroupList = rangerDaoManager.getXXGroup().findByUserId(
 				userId);
 		boolean isRecursivlyAllowed = false;
 		List<XXResource> xXResourceList = null;
 		if (assetType == AppConstants.ASSET_HDFS) {
-			xXResourceList = xADaoManager.getXXResource().findByAssetId(
+			xXResourceList = rangerDaoManager.getXXResource().findByAssetId(
 					assetId);
 			//this code block is to add record of 'public' group in group_user mapping list.
-			XXGroup xXGroupPublic = xADaoManager.getXXGroup().
-					findByGroupName(XAConstants.GROUP_PUBLIC);
+			XXGroup xXGroupPublic = rangerDaoManager.getXXGroup().
+					findByGroupName(RangerConstants.GROUP_PUBLIC);
 			if (xXGroupPublic != null
 					&& xXGroupPublic.getName().trim()
-							.equalsIgnoreCase(XAConstants.GROUP_PUBLIC)) {
+							.equalsIgnoreCase(RangerConstants.GROUP_PUBLIC)) {
 				if(xGroupList!=null){
 					xGroupList.add(xXGroupPublic);
 				}else{
@@ -665,7 +675,7 @@ public class XResourceService extends
 				}
 			}
 		} else {
-			xXResourceList = xADaoManager.getXXResource()
+			xXResourceList = rangerDaoManager.getXXResource()
 					.findByAssetIdAndResourceTypes(assetId, resourceTypeList);
 		}
 		String expandedName = xaBizUtil.replaceMetaChars(path);
@@ -715,7 +725,7 @@ public class XResourceService extends
 				}
 				if (matchFound) {
 					// get the perms for this resource
-					List<XXPermMap> permMapList = xADaoManager.getXXPermMap()
+					List<XXPermMap> permMapList = rangerDaoManager.getXXPermMap()
 							.findByResourceId(xResource.getId());
 					for (XXPermMap permMap : permMapList) {
 						if (permMap.getPermType() == permType) {
@@ -751,10 +761,10 @@ public class XResourceService extends
 		List<XXResource> xXResourceList = new ArrayList<XXResource>();
 		
 		if (assetType == AppConstants.ASSET_HDFS) {
-			xXResourceList = xADaoManager.getXXResource().findByAssetId(
+			xXResourceList = rangerDaoManager.getXXResource().findByAssetId(
 					assetId);
 		} else {
-			xXResourceList = xADaoManager.getXXResource()
+			xXResourceList = rangerDaoManager.getXXResource()
 					.findByAssetIdAndResourceTypes(assetId, resourceTypeList);
 		}
 		
@@ -805,7 +815,7 @@ public class XResourceService extends
 			}
 			if (matchFound) {
 				// get the perms for this resource
-				List<XXPermMap> permMapList = xADaoManager.getXXPermMap()
+				List<XXPermMap> permMapList = rangerDaoManager.getXXPermMap()
 						.findByResourceId(xResource.getId());
 				for (XXPermMap permMap : permMapList) {
 					if (permMap.getPermType() == permType) {
@@ -945,7 +955,7 @@ public class XResourceService extends
 			return null;
 		}
 
-		XXAsset xAsset = xADaoManager.getXXAsset().getById(vObj.getAssetId());
+		XXAsset xAsset = rangerDaoManager.getXXAsset().getById(vObj.getAssetId());
 		String parentObjectName = xAsset.getName();
 		
 		List<XXTrxLog> trxLogList = new ArrayList<XXTrxLog>();

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java
index 39b0838..4c123ef 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XResourceServiceBase.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXResource;
+import org.apache.ranger.view.VXResource;
+import org.apache.ranger.view.VXResourceList;
 
 public abstract class XResourceServiceBase<T extends XXResource, V extends VXResource>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
index 8a61aea..7edce5b 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
@@ -26,13 +26,10 @@ import java.util.List;
 import java.util.Map;
 
 import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.ParameterExpression;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Subquery;
 import javax.persistence.metamodel.EntityType;
 import javax.persistence.metamodel.Metamodel;
 import javax.persistence.metamodel.SingularAttribute;
@@ -41,10 +38,12 @@ import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.SearchField;
 import org.apache.ranger.common.SortField;
 import org.apache.ranger.common.SortField.SORT_ORDER;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.entity.*;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.entity.XXPortalUser;
+import org.apache.ranger.entity.XXTrxLog;
 import org.apache.ranger.entity.view.VXXTrxLog;
-import org.apache.ranger.view.*;
+import org.apache.ranger.view.VXTrxLog;
+import org.apache.ranger.view.VXTrxLogList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
@@ -53,7 +52,7 @@ import org.springframework.stereotype.Service;
 @Scope("singleton")
 public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
 	@Autowired
-	XADaoManager xADaoManager;
+	RangerDaoManager rangerDaoManager;
 	public XTrxLogService(){
 		searchFields.add(new SearchField("attributeName", "obj.attributeName",
 				SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL));
@@ -191,7 +190,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
 			VXTrxLog trxLog = mapCustomViewToViewObj(xTrxLog);
 			xXPortalUser=null;
 			if(trxLog.getUpdatedBy()!=null){
-				xXPortalUser= xADaoManager.getXXPortalUser().getById(
+				xXPortalUser= rangerDaoManager.getXXPortalUser().getById(
 						Long.parseLong(trxLog.getUpdatedBy()));
 			}			
 			if(xXPortalUser!=null){
@@ -419,7 +418,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
 			XXPortalUser xXPortalUser=null;
 			if(mObj.getAddedByUserId()==null || mObj.getAddedByUserId()==0){
 				if(!stringUtil.isEmpty(vObj.getOwner())){
-					xXPortalUser=xADaoManager.getXXPortalUser().findByLoginId(vObj.getOwner());	
+					xXPortalUser=rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getOwner());	
 					if(xXPortalUser!=null){
 						mObj.setAddedByUserId(xXPortalUser.getId());
 					}
@@ -427,7 +426,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
 			}
 			if(mObj.getUpdatedByUserId()==null || mObj.getUpdatedByUserId()==0){
 				if(!stringUtil.isEmpty(vObj.getUpdatedBy())){
-					xXPortalUser= xADaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());			
+					xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());			
 					if(xXPortalUser!=null){
 						mObj.setUpdatedByUserId(xXPortalUser.getId());
 					}		
@@ -443,13 +442,13 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
 		if(mObj!=null && vObj!=null){
 			XXPortalUser xXPortalUser=null;
 			if(stringUtil.isEmpty(vObj.getOwner())){
-				xXPortalUser= xADaoManager.getXXPortalUser().getById(mObj.getAddedByUserId());	
+				xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId());	
 				if(xXPortalUser!=null){
 					vObj.setOwner(xXPortalUser.getLoginId());
 				}
 			}
 			if(stringUtil.isEmpty(vObj.getUpdatedBy())){
-				xXPortalUser= xADaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());		
+				xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());		
 				if(xXPortalUser!=null){
 					vObj.setUpdatedBy(xXPortalUser.getLoginId());
 				}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java
index 5b5cd43..e23ee6c 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogServiceBase.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXTrxLog;
+import org.apache.ranger.view.VXTrxLog;
+import org.apache.ranger.view.VXTrxLogList;
 
 public abstract class XTrxLogServiceBase<T extends XXTrxLog, V extends VXTrxLog>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
index 1f09e61..5e4875f 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
@@ -22,25 +22,28 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.ranger.biz.XABizUtil;
+import org.apache.ranger.biz.RangerBizUtil;
 import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.PropertiesUtil;
+import org.apache.ranger.common.RangerConstants;
 import org.apache.ranger.common.SearchField;
 import org.apache.ranger.common.SortField;
 import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.XACommonEnums;
-import org.apache.ranger.common.XAConstants;
 import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.util.XAEnumUtil;
-import org.apache.ranger.view.*;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.entity.XXGroupUser;
+import org.apache.ranger.entity.XXPortalUser;
+import org.apache.ranger.entity.XXPortalUserRole;
+import org.apache.ranger.entity.XXTrxLog;
+import org.apache.ranger.entity.XXUser;
+import org.apache.ranger.util.RangerEnumUtil;
+import org.apache.ranger.view.VXPortalUser;
+import org.apache.ranger.view.VXUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
@@ -52,7 +55,7 @@ public class XUserService extends XUserServiceBase<XXUser, VXUser> {
 	public static Long createdByUserId = 1L;
 
 	@Autowired
-	XADaoManager daoManager;
+	RangerDaoManager daoManager;
 
 	@Autowired
 	XPermMapService xPermMapService;
@@ -61,10 +64,10 @@ public class XUserService extends XUserServiceBase<XXUser, VXUser> {
 	StringUtil stringUtil;
 
 	@Autowired
-	XAEnumUtil xaEnumUtil;
+	RangerEnumUtil xaEnumUtil;
 
 	@Autowired
-	XABizUtil xaBizUtil;
+	RangerBizUtil xaBizUtil;
 
 	String hiddenPasswordString;
 
@@ -242,7 +245,7 @@ public class XUserService extends XUserServiceBase<XXUser, VXUser> {
 				}
 			}
 			if(userRoleList==null || userRoleList.size()==0){
-				userRoleList.add(XAConstants.ROLE_USER);
+				userRoleList.add(RangerConstants.ROLE_USER);
 			}			
 			vObj.setUserRoleList(userRoleList);
 		}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java
index 41dfff3..b8a4487 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XUserServiceBase.java
@@ -26,10 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.entity.*;
-import org.apache.ranger.service.*;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.SearchCriteria;
+import org.apache.ranger.entity.XXUser;
+import org.apache.ranger.view.VXUser;
+import org.apache.ranger.view.VXUserList;
 
 public abstract class XUserServiceBase<T extends XXUser, V extends VXUser>
 		extends AbstractBaseResourceService<T, V> {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java b/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java
new file mode 100644
index 0000000..6087d35
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java
@@ -0,0 +1,278 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ package org.apache.ranger.service.filter;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+
+import org.apache.log4j.Logger;
+import org.apache.ranger.common.PropertiesUtil;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
+
+import com.sun.jersey.api.container.filter.LoggingFilter;
+import com.sun.jersey.api.uri.UriTemplate;
+import com.sun.jersey.spi.container.ContainerRequest;
+import com.sun.jersey.spi.container.ContainerResponse;
+
+public class RangerRESTAPIFilter extends LoggingFilter {
+	Logger logger = Logger.getLogger(RangerRESTAPIFilter.class);
+	static boolean initDone = false;
+
+	boolean logStdOut = true;
+	HashMap<String, String> regexPathMap = new HashMap<String, String>();
+	HashMap<String, Pattern> regexPatternMap = new HashMap<String, Pattern>();
+	List<String> regexList = new ArrayList<String>();
+	List<String> loggedRestPathErrors = new ArrayList<String>();
+	private final Object lock = new Object();
+
+	void init() {
+		if (initDone) {
+			return;
+		}
+		synchronized (lock) {
+			if (initDone) {
+				return;
+			}
+
+			logStdOut = PropertiesUtil.getBooleanProperty(
+					"xa.restapi.log.enabled", initDone);
+
+			// Build hash map
+			try {
+				loadPathPatterns();
+			} catch (Throwable t) {
+				logger.error(
+						"Error parsing REST classes for PATH patterns. Error ignored, but should be fixed immediately",
+						t);
+			}
+			initDone = true;
+		}
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * com.sun.jersey.spi.container.ContainerRequestFilter#filter(com.sun.jersey
+	 * .spi.container.ContainerRequest)
+	 */
+	@Override
+	public ContainerRequest filter(ContainerRequest request) {
+		if (!initDone) {
+			init();
+		}
+		if (logStdOut) {
+			String path = request.getRequestUri().getPath();
+
+			// mediaType=multipart/form-data;boundary=----WebKitFormBoundaryTHan76r5AkgpAuVG
+			if (request.getMediaType() != null) {
+				// logger.info("DELETE ME: mediaType=" + request.getMediaType()
+				// + ", getType()" + request.getMediaType().getType()
+				// + ", getSubType()="
+				// + request.getMediaType().getSubtype());
+			} else {
+				logger.info("DELETE ME: mediaType is null. path=" + path);
+			}
+			if ((request.getMediaType() == null || !request.getMediaType()
+					.getType().equals("multipart"))
+					&& !path.endsWith("/service/general/logs")) {
+				try {
+					request = super.filter(request);
+				} catch (Throwable t) {
+					logger.error("Error FILTER logging. path=" + path, t);
+				}
+			}
+		}
+
+		return request;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * com.sun.jersey.spi.container.ContainerResponseFilter#filter(com.sun.jersey
+	 * .spi.container.ContainerRequest,
+	 * com.sun.jersey.spi.container.ContainerResponse)
+	 */
+	@Override
+	public ContainerResponse filter(ContainerRequest request,
+			ContainerResponse response) {
+		if (logStdOut) {
+			// If it is image, then don't call super
+			if (response.getMediaType() != null) {
+				// logger.info("DELETE ME: Response= mediaType="
+				// + response.getMediaType() + ", getType()"
+				// + response.getMediaType().getType() + ", getSubType()="
+				// + response.getMediaType().getSubtype());
+			} else {
+				logger.info("DELETE ME: Response= mediaType is null");
+			}
+			if (response.getMediaType() == null
+					|| !response.getMediaType().getType().equals("image")) {
+
+				response = super.filter(request, response);
+			}
+		}
+
+		return response;
+	}
+
+	private void loadPathPatterns() throws ClassNotFoundException {
+		String pkg = "org.apache.ranger.service";
+		// List<Class> cList = findClasses(new File(dir), pkg);
+		@SuppressWarnings("rawtypes")
+		List<Class> cList = findClasses(pkg);
+		for (@SuppressWarnings("rawtypes")
+		Class klass : cList) {
+			Annotation[] annotations = klass.getAnnotations();
+			for (Annotation annotation : annotations) {
+				if (!(annotation instanceof Path)) {
+					continue;
+				}
+				Path path = (Path) annotation;
+				if (path.value().startsWith("crud")) {
+					continue;
+				}
+				// logger.info("path=" + path.value());
+				// Loop over the class methods
+				for (Method m : klass.getMethods()) {
+					Annotation[] methodAnnotations = m.getAnnotations();
+					String httpMethod = null;
+					String servicePath = null;
+					for (int ma = 0; ma < methodAnnotations.length; ma++) {
+						if (methodAnnotations[ma] instanceof GET) {
+							httpMethod = "GET";
+						} else if (methodAnnotations[ma] instanceof PUT) {
+							httpMethod = "PUT";
+						} else if (methodAnnotations[ma] instanceof POST) {
+							httpMethod = "POST";
+						} else if (methodAnnotations[ma] instanceof DELETE) {
+							httpMethod = "DELETE";
+						} else if (methodAnnotations[ma] instanceof Path) {
+							servicePath = ((Path) methodAnnotations[ma])
+									.value();
+						}
+					}
+
+					if (httpMethod == null) {
+						continue;
+					}
+
+					String fullPath = path.value();
+					String regEx = httpMethod + ":" + path.value();
+					if (servicePath != null) {
+						if (!servicePath.startsWith("/")) {
+							servicePath = "/" + servicePath;
+						}
+						UriTemplate ut = new UriTemplate(servicePath);
+						regEx = httpMethod + ":" + path.value()
+								+ ut.getPattern().getRegex();
+						fullPath += servicePath;
+					}
+					Pattern regexPattern = Pattern.compile(regEx);
+
+					if (regexPatternMap.containsKey(regEx)) {
+						logger.warn("Duplicate regex=" + regEx + ", fullPath="
+								+ fullPath);
+					}
+					regexList.add(regEx);
+					regexPathMap.put(regEx, fullPath);
+					regexPatternMap.put(regEx, regexPattern);
+
+					logger.info("path=" + path.value() + ", servicePath="
+							+ servicePath + ", fullPath=" + fullPath
+							+ ", regEx=" + regEx);
+				}
+			}
+		}
+		// ReOrder list
+		int i = 0;
+		for (i = 0; i < 10; i++) {
+			boolean foundMatches = false;
+			List<String> tmpList = new ArrayList<String>();
+			for (int x = 0; x < regexList.size(); x++) {
+				boolean foundMatch = false;
+				String rX = regexList.get(x);
+				for (int y = 0; y < x; y++) {
+					String rY = regexList.get(y);
+					Matcher matcher = regexPatternMap.get(rY).matcher(rX);
+					if (matcher.matches()) {
+						foundMatch = true;
+						foundMatches = true;
+						// logger.info("rX " + rX + " matched with rY=" + rY
+						// + ". Moving rX to the top. Loop count=" + i);
+						break;
+					}
+				}
+				if (foundMatch) {
+					tmpList.add(0, rX);
+				} else {
+					tmpList.add(rX);
+				}
+			}
+			regexList = tmpList;
+			if (!foundMatches) {
+				logger.info("Done rearranging. loopCount=" + i);
+				break;
+			}
+		}
+		if (i == 10) {
+			logger.warn("Couldn't rearrange even after " + i + " loops");
+		}
+
+		logger.info("Loaded " + regexList.size() + " API methods.");
+		// for (String regEx : regexList) {
+		// logger.info("regEx=" + regEx);
+		// }
+	}
+
+	@SuppressWarnings("rawtypes")
+	private List<Class> findClasses(String packageName)
+			throws ClassNotFoundException {
+		List<Class> classes = new ArrayList<Class>();
+
+		ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(
+				true);
+
+		// scanner.addIncludeFilter(new
+		// AnnotationTypeFilter(<TYPE_YOUR_ANNOTATION_HERE>.class));
+
+		for (BeanDefinition bd : scanner.findCandidateComponents(packageName)) {
+			classes.add(Class.forName(bd.getBeanClassName()));
+		}
+
+		return classes;
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/service/filter/XARESTAPIFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/filter/XARESTAPIFilter.java b/security-admin/src/main/java/org/apache/ranger/service/filter/XARESTAPIFilter.java
deleted file mode 100644
index 300608e..0000000
--- a/security-admin/src/main/java/org/apache/ranger/service/filter/XARESTAPIFilter.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- package org.apache.ranger.service.filter;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.MultivaluedMap;
-
-import org.apache.log4j.Logger;
-import org.apache.ranger.common.PropertiesUtil;
-import org.apache.ranger.security.context.XAContextHolder;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
-
-import com.sun.jersey.api.container.filter.LoggingFilter;
-import com.sun.jersey.api.uri.UriTemplate;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerResponse;
-
-public class XARESTAPIFilter extends LoggingFilter {
-	Logger logger = Logger.getLogger(XARESTAPIFilter.class);
-	static boolean initDone = false;
-
-	boolean logStdOut = true;
-	HashMap<String, String> regexPathMap = new HashMap<String, String>();
-	HashMap<String, Pattern> regexPatternMap = new HashMap<String, Pattern>();
-	List<String> regexList = new ArrayList<String>();
-	List<String> loggedRestPathErrors = new ArrayList<String>();
-	private final Object lock = new Object();
-
-	void init() {
-		if (initDone) {
-			return;
-		}
-		synchronized (lock) {
-			if (initDone) {
-				return;
-			}
-
-			logStdOut = PropertiesUtil.getBooleanProperty(
-					"xa.restapi.log.enabled", initDone);
-
-			// Build hash map
-			try {
-				loadPathPatterns();
-			} catch (Throwable t) {
-				logger.error(
-						"Error parsing REST classes for PATH patterns. Error ignored, but should be fixed immediately",
-						t);
-			}
-			initDone = true;
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * com.sun.jersey.spi.container.ContainerRequestFilter#filter(com.sun.jersey
-	 * .spi.container.ContainerRequest)
-	 */
-	@Override
-	public ContainerRequest filter(ContainerRequest request) {
-		if (!initDone) {
-			init();
-		}
-		if (logStdOut) {
-			String path = request.getRequestUri().getPath();
-
-			// mediaType=multipart/form-data;boundary=----WebKitFormBoundaryTHan76r5AkgpAuVG
-			if (request.getMediaType() != null) {
-				// logger.info("DELETE ME: mediaType=" + request.getMediaType()
-				// + ", getType()" + request.getMediaType().getType()
-				// + ", getSubType()="
-				// + request.getMediaType().getSubtype());
-			} else {
-				logger.info("DELETE ME: mediaType is null. path=" + path);
-			}
-			if ((request.getMediaType() == null || !request.getMediaType()
-					.getType().equals("multipart"))
-					&& !path.endsWith("/service/general/logs")) {
-				try {
-					request = super.filter(request);
-				} catch (Throwable t) {
-					logger.error("Error FILTER logging. path=" + path, t);
-				}
-			}
-		}
-
-		return request;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * com.sun.jersey.spi.container.ContainerResponseFilter#filter(com.sun.jersey
-	 * .spi.container.ContainerRequest,
-	 * com.sun.jersey.spi.container.ContainerResponse)
-	 */
-	@Override
-	public ContainerResponse filter(ContainerRequest request,
-			ContainerResponse response) {
-		if (logStdOut) {
-			// If it is image, then don't call super
-			if (response.getMediaType() != null) {
-				// logger.info("DELETE ME: Response= mediaType="
-				// + response.getMediaType() + ", getType()"
-				// + response.getMediaType().getType() + ", getSubType()="
-				// + response.getMediaType().getSubtype());
-			} else {
-				logger.info("DELETE ME: Response= mediaType is null");
-			}
-			if (response.getMediaType() == null
-					|| !response.getMediaType().getType().equals("image")) {
-
-				response = super.filter(request, response);
-			}
-		}
-
-		return response;
-	}
-
-	private void loadPathPatterns() throws ClassNotFoundException {
-		String pkg = "org.apache.ranger.service";
-		// List<Class> cList = findClasses(new File(dir), pkg);
-		@SuppressWarnings("rawtypes")
-		List<Class> cList = findClasses(pkg);
-		for (@SuppressWarnings("rawtypes")
-		Class klass : cList) {
-			Annotation[] annotations = klass.getAnnotations();
-			for (Annotation annotation : annotations) {
-				if (!(annotation instanceof Path)) {
-					continue;
-				}
-				Path path = (Path) annotation;
-				if (path.value().startsWith("crud")) {
-					continue;
-				}
-				// logger.info("path=" + path.value());
-				// Loop over the class methods
-				for (Method m : klass.getMethods()) {
-					Annotation[] methodAnnotations = m.getAnnotations();
-					String httpMethod = null;
-					String servicePath = null;
-					for (int ma = 0; ma < methodAnnotations.length; ma++) {
-						if (methodAnnotations[ma] instanceof GET) {
-							httpMethod = "GET";
-						} else if (methodAnnotations[ma] instanceof PUT) {
-							httpMethod = "PUT";
-						} else if (methodAnnotations[ma] instanceof POST) {
-							httpMethod = "POST";
-						} else if (methodAnnotations[ma] instanceof DELETE) {
-							httpMethod = "DELETE";
-						} else if (methodAnnotations[ma] instanceof Path) {
-							servicePath = ((Path) methodAnnotations[ma])
-									.value();
-						}
-					}
-
-					if (httpMethod == null) {
-						continue;
-					}
-
-					String fullPath = path.value();
-					String regEx = httpMethod + ":" + path.value();
-					if (servicePath != null) {
-						if (!servicePath.startsWith("/")) {
-							servicePath = "/" + servicePath;
-						}
-						UriTemplate ut = new UriTemplate(servicePath);
-						regEx = httpMethod + ":" + path.value()
-								+ ut.getPattern().getRegex();
-						fullPath += servicePath;
-					}
-					Pattern regexPattern = Pattern.compile(regEx);
-
-					if (regexPatternMap.containsKey(regEx)) {
-						logger.warn("Duplicate regex=" + regEx + ", fullPath="
-								+ fullPath);
-					}
-					regexList.add(regEx);
-					regexPathMap.put(regEx, fullPath);
-					regexPatternMap.put(regEx, regexPattern);
-
-					logger.info("path=" + path.value() + ", servicePath="
-							+ servicePath + ", fullPath=" + fullPath
-							+ ", regEx=" + regEx);
-				}
-			}
-		}
-		// ReOrder list
-		int i = 0;
-		for (i = 0; i < 10; i++) {
-			boolean foundMatches = false;
-			List<String> tmpList = new ArrayList<String>();
-			for (int x = 0; x < regexList.size(); x++) {
-				boolean foundMatch = false;
-				String rX = regexList.get(x);
-				for (int y = 0; y < x; y++) {
-					String rY = regexList.get(y);
-					Matcher matcher = regexPatternMap.get(rY).matcher(rX);
-					if (matcher.matches()) {
-						foundMatch = true;
-						foundMatches = true;
-						// logger.info("rX " + rX + " matched with rY=" + rY
-						// + ". Moving rX to the top. Loop count=" + i);
-						break;
-					}
-				}
-				if (foundMatch) {
-					tmpList.add(0, rX);
-				} else {
-					tmpList.add(rX);
-				}
-			}
-			regexList = tmpList;
-			if (!foundMatches) {
-				logger.info("Done rearranging. loopCount=" + i);
-				break;
-			}
-		}
-		if (i == 10) {
-			logger.warn("Couldn't rearrange even after " + i + " loops");
-		}
-
-		logger.info("Loaded " + regexList.size() + " API methods.");
-		// for (String regEx : regexList) {
-		// logger.info("regEx=" + regEx);
-		// }
-	}
-
-	@SuppressWarnings("rawtypes")
-	private List<Class> findClasses(String packageName)
-			throws ClassNotFoundException {
-		List<Class> classes = new ArrayList<Class>();
-
-		ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(
-				true);
-
-		// scanner.addIncludeFilter(new
-		// AnnotationTypeFilter(<TYPE_YOUR_ANNOTATION_HERE>.class));
-
-		for (BeanDefinition bd : scanner.findCandidateComponents(packageName)) {
-			classes.add(Class.forName(bd.getBeanClassName()));
-		}
-
-		return classes;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java b/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java
index dddb48f..1ed340e 100644
--- a/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java
@@ -26,9 +26,9 @@ import org.apache.log4j.Logger;
 import org.apache.ranger.common.PropertiesUtil;
 import org.apache.ranger.security.standalone.StandaloneSecurityHandler;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.stereotype.Component;
 
 /**
  *

[02/12] incubator-ranger git commit: RANGER-194: Rename classes under web-admin project

Posted by ma...@apache.org.

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java
index 364fef4..5536b3c 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java
@@ -24,15 +24,10 @@
  *
  */
 
-import java.util.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.persistence.Column;
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.RangerCommonEnums;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -60,7 +55,7 @@ public class VXGroup extends VXDataObject implements java.io.Serializable {
 	 */
 	protected int groupType = AppConstants.XA_GROUP_UNKNOWN;
 	
-	protected int groupSource = XACommonEnums.GROUP_INTERNAL;
+	protected int groupSource = RangerCommonEnums.GROUP_INTERNAL;
 	/**
 	 * Id of the credential store
 	 */

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java
index faa6aac..37ad010 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java
@@ -24,14 +24,9 @@
  * 
  */
 
-import java.util.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java
index 1757fbb..afc8470 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java
@@ -24,11 +24,14 @@
  *
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java
index 83c222b..28b541f 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java
@@ -24,11 +24,14 @@
  * 
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java
index c9da6b2..1068f3f 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java
@@ -24,14 +24,9 @@
  *
  */
 
-import java.util.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java
index 6cb1ae1..1741b19 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java
@@ -24,11 +24,14 @@
  *
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXLong.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXLong.java b/security-admin/src/main/java/org/apache/ranger/view/VXLong.java
index 68df898..615371c 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXLong.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXLong.java
@@ -24,14 +24,10 @@
  * 
  */
 
-import java.util.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.view.ViewBaseBean;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java b/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java
index a28a313..f516e95 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java
@@ -24,14 +24,10 @@
  * 
  */
 
-import java.util.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.view.ViewBaseBean;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java b/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java
index d894c33..128c740 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java
@@ -24,14 +24,10 @@
  * 
  */
 
-import java.util.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.view.ViewBaseBean;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java
index a64e96a..b273da0 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java
@@ -24,14 +24,10 @@
  * 
  */
 
-import java.util.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.RangerConstants;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -87,7 +83,7 @@ public class VXPermMap extends VXDataObject implements java.io.Serializable {
 	 * Is recursive
 	 * This attribute is of type enum CommonEnums::BooleanValue
 	 */
-	protected int isRecursive = XAConstants.BOOL_NONE;
+	protected int isRecursive = RangerConstants.BOOL_NONE;
 	/**
 	 * Is wild card
 	 */
@@ -103,7 +99,7 @@ public class VXPermMap extends VXDataObject implements java.io.Serializable {
 	public VXPermMap ( ) {
 		permFor = AppConstants.XA_PERM_FOR_UNKNOWN;
 		permType = AppConstants.XA_PERM_TYPE_UNKNOWN;
-		isRecursive = XAConstants.BOOL_NONE;
+		isRecursive = RangerConstants.BOOL_NONE;
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java
index 065be19..4bf5334 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java
@@ -24,11 +24,14 @@
  * 
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java
index 2777ce4..8da18e3 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java
@@ -26,7 +26,7 @@
 
 import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java
index c8d1aba..c60c2f2 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java
@@ -24,11 +24,14 @@
  * List wrapper class for VXPermObj
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java
index 32bc6d3..10077c8 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java
@@ -24,11 +24,11 @@
  * Policy
  */
 
-import java.util.*;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.*;
+import org.apache.ranger.common.AppConstants;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java
index 174cdca..9ac3fa1 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java
@@ -24,14 +24,12 @@
  * 
  */
 
-import java.util.*;
+import java.util.Date;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java
index c58a720..ad740db 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java
@@ -24,11 +24,14 @@
  *
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java
index 54d9736..2e5f55d 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java
@@ -24,11 +24,14 @@
  * List wrapper class for VXPolicy
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java
index 84f7f55..a0c9ec8 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java
@@ -19,14 +19,11 @@
 
  package org.apache.ranger.view;
 
-import java.util.*;
+import java.util.Collection;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java
index 7d17a99..b0840d6 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java
@@ -24,11 +24,14 @@
  * 
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java b/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java
index e968e16..dae717c 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java
@@ -24,9 +24,9 @@
  * Repository
  */
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.*;
+import org.apache.ranger.common.AppConstants;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java b/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java
index aae5db4..987587a 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java
@@ -24,11 +24,14 @@
  * List wrapper class for VXRepository
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXResource.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXResource.java b/security-admin/src/main/java/org/apache/ranger/view/VXResource.java
index d8f0226..23d3e4a 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXResource.java
@@ -24,14 +24,12 @@
  * 
  */
 
-import java.util.*;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.RangerConstants;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -75,7 +73,7 @@ public class VXResource extends VXDataObject implements java.io.Serializable {
 	 * Whether to encrypt this resource
 	 * This attribute is of type enum CommonEnums::BooleanValue
 	 */
-	protected int isEncrypt = XAConstants.BOOL_FALSE;
+	protected int isEncrypt = RangerConstants.BOOL_FALSE;
 	/**
 	 * List of permissions maps
 	 */
@@ -88,7 +86,7 @@ public class VXResource extends VXDataObject implements java.io.Serializable {
 	 * Is recursive
 	 * This attribute is of type enum CommonEnums::BooleanValue
 	 */
-	protected int isRecursive = XAConstants.BOOL_NONE;
+	protected int isRecursive = RangerConstants.BOOL_NONE;
 	/**
 	 * Group to which this resource belongs to
 	 */
@@ -137,7 +135,7 @@ public class VXResource extends VXDataObject implements java.io.Serializable {
 	 * Check parent permission
 	 * This attribute is of type enum CommonEnums::BooleanValue
 	 */
-	protected int checkParentPermission = XAConstants.BOOL_NONE;
+	protected int checkParentPermission = RangerConstants.BOOL_NONE;
 	/**
 	 * Topologoies
 	 */
@@ -152,9 +150,9 @@ public class VXResource extends VXDataObject implements java.io.Serializable {
 	 */
 	public VXResource ( ) {
 		resourceType = AppConstants.RESOURCE_PATH;
-		isEncrypt = XAConstants.BOOL_FALSE;
-		isRecursive = XAConstants.BOOL_NONE;
-		checkParentPermission = XAConstants.BOOL_NONE;
+		isEncrypt = RangerConstants.BOOL_FALSE;
+		isRecursive = RangerConstants.BOOL_NONE;
+		checkParentPermission = RangerConstants.BOOL_NONE;
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java b/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java
index 3a639b7..7a49c0a 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java
@@ -24,11 +24,14 @@
  * 
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java b/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java
index 1176a11..2451afd 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java
@@ -24,14 +24,12 @@
  * 
  */
 
-import java.util.*;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.view.ViewBaseBean;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXString.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXString.java b/security-admin/src/main/java/org/apache/ranger/view/VXString.java
index 1515f25..bd52ff7 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXString.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXString.java
@@ -24,14 +24,10 @@
  * 
  */
 
-import java.util.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.view.ViewBaseBean;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java b/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java
index f096bfb..4d830e2 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java
@@ -24,11 +24,14 @@
  * 
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java
index 00f2bf2..6ee1394 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java
@@ -24,14 +24,9 @@
  * 
  */
 
-import java.util.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import javax.xml.bind.annotation.*;
-
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.RangerConstants;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -49,7 +44,7 @@ public class VXTrxLog extends VXDataObject implements java.io.Serializable {
 	 * Name of the class to which the object id belongs to
 	 * This attribute is of type enum CommonEnums::ClassTypes
 	 */
-	protected int objectClassType = XAConstants.CLASS_TYPE_NONE;
+	protected int objectClassType = RangerConstants.CLASS_TYPE_NONE;
 	/**
 	 * Id of the object to which this notes refers to
 	 */
@@ -107,7 +102,7 @@ public class VXTrxLog extends VXDataObject implements java.io.Serializable {
 	 * Default constructor. This will set all the attributes to default value.
 	 */
 	public VXTrxLog ( ) {
-		objectClassType = XAConstants.CLASS_TYPE_NONE;
+		objectClassType = RangerConstants.CLASS_TYPE_NONE;
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java
index 6a40118..ab4ffd0 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java
@@ -19,11 +19,14 @@
 
  package org.apache.ranger.view;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXUser.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUser.java b/security-admin/src/main/java/org/apache/ranger/view/VXUser.java
index 3324986..a237377 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXUser.java
@@ -24,14 +24,11 @@
  * 
  */
 
-import java.util.*;
+import java.util.Collection;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.*;
-import org.apache.ranger.common.view.*;
-import org.apache.ranger.json.JsonDateSerializer;
-import org.apache.ranger.view.*;
+import org.apache.ranger.common.AppConstants;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java b/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java
index a1b403e..2e5b9b1 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java
@@ -24,11 +24,14 @@
  * 
  */
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.view.*;
+import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/resources/conf.dist/security-applicationContext.xml
----------------------------------------------------------------------
diff --git a/security-admin/src/main/resources/conf.dist/security-applicationContext.xml b/security-admin/src/main/resources/conf.dist/security-applicationContext.xml
index 908dd6e..5a210db 100644
--- a/security-admin/src/main/resources/conf.dist/security-applicationContext.xml
+++ b/security-admin/src/main/resources/conf.dist/security-applicationContext.xml
@@ -99,30 +99,30 @@ http://www.springframework.org/schema/security/spring-security-oauth2-1.0.xsd">
 		</beans:property>
 	</beans:bean>
 
-	<beans:bean id="customUsernamePasswordAuthenticationFilter" class="org.apache.ranger.security.web.filter.XAUsernamePasswordAuthenticationFilter">
+	<beans:bean id="customUsernamePasswordAuthenticationFilter" class="org.apache.ranger.security.web.filter.RangerUsernamePasswordAuthenticationFilter">
 		<beans:property name="authenticationManager" ref="authenticationManager"/>
 		<beans:property name="authenticationSuccessHandler" ref="ajaxAuthSuccessHandler"/>
 		<beans:property name="authenticationFailureHandler"	ref="ajaxAuthFailureHandler"/>
 		<!--  beans:property name="rememberMeServices" ref="rememberMeServices"/ -->
 	</beans:bean>
 
-	<beans:bean id="authenticationProcessingFilterEntryPoint" class="org.apache.ranger.security.web.authentication.XAAuthenticationEntryPoint">
+	<beans:bean id="authenticationProcessingFilterEntryPoint" class="org.apache.ranger.security.web.authentication.RangerAuthenticationEntryPoint">
 		<beans:property name="loginFormUrl" value="/login.jsp"/>
 		<beans:property name="forceHttps" value="false"/>
 	</beans:bean>
 
-	<beans:bean id="ajaxAuthSuccessHandler" class="org.apache.ranger.security.web.authentication.XAAuthSuccessHandler">
+	<beans:bean id="ajaxAuthSuccessHandler" class="org.apache.ranger.security.web.authentication.RangerAuthSuccessHandler">
 		<beans:property name="defaultTargetUrl" value="/dashboard.jsp"/>
 	</beans:bean>
 
-	<beans:bean id="ajaxAuthFailureHandler" class="org.apache.ranger.security.web.authentication.XAAuthFailureHandler">
+	<beans:bean id="ajaxAuthFailureHandler" class="org.apache.ranger.security.web.authentication.RangerAuthFailureHandler">
 		<beans:property name="defaultFailureUrl" value="/public/failedLogin.jsp?login_error=1"/>
 	</beans:bean>
 
 	<beans:bean id="customLogoutSuccessHandler" class="org.apache.ranger.security.web.authentication.CustomLogoutSuccessHandler">
 	</beans:bean>
 
-	<beans:bean id="userContextFormationFilter" class="org.apache.ranger.security.web.filter.XASecurityContextFormationFilter"/>
+	<beans:bean id="userContextFormationFilter" class="org.apache.ranger.security.web.filter.RangerSecurityContextFormationFilter"/>
 
 	<security:jdbc-user-service id="userService" data-source-ref="defaultDataSource"
 			users-by-username-query="select LOGIN_ID,PASSWORD,STATUS from x_portal_user where LOGIN_ID=? and STATUS = 1"

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/WEB-INF/web.xml b/security-admin/src/main/webapp/WEB-INF/web.xml
index a3805c8..cbd5724 100644
--- a/security-admin/src/main/webapp/WEB-INF/web.xml
+++ b/security-admin/src/main/webapp/WEB-INF/web.xml
@@ -56,11 +56,11 @@
     </init-param>
     <init-param>
       <param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>
-      <param-value>org.apache.ranger.service.filter.XARESTAPIFilter</param-value>
+      <param-value>org.apache.ranger.service.filter.RangerRESTAPIFilter</param-value>
     </init-param>
     <init-param>
       <param-name>com.sun.jersey.spi.container.ContainerResponseFilters</param-name>
-      <param-value>org.apache.ranger.service.filter.XARESTAPIFilter</param-value>
+      <param-value>org.apache.ranger.service.filter.RangerRESTAPIFilter</param-value>
     </init-param>
     <init-param>
       <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/biz/TestAssetMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestAssetMgr.java b/security-admin/src/test/java/org/apache/ranger/biz/TestAssetMgr.java
index 084a142..f6bee3b 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestAssetMgr.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestAssetMgr.java
@@ -27,19 +27,16 @@ import java.util.Map;
 
 import javax.ws.rs.WebApplicationException;
 
-import org.apache.ranger.biz.AssetConnectionMgr;
-import org.apache.ranger.biz.AssetMgr;
-import org.apache.ranger.biz.XABizUtil;
 import org.apache.ranger.common.AppConstants;
 import org.apache.ranger.common.ContextUtil;
 import org.apache.ranger.common.JSONUtil;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.RESTErrorUtil;
+import org.apache.ranger.common.RangerCommonEnums;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.StringUtil;
 import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.common.XACommonEnums;
-import org.apache.ranger.db.XADaoManager;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.db.XXAssetDao;
 import org.apache.ranger.db.XXResourceDao;
 import org.apache.ranger.db.XXUserDao;
@@ -47,8 +44,8 @@ import org.apache.ranger.entity.XXAsset;
 import org.apache.ranger.entity.XXPortalUser;
 import org.apache.ranger.entity.XXResource;
 import org.apache.ranger.entity.XXUser;
-import org.apache.ranger.security.context.XAContextHolder;
-import org.apache.ranger.security.context.XASecurityContext;
+import org.apache.ranger.security.context.RangerContextHolder;
+import org.apache.ranger.security.context.RangerSecurityContext;
 import org.apache.ranger.service.XAssetService;
 import org.apache.ranger.service.XAuditMapService;
 import org.apache.ranger.service.XPermMapService;
@@ -97,7 +94,7 @@ public class TestAssetMgr {
 	StringUtil stringUtil;
 	
 	@Mock
-	XADaoManager xADaoManager;
+	RangerDaoManager rangerDaoManager;
 	
 	@Mock
 	XResourceService xResourceService;
@@ -112,7 +109,7 @@ public class TestAssetMgr {
 	XAuditMapService xAuditMapService;
 	
 	@Mock
-	XABizUtil xaBizUtil;
+	RangerBizUtil xaBizUtil;
 	
 	@Mock 
 	AssetConnectionMgr assetConnectionMgr;
@@ -124,18 +121,18 @@ public class TestAssetMgr {
 	public ExpectedException thrown = ExpectedException.none();
 	
 	public void setup(){
-		XASecurityContext context = new XASecurityContext();
+		RangerSecurityContext context = new RangerSecurityContext();
 		context.setUserSession(new UserSessionBase());
-		XAContextHolder.setSecurityContext(context);		
+		RangerContextHolder.setSecurityContext(context);		
 		UserSessionBase currentUserSession = ContextUtil.getCurrentUserSession();
 		currentUserSession.setUserAdmin(true);
 	}
 	
 	@Test
 	public void testCreateXAssetForNoUserSession(){
-		XASecurityContext context = new XASecurityContext();
+		RangerSecurityContext context = new RangerSecurityContext();
 		context.setUserSession(new UserSessionBase());
-		XAContextHolder.setSecurityContext(context);		
+		RangerContextHolder.setSecurityContext(context);		
 		XXPortalUser portalUser = new XXPortalUser();
 		portalUser.setId(id);
 		UserSessionBase currentUserSession = ContextUtil.getCurrentUserSession();
@@ -171,7 +168,7 @@ public class TestAssetMgr {
 		vXResource.setAuditList(new ArrayList<VXAuditMap>());
 		Mockito.when(xResourceService.createResource((VXResource)Mockito.anyObject())).thenReturn(vXResource);
 		XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
-		Mockito.when(xADaoManager.getXXUser()).thenReturn(xxUserDao);
+		Mockito.when(rangerDaoManager.getXXUser()).thenReturn(xxUserDao);
 		Mockito.when(xxUserDao.findByUserName(userName)).thenReturn(xxUser);
 		VXUser vxUser = new VXUser(); 
 		Mockito.when(xUserService.populateViewBean(xxUser)).thenReturn(vxUser);
@@ -201,10 +198,10 @@ public class TestAssetMgr {
 		XXAsset xxAsset = new XXAsset();
 		XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class);
 		XXAssetDao xxAssetDao = Mockito.mock(XXAssetDao.class);
-		Mockito.when(xADaoManager.getXXAsset()).thenReturn(xxAssetDao);
+		Mockito.when(rangerDaoManager.getXXAsset()).thenReturn(xxAssetDao);
 		Mockito.when(xxAssetDao.getById(vXAsset.getId())).thenReturn(xxAsset);
 		Mockito.when(xAssetService.updateResource((VXAsset)Mockito.anyObject())).thenReturn(vXAssetDB);
-		Mockito.when(xADaoManager.getXXResource()).thenReturn(xxResourceDao);
+		Mockito.when(rangerDaoManager.getXXResource()).thenReturn(xxResourceDao);
 		List<XXResource> lst = new ArrayList<XXResource>();
 		Mockito.when(xxResourceDao.findByResourceNameAndAssetIdAndRecursiveFlag(Mockito.anyString(),Mockito.anyLong(), Mockito.anyInt())).thenReturn(lst );
 		
@@ -235,7 +232,7 @@ public class TestAssetMgr {
 		vXResource.setAuditList(new ArrayList<VXAuditMap>());
 		Mockito.when(xResourceService.createResource((VXResource)Mockito.anyObject())).thenReturn(vXResource);
 		XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
-		Mockito.when(xADaoManager.getXXUser()).thenReturn(xxUserDao);
+		Mockito.when(rangerDaoManager.getXXUser()).thenReturn(xxUserDao);
 		Mockito.when(xxUserDao.findByUserName(userName)).thenReturn(xxUser);
 		VXUser vxUser = new VXUser(); 
 		Mockito.when(xUserService.populateViewBean(xxUser)).thenReturn(vxUser);
@@ -278,7 +275,7 @@ public class TestAssetMgr {
 		vXResource.setAuditList(new ArrayList<VXAuditMap>());
 		Mockito.when(xResourceService.createResource((VXResource)Mockito.anyObject())).thenReturn(vXResource);
 		XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
-		Mockito.when(xADaoManager.getXXUser()).thenReturn(xxUserDao);
+		Mockito.when(rangerDaoManager.getXXUser()).thenReturn(xxUserDao);
 		Mockito.when(xxUserDao.findByUserName(userName)).thenReturn(xxUser);
 		VXUser vxUser = new VXUser(); 
 		Mockito.when(xUserService.populateViewBean(xxUser)).thenReturn(vxUser);
@@ -321,7 +318,7 @@ public class TestAssetMgr {
 		vXResource.setAuditList(new ArrayList<VXAuditMap>());
 		Mockito.when(xResourceService.createResource((VXResource)Mockito.anyObject())).thenReturn(vXResource);
 		XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
-		Mockito.when(xADaoManager.getXXUser()).thenReturn(xxUserDao);
+		Mockito.when(rangerDaoManager.getXXUser()).thenReturn(xxUserDao);
 		Mockito.when(xxUserDao.findByUserName(userName)).thenReturn(xxUser);
 		VXUser vxUser = new VXUser(); 
 		Mockito.when(xUserService.populateViewBean(xxUser)).thenReturn(vxUser);
@@ -364,7 +361,7 @@ public class TestAssetMgr {
 		vXResource.setAuditList(new ArrayList<VXAuditMap>());
 		Mockito.when(xResourceService.createResource((VXResource)Mockito.anyObject())).thenReturn(vXResource);
 		XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
-		Mockito.when(xADaoManager.getXXUser()).thenReturn(xxUserDao);
+		Mockito.when(rangerDaoManager.getXXUser()).thenReturn(xxUserDao);
 		Mockito.when(xxUserDao.findByUserName(userName)).thenReturn(xxUser);
 		VXUser vxUser = new VXUser(); 
 		Mockito.when(xUserService.populateViewBean(xxUser)).thenReturn(vxUser);
@@ -402,7 +399,7 @@ public class TestAssetMgr {
 		XXAsset xxAsset = new XXAsset();
 				
 		VXResponse vXResponse = new VXResponse();
-		Mockito.when(xADaoManager.getXXAsset()).thenReturn(xxAssetDao);
+		Mockito.when(rangerDaoManager.getXXAsset()).thenReturn(xxAssetDao);
 		Mockito.when(xxAssetDao.getById(assetId)).thenReturn(xxAsset);
 		Mockito.when(stringUtil.split(vXResource.getName(), ",")).thenReturn(new String[0]);
 		Mockito.when(xaBizUtil.hasPermission(vXResource,AppConstants.XA_PERM_TYPE_ADMIN)).thenReturn(vXResponse);
@@ -435,7 +432,7 @@ public class TestAssetMgr {
 		XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class);
 		XXResource xxResource = new XXResource();
 		Mockito.when(xResourceService.updateResource(vXResourceChkDb)).thenReturn(vXResourceChkDb);
-		Mockito.when(xADaoManager.getXXResource()).thenReturn(xxResourceDao);
+		Mockito.when(rangerDaoManager.getXXResource()).thenReturn(xxResourceDao);
 		Mockito.when(xxResourceDao.getById(vXResource.getId())).thenReturn(xxResource);
 		
 		VXResource vXResourceUpd = assetMgr.updateXResource(vXResourceChkDb);
@@ -472,7 +469,7 @@ public class TestAssetMgr {
 		Mockito.when(stringUtil.split("", ",")).thenReturn(new String[0]);
 		
 		VXResponse vXResponse = new VXResponse();
-		Mockito.when(xADaoManager.getXXAsset()).thenReturn(xxAssetDao);
+		Mockito.when(rangerDaoManager.getXXAsset()).thenReturn(xxAssetDao);
 		Mockito.when(xxAssetDao.getById(assetId)).thenReturn(xxAsset);
 		Mockito.when(stringUtil.split(vXResource.getName(), ",")).thenReturn(new String[0]);
 		Mockito.when(xaBizUtil.hasPermission(vXResource,AppConstants.XA_PERM_TYPE_ADMIN)).thenReturn(vXResponse);
@@ -505,7 +502,7 @@ public class TestAssetMgr {
 		XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class);
 		XXResource xxResource = new XXResource();
 		Mockito.when(xResourceService.updateResource(vXResourceChkDb)).thenReturn(vXResourceChkDb);
-		Mockito.when(xADaoManager.getXXResource()).thenReturn(xxResourceDao);
+		Mockito.when(rangerDaoManager.getXXResource()).thenReturn(xxResourceDao);
 		Mockito.when(xxResourceDao.getById(vXResource.getId())).thenReturn(xxResource);
 		
 		VXResource vXResourceUpd = assetMgr.updateXResource(vXResourceChkDb);
@@ -541,7 +538,7 @@ public class TestAssetMgr {
 		Mockito.when(stringUtil.split("", ",")).thenReturn(new String[0]);
 		
 		VXResponse vXResponse = new VXResponse();
-		Mockito.when(xADaoManager.getXXAsset()).thenReturn(xxAssetDao);
+		Mockito.when(rangerDaoManager.getXXAsset()).thenReturn(xxAssetDao);
 		Mockito.when(xxAssetDao.getById(assetId)).thenReturn(xxAsset);
 		Mockito.when(stringUtil.split(vXResource.getName(), ",")).thenReturn(new String[0]);
 		Mockito.when(xaBizUtil.hasPermission(vXResource,AppConstants.XA_PERM_TYPE_ADMIN)).thenReturn(vXResponse);
@@ -574,7 +571,7 @@ public class TestAssetMgr {
 		XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class);
 		XXResource xxResource = new XXResource();
 		Mockito.when(xResourceService.updateResource(vXResourceChkDb)).thenReturn(vXResourceChkDb);
-		Mockito.when(xADaoManager.getXXResource()).thenReturn(xxResourceDao);
+		Mockito.when(rangerDaoManager.getXXResource()).thenReturn(xxResourceDao);
 		Mockito.when(xxResourceDao.getById(vXResource.getId())).thenReturn(xxResource);
 		
 		VXResource vXResourceUpd = assetMgr.updateXResource(vXResourceChkDb);
@@ -610,7 +607,7 @@ public class TestAssetMgr {
 		Mockito.when(stringUtil.split("", ",")).thenReturn(new String[0]);
 		
 		VXResponse vXResponse = new VXResponse();
-		Mockito.when(xADaoManager.getXXAsset()).thenReturn(xxAssetDao);
+		Mockito.when(rangerDaoManager.getXXAsset()).thenReturn(xxAssetDao);
 		Mockito.when(xxAssetDao.getById(assetId)).thenReturn(xxAsset);
 		Mockito.when(stringUtil.split(vXResource.getName(), ",")).thenReturn(new String[0]);
 		Mockito.when(xaBizUtil.hasPermission(vXResource,AppConstants.XA_PERM_TYPE_ADMIN)).thenReturn(vXResponse);
@@ -643,7 +640,7 @@ public class TestAssetMgr {
 		XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class);
 		XXResource xxResource = new XXResource();
 		Mockito.when(xResourceService.updateResource(vXResourceChkDb)).thenReturn(vXResourceChkDb);
-		Mockito.when(xADaoManager.getXXResource()).thenReturn(xxResourceDao);
+		Mockito.when(rangerDaoManager.getXXResource()).thenReturn(xxResourceDao);
 		Mockito.when(xxResourceDao.getById(vXResource.getId())).thenReturn(xxResource);
 		
 		VXResource vXResourceUpd = assetMgr.updateXResource(vXResourceChkDb);
@@ -664,10 +661,10 @@ public class TestAssetMgr {
 		setup();
 		VXAsset vXAsset = new VXAsset();
 		vXAsset.setId(hiveAssetId);
-		vXAsset.setActiveStatus(XACommonEnums.STATUS_ENABLED);
+		vXAsset.setActiveStatus(RangerCommonEnums.STATUS_ENABLED);
 		Mockito.when(xAssetService.readResource(hiveAssetId)).thenReturn(vXAsset);
 		assetMgr.deleteXAsset(hiveAssetId, true);
-		Assert.assertEquals(vXAsset.getActiveStatus(), XACommonEnums.STATUS_DELETED);
+		Assert.assertEquals(vXAsset.getActiveStatus(), RangerCommonEnums.STATUS_DELETED);
 	} 
 	
 	@Test
@@ -675,10 +672,10 @@ public class TestAssetMgr {
 		setup();
 		VXAsset vXAsset = new VXAsset();
 		vXAsset.setId(hbaseAssetId);
-		vXAsset.setActiveStatus(XACommonEnums.STATUS_ENABLED);
+		vXAsset.setActiveStatus(RangerCommonEnums.STATUS_ENABLED);
 		Mockito.when(xAssetService.readResource(hiveAssetId)).thenReturn(vXAsset);
 		assetMgr.deleteXAsset(hbaseAssetId, true);
-		Assert.assertEquals(vXAsset.getActiveStatus(), XACommonEnums.STATUS_DELETED);
+		Assert.assertEquals(vXAsset.getActiveStatus(), RangerCommonEnums.STATUS_DELETED);
 	}
 	
 	@Test
@@ -686,10 +683,10 @@ public class TestAssetMgr {
 		setup();
 		VXAsset vXAsset = new VXAsset();
 		vXAsset.setId(knoxAssetId);
-		vXAsset.setActiveStatus(XACommonEnums.STATUS_ENABLED);
+		vXAsset.setActiveStatus(RangerCommonEnums.STATUS_ENABLED);
 		Mockito.when(xAssetService.readResource(hiveAssetId)).thenReturn(vXAsset);
 		assetMgr.deleteXAsset(knoxAssetId, true);
-		Assert.assertEquals(vXAsset.getActiveStatus(), XACommonEnums.STATUS_DELETED);
+		Assert.assertEquals(vXAsset.getActiveStatus(), RangerCommonEnums.STATUS_DELETED);
 	}
 	
 	@Test
@@ -697,10 +694,10 @@ public class TestAssetMgr {
 		setup();
 		VXAsset vXAsset = new VXAsset();
 		vXAsset.setId(stormAssetId);
-		vXAsset.setActiveStatus(XACommonEnums.STATUS_ENABLED);
+		vXAsset.setActiveStatus(RangerCommonEnums.STATUS_ENABLED);
 		Mockito.when(xAssetService.readResource(hiveAssetId)).thenReturn(vXAsset);
 		assetMgr.deleteXAsset(stormAssetId, true);
-		Assert.assertEquals(vXAsset.getActiveStatus(), XACommonEnums.STATUS_DELETED);
+		Assert.assertEquals(vXAsset.getActiveStatus(), RangerCommonEnums.STATUS_DELETED);
 	}
 	
 	private VXResource createVXResource(String assetTypeName, Long assetId, int assetType, int resourceType){

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java b/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
new file mode 100644
index 0000000..b7bc416
--- /dev/null
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
@@ -0,0 +1,547 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ranger.biz;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.ranger.common.AppConstants;
+import org.apache.ranger.common.ContextUtil;
+import org.apache.ranger.common.RangerCommonEnums;
+import org.apache.ranger.common.RangerConstants;
+import org.apache.ranger.common.StringUtil;
+import org.apache.ranger.common.UserSessionBase;
+import org.apache.ranger.common.db.BaseDao;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.db.XXAssetDao;
+import org.apache.ranger.db.XXPortalUserDao;
+import org.apache.ranger.db.XXResourceDao;
+import org.apache.ranger.db.XXUserDao;
+import org.apache.ranger.entity.XXAsset;
+import org.apache.ranger.entity.XXDBBase;
+import org.apache.ranger.entity.XXPortalUser;
+import org.apache.ranger.entity.XXResource;
+import org.apache.ranger.entity.XXUser;
+import org.apache.ranger.security.context.RangerContextHolder;
+import org.apache.ranger.security.context.RangerSecurityContext;
+import org.apache.ranger.view.VXAsset;
+import org.apache.ranger.view.VXDataObject;
+import org.apache.ranger.view.VXPortalUser;
+import org.apache.ranger.view.VXResource;
+import org.apache.ranger.view.VXResponse;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TestRangerBizUtil {
+	
+	private Long id = 1L;
+	private String resourceName = "hadoopdev";
+	
+	@InjectMocks
+	RangerBizUtil rangerBizUtil = new RangerBizUtil();
+	
+	@Mock
+	RangerDaoManager daoManager;
+	
+	@Mock
+	StringUtil stringUtil; 
+	
+	@Before
+	public void setup(){
+		RangerSecurityContext context = new RangerSecurityContext();
+		context.setUserSession(new UserSessionBase());
+		RangerContextHolder.setSecurityContext(context);		
+	}
+	
+	@Test
+	public void testHasPermission_When_disableAccessControl(){
+		VXResource vXResource = null;
+		rangerBizUtil.enableResourceAccessControl = false;
+		VXResponse resp = rangerBizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN);
+		Assert.assertNotNull(resp);		
+	}
+	
+	@Test
+	public void testHasPermission_When_NoResource(){
+		VXResource vXResource = null;
+		VXResponse resp = rangerBizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN);
+		Assert.assertNotNull(resp);
+		Assert.assertEquals(VXResponse.STATUS_ERROR, resp.getStatusCode());
+		Assert.assertEquals("Please provide valid policy.", resp.getMsgDesc());
+	}
+	
+	@Test
+	public void testHasPermission_emptyResourceName(){
+		VXResource vXResource = new VXResource();
+		XXPortalUser portalUser = new XXPortalUser();
+		XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
+		XXPortalUserDao userDao = Mockito.mock(XXPortalUserDao.class);
+		XXUser xxUser = new XXUser(); 
+		XXAsset xxAsset = new XXAsset();
+		List<XXResource> lst = new ArrayList<XXResource>();
+		XXResourceDao xxResourceDao = Mockito.mock(XXResourceDao.class);
+		XXAssetDao xxAssetDao = Mockito.mock(XXAssetDao.class);
+		Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao);
+		Mockito.when(userDao.getById(Mockito.anyLong())).thenReturn(portalUser);
+		Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao);
+		Mockito.when(xxUserDao.findByUserName(Mockito.anyString())).thenReturn(xxUser);	
+		Mockito.when(daoManager.getXXResource()).thenReturn(xxResourceDao);
+		Mockito.when(xxResourceDao.findByAssetIdAndResourceStatus(Mockito.anyLong(),Mockito.anyInt())).thenReturn(lst);
+		Mockito.when(daoManager.getXXAsset()).thenReturn(xxAssetDao);
+		Mockito.when(xxAssetDao.getById(Mockito.anyLong())).thenReturn(xxAsset);
+		VXResponse resp = rangerBizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN);
+		Mockito.verify(daoManager).getXXPortalUser();
+		Mockito.verify(userDao).getById(Mockito.anyLong());
+		Mockito.verify(daoManager).getXXUser();
+		Mockito.verify(xxUserDao).findByUserName(Mockito.anyString());
+		Assert.assertNotNull(resp);
+		Assert.assertEquals(VXResponse.STATUS_ERROR, resp.getStatusCode());
+		Assert.assertEquals("Permission Denied !", resp.getMsgDesc());		
+	}
+	
+	@Test
+	public void testHasPermission_isAdmin(){
+		VXResource vXResource = new VXResource();
+		vXResource.setName(resourceName);
+		vXResource.setAssetId(id);		
+		UserSessionBase currentUserSession = ContextUtil.getCurrentUserSession();
+		currentUserSession.setUserAdmin(true);
+		VXResponse resp = rangerBizUtil.hasPermission(vXResource, AppConstants.XA_PERM_TYPE_UNKNOWN);
+		Assert.assertNotNull(resp);
+		Assert.assertEquals(VXResponse.STATUS_SUCCESS, resp.getStatusCode());
+	}	
+	
+	@Test
+	public void testIsNotAdmin(){
+		boolean isAdminChk = rangerBizUtil.isAdmin();
+		Assert.assertFalse(isAdminChk);
+	}
+	
+	@Test
+	public void testIsAdmin(){
+		UserSessionBase currentUserSession = ContextUtil.getCurrentUserSession();
+		currentUserSession.setUserAdmin(true);
+		boolean isAdminChk = rangerBizUtil.isAdmin();
+		Assert.assertTrue(isAdminChk);
+	}	
+	
+	@Test
+	public void testUserSessionNull_forIsAdmin(){
+		RangerContextHolder.setSecurityContext(null);	
+		boolean isAdminChk = rangerBizUtil.isAdmin();
+		Assert.assertFalse(isAdminChk);
+	}
+	
+	@Test
+	public void testGetXUserId_NoUserSession(){
+		RangerContextHolder.setSecurityContext(null);
+		Long chk = rangerBizUtil.getXUserId();
+		Assert.assertNull(chk);
+	}
+	
+	@Test
+	public void testGetXUserId_NoUser(){
+		RangerSecurityContext context = new RangerSecurityContext();
+		context.setUserSession(new UserSessionBase());
+		RangerContextHolder.setSecurityContext(context);	
+		XXPortalUser xxPortalUser = new XXPortalUser();
+		XXUser xxUser = new XXUser();
+		XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
+		XXPortalUserDao xxPortalUserDao = Mockito.mock(XXPortalUserDao.class);
+		Mockito.when(daoManager.getXXPortalUser()).thenReturn(xxPortalUserDao);
+		Mockito.when(xxPortalUserDao.getById(Mockito.anyLong())).thenReturn(xxPortalUser);
+		Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao);
+		Mockito.when(xxUserDao.findByUserName(Mockito.anyString())).thenReturn(xxUser);
+		Long chk = rangerBizUtil.getXUserId();
+		Mockito.verify(daoManager).getXXPortalUser();
+		Mockito.verify(xxPortalUserDao).getById(Mockito.anyLong());
+		Mockito.verify(daoManager).getXXUser();
+		Mockito.verify(xxUserDao).findByUserName(Mockito.anyString());
+		Assert.assertNull(chk);	
+	}
+	
+	@Test
+	public void testGetXUserId(){
+		XXPortalUser xxPortalUser = new XXPortalUser();
+		xxPortalUser.setId(id);
+		XXUser xxUser = new XXUser();
+		xxUser.setId(id);
+		XXPortalUserDao xxPortalUserDao = Mockito.mock(XXPortalUserDao.class);
+		XXUserDao xxUserDao = Mockito.mock(XXUserDao.class);
+		RangerSecurityContext context = new RangerSecurityContext();
+		UserSessionBase userSessionBase = new UserSessionBase();
+		userSessionBase.setUserAdmin(true);
+		context.setUserSession(userSessionBase);
+		userSessionBase.setXXPortalUser(xxPortalUser);
+		RangerContextHolder.setSecurityContext(context);	
+		Mockito.when(daoManager.getXXPortalUser()).thenReturn(xxPortalUserDao);
+		Mockito.when(xxPortalUserDao.getById(Mockito.anyLong())).thenReturn(xxPortalUser);
+		Mockito.when(daoManager.getXXUser()).thenReturn(xxUserDao);
+		Mockito.when(xxUserDao.findByUserName(Mockito.anyString())).thenReturn(xxUser);		
+		Long chk = rangerBizUtil.getXUserId();
+		Mockito.verify(daoManager).getXXPortalUser();
+		Mockito.verify(xxPortalUserDao).getById(Mockito.anyLong());
+		Mockito.verify(daoManager).getXXUser();
+		Mockito.verify(xxUserDao).findByUserName(Mockito.anyString());
+		Assert.assertEquals(chk, id);		
+	}
+	
+	@Test
+	public void testReplaceMetaChars_PathEmpty(){
+		String path = "";
+		String pathChk = rangerBizUtil.replaceMetaChars(path);
+		Assert.assertFalse(pathChk.contains("\\*"));
+		Assert.assertFalse(pathChk.contains("\\?"));
+	}
+	
+	@Test
+	public void testReplaceMetaChars_NoMetaChars(){
+		String path = "\\Demo\\Test";
+		String pathChk = rangerBizUtil.replaceMetaChars(path);
+		Assert.assertFalse(pathChk.contains("\\*"));
+		Assert.assertFalse(pathChk.contains("\\?"));
+	}
+	
+	@Test
+	public void testReplaceMetaChars_PathNull(){
+		String path = null;
+		String pathChk = rangerBizUtil.replaceMetaChars(path);
+		Assert.assertNull(pathChk);
+	}
+	
+	@Test
+	public void testReplaceMetaChars(){
+		String path = "\\Demo\\Test\\*\\?";
+		String pathChk = rangerBizUtil.replaceMetaChars(path);
+		Assert.assertFalse(pathChk.contains("\\*"));
+		Assert.assertFalse(pathChk.contains("\\?"));
+	}
+	
+	@Test
+	public void testGeneratePublicName(){		
+		String firstName = "Test123456789123456789";
+		String lastName = "Unit";
+		String publicNameChk = rangerBizUtil.generatePublicName(firstName, lastName);
+		Assert.assertEquals("Test12345678... U.", publicNameChk);
+	}
+	
+	@Test
+	public void testGeneratePublicName_fNameLessThanMax(){		
+		String firstName = "Test";
+		String lastName = "";
+		String publicNameChk = rangerBizUtil.generatePublicName(firstName, lastName);
+		Assert.assertNull(publicNameChk);
+	}
+	
+	@Test
+	public void testGeneratePublicName_withPortalUser(){
+		VXPortalUser vXPortalUser = new VXPortalUser();
+		vXPortalUser.setFirstName("Test");
+		vXPortalUser.setLastName(null);
+		String publicNameChk = rangerBizUtil.generatePublicName(vXPortalUser, null);
+		Assert.assertNull(publicNameChk);
+	}
+	
+	@Test
+	public void testGetDisplayName_EmptyName() {
+		String displayNameChk = rangerBizUtil.getDisplayName(null);
+		Assert.assertEquals(rangerBizUtil.EMPTY_CONTENT_DISPLAY_NAME, displayNameChk);
+	}
+	
+	@Test
+	public void testGetDisplayName_AssetName() {
+		XXAsset obj = new XXAsset();
+		obj.setDescription(resourceName);
+		String displayNameChk = rangerBizUtil.getDisplayName(obj);
+		Assert.assertEquals(resourceName, displayNameChk);
+	}
+	
+	@Test
+	public void testGetDisplayName_MoreThanMaxLen() {
+		XXAsset obj = new XXAsset();
+		String name = resourceName;
+		for(int i=0;i<16;i++){
+			name = name + "_" + name + "1";
+		}
+		obj.setDescription(name);
+		String displayNameChk = rangerBizUtil.getDisplayName(obj);
+		Assert.assertEquals(displayNameChk.length(), 150);
+	}
+	
+	@Test
+	public void testGetDisplayNameForClassName(){
+		XXAsset obj = new XXAsset();
+		String displayNameChk = rangerBizUtil.getDisplayNameForClassName(obj);
+		Assert.assertEquals("Asset",displayNameChk);
+	}
+	
+	@Test
+	public void testGetFileNameWithoutExtension(){
+		File file = new File("test.txt");
+		String fileNameChk = rangerBizUtil.getFileNameWithoutExtension(file);
+		Assert.assertEquals("test",fileNameChk);
+	}
+	
+	@Test
+	public void testGetFileNameWithoutExtension_NoFile(){
+		String fileNameChk = rangerBizUtil.getFileNameWithoutExtension(null);
+		Assert.assertNull(fileNameChk);
+	}
+	
+	@Test
+	public void testGetFileNameWithoutExtension_noExt(){
+		File file = new File("test");
+		String fileNameChk = rangerBizUtil.getFileNameWithoutExtension(file);
+		Assert.assertEquals("test",fileNameChk);
+	}
+	
+	@Test
+	public void testGetImageExtension_TestJPG(){
+		String contentType = "img.JPG";
+		String extChk = rangerBizUtil.getImageExtension(contentType);
+		Assert.assertEquals("jpg",extChk);
+	}
+	
+	@Test
+	public void testGetImageExtension_TestJPEG(){
+		String contentType = "img.JPEG";
+		String extChk = rangerBizUtil.getImageExtension(contentType);
+		Assert.assertEquals("jpg",extChk);
+	}
+	
+	@Test
+	public void testGetImageExtension_TestPNG(){
+		String contentType = "img.PNG";
+		String extChk = rangerBizUtil.getImageExtension(contentType);
+		Assert.assertEquals("png",extChk);
+	}
+	
+	@Test
+	public void testGetImageExtension_NoExt(){
+		String contentType = "img";
+		String extChk = rangerBizUtil.getImageExtension(contentType);
+		Assert.assertEquals("",extChk);
+	}
+	
+	@Test
+	public void testGetMimeType_ForJPG(){
+		String mimeTypeChk = rangerBizUtil.getMimeType(RangerConstants.MIME_JPEG);
+		Assert.assertEquals("jpg",mimeTypeChk);		
+	}
+	
+	@Test
+	public void testGetMimeType_ForPNG(){
+		String mimeTypeChk = rangerBizUtil.getMimeType(RangerConstants.MIME_PNG);
+		Assert.assertEquals("png",mimeTypeChk);		
+	}
+	
+	@Test
+	public void testGetMimeType_ForEmpty(){
+		String mimeTypeChk = rangerBizUtil.getMimeType(1);
+		Assert.assertEquals("",mimeTypeChk);
+	}
+	
+	@Test
+	public void testGetMimeTypeInt_ForUnknow(){
+		int mimeTypeChk = rangerBizUtil.getMimeTypeInt("");
+		Assert.assertEquals(RangerConstants.MIME_UNKNOWN, mimeTypeChk);
+	}
+	
+	@Test
+	public void testGetMimeTypeInt_Forjpg(){
+		int mimeTypeChk = rangerBizUtil.getMimeTypeInt("jpg");
+		Assert.assertEquals(RangerConstants.MIME_JPEG, mimeTypeChk);
+	}
+	
+	@Test
+	public void testGetMimeTypeInt_ForJPEG(){
+		int mimeTypeChk = rangerBizUtil.getMimeTypeInt("JPEG");
+		Assert.assertEquals(RangerConstants.MIME_JPEG, mimeTypeChk);
+	}
+	
+	@Test
+	public void testGetMimeTypeInt_EndsWithJPEG(){
+		int mimeTypeChk = rangerBizUtil.getMimeTypeInt("txt.jpeg");
+		Assert.assertEquals(RangerConstants.MIME_JPEG, mimeTypeChk);
+	}
+	
+	@Test
+	public void testGetMimeTypeInt_EndsWithJPG(){
+		int mimeTypeChk = rangerBizUtil.getMimeTypeInt("txt.jpg");
+		Assert.assertEquals(RangerConstants.MIME_JPEG, mimeTypeChk);
+	}
+	
+	@Test
+	public void testGetMimeTypeInt_EndsWithPNG(){
+		int mimeTypeChk = rangerBizUtil.getMimeTypeInt("txt.png");
+		Assert.assertEquals(RangerConstants.MIME_PNG, mimeTypeChk);
+	}
+	
+	@Test
+	public void testGetMimeTypeInt_ForPNG(){
+		int mimeTypeChk = rangerBizUtil.getMimeTypeInt("png");
+		Assert.assertEquals(RangerConstants.MIME_PNG, mimeTypeChk);		
+	}	
+	
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Test
+	public void testGetMObject(){
+		BaseDao baseDao = Mockito.mock(BaseDao.class);
+		Mockito.when(daoManager.getDaoForClassType(RangerCommonEnums.CLASS_TYPE_USER_PROFILE)).thenReturn(baseDao);
+		Mockito.when(baseDao.getById(id)).thenReturn(new XXAsset());
+		XXDBBase mObjChk = rangerBizUtil.getMObject(RangerCommonEnums.CLASS_TYPE_USER_PROFILE,id);
+		Assert.assertNotNull(mObjChk);
+	}
+	
+	@Test
+	public void testGetMObject_NoObjId(){
+		XXDBBase mObjChk = rangerBizUtil.getMObject(RangerCommonEnums.CLASS_TYPE_USER_PROFILE,null);
+		Assert.assertNull(mObjChk);
+	}
+	
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Test
+	public void testGetMObject_VXDataObject(){
+		VXAsset vXDataObject = new VXAsset();
+		vXDataObject.setId(id);	
+		BaseDao baseDao = Mockito.mock(BaseDao.class);
+		Mockito.when(daoManager.getDaoForClassType(vXDataObject.getMyClassType())).thenReturn(baseDao);
+		Mockito.when(baseDao.getById(vXDataObject.getId())).thenReturn(new XXAsset());
+		XXDBBase xXDBaseChk = rangerBizUtil.getMObject(vXDataObject);		
+		Assert.assertNotNull(xXDBaseChk);
+	}
+	
+	@Test
+	public void testGetMObject_NOVXDataObject(){
+		XXDBBase xXDBaseChk = rangerBizUtil.getMObject(null);		
+		Assert.assertNull(xXDBaseChk);
+	}
+	
+	@Test
+	public void testGetVObject_NOObjId(){
+		VXDataObject objchk = rangerBizUtil.getVObject(RangerConstants.CLASS_TYPE_USER_PROFILE, null);
+		Assert.assertNull(objchk);
+	}	
+	
+	@Test
+	public void testMatchHdfsPolicy_NoResourceName(){
+		boolean bnlChk = rangerBizUtil.matchHbasePolicy(null, null, null, id, AppConstants.XA_PERM_TYPE_UNKNOWN);
+		Assert.assertFalse(bnlChk);
+	}
+	
+	@Test
+	public void testMatchHdfsPolicy_NoResourceList(){
+		boolean bnlChk = rangerBizUtil.matchHbasePolicy(resourceName, null, null, id, AppConstants.XA_PERM_TYPE_UNKNOWN);
+		Assert.assertFalse(bnlChk);
+	}
+	
+	@Test
+	public void testMatchHdfsPolicy_NoUserId(){
+		VXResponse vXResponse = new VXResponse();
+		List<XXResource> xResourceList = new ArrayList<XXResource>();
+		XXResource xXResource = new XXResource();
+		xXResource.setId(id);
+		xXResource.setName(resourceName);
+		xXResource.setIsRecursive(AppConstants.BOOL_TRUE);
+		xXResource.setResourceStatus(AppConstants.STATUS_ENABLED);
+		xResourceList.add(xXResource);
+		boolean bnlChk = rangerBizUtil.matchHbasePolicy(resourceName, xResourceList, vXResponse, null, AppConstants.XA_PERM_TYPE_UNKNOWN);
+		Assert.assertFalse(bnlChk);
+	}
+	
+	@Test
+	public void testMatchHdfsPolicy_NoPremission(){
+		VXResponse vXResponse = new VXResponse();
+		List<XXResource> xResourceList = new ArrayList<XXResource>();
+		XXResource xXResource = new XXResource();
+		xXResource.setId(id);
+		xXResource.setName(resourceName);
+		xXResource.setIsRecursive(AppConstants.BOOL_TRUE);
+		xXResource.setResourceStatus(AppConstants.STATUS_ENABLED);
+		xResourceList.add(xXResource);
+		Mockito.when(stringUtil.isEmpty(resourceName)).thenReturn(true);
+		Mockito.when(stringUtil.split(Mockito.anyString(), Mockito.anyString())).thenReturn(new String[0]);
+		boolean bnlChk = rangerBizUtil.matchHbasePolicy("/*/*/*", xResourceList, vXResponse, id, AppConstants.XA_PERM_TYPE_UNKNOWN);
+		Mockito.verify(stringUtil).split(Mockito.anyString(), Mockito.anyString());
+		Assert.assertFalse(bnlChk);
+	}
+	
+	@Test
+	public void testMatchHivePolicy_NoResourceName(){
+		boolean bnlChk = rangerBizUtil.matchHivePolicy(null, null, null, 0);
+		Assert.assertFalse(bnlChk);
+		
+	}
+	
+	@Test
+	public void testMatchHivePolicy_NoResourceList(){
+		boolean bnlChk = rangerBizUtil.matchHivePolicy(resourceName, null, null, 0);
+		Assert.assertFalse(bnlChk);
+		
+	}
+	
+	@Test
+	public void testMatchHivePolicy_NoUserId(){
+		List<XXResource> xResourceList = new ArrayList<XXResource>();
+		XXResource xXResource = new XXResource();
+		xXResource.setId(id);
+		xXResource.setName(resourceName);
+		xXResource.setIsRecursive(AppConstants.BOOL_TRUE);
+		xXResource.setResourceStatus(AppConstants.STATUS_ENABLED);
+		xResourceList.add(xXResource);
+		boolean bnlChk = rangerBizUtil.matchHivePolicy(resourceName, xResourceList, null, 0);
+		Assert.assertFalse(bnlChk);
+		
+	}
+	
+	@Test
+	public void testMatchHivePolicy_NoPremission(){
+		List<XXResource> xResourceList = new ArrayList<XXResource>();
+		XXResource xXResource = new XXResource();
+		xXResource.setId(id);
+		xXResource.setName(resourceName);
+		xXResource.setIsRecursive(AppConstants.BOOL_TRUE);
+		xXResource.setResourceStatus(AppConstants.STATUS_ENABLED);
+		xResourceList.add(xXResource);
+		Mockito.when(stringUtil.split(Mockito.anyString(), Mockito.anyString())).thenReturn(new String[0]);
+		boolean bnlChk = rangerBizUtil.matchHivePolicy("/*/*/*", xResourceList, id, 0);
+		Assert.assertFalse(bnlChk);		
+	}
+	
+	@Test
+	public void testMatchHivePolicy(){
+		List<XXResource> xResourceList = new ArrayList<XXResource>();
+		XXResource xXResource = new XXResource();
+		xXResource.setId(5L);
+		xXResource.setName(resourceName);
+		xXResource.setIsRecursive(AppConstants.BOOL_TRUE);
+		xXResource.setResourceStatus(AppConstants.STATUS_ENABLED);
+		xResourceList.add(xXResource);
+		Mockito.when(stringUtil.split(Mockito.anyString(), Mockito.anyString())).thenReturn(new String[0]);
+		boolean bnlChk = rangerBizUtil.matchHivePolicy("/*/*/*", xResourceList, id, 17);
+		Mockito.verify(stringUtil).split(Mockito.anyString(), Mockito.anyString());
+		Assert.assertFalse(bnlChk);		
+	}		
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java b/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java
index 41d9c4e..c514bfb 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java
@@ -24,26 +24,23 @@ import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.ws.rs.WebApplicationException;
 
-import org.apache.ranger.biz.UserMgr;
-import org.apache.ranger.biz.XABizUtil;
 import org.apache.ranger.common.ContextUtil;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.RESTErrorUtil;
 import org.apache.ranger.common.SearchCriteria;
 import org.apache.ranger.common.StringUtil;
 import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.db.XADaoManager;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.db.XXPortalUserDao;
 import org.apache.ranger.db.XXPortalUserRoleDao;
 import org.apache.ranger.entity.XXPortalUser;
 import org.apache.ranger.entity.XXPortalUserRole;
-import org.apache.ranger.security.context.XAContextHolder;
-import org.apache.ranger.security.context.XASecurityContext;
+import org.apache.ranger.security.context.RangerContextHolder;
+import org.apache.ranger.security.context.RangerSecurityContext;
 import org.apache.ranger.view.VXPasswordChange;
 import org.apache.ranger.view.VXPortalUser;
 import org.apache.ranger.view.VXPortalUserList;
 import org.apache.ranger.view.VXResponse;
-import org.apache.ranger.view.VXString;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Rule;
@@ -69,7 +66,7 @@ public class TestUserMgr {
 	VXPortalUser VXPortalUser;
 
 	@Mock
-	XADaoManager daoManager;
+	RangerDaoManager daoManager;
 
 	@Mock
 	RESTErrorUtil restErrorUtil;
@@ -81,15 +78,15 @@ public class TestUserMgr {
 	StringUtil stringUtil;
 
 	@Mock
-	XABizUtil msBizUtil;
+	RangerBizUtil msBizUtil;
 
 	@Rule
 	public ExpectedException thrown = ExpectedException.none();
 
 	public void setup() {
-		XASecurityContext context = new XASecurityContext();
+		RangerSecurityContext context = new RangerSecurityContext();
 		context.setUserSession(new UserSessionBase());
-		XAContextHolder.setSecurityContext(context);
+		RangerContextHolder.setSecurityContext(context);
 		UserSessionBase currentUserSession = ContextUtil
 				.getCurrentUserSession();
 		currentUserSession.setUserAdmin(true);

[09/12] incubator-ranger git commit: RANGER-194: Rename classes under web-admin project

Posted by ma...@apache.org.

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/RangerCommonEnums.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerCommonEnums.java b/security-admin/src/main/java/org/apache/ranger/common/RangerCommonEnums.java
new file mode 100644
index 0000000..33edc28
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerCommonEnums.java
@@ -0,0 +1,1441 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ package org.apache.ranger.common;
+
+/**
+ * 
+ */
+
+
+public class RangerCommonEnums {
+
+	/***************************************************************
+	 * Enum values for ActiveStatus
+	 **************************************************************/
+	/**
+	 * STATUS_DISABLED is an element of enum ActiveStatus. Its value is "STATUS_DISABLED".
+	 */
+	public static final int STATUS_DISABLED = 0;
+	/**
+	 * STATUS_ENABLED is an element of enum ActiveStatus. Its value is "STATUS_ENABLED".
+	 */
+	public static final int STATUS_ENABLED = 1;
+	/**
+	 * STATUS_DELETED is an element of enum ActiveStatus. Its value is "STATUS_DELETED".
+	 */
+	public static final int STATUS_DELETED = 2;
+
+	/**
+	 * Max value for enum ActiveStatus_MAX
+	 */
+	public static final int ActiveStatus_MAX = 2;
+
+
+	/***************************************************************
+	 * Enum values for ActivationStatus
+	 **************************************************************/
+	/**
+	 * ACT_STATUS_DISABLED is an element of enum ActivationStatus. Its value is "ACT_STATUS_DISABLED".
+	 */
+	public static final int ACT_STATUS_DISABLED = 0;
+	/**
+	 * ACT_STATUS_ACTIVE is an element of enum ActivationStatus. Its value is "ACT_STATUS_ACTIVE".
+	 */
+	public static final int ACT_STATUS_ACTIVE = 1;
+	/**
+	 * ACT_STATUS_PENDING_APPROVAL is an element of enum ActivationStatus. Its value is "ACT_STATUS_PENDING_APPROVAL".
+	 */
+	public static final int ACT_STATUS_PENDING_APPROVAL = 2;
+	/**
+	 * ACT_STATUS_PENDING_ACTIVATION is an element of enum ActivationStatus. Its value is "ACT_STATUS_PENDING_ACTIVATION".
+	 */
+	public static final int ACT_STATUS_PENDING_ACTIVATION = 3;
+	/**
+	 * ACT_STATUS_REJECTED is an element of enum ActivationStatus. Its value is "ACT_STATUS_REJECTED".
+	 */
+	public static final int ACT_STATUS_REJECTED = 4;
+	/**
+	 * ACT_STATUS_DEACTIVATED is an element of enum ActivationStatus. Its value is "ACT_STATUS_DEACTIVATED".
+	 */
+	public static final int ACT_STATUS_DEACTIVATED = 5;
+	/**
+	 * ACT_STATUS_PRE_REGISTRATION is an element of enum ActivationStatus. Its value is "ACT_STATUS_PRE_REGISTRATION".
+	 */
+	public static final int ACT_STATUS_PRE_REGISTRATION = 6;
+	/**
+	 * ACT_STATUS_NO_LOGIN is an element of enum ActivationStatus. Its value is "ACT_STATUS_NO_LOGIN".
+	 */
+	public static final int ACT_STATUS_NO_LOGIN = 7;
+
+	/**
+	 * Max value for enum ActivationStatus_MAX
+	 */
+	public static final int ActivationStatus_MAX = 7;
+
+
+	/***************************************************************
+	 * Enum values for BooleanValue
+	 **************************************************************/
+	/**
+	 * BOOL_NONE is an element of enum BooleanValue. Its value is "BOOL_NONE".
+	 */
+	public static final int BOOL_NONE = 0;
+	/**
+	 * BOOL_TRUE is an element of enum BooleanValue. Its value is "BOOL_TRUE".
+	 */
+	public static final int BOOL_TRUE = 1;
+	/**
+	 * BOOL_FALSE is an element of enum BooleanValue. Its value is "BOOL_FALSE".
+	 */
+	public static final int BOOL_FALSE = 2;
+
+	/**
+	 * Max value for enum BooleanValue_MAX
+	 */
+	public static final int BooleanValue_MAX = 2;
+
+
+	/***************************************************************
+	 * Enum values for DataType
+	 **************************************************************/
+	/**
+	 * DATA_TYPE_UNKNOWN is an element of enum DataType. Its value is "DATA_TYPE_UNKNOWN".
+	 */
+	public static final int DATA_TYPE_UNKNOWN = 0;
+	/**
+	 * DATA_TYPE_INTEGER is an element of enum DataType. Its value is "DATA_TYPE_INTEGER".
+	 */
+	public static final int DATA_TYPE_INTEGER = 1;
+	/**
+	 * DATA_TYPE_DOUBLE is an element of enum DataType. Its value is "DATA_TYPE_DOUBLE".
+	 */
+	public static final int DATA_TYPE_DOUBLE = 2;
+	/**
+	 * DATA_TYPE_STRING is an element of enum DataType. Its value is "DATA_TYPE_STRING".
+	 */
+	public static final int DATA_TYPE_STRING = 3;
+	/**
+	 * DATA_TYPE_BOOLEAN is an element of enum DataType. Its value is "DATA_TYPE_BOOLEAN".
+	 */
+	public static final int DATA_TYPE_BOOLEAN = 4;
+	/**
+	 * DATA_TYPE_DATE is an element of enum DataType. Its value is "DATA_TYPE_DATE".
+	 */
+	public static final int DATA_TYPE_DATE = 5;
+	/**
+	 * DATA_TYPE_STRING_ENUM is an element of enum DataType. Its value is "DATA_TYPE_STRING_ENUM".
+	 */
+	public static final int DATA_TYPE_STRING_ENUM = 6;
+	/**
+	 * DATA_TYPE_LONG is an element of enum DataType. Its value is "DATA_TYPE_LONG".
+	 */
+	public static final int DATA_TYPE_LONG = 7;
+	/**
+	 * DATA_TYPE_INTEGER_ENUM is an element of enum DataType. Its value is "DATA_TYPE_INTEGER_ENUM".
+	 */
+	public static final int DATA_TYPE_INTEGER_ENUM = 8;
+
+	/**
+	 * Max value for enum DataType_MAX
+	 */
+	public static final int DataType_MAX = 8;
+
+
+	/***************************************************************
+	 * Enum values for DeviceType
+	 **************************************************************/
+	/**
+	 * DEVICE_UNKNOWN is an element of enum DeviceType. Its value is "DEVICE_UNKNOWN".
+	 */
+	public static final int DEVICE_UNKNOWN = 0;
+	/**
+	 * DEVICE_BROWSER is an element of enum DeviceType. Its value is "DEVICE_BROWSER".
+	 */
+	public static final int DEVICE_BROWSER = 1;
+	/**
+	 * DEVICE_IPHONE is an element of enum DeviceType. Its value is "DEVICE_IPHONE".
+	 */
+	public static final int DEVICE_IPHONE = 2;
+	/**
+	 * DEVICE_IPAD is an element of enum DeviceType. Its value is "DEVICE_IPAD".
+	 */
+	public static final int DEVICE_IPAD = 3;
+	/**
+	 * DEVICE_IPOD is an element of enum DeviceType. Its value is "DEVICE_IPOD".
+	 */
+	public static final int DEVICE_IPOD = 4;
+	/**
+	 * DEVICE_ANDROID is an element of enum DeviceType. Its value is "DEVICE_ANDROID".
+	 */
+	public static final int DEVICE_ANDROID = 5;
+
+	/**
+	 * Max value for enum DeviceType_MAX
+	 */
+	public static final int DeviceType_MAX = 5;
+
+
+	/***************************************************************
+	 * Enum values for DiffLevel
+	 **************************************************************/
+	/**
+	 * DIFF_UNKNOWN is an element of enum DiffLevel. Its value is "DIFF_UNKNOWN".
+	 */
+	public static final int DIFF_UNKNOWN = 0;
+	/**
+	 * DIFF_LOW is an element of enum DiffLevel. Its value is "DIFF_LOW".
+	 */
+	public static final int DIFF_LOW = 1;
+	/**
+	 * DIFF_MEDIUM is an element of enum DiffLevel. Its value is "DIFF_MEDIUM".
+	 */
+	public static final int DIFF_MEDIUM = 2;
+	/**
+	 * DIFF_HIGH is an element of enum DiffLevel. Its value is "DIFF_HIGH".
+	 */
+	public static final int DIFF_HIGH = 3;
+
+	/**
+	 * Max value for enum DiffLevel_MAX
+	 */
+	public static final int DiffLevel_MAX = 3;
+
+
+	/***************************************************************
+	 * Enum values for FileType
+	 **************************************************************/
+	/**
+	 * FILE_FILE is an element of enum FileType. Its value is "FILE_FILE".
+	 */
+	public static final int FILE_FILE = 0;
+	/**
+	 * FILE_DIR is an element of enum FileType. Its value is "FILE_DIR".
+	 */
+	public static final int FILE_DIR = 1;
+
+	/**
+	 * Max value for enum FileType_MAX
+	 */
+	public static final int FileType_MAX = 1;
+
+
+	/***************************************************************
+	 * Enum values for FreqType
+	 **************************************************************/
+	/**
+	 * FREQ_NONE is an element of enum FreqType. Its value is "FREQ_NONE".
+	 */
+	public static final int FREQ_NONE = 0;
+	/**
+	 * FREQ_MANUAL is an element of enum FreqType. Its value is "FREQ_MANUAL".
+	 */
+	public static final int FREQ_MANUAL = 1;
+	/**
+	 * FREQ_HOURLY is an element of enum FreqType. Its value is "FREQ_HOURLY".
+	 */
+	public static final int FREQ_HOURLY = 2;
+	/**
+	 * FREQ_DAILY is an element of enum FreqType. Its value is "FREQ_DAILY".
+	 */
+	public static final int FREQ_DAILY = 3;
+	/**
+	 * FREQ_WEEKLY is an element of enum FreqType. Its value is "FREQ_WEEKLY".
+	 */
+	public static final int FREQ_WEEKLY = 4;
+	/**
+	 * FREQ_BI_WEEKLY is an element of enum FreqType. Its value is "FREQ_BI_WEEKLY".
+	 */
+	public static final int FREQ_BI_WEEKLY = 5;
+	/**
+	 * FREQ_MONTHLY is an element of enum FreqType. Its value is "FREQ_MONTHLY".
+	 */
+	public static final int FREQ_MONTHLY = 6;
+
+	/**
+	 * Max value for enum FreqType_MAX
+	 */
+	public static final int FreqType_MAX = 6;
+
+
+	/***************************************************************
+	 * Enum values for MimeType
+	 **************************************************************/
+	/**
+	 * MIME_UNKNOWN is an element of enum MimeType. Its value is "MIME_UNKNOWN".
+	 */
+	public static final int MIME_UNKNOWN = 0;
+	/**
+	 * MIME_TEXT is an element of enum MimeType. Its value is "MIME_TEXT".
+	 */
+	public static final int MIME_TEXT = 1;
+	/**
+	 * MIME_HTML is an element of enum MimeType. Its value is "MIME_HTML".
+	 */
+	public static final int MIME_HTML = 2;
+	/**
+	 * MIME_PNG is an element of enum MimeType. Its value is "MIME_PNG".
+	 */
+	public static final int MIME_PNG = 3;
+	/**
+	 * MIME_JPEG is an element of enum MimeType. Its value is "MIME_JPEG".
+	 */
+	public static final int MIME_JPEG = 4;
+
+	/**
+	 * Max value for enum MimeType_MAX
+	 */
+	public static final int MimeType_MAX = 4;
+
+
+	/***************************************************************
+	 * Enum values for NumberFormat
+	 **************************************************************/
+	/**
+	 * NUM_FORMAT_NONE is an element of enum NumberFormat. Its value is "NUM_FORMAT_NONE".
+	 */
+	public static final int NUM_FORMAT_NONE = 0;
+	/**
+	 * NUM_FORMAT_NUMERIC is an element of enum NumberFormat. Its value is "NUM_FORMAT_NUMERIC".
+	 */
+	public static final int NUM_FORMAT_NUMERIC = 1;
+	/**
+	 * NUM_FORMAT_ALPHA is an element of enum NumberFormat. Its value is "NUM_FORMAT_ALPHA".
+	 */
+	public static final int NUM_FORMAT_ALPHA = 2;
+	/**
+	 * NUM_FORMAT_ROMAN is an element of enum NumberFormat. Its value is "NUM_FORMAT_ROMAN".
+	 */
+	public static final int NUM_FORMAT_ROMAN = 3;
+
+	/**
+	 * Max value for enum NumberFormat_MAX
+	 */
+	public static final int NumberFormat_MAX = 3;
+
+
+	/***************************************************************
+	 * Enum values for ObjectStatus
+	 **************************************************************/
+	/**
+	 * OBJ_STATUS_ACTIVE is an element of enum ObjectStatus. Its value is "OBJ_STATUS_ACTIVE".
+	 */
+	public static final int OBJ_STATUS_ACTIVE = 0;
+	/**
+	 * OBJ_STATUS_DELETED is an element of enum ObjectStatus. Its value is "OBJ_STATUS_DELETED".
+	 */
+	public static final int OBJ_STATUS_DELETED = 1;
+	/**
+	 * OBJ_STATUS_ARCHIVED is an element of enum ObjectStatus. Its value is "OBJ_STATUS_ARCHIVED".
+	 */
+	public static final int OBJ_STATUS_ARCHIVED = 2;
+
+	/**
+	 * Max value for enum ObjectStatus_MAX
+	 */
+	public static final int ObjectStatus_MAX = 2;
+
+
+	/***************************************************************
+	 * Enum values for PasswordResetStatus
+	 **************************************************************/
+	/**
+	 * PWD_RESET_ACTIVE is an element of enum PasswordResetStatus. Its value is "PWD_RESET_ACTIVE".
+	 */
+	public static final int PWD_RESET_ACTIVE = 0;
+	/**
+	 * PWD_RESET_USED is an element of enum PasswordResetStatus. Its value is "PWD_RESET_USED".
+	 */
+	public static final int PWD_RESET_USED = 1;
+	/**
+	 * PWD_RESET_EXPIRED is an element of enum PasswordResetStatus. Its value is "PWD_RESET_EXPIRED".
+	 */
+	public static final int PWD_RESET_EXPIRED = 2;
+	/**
+	 * PWD_RESET_DISABLED is an element of enum PasswordResetStatus. Its value is "PWD_RESET_DISABLED".
+	 */
+	public static final int PWD_RESET_DISABLED = 3;
+
+	/**
+	 * Max value for enum PasswordResetStatus_MAX
+	 */
+	public static final int PasswordResetStatus_MAX = 3;
+
+
+	/***************************************************************
+	 * Enum values for PriorityType
+	 **************************************************************/
+	/**
+	 * PRIORITY_NORMAL is an element of enum PriorityType. Its value is "PRIORITY_NORMAL".
+	 */
+	public static final int PRIORITY_NORMAL = 0;
+	/**
+	 * PRIORITY_LOW is an element of enum PriorityType. Its value is "PRIORITY_LOW".
+	 */
+	public static final int PRIORITY_LOW = 1;
+	/**
+	 * PRIORITY_MEDIUM is an element of enum PriorityType. Its value is "PRIORITY_MEDIUM".
+	 */
+	public static final int PRIORITY_MEDIUM = 2;
+	/**
+	 * PRIORITY_HIGH is an element of enum PriorityType. Its value is "PRIORITY_HIGH".
+	 */
+	public static final int PRIORITY_HIGH = 3;
+
+	/**
+	 * Max value for enum PriorityType_MAX
+	 */
+	public static final int PriorityType_MAX = 3;
+
+
+	/***************************************************************
+	 * Enum values for ProgressStatus
+	 **************************************************************/
+	/**
+	 * PROGRESS_PENDING is an element of enum ProgressStatus. Its value is "PROGRESS_PENDING".
+	 */
+	public static final int PROGRESS_PENDING = 0;
+	/**
+	 * PROGRESS_IN_PROGRESS is an element of enum ProgressStatus. Its value is "PROGRESS_IN_PROGRESS".
+	 */
+	public static final int PROGRESS_IN_PROGRESS = 1;
+	/**
+	 * PROGRESS_COMPLETE is an element of enum ProgressStatus. Its value is "PROGRESS_COMPLETE".
+	 */
+	public static final int PROGRESS_COMPLETE = 2;
+	/**
+	 * PROGRESS_ABORTED is an element of enum ProgressStatus. Its value is "PROGRESS_ABORTED".
+	 */
+	public static final int PROGRESS_ABORTED = 3;
+	/**
+	 * PROGRESS_FAILED is an element of enum ProgressStatus. Its value is "PROGRESS_FAILED".
+	 */
+	public static final int PROGRESS_FAILED = 4;
+
+	/**
+	 * Max value for enum ProgressStatus_MAX
+	 */
+	public static final int ProgressStatus_MAX = 4;
+
+
+	/***************************************************************
+	 * Enum values for RelationType
+	 **************************************************************/
+	/**
+	 * REL_NONE is an element of enum RelationType. Its value is "REL_NONE".
+	 */
+	public static final int REL_NONE = 0;
+	/**
+	 * REL_SELF is an element of enum RelationType. Its value is "REL_SELF".
+	 */
+	public static final int REL_SELF = 1;
+
+	/**
+	 * Max value for enum RelationType_MAX
+	 */
+	public static final int RelationType_MAX = 1;
+
+
+	/***************************************************************
+	 * Enum values for UserSource
+	 **************************************************************/
+	/**
+	 * USER_APP is an element of enum UserSource. Its value is "USER_APP".
+	 */
+	public static final int USER_APP = 0;
+	public static final int USER_EXTERNAL = 1;
+	public static final int USER_AD= 2;
+	public static final int USER_LDAP = 3;
+	public static final int USER_UNIX = 4;
+	public static final int USER_REPO = 5;
+	
+	public static final int GROUP_INTERNAL = 0;
+	public static final int GROUP_EXTERNAL = 1;
+	public static final int GROUP_AD= 2;
+	public static final int GROUP_LDAP = 3;
+	public static final int GROUP_UNIX = 4;
+	public static final int GROUP_REPO = 5;
+	/**
+	 * USER_GOOGLE is an element of enum UserSource. Its value is "USER_GOOGLE".
+	 */
+	//public static final int USER_GOOGLE = 1;
+	/**
+	 * USER_FB is an element of enum UserSource. Its value is "USER_FB".
+	 */
+	//public static final int USER_FB = 2;
+
+	/**
+	 * Max value for enum UserSource_MAX
+	 */
+	public static final int UserSource_MAX = 5;
+
+
+	/***************************************************************
+	 * Enum values for AssetType
+	 **************************************************************/
+	/**
+	 * ASSET_UNKNOWN is an element of enum AssetType. Its value is "ASSET_UNKNOWN".
+	 */
+	public static final int ASSET_UNKNOWN = 0;
+	/**
+	 * ASSET_HDFS is an element of enum AssetType. Its value is "ASSET_HDFS".
+	 */
+	public static final int ASSET_HDFS = 1;
+	/**
+	 * ASSET_HBASE is an element of enum AssetType. Its value is "ASSET_HBASE".
+	 */
+	public static final int ASSET_HBASE = 2;
+	/**
+	 * ASSET_HIVE is an element of enum AssetType. Its value is "ASSET_HIVE".
+	 */
+	public static final int ASSET_HIVE = 3;
+	/**
+	 * ASSET_HIVE is an element of enum AssetType. Its value is "ASSET_HIVE".
+	 */
+	public static final int ASSET_AGENT = 4;
+	/**
+	 * ASSET_HIVE is an element of enum AssetType. Its value is "ASSET_HIVE".
+	 */
+	public static final int ASSET_KNOX = 5;
+	/**
+	 * ASSET_HIVE is an element of enum AssetType. Its value is "ASSET_HIVE".
+	 */
+	public static final int ASSET_STORM = 6;
+
+	/**
+	 * Max value for enum AssetType_MAX
+	 */
+	public static final int AssetType_MAX = 6;
+
+
+	/***************************************************************
+	 * Enum values for AccessResult
+	 **************************************************************/
+	/**
+	 * ACCESS_RESULT_DENIED is an element of enum AccessResult. Its value is "ACCESS_RESULT_DENIED".
+	 */
+	public static final int ACCESS_RESULT_DENIED = 0;
+	/**
+	 * ACCESS_RESULT_ALLOWED is an element of enum AccessResult. Its value is "ACCESS_RESULT_ALLOWED".
+	 */
+	public static final int ACCESS_RESULT_ALLOWED = 1;
+
+	/**
+	 * Max value for enum AccessResult_MAX
+	 */
+	public static final int AccessResult_MAX = 1;
+
+
+	/***************************************************************
+	 * Enum values for PolicyType
+	 **************************************************************/
+	/**
+	 * POLICY_INCLUSION is an element of enum PolicyType. Its value is "POLICY_INCLUSION".
+	 */
+	public static final int POLICY_INCLUSION = 0;
+	/**
+	 * POLICY_EXCLUSION is an element of enum PolicyType. Its value is "POLICY_EXCLUSION".
+	 */
+	public static final int POLICY_EXCLUSION = 1;
+
+	/**
+	 * Max value for enum PolicyType_MAX
+	 */
+	public static final int PolicyType_MAX = 1;
+
+
+	/***************************************************************
+	 * Enum values for XAAuditType
+	 **************************************************************/
+	/**
+	 * XA_AUDIT_TYPE_UNKNOWN is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_UNKNOWN".
+	 */
+	public static final int XA_AUDIT_TYPE_UNKNOWN = 0;
+	/**
+	 * XA_AUDIT_TYPE_ALL is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_ALL".
+	 */
+	public static final int XA_AUDIT_TYPE_ALL = 1;
+	/**
+	 * XA_AUDIT_TYPE_READ is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_READ".
+	 */
+	public static final int XA_AUDIT_TYPE_READ = 2;
+	/**
+	 * XA_AUDIT_TYPE_WRITE is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_WRITE".
+	 */
+	public static final int XA_AUDIT_TYPE_WRITE = 3;
+	/**
+	 * XA_AUDIT_TYPE_CREATE is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_CREATE".
+	 */
+	public static final int XA_AUDIT_TYPE_CREATE = 4;
+	/**
+	 * XA_AUDIT_TYPE_DELETE is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_DELETE".
+	 */
+	public static final int XA_AUDIT_TYPE_DELETE = 5;
+	/**
+	 * XA_AUDIT_TYPE_LOGIN is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_LOGIN".
+	 */
+	public static final int XA_AUDIT_TYPE_LOGIN = 6;
+
+	/**
+	 * Max value for enum XAAuditType_MAX
+	 */
+	public static final int XAAuditType_MAX = 6;
+
+
+	/***************************************************************
+	 * Enum values for ResourceType
+	 **************************************************************/
+	/**
+	 * RESOURCE_UNKNOWN is an element of enum ResourceType. Its value is "RESOURCE_UNKNOWN".
+	 */
+	public static final int RESOURCE_UNKNOWN = 0;
+	/**
+	 * RESOURCE_PATH is an element of enum ResourceType. Its value is "RESOURCE_PATH".
+	 */
+	public static final int RESOURCE_PATH = 1;
+	/**
+	 * RESOURCE_DB is an element of enum ResourceType. Its value is "RESOURCE_DB".
+	 */
+	public static final int RESOURCE_DB = 2;
+	/**
+	 * RESOURCE_TABLE is an element of enum ResourceType. Its value is "RESOURCE_TABLE".
+	 */
+	public static final int RESOURCE_TABLE = 3;
+	/**
+	 * RESOURCE_COL_FAM is an element of enum ResourceType. Its value is "RESOURCE_COL_FAM".
+	 */
+	public static final int RESOURCE_COL_FAM = 4;
+	/**
+	 * RESOURCE_COLUMN is an element of enum ResourceType. Its value is "RESOURCE_COLUMN".
+	 */
+	public static final int RESOURCE_COLUMN = 5;
+	/**
+	 * RESOURCE_VIEW is an element of enum ResourceType. Its value is "RESOURCE_VIEW".
+	 */
+	public static final int RESOURCE_VIEW = 6;
+	/**
+	 * RESOURCE_UDF is an element of enum ResourceType. Its value is "RESOURCE_UDF".
+	 */
+	public static final int RESOURCE_UDF = 7;
+	/**
+	 * RESOURCE_VIEW_COL is an element of enum ResourceType. Its value is "RESOURCE_VIEW_COL".
+	 */
+	public static final int RESOURCE_VIEW_COL = 8;
+
+	/**
+	 * Max value for enum ResourceType_MAX
+	 */
+	public static final int ResourceType_MAX = 8;
+
+
+	/***************************************************************
+	 * Enum values for XAGroupType
+	 **************************************************************/
+	/**
+	 * XA_GROUP_UNKNOWN is an element of enum XAGroupType. Its value is "XA_GROUP_UNKNOWN".
+	 */
+	public static final int XA_GROUP_UNKNOWN = 0;
+	/**
+	 * XA_GROUP_USER is an element of enum XAGroupType. Its value is "XA_GROUP_USER".
+	 */
+	public static final int XA_GROUP_USER = 1;
+	/**
+	 * XA_GROUP_GROUP is an element of enum XAGroupType. Its value is "XA_GROUP_GROUP".
+	 */
+	public static final int XA_GROUP_GROUP = 2;
+	/**
+	 * XA_GROUP_ROLE is an element of enum XAGroupType. Its value is "XA_GROUP_ROLE".
+	 */
+	public static final int XA_GROUP_ROLE = 3;
+
+	/**
+	 * Max value for enum XAGroupType_MAX
+	 */
+	public static final int XAGroupType_MAX = 3;
+
+
+	/***************************************************************
+	 * Enum values for XAPermForType
+	 **************************************************************/
+	/**
+	 * XA_PERM_FOR_UNKNOWN is an element of enum XAPermForType. Its value is "XA_PERM_FOR_UNKNOWN".
+	 */
+	public static final int XA_PERM_FOR_UNKNOWN = 0;
+	/**
+	 * XA_PERM_FOR_USER is an element of enum XAPermForType. Its value is "XA_PERM_FOR_USER".
+	 */
+	public static final int XA_PERM_FOR_USER = 1;
+	/**
+	 * XA_PERM_FOR_GROUP is an element of enum XAPermForType. Its value is "XA_PERM_FOR_GROUP".
+	 */
+	public static final int XA_PERM_FOR_GROUP = 2;
+
+	/**
+	 * Max value for enum XAPermForType_MAX
+	 */
+	public static final int XAPermForType_MAX = 2;
+
+
+	/***************************************************************
+	 * Enum values for XAPermType
+	 **************************************************************/
+	/**
+	 * XA_PERM_TYPE_UNKNOWN is an element of enum XAPermType. Its value is "XA_PERM_TYPE_UNKNOWN".
+	 */
+	public static final int XA_PERM_TYPE_UNKNOWN = 0;
+	/**
+	 * XA_PERM_TYPE_RESET is an element of enum XAPermType. Its value is "XA_PERM_TYPE_RESET".
+	 */
+	public static final int XA_PERM_TYPE_RESET = 1;
+	/**
+	 * XA_PERM_TYPE_READ is an element of enum XAPermType. Its value is "XA_PERM_TYPE_READ".
+	 */
+	public static final int XA_PERM_TYPE_READ = 2;
+	/**
+	 * XA_PERM_TYPE_WRITE is an element of enum XAPermType. Its value is "XA_PERM_TYPE_WRITE".
+	 */
+	public static final int XA_PERM_TYPE_WRITE = 3;
+	/**
+	 * XA_PERM_TYPE_CREATE is an element of enum XAPermType. Its value is "XA_PERM_TYPE_CREATE".
+	 */
+	public static final int XA_PERM_TYPE_CREATE = 4;
+	/**
+	 * XA_PERM_TYPE_DELETE is an element of enum XAPermType. Its value is "XA_PERM_TYPE_DELETE".
+	 */
+	public static final int XA_PERM_TYPE_DELETE = 5;
+	/**
+	 * XA_PERM_TYPE_ADMIN is an element of enum XAPermType. Its value is "XA_PERM_TYPE_ADMIN".
+	 */
+	public static final int XA_PERM_TYPE_ADMIN = 6;
+	/**
+	 * XA_PERM_TYPE_OBFUSCATE is an element of enum XAPermType. Its value is "XA_PERM_TYPE_OBFUSCATE".
+	 */
+	public static final int XA_PERM_TYPE_OBFUSCATE = 7;
+	/**
+	 * XA_PERM_TYPE_MASK is an element of enum XAPermType. Its value is "XA_PERM_TYPE_MASK".
+	 */
+	public static final int XA_PERM_TYPE_MASK = 8;
+	/**
+	 * XA_PERM_TYPE_EXECUTE is an element of enum XAPermType. Its value is "XA_PERM_TYPE_EXECUTE".
+	 */
+	public static final int XA_PERM_TYPE_EXECUTE = 9;
+	/**
+	 * XA_PERM_TYPE_SELECT is an element of enum XAPermType. Its value is "XA_PERM_TYPE_SELECT".
+	 */
+	public static final int XA_PERM_TYPE_SELECT = 10;
+	/**
+	 * XA_PERM_TYPE_UPDATE is an element of enum XAPermType. Its value is "XA_PERM_TYPE_UPDATE".
+	 */
+	public static final int XA_PERM_TYPE_UPDATE = 11;
+	/**
+	 * XA_PERM_TYPE_DROP is an element of enum XAPermType. Its value is "XA_PERM_TYPE_DROP".
+	 */
+	public static final int XA_PERM_TYPE_DROP = 12;
+	/**
+	 * XA_PERM_TYPE_ALTER is an element of enum XAPermType. Its value is "XA_PERM_TYPE_ALTER".
+	 */
+	public static final int XA_PERM_TYPE_ALTER = 13;
+	/**
+	 * XA_PERM_TYPE_INDEX is an element of enum XAPermType. Its value is "XA_PERM_TYPE_INDEX".
+	 */
+	public static final int XA_PERM_TYPE_INDEX = 14;
+	/**
+	 * XA_PERM_TYPE_LOCK is an element of enum XAPermType. Its value is "XA_PERM_TYPE_LOCK".
+	 */
+	public static final int XA_PERM_TYPE_LOCK = 15;
+	/**
+	 * XA_PERM_TYPE_ALL is an element of enum XAPermType. Its value is "XA_PERM_TYPE_ALL".
+	 */
+	public static final int XA_PERM_TYPE_ALL = 16;
+
+	/**
+	 * XA_PERM_TYPE_ALL is an element of enum XAPermType. Its value is "XA_PERM_TYPE_ALLOW".
+	 */
+	public static final int XA_PERM_TYPE_ALLOW = 17;
+
+	/**
+	 * Max value for enum XAPermType_MAX
+	 */
+	public static final int XAPermType_MAX = 17;
+
+
+	/***************************************************************
+	 * Enum values for ClassTypes
+	 **************************************************************/
+	/**
+	 * CLASS_TYPE_NONE is an element of enum ClassTypes. Its value is "CLASS_TYPE_NONE".
+	 */
+	public static final int CLASS_TYPE_NONE = 0;
+	/**
+	 * CLASS_TYPE_MESSAGE is an element of enum ClassTypes. Its value is "CLASS_TYPE_MESSAGE".
+	 */
+	public static final int CLASS_TYPE_MESSAGE = 1;
+	/**
+	 * CLASS_TYPE_USER_PROFILE is an element of enum ClassTypes. Its value is "CLASS_TYPE_USER_PROFILE".
+	 */
+	public static final int CLASS_TYPE_USER_PROFILE = 2;
+	/**
+	 * CLASS_TYPE_AUTH_SESS is an element of enum ClassTypes. Its value is "CLASS_TYPE_AUTH_SESS".
+	 */
+	public static final int CLASS_TYPE_AUTH_SESS = 3;
+	/**
+	 * CLASS_TYPE_DATA_OBJECT is an element of enum ClassTypes. Its value is "CLASS_TYPE_DATA_OBJECT".
+	 */
+	public static final int CLASS_TYPE_DATA_OBJECT = 4;
+	/**
+	 * CLASS_TYPE_NAMEVALUE is an element of enum ClassTypes. Its value is "CLASS_TYPE_NAMEVALUE".
+	 */
+	public static final int CLASS_TYPE_NAMEVALUE = 5;
+	/**
+	 * CLASS_TYPE_LONG is an element of enum ClassTypes. Its value is "CLASS_TYPE_LONG".
+	 */
+	public static final int CLASS_TYPE_LONG = 6;
+	/**
+	 * CLASS_TYPE_PASSWORD_CHANGE is an element of enum ClassTypes. Its value is "CLASS_TYPE_PASSWORD_CHANGE".
+	 */
+	public static final int CLASS_TYPE_PASSWORD_CHANGE = 7;
+	/**
+	 * CLASS_TYPE_STRING is an element of enum ClassTypes. Its value is "CLASS_TYPE_STRING".
+	 */
+	public static final int CLASS_TYPE_STRING = 8;
+	/**
+	 * CLASS_TYPE_ENUM is an element of enum ClassTypes. Its value is "CLASS_TYPE_ENUM".
+	 */
+	public static final int CLASS_TYPE_ENUM = 9;
+	/**
+	 * CLASS_TYPE_ENUM_ELEMENT is an element of enum ClassTypes. Its value is "CLASS_TYPE_ENUM_ELEMENT".
+	 */
+	public static final int CLASS_TYPE_ENUM_ELEMENT = 10;
+	/**
+	 * CLASS_TYPE_RESPONSE is an element of enum ClassTypes. Its value is "CLASS_TYPE_RESPONSE".
+	 */
+	public static final int CLASS_TYPE_RESPONSE = 11;
+	/**
+	 * CLASS_TYPE_XA_ASSET is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_ASSET".
+	 */
+	public static final int CLASS_TYPE_XA_ASSET = 1000;
+	/**
+	 * CLASS_TYPE_XA_RESOURCE is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_RESOURCE".
+	 */
+	public static final int CLASS_TYPE_XA_RESOURCE = 1001;
+	/**
+	 * CLASS_TYPE_XA_GROUP is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_GROUP".
+	 */
+	public static final int CLASS_TYPE_XA_GROUP = 1002;
+	/**
+	 * CLASS_TYPE_XA_USER is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_USER".
+	 */
+	public static final int CLASS_TYPE_XA_USER = 1003;
+	/**
+	 * CLASS_TYPE_XA_GROUP_USER is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_GROUP_USER".
+	 */
+	public static final int CLASS_TYPE_XA_GROUP_USER = 1004;
+	/**
+	 * CLASS_TYPE_XA_GROUP_GROUP is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_GROUP_GROUP".
+	 */
+	public static final int CLASS_TYPE_XA_GROUP_GROUP = 1005;
+	/**
+	 * CLASS_TYPE_XA_PERM_MAP is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_PERM_MAP".
+	 */
+	public static final int CLASS_TYPE_XA_PERM_MAP = 1006;
+	/**
+	 * CLASS_TYPE_XA_AUDIT_MAP is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_AUDIT_MAP".
+	 */
+	public static final int CLASS_TYPE_XA_AUDIT_MAP = 1007;
+	/**
+	 * CLASS_TYPE_XA_CRED_STORE is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_CRED_STORE".
+	 */
+	public static final int CLASS_TYPE_XA_CRED_STORE = 1008;
+	/**
+	 * CLASS_TYPE_XA_POLICY_EXPORT_AUDIT is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_POLICY_EXPORT_AUDIT".
+	 */
+	public static final int CLASS_TYPE_XA_POLICY_EXPORT_AUDIT = 1009;
+	/**
+	 * CLASS_TYPE_TRX_LOG is an element of enum ClassTypes. Its value is "CLASS_TYPE_TRX_LOG".
+	 */
+	public static final int CLASS_TYPE_TRX_LOG = 1010;
+	/**
+	 * CLASS_TYPE_XA_ACCESS_AUDIT is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_ACCESS_AUDIT".
+	 */
+	public static final int CLASS_TYPE_XA_ACCESS_AUDIT = 1011;
+	/**
+	 * CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE".
+	 */
+	public static final int CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE = 1012;
+
+	/**
+	 * Max value for enum ClassTypes_MAX
+	 */
+	public static final int ClassTypes_MAX = 1012;
+
+
+
+	static public String getLabelFor_ActiveStatus( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Disabled"; //STATUS_DISABLED
+		}
+		if( elementValue == 1 ) {
+			return "Enabled"; //STATUS_ENABLED
+		}
+		if( elementValue == 2 ) {
+			return "Deleted"; //STATUS_DELETED
+		}
+		return null;
+	}
+
+	static public String getLabelFor_ActivationStatus( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Disabled"; //ACT_STATUS_DISABLED
+		}
+		if( elementValue == 1 ) {
+			return "Active"; //ACT_STATUS_ACTIVE
+		}
+		if( elementValue == 2 ) {
+			return "Pending Approval"; //ACT_STATUS_PENDING_APPROVAL
+		}
+		if( elementValue == 3 ) {
+			return "Pending Activation"; //ACT_STATUS_PENDING_ACTIVATION
+		}
+		if( elementValue == 4 ) {
+			return "Rejected"; //ACT_STATUS_REJECTED
+		}
+		if( elementValue == 5 ) {
+			return "Deactivated"; //ACT_STATUS_DEACTIVATED
+		}
+		if( elementValue == 6 ) {
+			return "Registration Pending"; //ACT_STATUS_PRE_REGISTRATION
+		}
+		if( elementValue == 7 ) {
+			return "No login privilege"; //ACT_STATUS_NO_LOGIN
+		}
+		return null;
+	}
+
+	static public String getLabelFor_BooleanValue( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "None"; //BOOL_NONE
+		}
+		if( elementValue == 1 ) {
+			return "True"; //BOOL_TRUE
+		}
+		if( elementValue == 2 ) {
+			return "False"; //BOOL_FALSE
+		}
+		return null;
+	}
+
+	static public String getLabelFor_DataType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Unknown"; //DATA_TYPE_UNKNOWN
+		}
+		if( elementValue == 1 ) {
+			return "Integer"; //DATA_TYPE_INTEGER
+		}
+		if( elementValue == 2 ) {
+			return "Double"; //DATA_TYPE_DOUBLE
+		}
+		if( elementValue == 3 ) {
+			return "String"; //DATA_TYPE_STRING
+		}
+		if( elementValue == 4 ) {
+			return "Boolean"; //DATA_TYPE_BOOLEAN
+		}
+		if( elementValue == 5 ) {
+			return "Date"; //DATA_TYPE_DATE
+		}
+		if( elementValue == 6 ) {
+			return "String enumeration"; //DATA_TYPE_STRING_ENUM
+		}
+		if( elementValue == 7 ) {
+			return "Long"; //DATA_TYPE_LONG
+		}
+		if( elementValue == 8 ) {
+			return "Integer enumeration"; //DATA_TYPE_INTEGER_ENUM
+		}
+		return null;
+	}
+
+	static public String getLabelFor_DeviceType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Unknown"; //DEVICE_UNKNOWN
+		}
+		if( elementValue == 1 ) {
+			return "Browser"; //DEVICE_BROWSER
+		}
+		if( elementValue == 2 ) {
+			return "iPhone"; //DEVICE_IPHONE
+		}
+		if( elementValue == 3 ) {
+			return "iPad"; //DEVICE_IPAD
+		}
+		if( elementValue == 4 ) {
+			return "iPod"; //DEVICE_IPOD
+		}
+		if( elementValue == 5 ) {
+			return "Android"; //DEVICE_ANDROID
+		}
+		return null;
+	}
+
+	static public String getLabelFor_DiffLevel( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Unknown"; //DIFF_UNKNOWN
+		}
+		if( elementValue == 1 ) {
+			return "Low"; //DIFF_LOW
+		}
+		if( elementValue == 2 ) {
+			return "Medium"; //DIFF_MEDIUM
+		}
+		if( elementValue == 3 ) {
+			return "High"; //DIFF_HIGH
+		}
+		return null;
+	}
+
+	static public String getLabelFor_FileType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "File"; //FILE_FILE
+		}
+		if( elementValue == 1 ) {
+			return "Directory"; //FILE_DIR
+		}
+		return null;
+	}
+
+	static public String getLabelFor_FreqType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "None"; //FREQ_NONE
+		}
+		if( elementValue == 1 ) {
+			return "Manual"; //FREQ_MANUAL
+		}
+		if( elementValue == 2 ) {
+			return "Hourly"; //FREQ_HOURLY
+		}
+		if( elementValue == 3 ) {
+			return "Daily"; //FREQ_DAILY
+		}
+		if( elementValue == 4 ) {
+			return "Weekly"; //FREQ_WEEKLY
+		}
+		if( elementValue == 5 ) {
+			return "Bi Weekly"; //FREQ_BI_WEEKLY
+		}
+		if( elementValue == 6 ) {
+			return "Monthly"; //FREQ_MONTHLY
+		}
+		return null;
+	}
+
+	static public String getLabelFor_MimeType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Unknown"; //MIME_UNKNOWN
+		}
+		if( elementValue == 1 ) {
+			return "Text"; //MIME_TEXT
+		}
+		if( elementValue == 2 ) {
+			return "Html"; //MIME_HTML
+		}
+		if( elementValue == 3 ) {
+			return "png"; //MIME_PNG
+		}
+		if( elementValue == 4 ) {
+			return "jpeg"; //MIME_JPEG
+		}
+		return null;
+	}
+
+	static public String getLabelFor_NumberFormat( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "None"; //NUM_FORMAT_NONE
+		}
+		if( elementValue == 1 ) {
+			return "Numeric"; //NUM_FORMAT_NUMERIC
+		}
+		if( elementValue == 2 ) {
+			return "Alphabhet"; //NUM_FORMAT_ALPHA
+		}
+		if( elementValue == 3 ) {
+			return "Roman"; //NUM_FORMAT_ROMAN
+		}
+		return null;
+	}
+
+	static public String getLabelFor_ObjectStatus( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Active"; //OBJ_STATUS_ACTIVE
+		}
+		if( elementValue == 1 ) {
+			return "Deleted"; //OBJ_STATUS_DELETED
+		}
+		if( elementValue == 2 ) {
+			return "Archived"; //OBJ_STATUS_ARCHIVED
+		}
+		return null;
+	}
+
+	static public String getLabelFor_PasswordResetStatus( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Active"; //PWD_RESET_ACTIVE
+		}
+		if( elementValue == 1 ) {
+			return "Used"; //PWD_RESET_USED
+		}
+		if( elementValue == 2 ) {
+			return "Expired"; //PWD_RESET_EXPIRED
+		}
+		if( elementValue == 3 ) {
+			return "Disabled"; //PWD_RESET_DISABLED
+		}
+		return null;
+	}
+
+	static public String getLabelFor_PriorityType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Normal"; //PRIORITY_NORMAL
+		}
+		if( elementValue == 1 ) {
+			return "Low"; //PRIORITY_LOW
+		}
+		if( elementValue == 2 ) {
+			return "Medium"; //PRIORITY_MEDIUM
+		}
+		if( elementValue == 3 ) {
+			return "High"; //PRIORITY_HIGH
+		}
+		return null;
+	}
+
+	static public String getLabelFor_ProgressStatus( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Pending"; //PROGRESS_PENDING
+		}
+		if( elementValue == 1 ) {
+			return "In Progress"; //PROGRESS_IN_PROGRESS
+		}
+		if( elementValue == 2 ) {
+			return "Complete"; //PROGRESS_COMPLETE
+		}
+		if( elementValue == 3 ) {
+			return "Aborted"; //PROGRESS_ABORTED
+		}
+		if( elementValue == 4 ) {
+			return "Failed"; //PROGRESS_FAILED
+		}
+		return null;
+	}
+
+	static public String getLabelFor_RelationType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "None"; //REL_NONE
+		}
+		if( elementValue == 1 ) {
+			return "Self"; //REL_SELF
+		}
+		return null;
+	}
+
+	static public String getLabelFor_UserSource( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Application"; //USER_APP
+		}
+		if( elementValue == 1 ) {
+			return "External"; //USER_EXTERNAL
+		}
+		/*if( elementValue == 1 ) {
+			return "Google"; //USER_GOOGLE
+		}
+		if( elementValue == 2 ) {
+			return "FaceBook"; //USER_FB
+		}*/
+		return null;
+	}
+
+	static public String getLabelFor_AssetType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Unknown"; //ASSET_UNKNOWN
+		}
+		if( elementValue == 1 ) {
+			return "HDFS"; //ASSET_HDFS
+		}
+		if( elementValue == 2 ) {
+			return "HBase"; //ASSET_HBASE
+		}
+		if( elementValue == 3 ) {
+			return "Hive"; //ASSET_HIVE
+		}
+		if( elementValue == 4 ) {
+			return "Agent"; //ASSET_HIVE
+		}
+		if( elementValue == 5 ) {
+			return "Knox"; //ASSET_HIVE
+		}
+		if( elementValue == 6 ) {
+			return "Storm"; //ASSET_HIVE
+		}
+		return null;
+	}
+
+	static public String getLabelFor_AccessResult( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Denied"; //ACCESS_RESULT_DENIED
+		}
+		if( elementValue == 1 ) {
+			return "Allowed"; //ACCESS_RESULT_ALLOWED
+		}
+		return null;
+	}
+
+	static public String getLabelFor_PolicyType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Inclusion"; //POLICY_INCLUSION
+		}
+		if( elementValue == 1 ) {
+			return "Exclusion"; //POLICY_EXCLUSION
+		}
+		return null;
+	}
+
+	static public String getLabelFor_XAAuditType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Unknown"; //XA_AUDIT_TYPE_UNKNOWN
+		}
+		if( elementValue == 1 ) {
+			return "All"; //XA_AUDIT_TYPE_ALL
+		}
+		if( elementValue == 2 ) {
+			return "Read"; //XA_AUDIT_TYPE_READ
+		}
+		if( elementValue == 3 ) {
+			return "Write"; //XA_AUDIT_TYPE_WRITE
+		}
+		if( elementValue == 4 ) {
+			return "Create"; //XA_AUDIT_TYPE_CREATE
+		}
+		if( elementValue == 5 ) {
+			return "Delete"; //XA_AUDIT_TYPE_DELETE
+		}
+		if( elementValue == 6 ) {
+			return "Login"; //XA_AUDIT_TYPE_LOGIN
+		}
+		return null;
+	}
+
+	static public String getLabelFor_ResourceType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Unknown"; //RESOURCE_UNKNOWN
+		}
+		if( elementValue == 1 ) {
+			return "Path"; //RESOURCE_PATH
+		}
+		if( elementValue == 2 ) {
+			return "Database"; //RESOURCE_DB
+		}
+		if( elementValue == 3 ) {
+			return "Table"; //RESOURCE_TABLE
+		}
+		if( elementValue == 4 ) {
+			return "Column Family"; //RESOURCE_COL_FAM
+		}
+		if( elementValue == 5 ) {
+			return "Column"; //RESOURCE_COLUMN
+		}
+		if( elementValue == 6 ) {
+			return "VIEW"; //RESOURCE_VIEW
+		}
+		if( elementValue == 7 ) {
+			return "UDF"; //RESOURCE_UDF
+		}
+		if( elementValue == 8 ) {
+			return "View Column"; //RESOURCE_VIEW_COL
+		}
+		return null;
+	}
+
+	static public String getLabelFor_XAGroupType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Unknown"; //XA_GROUP_UNKNOWN
+		}
+		if( elementValue == 1 ) {
+			return "User"; //XA_GROUP_USER
+		}
+		if( elementValue == 2 ) {
+			return "Group"; //XA_GROUP_GROUP
+		}
+		if( elementValue == 3 ) {
+			return "Role"; //XA_GROUP_ROLE
+		}
+		return null;
+	}
+
+	static public String getLabelFor_XAPermForType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Unknown"; //XA_PERM_FOR_UNKNOWN
+		}
+		if( elementValue == 1 ) {
+			return "Permission for Users"; //XA_PERM_FOR_USER
+		}
+		if( elementValue == 2 ) {
+			return "Permission for Groups"; //XA_PERM_FOR_GROUP
+		}
+		return null;
+	}
+
+	static public String getLabelFor_XAPermType( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "Unknown"; //XA_PERM_TYPE_UNKNOWN
+		}
+		if( elementValue == 1 ) {
+			return "Reset"; //XA_PERM_TYPE_RESET
+		}
+		if( elementValue == 2 ) {
+			return "Read"; //XA_PERM_TYPE_READ
+		}
+		if( elementValue == 3 ) {
+			return "Write"; //XA_PERM_TYPE_WRITE
+		}
+		if( elementValue == 4 ) {
+			return "Create"; //XA_PERM_TYPE_CREATE
+		}
+		if( elementValue == 5 ) {
+			return "Delete"; //XA_PERM_TYPE_DELETE
+		}
+		if( elementValue == 6 ) {
+			return "Admin"; //XA_PERM_TYPE_ADMIN
+		}
+		if( elementValue == 7 ) {
+			return "Obfuscate"; //XA_PERM_TYPE_OBFUSCATE
+		}
+		if( elementValue == 8 ) {
+			return "Mask"; //XA_PERM_TYPE_MASK
+		}
+		if( elementValue == 9 ) {
+			return "Execute"; //XA_PERM_TYPE_EXECUTE
+		}
+		if( elementValue == 10 ) {
+			return "Select"; //XA_PERM_TYPE_SELECT
+		}
+		if( elementValue == 11 ) {
+			return "Update"; //XA_PERM_TYPE_UPDATE
+		}
+		if( elementValue == 12 ) {
+			return "Drop"; //XA_PERM_TYPE_DROP
+		}
+		if( elementValue == 13 ) {
+			return "Alter"; //XA_PERM_TYPE_ALTER
+		}
+		if( elementValue == 14 ) {
+			return "Index"; //XA_PERM_TYPE_INDEX
+		}
+		if( elementValue == 15 ) {
+			return "Lock"; //XA_PERM_TYPE_LOCK
+		}
+		if( elementValue == 16 ) {
+			return "All"; //XA_PERM_TYPE_ALL
+		}
+		if( elementValue == 17 ) {
+			return "Allow"; //XA_PERM_TYPE_ALLOW
+		}
+		return null;
+	}
+
+	static public String getLabelFor_ClassTypes( int elementValue ) {
+		if( elementValue == 0 ) {
+			return "None"; //CLASS_TYPE_NONE
+		}
+		if( elementValue == 1 ) {
+			return "Message"; //CLASS_TYPE_MESSAGE
+		}
+		if( elementValue == 2 ) {
+			return "User Profile"; //CLASS_TYPE_USER_PROFILE
+		}
+		if( elementValue == 3 ) {
+			return "Authentication Session"; //CLASS_TYPE_AUTH_SESS
+		}
+		if( elementValue == 4 ) {
+			return null; //CLASS_TYPE_DATA_OBJECT
+		}
+		if( elementValue == 5 ) {
+			return null; //CLASS_TYPE_NAMEVALUE
+		}
+		if( elementValue == 6 ) {
+			return null; //CLASS_TYPE_LONG
+		}
+		if( elementValue == 7 ) {
+			return null; //CLASS_TYPE_PASSWORD_CHANGE
+		}
+		if( elementValue == 8 ) {
+			return null; //CLASS_TYPE_STRING
+		}
+		if( elementValue == 9 ) {
+			return null; //CLASS_TYPE_ENUM
+		}
+		if( elementValue == 10 ) {
+			return null; //CLASS_TYPE_ENUM_ELEMENT
+		}
+		if( elementValue == 11 ) {
+			return "Response"; //CLASS_TYPE_RESPONSE
+		}
+		if( elementValue == 1000 ) {
+			return "Asset"; //CLASS_TYPE_XA_ASSET
+		}
+		if( elementValue == 1001 ) {
+			return "Resource"; //CLASS_TYPE_XA_RESOURCE
+		}
+		if( elementValue == 1002 ) {
+			return "XA Group"; //CLASS_TYPE_XA_GROUP
+		}
+		if( elementValue == 1003 ) {
+			return "XA User"; //CLASS_TYPE_XA_USER
+		}
+		if( elementValue == 1004 ) {
+			return "XA Group of Users"; //CLASS_TYPE_XA_GROUP_USER
+		}
+		if( elementValue == 1005 ) {
+			return "XA Group of groups"; //CLASS_TYPE_XA_GROUP_GROUP
+		}
+		if( elementValue == 1006 ) {
+			return "XA permissions for resource"; //CLASS_TYPE_XA_PERM_MAP
+		}
+		if( elementValue == 1007 ) {
+			return "XA audits for resource"; //CLASS_TYPE_XA_AUDIT_MAP
+		}
+		if( elementValue == 1008 ) {
+			return "XA credential store"; //CLASS_TYPE_XA_CRED_STORE
+		}
+		if( elementValue == 1009 ) {
+			return "XA Policy Export Audit"; //CLASS_TYPE_XA_POLICY_EXPORT_AUDIT
+		}
+		if( elementValue == 1010 ) {
+			return "Transaction log"; //CLASS_TYPE_TRX_LOG
+		}
+		if( elementValue == 1011 ) {
+			return "Access Audit"; //CLASS_TYPE_XA_ACCESS_AUDIT
+		}
+		if( elementValue == 1012 ) {
+			return "Transaction log attribute"; //CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE
+		}
+		return null;
+	}
+
+
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java
new file mode 100644
index 0000000..67ce850
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ package org.apache.ranger.common;
+
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+/**
+ * 
+ * 
+ */
+@Component
+public class RangerConfigUtil {
+	static Logger logger = Logger.getLogger(RangerConfigUtil.class);
+
+	String webappRootURL;
+	int defaultMaxRows = 250;
+	String[] roles;
+	boolean accessFilterEnabled = true;
+	boolean isModerationEnabled = false;
+	boolean isUserPrefEnabled = false;
+
+	public RangerConfigUtil() {
+		webappRootURL = PropertiesUtil
+				.getProperty("xa.webapp.url.root");
+		if (webappRootURL == null || webappRootURL.trim().length() == 0) {
+			logger.error("webapp URL is not set. Please xa.webapp.url.root property");
+		}
+
+		defaultMaxRows = PropertiesUtil.getIntProperty(
+				"xa.db.maxrows.default", defaultMaxRows);
+
+		roles = PropertiesUtil
+				.getPropertyStringList("xa.users.roles.list");
+
+		accessFilterEnabled = PropertiesUtil.getBooleanProperty(
+				"xa.db.access.filter.enable", true);
+
+		isModerationEnabled = PropertiesUtil.getBooleanProperty(
+				"xa.moderation.enabled", isModerationEnabled);
+		isUserPrefEnabled = PropertiesUtil.getBooleanProperty(
+				"xa.userpref.enabled", isUserPrefEnabled);
+	}	
+
+	/**
+	 * @return the defaultMaxRows
+	 */
+	public int getDefaultMaxRows() {
+		return defaultMaxRows;
+	}
+
+	/**
+	 * @return the roles
+	 */
+	public String[] getRoles() {
+		return roles;
+	}
+
+	/**
+	 * @return the accessFilterEnabled
+	 */
+	public boolean isAccessFilterEnabled() {
+		return accessFilterEnabled;
+	}
+
+	/**
+	 * @return the webAppRootURL
+	 */
+	public String getWebAppRootURL() {
+		return webappRootURL;
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/RangerConstants.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerConstants.java b/security-admin/src/main/java/org/apache/ranger/common/RangerConstants.java
new file mode 100644
index 0000000..b09b21a
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerConstants.java
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ /**
+ *
+ */
+
+package org.apache.ranger.common;
+
+public class RangerConstants extends RangerCommonEnums {
+
+	// Default Roles
+	public final static String ROLE_SYS_ADMIN = "ROLE_SYS_ADMIN";
+	public final static String ROLE_ADMIN = "ROLE_ADMIN";
+	public final static String ROLE_INTEGRATOR = "ROLE_INTEGRATOR";
+	public final static String ROLE_DATA_ANALYST = "ROLE_DATA_ANALYST";
+	public final static String ROLE_BIZ_MGR = "ROLE_BIZ_MGR";
+
+	public final static String ROLE_USER = "ROLE_USER";
+	public final static String ROLE_ANON = "ROLE_ANON";
+	public final static String ROLE_OTHER = "ROLE_OTHER";
+	public final static String GROUP_PUBLIC = "public";
+	// Action constants
+	public final static String ACTION_EDIT = "edit";
+	public final static String ACTION_CHANGE = "change";
+	public final static String ACTION_DELETE = "delete";
+	public final static String ACTION_MARK_SPAM = "mark_spam";
+	public final static String ACTION_RATE = "rate";
+	public final static String ACTION_SELECT = "select";
+	public final static String ACTION_UNSELECT = "unselect";
+	public final static String ACTION_HIDE = "hide";
+	public final static String ACTION_UNHIDE = "unhide";
+	public final static String ACTION_SHARE = "share";
+	public final static String ACTION_UNSHARE = "unshare";
+	public final static String ACTION_BOOKMARK = "bookmark";
+	public final static String ACTION_UNBOOKMARK = "unbookmark";
+
+	// Sendgrid email API constants
+	public static final String SENDGRID_API_USER = "api_user";
+	public static final String SENDGRID_API_KEY = "api_key";
+	public static final String SENDGRID_TO = "to";
+	public static final String SENDGRID_TO_NAME = "toname";
+	public static final String SENDGRID_SUBJECT = "subject";
+	public static final String SENDGRID_TEXT = "text";
+	public static final String SENDGRID_HTML = "html";
+	public static final String SENDGRID_FROM_EMAIL = "from";
+	public static final String SENDGRID_FROM_NAME = "fromname";
+	public static final String SENDGRID_BCC = "bcc";
+	public static final String SENDGRID_CC = "cc";
+	public static final String SENDGRID_REPLY_TO = "replyto";
+	
+	// User create validation errors
+	public enum ValidationUserProfile {
+
+		NO_EMAIL_ADDR("xa.validation.userprofile.no_email_addr",
+				"Email address not provided"), INVALID_EMAIL_ADDR(
+				"xa.validation.userprofile.userprofile.invalid_email_addr",
+				"Invalid email address"), NO_FIRST_NAME(
+				"xa.validation.userprofile.userprofile.no_first_name",
+				"First name not provided"), INVALID_FIRST_NAME(
+				"xa.validation.userprofile.invalid_first_name",
+				"Invalid first name"), NO_LAST_NAME(
+				"xa.validation.userprofile.noemailaddr",
+				"Email address not provided"), INVALID_LAST_NAME(
+				"xa.validation.userprofile.noemailaddr",
+				"Email address not provided"), NO_PUBLIC_SCREEN_NAME(
+				"xa.validation.userprofile.noemailaddr",
+				"Email address not provided"), INVALID_PUBLIC_SCREEN_NAME(
+				"xa.validation.userprofile.noemailaddr",
+				"Email address not provided");
+
+		String rbKey;
+		String message;
+
+		ValidationUserProfile(String rbKey, String message) {
+			this.rbKey = rbKey;
+			this.message = message;
+		}
+	};
+
+	// these constants will be used in setting GjResponse object.
+
+	public final static String USER_PENDING_APPROVAL_MSG = "User is yet not reviewed by Administrator. Please contact at <number>.";
+	public final static int USER_PENDING_APPROVAL_STATUS_CODE = 0;
+
+	public final static String USER_APPROVAL_MSG = "User is approved";
+	public final static int USER_APPROVAL_STATUS_CODE = 1;
+
+	public final static String USER_REJECTION_MSG = "User is rejected";
+	public final static int USER_REJECTION_STATUS_CODE = 1;
+
+	public final static String USER_STATUS_ALREADY_CHANGED_MSG = "Can not change user status. it is either already activated/approved/rejected";
+	public final static int USER_STATUS_ALREADY_CHANGED_STATUS_CODE = 0;
+
+	public final static String USER_ALREADY_ACTIVATED_MSG = "Your account is already activated. If you have forgotten your password, then from the login page, select 'Forgot Password'";
+	public final static int USER_ALREADY_ACTIVATED_STATUS_CODE = 0;
+
+	public final static String USER_STATUS_NOT_ACTIVE_MSG = "User is not in active status. Please activate your account first.";
+	public final static int USER_STATUS_NOT_ACTIVE_STATUS_CODE = 0;
+
+	public final static String INVALID_EMAIL_ADDRESS_MSG = "Invalid email address";
+	public final static int INVALID_EMAIL_ADDRESS_STATUS_CODE = 0;
+
+	public final static String WRONG_ACTIVATION_CODE_MSG = "Wrong activation code";
+	public final static int WRONG_ACTIVATION_CODE_STATUS_CODE = 0;
+
+	public final static String VALID_EMAIL_ADDRESS_MSG = "Valid email address";
+	public final static int VALID_EMAIL_ADDRESS_STATUS_CODE = 1;
+
+	public final static String NO_ACTIVATION_RECORD_FOR_USER_ERR_MSG = "No activation record found for user:";
+	public final static String NO_ACTIVATION_ENTRY = "activation entry not found";
+
+	public final static String VALIDATION_INVALID_DATA_DESC = "Invalid value for";
+	public final static int VALIDATION_INVALID_DATA_CODE = 0;
+	public static final String GROUP_MODERATORS = "GROUP_MODERATORS";
+
+	// public final static String EMAIL_WELCOME_MSG =
+	// "Welcome to iSchoolCircle";
+	// public final static String EMAIL_LINK_WELCOME_MSG =
+	// "Welcome to iSchoolCircle ! Please verify your account by clicking on the link below: ";
+	// public static final String EMAIL_EDIT_REJECTED_MSG =
+	// "Your changes not approved for public sharing.";
+	// public static final String EMAIL_APPROVAL_NEEDED_MSG =
+	// "New objects pending approval";
+	// public static final String EMAIL_PWD_RESET_CODE_MSG =
+	// "iSchoolCircle - Password Reset";
+
+	public final static String PWD_RESET_FAILED_MSG = "Invalid password reset request";
+
+	public final static String INVALID_NEW_PASSWORD_MSG = "Invalid new password";
+	public static final String EMAIL_NEW_FEEDBACK_RECEIVED = "New feedback from";
+	public static final int INITIAL_DOCUMENT_VERSION = 1;
+
+	public static final int EMAIL_TYPE_ACCOUNT_CREATE = 0;
+	public static final int EMAIL_TYPE_USER_CREATE = 1;
+	public static final int EMAIL_TYPE_USER_ACCT_ADD = 2;
+	public static final int EMAIL_TYPE_DOCUMENT_CREATE = 3;
+	public static final int EMAIL_TYPE_DISCUSSION_CREATE = 4;
+	public static final int EMAIL_TYPE_NOTE_CREATE = 5;	
+	public static final int EMAIL_TYPE_TASK_CREATE = 6;
+	public static final int EMAIL_TYPE_USER_PASSWORD = 7;
+	public static final int EMAIL_TYPE_USER_ACTIVATION = 8;
+	public static final int EMAIL_TYPE_USER_ROLE_UPDATED = 9;
+	public static final int EMAIL_TYPE_USER_GRP_ADD = 10;
+	
+	public static enum RBAC_PERM {
+		ALLOW_NONE, 
+		ALLOW_READ, 
+		ALLOW_WRITE, 
+		ALLOW_DELETE
+	}
+	
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/RangerJAXBContextResolver.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerJAXBContextResolver.java b/security-admin/src/main/java/org/apache/ranger/common/RangerJAXBContextResolver.java
new file mode 100644
index 0000000..3b3260d
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerJAXBContextResolver.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ package org.apache.ranger.common;
+
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.Provider;
+import javax.xml.bind.JAXBContext;
+
+import com.sun.jersey.api.json.JSONConfiguration;
+import com.sun.jersey.api.json.JSONJAXBContext;
+
+/**
+ * 
+ *
+ */
+@Provider
+public class RangerJAXBContextResolver implements ContextResolver<JAXBContext> {
+
+    private JAXBContext context;
+    private Class<?>[] types = {
+	org.apache.ranger.view.VXAuthSessionList.class,
+	org.apache.ranger.view.VXResponse.class,
+	org.apache.ranger.view.VXStringList.class,
+	org.apache.ranger.view.VXPortalUserList.class,
+	org.apache.ranger.view.VXAssetList.class,
+	org.apache.ranger.view.VXResourceList.class,
+	org.apache.ranger.view.VXCredentialStoreList.class,
+	org.apache.ranger.view.VXGroupList.class,
+	org.apache.ranger.view.VXUserList.class,
+	org.apache.ranger.view.VXGroupUserList.class,
+	org.apache.ranger.view.VXGroupGroupList.class,
+	org.apache.ranger.view.VXPermMapList.class,
+	org.apache.ranger.view.VXAuditMapList.class,
+	org.apache.ranger.view.VXPolicyExportAuditList.class,
+	org.apache.ranger.view.VXAccessAuditList.class
+    };
+
+    public RangerJAXBContextResolver() throws Exception {
+	JSONConfiguration config = JSONConfiguration.natural().build();
+	context = new JSONJAXBContext(config, types);
+    }
+
+    @Override
+    public JAXBContext getContext(Class<?> objectType) {
+	// return context;
+	for (Class<?> type : types) {
+	    if (type.getName().equals(objectType.getName())) {
+		return context;
+	    }
+	}
+	return null;
+    }
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
new file mode 100644
index 0000000..cfdffc0
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ package org.apache.ranger.common;
+
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RangerSearchUtil extends SearchUtil {
+	final static Logger logger = Logger.getLogger(RangerSearchUtil.class);
+	/*
+	@Override
+	public Query createSearchQuery(EntityManager em, String queryStr, String sortClause,
+			SearchCriteria searchCriteria, List<SearchField> searchFields,
+			int objectClassType, boolean hasAttributes, boolean isCountQuery){
+
+		// [1] Build where clause
+		StringBuilder queryClause = buildWhereClause(searchCriteria,
+				searchFields);
+
+		// [2] Add domain-object-security clause if needed
+		// if (objectClassType != -1
+		// && !ContextUtil.getCurrentUserSession().isUserAdmin()) {
+		// addDomainObjectSecuirtyClause(queryClause, hasAttributes);
+		// }
+
+		// [2] Add order by clause
+		addOrderByClause(queryClause, sortClause);
+
+		// [3] Create Query Object
+		Query query = em.createQuery(
+					queryStr + queryClause);
+
+		// [4] Resolve query parameters with values
+		resolveQueryParams(query, searchCriteria, searchFields);
+
+		// [5] Resolve domain-object-security parameters
+		// if (objectClassType != -1 &&
+		// !securityHandler.hasModeratorPermission()) {
+		// resolveDomainObjectSecuirtyParams(query, objectClassType);
+		// }
+
+		if (!isCountQuery) {
+			query.setFirstResult(searchCriteria.getStartIndex());
+			updateQueryPageSize(query, searchCriteria);
+		}
+
+		return query;
+	}
+	*/
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/RequestContext.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RequestContext.java b/security-admin/src/main/java/org/apache/ranger/common/RequestContext.java
index 778cc9a..62e63db 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RequestContext.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RequestContext.java
@@ -26,7 +26,7 @@ public class RequestContext implements Serializable {
 	private String ipAddress = null;
 	private String userAgent = null;
 	private String requestURL = null;
-	private int deviceType = XACommonEnums.DEVICE_UNKNOWN;
+	private int deviceType = RangerCommonEnums.DEVICE_UNKNOWN;
 	private String serverRequestId = null;
 	private boolean isSync = true;
 	private long startTime = System.currentTimeMillis();

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/SearchCriteria.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/SearchCriteria.java b/security-admin/src/main/java/org/apache/ranger/common/SearchCriteria.java
index 6a93121..3dcd755 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/SearchCriteria.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/SearchCriteria.java
@@ -29,7 +29,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
-import org.apache.ranger.biz.XABizUtil;
+import org.apache.ranger.biz.RangerBizUtil;
 
 
 public class SearchCriteria {
@@ -187,7 +187,7 @@ public class SearchCriteria {
 	 */
 	public void setDistinct(boolean isDistinct) {
 
-		int dbFlavor = XABizUtil.getDBFlavor();
+		int dbFlavor = RangerBizUtil.getDBFlavor();
 		if (isDistinct && dbFlavor == AppConstants.DB_FLAVOR_ORACLE) {
 			isDistinct = false;
 			logger.debug("Database flavor is `ORACLE` so ignoring DISTINCT "

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/SearchField.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/SearchField.java b/security-admin/src/main/java/org/apache/ranger/common/SearchField.java
index b232559..1891edb 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/SearchField.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/SearchField.java
@@ -23,7 +23,6 @@
 package org.apache.ranger.common;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 public class SearchField {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
index d1782ce..43d3784 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
@@ -45,7 +45,7 @@ public class SearchUtil {
 	RESTErrorUtil restErrorUtil;
 
 	@Autowired
-	XAConfigUtil configUtil;
+	RangerConfigUtil configUtil;
 
 	// @Autowired
 	// AKADomainObjectSecurityHandler securityHandler;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java b/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java
index 870b0d7..f833242 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java
@@ -20,11 +20,6 @@
  package org.apache.ranger.common;
 
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/UserSessionBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/UserSessionBase.java b/security-admin/src/main/java/org/apache/ranger/common/UserSessionBase.java
index b009193..842015b 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/UserSessionBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/UserSessionBase.java
@@ -21,10 +21,7 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import org.apache.ranger.entity.XXAuthSession;
 import org.apache.ranger.entity.XXPortalUser;
@@ -36,7 +33,7 @@ public class UserSessionBase implements Serializable {
 	XXPortalUser xXPortalUser;
 	XXAuthSession xXAuthSession;
 	private boolean userAdmin;
-	private int authProvider = XAConstants.USER_APP;
+	private int authProvider = RangerConstants.USER_APP;
 	private List<String> userRoleList = new ArrayList<String>();
 	int clientTimeOffsetInMinute = 0;
 	public Long getUserId() {

[10/12] incubator-ranger git commit: RANGER-194: Rename classes under web-admin project

Posted by ma...@apache.org.

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/biz/XABizUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XABizUtil.java b/security-admin/src/main/java/org/apache/ranger/biz/XABizUtil.java
deleted file mode 100644
index 0177682..0000000
--- a/security-admin/src/main/java/org/apache/ranger/biz/XABizUtil.java
+++ /dev/null
@@ -1,1313 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- package org.apache.ranger.biz;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.log4j.Logger;
-import org.apache.ranger.common.AppConstants;
-import org.apache.ranger.common.ContextUtil;
-import org.apache.ranger.common.GUIDUtil;
-import org.apache.ranger.common.PropertiesUtil;
-import org.apache.ranger.common.RESTErrorUtil;
-import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.common.XACommonEnums;
-import org.apache.ranger.common.XAConstants;
-import org.apache.ranger.common.db.BaseDao;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.entity.XXAsset;
-import org.apache.ranger.entity.XXDBBase;
-import org.apache.ranger.entity.XXGroup;
-import org.apache.ranger.entity.XXPermMap;
-import org.apache.ranger.entity.XXPortalUser;
-import org.apache.ranger.entity.XXResource;
-import org.apache.ranger.entity.XXTrxLog;
-import org.apache.ranger.entity.XXUser;
-import org.apache.ranger.service.AbstractBaseResourceService;
-import org.apache.ranger.view.VXDataObject;
-import org.apache.ranger.view.VXPortalUser;
-import org.apache.ranger.view.VXResource;
-import org.apache.ranger.view.VXResponse;
-import org.apache.ranger.view.VXString;
-import org.apache.ranger.view.VXStringList;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Random;
-
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.IOCase;
-
-@Component
-public class XABizUtil {
-	static final Logger logger = Logger.getLogger(XABizUtil.class);
-
-	@Autowired
-	RESTErrorUtil restErrorUtil;
-
-	@Autowired
-	XADaoManager daoManager;
-
-	@Autowired
-	StringUtil stringUtil;
-
-	@Autowired
-	UserMgr userMgr;
-
-	Set<Class<?>> groupEditableClasses;
-	private Class<?>[] groupEditableClassesList = {};
-
-	Map<String, Integer> classTypeMappings = new HashMap<String, Integer>();
-	private int maxFirstNameLength;
-	int maxDisplayNameLength = 150;
-	boolean defaultAutoApprove = true;
-	boolean showBlockedContent = true;
-	public final String EMPTY_CONTENT_DISPLAY_NAME = "...";
-	boolean enableResourceAccessControl;
-	private Random random;
-	private static final String PATH_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrst0123456789-_.";
-	private static char[] PATH_CHAR_SET = PATH_CHARS.toCharArray();
-	private static int PATH_CHAR_SET_LEN = PATH_CHAR_SET.length;
-	
-	static String fileSeparator = PropertiesUtil.getProperty(
-			"xa.file.separator", "/");
-
-	public XABizUtil() {
-		maxFirstNameLength = Integer.parseInt(PropertiesUtil.getProperty(
-				"xa.user.firstname.maxlength", "16"));
-		maxDisplayNameLength = PropertiesUtil.getIntProperty(
-				"xa.bookmark.name.maxlen", maxDisplayNameLength);
-		showBlockedContent = PropertiesUtil.getBooleanProperty(
-				"xa.content.show_blocked", showBlockedContent);
-		defaultAutoApprove = PropertiesUtil.getBooleanProperty(
-				"xa.mod.default", defaultAutoApprove);
-
-		groupEditableClasses = new HashSet<Class<?>>(
-				Arrays.asList(groupEditableClassesList));
-		enableResourceAccessControl = PropertiesUtil.getBooleanProperty(
-				"xa.resource.accessControl.enabled", true);
-		random = new Random();
-	}
-
-	public <T extends XXDBBase> List<? extends XXDBBase> getParentObjects(T object) {
-		List<XXDBBase> parentObjectList = null;
-		// if (checkParentAcess.contains(object.getMyClassType())) {
-		// parentObjectList = new ArrayList<MBase>();
-		// }
-		return parentObjectList;
-	}
-
-	public int getClassType(Class<?> klass) {
-		String className = klass.getName();
-		// See if this mapping is already in the database
-		Integer classType = classTypeMappings.get(className);
-		if (classType == null) {
-			// Instantiate the class and call the getClassType method
-			if (XXDBBase.class.isAssignableFrom(klass)) {
-				try {
-					XXDBBase gjObj = (XXDBBase) klass.newInstance();
-					classType = gjObj.getMyClassType();
-					classTypeMappings.put(className, classType);
-				} catch (Throwable ex) {
-					logger.error("Error instantiating object for class "
-							+ className, ex);
-				}
-			}
-		}
-		if (classType == null) {
-			return XACommonEnums.CLASS_TYPE_NONE;
-		} else {
-			return classType;
-		}
-	}
-
-	// Access control methods
-	public void checkSystemAdminAccess() {
-		UserSessionBase currentUserSession = ContextUtil
-				.getCurrentUserSession();
-		if (currentUserSession != null && currentUserSession.isUserAdmin()) {
-			return;
-		}
-		throw restErrorUtil
-				.create403RESTException("Only System Administrators can add accounts");
-	}
-
-	/**
-	 * @param contentType
-	 * @return
-	 */
-	public int getMimeTypeInt(String contentType) {
-		if (contentType.equalsIgnoreCase("JPEG")
-				|| contentType.equalsIgnoreCase("JPG")
-				|| contentType.endsWith("jpg") || contentType.endsWith("jpeg")) {
-			return XAConstants.MIME_JPEG;
-		}
-		if (contentType.equalsIgnoreCase("PNG") || contentType.endsWith("png")) {
-			return XAConstants.MIME_PNG;
-		}
-		return XAConstants.MIME_UNKNOWN;
-	}
-
-	/**
-	 * @param mimeType
-	 * @return
-	 */
-	public String getMimeType(int mimeType) {
-		switch (mimeType) {
-		case XAConstants.MIME_JPEG:
-			return "jpg";
-		case XAConstants.MIME_PNG:
-			return "png";
-		}
-		return "";
-	}
-
-	/**
-	 * @param contentType
-	 * @return
-	 */
-	public String getImageExtension(String contentType) {
-		if (contentType.toLowerCase().endsWith("jpg")
-				|| contentType.toLowerCase().endsWith("jpeg")) {
-			return "jpg";
-		} else if (contentType.toLowerCase().endsWith("png")) {
-			return "png";
-		}
-		return "";
-	}
-
-	/**
-	 * @param file
-	 * @return
-	 */
-	public String getFileNameWithoutExtension(File file) {
-		if (file != null) {
-			String fileName = file.getName();
-			if (fileName.indexOf(".") > 0) {
-				return fileName.substring(0, fileName.indexOf("."));
-			}
-			return fileName;
-
-		}
-		return null;
-	}
-
-	public String getDisplayNameForClassName(XXDBBase obj) {
-		String classTypeDisplayName = XAConstants.getLabelFor_ClassTypes(obj
-				.getMyClassType());
-		if (classTypeDisplayName == null) {
-			logger.error(
-					"Error get name for class type. obj=" + obj.toString(),
-					new Throwable());
-		}
-		return classTypeDisplayName;
-	}
-
-	public String getDisplayName(XXDBBase obj) {
-		if (obj != null) {
-			return handleGetDisplayName(obj.getMyDisplayValue());
-		} else {
-			return handleGetDisplayName(null);
-		}
-	}
-
-	/**
-	 * @param displayValue
-	 * @return
-	 */
-	private String handleGetDisplayName(String displayValue) {
-		if (displayValue == null || displayValue.trim().isEmpty()) {
-			return EMPTY_CONTENT_DISPLAY_NAME;
-		}
-
-		if (displayValue.length() > maxDisplayNameLength) {
-			displayValue = displayValue.substring(0, maxDisplayNameLength - 3)
-					.concat("...");
-		}
-		return displayValue;
-	}
-
-	/**
-	 * @param userProfile
-	 * @return
-	 */
-	public String generatePublicName(VXPortalUser userProfile, XXPortalUser gjUser) {
-		return generatePublicName(userProfile.getFirstName(),
-				userProfile.getLastName());
-	}
-
-	public String generatePublicName(String firstName, String lastName) {
-		String publicName = null;
-		String fName = firstName;
-		if (firstName.length() > maxFirstNameLength) {
-			fName = firstName.substring(0, maxFirstNameLength - (1 + 3))
-					+ "...";
-		}
-		if (lastName != null && lastName.length() > 0) {
-			publicName = fName + " " + lastName.substring(0, 1) + ".";
-		}
-		return publicName;
-	}
-
-	public void updateCloneReferences(XXDBBase obj) {
-		if (obj == null) {
-			return;
-		}
-	}
-
-	public Long getForUserId(XXDBBase resource) {
-		return null;
-	}
-
-	public XXDBBase getMObject(int objClassType, Long objId) {
-		XXDBBase obj = null;
-
-		if (objId != null) {
-			BaseDao<?> dao = daoManager.getDaoForClassType(objClassType);
-
-			if (dao != null) {
-				obj = (XXDBBase) dao.getById(objId);
-			}
-		}
-
-		return obj;
-	}
-
-	public XXDBBase getMObject(VXDataObject vXDataObject) {
-		if (vXDataObject != null) {
-			return getMObject(vXDataObject.getMyClassType(), vXDataObject.getId());
-		}
-		return null;
-	}
-
-	public VXDataObject getVObject(int objClassType, Long objId) {
-		if (objId == null) {
-			return null;
-		}
-		if (objClassType == XAConstants.CLASS_TYPE_USER_PROFILE) {
-			return userMgr.mapXXPortalUserVXPortalUser(daoManager.getXXPortalUser().getById(
-					objId));
-		}
-		try {
-			AbstractBaseResourceService<?, ?> myService = AbstractBaseResourceService
-					.getService(objClassType);
-			if (myService != null) {
-				return myService.readResource(objId);
-			}
-		} catch (Throwable t) {
-			logger.error("Error reading resource. objectClassType="
-					+ objClassType + ", objectId=" + objId, t);
-		}
-		return null;
-	}
-
-	public void deleteReferencedObjects(XXDBBase obj) {
-
-		if (obj == null) {
-			return;
-		}
-		if (obj.getMyClassType() == XAConstants.CLASS_TYPE_NONE) {
-			return;
-		}
-
-	}
-
-	/**
-	 * @param obj
-	 */
-	void deleteObjects(List<XXDBBase> objs) {
-
-	}
-
-	void deleteObject(XXDBBase obj) {
-		AbstractBaseResourceService<?, ?> myService = AbstractBaseResourceService
-				.getService(obj.getMyClassType());
-		if (myService != null) {
-			myService.deleteResource(obj.getId());
-		} else {
-			logger.error("Service not found for obj=" + obj, new Throwable());
-		}
-	}
-
-	public <T extends XXDBBase> Class<? extends XXDBBase> getContextObject(
-			int objectClassType, Long objectId) {
-		return null;
-	}
-
-	public VXStringList mapStringListToVStringList(List<String> stringList) {
-		if (stringList == null) {
-			return null;
-		}
-
-		List<VXString> vStringList = new ArrayList<VXString>();
-		for (String str : stringList) {
-			VXString vXString = new VXString();
-			vXString.setValue(str);
-			vStringList.add(vXString);
-		}
-
-		return new VXStringList(vStringList);
-	}
-
-	/**
-	 * return response object if users is having permission on given resource
-	 * 
-	 * @param vXResource
-	 * @param permission
-	 * @return
-	 */
-	public VXResponse hasPermission(VXResource vXResource, int permission) {
-
-		VXResponse vXResponse = new VXResponse();
-		if (!enableResourceAccessControl) {
-			logger.debug("Resource Access Control is disabled !!!");
-			return vXResponse;
-		}
-
-		if (vXResource == null) {
-			vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
-			vXResponse.setMsgDesc("Please provide valid policy.");
-			return vXResponse;
-		}
-
-		String resourceNames = vXResource.getName();
-		if (stringUtil.isEmpty(resourceNames)) {
-			vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
-			vXResponse.setMsgDesc("Please provide valid policy.");
-			return vXResponse;
-		}
-
-		if (isAdmin()) {
-			return vXResponse;
-		}
-
-		Long xUserId = getXUserId();
-		Long assetId = vXResource.getAssetId();
-		List<XXResource> xResourceList = daoManager.getXXResource()
-				.findByAssetIdAndResourceStatus(assetId,
-						AppConstants.STATUS_ENABLED);
-
-		XXAsset xAsset = daoManager.getXXAsset().getById(assetId);
-		int assetType = xAsset.getAssetType();
-
-		vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
-		vXResponse.setMsgDesc("Permission Denied !");
-
-		if (assetType == AppConstants.ASSET_HIVE) {
-			String[] requestResNameList = resourceNames.split(",");
-			if (stringUtil.isEmpty(vXResource.getUdfs())) {
-				int reqTableType = vXResource.getTableType();
-				int reqColumnType = vXResource.getColumnType();
-				for (String resourceName : requestResNameList) {
-					boolean matchFound = matchHivePolicy(resourceName,
-							xResourceList, xUserId, permission, reqTableType,
-							reqColumnType, false);
-					if (!matchFound) {
-						vXResponse.setMsgDesc("You're not permitted to perform "
-								+ "the action for resource path : "
-								+ resourceName);
-						vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
-						return vXResponse;
-					}
-				}
-			} else {
-				for (String resourceName : requestResNameList) {
-					boolean matchFound = matchHivePolicy(resourceName,
-							xResourceList, xUserId, permission);
-					if (!matchFound) {
-						vXResponse.setMsgDesc("You're not permitted to perform "
-								+ "the action for resource path : "
-								+ resourceName);
-						vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
-						return vXResponse;
-					}
-				}
-			}
-			vXResponse.setStatusCode(VXResponse.STATUS_SUCCESS);
-			return vXResponse;
-		} else if (assetType == AppConstants.ASSET_HBASE) {
-			String[] requestResNameList = resourceNames.split(",");
-			for (String resourceName : requestResNameList) {
-				boolean matchFound = matchHbasePolicy(resourceName,
-						xResourceList, vXResponse, xUserId, permission);
-				if (!matchFound) {
-					vXResponse.setMsgDesc("You're not permitted to perform "
-							+ "the action for resource path : " + resourceName);
-					vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
-					return vXResponse;
-				}
-			}
-			vXResponse.setStatusCode(VXResponse.STATUS_SUCCESS);
-			return vXResponse;
-		} else if (assetType == AppConstants.ASSET_HDFS) {
-			String[] requestResNameList = resourceNames.split(",");
-			for (String resourceName : requestResNameList) {
-				boolean matchFound = matchHdfsPolicy(resourceName,
-						xResourceList, xUserId, permission);
-				if (!matchFound) {
-					vXResponse.setMsgDesc("You're not permitted to perform "
-							+ "the action for resource path : " + resourceName);
-					vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
-					return vXResponse;
-				}
-			}
-			vXResponse.setStatusCode(VXResponse.STATUS_SUCCESS);
-			return vXResponse;
-		} else if (assetType == AppConstants.ASSET_KNOX) {
-				String[] requestResNameList = resourceNames.split(",");
-				for (String resourceName : requestResNameList) {
-					boolean matchFound = matchKnoxPolicy(resourceName,
-							xResourceList, vXResponse, xUserId, permission);
-					if (!matchFound) {
-						vXResponse.setMsgDesc("You're not permitted to perform "
-								+ "the action for resource path : " + resourceName);
-						vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
-						return vXResponse;
-					}
-				}
-				vXResponse.setStatusCode(VXResponse.STATUS_SUCCESS);
-				return vXResponse;	
-        } else if (assetType == AppConstants.ASSET_STORM) {
-            String[] requestResNameList = resourceNames.split(",");
-            for (String resourceName : requestResNameList) {
-                boolean matchFound = matchStormPolicy(resourceName,
-                        xResourceList, vXResponse, xUserId, permission);
-                if (!matchFound) {
-                    vXResponse.setMsgDesc("You're not permitted to perform "
-                            + "the action for resource path : " + resourceName);
-                    vXResponse.setStatusCode(VXResponse.STATUS_ERROR);
-                    return vXResponse;
-                }
-            }
-            vXResponse.setStatusCode(VXResponse.STATUS_SUCCESS);
-            return vXResponse;
-        }
-		return vXResponse;
-	}
-
-	/**
-	 * return true id current logged in session is owned by admin
-	 * 
-	 * @return
-	 */
-	public boolean isAdmin() {
-		UserSessionBase currentUserSession = ContextUtil
-				.getCurrentUserSession();
-		if (currentUserSession == null) {
-			logger.debug("Unable to find session.");
-			return false;
-		}
-
-		if (currentUserSession.isUserAdmin()) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * returns current user's userID from active user sessions
-	 * 
-	 * @return
-	 */
-	public Long getXUserId() {
-
-		UserSessionBase currentUserSession = ContextUtil
-				.getCurrentUserSession();
-		if (currentUserSession == null) {
-			logger.debug("Unable to find session.");
-			return null;
-		}
-
-		XXPortalUser user = daoManager.getXXPortalUser().getById(
-				currentUserSession.getUserId());
-		if (user == null) {
-			logger.debug("XXPortalUser not found with logged in user id : "
-					+ currentUserSession.getUserId());
-			return null;
-		}
-
-		XXUser xUser = daoManager.getXXUser().findByUserName(user.getLoginId());
-		if (xUser == null) {
-			logger.debug("XXPortalUser not found for user id :" + user.getId()
-					+ " with name " + user.getFirstName());
-			return null;
-		}
-
-		return xUser.getId();
-	}
-
-	/**
-	 * returns true if user is having required permission on given Hdfs resource
-	 * 
-	 * @param resourceName
-	 * @param xResourceList
-	 * @param xUserId
-	 * @param permission
-	 * @return
-	 */
-	private boolean matchHdfsPolicy(String resourceName,
-			List<XXResource> xResourceList, Long xUserId, int permission) {
-		boolean matchFound = false;
-		resourceName = replaceMetaChars(resourceName);
-
-		for (XXResource xResource : xResourceList) {
-			if (xResource.getResourceStatus() != AppConstants.STATUS_ENABLED) {
-				continue;
-			}
-			Long resourceId = xResource.getId();
-			matchFound = checkUsrPermForPolicy(xUserId, permission, resourceId);
-			if (matchFound) {
-				matchFound = false;
-				String resource = xResource.getName();
-				String[] dbResourceNameList = resource.split(",");
-				for (String dbResourceName : dbResourceNameList) {
-					if (comparePathsForExactMatch(resourceName, dbResourceName)) {
-						matchFound = true;
-					} else {
-						if (xResource.getIsRecursive() == AppConstants.BOOL_TRUE) {
-							matchFound = isRecursiveWildCardMatch(resourceName,
-									dbResourceName);
-						} else {
-							matchFound = nonRecursiveWildCardMatch(
-									resourceName, dbResourceName);
-						}
-					}
-					if (matchFound) {
-						break;
-					}
-				}
-				if (matchFound) {
-					break;
-				}
-			}
-		}
-		return matchFound;
-	}
-
-	/**
-	 * returns true if user is having required permission on given Hbase
-	 * resource
-	 * 
-	 * @param resourceName
-	 * @param xResourceList
-	 * @param vXResponse
-	 * @param xUserId
-	 * @param permission
-	 * @return
-	 */
-	public boolean matchHbasePolicy(String resourceName,
-			List<XXResource> xResourceList, VXResponse vXResponse, Long xUserId,
-			int permission) {
-		if(stringUtil.isEmpty(resourceName) || xResourceList==null || xUserId==null){
-			return false;
-		}
-
-		String[] splittedResources = stringUtil.split(resourceName, fileSeparator);
-		if (splittedResources.length < 1 || splittedResources.length > 3) {
-			logger.debug("Invalid resourceName name : " + resourceName);
-			return false;
-		}
-
-		String tblName    = splittedResources.length > 0 ? splittedResources[0] : StringUtil.WILDCARD_ASTERISK;
-		String colFamName = splittedResources.length > 1 ? splittedResources[1] : StringUtil.WILDCARD_ASTERISK;
-		String colName    = splittedResources.length > 2 ? splittedResources[2] : StringUtil.WILDCARD_ASTERISK;
-
-		boolean policyMatched = false;
-		// check all resources whether Hbase policy is enabled in any resource
-		// of provided resource list
-		for (XXResource xResource : xResourceList) {
-			if (xResource.getResourceStatus() != AppConstants.STATUS_ENABLED) {
-				continue;
-			}
-			Long resourceId = xResource.getId();
-			boolean hasPermission = checkUsrPermForPolicy(xUserId, permission, resourceId);
-			// if permission is enabled then load Tables,column family and
-			// columns list from resource
-			if (! hasPermission) {
-				continue;
-			}
-
-			// 1. does the policy match the table?
-			String[] xTables = stringUtil.isEmpty(xResource.getTables()) ? null : stringUtil.split(xResource.getTables(), ",");
-
-			boolean matchFound = (xTables == null || xTables.length == 0) ? true : matchPath(tblName, xTables);
-
-			if(matchFound) {
-				// 2. does the policy match the column?
-				String[] xColumnFamilies = stringUtil.isEmpty(xResource.getColumnFamilies()) ? null : stringUtil.split(xResource.getColumnFamilies(), ",");
-
-				matchFound = (xColumnFamilies == null || xColumnFamilies.length == 0) ? true : matchPath(colFamName, xColumnFamilies);
-				
-				if(matchFound) {
-					// 3. does the policy match the columnFamily?
-					String[] xColumns = stringUtil.isEmpty(xResource.getColumns()) ? null : stringUtil.split(xResource.getColumns(), ",");
-
-					matchFound = (xColumns == null || xColumns.length == 0) ? true : matchPath(colName, xColumns);
-				}
-			}
-
-			if (matchFound) {
-				policyMatched = true;
-				break;
-			}
-		}
-		return policyMatched;
-	}
-
-	public boolean matchHivePolicy(String resourceName,
-			List<XXResource> xResourceList, Long xUserId, int permission) {
-		return matchHivePolicy(resourceName, xResourceList, xUserId,
-				permission, 0, 0, true);
-	}
-
-	/**
-	 * returns true if user is having required permission on given Hive resource
-	 * 
-	 * @param resourceName
-	 * @param xResourceList
-	 * @param xUserId
-	 * @param permission
-	 * @param reqTableType
-	 * @param reqColumnType
-	 * @param isUdfPolicy
-	 * @return
-	 */
-	public boolean matchHivePolicy(String resourceName,
-			List<XXResource> xResourceList, Long xUserId, int permission,
-			int reqTableType, int reqColumnType, boolean isUdfPolicy) {
-
-		if(stringUtil.isEmpty(resourceName) || xResourceList==null || xUserId==null){
-			return false;
-		}
-
-		String[] splittedResources = stringUtil.split(resourceName, fileSeparator);// get list of resources
-		if (splittedResources.length < 1 || splittedResources.length > 3) {
-			logger.debug("Invalid resource name : " + resourceName);
-			return false;
-		}
-		
-		String dbName  = splittedResources.length > 0 ? splittedResources[0] : StringUtil.WILDCARD_ASTERISK;
-		String tblName = splittedResources.length > 1 ? splittedResources[1] : StringUtil.WILDCARD_ASTERISK;
-		String colName = splittedResources.length > 2 ? splittedResources[2] : StringUtil.WILDCARD_ASTERISK;
-
-		boolean policyMatched = false;
-		for (XXResource xResource : xResourceList) {
-			if (xResource.getResourceStatus() != AppConstants.STATUS_ENABLED) {
-				continue;
-			}
-
-			Long resourceId = xResource.getId();
-			boolean hasPermission = checkUsrPermForPolicy(xUserId, permission, resourceId);
-
-			if (! hasPermission) {
-				continue;
-			}
-
-			// 1. does the policy match the database?
-			String[] xDatabases = stringUtil.isEmpty(xResource.getDatabases()) ? null : stringUtil.split(xResource.getDatabases(), ",");
-
-			boolean matchFound = (xDatabases == null || xDatabases.length == 0) ? true : matchPath(dbName, xDatabases);
-
-			if (! matchFound) {
-				continue;
-			}
-			
-			// Type(either UDFs policy or non-UDFs policy) of current policy
-			// should be of same as type of policy being iterated
-			if (!stringUtil.isEmpty(xResource.getUdfs()) && !isUdfPolicy) {
-				continue;
-			}
-
-			if (isUdfPolicy) {
-				// 2. does the policy match the UDF?
-				String[] xUdfs = stringUtil.isEmpty(xResource.getUdfs()) ? null : stringUtil.split(xResource.getUdfs(), ",");
-				
-				if(! matchPath(tblName, xUdfs)) {
-					continue;
-				} else {
-					policyMatched = true;
-					break;
-				}
-			} else {
-				// 2. does the policy match the table?
-				String[] xTables = stringUtil.isEmpty(xResource.getTables()) ? null : stringUtil.split(xResource.getTables(), ",");
-
-				matchFound = (xTables == null || xTables.length == 0) ? true : matchPath(tblName, xTables);
-
-				if(xResource.getTableType() == AppConstants.POLICY_EXCLUSION) {
-					matchFound = !matchFound;
-				}
-
-				if (!matchFound) {
-					continue;
-				}
-
-				// 3. does current policy match the column?
-				String[] xColumns = stringUtil.isEmpty(xResource.getColumns()) ? null : stringUtil.split(xResource.getColumns(), ",");
-
-				matchFound = (xColumns == null || xColumns.length == 0) ? true : matchPath(colName, xColumns);
-
-				if(xResource.getColumnType() == AppConstants.POLICY_EXCLUSION) {
-					matchFound = !matchFound;
-				}
-
-				if (!matchFound) {
-					continue;
-				} else {
-					policyMatched = true;
-					break;
-				}
-			}
-		}
-		return policyMatched;
-	}
-	/**
-	 * returns true if user is having required permission on given Hbase
-	 * resource
-	 * 
-	 * @param resourceName
-	 * @param xResourceList
-	 * @param vXResponse
-	 * @param xUserId
-	 * @param permission
-	 * @return
-	 */
-	private boolean matchKnoxPolicy(String resourceName,
-			List<XXResource> xResourceList, VXResponse vXResponse, Long xUserId,
-			int permission) {
-
-		String[] splittedResources = stringUtil.split(resourceName,
-				fileSeparator);
-		int numberOfResources = splittedResources.length;
-		if (numberOfResources < 1 || numberOfResources > 3) {
-			logger.debug("Invalid policy name : " + resourceName);
-			return false;
-		}
-
-		boolean policyMatched = false;
-		// check all resources whether Knox policy is enabled in any resource
-		// of provided resource list
-		for (XXResource xResource : xResourceList) {
-			if (xResource.getResourceStatus() != AppConstants.STATUS_ENABLED) {
-				continue;
-			}
-			Long resourceId = xResource.getId();
-			boolean hasPermission = checkUsrPermForPolicy(xUserId, permission,
-					resourceId);
-			// if permission is enabled then load Topologies,services list from resource
-			if (hasPermission) {
-				String[] xTopologies = (xResource.getTopologies() == null || xResource
-						.getTopologies().equalsIgnoreCase("")) ? null : stringUtil
-						.split(xResource.getTopologies(), ",");
-				String[] xServices = (xResource.getServices() == null || xResource
-						.getServices().equalsIgnoreCase("")) ? null
-						: stringUtil.split(xResource.getServices(), ",");
-
-				boolean matchFound = false;
-
-				for (int index = 0; index < numberOfResources; index++) {
-					matchFound = false;
-					// check whether given table resource matches with any
-					// existing topology resource
-					if (index == 0) {
-						if(xTopologies!=null){
-						for (String xTopology : xTopologies) {
-							if (matchPath(splittedResources[index], xTopology)) {
-								matchFound = true;
-								continue;
-							}
-						}
-						}
-						if(!matchFound) {
-							break;
-						}
-					} // check whether given service resource matches with
-						// any existing service resource
-					else if (index == 1) {
-						if(xServices!=null){
-						for (String xService : xServices) {
-							if (matchPath(splittedResources[index],
-									xService)) {
-								matchFound = true;
-								continue;
-							}
-						}
-						}
-						if(!matchFound) {
-							break;
-						}
-					}
-				}
-				if (matchFound) {
-					policyMatched = true;
-					break;
-				}
-			}
-		}
-		return policyMatched;
-	}
-
- 	/**
- 	 * returns true if user is having required permission on given STORM
- 	 * resource
- 	 * 
- 	 * @param resourceName
- 	 * @param xResourceList
- 	 * @param vXResponse
- 	 * @param xUserId
- 	 * @param permission
- 	 * @return
- 	 */
- 	private boolean matchStormPolicy(String resourceName,
- 			List<XXResource> xResourceList, VXResponse vXResponse, Long xUserId,
- 			int permission) {
- 
- 		String[] splittedResources = stringUtil.split(resourceName,
- 				fileSeparator);
- 		int numberOfResources = splittedResources.length;
- 		if (numberOfResources < 1 || numberOfResources > 3) {
- 			logger.debug("Invalid policy name : " + resourceName);
- 			return false;
- 		}
- 
- 		boolean policyMatched = false;
- 		// check all resources whether Knox policy is enabled in any resource
- 		// of provided resource list
- 		for (XXResource xResource : xResourceList) {
- 			if (xResource.getResourceStatus() != AppConstants.STATUS_ENABLED) {
- 				continue;
- 			}
- 			Long resourceId = xResource.getId();
- 			boolean hasPermission = checkUsrPermForPolicy(xUserId, permission,
- 					resourceId);
- 			// if permission is enabled then load Topologies,services list from resource
- 			if (hasPermission) {
- 				String[] xTopologies = (xResource.getTopologies() == null || xResource
- 						.getTopologies().equalsIgnoreCase("")) ? null : stringUtil
- 						.split(xResource.getTopologies(), ",");
- 				/*String[] xServices = (xResource.getServices() == null || xResource
- 						.getServices().equalsIgnoreCase("")) ? null
- 						: stringUtil.split(xResource.getServices(), ",");*/
- 
- 				boolean matchFound = false;
- 
- 				for (int index = 0; index < numberOfResources; index++) {
- 					matchFound = false;
- 					// check whether given table resource matches with any
- 					// existing topology resource
- 					if (index == 0) {
- 						if(xTopologies!=null){
- 						for (String xTopology : xTopologies) {
- 							if (matchPath(splittedResources[index], xTopology)) {
- 								matchFound = true;
- 								continue;
- 							}
- 						}
- 						}
- 					} // check whether given service resource matches with
- 						// any existing service resource
- 					/*else if (index == 1) {
- 						if(xServices!=null){
- 						for (String xService : xServices) {
- 							if (matchPath(splittedResources[index],
- 									xService)) {
- 								matchFound = true;
- 								continue;
- 							}
- 						}
- 						}
- 					}*/
- 				}
- 				if (matchFound) {
- 					policyMatched = true;
- 					break;
- 				}
- 			}
- 		}
- 		return policyMatched;
- 	}
-
-	/**
-	 * returns path without meta characters
-	 * 
-	 * @param path
-	 * @return
-	 */
-	public String replaceMetaChars(String path) {
-		if (path == null || path.isEmpty()) {
-			return path;
-		}
-
-		if (path.contains("*")) {
-			String replacement = getRandomString(5, 60);
-			path = path.replaceAll("\\*", replacement);
-		}
-		if (path.contains("?")) {
-			String replacement = getRandomString(1, 1);
-			path = path.replaceAll("\\?", replacement);
-		}
-		return path;
-	}
-
-	/**
-	 * returns random String of given length range
-	 * 
-	 * @param minLen
-	 * @param maxLen
-	 * @return
-	 */
-	private String getRandomString(int minLen, int maxLen) {
-		StringBuilder sb = new StringBuilder();
-		int len = getRandomInt(minLen, maxLen);
-		for (int i = 0; i < len; i++) {
-			int charIdx = random.nextInt(PATH_CHAR_SET_LEN);
-			sb.append(PATH_CHAR_SET[charIdx]);
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * return random integer number for given range
-	 * 
-	 * @param min
-	 * @param max
-	 * @return
-	 */
-	private int getRandomInt(int min, int max) {
-		if (min == max) {
-			return min;
-		} else {
-			int interval = max - min;
-			int randomNum = random.nextInt();
-			return ((Math.abs(randomNum) % interval) + min);
-		}
-	}
-
-	/**
-	 * returns true if given userID is having specified permission on specified
-	 * resource
-	 * 
-	 * @param xUserId
-	 * @param permission
-	 * @param resourceId
-	 * @return
-	 */
-	private boolean checkUsrPermForPolicy(Long xUserId, int permission,
-			Long resourceId) {
-		// this snippet load user groups and permission map list from DB
-		List<XXGroup> userGroups = new ArrayList<XXGroup>();
-		List<XXPermMap> permMapList = new ArrayList<XXPermMap>();
-		userGroups = daoManager.getXXGroup().findByUserId(xUserId);
-		permMapList = daoManager.getXXPermMap().findByResourceId(resourceId);
-		Long publicGroupId = getPublicGroupId();
-		boolean matchFound = false;
-		for (XXPermMap permMap : permMapList) {
-			if (permMap.getPermType() == permission) {
-				if (permMap.getPermFor() == AppConstants.XA_PERM_FOR_GROUP) {
-					// check whether permission is enabled for public group or a group to which user belongs
-					matchFound = (publicGroupId != null && publicGroupId == permMap.getGroupId()) || isGroupInList(permMap.getGroupId(), userGroups);
-				} else if (permMap.getPermFor() == AppConstants.XA_PERM_FOR_USER) {
-					// check whether permission is enabled to user
-					matchFound = permMap.getUserId().equals(xUserId);
-				}
-			}
-			if (matchFound) {
-				break;
-			}
-		}
-		return matchFound;
-	}
-	
-	public Long getPublicGroupId() {
-		XXGroup xXGroupPublic = daoManager.getXXGroup().findByGroupName(XAConstants.GROUP_PUBLIC);
-
-		return xXGroupPublic != null ? xXGroupPublic.getId() : null;
-	}
-
-	/**
-	 * returns true is given group id is in given group list
-	 * 
-	 * @param groupId
-	 * @param xGroupList
-	 * @return
-	 */
-	public boolean isGroupInList(Long groupId, List<XXGroup> xGroupList) {
-		for (XXGroup xGroup : xGroupList) {
-			if (xGroup.getId().equals(groupId)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * returns true if given path matches in same level or sub directories with
-	 * given wild card pattern
-	 * 
-	 * @param pathToCheck
-	 * @param wildcardPath
-	 * @return
-	 */
-	public boolean isRecursiveWildCardMatch(String pathToCheck,
-			String wildcardPath) {
-		if (pathToCheck != null) {
-			if (wildcardPath != null && wildcardPath.equals(fileSeparator)) {
-				return true;
-			}
-			StringBuilder sb = new StringBuilder();
-			for (String p : pathToCheck.split(fileSeparator)) {
-				sb.append(p);
-				boolean matchFound = FilenameUtils.wildcardMatch(sb.toString(),
-						wildcardPath);
-				if (matchFound) {
-					return true;
-				}
-				sb.append(fileSeparator);
-			}
-			sb = null;
-		}
-		return false;
-	}
-
-	/**
-	 * return List<Integer>
-	 * 
-	 * List of all possible parent return type for some specific resourceType
-	 * 
-	 * @param resourceType
-	 *            , assetType
-	 * 
-	 */
-	public List<Integer> getResorceTypeParentHirearchy(int resourceType,
-			int assetType) {
-		List<Integer> resourceTypeList = new ArrayList<Integer>();
-
-		if (assetType == AppConstants.ASSET_HDFS) {
-			resourceTypeList.add(AppConstants.RESOURCE_PATH);
-		} else if (assetType == AppConstants.ASSET_HIVE) {
-			resourceTypeList.add(AppConstants.RESOURCE_DB);
-			if (resourceType == AppConstants.RESOURCE_TABLE) {
-				resourceTypeList.add(AppConstants.RESOURCE_TABLE);
-			} else if (resourceType == AppConstants.RESOURCE_UDF) {
-				resourceTypeList.add(AppConstants.RESOURCE_UDF);
-			} else if (resourceType == AppConstants.RESOURCE_COLUMN) {
-				resourceTypeList.add(AppConstants.RESOURCE_TABLE);
-				resourceTypeList.add(AppConstants.RESOURCE_COLUMN);
-			}
-		} else if (assetType == AppConstants.ASSET_HBASE) {
-			resourceTypeList.add(AppConstants.RESOURCE_TABLE);
-			if (resourceType == AppConstants.RESOURCE_COL_FAM) {
-				resourceTypeList.add(AppConstants.RESOURCE_COL_FAM);
-			} else if (resourceType == AppConstants.RESOURCE_COLUMN) {
-				resourceTypeList.add(AppConstants.RESOURCE_COL_FAM);
-				resourceTypeList.add(AppConstants.RESOURCE_COLUMN);
-			}
-		}
-
-		return resourceTypeList;
-	}
-
-	/**
-	 * return true if both path matches exactly, wild card matching is not
-	 * checked
-	 * 
-	 * @param path1
-	 * @param path2
-	 * @return
-	 */
-	public boolean comparePathsForExactMatch(String path1, String path2) {
-		String pathSeparator = fileSeparator;
-		if (!path1.endsWith(pathSeparator)) {
-			path1 = path1.concat(pathSeparator);
-		}
-		if (!path2.endsWith(pathSeparator)) {
-			path2 = path2.concat(pathSeparator);
-		}
-		return path1.equalsIgnoreCase(path2);
-	}
-
-	/**
-	 * return true if both path matches at same level path, this function does
-	 * not match sub directories
-	 * 
-	 * @param pathToCheck
-	 * @param wildcardPath
-	 * @return
-	 */
-	public boolean nonRecursiveWildCardMatch(String pathToCheck,
-			String wildcardPath) {
-		if (pathToCheck != null && wildcardPath != null) {
-
-			List<String> pathToCheckArray = new ArrayList<String>();
-			List<String> wildcardPathArray = new ArrayList<String>();
-
-			for (String p : pathToCheck.split(fileSeparator)) {
-				pathToCheckArray.add(p);
-			}
-			for (String w : wildcardPath.split(fileSeparator)) {
-				wildcardPathArray.add(w);
-			}
-
-			if (pathToCheckArray.size() == wildcardPathArray.size()) {
-				boolean match = false;
-				for (int index = 0; index < pathToCheckArray.size(); index++) {
-					match = matchPath(pathToCheckArray.get(index),
-							wildcardPathArray.get(index));
-					if (!match)
-						return match;
-				}
-				return match;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * returns true if first and second path are same
-	 * 
-	 * @param pathToCheckFragment
-	 * @param wildCardPathFragment
-	 * @return
-	 */
-	private boolean matchPath(String pathToCheckFragment,
-			String wildCardPathFragment) {
-		if(pathToCheckFragment == null || wildCardPathFragment == null) {
-			return false;
-		}
-
-		if (pathToCheckFragment.contains("*")
-				|| pathToCheckFragment.contains("?")) {
-			pathToCheckFragment = replaceMetaChars(pathToCheckFragment);
-
-			if (wildCardPathFragment.contains("*")
-					|| wildCardPathFragment.contains("?")) {
-				return FilenameUtils.wildcardMatch(pathToCheckFragment,
-						wildCardPathFragment, IOCase.SENSITIVE);
-			} else {
-				return false;
-			}
-		} else {
-			if (wildCardPathFragment.contains("*")
-					|| wildCardPathFragment.contains("?")) {
-				return FilenameUtils.wildcardMatch(pathToCheckFragment,
-						wildCardPathFragment, IOCase.SENSITIVE);
-			} else {
-				return pathToCheckFragment.trim().equals(
-						wildCardPathFragment.trim());
-			}
-		}
-	}
-	
-	private boolean matchPath(String pathToCheck, String[] wildCardPaths) {
-		if (pathToCheck != null && wildCardPaths != null) {
-			for (String wildCardPath : wildCardPaths) {
-				if (matchPath(pathToCheck, wildCardPath)) {
-					return true;
-				}
-			}
-		}
-		
-		return false;
-	}
-
-	/**
-	 * This method returns true if first parameter value is equal to others
-	 * argument value passed
-	 * 
-	 * @param checkValue
-	 * @param otherValues
-	 * @return
-	 */
-	public static boolean areAllEqual(int checkValue, int... otherValues) {
-		for (int value : otherValues) {
-			if (value != checkValue) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	public void createTrxLog(List<XXTrxLog> trxLogList) {
-		if (trxLogList == null) {
-			return;
-		}
-
-		UserSessionBase usb = ContextUtil.getCurrentUserSession();
-		Long authSessionId = null;
-		if (usb != null) {
-			authSessionId = ContextUtil.getCurrentUserSession().getSessionId();
-		}
-		Long trxId = GUIDUtil.genLong();
-
-		for (XXTrxLog xTrxLog : trxLogList) {
-			xTrxLog.setTransactionId(trxId.toString());
-			if (authSessionId != null) {
-				xTrxLog.setSessionId("" + authSessionId);
-			}
-			xTrxLog.setSessionType("Spring Authenticated Session");
-			xTrxLog.setRequestId(trxId.toString());
-			daoManager.getXXTrxLog().create(xTrxLog);
-		}
-	}
-
-	public static int getDBFlavor() {
-
-		String dbFlavor = "";
-		boolean dbFlavorPropFound = true;
-
-		dbFlavor = PropertiesUtil.getProperty("xa.db.flavor");
-		if (dbFlavor == null || dbFlavor.trim().isEmpty()) {
-			dbFlavor = PropertiesUtil.getProperty("jdbc.dialect");
-			dbFlavorPropFound = false;
-		}
-
-		if (dbFlavor != null && !dbFlavor.trim().isEmpty()) {
-			if (dbFlavorPropFound) {
-				if ("MYSQL".equalsIgnoreCase(dbFlavor)) {
-					return AppConstants.DB_FLAVOR_MYSQL;
-				} else if ("ORACLE".equalsIgnoreCase(dbFlavor)) {
-					return AppConstants.DB_FLAVOR_ORACLE;
-				} else {
-					return AppConstants.DB_FLAVOR_UNKNOWN;
-				}
-			} else {
-				if (dbFlavor.toUpperCase().contains("MYSQL")) {
-					return AppConstants.DB_FLAVOR_MYSQL;
-				} else if (dbFlavor.toUpperCase().contains("ORACLE")) {
-					return AppConstants.DB_FLAVOR_ORACLE;
-				} else {
-					return AppConstants.DB_FLAVOR_UNKNOWN;
-				}
-			}
-		} else {
-			logger.error("Property : xa.db.flavor or jdbc.dialect, not found");
-			return AppConstants.DB_FLAVOR_UNKNOWN;
-		}
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgrBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgrBase.java b/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgrBase.java
index 7031508..c1e3077 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgrBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgrBase.java
@@ -19,9 +19,16 @@
 
  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.XAccessAuditService;
+import org.apache.ranger.service.XTrxLogService;
+import org.apache.ranger.view.VXAccessAudit;
+import org.apache.ranger.view.VXAccessAuditList;
+import org.apache.ranger.view.VXLong;
+import org.apache.ranger.view.VXTrxLog;
+import org.apache.ranger.view.VXTrxLogList;
 import org.springframework.beans.factory.annotation.Autowired;
 public class XAuditMgrBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
index 7f0fe37..64ae9b3 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
@@ -26,13 +26,11 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
-import org.apache.ranger.biz.UserMgr;
-import org.apache.ranger.biz.XABizUtil;
 import org.apache.ranger.common.MessageEnums;
 import org.apache.ranger.common.PropertiesUtil;
+import org.apache.ranger.common.RangerConstants;
 import org.apache.ranger.common.SearchCriteria;
-import org.apache.ranger.common.XAConstants;
-import org.apache.ranger.db.XADaoManager;
+import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.db.XXGroupUserDao;
 import org.apache.ranger.entity.XXGroup;
 import org.apache.ranger.entity.XXPortalUser;
@@ -54,16 +52,16 @@ public class XUserMgr extends XUserMgrBase {
 	@Autowired
 	XUserService xUserService;
 	@Autowired
-	XABizUtil msBizUtil;
+	RangerBizUtil msBizUtil;
 
 	@Autowired
 	UserMgr userMgr;
 
 	@Autowired
-	XADaoManager daoManager;
+	RangerDaoManager daoManager;
 
 	@Autowired
-	XABizUtil xaBizUtil;
+	RangerBizUtil xaBizUtil;
 
 	static final Logger logger = Logger.getLogger(XUserMgr.class);
 
@@ -219,7 +217,7 @@ public class XUserMgr extends XUserMgrBase {
 			roleList=userMgr.getRolesForUser(xXPortalUser);	
 		}
 		if(roleList==null || roleList.size()==0){
-			roleList.add(XAConstants.ROLE_USER);
+			roleList.add(RangerConstants.ROLE_USER);
 		}	
 		
 		// TODO I've to get the transaction log from here.

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/biz/XUserMgrBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgrBase.java b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgrBase.java
index 2a413d2..b20ce31 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgrBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgrBase.java
@@ -19,9 +19,28 @@
 
  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.XAuditMapService;
+import org.apache.ranger.service.XGroupGroupService;
+import org.apache.ranger.service.XGroupService;
+import org.apache.ranger.service.XGroupUserService;
+import org.apache.ranger.service.XPermMapService;
+import org.apache.ranger.service.XUserService;
+import org.apache.ranger.view.VXAuditMap;
+import org.apache.ranger.view.VXAuditMapList;
+import org.apache.ranger.view.VXGroup;
+import org.apache.ranger.view.VXGroupGroup;
+import org.apache.ranger.view.VXGroupGroupList;
+import org.apache.ranger.view.VXGroupList;
+import org.apache.ranger.view.VXGroupUser;
+import org.apache.ranger.view.VXGroupUserList;
+import org.apache.ranger.view.VXLong;
+import org.apache.ranger.view.VXPermMap;
+import org.apache.ranger.view.VXPermMapList;
+import org.apache.ranger.view.VXUser;
+import org.apache.ranger.view.VXUserList;
 import org.springframework.beans.factory.annotation.Autowired;
 public class XUserMgrBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java b/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java
index ac47ef0..c5bfedf 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/AppConstants.java
@@ -19,11 +19,8 @@
 
  package org.apache.ranger.common;
 
-import java.util.*;
 
-import org.apache.ranger.common.*;
-
-public class AppConstants extends XACommonEnums {
+public class AppConstants extends RangerCommonEnums {
 
 	/***************************************************************
 	 * Enum values for AssetType

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/ContextUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/ContextUtil.java b/security-admin/src/main/java/org/apache/ranger/common/ContextUtil.java
index 026e253..eb1d573 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/ContextUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/ContextUtil.java
@@ -19,8 +19,8 @@
 
  package org.apache.ranger.common;
 
-import org.apache.ranger.security.context.XAContextHolder;
-import org.apache.ranger.security.context.XASecurityContext;
+import org.apache.ranger.security.context.RangerContextHolder;
+import org.apache.ranger.security.context.RangerSecurityContext;
 
 public class ContextUtil {
 
@@ -31,7 +31,7 @@ public class ContextUtil {
 	}
 
 	public static Long getCurrentUserId() {
-		XASecurityContext context = XAContextHolder.getSecurityContext();
+		RangerSecurityContext context = RangerContextHolder.getSecurityContext();
 		if (context != null) {
 			UserSessionBase userSession = context.getUserSession();
 			if (userSession != null) {
@@ -42,7 +42,7 @@ public class ContextUtil {
 	}
 
 	public static String getCurrentUserPublicName() {
-		XASecurityContext context = XAContextHolder.getSecurityContext();
+		RangerSecurityContext context = RangerContextHolder.getSecurityContext();
 		if (context != null) {
 			UserSessionBase userSession = context.getUserSession();
 			if (userSession != null) {
@@ -55,7 +55,7 @@ public class ContextUtil {
 
 	public static UserSessionBase getCurrentUserSession() {
 		UserSessionBase userSession = null;
-		XASecurityContext context = XAContextHolder.getSecurityContext();
+		RangerSecurityContext context = RangerContextHolder.getSecurityContext();
 		if (context != null) {
 			userSession = context.getUserSession();
 		}
@@ -63,7 +63,7 @@ public class ContextUtil {
 	}
 
 	public static RequestContext getCurrentRequestContext() {
-		XASecurityContext context = XAContextHolder.getSecurityContext();
+		RangerSecurityContext context = RangerContextHolder.getSecurityContext();
 		if (context != null) {
 			return context.getRequestContext();
 		}
@@ -71,7 +71,7 @@ public class ContextUtil {
 	}
 
 	public static String getCurrentUserLoginId() {
-		XASecurityContext context = XAContextHolder.getSecurityContext();
+		RangerSecurityContext context = RangerContextHolder.getSecurityContext();
 		if (context != null) {
 			UserSessionBase userSession = context.getUserSession();
 			if (userSession != null) {

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/DateUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/DateUtil.java b/security-admin/src/main/java/org/apache/ranger/common/DateUtil.java
index a553978..b710020 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/DateUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/DateUtil.java
@@ -26,6 +26,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
+
 import org.springframework.stereotype.Component;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/HTTPUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/HTTPUtil.java b/security-admin/src/main/java/org/apache/ranger/common/HTTPUtil.java
index 29b1395..6eba2e6 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/HTTPUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/HTTPUtil.java
@@ -22,8 +22,6 @@
  */
 package org.apache.ranger.common;
 
-import java.util.Map;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.stereotype.Component;
@@ -45,19 +43,19 @@ public class HTTPUtil {
 
     public int getDeviceType(String userAgent) {
 	if (userAgent == null) {
-	    return XACommonEnums.DEVICE_UNKNOWN;
+	    return RangerCommonEnums.DEVICE_UNKNOWN;
 	}
 
 	if (userAgent.contains(IPHONE)) {
-	    return XACommonEnums.DEVICE_IPHONE;
+	    return RangerCommonEnums.DEVICE_IPHONE;
 	} else if (userAgent.contains(IPAD)) {
-	    return XACommonEnums.DEVICE_IPAD;
+	    return RangerCommonEnums.DEVICE_IPAD;
 	} else if (userAgent.contains(IPOD)) {
-	    return XACommonEnums.DEVICE_IPOD;
+	    return RangerCommonEnums.DEVICE_IPOD;
 	} else if (userAgent.contains(ANDROID)) {
-	    return XACommonEnums.DEVICE_ANDROID;
+	    return RangerCommonEnums.DEVICE_ANDROID;
 	} else {
-	    return XACommonEnums.DEVICE_BROWSER;
+	    return RangerCommonEnums.DEVICE_BROWSER;
 	}
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java b/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
index eeacd11..2901b0f 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java
@@ -22,16 +22,16 @@
  */
 package org.apache.ranger.common;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 
-import org.apache.log4j.Logger;
+import org.apache.log4j.Logger;
 import org.apache.ranger.credentialapi.CredentialReader;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java
index 9d05ca0..8d7d96d 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java
@@ -20,7 +20,6 @@
  package org.apache.ranger.common;
 
 import java.text.DateFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;

[08/12] incubator-ranger git commit: RANGER-194: Rename classes under web-admin project

Posted by ma...@apache.org.

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/XACommonEnums.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/XACommonEnums.java b/security-admin/src/main/java/org/apache/ranger/common/XACommonEnums.java
deleted file mode 100644
index bc5d809..0000000
--- a/security-admin/src/main/java/org/apache/ranger/common/XACommonEnums.java
+++ /dev/null
@@ -1,1444 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- package org.apache.ranger.common;
-
-/**
- * 
- */
-
-import java.util.*;
-
-import org.apache.ranger.common.*;
-
-public class XACommonEnums {
-
-	/***************************************************************
-	 * Enum values for ActiveStatus
-	 **************************************************************/
-	/**
-	 * STATUS_DISABLED is an element of enum ActiveStatus. Its value is "STATUS_DISABLED".
-	 */
-	public static final int STATUS_DISABLED = 0;
-	/**
-	 * STATUS_ENABLED is an element of enum ActiveStatus. Its value is "STATUS_ENABLED".
-	 */
-	public static final int STATUS_ENABLED = 1;
-	/**
-	 * STATUS_DELETED is an element of enum ActiveStatus. Its value is "STATUS_DELETED".
-	 */
-	public static final int STATUS_DELETED = 2;
-
-	/**
-	 * Max value for enum ActiveStatus_MAX
-	 */
-	public static final int ActiveStatus_MAX = 2;
-
-
-	/***************************************************************
-	 * Enum values for ActivationStatus
-	 **************************************************************/
-	/**
-	 * ACT_STATUS_DISABLED is an element of enum ActivationStatus. Its value is "ACT_STATUS_DISABLED".
-	 */
-	public static final int ACT_STATUS_DISABLED = 0;
-	/**
-	 * ACT_STATUS_ACTIVE is an element of enum ActivationStatus. Its value is "ACT_STATUS_ACTIVE".
-	 */
-	public static final int ACT_STATUS_ACTIVE = 1;
-	/**
-	 * ACT_STATUS_PENDING_APPROVAL is an element of enum ActivationStatus. Its value is "ACT_STATUS_PENDING_APPROVAL".
-	 */
-	public static final int ACT_STATUS_PENDING_APPROVAL = 2;
-	/**
-	 * ACT_STATUS_PENDING_ACTIVATION is an element of enum ActivationStatus. Its value is "ACT_STATUS_PENDING_ACTIVATION".
-	 */
-	public static final int ACT_STATUS_PENDING_ACTIVATION = 3;
-	/**
-	 * ACT_STATUS_REJECTED is an element of enum ActivationStatus. Its value is "ACT_STATUS_REJECTED".
-	 */
-	public static final int ACT_STATUS_REJECTED = 4;
-	/**
-	 * ACT_STATUS_DEACTIVATED is an element of enum ActivationStatus. Its value is "ACT_STATUS_DEACTIVATED".
-	 */
-	public static final int ACT_STATUS_DEACTIVATED = 5;
-	/**
-	 * ACT_STATUS_PRE_REGISTRATION is an element of enum ActivationStatus. Its value is "ACT_STATUS_PRE_REGISTRATION".
-	 */
-	public static final int ACT_STATUS_PRE_REGISTRATION = 6;
-	/**
-	 * ACT_STATUS_NO_LOGIN is an element of enum ActivationStatus. Its value is "ACT_STATUS_NO_LOGIN".
-	 */
-	public static final int ACT_STATUS_NO_LOGIN = 7;
-
-	/**
-	 * Max value for enum ActivationStatus_MAX
-	 */
-	public static final int ActivationStatus_MAX = 7;
-
-
-	/***************************************************************
-	 * Enum values for BooleanValue
-	 **************************************************************/
-	/**
-	 * BOOL_NONE is an element of enum BooleanValue. Its value is "BOOL_NONE".
-	 */
-	public static final int BOOL_NONE = 0;
-	/**
-	 * BOOL_TRUE is an element of enum BooleanValue. Its value is "BOOL_TRUE".
-	 */
-	public static final int BOOL_TRUE = 1;
-	/**
-	 * BOOL_FALSE is an element of enum BooleanValue. Its value is "BOOL_FALSE".
-	 */
-	public static final int BOOL_FALSE = 2;
-
-	/**
-	 * Max value for enum BooleanValue_MAX
-	 */
-	public static final int BooleanValue_MAX = 2;
-
-
-	/***************************************************************
-	 * Enum values for DataType
-	 **************************************************************/
-	/**
-	 * DATA_TYPE_UNKNOWN is an element of enum DataType. Its value is "DATA_TYPE_UNKNOWN".
-	 */
-	public static final int DATA_TYPE_UNKNOWN = 0;
-	/**
-	 * DATA_TYPE_INTEGER is an element of enum DataType. Its value is "DATA_TYPE_INTEGER".
-	 */
-	public static final int DATA_TYPE_INTEGER = 1;
-	/**
-	 * DATA_TYPE_DOUBLE is an element of enum DataType. Its value is "DATA_TYPE_DOUBLE".
-	 */
-	public static final int DATA_TYPE_DOUBLE = 2;
-	/**
-	 * DATA_TYPE_STRING is an element of enum DataType. Its value is "DATA_TYPE_STRING".
-	 */
-	public static final int DATA_TYPE_STRING = 3;
-	/**
-	 * DATA_TYPE_BOOLEAN is an element of enum DataType. Its value is "DATA_TYPE_BOOLEAN".
-	 */
-	public static final int DATA_TYPE_BOOLEAN = 4;
-	/**
-	 * DATA_TYPE_DATE is an element of enum DataType. Its value is "DATA_TYPE_DATE".
-	 */
-	public static final int DATA_TYPE_DATE = 5;
-	/**
-	 * DATA_TYPE_STRING_ENUM is an element of enum DataType. Its value is "DATA_TYPE_STRING_ENUM".
-	 */
-	public static final int DATA_TYPE_STRING_ENUM = 6;
-	/**
-	 * DATA_TYPE_LONG is an element of enum DataType. Its value is "DATA_TYPE_LONG".
-	 */
-	public static final int DATA_TYPE_LONG = 7;
-	/**
-	 * DATA_TYPE_INTEGER_ENUM is an element of enum DataType. Its value is "DATA_TYPE_INTEGER_ENUM".
-	 */
-	public static final int DATA_TYPE_INTEGER_ENUM = 8;
-
-	/**
-	 * Max value for enum DataType_MAX
-	 */
-	public static final int DataType_MAX = 8;
-
-
-	/***************************************************************
-	 * Enum values for DeviceType
-	 **************************************************************/
-	/**
-	 * DEVICE_UNKNOWN is an element of enum DeviceType. Its value is "DEVICE_UNKNOWN".
-	 */
-	public static final int DEVICE_UNKNOWN = 0;
-	/**
-	 * DEVICE_BROWSER is an element of enum DeviceType. Its value is "DEVICE_BROWSER".
-	 */
-	public static final int DEVICE_BROWSER = 1;
-	/**
-	 * DEVICE_IPHONE is an element of enum DeviceType. Its value is "DEVICE_IPHONE".
-	 */
-	public static final int DEVICE_IPHONE = 2;
-	/**
-	 * DEVICE_IPAD is an element of enum DeviceType. Its value is "DEVICE_IPAD".
-	 */
-	public static final int DEVICE_IPAD = 3;
-	/**
-	 * DEVICE_IPOD is an element of enum DeviceType. Its value is "DEVICE_IPOD".
-	 */
-	public static final int DEVICE_IPOD = 4;
-	/**
-	 * DEVICE_ANDROID is an element of enum DeviceType. Its value is "DEVICE_ANDROID".
-	 */
-	public static final int DEVICE_ANDROID = 5;
-
-	/**
-	 * Max value for enum DeviceType_MAX
-	 */
-	public static final int DeviceType_MAX = 5;
-
-
-	/***************************************************************
-	 * Enum values for DiffLevel
-	 **************************************************************/
-	/**
-	 * DIFF_UNKNOWN is an element of enum DiffLevel. Its value is "DIFF_UNKNOWN".
-	 */
-	public static final int DIFF_UNKNOWN = 0;
-	/**
-	 * DIFF_LOW is an element of enum DiffLevel. Its value is "DIFF_LOW".
-	 */
-	public static final int DIFF_LOW = 1;
-	/**
-	 * DIFF_MEDIUM is an element of enum DiffLevel. Its value is "DIFF_MEDIUM".
-	 */
-	public static final int DIFF_MEDIUM = 2;
-	/**
-	 * DIFF_HIGH is an element of enum DiffLevel. Its value is "DIFF_HIGH".
-	 */
-	public static final int DIFF_HIGH = 3;
-
-	/**
-	 * Max value for enum DiffLevel_MAX
-	 */
-	public static final int DiffLevel_MAX = 3;
-
-
-	/***************************************************************
-	 * Enum values for FileType
-	 **************************************************************/
-	/**
-	 * FILE_FILE is an element of enum FileType. Its value is "FILE_FILE".
-	 */
-	public static final int FILE_FILE = 0;
-	/**
-	 * FILE_DIR is an element of enum FileType. Its value is "FILE_DIR".
-	 */
-	public static final int FILE_DIR = 1;
-
-	/**
-	 * Max value for enum FileType_MAX
-	 */
-	public static final int FileType_MAX = 1;
-
-
-	/***************************************************************
-	 * Enum values for FreqType
-	 **************************************************************/
-	/**
-	 * FREQ_NONE is an element of enum FreqType. Its value is "FREQ_NONE".
-	 */
-	public static final int FREQ_NONE = 0;
-	/**
-	 * FREQ_MANUAL is an element of enum FreqType. Its value is "FREQ_MANUAL".
-	 */
-	public static final int FREQ_MANUAL = 1;
-	/**
-	 * FREQ_HOURLY is an element of enum FreqType. Its value is "FREQ_HOURLY".
-	 */
-	public static final int FREQ_HOURLY = 2;
-	/**
-	 * FREQ_DAILY is an element of enum FreqType. Its value is "FREQ_DAILY".
-	 */
-	public static final int FREQ_DAILY = 3;
-	/**
-	 * FREQ_WEEKLY is an element of enum FreqType. Its value is "FREQ_WEEKLY".
-	 */
-	public static final int FREQ_WEEKLY = 4;
-	/**
-	 * FREQ_BI_WEEKLY is an element of enum FreqType. Its value is "FREQ_BI_WEEKLY".
-	 */
-	public static final int FREQ_BI_WEEKLY = 5;
-	/**
-	 * FREQ_MONTHLY is an element of enum FreqType. Its value is "FREQ_MONTHLY".
-	 */
-	public static final int FREQ_MONTHLY = 6;
-
-	/**
-	 * Max value for enum FreqType_MAX
-	 */
-	public static final int FreqType_MAX = 6;
-
-
-	/***************************************************************
-	 * Enum values for MimeType
-	 **************************************************************/
-	/**
-	 * MIME_UNKNOWN is an element of enum MimeType. Its value is "MIME_UNKNOWN".
-	 */
-	public static final int MIME_UNKNOWN = 0;
-	/**
-	 * MIME_TEXT is an element of enum MimeType. Its value is "MIME_TEXT".
-	 */
-	public static final int MIME_TEXT = 1;
-	/**
-	 * MIME_HTML is an element of enum MimeType. Its value is "MIME_HTML".
-	 */
-	public static final int MIME_HTML = 2;
-	/**
-	 * MIME_PNG is an element of enum MimeType. Its value is "MIME_PNG".
-	 */
-	public static final int MIME_PNG = 3;
-	/**
-	 * MIME_JPEG is an element of enum MimeType. Its value is "MIME_JPEG".
-	 */
-	public static final int MIME_JPEG = 4;
-
-	/**
-	 * Max value for enum MimeType_MAX
-	 */
-	public static final int MimeType_MAX = 4;
-
-
-	/***************************************************************
-	 * Enum values for NumberFormat
-	 **************************************************************/
-	/**
-	 * NUM_FORMAT_NONE is an element of enum NumberFormat. Its value is "NUM_FORMAT_NONE".
-	 */
-	public static final int NUM_FORMAT_NONE = 0;
-	/**
-	 * NUM_FORMAT_NUMERIC is an element of enum NumberFormat. Its value is "NUM_FORMAT_NUMERIC".
-	 */
-	public static final int NUM_FORMAT_NUMERIC = 1;
-	/**
-	 * NUM_FORMAT_ALPHA is an element of enum NumberFormat. Its value is "NUM_FORMAT_ALPHA".
-	 */
-	public static final int NUM_FORMAT_ALPHA = 2;
-	/**
-	 * NUM_FORMAT_ROMAN is an element of enum NumberFormat. Its value is "NUM_FORMAT_ROMAN".
-	 */
-	public static final int NUM_FORMAT_ROMAN = 3;
-
-	/**
-	 * Max value for enum NumberFormat_MAX
-	 */
-	public static final int NumberFormat_MAX = 3;
-
-
-	/***************************************************************
-	 * Enum values for ObjectStatus
-	 **************************************************************/
-	/**
-	 * OBJ_STATUS_ACTIVE is an element of enum ObjectStatus. Its value is "OBJ_STATUS_ACTIVE".
-	 */
-	public static final int OBJ_STATUS_ACTIVE = 0;
-	/**
-	 * OBJ_STATUS_DELETED is an element of enum ObjectStatus. Its value is "OBJ_STATUS_DELETED".
-	 */
-	public static final int OBJ_STATUS_DELETED = 1;
-	/**
-	 * OBJ_STATUS_ARCHIVED is an element of enum ObjectStatus. Its value is "OBJ_STATUS_ARCHIVED".
-	 */
-	public static final int OBJ_STATUS_ARCHIVED = 2;
-
-	/**
-	 * Max value for enum ObjectStatus_MAX
-	 */
-	public static final int ObjectStatus_MAX = 2;
-
-
-	/***************************************************************
-	 * Enum values for PasswordResetStatus
-	 **************************************************************/
-	/**
-	 * PWD_RESET_ACTIVE is an element of enum PasswordResetStatus. Its value is "PWD_RESET_ACTIVE".
-	 */
-	public static final int PWD_RESET_ACTIVE = 0;
-	/**
-	 * PWD_RESET_USED is an element of enum PasswordResetStatus. Its value is "PWD_RESET_USED".
-	 */
-	public static final int PWD_RESET_USED = 1;
-	/**
-	 * PWD_RESET_EXPIRED is an element of enum PasswordResetStatus. Its value is "PWD_RESET_EXPIRED".
-	 */
-	public static final int PWD_RESET_EXPIRED = 2;
-	/**
-	 * PWD_RESET_DISABLED is an element of enum PasswordResetStatus. Its value is "PWD_RESET_DISABLED".
-	 */
-	public static final int PWD_RESET_DISABLED = 3;
-
-	/**
-	 * Max value for enum PasswordResetStatus_MAX
-	 */
-	public static final int PasswordResetStatus_MAX = 3;
-
-
-	/***************************************************************
-	 * Enum values for PriorityType
-	 **************************************************************/
-	/**
-	 * PRIORITY_NORMAL is an element of enum PriorityType. Its value is "PRIORITY_NORMAL".
-	 */
-	public static final int PRIORITY_NORMAL = 0;
-	/**
-	 * PRIORITY_LOW is an element of enum PriorityType. Its value is "PRIORITY_LOW".
-	 */
-	public static final int PRIORITY_LOW = 1;
-	/**
-	 * PRIORITY_MEDIUM is an element of enum PriorityType. Its value is "PRIORITY_MEDIUM".
-	 */
-	public static final int PRIORITY_MEDIUM = 2;
-	/**
-	 * PRIORITY_HIGH is an element of enum PriorityType. Its value is "PRIORITY_HIGH".
-	 */
-	public static final int PRIORITY_HIGH = 3;
-
-	/**
-	 * Max value for enum PriorityType_MAX
-	 */
-	public static final int PriorityType_MAX = 3;
-
-
-	/***************************************************************
-	 * Enum values for ProgressStatus
-	 **************************************************************/
-	/**
-	 * PROGRESS_PENDING is an element of enum ProgressStatus. Its value is "PROGRESS_PENDING".
-	 */
-	public static final int PROGRESS_PENDING = 0;
-	/**
-	 * PROGRESS_IN_PROGRESS is an element of enum ProgressStatus. Its value is "PROGRESS_IN_PROGRESS".
-	 */
-	public static final int PROGRESS_IN_PROGRESS = 1;
-	/**
-	 * PROGRESS_COMPLETE is an element of enum ProgressStatus. Its value is "PROGRESS_COMPLETE".
-	 */
-	public static final int PROGRESS_COMPLETE = 2;
-	/**
-	 * PROGRESS_ABORTED is an element of enum ProgressStatus. Its value is "PROGRESS_ABORTED".
-	 */
-	public static final int PROGRESS_ABORTED = 3;
-	/**
-	 * PROGRESS_FAILED is an element of enum ProgressStatus. Its value is "PROGRESS_FAILED".
-	 */
-	public static final int PROGRESS_FAILED = 4;
-
-	/**
-	 * Max value for enum ProgressStatus_MAX
-	 */
-	public static final int ProgressStatus_MAX = 4;
-
-
-	/***************************************************************
-	 * Enum values for RelationType
-	 **************************************************************/
-	/**
-	 * REL_NONE is an element of enum RelationType. Its value is "REL_NONE".
-	 */
-	public static final int REL_NONE = 0;
-	/**
-	 * REL_SELF is an element of enum RelationType. Its value is "REL_SELF".
-	 */
-	public static final int REL_SELF = 1;
-
-	/**
-	 * Max value for enum RelationType_MAX
-	 */
-	public static final int RelationType_MAX = 1;
-
-
-	/***************************************************************
-	 * Enum values for UserSource
-	 **************************************************************/
-	/**
-	 * USER_APP is an element of enum UserSource. Its value is "USER_APP".
-	 */
-	public static final int USER_APP = 0;
-	public static final int USER_EXTERNAL = 1;
-	public static final int USER_AD= 2;
-	public static final int USER_LDAP = 3;
-	public static final int USER_UNIX = 4;
-	public static final int USER_REPO = 5;
-	
-	public static final int GROUP_INTERNAL = 0;
-	public static final int GROUP_EXTERNAL = 1;
-	public static final int GROUP_AD= 2;
-	public static final int GROUP_LDAP = 3;
-	public static final int GROUP_UNIX = 4;
-	public static final int GROUP_REPO = 5;
-	/**
-	 * USER_GOOGLE is an element of enum UserSource. Its value is "USER_GOOGLE".
-	 */
-	//public static final int USER_GOOGLE = 1;
-	/**
-	 * USER_FB is an element of enum UserSource. Its value is "USER_FB".
-	 */
-	//public static final int USER_FB = 2;
-
-	/**
-	 * Max value for enum UserSource_MAX
-	 */
-	public static final int UserSource_MAX = 5;
-
-
-	/***************************************************************
-	 * Enum values for AssetType
-	 **************************************************************/
-	/**
-	 * ASSET_UNKNOWN is an element of enum AssetType. Its value is "ASSET_UNKNOWN".
-	 */
-	public static final int ASSET_UNKNOWN = 0;
-	/**
-	 * ASSET_HDFS is an element of enum AssetType. Its value is "ASSET_HDFS".
-	 */
-	public static final int ASSET_HDFS = 1;
-	/**
-	 * ASSET_HBASE is an element of enum AssetType. Its value is "ASSET_HBASE".
-	 */
-	public static final int ASSET_HBASE = 2;
-	/**
-	 * ASSET_HIVE is an element of enum AssetType. Its value is "ASSET_HIVE".
-	 */
-	public static final int ASSET_HIVE = 3;
-	/**
-	 * ASSET_HIVE is an element of enum AssetType. Its value is "ASSET_HIVE".
-	 */
-	public static final int ASSET_AGENT = 4;
-	/**
-	 * ASSET_HIVE is an element of enum AssetType. Its value is "ASSET_HIVE".
-	 */
-	public static final int ASSET_KNOX = 5;
-	/**
-	 * ASSET_HIVE is an element of enum AssetType. Its value is "ASSET_HIVE".
-	 */
-	public static final int ASSET_STORM = 6;
-
-	/**
-	 * Max value for enum AssetType_MAX
-	 */
-	public static final int AssetType_MAX = 6;
-
-
-	/***************************************************************
-	 * Enum values for AccessResult
-	 **************************************************************/
-	/**
-	 * ACCESS_RESULT_DENIED is an element of enum AccessResult. Its value is "ACCESS_RESULT_DENIED".
-	 */
-	public static final int ACCESS_RESULT_DENIED = 0;
-	/**
-	 * ACCESS_RESULT_ALLOWED is an element of enum AccessResult. Its value is "ACCESS_RESULT_ALLOWED".
-	 */
-	public static final int ACCESS_RESULT_ALLOWED = 1;
-
-	/**
-	 * Max value for enum AccessResult_MAX
-	 */
-	public static final int AccessResult_MAX = 1;
-
-
-	/***************************************************************
-	 * Enum values for PolicyType
-	 **************************************************************/
-	/**
-	 * POLICY_INCLUSION is an element of enum PolicyType. Its value is "POLICY_INCLUSION".
-	 */
-	public static final int POLICY_INCLUSION = 0;
-	/**
-	 * POLICY_EXCLUSION is an element of enum PolicyType. Its value is "POLICY_EXCLUSION".
-	 */
-	public static final int POLICY_EXCLUSION = 1;
-
-	/**
-	 * Max value for enum PolicyType_MAX
-	 */
-	public static final int PolicyType_MAX = 1;
-
-
-	/***************************************************************
-	 * Enum values for XAAuditType
-	 **************************************************************/
-	/**
-	 * XA_AUDIT_TYPE_UNKNOWN is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_UNKNOWN".
-	 */
-	public static final int XA_AUDIT_TYPE_UNKNOWN = 0;
-	/**
-	 * XA_AUDIT_TYPE_ALL is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_ALL".
-	 */
-	public static final int XA_AUDIT_TYPE_ALL = 1;
-	/**
-	 * XA_AUDIT_TYPE_READ is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_READ".
-	 */
-	public static final int XA_AUDIT_TYPE_READ = 2;
-	/**
-	 * XA_AUDIT_TYPE_WRITE is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_WRITE".
-	 */
-	public static final int XA_AUDIT_TYPE_WRITE = 3;
-	/**
-	 * XA_AUDIT_TYPE_CREATE is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_CREATE".
-	 */
-	public static final int XA_AUDIT_TYPE_CREATE = 4;
-	/**
-	 * XA_AUDIT_TYPE_DELETE is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_DELETE".
-	 */
-	public static final int XA_AUDIT_TYPE_DELETE = 5;
-	/**
-	 * XA_AUDIT_TYPE_LOGIN is an element of enum XAAuditType. Its value is "XA_AUDIT_TYPE_LOGIN".
-	 */
-	public static final int XA_AUDIT_TYPE_LOGIN = 6;
-
-	/**
-	 * Max value for enum XAAuditType_MAX
-	 */
-	public static final int XAAuditType_MAX = 6;
-
-
-	/***************************************************************
-	 * Enum values for ResourceType
-	 **************************************************************/
-	/**
-	 * RESOURCE_UNKNOWN is an element of enum ResourceType. Its value is "RESOURCE_UNKNOWN".
-	 */
-	public static final int RESOURCE_UNKNOWN = 0;
-	/**
-	 * RESOURCE_PATH is an element of enum ResourceType. Its value is "RESOURCE_PATH".
-	 */
-	public static final int RESOURCE_PATH = 1;
-	/**
-	 * RESOURCE_DB is an element of enum ResourceType. Its value is "RESOURCE_DB".
-	 */
-	public static final int RESOURCE_DB = 2;
-	/**
-	 * RESOURCE_TABLE is an element of enum ResourceType. Its value is "RESOURCE_TABLE".
-	 */
-	public static final int RESOURCE_TABLE = 3;
-	/**
-	 * RESOURCE_COL_FAM is an element of enum ResourceType. Its value is "RESOURCE_COL_FAM".
-	 */
-	public static final int RESOURCE_COL_FAM = 4;
-	/**
-	 * RESOURCE_COLUMN is an element of enum ResourceType. Its value is "RESOURCE_COLUMN".
-	 */
-	public static final int RESOURCE_COLUMN = 5;
-	/**
-	 * RESOURCE_VIEW is an element of enum ResourceType. Its value is "RESOURCE_VIEW".
-	 */
-	public static final int RESOURCE_VIEW = 6;
-	/**
-	 * RESOURCE_UDF is an element of enum ResourceType. Its value is "RESOURCE_UDF".
-	 */
-	public static final int RESOURCE_UDF = 7;
-	/**
-	 * RESOURCE_VIEW_COL is an element of enum ResourceType. Its value is "RESOURCE_VIEW_COL".
-	 */
-	public static final int RESOURCE_VIEW_COL = 8;
-
-	/**
-	 * Max value for enum ResourceType_MAX
-	 */
-	public static final int ResourceType_MAX = 8;
-
-
-	/***************************************************************
-	 * Enum values for XAGroupType
-	 **************************************************************/
-	/**
-	 * XA_GROUP_UNKNOWN is an element of enum XAGroupType. Its value is "XA_GROUP_UNKNOWN".
-	 */
-	public static final int XA_GROUP_UNKNOWN = 0;
-	/**
-	 * XA_GROUP_USER is an element of enum XAGroupType. Its value is "XA_GROUP_USER".
-	 */
-	public static final int XA_GROUP_USER = 1;
-	/**
-	 * XA_GROUP_GROUP is an element of enum XAGroupType. Its value is "XA_GROUP_GROUP".
-	 */
-	public static final int XA_GROUP_GROUP = 2;
-	/**
-	 * XA_GROUP_ROLE is an element of enum XAGroupType. Its value is "XA_GROUP_ROLE".
-	 */
-	public static final int XA_GROUP_ROLE = 3;
-
-	/**
-	 * Max value for enum XAGroupType_MAX
-	 */
-	public static final int XAGroupType_MAX = 3;
-
-
-	/***************************************************************
-	 * Enum values for XAPermForType
-	 **************************************************************/
-	/**
-	 * XA_PERM_FOR_UNKNOWN is an element of enum XAPermForType. Its value is "XA_PERM_FOR_UNKNOWN".
-	 */
-	public static final int XA_PERM_FOR_UNKNOWN = 0;
-	/**
-	 * XA_PERM_FOR_USER is an element of enum XAPermForType. Its value is "XA_PERM_FOR_USER".
-	 */
-	public static final int XA_PERM_FOR_USER = 1;
-	/**
-	 * XA_PERM_FOR_GROUP is an element of enum XAPermForType. Its value is "XA_PERM_FOR_GROUP".
-	 */
-	public static final int XA_PERM_FOR_GROUP = 2;
-
-	/**
-	 * Max value for enum XAPermForType_MAX
-	 */
-	public static final int XAPermForType_MAX = 2;
-
-
-	/***************************************************************
-	 * Enum values for XAPermType
-	 **************************************************************/
-	/**
-	 * XA_PERM_TYPE_UNKNOWN is an element of enum XAPermType. Its value is "XA_PERM_TYPE_UNKNOWN".
-	 */
-	public static final int XA_PERM_TYPE_UNKNOWN = 0;
-	/**
-	 * XA_PERM_TYPE_RESET is an element of enum XAPermType. Its value is "XA_PERM_TYPE_RESET".
-	 */
-	public static final int XA_PERM_TYPE_RESET = 1;
-	/**
-	 * XA_PERM_TYPE_READ is an element of enum XAPermType. Its value is "XA_PERM_TYPE_READ".
-	 */
-	public static final int XA_PERM_TYPE_READ = 2;
-	/**
-	 * XA_PERM_TYPE_WRITE is an element of enum XAPermType. Its value is "XA_PERM_TYPE_WRITE".
-	 */
-	public static final int XA_PERM_TYPE_WRITE = 3;
-	/**
-	 * XA_PERM_TYPE_CREATE is an element of enum XAPermType. Its value is "XA_PERM_TYPE_CREATE".
-	 */
-	public static final int XA_PERM_TYPE_CREATE = 4;
-	/**
-	 * XA_PERM_TYPE_DELETE is an element of enum XAPermType. Its value is "XA_PERM_TYPE_DELETE".
-	 */
-	public static final int XA_PERM_TYPE_DELETE = 5;
-	/**
-	 * XA_PERM_TYPE_ADMIN is an element of enum XAPermType. Its value is "XA_PERM_TYPE_ADMIN".
-	 */
-	public static final int XA_PERM_TYPE_ADMIN = 6;
-	/**
-	 * XA_PERM_TYPE_OBFUSCATE is an element of enum XAPermType. Its value is "XA_PERM_TYPE_OBFUSCATE".
-	 */
-	public static final int XA_PERM_TYPE_OBFUSCATE = 7;
-	/**
-	 * XA_PERM_TYPE_MASK is an element of enum XAPermType. Its value is "XA_PERM_TYPE_MASK".
-	 */
-	public static final int XA_PERM_TYPE_MASK = 8;
-	/**
-	 * XA_PERM_TYPE_EXECUTE is an element of enum XAPermType. Its value is "XA_PERM_TYPE_EXECUTE".
-	 */
-	public static final int XA_PERM_TYPE_EXECUTE = 9;
-	/**
-	 * XA_PERM_TYPE_SELECT is an element of enum XAPermType. Its value is "XA_PERM_TYPE_SELECT".
-	 */
-	public static final int XA_PERM_TYPE_SELECT = 10;
-	/**
-	 * XA_PERM_TYPE_UPDATE is an element of enum XAPermType. Its value is "XA_PERM_TYPE_UPDATE".
-	 */
-	public static final int XA_PERM_TYPE_UPDATE = 11;
-	/**
-	 * XA_PERM_TYPE_DROP is an element of enum XAPermType. Its value is "XA_PERM_TYPE_DROP".
-	 */
-	public static final int XA_PERM_TYPE_DROP = 12;
-	/**
-	 * XA_PERM_TYPE_ALTER is an element of enum XAPermType. Its value is "XA_PERM_TYPE_ALTER".
-	 */
-	public static final int XA_PERM_TYPE_ALTER = 13;
-	/**
-	 * XA_PERM_TYPE_INDEX is an element of enum XAPermType. Its value is "XA_PERM_TYPE_INDEX".
-	 */
-	public static final int XA_PERM_TYPE_INDEX = 14;
-	/**
-	 * XA_PERM_TYPE_LOCK is an element of enum XAPermType. Its value is "XA_PERM_TYPE_LOCK".
-	 */
-	public static final int XA_PERM_TYPE_LOCK = 15;
-	/**
-	 * XA_PERM_TYPE_ALL is an element of enum XAPermType. Its value is "XA_PERM_TYPE_ALL".
-	 */
-	public static final int XA_PERM_TYPE_ALL = 16;
-
-	/**
-	 * XA_PERM_TYPE_ALL is an element of enum XAPermType. Its value is "XA_PERM_TYPE_ALLOW".
-	 */
-	public static final int XA_PERM_TYPE_ALLOW = 17;
-
-	/**
-	 * Max value for enum XAPermType_MAX
-	 */
-	public static final int XAPermType_MAX = 17;
-
-
-	/***************************************************************
-	 * Enum values for ClassTypes
-	 **************************************************************/
-	/**
-	 * CLASS_TYPE_NONE is an element of enum ClassTypes. Its value is "CLASS_TYPE_NONE".
-	 */
-	public static final int CLASS_TYPE_NONE = 0;
-	/**
-	 * CLASS_TYPE_MESSAGE is an element of enum ClassTypes. Its value is "CLASS_TYPE_MESSAGE".
-	 */
-	public static final int CLASS_TYPE_MESSAGE = 1;
-	/**
-	 * CLASS_TYPE_USER_PROFILE is an element of enum ClassTypes. Its value is "CLASS_TYPE_USER_PROFILE".
-	 */
-	public static final int CLASS_TYPE_USER_PROFILE = 2;
-	/**
-	 * CLASS_TYPE_AUTH_SESS is an element of enum ClassTypes. Its value is "CLASS_TYPE_AUTH_SESS".
-	 */
-	public static final int CLASS_TYPE_AUTH_SESS = 3;
-	/**
-	 * CLASS_TYPE_DATA_OBJECT is an element of enum ClassTypes. Its value is "CLASS_TYPE_DATA_OBJECT".
-	 */
-	public static final int CLASS_TYPE_DATA_OBJECT = 4;
-	/**
-	 * CLASS_TYPE_NAMEVALUE is an element of enum ClassTypes. Its value is "CLASS_TYPE_NAMEVALUE".
-	 */
-	public static final int CLASS_TYPE_NAMEVALUE = 5;
-	/**
-	 * CLASS_TYPE_LONG is an element of enum ClassTypes. Its value is "CLASS_TYPE_LONG".
-	 */
-	public static final int CLASS_TYPE_LONG = 6;
-	/**
-	 * CLASS_TYPE_PASSWORD_CHANGE is an element of enum ClassTypes. Its value is "CLASS_TYPE_PASSWORD_CHANGE".
-	 */
-	public static final int CLASS_TYPE_PASSWORD_CHANGE = 7;
-	/**
-	 * CLASS_TYPE_STRING is an element of enum ClassTypes. Its value is "CLASS_TYPE_STRING".
-	 */
-	public static final int CLASS_TYPE_STRING = 8;
-	/**
-	 * CLASS_TYPE_ENUM is an element of enum ClassTypes. Its value is "CLASS_TYPE_ENUM".
-	 */
-	public static final int CLASS_TYPE_ENUM = 9;
-	/**
-	 * CLASS_TYPE_ENUM_ELEMENT is an element of enum ClassTypes. Its value is "CLASS_TYPE_ENUM_ELEMENT".
-	 */
-	public static final int CLASS_TYPE_ENUM_ELEMENT = 10;
-	/**
-	 * CLASS_TYPE_RESPONSE is an element of enum ClassTypes. Its value is "CLASS_TYPE_RESPONSE".
-	 */
-	public static final int CLASS_TYPE_RESPONSE = 11;
-	/**
-	 * CLASS_TYPE_XA_ASSET is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_ASSET".
-	 */
-	public static final int CLASS_TYPE_XA_ASSET = 1000;
-	/**
-	 * CLASS_TYPE_XA_RESOURCE is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_RESOURCE".
-	 */
-	public static final int CLASS_TYPE_XA_RESOURCE = 1001;
-	/**
-	 * CLASS_TYPE_XA_GROUP is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_GROUP".
-	 */
-	public static final int CLASS_TYPE_XA_GROUP = 1002;
-	/**
-	 * CLASS_TYPE_XA_USER is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_USER".
-	 */
-	public static final int CLASS_TYPE_XA_USER = 1003;
-	/**
-	 * CLASS_TYPE_XA_GROUP_USER is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_GROUP_USER".
-	 */
-	public static final int CLASS_TYPE_XA_GROUP_USER = 1004;
-	/**
-	 * CLASS_TYPE_XA_GROUP_GROUP is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_GROUP_GROUP".
-	 */
-	public static final int CLASS_TYPE_XA_GROUP_GROUP = 1005;
-	/**
-	 * CLASS_TYPE_XA_PERM_MAP is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_PERM_MAP".
-	 */
-	public static final int CLASS_TYPE_XA_PERM_MAP = 1006;
-	/**
-	 * CLASS_TYPE_XA_AUDIT_MAP is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_AUDIT_MAP".
-	 */
-	public static final int CLASS_TYPE_XA_AUDIT_MAP = 1007;
-	/**
-	 * CLASS_TYPE_XA_CRED_STORE is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_CRED_STORE".
-	 */
-	public static final int CLASS_TYPE_XA_CRED_STORE = 1008;
-	/**
-	 * CLASS_TYPE_XA_POLICY_EXPORT_AUDIT is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_POLICY_EXPORT_AUDIT".
-	 */
-	public static final int CLASS_TYPE_XA_POLICY_EXPORT_AUDIT = 1009;
-	/**
-	 * CLASS_TYPE_TRX_LOG is an element of enum ClassTypes. Its value is "CLASS_TYPE_TRX_LOG".
-	 */
-	public static final int CLASS_TYPE_TRX_LOG = 1010;
-	/**
-	 * CLASS_TYPE_XA_ACCESS_AUDIT is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_ACCESS_AUDIT".
-	 */
-	public static final int CLASS_TYPE_XA_ACCESS_AUDIT = 1011;
-	/**
-	 * CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE is an element of enum ClassTypes. Its value is "CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE".
-	 */
-	public static final int CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE = 1012;
-
-	/**
-	 * Max value for enum ClassTypes_MAX
-	 */
-	public static final int ClassTypes_MAX = 1012;
-
-
-
-	static public String getLabelFor_ActiveStatus( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Disabled"; //STATUS_DISABLED
-		}
-		if( elementValue == 1 ) {
-			return "Enabled"; //STATUS_ENABLED
-		}
-		if( elementValue == 2 ) {
-			return "Deleted"; //STATUS_DELETED
-		}
-		return null;
-	}
-
-	static public String getLabelFor_ActivationStatus( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Disabled"; //ACT_STATUS_DISABLED
-		}
-		if( elementValue == 1 ) {
-			return "Active"; //ACT_STATUS_ACTIVE
-		}
-		if( elementValue == 2 ) {
-			return "Pending Approval"; //ACT_STATUS_PENDING_APPROVAL
-		}
-		if( elementValue == 3 ) {
-			return "Pending Activation"; //ACT_STATUS_PENDING_ACTIVATION
-		}
-		if( elementValue == 4 ) {
-			return "Rejected"; //ACT_STATUS_REJECTED
-		}
-		if( elementValue == 5 ) {
-			return "Deactivated"; //ACT_STATUS_DEACTIVATED
-		}
-		if( elementValue == 6 ) {
-			return "Registration Pending"; //ACT_STATUS_PRE_REGISTRATION
-		}
-		if( elementValue == 7 ) {
-			return "No login privilege"; //ACT_STATUS_NO_LOGIN
-		}
-		return null;
-	}
-
-	static public String getLabelFor_BooleanValue( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "None"; //BOOL_NONE
-		}
-		if( elementValue == 1 ) {
-			return "True"; //BOOL_TRUE
-		}
-		if( elementValue == 2 ) {
-			return "False"; //BOOL_FALSE
-		}
-		return null;
-	}
-
-	static public String getLabelFor_DataType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Unknown"; //DATA_TYPE_UNKNOWN
-		}
-		if( elementValue == 1 ) {
-			return "Integer"; //DATA_TYPE_INTEGER
-		}
-		if( elementValue == 2 ) {
-			return "Double"; //DATA_TYPE_DOUBLE
-		}
-		if( elementValue == 3 ) {
-			return "String"; //DATA_TYPE_STRING
-		}
-		if( elementValue == 4 ) {
-			return "Boolean"; //DATA_TYPE_BOOLEAN
-		}
-		if( elementValue == 5 ) {
-			return "Date"; //DATA_TYPE_DATE
-		}
-		if( elementValue == 6 ) {
-			return "String enumeration"; //DATA_TYPE_STRING_ENUM
-		}
-		if( elementValue == 7 ) {
-			return "Long"; //DATA_TYPE_LONG
-		}
-		if( elementValue == 8 ) {
-			return "Integer enumeration"; //DATA_TYPE_INTEGER_ENUM
-		}
-		return null;
-	}
-
-	static public String getLabelFor_DeviceType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Unknown"; //DEVICE_UNKNOWN
-		}
-		if( elementValue == 1 ) {
-			return "Browser"; //DEVICE_BROWSER
-		}
-		if( elementValue == 2 ) {
-			return "iPhone"; //DEVICE_IPHONE
-		}
-		if( elementValue == 3 ) {
-			return "iPad"; //DEVICE_IPAD
-		}
-		if( elementValue == 4 ) {
-			return "iPod"; //DEVICE_IPOD
-		}
-		if( elementValue == 5 ) {
-			return "Android"; //DEVICE_ANDROID
-		}
-		return null;
-	}
-
-	static public String getLabelFor_DiffLevel( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Unknown"; //DIFF_UNKNOWN
-		}
-		if( elementValue == 1 ) {
-			return "Low"; //DIFF_LOW
-		}
-		if( elementValue == 2 ) {
-			return "Medium"; //DIFF_MEDIUM
-		}
-		if( elementValue == 3 ) {
-			return "High"; //DIFF_HIGH
-		}
-		return null;
-	}
-
-	static public String getLabelFor_FileType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "File"; //FILE_FILE
-		}
-		if( elementValue == 1 ) {
-			return "Directory"; //FILE_DIR
-		}
-		return null;
-	}
-
-	static public String getLabelFor_FreqType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "None"; //FREQ_NONE
-		}
-		if( elementValue == 1 ) {
-			return "Manual"; //FREQ_MANUAL
-		}
-		if( elementValue == 2 ) {
-			return "Hourly"; //FREQ_HOURLY
-		}
-		if( elementValue == 3 ) {
-			return "Daily"; //FREQ_DAILY
-		}
-		if( elementValue == 4 ) {
-			return "Weekly"; //FREQ_WEEKLY
-		}
-		if( elementValue == 5 ) {
-			return "Bi Weekly"; //FREQ_BI_WEEKLY
-		}
-		if( elementValue == 6 ) {
-			return "Monthly"; //FREQ_MONTHLY
-		}
-		return null;
-	}
-
-	static public String getLabelFor_MimeType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Unknown"; //MIME_UNKNOWN
-		}
-		if( elementValue == 1 ) {
-			return "Text"; //MIME_TEXT
-		}
-		if( elementValue == 2 ) {
-			return "Html"; //MIME_HTML
-		}
-		if( elementValue == 3 ) {
-			return "png"; //MIME_PNG
-		}
-		if( elementValue == 4 ) {
-			return "jpeg"; //MIME_JPEG
-		}
-		return null;
-	}
-
-	static public String getLabelFor_NumberFormat( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "None"; //NUM_FORMAT_NONE
-		}
-		if( elementValue == 1 ) {
-			return "Numeric"; //NUM_FORMAT_NUMERIC
-		}
-		if( elementValue == 2 ) {
-			return "Alphabhet"; //NUM_FORMAT_ALPHA
-		}
-		if( elementValue == 3 ) {
-			return "Roman"; //NUM_FORMAT_ROMAN
-		}
-		return null;
-	}
-
-	static public String getLabelFor_ObjectStatus( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Active"; //OBJ_STATUS_ACTIVE
-		}
-		if( elementValue == 1 ) {
-			return "Deleted"; //OBJ_STATUS_DELETED
-		}
-		if( elementValue == 2 ) {
-			return "Archived"; //OBJ_STATUS_ARCHIVED
-		}
-		return null;
-	}
-
-	static public String getLabelFor_PasswordResetStatus( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Active"; //PWD_RESET_ACTIVE
-		}
-		if( elementValue == 1 ) {
-			return "Used"; //PWD_RESET_USED
-		}
-		if( elementValue == 2 ) {
-			return "Expired"; //PWD_RESET_EXPIRED
-		}
-		if( elementValue == 3 ) {
-			return "Disabled"; //PWD_RESET_DISABLED
-		}
-		return null;
-	}
-
-	static public String getLabelFor_PriorityType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Normal"; //PRIORITY_NORMAL
-		}
-		if( elementValue == 1 ) {
-			return "Low"; //PRIORITY_LOW
-		}
-		if( elementValue == 2 ) {
-			return "Medium"; //PRIORITY_MEDIUM
-		}
-		if( elementValue == 3 ) {
-			return "High"; //PRIORITY_HIGH
-		}
-		return null;
-	}
-
-	static public String getLabelFor_ProgressStatus( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Pending"; //PROGRESS_PENDING
-		}
-		if( elementValue == 1 ) {
-			return "In Progress"; //PROGRESS_IN_PROGRESS
-		}
-		if( elementValue == 2 ) {
-			return "Complete"; //PROGRESS_COMPLETE
-		}
-		if( elementValue == 3 ) {
-			return "Aborted"; //PROGRESS_ABORTED
-		}
-		if( elementValue == 4 ) {
-			return "Failed"; //PROGRESS_FAILED
-		}
-		return null;
-	}
-
-	static public String getLabelFor_RelationType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "None"; //REL_NONE
-		}
-		if( elementValue == 1 ) {
-			return "Self"; //REL_SELF
-		}
-		return null;
-	}
-
-	static public String getLabelFor_UserSource( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Application"; //USER_APP
-		}
-		if( elementValue == 1 ) {
-			return "External"; //USER_EXTERNAL
-		}
-		/*if( elementValue == 1 ) {
-			return "Google"; //USER_GOOGLE
-		}
-		if( elementValue == 2 ) {
-			return "FaceBook"; //USER_FB
-		}*/
-		return null;
-	}
-
-	static public String getLabelFor_AssetType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Unknown"; //ASSET_UNKNOWN
-		}
-		if( elementValue == 1 ) {
-			return "HDFS"; //ASSET_HDFS
-		}
-		if( elementValue == 2 ) {
-			return "HBase"; //ASSET_HBASE
-		}
-		if( elementValue == 3 ) {
-			return "Hive"; //ASSET_HIVE
-		}
-		if( elementValue == 4 ) {
-			return "Agent"; //ASSET_HIVE
-		}
-		if( elementValue == 5 ) {
-			return "Knox"; //ASSET_HIVE
-		}
-		if( elementValue == 6 ) {
-			return "Storm"; //ASSET_HIVE
-		}
-		return null;
-	}
-
-	static public String getLabelFor_AccessResult( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Denied"; //ACCESS_RESULT_DENIED
-		}
-		if( elementValue == 1 ) {
-			return "Allowed"; //ACCESS_RESULT_ALLOWED
-		}
-		return null;
-	}
-
-	static public String getLabelFor_PolicyType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Inclusion"; //POLICY_INCLUSION
-		}
-		if( elementValue == 1 ) {
-			return "Exclusion"; //POLICY_EXCLUSION
-		}
-		return null;
-	}
-
-	static public String getLabelFor_XAAuditType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Unknown"; //XA_AUDIT_TYPE_UNKNOWN
-		}
-		if( elementValue == 1 ) {
-			return "All"; //XA_AUDIT_TYPE_ALL
-		}
-		if( elementValue == 2 ) {
-			return "Read"; //XA_AUDIT_TYPE_READ
-		}
-		if( elementValue == 3 ) {
-			return "Write"; //XA_AUDIT_TYPE_WRITE
-		}
-		if( elementValue == 4 ) {
-			return "Create"; //XA_AUDIT_TYPE_CREATE
-		}
-		if( elementValue == 5 ) {
-			return "Delete"; //XA_AUDIT_TYPE_DELETE
-		}
-		if( elementValue == 6 ) {
-			return "Login"; //XA_AUDIT_TYPE_LOGIN
-		}
-		return null;
-	}
-
-	static public String getLabelFor_ResourceType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Unknown"; //RESOURCE_UNKNOWN
-		}
-		if( elementValue == 1 ) {
-			return "Path"; //RESOURCE_PATH
-		}
-		if( elementValue == 2 ) {
-			return "Database"; //RESOURCE_DB
-		}
-		if( elementValue == 3 ) {
-			return "Table"; //RESOURCE_TABLE
-		}
-		if( elementValue == 4 ) {
-			return "Column Family"; //RESOURCE_COL_FAM
-		}
-		if( elementValue == 5 ) {
-			return "Column"; //RESOURCE_COLUMN
-		}
-		if( elementValue == 6 ) {
-			return "VIEW"; //RESOURCE_VIEW
-		}
-		if( elementValue == 7 ) {
-			return "UDF"; //RESOURCE_UDF
-		}
-		if( elementValue == 8 ) {
-			return "View Column"; //RESOURCE_VIEW_COL
-		}
-		return null;
-	}
-
-	static public String getLabelFor_XAGroupType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Unknown"; //XA_GROUP_UNKNOWN
-		}
-		if( elementValue == 1 ) {
-			return "User"; //XA_GROUP_USER
-		}
-		if( elementValue == 2 ) {
-			return "Group"; //XA_GROUP_GROUP
-		}
-		if( elementValue == 3 ) {
-			return "Role"; //XA_GROUP_ROLE
-		}
-		return null;
-	}
-
-	static public String getLabelFor_XAPermForType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Unknown"; //XA_PERM_FOR_UNKNOWN
-		}
-		if( elementValue == 1 ) {
-			return "Permission for Users"; //XA_PERM_FOR_USER
-		}
-		if( elementValue == 2 ) {
-			return "Permission for Groups"; //XA_PERM_FOR_GROUP
-		}
-		return null;
-	}
-
-	static public String getLabelFor_XAPermType( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "Unknown"; //XA_PERM_TYPE_UNKNOWN
-		}
-		if( elementValue == 1 ) {
-			return "Reset"; //XA_PERM_TYPE_RESET
-		}
-		if( elementValue == 2 ) {
-			return "Read"; //XA_PERM_TYPE_READ
-		}
-		if( elementValue == 3 ) {
-			return "Write"; //XA_PERM_TYPE_WRITE
-		}
-		if( elementValue == 4 ) {
-			return "Create"; //XA_PERM_TYPE_CREATE
-		}
-		if( elementValue == 5 ) {
-			return "Delete"; //XA_PERM_TYPE_DELETE
-		}
-		if( elementValue == 6 ) {
-			return "Admin"; //XA_PERM_TYPE_ADMIN
-		}
-		if( elementValue == 7 ) {
-			return "Obfuscate"; //XA_PERM_TYPE_OBFUSCATE
-		}
-		if( elementValue == 8 ) {
-			return "Mask"; //XA_PERM_TYPE_MASK
-		}
-		if( elementValue == 9 ) {
-			return "Execute"; //XA_PERM_TYPE_EXECUTE
-		}
-		if( elementValue == 10 ) {
-			return "Select"; //XA_PERM_TYPE_SELECT
-		}
-		if( elementValue == 11 ) {
-			return "Update"; //XA_PERM_TYPE_UPDATE
-		}
-		if( elementValue == 12 ) {
-			return "Drop"; //XA_PERM_TYPE_DROP
-		}
-		if( elementValue == 13 ) {
-			return "Alter"; //XA_PERM_TYPE_ALTER
-		}
-		if( elementValue == 14 ) {
-			return "Index"; //XA_PERM_TYPE_INDEX
-		}
-		if( elementValue == 15 ) {
-			return "Lock"; //XA_PERM_TYPE_LOCK
-		}
-		if( elementValue == 16 ) {
-			return "All"; //XA_PERM_TYPE_ALL
-		}
-		if( elementValue == 17 ) {
-			return "Allow"; //XA_PERM_TYPE_ALLOW
-		}
-		return null;
-	}
-
-	static public String getLabelFor_ClassTypes( int elementValue ) {
-		if( elementValue == 0 ) {
-			return "None"; //CLASS_TYPE_NONE
-		}
-		if( elementValue == 1 ) {
-			return "Message"; //CLASS_TYPE_MESSAGE
-		}
-		if( elementValue == 2 ) {
-			return "User Profile"; //CLASS_TYPE_USER_PROFILE
-		}
-		if( elementValue == 3 ) {
-			return "Authentication Session"; //CLASS_TYPE_AUTH_SESS
-		}
-		if( elementValue == 4 ) {
-			return null; //CLASS_TYPE_DATA_OBJECT
-		}
-		if( elementValue == 5 ) {
-			return null; //CLASS_TYPE_NAMEVALUE
-		}
-		if( elementValue == 6 ) {
-			return null; //CLASS_TYPE_LONG
-		}
-		if( elementValue == 7 ) {
-			return null; //CLASS_TYPE_PASSWORD_CHANGE
-		}
-		if( elementValue == 8 ) {
-			return null; //CLASS_TYPE_STRING
-		}
-		if( elementValue == 9 ) {
-			return null; //CLASS_TYPE_ENUM
-		}
-		if( elementValue == 10 ) {
-			return null; //CLASS_TYPE_ENUM_ELEMENT
-		}
-		if( elementValue == 11 ) {
-			return "Response"; //CLASS_TYPE_RESPONSE
-		}
-		if( elementValue == 1000 ) {
-			return "Asset"; //CLASS_TYPE_XA_ASSET
-		}
-		if( elementValue == 1001 ) {
-			return "Resource"; //CLASS_TYPE_XA_RESOURCE
-		}
-		if( elementValue == 1002 ) {
-			return "XA Group"; //CLASS_TYPE_XA_GROUP
-		}
-		if( elementValue == 1003 ) {
-			return "XA User"; //CLASS_TYPE_XA_USER
-		}
-		if( elementValue == 1004 ) {
-			return "XA Group of Users"; //CLASS_TYPE_XA_GROUP_USER
-		}
-		if( elementValue == 1005 ) {
-			return "XA Group of groups"; //CLASS_TYPE_XA_GROUP_GROUP
-		}
-		if( elementValue == 1006 ) {
-			return "XA permissions for resource"; //CLASS_TYPE_XA_PERM_MAP
-		}
-		if( elementValue == 1007 ) {
-			return "XA audits for resource"; //CLASS_TYPE_XA_AUDIT_MAP
-		}
-		if( elementValue == 1008 ) {
-			return "XA credential store"; //CLASS_TYPE_XA_CRED_STORE
-		}
-		if( elementValue == 1009 ) {
-			return "XA Policy Export Audit"; //CLASS_TYPE_XA_POLICY_EXPORT_AUDIT
-		}
-		if( elementValue == 1010 ) {
-			return "Transaction log"; //CLASS_TYPE_TRX_LOG
-		}
-		if( elementValue == 1011 ) {
-			return "Access Audit"; //CLASS_TYPE_XA_ACCESS_AUDIT
-		}
-		if( elementValue == 1012 ) {
-			return "Transaction log attribute"; //CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE
-		}
-		return null;
-	}
-
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/XAConfigUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/XAConfigUtil.java b/security-admin/src/main/java/org/apache/ranger/common/XAConfigUtil.java
deleted file mode 100644
index e50fb20..0000000
--- a/security-admin/src/main/java/org/apache/ranger/common/XAConfigUtil.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- package org.apache.ranger.common;
-
-import org.apache.log4j.Logger;
-import org.apache.ranger.common.PropertiesUtil;
-import org.springframework.stereotype.Component;
-
-/**
- * 
- * 
- */
-@Component
-public class XAConfigUtil {
-	static Logger logger = Logger.getLogger(XAConfigUtil.class);
-
-	String webappRootURL;
-	int defaultMaxRows = 250;
-	String[] roles;
-	boolean accessFilterEnabled = true;
-	boolean isModerationEnabled = false;
-	boolean isUserPrefEnabled = false;
-
-	public XAConfigUtil() {
-		webappRootURL = PropertiesUtil
-				.getProperty("xa.webapp.url.root");
-		if (webappRootURL == null || webappRootURL.trim().length() == 0) {
-			logger.error("webapp URL is not set. Please xa.webapp.url.root property");
-		}
-
-		defaultMaxRows = PropertiesUtil.getIntProperty(
-				"xa.db.maxrows.default", defaultMaxRows);
-
-		roles = PropertiesUtil
-				.getPropertyStringList("xa.users.roles.list");
-
-		accessFilterEnabled = PropertiesUtil.getBooleanProperty(
-				"xa.db.access.filter.enable", true);
-
-		isModerationEnabled = PropertiesUtil.getBooleanProperty(
-				"xa.moderation.enabled", isModerationEnabled);
-		isUserPrefEnabled = PropertiesUtil.getBooleanProperty(
-				"xa.userpref.enabled", isUserPrefEnabled);
-	}	
-
-	/**
-	 * @return the defaultMaxRows
-	 */
-	public int getDefaultMaxRows() {
-		return defaultMaxRows;
-	}
-
-	/**
-	 * @return the roles
-	 */
-	public String[] getRoles() {
-		return roles;
-	}
-
-	/**
-	 * @return the accessFilterEnabled
-	 */
-	public boolean isAccessFilterEnabled() {
-		return accessFilterEnabled;
-	}
-
-	/**
-	 * @return the webAppRootURL
-	 */
-	public String getWebAppRootURL() {
-		return webappRootURL;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/XAConstants.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/XAConstants.java b/security-admin/src/main/java/org/apache/ranger/common/XAConstants.java
deleted file mode 100644
index 5dbebb8..0000000
--- a/security-admin/src/main/java/org/apache/ranger/common/XAConstants.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /**
- *
- */
-
-package org.apache.ranger.common;
-
-public class XAConstants extends XACommonEnums {
-
-	// Default Roles
-	public final static String ROLE_SYS_ADMIN = "ROLE_SYS_ADMIN";
-	public final static String ROLE_ADMIN = "ROLE_ADMIN";
-	public final static String ROLE_INTEGRATOR = "ROLE_INTEGRATOR";
-	public final static String ROLE_DATA_ANALYST = "ROLE_DATA_ANALYST";
-	public final static String ROLE_BIZ_MGR = "ROLE_BIZ_MGR";
-
-	public final static String ROLE_USER = "ROLE_USER";
-	public final static String ROLE_ANON = "ROLE_ANON";
-	public final static String ROLE_OTHER = "ROLE_OTHER";
-	public final static String GROUP_PUBLIC = "public";
-	// Action constants
-	public final static String ACTION_EDIT = "edit";
-	public final static String ACTION_CHANGE = "change";
-	public final static String ACTION_DELETE = "delete";
-	public final static String ACTION_MARK_SPAM = "mark_spam";
-	public final static String ACTION_RATE = "rate";
-	public final static String ACTION_SELECT = "select";
-	public final static String ACTION_UNSELECT = "unselect";
-	public final static String ACTION_HIDE = "hide";
-	public final static String ACTION_UNHIDE = "unhide";
-	public final static String ACTION_SHARE = "share";
-	public final static String ACTION_UNSHARE = "unshare";
-	public final static String ACTION_BOOKMARK = "bookmark";
-	public final static String ACTION_UNBOOKMARK = "unbookmark";
-
-	// Sendgrid email API constants
-	public static final String SENDGRID_API_USER = "api_user";
-	public static final String SENDGRID_API_KEY = "api_key";
-	public static final String SENDGRID_TO = "to";
-	public static final String SENDGRID_TO_NAME = "toname";
-	public static final String SENDGRID_SUBJECT = "subject";
-	public static final String SENDGRID_TEXT = "text";
-	public static final String SENDGRID_HTML = "html";
-	public static final String SENDGRID_FROM_EMAIL = "from";
-	public static final String SENDGRID_FROM_NAME = "fromname";
-	public static final String SENDGRID_BCC = "bcc";
-	public static final String SENDGRID_CC = "cc";
-	public static final String SENDGRID_REPLY_TO = "replyto";
-	
-	// User create validation errors
-	public enum ValidationUserProfile {
-
-		NO_EMAIL_ADDR("xa.validation.userprofile.no_email_addr",
-				"Email address not provided"), INVALID_EMAIL_ADDR(
-				"xa.validation.userprofile.userprofile.invalid_email_addr",
-				"Invalid email address"), NO_FIRST_NAME(
-				"xa.validation.userprofile.userprofile.no_first_name",
-				"First name not provided"), INVALID_FIRST_NAME(
-				"xa.validation.userprofile.invalid_first_name",
-				"Invalid first name"), NO_LAST_NAME(
-				"xa.validation.userprofile.noemailaddr",
-				"Email address not provided"), INVALID_LAST_NAME(
-				"xa.validation.userprofile.noemailaddr",
-				"Email address not provided"), NO_PUBLIC_SCREEN_NAME(
-				"xa.validation.userprofile.noemailaddr",
-				"Email address not provided"), INVALID_PUBLIC_SCREEN_NAME(
-				"xa.validation.userprofile.noemailaddr",
-				"Email address not provided");
-
-		String rbKey;
-		String message;
-
-		ValidationUserProfile(String rbKey, String message) {
-			this.rbKey = rbKey;
-			this.message = message;
-		}
-	};
-
-	// these constants will be used in setting GjResponse object.
-
-	public final static String USER_PENDING_APPROVAL_MSG = "User is yet not reviewed by Administrator. Please contact at <number>.";
-	public final static int USER_PENDING_APPROVAL_STATUS_CODE = 0;
-
-	public final static String USER_APPROVAL_MSG = "User is approved";
-	public final static int USER_APPROVAL_STATUS_CODE = 1;
-
-	public final static String USER_REJECTION_MSG = "User is rejected";
-	public final static int USER_REJECTION_STATUS_CODE = 1;
-
-	public final static String USER_STATUS_ALREADY_CHANGED_MSG = "Can not change user status. it is either already activated/approved/rejected";
-	public final static int USER_STATUS_ALREADY_CHANGED_STATUS_CODE = 0;
-
-	public final static String USER_ALREADY_ACTIVATED_MSG = "Your account is already activated. If you have forgotten your password, then from the login page, select 'Forgot Password'";
-	public final static int USER_ALREADY_ACTIVATED_STATUS_CODE = 0;
-
-	public final static String USER_STATUS_NOT_ACTIVE_MSG = "User is not in active status. Please activate your account first.";
-	public final static int USER_STATUS_NOT_ACTIVE_STATUS_CODE = 0;
-
-	public final static String INVALID_EMAIL_ADDRESS_MSG = "Invalid email address";
-	public final static int INVALID_EMAIL_ADDRESS_STATUS_CODE = 0;
-
-	public final static String WRONG_ACTIVATION_CODE_MSG = "Wrong activation code";
-	public final static int WRONG_ACTIVATION_CODE_STATUS_CODE = 0;
-
-	public final static String VALID_EMAIL_ADDRESS_MSG = "Valid email address";
-	public final static int VALID_EMAIL_ADDRESS_STATUS_CODE = 1;
-
-	public final static String NO_ACTIVATION_RECORD_FOR_USER_ERR_MSG = "No activation record found for user:";
-	public final static String NO_ACTIVATION_ENTRY = "activation entry not found";
-
-	public final static String VALIDATION_INVALID_DATA_DESC = "Invalid value for";
-	public final static int VALIDATION_INVALID_DATA_CODE = 0;
-	public static final String GROUP_MODERATORS = "GROUP_MODERATORS";
-
-	// public final static String EMAIL_WELCOME_MSG =
-	// "Welcome to iSchoolCircle";
-	// public final static String EMAIL_LINK_WELCOME_MSG =
-	// "Welcome to iSchoolCircle ! Please verify your account by clicking on the link below: ";
-	// public static final String EMAIL_EDIT_REJECTED_MSG =
-	// "Your changes not approved for public sharing.";
-	// public static final String EMAIL_APPROVAL_NEEDED_MSG =
-	// "New objects pending approval";
-	// public static final String EMAIL_PWD_RESET_CODE_MSG =
-	// "iSchoolCircle - Password Reset";
-
-	public final static String PWD_RESET_FAILED_MSG = "Invalid password reset request";
-
-	public final static String INVALID_NEW_PASSWORD_MSG = "Invalid new password";
-	public static final String EMAIL_NEW_FEEDBACK_RECEIVED = "New feedback from";
-	public static final int INITIAL_DOCUMENT_VERSION = 1;
-
-	public static final int EMAIL_TYPE_ACCOUNT_CREATE = 0;
-	public static final int EMAIL_TYPE_USER_CREATE = 1;
-	public static final int EMAIL_TYPE_USER_ACCT_ADD = 2;
-	public static final int EMAIL_TYPE_DOCUMENT_CREATE = 3;
-	public static final int EMAIL_TYPE_DISCUSSION_CREATE = 4;
-	public static final int EMAIL_TYPE_NOTE_CREATE = 5;	
-	public static final int EMAIL_TYPE_TASK_CREATE = 6;
-	public static final int EMAIL_TYPE_USER_PASSWORD = 7;
-	public static final int EMAIL_TYPE_USER_ACTIVATION = 8;
-	public static final int EMAIL_TYPE_USER_ROLE_UPDATED = 9;
-	public static final int EMAIL_TYPE_USER_GRP_ADD = 10;
-	
-	public static enum RBAC_PERM {
-		ALLOW_NONE, 
-		ALLOW_READ, 
-		ALLOW_WRITE, 
-		ALLOW_DELETE
-	}
-	
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/XAJAXBContextResolver.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/XAJAXBContextResolver.java b/security-admin/src/main/java/org/apache/ranger/common/XAJAXBContextResolver.java
deleted file mode 100644
index 87a7924..0000000
--- a/security-admin/src/main/java/org/apache/ranger/common/XAJAXBContextResolver.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- package org.apache.ranger.common;
-
-import javax.ws.rs.ext.ContextResolver;
-import javax.ws.rs.ext.Provider;
-import javax.xml.bind.JAXBContext;
-
-import org.apache.ranger.common.*;
-
-import com.sun.jersey.api.json.JSONConfiguration;
-import com.sun.jersey.api.json.JSONJAXBContext;
-
-/**
- * 
- *
- */
-@Provider
-public class XAJAXBContextResolver implements ContextResolver<JAXBContext> {
-
-    private JAXBContext context;
-    private Class<?>[] types = {
-	org.apache.ranger.view.VXAuthSessionList.class,
-	org.apache.ranger.view.VXResponse.class,
-	org.apache.ranger.view.VXStringList.class,
-	org.apache.ranger.view.VXPortalUserList.class,
-	org.apache.ranger.view.VXAssetList.class,
-	org.apache.ranger.view.VXResourceList.class,
-	org.apache.ranger.view.VXCredentialStoreList.class,
-	org.apache.ranger.view.VXGroupList.class,
-	org.apache.ranger.view.VXUserList.class,
-	org.apache.ranger.view.VXGroupUserList.class,
-	org.apache.ranger.view.VXGroupGroupList.class,
-	org.apache.ranger.view.VXPermMapList.class,
-	org.apache.ranger.view.VXAuditMapList.class,
-	org.apache.ranger.view.VXPolicyExportAuditList.class,
-	org.apache.ranger.view.VXAccessAuditList.class
-    };
-
-    public XAJAXBContextResolver() throws Exception {
-	JSONConfiguration config = JSONConfiguration.natural().build();
-	context = new JSONJAXBContext(config, types);
-    }
-
-    @Override
-    public JAXBContext getContext(Class<?> objectType) {
-	// return context;
-	for (Class<?> type : types) {
-	    if (type.getName().equals(objectType.getName())) {
-		return context;
-	    }
-	}
-	return null;
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/XASearchUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/XASearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/XASearchUtil.java
deleted file mode 100644
index ff1f1a4..0000000
--- a/security-admin/src/main/java/org/apache/ranger/common/XASearchUtil.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- package org.apache.ranger.common;
-
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-import org.apache.log4j.Logger;
-import org.apache.ranger.common.SearchCriteria;
-import org.apache.ranger.common.SearchField;
-import org.apache.ranger.common.SearchUtil;
-import org.apache.ranger.db.XADaoManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class XASearchUtil extends SearchUtil {
-	final static Logger logger = Logger.getLogger(XASearchUtil.class);
-	/*
-	@Override
-	public Query createSearchQuery(EntityManager em, String queryStr, String sortClause,
-			SearchCriteria searchCriteria, List<SearchField> searchFields,
-			int objectClassType, boolean hasAttributes, boolean isCountQuery){
-
-		// [1] Build where clause
-		StringBuilder queryClause = buildWhereClause(searchCriteria,
-				searchFields);
-
-		// [2] Add domain-object-security clause if needed
-		// if (objectClassType != -1
-		// && !ContextUtil.getCurrentUserSession().isUserAdmin()) {
-		// addDomainObjectSecuirtyClause(queryClause, hasAttributes);
-		// }
-
-		// [2] Add order by clause
-		addOrderByClause(queryClause, sortClause);
-
-		// [3] Create Query Object
-		Query query = em.createQuery(
-					queryStr + queryClause);
-
-		// [4] Resolve query parameters with values
-		resolveQueryParams(query, searchCriteria, searchFields);
-
-		// [5] Resolve domain-object-security parameters
-		// if (objectClassType != -1 &&
-		// !securityHandler.hasModeratorPermission()) {
-		// resolveDomainObjectSecuirtyParams(query, objectClassType);
-		// }
-
-		if (!isCountQuery) {
-			query.setFirstResult(searchCriteria.getStartIndex());
-			updateQueryPageSize(query, searchCriteria);
-		}
-
-		return query;
-	}
-	*/
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationClassName.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationClassName.java b/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationClassName.java
new file mode 100644
index 0000000..c85f3da
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationClassName.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ /**
+ *
+ */
+package org.apache.ranger.common.annotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RangerAnnotationClassName {
+    public Class class_name();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationJSMgrName.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationJSMgrName.java b/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationJSMgrName.java
new file mode 100644
index 0000000..911b414
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationJSMgrName.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ /**
+ *
+ */
+package org.apache.ranger.common.annotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RangerAnnotationJSMgrName {
+    public String value();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationRestAPI.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationRestAPI.java b/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationRestAPI.java
new file mode 100644
index 0000000..a91d9ec
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/common/annotation/RangerAnnotationRestAPI.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ /**
+ *
+ */
+package org.apache.ranger.common.annotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Annotating the REST APIs
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RangerAnnotationRestAPI {
+    public String api_name() default "";
+    public boolean updates_generic_objects() default false;
+    public String updates_classes() default "";
+}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/annotation/XAAnnotationClassName.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/annotation/XAAnnotationClassName.java b/security-admin/src/main/java/org/apache/ranger/common/annotation/XAAnnotationClassName.java
deleted file mode 100644
index dcc357d..0000000
--- a/security-admin/src/main/java/org/apache/ranger/common/annotation/XAAnnotationClassName.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /**
- *
- */
-package org.apache.ranger.common.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-
-@Retention(RetentionPolicy.RUNTIME)
-public @interface XAAnnotationClassName {
-    public Class class_name();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/annotation/XAAnnotationJSMgrName.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/annotation/XAAnnotationJSMgrName.java b/security-admin/src/main/java/org/apache/ranger/common/annotation/XAAnnotationJSMgrName.java
deleted file mode 100644
index cf21848..0000000
--- a/security-admin/src/main/java/org/apache/ranger/common/annotation/XAAnnotationJSMgrName.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /**
- *
- */
-package org.apache.ranger.common.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * 
- *
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface XAAnnotationJSMgrName {
-    public String value();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/annotation/XAAnnotationRestAPI.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/annotation/XAAnnotationRestAPI.java b/security-admin/src/main/java/org/apache/ranger/common/annotation/XAAnnotationRestAPI.java
deleted file mode 100644
index 3dc62bb..0000000
--- a/security-admin/src/main/java/org/apache/ranger/common/annotation/XAAnnotationRestAPI.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /**
- *
- */
-package org.apache.ranger.common.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * Annotating the REST APIs
- *
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface XAAnnotationRestAPI {
-    public String api_name() default "";
-    public boolean updates_generic_objects() default false;
-    public String updates_classes() default "";
-}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java b/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java
index bebe956..8ef9e08 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java
@@ -32,27 +32,25 @@ import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
 import org.apache.log4j.Logger;
-import org.apache.ranger.common.ContextUtil;
-import org.apache.ranger.db.XADaoManager;
-import org.apache.ranger.db.XADaoManagerBase;
-import org.apache.ranger.entity.XXDBBase;
+import org.apache.ranger.db.RangerDaoManager;
+import org.apache.ranger.db.RangerDaoManagerBase;
 
 public abstract class BaseDao<T> {
 	static final Logger logger = Logger.getLogger(BaseDao.class);
 
-	protected XADaoManager daoManager;
+	protected RangerDaoManager daoManager;
 
 	EntityManager em;
 
 	protected Class<T> tClass;
 
-	public BaseDao(XADaoManagerBase daoManager) {
-		this.daoManager = (XADaoManager) daoManager;
+	public BaseDao(RangerDaoManagerBase daoManager) {
+		this.daoManager = (RangerDaoManager) daoManager;
 		this.init(daoManager.getEntityManager());
 	}
 
-	public BaseDao(XADaoManagerBase daoManager, String persistenceContextUnit) {
-		this.daoManager = (XADaoManager) daoManager;
+	public BaseDao(RangerDaoManagerBase daoManager, String persistenceContextUnit) {
+		this.daoManager = (RangerDaoManager) daoManager;
 
 		EntityManager em = this.daoManager.getEntityManager(persistenceContextUnit);
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java b/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java
index c5176ba..ece3b6e 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java
@@ -26,8 +26,8 @@ import org.apache.log4j.Logger;
 import org.apache.ranger.common.DateUtil;
 import org.apache.ranger.common.UserSessionBase;
 import org.apache.ranger.entity.XXDBBase;
-import org.apache.ranger.security.context.XAContextHolder;
-import org.apache.ranger.security.context.XASecurityContext;
+import org.apache.ranger.security.context.RangerContextHolder;
+import org.apache.ranger.security.context.RangerSecurityContext;
 
 public class JPABeanCallbacks {
 	static final Logger logger = Logger.getLogger(JPABeanCallbacks.class);
@@ -40,7 +40,7 @@ public class JPABeanCallbacks {
 
 				entity.setUpdateTime(DateUtil.getUTCDate());
 
-				XASecurityContext context = XAContextHolder
+				RangerSecurityContext context = RangerContextHolder
 						.getSecurityContext();
 				if (context != null) {
 					UserSessionBase userSession = context.getUserSession();

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java b/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java
index 9f31390..3d5c252 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.XACommonEnums;
+import org.apache.ranger.common.RangerCommonEnums;
 
 
 @XmlRootElement
@@ -88,7 +88,7 @@ public class VEnum extends ViewBaseBean implements java.io.Serializable {
 
 	@Override
 	public int getMyClassType() {
-		return XACommonEnums.CLASS_TYPE_ENUM;
+		return RangerCommonEnums.CLASS_TYPE_ENUM;
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java b/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java
index 15f890d..4a73ce7 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java
@@ -21,7 +21,7 @@
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.ranger.common.XACommonEnums;
+import org.apache.ranger.common.RangerCommonEnums;
 
 @XmlRootElement
 public class VEnumElement extends ViewBaseBean implements java.io.Serializable {
@@ -145,7 +145,7 @@ public class VEnumElement extends ViewBaseBean implements java.io.Serializable {
 
 	@Override
 	public int getMyClassType( ) {
-	    return XACommonEnums.CLASS_TYPE_ENUM_ELEMENT;
+	    return RangerCommonEnums.CLASS_TYPE_ENUM_ELEMENT;
 	}
 
 	/**

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/view/VList.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/VList.java b/security-admin/src/main/java/org/apache/ranger/common/view/VList.java
index 177e7fd..4364ae6 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/VList.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/VList.java
@@ -22,7 +22,7 @@
 
 import java.util.List;
 
-import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 public abstract class VList extends ViewBaseBean implements

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java b/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java
index 2974e7d..eb2e0e3 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java
@@ -24,8 +24,6 @@ import java.io.Serializable;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.ranger.common.AppConstants;
-import org.apache.ranger.common.XACommonEnums;
-import org.apache.ranger.common.view.ViewBaseBean;
 
 @XmlRootElement
 public class VTrxLogAttr extends ViewBaseBean implements Serializable{

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java b/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java
index b820120..b93da50 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java
@@ -21,7 +21,7 @@
 
 import javax.xml.bind.annotation.XmlTransient;
 
-import org.apache.ranger.common.XACommonEnums;
+import org.apache.ranger.common.RangerCommonEnums;
 import org.apache.ranger.entity.XXDBBase;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
@@ -51,6 +51,6 @@ public class ViewBaseBean implements java.io.Serializable {
     @XmlTransient
     @JsonIgnore
     public int getMyClassType() {
-	return XACommonEnums.CLASS_TYPE_NONE;
+	return RangerCommonEnums.CLASS_TYPE_NONE;
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/06ca8538/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java
new file mode 100644
index 0000000..4227c90
--- /dev/null
+++ b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ package org.apache.ranger.db;
+
+
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.apache.log4j.Logger;
+import org.apache.ranger.common.RangerConstants;
+import org.apache.ranger.common.StringUtil;
+import org.apache.ranger.common.db.BaseDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RangerDaoManager extends RangerDaoManagerBase {
+	final static Logger logger = Logger.getLogger(RangerDaoManager.class);
+
+	@PersistenceContext(unitName = "defaultPU")
+	private EntityManager em;
+
+	@PersistenceContext(unitName = "loggingPU")
+	private EntityManager loggingEM;
+
+	@Autowired
+	StringUtil stringUtil;
+
+	@Override
+	public EntityManager getEntityManager() {
+		return em;
+	}
+
+	public EntityManager getEntityManager(String persistenceContextUnit) {
+		logger.error("RangerDaoManager.getEntityManager(" + persistenceContextUnit + ")");
+		if (persistenceContextUnit.equalsIgnoreCase("loggingPU")) {
+			return loggingEM;
+		}
+		return getEntityManager();
+	}
+
+	
+	/**
+	 * @return the stringUtil
+	 */
+	public StringUtil getStringUtil() {
+		return stringUtil;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 */
+	@Override
+	public BaseDao<?> getDaoForClassType(int classType) {
+		if (classType == RangerConstants.CLASS_TYPE_NONE) {
+			return null;
+		}
+		return super.getDaoForClassType(classType);
+	}
+
+}

[12/12] incubator-ranger git commit: RANGER-194: Rename classes under web-admin project

Posted by ma...@apache.org.

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 <al...@hortonworks.com>
Authored: Mon Dec 15 18:43:44 2014 -0800
Committer: Madhan Neethiraj <ma...@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;
 
 /**
  *