From 42d8a71cf49d3b809fd913173e0234ae252df529 Mon Sep 17 00:00:00 2001
From: Thamindu Aluthwala <thamindu.randil@gmail.com>
Date: Fri, 26 Jan 2024 11:41:58 +0530
Subject: [PATCH] Rename role management service

---
 ...eManagementServlet.java => RoleManagementServlet.java} | 4 ++--
 .../src/main/resources/META-INF/component.xml             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename components/user-mgt/org.wso2.carbon.role.mgt.ui/src/main/java/org/wso2/carbon/role/mgt/ui/servlet/{UserAndRoleManagementServlet.java => RoleManagementServlet.java} (99%)

diff --git a/components/user-mgt/org.wso2.carbon.role.mgt.ui/src/main/java/org/wso2/carbon/role/mgt/ui/servlet/UserAndRoleManagementServlet.java b/components/user-mgt/org.wso2.carbon.role.mgt.ui/src/main/java/org/wso2/carbon/role/mgt/ui/servlet/RoleManagementServlet.java
similarity index 99%
rename from components/user-mgt/org.wso2.carbon.role.mgt.ui/src/main/java/org/wso2/carbon/role/mgt/ui/servlet/UserAndRoleManagementServlet.java
rename to components/user-mgt/org.wso2.carbon.role.mgt.ui/src/main/java/org/wso2/carbon/role/mgt/ui/servlet/RoleManagementServlet.java
index f174d89966b2..710fd4322d56 100644
--- a/components/user-mgt/org.wso2.carbon.role.mgt.ui/src/main/java/org/wso2/carbon/role/mgt/ui/servlet/UserAndRoleManagementServlet.java
+++ b/components/user-mgt/org.wso2.carbon.role.mgt.ui/src/main/java/org/wso2/carbon/role/mgt/ui/servlet/RoleManagementServlet.java
@@ -51,9 +51,9 @@
  * Service to get Users and Roles
  *
  */
-public class UserAndRoleManagementServlet extends HttpServlet {
+public class RoleManagementServlet extends HttpServlet {
 
-    private static final Log log                        = LogFactory.getLog(UserAndRoleManagementServlet.class);
+    private static final Log log                        = LogFactory.getLog(RoleManagementServlet.class);
     private static final String PERMISSION_VIEWTASKS    = "/permission/admin/manage/humantask/viewtasks";
     private static final String USERS                   = "users";
     private static final String CATEGORY                = "category";
diff --git a/components/user-mgt/org.wso2.carbon.role.mgt.ui/src/main/resources/META-INF/component.xml b/components/user-mgt/org.wso2.carbon.role.mgt.ui/src/main/resources/META-INF/component.xml
index 06a4bb6b2583..862351bbfb09 100644
--- a/components/user-mgt/org.wso2.carbon.role.mgt.ui/src/main/resources/META-INF/component.xml
+++ b/components/user-mgt/org.wso2.carbon.role.mgt.ui/src/main/resources/META-INF/component.xml
@@ -48,11 +48,11 @@
     </menus>
 
     <servlets>
-        <servlet id="UserAndRoleMgt">
-            <servlet-name>userandrolemgtservice</servlet-name>
-            <url-pattern>/userandrolemgtservice</url-pattern>
+        <servlet id="RoleMgt">
+            <servlet-name>rolemgtservice</servlet-name>
+            <url-pattern>/rolemgtservice</url-pattern>
             <display-name>RoleManagement</display-name>
-            <servlet-class>org.wso2.carbon.role.mgt.ui.servlet.UserAndRoleManagementServlet</servlet-class>
+            <servlet-class>org.wso2.carbon.role.mgt.ui.servlet.RoleManagementServlet</servlet-class>
         </servlet>
     </servlets>