Commit Graph

454 Commits

Author SHA1 Message Date
Shabirmean
e9d08faa6c added changes to publish data received via MQTT and XMPP 2015-10-22 12:31:28 +05:30
charithag
928dd66ae3 License updated 2015-10-22 07:52:19 +05:30
charithag
36bf7a529a Redirect user to the login page upon successful registration 2015-10-22 06:51:53 +05:30
charithag
306646c51d Change virtual device "Download" button text to "Create a Device". 2015-10-22 06:50:55 +05:30
charithag
08d2d9d6a7 Removed un used cdm dbscripts 2015-10-22 06:48:00 +05:30
Shabirmean
75b4e5ff27 changes to the VirtualFireAlarm service to send and receive XMPP,MQTT messages 2015-10-20 20:21:02 +05:30
ayyoob
ec47429127 few changes after testing 2015-10-16 18:30:19 +05:30
ayyoob
aa001675b3 Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud 2015-10-16 16:58:58 +05:30
ayyoob
2d2ab1cdf3 update the bin file 2015-10-16 16:58:51 +05:30
ayyoob
fd2e7c3ed2 DAS update 2015-10-16 16:58:39 +05:30
Shabirmean
ae05b84c79 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-10-16 16:27:49 +05:30
Shabirmean
a5df23b565 changed the terminal print text in the startup script of virtual_firealarm 2015-10-16 16:27:42 +05:30
charithag
e4f0cd3059 Fix sample deployment issue for samples except virtual fire alarm 2015-10-16 15:40:50 +05:30
ayyoob
cfd1497ecc Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud 2015-10-15 20:36:44 +05:30
Shabirmean
c37a97d7b4 removed hardcoded deviceName 2015-10-15 12:25:53 +05:30
Shabirmean
9070110818 added changes to receive customDeviceName from user and register device using this value 2015-10-15 12:21:04 +05:30
Shabirmean
38457554a5 changes to take in both https and http server endpoints 2015-10-14 23:50:50 +05:30
Shabir Mohamed
695571011c changed button label from "Download" to "Download Agent" 2015-10-14 23:28:15 +05:30
ayyoob
d4fc698b4f Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud 2015-10-14 22:38:25 +05:30
ayyoob
0cde75e8a1 changed DAS to SNAPSHOT version 2015-10-14 22:38:18 +05:30
Shabir Mohamed
90ad9802bc Merge branch 'build-pack' 2015-10-14 22:04:43 +05:30
charithag
f9dff1b0ed Virtual firealarm icon updated 2015-10-14 20:28:31 +05:30
Shabir Mohamed
69dcf064f9 merged conflicts with the changes of combining the device controller
and the manager together
2015-10-13 15:33:32 +05:30
Shabir Mohamed
c13e5ac620 Added MQTT-Subscriber and XMPP-Connector for the virtual_firealarm
deviceType
2015-10-13 13:28:26 +05:30
charithag
76de89bd05 Add components necessory to work with internal APIM 2015-10-13 00:46:26 +05:30
ayyoob
ecd8c75660 few changes to resolve the error on matt 2015-10-12 19:42:50 +05:30
ayyoob
183d53eea6 Merge branch 'build-pack' of https://github.com/wso2-incubator/product-device-cloud into build-pack 2015-10-12 13:13:20 +05:30
charithag
4d5b6d8bff Fix certificate issue in FireAlarmVirtualAgent for mac 2015-10-12 13:04:31 +05:30
ayyoob
388af5f248 merged with upstream 2015-10-12 11:56:22 +05:30
ayyoob
08c518c0c2 added api managed on virtual fire alarm and few changes on internal api 2015-10-12 11:37:24 +05:30
charithag
454a403a22 Merge remote-tracking branch 'upstream/build-pack' into build-pack 2015-10-12 11:12:20 +05:30
Shabir Mohamed
85ed06e12a merge conflicts with build-pack branch 2015-10-12 11:01:37 +05:30
Shabir Mohamed
45c0d9bc03 added XMPPClient and MQTTClient for receiving incoming messages 2015-10-12 10:46:04 +05:30
Rasika Perera
d384942f69 adding policy monitor service for firealarm 2015-10-12 08:12:52 +05:30
charithag
cfcc69b6fc Fix issue with cnnecting remote APIM 2015-10-12 01:18:30 +05:30
charithag
b63c062eb8 Include virtual agent to pack by default 2015-10-11 20:33:04 +05:30
charithag
a73cf7213d Set to build firealarm virtual agent from source in git 2015-10-11 20:32:47 +05:30
Shabir Mohamed
f8dca4dd8f changed firealarm thumbnail 2015-10-11 18:14:13 +05:30
Shabir Mohamed
a47232c8e1 changed deviceType to “firealarm” to obtain APIMToken and updated Agent
jar/startup script
2015-10-11 17:29:54 +05:30
Shabir Mohamed
13792a56a4 added new deviceType VirtualAgent 2015-10-11 16:09:58 +05:30
Shabir Mohamed
5d0f0c9a42 small corrections with firealarm sample 2015-10-11 15:37:03 +05:30
Shabir Mohamed
e7bf722c48 removing unnecessary util code 2015-10-10 09:59:54 +05:30
Shabir Mohamed
5d17940da4 added changes for the firealarmagent download 2015-10-09 19:41:20 +05:30
Ace
9e010dacba Fixing issue when building samples inside the pack 2015-10-09 14:05:30 +05:30
charithag
4c64456b36 Add ES themed login page 2015-10-08 14:19:56 +05:30
Ace
933b01a4f8 Adding fix for MT issue and missing config files 2015-10-08 11:47:40 +05:30
Ace
57da4fb9c4 changing bin.xml to fix duplicate files in pack 2015-10-07 12:21:16 +05:30
charithag
b4e9b84536 Fix build issue in samples 2015-10-06 11:20:19 +05:30
charithag
3045bc068a Fix enrolling exception in raspberry pi device type 2015-10-05 15:29:36 +05:30
charithag
b525895ac2 Fix sso-idp-config issue 2015-10-05 12:01:28 +05:30
ayyoob
b7daf92ada Integrated DAS for stat 2015-10-05 03:13:54 +05:30
charithag
20b5469e2a Fixed raspberry icon 2015-10-04 21:27:41 +05:30
charithag
864ee63807 Fix sso issue and copy sso-idp-configs.xml from src/repository to pack 2015-10-04 19:55:28 +05:30
ayyoob
a2ffaf170d updated jaggery version and added ES IDP configs 2015-10-04 01:50:27 +05:30
ayyoob
e6d9cb82af merged with upstream 2015-10-01 16:47:37 +05:30
ayyoob
ca11c630ad APIM, Store, DAS features merged to one pack 2015-10-01 16:10:10 +05:30
ayyoob
09285aea5e resolved build issues 2015-09-24 12:07:25 +05:30
Rasika Perera
6d856ae975 fixing samples images not showing issue 2015-09-24 11:21:18 +05:30
charithag
4631df2770 Merge remote-tracking branch 'origin/master' 2015-09-23 11:58:55 +05:30
charithag
8797dc4e1b Temporary fix for build break due to analytics lite feature dependency until Ayyob commits his changes 2015-09-23 11:58:41 +05:30
ayyoob
d08d7cb048 added analytics commons data publisher and used dal layer to capture the data 2015-09-22 19:23:06 +05:30
Shabir Mohamed
a47776405b samples’ names changed to match with that of CDMF-types 2015-09-22 13:23:59 +05:30
Shabir Mohamed
4ccc8b58c5 changes to enable default samples with the new deviceType txt 2015-09-22 11:24:28 +05:30
Rasika Perera
83d8acffe8 removing excludes on jaggery app copy 2015-09-16 18:36:42 +05:30
Rasika Perera
034d1993fc moving jaggery apps to device-cloud 2015-09-16 16:57:44 +05:30
Rasika Perera
b4b279bf13 moving jaggery apps to device-cloud 2015-09-16 16:56:15 +05:30
Rasika Perera
375731422c moving jaggery apps to device-cloud 2015-09-16 16:40:57 +05:30
charithag
3766bbec06 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	modules/distribution/src/assembly/bin.xml
2015-09-16 16:09:44 +05:30
charithag
220b25a4ef Update with device-cloud changes 2015-09-16 16:08:39 +05:30
Rasika Perera
af259ef021 adding deviceType.rxt and adding few extensions 2015-09-16 14:06:03 +05:30
charithag
115f4ce0ea Move publisher to jaggeryapps 2015-09-15 14:01:20 +05:30
charithag
9ecf406252 Update poms with CDMF upstream merge 2015-09-15 13:35:01 +05:30
ayyoob
e10ce13532 Merge branch 'master' of https://github.com/ayyoob/product-device-cloud 2015-09-13 19:32:20 +05:30
ayyoob
d9701885b9 added das features 2015-09-13 19:30:52 +05:30
charithag
6ff453e213 Secure stats-api and analytics page 2015-09-12 02:22:29 +05:30
charithag
2fe3f14b55 Fix for new exception occured with latest CDMF changes 2015-09-12 02:21:14 +05:30
Shabir Mohamed
a9ee964a07 Added changes required to initialise sample devices 2015-09-11 16:17:13 +05:30
charithag
077e7925eb Add analytics components to store 2015-09-10 16:06:39 +05:30
charithag
6732d7b642 Update carbon store version 2015-09-09 11:37:17 +05:30
charithag
c06d7184ca Merge remote-tracking branch 'origin/es-integration' into es-integration 2015-09-08 18:15:18 +05:30
charithag
dcf8816b2e Add enterprise store feature 2015-09-08 18:15:07 +05:30
ayyoob
19d28606b8 Added analytics config files 2015-09-08 16:41:09 +05:30
charithag
31d337126f Bump carbon store version and made other version changes accordingly 2015-09-08 15:13:07 +05:30
ayyoob
8597299bba Added files to cater apim component activation 2015-09-08 12:08:45 +05:30
ayyoob
f3c807d5e2 few changes on apim features 2015-09-07 11:16:19 +05:30
charithag
888bdb8873 Update sample distributions to add datasource definitions directly to master-datasources.xml 2015-09-02 17:00:45 +05:30
charithag
6893ea0d0d Add ES features to pack.
Known issue: apim dependencies are not satisfying. Waiting for apim fix
2015-09-02 16:59:40 +05:30
charithag
45881b32ee Add sample build verification to integration testing 2015-09-01 14:13:38 +05:30
charithag
d7b18057df Remove target folders from integration 2015-09-01 11:47:22 +05:30
charithag
4daca74038 Removed custom launch configurations to fix oauth2 class not found issue. Copied launch configurations from carbon kernel 2015-08-26 17:29:56 +05:30
charithag
0ed24f4c88 Add app context path to urls 2015-08-24 11:01:14 +05:30
charithag
11a4966f1b Fix sample build brake 2015-08-24 11:00:24 +05:30
ayyoob
f26423bec3 added multi-tenancy features 2015-08-22 22:19:54 +05:30
ayyoob
1796db2807 few changes after tenant changes 2015-08-21 18:10:57 +05:30
charithag
61af9dc01f Merge remote-tracking branch 'origin/master' 2015-08-20 19:35:19 +05:30
charithag
1eb60aa8c5 Change to comply with JAX-RS update 2015-08-20 19:35:09 +05:30
ayyoob
35f8db90e1 DAS capp - Analytics 2015-08-20 17:34:05 +05:30
Shabir Mohamed
0c6bc2e400 changes to implement XMPP communication 2015-08-20 15:05:27 +05:30
charithag
570a8ba0ba Change paths to comply with JAX-RS update 2015-08-20 12:20:25 +05:30
charithag
0a99923d4a Modify permission resource ids for groups 2015-08-19 19:16:03 +05:30
Shabir Mohamed
89081a9a64 added changes to the xmppServer.py in the zip 2015-08-19 15:51:34 +05:30
Shabir Mohamed
43d46cfcdd changes to the xmpp_client.py 2015-08-19 12:57:41 +05:30
Shabir Mohamed
7915836dd0 Added Server-EP to deviceConfigs.cfg 2015-08-19 11:56:28 +05:30
charithag
c63257785b Change with Rich group object 2015-08-15 13:30:07 +05:30
charithag
d92205db42 Move device pages to samples 2015-08-14 13:48:19 +05:30
charithag
d0b041af99 Move device pages to samples 2015-08-14 13:48:01 +05:30
charithag
25e27cc6ca Convert add group option to separate page. 2015-08-14 12:30:53 +05:30
charithag
b404c29a98 Fix name of sensebot db 2015-08-14 11:07:01 +05:30
ayyoob
b9c340eb30 removed tmp files 2015-08-14 09:41:18 +05:30
ayyoob
78e4545ced removed dependencies 2015-08-14 04:13:30 +05:30
ayyoob
ba1c6f5c88 renamed to IoT Server 2015-08-14 02:43:35 +05:30
ayyoob
2b34b7e7af update on dependencies 2015-08-14 02:38:10 +05:30
charithag
d1db123a3f Update build scripts for samples 2015-08-13 15:54:04 +05:30
ayyoob
81507dc231 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud
add sample poms
2015-08-13 14:57:02 +05:30
ayyoob
a71c74fe12 added sample pons 2015-08-13 14:51:38 +05:30
charithag
e642a2634e Add sample src build 2015-08-13 13:48:22 +05:30
ayyoob
9ee4a09057 added sample pom with relative system path 2015-08-13 12:32:26 +05:30
charithag
af6c8b0a25 Add xmltask.jar 2015-08-13 12:04:18 +05:30
ayyoob
e5972d1a03 refactored package and removed unused dependency 2015-08-13 01:50:42 +05:30
charithag
7d44f2ae19 Disable arduino and raspberry build files in samples 2015-08-12 18:08:45 +05:30
charithag
e7db5a1d82 Set to deploy arduino and raspberrypi samples automatically to distribution 2015-08-12 17:44:42 +05:30
charithag
b6bc365bc5 Commented out exclude instruction for pom files 2015-08-12 16:11:50 +05:30
charithag
fea2d5756e Add iot-configs from samples 2015-08-12 15:31:08 +05:30
charithag
1dab745cfe Merge remote-tracking branch 'origin/master' 2015-08-12 12:31:06 +05:30
charithag
786cb19eb3 Add db creation from sql script for samples 2015-08-12 12:30:53 +05:30
ayyoob
feab815ad8 added cdmf extension features 2015-08-12 11:19:06 +05:30
ayyoob
e444d60d1c added samples source 2015-08-12 01:06:48 +05:30
charithag
5384c8ef0a Convert existing device types to samples 2015-08-11 18:34:33 +05:30
charithag
7e11475bb5 Change icons 2015-08-11 10:51:23 +05:30
charithag
807e16d6b3 Fix bug in stats listing 2015-08-07 20:43:49 +05:30
charithag
9cdba70f72 Merge remote-tracking branch 'origin/master' 2015-08-07 19:50:22 +05:30
charithag
1b64596953 Fix scaling bug 2015-08-07 19:50:07 +05:30
ayyoob
554e146be6 remove tmp files 2015-08-07 18:57:39 +05:30
Rasika Perera
86bf7cf31d Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-08-07 18:41:24 +05:30
Rasika Perera
ade05d7cda fixing events stats 2015-08-07 18:41:12 +05:30
Ace
e16bf62019 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-08-07 18:35:26 +05:30
Ace
b47af54057 Adding script to persist bulb status data 2015-08-07 18:34:52 +05:30
Rasika Perera
cdf1fa4d20 changes to dashboard 2015-08-07 15:55:25 +05:30
Rasika Perera
dfed7671bf refactoring events api 2015-08-07 15:49:22 +05:30
Rasika Perera
42a04c2660 fixing issues in events api 2015-08-07 15:41:41 +05:30
charithag
91ab732dba Set trigger to display add group popup 2015-08-07 15:20:23 +05:30
charithag
9f99e6e4da Add data simulation as comment 2015-08-07 15:06:11 +05:30
Rasika Perera
6b613034bd Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-08-07 15:04:19 +05:30
Rasika Perera
d29d63a915 few changes 2015-08-07 15:04:14 +05:30
charithag
f4b974ea52 Add data simulation 2015-08-07 15:02:49 +05:30
charithag
edc4b1766f Few fixes 2015-08-07 15:00:23 +05:30
Rasika Perera
08e30b1efb moving events into page 2015-08-07 14:49:54 +05:30
charithag
fbaa9a2e2f Complete device event stream client side 2015-08-07 13:43:17 +05:30
charithag
919f9b40e9 Merge remote-tracking branch 'origin/master' 2015-08-07 13:12:08 +05:30
charithag
c9b9270407 Add skeletons for device data stream 2015-08-07 13:11:22 +05:30