community
/
device-mgt-core
12
0
Fork 46
Code Issues Pull Requests 26 Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into sync-master

Browse Source
pull/261/head
Pasindu Rupasinghe 1 year ago
parent a46ab4c355 ae5bcf4f8a
commit 383eed95e8
4 changed files with 64 additions and 72 deletions
Show Stats Download Patch File Download Diff File

20
components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml
Unescape View File

@ -203,25 +203,7 @@
org.wso2.carbon.user.api, org.wso2.carbon.user.api,
org.wso2.carbon.user.core.service;version="[4.8,5)", org.wso2.carbon.user.core.service;version="[4.8,5)",
org.wso2.carbon.user.core.tenant;version="[4.8,5)", org.wso2.carbon.user.core.tenant;version="[4.8,5)",
org.wso2.carbon.utils;version="[4.8,5)", org.wso2.carbon.utils;version="[4.8,5)"
io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.listener,
io.entgra.device.mgt.core.apimgt.webapp.publisher.lifecycle.util,
io.entgra.device.mgt.core.device.mgt.common.exceptions,
io.entgra.device.mgt.core.device.mgt.common.metadata.mgt,
io.entgra.device.mgt.core.device.mgt.core.config,
io.entgra.device.mgt.core.device.mgt.core.config.permission,
org.wso2.carbon.base;version="1.0",
org.wso2.carbon;version="4.6",
org.wso2.carbon.core;version="4.6",
org.wso2.carbon.core.util;version="4.6",
org.wso2.carbon.registry.core.service;version="1.0",
org.wso2.carbon.user.api;version="1.0",
org.wso2.carbon.user.core.service;version="4.6",
org.wso2.carbon.user.core.tenant;version="4.6",
org.wso2.carbon.utils;version="4.6",
org.wso2.carbon.utils.multitenancy;version="4.6",
org.apache.commons.lang,
org.json
</Import-Package> </Import-Package>
<Embed-Dependency> <Embed-Dependency>
jsr311-api;scope=compile|runtime;inline=false jsr311-api;scope=compile|runtime;inline=false

11
components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherServiceImpl.java
Unescape View File

@ -175,7 +175,7 @@ public class APIPublisherServiceImpl implements APIPublisherService {
scope.setDisplayName(apiScope.getName()); scope.setDisplayName(apiScope.getName());
scope.setDescription(apiScope.getDescription()); scope.setDescription(apiScope.getDescription());
scope.setName(apiScope.getKey()); scope.setName(apiScope.getKey());
List<String> bindings = apiScope.getRoles(); List<String> bindings = new ArrayList<>(apiScope.getRoles());
bindings.add(ADMIN_ROLE_KEY); bindings.add(ADMIN_ROLE_KEY);
scope.setBindings(bindings); scope.setBindings(bindings);
publisherRESTAPIServices.addNewSharedScope(apiApplicationKey, accessTokenInfo, scope); publisherRESTAPIServices.addNewSharedScope(apiApplicationKey, accessTokenInfo, scope);
@ -252,7 +252,7 @@ public class APIPublisherServiceImpl implements APIPublisherService {
scope.setName(apiScope.getKey()); scope.setName(apiScope.getKey());
scope.setDescription(apiScope.getDescription()); scope.setDescription(apiScope.getDescription());
scope.setDisplayName(apiScope.getName()); scope.setDisplayName(apiScope.getName());
List<String> bindings = apiScope.getRoles(); List<String> bindings = new ArrayList<>(apiScope.getRoles());
bindings.add(ADMIN_ROLE_KEY); bindings.add(ADMIN_ROLE_KEY);
scope.setBindings(bindings); scope.setBindings(bindings);
publisherRESTAPIServices.addNewSharedScope(apiApplicationKey, accessTokenInfo, scope); publisherRESTAPIServices.addNewSharedScope(apiApplicationKey, accessTokenInfo, scope);
@ -275,7 +275,7 @@ public class APIPublisherServiceImpl implements APIPublisherService {
scope.setName(apiScope.getKey()); scope.setName(apiScope.getKey());
scope.setDescription(apiScope.getDescription()); scope.setDescription(apiScope.getDescription());
scope.setDisplayName(apiScope.getName()); scope.setDisplayName(apiScope.getName());
List<String> bindings = apiScope.getRoles(); List<String> bindings = new ArrayList<>(apiScope.getRoles());
bindings.add(ADMIN_ROLE_KEY); bindings.add(ADMIN_ROLE_KEY);
scope.setBindings(bindings); scope.setBindings(bindings);
publisherRESTAPIServices.addNewSharedScope(apiApplicationKey, accessTokenInfo, scope); publisherRESTAPIServices.addNewSharedScope(apiApplicationKey, accessTokenInfo, scope);
@ -452,10 +452,9 @@ public class APIPublisherServiceImpl implements APIPublisherService {
//todo check whether scope is available or not //todo check whether scope is available or not
ScopeMapping scopeMapping = defaultPermission.getScopeMapping(); ScopeMapping scopeMapping = defaultPermission.getScopeMapping();
String[] roles = scopeMapping.getDefaultRoles().split(","); List<String> bindings = new ArrayList<>(
List<String> bindings = Arrays.asList(roles); Arrays.asList(scopeMapping.getDefaultRoles().split(",")));
bindings.add(ADMIN_ROLE_KEY); bindings.add(ADMIN_ROLE_KEY);
scope.setName(scopeMapping.getKey()); scope.setName(scopeMapping.getKey());
scope.setDescription(scopeMapping.getName()); scope.setDescription(scopeMapping.getName());
scope.setDisplayName(scopeMapping.getName()); scope.setDisplayName(scopeMapping.getName());

77
components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml
Unescape View File

@ -57,11 +57,62 @@
io.entgra.device.mgt.core.certificate.mgt.core.util io.entgra.device.mgt.core.certificate.mgt.core.util
</Private-Package> </Private-Package>
<Import-Package> <Import-Package>
org.osgi.framework.*;version="${imp.package.version.osgi.framework}", <!-- org.osgi.framework.*;version="${imp.package.version.osgi.framework}",-->
org.osgi.service.*;version="${imp.package.version.osgi.service}", <!-- org.osgi.service.*;version="${imp.package.version.osgi.service}",-->
org.apache.commons.lang, <!-- org.apache.commons.lang,-->
org.apache.commons.logging, <!-- org.apache.commons.logging,-->
org.apache.commons.collections.map, <!-- org.apache.commons.collections.map,-->
<!-- io.entgra.device.mgt.core.certificate.mgt.core.*,-->
<!-- io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)",-->
<!-- io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)",-->
<!-- io.entgra.device.mgt.core.device.mgt.core.config;version="[5.0,6)",-->
<!-- io.entgra.device.mgt.core.device.mgt.core.config.cache;version="[5.0,6)",-->
<!-- io.entgra.device.mgt.core.device.mgt.core.service;version="[5.0,6)",-->
<!-- io.swagger.annotations;version="[1.6,2)",-->
<!-- javax.cache;version="[1.0,2)",-->
<!-- javax.naming,-->
<!-- javax.naming.ldap,-->
<!-- javax.security.auth.x500,-->
<!-- javax.xml.bind;version="[0.0,1)",-->
<!-- javax.xml.bind.annotation;version="[0.0,1)",-->
<!-- javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}",-->
<!-- org.apache.commons.codec.binary;version="[1.4,2)",-->
<!-- org.apache.commons.collections.map;version="[3.2,4)",-->
<!-- org.apache.commons.logging;version="[1.2,2)",-->
<!-- org.bouncycastle.asn1;version="[1.70,2)",-->
<!-- org.bouncycastle.asn1.pkcs;version="[1.70,2)",-->
<!-- org.bouncycastle.asn1.x500;version="[1.70,2)",-->
<!-- org.bouncycastle.asn1.x500.style;version="[1.70,2)",-->
<!-- org.bouncycastle.asn1.x509;version="[1.70,2)",-->
<!-- org.bouncycastle.cert;version="[1.70,2)",-->
<!-- org.bouncycastle.cert.jcajce;version="[1.70,2)",-->
<!-- org.bouncycastle.cms;version="[1.70,2)",-->
<!-- org.bouncycastle.jce.provider;version="[1.70,2)",-->
<!-- org.bouncycastle.operator;version="[1.70,2)",-->
<!-- org.bouncycastle.operator.jcajce;version="[1.70,2)",-->
<!-- org.bouncycastle.pkcs;version="[1.70,2)",-->
<!-- org.bouncycastle.util;version="[1.70,2)",-->
<!-- org.jscep.message,-->
<!-- org.jscep.transaction,-->
<!-- org.w3c.dom,-->
<!-- org.xml.sax,-->
<!-- javax.sql,-->
<!-- &lt;!&ndash;javax.cache,&ndash;&gt;-->
<!-- javax.naming,-->
<!-- javax.xml.bind.annotation,-->
<!-- javax.xml.bind,-->
<!-- org.wso2.carbon.utils.*,-->
<!--&lt;!&ndash; io.entgra.device.mgt.core.device.mgt.common.*,&ndash;&gt;-->
<!--&lt;!&ndash; io.swagger.annotations.*;resolution:=optional,&ndash;&gt;-->
<!--&lt;!&ndash; io.entgra.device.mgt.core.device.mgt.core.*,&ndash;&gt;-->
<!-- org.wso2.carbon.registry.indexing.*,-->
<!-- &lt;!&ndash;org.bouncycastle.pkcs.jcajce&ndash;&gt;-->
<!-- org.w3c.dom,org.wso2.carbon.context;version="[4.8,5)",-->
<!-- org.wso2.carbon.user.api;version="[1.0,2)",-->
<!-- org.wso2.carbon.user.core.service;version="[4.8,5)",-->
<!-- org.wso2.carbon.user.core.tenant;version="[4.8,5)",-->
<!-- org.wso2.carbon.utils;version="[4.8,5)",-->
<!-- org.wso2.carbon.utils.dbcreator;version="[4.8,5)"-->
io.entgra.device.mgt.core.certificate.mgt.core.*, io.entgra.device.mgt.core.certificate.mgt.core.*,
io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)",
io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)", io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)",
@ -95,22 +146,6 @@
org.bouncycastle.util;version="[1.70,2)", org.bouncycastle.util;version="[1.70,2)",
org.jscep.message, org.jscep.message,
org.jscep.transaction, org.jscep.transaction,
org.w3c.dom,
org.xml.sax,
javax.sql,
<!--javax.cache,-->
javax.naming,
javax.xml.bind.annotation,
javax.xml.bind,
org.wso2.carbon.utils.*,
io.entgra.device.mgt.core.device.mgt.common.*,
io.swagger.annotations.*;resolution:=optional,
io.entgra.device.mgt.core.device.mgt.core.*,
org.wso2.carbon.registry.indexing.*,
javax.cache.*,
javax.naming.ldap,
com.google.gson.*,
<!--org.bouncycastle.pkcs.jcajce-->
org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.w3c.dom,org.wso2.carbon.context;version="[4.8,5)", org.w3c.dom,org.wso2.carbon.context;version="[4.8,5)",

28
components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml
Unescape View File

@ -69,38 +69,14 @@
io.entgra.device.mgt.core.operation.template.impl, io.entgra.device.mgt.core.operation.template.impl,
io.entgra.device.mgt.core.operation.template.spi, io.entgra.device.mgt.core.operation.template.spi,
io.entgra.device.mgt.core.operation.template.util, io.entgra.device.mgt.core.operation.template.util,
javax.naming,
javax.sql, javax.sql,
javax.xml.bind;version="[2.3,3)", javax.xml.bind.*;version="${javax.xml.bind.imp.pkg.version}",
javax.xml.bind.annotation;version="[2.3,3)",
javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}", javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}",
org.apache.commons.lang;version="[2.4,3)", org.apache.commons.lang;version="[2.4,3)",
org.apache.commons.logging;version="[1.2,2)", org.apache.commons.logging;version="[1.2,2)",
org.osgi.framework.*;version="${imp.package.version.osgi.framework}", org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
org.osgi.service.*;version="${imp.package.version.osgi.service}", org.osgi.service.*;version="${imp.package.version.osgi.service}",
org.apache.commons.logging,
org.apache.commons.lang,
javax.xml,
javax.xml.stream,
javax.xml.bind.*;version="${javax.xml.bind.imp.pkg.version}",
<!-- javax.xml.parsers;version=0.0.0,-->
org.w3c.dom,
com.google.gson.*,
javax.naming,
org.wso2.carbon.context,
org.wso2.carbon.base,
org.wso2.carbon.utils.*,
io.entgra.device.mgt.core.device.mgt.common.*,
io.entgra.device.mgt.core.device.mgt.core.*,
org.wso2.carbon.ndatasource.core,
org.wso2.carbon.registry.core,
org.wso2.carbon.registry.core.session,
org.wso2.carbon.registry.core.service,
org.wso2.carbon.registry.api,
io.entgra.device.mgt.core.device.mgt.extensions.license.mgt.registry,
javax.net.ssl,
org.wso2.carbon.core.util,
okhttp3,
com.google.common.cache.*,
org.w3c.dom,org.wso2.carbon.ndatasource.core;version="[4.8,5)", org.w3c.dom,org.wso2.carbon.ndatasource.core;version="[4.8,5)",
org.wso2.carbon.registry.core.service;version="[1.0,2)", org.wso2.carbon.registry.core.service;version="[1.0,2)",
org.wso2.carbon.utils;version="[4.8,5)" org.wso2.carbon.utils;version="[4.8,5)"

Write Preview
Loading…
Cancel
Save