tcdlpds
/
product-uem-community
forked from community/product-uem-community
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issues related to uem test failures

Browse Source
master
Amalka Subasinghe 2 years ago
parent cdf4e073be
commit bbf71392ba
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

8
distribution/uem-community/src/conf/deployment.toml
Unescape View File

@ -109,7 +109,7 @@ auth_token = ""
#pool.max_idle = 100 #pool.max_idle = 100
#key_validation_handler_type = "default" #key_validation_handler_type = "default"
#key_validation_handler_type = "custom" #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] #[apim.idp]
#server_url = "https://localhost:${mgt.transport.https.port}" #server_url = "https://localhost:${mgt.transport.https.port}"
@ -265,12 +265,12 @@ maxHttpHeaderSize="16384"
maxHttpHeaderSize="16384" maxHttpHeaderSize="16384"
[oauth.grant_type.jwt_bearer] [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]] [[oauth.custom_grant_type]]
name="access_token" name="access_token"
grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler" grant_handler="io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler"
grant_validator="org.wso2.carbon.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator" grant_validator="io.entgra.device.mgt.core.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator"
[oauth.token_renewal] [oauth.token_renewal]
renew_refresh_token=false renew_refresh_token=false

4
uem-core/pom.xml
Unescape View File

@ -186,7 +186,7 @@
<property name="db.dir" value="target/${wso2am}/repository/database" /> <property name="db.dir" value="target/${wso2am}/repository/database" />
<property name="userid" value="wso2carbon" /> <property name="userid" value="wso2carbon" />
<property name="password" 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"> <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" /> <classpath refid="maven.dependency.classpath" />
@ -213,7 +213,7 @@
<property name="db.dir" value="target/${wso2am}/repository/database" /> <property name="db.dir" value="target/${wso2am}/repository/database" />
<property name="userid" value="wso2carbon" /> <property name="userid" value="wso2carbon" />
<property name="password" 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"> <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" /> <classpath refid="maven.dependency.classpath" />

10
uem-core/src/core/conf/deployment.toml
Unescape View File

@ -105,7 +105,7 @@ config_endpoint = "https://localhost:8080/auth/v1"
auth_token = "" auth_token = ""
[web_app.listener] [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] [apim.key_manager]
#service_url = "https://localhost:${mgt.transport.https.port}/services/" #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 #pool.max_idle = 100
#key_validation_handler_type = "default" #key_validation_handler_type = "default"
#key_validation_handler_type = "custom" #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] #[apim.idp]
#server_url = "https://localhost:${mgt.transport.https.port}" #server_url = "https://localhost:${mgt.transport.https.port}"
@ -271,12 +271,12 @@ maxHttpHeaderSize="16384"
maxHttpHeaderSize="16384" maxHttpHeaderSize="16384"
[oauth.grant_type.jwt_bearer] [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]] [[oauth.custom_grant_type]]
name="access_token" name="access_token"
grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler" grant_handler="io.entgra.device.mgt.core.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler"
grant_validator="org.wso2.carbon.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator" grant_validator="io.entgra.device.mgt.core.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator"
[oauth.token_renewal] [oauth.token_renewal]
renew_refresh_token=false renew_refresh_token=false

4
uem-core/src/core/conf/tomcat/context.xml
Unescape View File

@ -47,7 +47,7 @@
'managed-api-isSecured' - Indicates if the 'Managed API' needs to be exposed over a secured channel. '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. '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' <!-- 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. 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> </Permission>
</PermissionConfiguration> </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> </Context>

Write Preview
Loading…
Cancel
Save