Merge pull request #167 from ayyoob/das-ext

added a configuration ui to connected cup

modules/distribution/src/repository/conf/etc/webapp-publisher-config.xml

@@ -24,7 +24,7 @@
 <WebappPublisherConfigs>
 
     <!-- This host is used to define the host address which is used to publish APIs -->
-    <Host>http://localhost:${carbon.http.port}</Host>
+    <Host>https://localhost:9443</Host>
 
     <!-- If it is true, the APIs of this instance will be published to the defined host -->
     <PublishAPI>true</PublishAPI>

modules/p2-profile-gen/pom.xml

@@ -2036,7 +2036,6 @@
                                     <version>${carbon.identity.version}</version>
                                 </feature>
 
-
                                 <!--required for context.xml-->
                                 <feature>
                                     <id>org.wso2.carbon.webapp.mgt.feature.group</id>

modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs

@@ -18,7 +18,7 @@
     <div class="add-margin-top-4x">
         <div class="add-margin-top-4x">
             <div class="buttons">
-                <a class="btn-operations" target="_blank"  href="https://{{../device.ip}}:9443/connected-cup-agent/index.jsp?deviceOwner={{@user.username}}&tenantDomain={{@user.domain}}&deviceId={{../device.deviceIdentifier}}&token={{../device.accessToken}}" >Go To Device</a>
+                <a class="btn-operations" target="_blank"  href="{{../device.ip}}/connected-cup-agent/index.jsp?deviceOwner={{@user.username}}&tenantDomain={{@user.domain}}&deviceId={{../device.deviceIdentifier}}&token={{../device.accessToken}}" >Go To Device</a>
             </div>
         </div>
     </div>

modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js

@@ -23,7 +23,7 @@ function onRequest(context) {
     var deviceId = request.getParameter("id");
 
     var property = require("process").getProperty;
-    var serverIp = property("carbon.local.ip");
+    var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
 
     if (deviceType != null && deviceType != undefined && deviceId != null && deviceId != undefined) {
         var deviceModule = require("/app/modules/device.js").deviceModule;
@@ -38,7 +38,7 @@ function onRequest(context) {
                 token =  tokenPair.accessToken;
             }
             device.accessToken = token;
-            device.ip = serverIp;
+            device.ip = devicemgtProps["httpsWebURL"];
             return {"device": device};
         }
     }

modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.js

@@ -21,7 +21,7 @@ function onRequest(context) {
     var device = context.unit.params.device;
     var devicemgtProps = require('/app/conf/devicemgt-props.js').config();
     var constants = require("/app/modules/constants.js");
-    var websocketEndpoint = devicemgtProps["httpsURL"].replace("https", "wss");
+    var websocketEndpoint = devicemgtProps["wssURL"].replace("https", "wss");
     var tokenPair = session.get(constants.ACCESS_TOKEN_PAIR_IDENTIFIER);
     var token = "";
     if (tokenPair) {

modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf

@@ -23,3 +23,5 @@ org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../con
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../database/ConnectedCupDM_DB.h2.db);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view);\