Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim

8 years ago · de72cc21c6
parent 3858920d72 db56143fa3
commit de72cc21c6
2 changed files with 2 additions and 0 deletions
--- 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:9443",
  "httpURL" : "%http.ip%",
+  "httpsWebURL" : "%https.ip%",
  "wssURL" : "%https.ip%",
  "wsURL" : "%http.ip%",
  "enrollmentDir": "/emm-web-agent/enrollment",
--- 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
                        </Import-Package>
                    </instructions>
                </configuration>