From bf6b4bcb31e79f85e1db3af0fd36e6f3d8c3be91 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Fri, 5 Jun 2015 19:06:29 +0530 Subject: [PATCH 1/2] refactored --- modules/p2-profile-gen/pom.xml | 14 +++++--------- pom.xml | 4 ++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 39c91c40..4c89536b 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -117,11 +117,7 @@ - - - + @@ -300,9 +296,9 @@ org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.wso2.version} - - - org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.feature:1.9.2-SNAPSHOT + + + org.wso2.carbon.device.mgt.iot:org.wso2.carbon.device.mgt.iot.feature:1.0.0-SNAPSHOT @@ -578,7 +574,7 @@ org.wso2.carbon.device.mgt.iot.feature.group - 1.9.2-SNAPSHOT + 1.0.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 793ceeb8..681eeaec 100644 --- a/pom.xml +++ b/pom.xml @@ -784,8 +784,8 @@ 0.9.2-SNAPSHOT [0.8.0, 2.0.0) - - 1.9.2-SNAPSHOT + + 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT From 52200f68e029a9bfc4fbe96a6566ffe5986d7f52 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Sat, 6 Jun 2015 00:30:57 +0530 Subject: [PATCH 2/2] Refactor product device cloud --- modules/distribution/src/assembly/bin.xml | 22 ++++++++++++++++++- .../jaggeryapps/iot/api/device-api.jag | 4 ++-- .../jaggeryapps/sensebot/api/device-api.jag | 2 +- .../firealarm/FireAlarmEthernetAgent.h | 2 +- .../firealarm_wifi/FireAlarmWifiAgent.h | 2 +- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 3d5566c0..075a6732 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -277,7 +277,27 @@ ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps - iotdevices.war + firealarm.war + + + + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps + + ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps + + sensebot.war + + + + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps + + ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps + + devicecloud.war diff --git a/modules/distribution/src/repository/jaggeryapps/iot/api/device-api.jag b/modules/distribution/src/repository/jaggeryapps/iot/api/device-api.jag index e8a48ea0..a6132daa 100644 --- a/modules/distribution/src/repository/jaggeryapps/iot/api/device-api.jag +++ b/modules/distribution/src/repository/jaggeryapps/iot/api/device-api.jag @@ -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 = {}; diff --git a/modules/distribution/src/repository/jaggeryapps/sensebot/api/device-api.jag b/modules/distribution/src/repository/jaggeryapps/sensebot/api/device-api.jag index 0a5c8ef4..034a4eee 100644 --- a/modules/distribution/src/repository/jaggeryapps/sensebot/api/device-api.jag +++ b/modules/distribution/src/repository/jaggeryapps/sensebot/api/device-api.jag @@ -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(); diff --git a/modules/distribution/src/sketches/firealarm/FireAlarmEthernetAgent.h b/modules/distribution/src/sketches/firealarm/FireAlarmEthernetAgent.h index bd4c28e5..ba97ed8a 100755 --- a/modules/distribution/src/sketches/firealarm/FireAlarmEthernetAgent.h +++ b/modules/distribution/src/sketches/firealarm/FireAlarmEthernetAgent.h @@ -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":""} diff --git a/modules/distribution/src/sketches/firealarm_wifi/FireAlarmWifiAgent.h b/modules/distribution/src/sketches/firealarm_wifi/FireAlarmWifiAgent.h index b71dcc0a..ef322104 100755 --- a/modules/distribution/src/sketches/firealarm_wifi/FireAlarmWifiAgent.h +++ b/modules/distribution/src/sketches/firealarm_wifi/FireAlarmWifiAgent.h @@ -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":""}