From 5f90587564d1a3f006c5047cc58f5de883b46aa3 Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Tue, 20 Sep 2016 18:13:53 +0530
Subject: [PATCH] Synching with master

---
 .../org.wso2.carbon.certificate.mgt.core/pom.xml          | 5 +++++
 .../mgt/core/service/DeviceManagementProviderService.java | 3 +++
 pom.xml                                                   | 8 ++++++++
 3 files changed, 16 insertions(+)

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 7fd3679c50..5e0f433144 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
@@ -181,6 +181,11 @@
             <groupId>org.wso2.carbon.registry</groupId>
             <artifactId>org.wso2.carbon.registry.indexing</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
index 06ae1c875f..943634f1c5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
@@ -25,6 +25,7 @@ import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 
+import java.util.HashMap;
 import java.util.Date;
 import java.util.List;
 
@@ -208,6 +209,8 @@ public interface DeviceManagementProviderService {
 
     Device getDevice(DeviceIdentifier deviceId, Date since) throws DeviceManagementException;
 
+    HashMap<Integer, Device> getTenantedDevice(DeviceIdentifier deviceIdentifier) throws DeviceManagementException;
+
     Device getDevice(DeviceIdentifier deviceId, EnrolmentInfo.Status status) throws DeviceManagementException;
 
     List<String> getAvailableDeviceTypes() throws DeviceManagementException;
diff --git a/pom.xml b/pom.xml
index 02aab90e58..112f715979 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1520,6 +1520,11 @@
                 <artifactId>javax.servlet.jsp-api</artifactId>
                 <version>${servelet.jsp.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>${slf4j.simple.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1898,6 +1903,9 @@
         <orbit.version.pdfbox>1.8.10.wso2v2</orbit.version.pdfbox>
         <carbon.throttle.module.version>4.2.1</carbon.throttle.module.version>
         <javax.xml.soap.imp.pkg.version>[1.0.0, 1.1.0)</javax.xml.soap.imp.pkg.version>
+
+        <!-- apache pdfbox version -->
+        <slf4j.simple.version>1.6.1</slf4j.simple.version>
     </properties>
 
 </project>