community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

service api changes

Browse Source
This commit is contained in:
Rasika 2015-06-06 22:44:25 +05:30
parent 2b2ce0f35b
commit ae3a134f87
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/distribution/src/assembly/bin.xml
View File

@ -277,7 +277,9 @@
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
<includes>
<include>iotdevices.war</include>
<include>devicecloud.war</include>
<include>firealarm.war</include>
<include>sensebot.war</include>
</includes>
</fileSet>

18
modules/distribution/src/repository/jaggeryapps/iot/api/device-api.jag
View File

@ -33,17 +33,20 @@ var result;
if (uriMatcher.match("/{context}/api/device/sketch/")) {
sketchType = request.getParameter("type");
if(!sketchType){log.error("Sketch Type is empty");}
if (!sketchType) {
log.error("Sketch Type is empty");
}
var user = session.get(constants.USER_SESSION_KEY);
if(!user){
if (!user) {
response.sendRedirect(dcProps.appContext + "login?#login-required");
exit();
}
//URL: /iotdevices/FireAlarmManager/device/firealarm/download
fireAlarmManagerService = carbonHttpsServletTransport + "/iotdevices/FireAlarmManager";
sketchDownloadEndPoint = fireAlarmManagerService + "/downloadSketch";
response.sendRedirect(sketchDownloadEndPoint + "?type="+sketchType+"&owner="+user.username);
sketchDownloadEndPoint = fireAlarmManagerService + "/device/" + sketchType + "/download";
response.sendRedirect(sketchDownloadEndPoint + "?owner=" + user.username);
exit();
}
@ -52,17 +55,18 @@ if (uriMatcher.match("/{context}/api/devices/")) {
var constants = require("/modules/constants.js");
var user = session.get(constants.USER_SESSION_KEY);
if(!user){
if (!user) {
response.sendRedirect(dcProps.appContext + "login?#login-required");
exit();
}
//URL: /iotdevices/DevicesManager/devices/username
devicesManagerService = carbonHttpsServletTransport + "/iotdevices/DevicesManager";
listAllDevicesEndPoint = devicesManagerService + "/getDevices";
listAllDevicesEndPoint = devicesManagerService + "/devices/" + user.username;
var data = {};
//XMLHTTPRequest's GET
result = get(listAllDevicesEndPoint+"?username="+user.username, data ,"json");
result = get(listAllDevicesEndPoint, data, "json");
//response.sendRedirect(listAllDevicesEndPoint + "?username="+user.username);
//exit();

10
modules/distribution/src/repository/jaggeryapps/sensebot/api/device-api.jag
View File

@ -27,15 +27,19 @@ var dcProps = require('/config/dc-props.js').config();
var downloadModule = require("/modules/download.js").downloadModule;
var utility = require("/modules/utility.js").utility;
var carbon = require('carbon');
var carbonHttpServletTransport = carbon.server.address('http');
var carbonHttpsServletTransport = carbon.server.address('https');
var result;
if (uriMatcher.match("/{context}/api/device/sketch/")) {
sketchType = request.getParameter("type");
if(!sketchType){log.error("Sketch Type is empty");}
senseBotManagerService = "http://localhost:9763/iotdevices/SenseBotManager";
sketchDownloadEndPoint = senseBotManagerService + "/downloadSketch";
response.sendRedirect(sketchDownloadEndPoint + "?type="+sketchType+"&owner=anonymous");
senseBotManagerService = carbonHttpsServletTransport+"/iotdevices/SenseBotManager";
sketchDownloadEndPoint = senseBotManagerService + "/downloadSketch/device/";
response.sendRedirect(sketchDownloadEndPoint + sketchType + "?owner=anonymous");
exit();
}

10
pom.xml
View File

@ -1008,16 +1008,6 @@
</releases>
</repository>
<repository>
<id>wso2-staging</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/orgwso2carbonapimgt-009/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
</repositories>
</project>