community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

Browse Source
This commit is contained in:
prabathabey 2016-07-18 11:48:24 +05:30
commit 50a2e4733b
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
View File

@ -56,7 +56,7 @@
org.osgi.service.component,
org.apache.commons.logging,
javax.security.auth.x500,
javax.xml.parsers,
javax.xml.*,
org.apache.commons.codec.binary,
org.bouncycastle.asn1,
org.bouncycastle.asn1.x500,

4
components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
View File

@ -121,9 +121,7 @@
org.wso2.carbon.registry.common.*;version="${carbon.registry.imp.pkg.version.range}",
org.wso2.carbon.registry.indexing.*; version="${carbon.registry.imp.pkg.version.range}",
org.json;version="${commons-json.version}",
javax.xml.bind,
javax.xml.bind.annotation,
javax.xml.parsers,
javax.xml.*,
org.w3c.dom,
org.wso2.carbon.base
</Import-Package>

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
View File

@ -115,7 +115,7 @@ public class OperationManagerImpl implements OperationManager {
org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status.PENDING,
org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status.REPEATED);
}
operationMappingDAO.addOperationMapping(operationId, device.getId());
operationMappingDAO.addOperationMapping(operationId, device.getEnrolmentInfo().getId());
if (notificationStrategy != null) {
try {
notificationStrategy.execute(new NotificationContext(deviceId, operation));

3
components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
View File

@ -60,8 +60,7 @@
javax.sql,
javax.cache,
javax.naming,
javax.xml.bind.*,
javax.xml.parsers.*,
javax.xml.*,
org.w3c.dom,
org.wso2.carbon.policy.mgt.common.*,
org.wso2.carbon.user.core.*,