From 76b4953e3a9aee13716f3dbb1f5c9c1a6256a4fb Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Thu, 22 Aug 2019 18:29:56 +0530
Subject: [PATCH] Add device-mgt react ui feature

---
 .../io.entgra.device.mgt.ui/src/main/webapp/WEB-INF/web.xml     | 2 +-
 .../device/type/template/dao/DeviceTypeDAOHandler.java          | 2 +-
 .../src/main/resources/p2.inf                                   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/device-mgt/io.entgra.device.mgt.ui/src/main/webapp/WEB-INF/web.xml b/components/device-mgt/io.entgra.device.mgt.ui/src/main/webapp/WEB-INF/web.xml
index bd9f023aa96..d9fcd747a04 100644
--- a/components/device-mgt/io.entgra.device.mgt.ui/src/main/webapp/WEB-INF/web.xml
+++ b/components/device-mgt/io.entgra.device.mgt.ui/src/main/webapp/WEB-INF/web.xml
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
-    <display-name>Store-Webapp</display-name>
+    <display-name>Entgra-Webapp</display-name>
     <error-page>
         <error-code>404</error-code>
         <location>/index.html</location>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/DeviceTypeDAOHandler.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/DeviceTypeDAOHandler.java
index 417d0788688..f6598ed5b15 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/DeviceTypeDAOHandler.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/DeviceTypeDAOHandler.java
@@ -19,7 +19,7 @@ package org.wso2.carbon.device.mgt.extensions.device.type.template.dao;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.IllegalTransactionStateException;
+import org.wso2.carbon.device.mgt.common.exceptions.IllegalTransactionStateException;
 import org.wso2.carbon.device.mgt.extensions.device.type.template.exception.DeviceTypeDeployerPayloadException;
 import org.wso2.carbon.device.mgt.extensions.device.type.template.exception.DeviceTypeMgtPluginException;
 
diff --git a/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/p2.inf b/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/p2.inf
index 968f20887a0..6e7e6d01df8 100644
--- a/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/p2.inf
+++ b/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/p2.inf
@@ -2,3 +2,4 @@ instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/publisher-ui-request-handler.war,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/store-ui-request-handler.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/entgra-ui-request-handler.war,overwrite:true);\