From bbf71392ba6cf3ce65fd6aa2a50f5bb472d53e55 Mon Sep 17 00:00:00 2001
From: Amalka Subasinghe <amalka.subasinghe>
Date: Mon, 15 May 2023 22:55:47 +0530
Subject: [PATCH] fix issues related to uem test failures

---
 distribution/uem-community/src/conf/deployment.toml |  8 ++++----
 uem-core/pom.xml                                    |  4 ++--
 uem-core/src/core/conf/deployment.toml              | 10 +++++-----
 uem-core/src/core/conf/tomcat/context.xml           |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/distribution/uem-community/src/conf/deployment.toml b/distribution/uem-community/src/conf/deployment.toml
index 84594e5..a8e4332 100644
--- a/distribution/uem-community/src/conf/deployment.toml
+++ b/distribution/uem-community/src/conf/deployment.toml
@@ -109,7 +109,7 @@ auth_token = ""
 #pool.max_idle = 100
 #key_validation_handler_type = "default"
 #key_validation_handler_type = "custom"
-key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.extension.KeyValidationHandler"
+key_validation_handler_impl = "io.entgra.device.mgt.core.apimgt.keymgt.extension.KeyValidationHandler"
 
 #[apim.idp]
 #server_url = "https://localhost:${mgt.transport.https.port}"
@@ -265,12 +265,12 @@ maxHttpHeaderSize="16384"
 maxHttpHeaderSize="16384"
 
 [oauth.grant_type.jwt_bearer]
-grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.ExtendedJWTGrantHandler"
+grant_handler="io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.ExtendedJWTGrantHandler"
 
 [[oauth.custom_grant_type]]
 name="access_token"
-grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler"
-grant_validator="org.wso2.carbon.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator"
+grant_handler="io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler"
+grant_validator="io.entgra.device.mgt.core.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator"
 
 [oauth.token_renewal]
 renew_refresh_token=false
diff --git a/uem-core/pom.xml b/uem-core/pom.xml
index 03c6225..fa10e7d 100644
--- a/uem-core/pom.xml
+++ b/uem-core/pom.xml
@@ -186,7 +186,7 @@
                                 <property name="db.dir" value="target/${wso2am}/repository/database" />
                                 <property name="userid" value="wso2carbon" />
                                 <property name="password" value="wso2carbon" />
-                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
+                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
 
                                 <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
                                     <classpath refid="maven.dependency.classpath" />
@@ -213,7 +213,7 @@
                                 <property name="db.dir" value="target/${wso2am}/repository/database" />
                                 <property name="userid" value="wso2carbon" />
                                 <property name="password" value="wso2carbon" />
-                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
+                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
 
                                 <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
                                     <classpath refid="maven.dependency.classpath" />
diff --git a/uem-core/src/core/conf/deployment.toml b/uem-core/src/core/conf/deployment.toml
index 964acbf..15f4538 100644
--- a/uem-core/src/core/conf/deployment.toml
+++ b/uem-core/src/core/conf/deployment.toml
@@ -105,7 +105,7 @@ config_endpoint = "https://localhost:8080/auth/v1"
 auth_token = ""
 
 [web_app.listener]
-class_name = ["org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener", "org.wso2.carbon.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"]
+class_name = ["io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener", "io.entgra.device.mgt.core.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"]
 
 [apim.key_manager]
 #service_url = "https://localhost:${mgt.transport.https.port}/services/"
@@ -115,7 +115,7 @@ class_name = ["org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPub
 #pool.max_idle = 100
 #key_validation_handler_type = "default"
 #key_validation_handler_type = "custom"
-key_validation_handler_impl = "org.wso2.carbon.apimgt.keymgt.extension.KeyValidationHandler"
+key_validation_handler_impl = "io.entgra.device.mgt.core.apimgt.keymgt.extension.KeyValidationHandler"
 
 #[apim.idp]
 #server_url = "https://localhost:${mgt.transport.https.port}"
@@ -271,12 +271,12 @@ maxHttpHeaderSize="16384"
 maxHttpHeaderSize="16384"
 
 [oauth.grant_type.jwt_bearer]
-grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.ExtendedJWTGrantHandler"
+grant_handler="io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.ExtendedJWTGrantHandler"
 
 [[oauth.custom_grant_type]]
 name="access_token"
-grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler"
-grant_validator="org.wso2.carbon.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator"
+grant_handler="io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler"
+grant_validator="io.entgra.device.mgt.core.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator"
 
 [oauth.token_renewal]
 renew_refresh_token=false
diff --git a/uem-core/src/core/conf/tomcat/context.xml b/uem-core/src/core/conf/tomcat/context.xml
index dcca984..b0c3dcb 100644
--- a/uem-core/src/core/conf/tomcat/context.xml
+++ b/uem-core/src/core/conf/tomcat/context.xml
@@ -47,7 +47,7 @@
 	 'managed-api-isSecured'  - Indicates if the 'Managed API' needs to be exposed over a secured channel.
 	 'managed-api-transports' - Transports through which the 'Managed API' is exposed.
      -->
-    <Listener className="org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener"/>
+    <Listener className="io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener"/>
 
     <!-- WebAppDeploymentLifecycleListener listens to webapp deployment events and adds the custom permissions defined in webapps'
         META-INF/permissions.xml to the permissions/admin section of registry. Given below is a sample of permissions.xml file.
@@ -71,5 +71,5 @@
             </Permission>
     </PermissionConfiguration>
      -->
-    <Listener className="org.wso2.carbon.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"/>
+    <Listener className="io.entgra.device.mgt.core.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"/>
 </Context>