From c5a997b1bf7f1ef18d877607732c054bf61a6d2a Mon Sep 17 00:00:00 2001 From: ayyoob Date: Mon, 6 Jun 2016 10:42:31 +0530 Subject: [PATCH 1/2] added missing imports --- .../org.wso2.carbon.webapp.authenticator.framework/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml index d9bf6ff65ac..6893eb1e886 100644 --- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml +++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml @@ -121,6 +121,7 @@ org.wso2.carbon.registry.core.*, 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.wso2.carbon.base From bb051deebc88dfa25554dad651b23626ff627983 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Mon, 6 Jun 2016 13:55:05 +0530 Subject: [PATCH 2/2] added https url for jaggery app deployment server --- .../main/resources/jaggeryapps/devicemgt/app/conf/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json index dbf06d8af38..08ef8beef35 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json @@ -4,6 +4,7 @@ "apiContext" : "api", "httpsURL" : "https://localhost:8243", "httpURL" : "%http.ip%", + "httpsWebURL" : "%https.ip%", "wssURL" : "%https.ip%", "wsURL" : "%http.ip%", "enrollmentDir": "/emm-web-agent/enrollment",