From 9d5061230c87b5be023e3963776cd64e4f0e45e2 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Tue, 10 Jan 2017 09:27:10 +0530
Subject: [PATCH 1/3] fixing test failures (cherry picked from commit ac8dae7)

---
 .../src/test/resources/testng.xml                               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
index b30b66cb78..32c9dca57d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
@@ -31,7 +31,7 @@
             <class name="org.wso2.carbon.device.mgt.core.DeviceManagementConfigTests"/>
             <class name="org.wso2.carbon.device.mgt.core.app.mgt.AppManagementConfigurationManagerTest"/>
             <class name="org.wso2.carbon.device.mgt.core.dao.ApplicationPersistenceTests"/>
-            <class name="org.wso2.carbon.device.mgt.core.search.DeviceDetails"/>
+            <class name="org.wso2.carbon.device.mgt.core.Search.DeviceDetails"/>
             <!--<class name="org.wso2.carbon.device.mgt.core.search.SearchDevice"/>-->
             <class name="org.wso2.carbon.device.mgt.core.dao.GroupPersistTests"/>
             </classes>

From 819074833f88520a245db67f57d38eb846771ac8 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Tue, 10 Jan 2017 03:09:42 +0530
Subject: [PATCH 2/3] added missing components (cherry picked from commit
 b35e0dd)

---
 .../pom.xml                                               | 7 +++++++
 .../device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml | 5 +++++
 pom.xml                                                   | 8 ++++++++
 3 files changed, 20 insertions(+)

diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
index 0cc36fe99e..8c8d0665d6 100644
--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
@@ -48,6 +48,10 @@
             <groupId>org.wso2.orbit.org.scannotation</groupId>
             <artifactId>scannotation</artifactId>
         </dependency>
+		<dependency>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-annotations</artifactId>
+		</dependency>
     </dependencies>
 
     <build>
@@ -137,6 +141,9 @@
                                 <bundleDef>
                                     org.wso2.orbit.org.scannotation:scannotation:${scannotation.version}
                                 </bundleDef>
+								<bundleDef>
+									io.swagger:swagger-annotations:${swagger.version}
+								</bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
index 3ba32fa1bc..ee5fa7b255 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
@@ -48,6 +48,10 @@
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>javax.servlet.jsp-api</artifactId>
         </dependency>
+		<dependency>
+			<groupId>org.wso2.carbon.store</groupId>
+			<artifactId>org.wso2.store.sso.common</artifactId>
+		</dependency>
     </dependencies>
 
     <build>
@@ -76,6 +80,7 @@
                             </includedFeatures>
                             <bundles>
                                 <bundleDef>javax.servlet.jsp:javax.servlet.jsp-api</bundleDef>
+								<bundleDef>org.wso2.carbon.store:org.wso2.store.sso.common:${carbon.store.sso.common.version}</bundleDef>
                             </bundles>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index e9339f6644..76fb99e3b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1664,6 +1664,11 @@
                 <artifactId>wss4j</artifactId>
                 <version>${org.apache.ws.security.wso2.version}</version>
             </dependency>
+			<dependency>
+				<groupId>org.wso2.carbon.store</groupId>
+				<artifactId>org.wso2.store.sso.common</artifactId>
+				<version>${carbon.store.sso.common.version}</version>
+			</dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -2059,6 +2064,9 @@
         <!-- api-mgt handler version properties -->
         <org.apache.synapse.version>2.1.7-wso2v7</org.apache.synapse.version>
         <org.apache.ws.security.wso2.version>1.5.11.wso2v15</org.apache.ws.security.wso2.version>
+
+		<!--carbon store version-->
+		<carbon.store.sso.common.version>1.4.4</carbon.store.sso.common.version>
     </properties>
 
 </project>

From cb7ff7f66a1200472a4dc3b72d49a73220724352 Mon Sep 17 00:00:00 2001
From: charitha <charitha.ws@gmail.com>
Date: Tue, 10 Jan 2017 10:18:28 +0530
Subject: [PATCH 3/3] Change package name to lower case

---
 .../device/mgt/core/{Search => search}/DeviceDetails.java       | 0
 .../carbon/device/mgt/core/{Search => search}/SearchDevice.java | 0
 .../carbon/device/mgt/core/{Search => search}/util/Utils.java   | 0
 .../src/test/resources/testng.xml                               | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/{Search => search}/DeviceDetails.java (100%)
 rename components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/{Search => search}/SearchDevice.java (100%)
 rename components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/{Search => search}/util/Utils.java (100%)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/Search/DeviceDetails.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/DeviceDetails.java
similarity index 100%
rename from components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/Search/DeviceDetails.java
rename to components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/DeviceDetails.java
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/Search/SearchDevice.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/SearchDevice.java
similarity index 100%
rename from components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/Search/SearchDevice.java
rename to components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/SearchDevice.java
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/Search/util/Utils.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/util/Utils.java
similarity index 100%
rename from components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/Search/util/Utils.java
rename to components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/util/Utils.java
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
index 32c9dca57d..b30b66cb78 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
@@ -31,7 +31,7 @@
             <class name="org.wso2.carbon.device.mgt.core.DeviceManagementConfigTests"/>
             <class name="org.wso2.carbon.device.mgt.core.app.mgt.AppManagementConfigurationManagerTest"/>
             <class name="org.wso2.carbon.device.mgt.core.dao.ApplicationPersistenceTests"/>
-            <class name="org.wso2.carbon.device.mgt.core.Search.DeviceDetails"/>
+            <class name="org.wso2.carbon.device.mgt.core.search.DeviceDetails"/>
             <!--<class name="org.wso2.carbon.device.mgt.core.search.SearchDevice"/>-->
             <class name="org.wso2.carbon.device.mgt.core.dao.GroupPersistTests"/>
             </classes>