From 80f737822ee58edb256b4119440f6eecee93a867 Mon Sep 17 00:00:00 2001 From: mharindu Date: Fri, 15 Jul 2016 19:45:04 +0530 Subject: [PATCH 1/2] Fixed enrollment device mapping issue --- .../device/mgt/core/operation/mgt/OperationManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java index e0df04dfeeb..d60e60d0972 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java @@ -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)); From ca8859c80adb899b91a43b576c733aa0e794623b Mon Sep 17 00:00:00 2001 From: Ace Date: Mon, 18 Jul 2016 09:09:29 +0530 Subject: [PATCH 2/2] Fixing broken build due to new javax.xml imports --- .../org.wso2.carbon.certificate.mgt.core/pom.xml | 2 +- .../pom.xml | 4 +--- components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml index 2f9145d6a7d..98625933537 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml @@ -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, diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml index dde3a030194..82108eaab04 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml @@ -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 diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml index 3a56db21876..9c72336e9fc 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml @@ -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.*,