community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor product device cloud

Browse Source
merge-requests/1/head
ayyoob 10 years ago
parent bf6b4bcb31
commit 52200f68e0
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File

22
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -277,7 +277,27 @@
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
<includes>
<include>iotdevices.war</include>
<include>firealarm.war</include>
</includes>
</fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
<includes>
<include>sensebot.war</include>
</includes>
</fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
<includes>
<include>devicecloud.war</include>
</includes>
</fileSet>

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

@ -41,7 +41,7 @@ if (uriMatcher.match("/{context}/api/device/sketch/")) {
exit();
}
fireAlarmManagerService = carbonHttpsServletTransport + "/iotdevices/FireAlarmManager";
fireAlarmManagerService = carbonHttpsServletTransport + "/firealarm/manager";
sketchDownloadEndPoint = fireAlarmManagerService + "/downloadSketch";
response.sendRedirect(sketchDownloadEndPoint + "?type="+sketchType+"&owner="+user.username);
exit();
@ -57,7 +57,7 @@ if (uriMatcher.match("/{context}/api/devices/")) {
exit();
}
devicesManagerService = carbonHttpsServletTransport + "/iotdevices/DevicesManager";
devicesManagerService = carbonHttpsServletTransport + "/devicecloud/manager";
listAllDevicesEndPoint = devicesManagerService + "/getDevices";
var data = {};

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

@ -33,7 +33,7 @@ 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";
senseBotManagerService = "http://localhost:9763/sensebot/manager";
sketchDownloadEndPoint = senseBotManagerService + "/downloadSketch";
response.sendRedirect(sketchDownloadEndPoint + "?type="+sketchType+"&owner=anonymous");
exit();

2
modules/distribution/src/sketches/firealarm/FireAlarmEthernetAgent.h
Unescape View File

@ -30,7 +30,7 @@
#define END_JSON "\"}"
#define SERVICE_PORT 9763
#define SERVICE_EPOINT "/iotdevices/FireAlarmController/"
#define SERVICE_EPOINT "/firealarm/controller/"
// pushalarmdata - application/json - {"owner":"","deviceId":"","replyMessage":"","time":"","key":"","value":""}
// readcontrols/{owner}/{deviceId}
// reply - application/json - {"owner":"","deviceId":"","replyMessage":""}

2
modules/distribution/src/sketches/firealarm_wifi/FireAlarmWifiAgent.h
Unescape View File

@ -26,7 +26,7 @@
#define SERVICE_PORT 9763
#define SERVICE_EPOINT "/iotdevices/FireAlarmController/"
#define SERVICE_EPOINT "/firealarm/controller/"
// pushalarmdata - application/json - {"owner":"","deviceId":"","replyMessage":"","time":"","key":"","value":""}
// readcontrols/{owner}/{deviceId}
// reply - application/json - {"owner":"","deviceId":"","replyMessage":""}

Write Preview
Loading…
Cancel
Save