Commit Graph

855 Commits (425d4207733cfe01f4f7d8550a6a537002d4266d)

Author SHA1 Message Date
Prabath Abeysekara 2fadbc10a6 Merge pull request #116 from charithag/master
9 years ago
Prabath Abeysekara a6e2b235c9 Merge pull request #117 from ayyoob/das-ext
9 years ago
ayyoob 394f57d729 Added DAS Extensions features
9 years ago
charithag 4d76f89b87 Merge branch 'master' of https://github.com/wso2/product-iots
9 years ago
charithag 49466b2953 Add devicemgt_admin jax-rs and removed mdm-admin jax-rs
9 years ago
NuwanSameera ab7ee2dbb8 Merge remote-tracking branch 'origin/master'
9 years ago
NuwanSameera c7c2222e4b Add Uninstall feature to sample device types.
9 years ago
ayyoob e9f2062362 added files related to activate synapse as a gateway
9 years ago
ayyoob f2648c2c28 few changes after testing with the apim
9 years ago
ayyoob a80a493506 few changes after testing
9 years ago
ayyoob f91b566425 version update and added das extension feature
9 years ago
ayyoob 4d2c63eff7 disabled jwt grant type
9 years ago
ayyoob 7e51653b36 removed snapshot version from dependencies
9 years ago
Ruwan 94ba3ff6c2 Merge pull request #112 from rasika90/master
9 years ago
Rasika Perera 0fc75151f6 Removing uuf template app feature
9 years ago
charithag 85a00afe85 Merge branch 'master' of https://github.com/wso2/product-iot-server
9 years ago
ayyoob 0b6cd88b78 Changed analytics to released version and temporally disabled mobile features until impl is released from base feature.
9 years ago
charithag 4cfa5f60ea Disabled IoT device types based features temporally.
9 years ago
charithag 17e9dd9127 Fix for https://wso2.org/jira/browse/IOTS-99
9 years ago
Ruwan 155867b334 Merge pull request #109 from ayyoob/master
9 years ago
ayyoob 69740cc2f2 updated APIM version
9 years ago
GPrathap 65b4dec1d7 adding a new gadget: Data Range Picker
9 years ago
GPrathap 824503c0d7 adding new theme to dashboard portal application
9 years ago
Charitha Goonetilleke 9afcfc6ee6 Merge pull request #107 from charithag/master
9 years ago
charithag e5c11b9fa5 Refactoring
9 years ago
NuwanSameera e0b9524168 Remove policy based jaggery apps from samples.
9 years ago
NuwanSameera 77b4a51add Resolve conflicts.
9 years ago
NuwanSameera 0ab149d392 Remove policy based jagerry apps from samples.
9 years ago
charithag 16a8e63497 Merge branch 'master' of https://github.com/charithag/product-iot-server
9 years ago
charithag a2c016efcc Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
charithag dc3540f2ef Merge branch 'master' of https://github.com/charithag/product-iot-server
9 years ago
GPrathap d9fd45e5ab removed file separator when creating mqtt subscriber topic
9 years ago
NuwanSameera 1ac7f55435 Add permissions.xml to current sensor device type.
9 years ago
Charitha Goonetilleke 6029428336 Bump json version
9 years ago
Charitha Goonetilleke f48b35b494 Bump json version
9 years ago
Charitha Goonetilleke a7221a04b6 Bump json version
9 years ago
Charitha Goonetilleke fbe6ebe9df Fix json library version
9 years ago
Menaka Madushanka 130cad34ee Changes suggested in the Code review.
9 years ago
Menaka Madushanka f7cf6fe56e Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Menaka Madushanka 0333007b1f Changes suggested in the Code review.
9 years ago
NuwanSameera 0e01164874 Merge branch 'master' of https://github.com/ayyoob/product-iot-server
9 years ago
Menaka Madushanka eb77b572e7 Fixes
9 years ago
Menaka Madushanka d7565e7fe7 Minor fixes
9 years ago
NuwanSameera aeb3ef20ac Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Menaka Madushanka d71b00d925 Added constants.
9 years ago
GPrathap 24fe930727 refactoring code
9 years ago
GPrathap 9b38eddd09 relocated ui component
9 years ago
GPrathap 87c4bbff85 removing and adding relevant images
9 years ago
GPrathap 39af0a9f57 removing and adding required images
9 years ago
GPrathap 5deac3cca1 adding claims definitions
9 years ago
GPrathap 3416a191c0 adding agent source code
9 years ago
GPrathap 5dd57a157e changing source code according to new API changes
9 years ago
GPrathap e2ce28767e added analytics scripts
9 years ago
GPrathap fa112b28e5 removed unnecessary module: agent
9 years ago
GPrathap bd856c0b75 refactoring code
9 years ago
GPrathap 70fcea507d changed source code according to new API changes
9 years ago
GPrathap 4f6ab8f6f6 changed group id cdmf.devicetype into org.wso2.cdmf.devicetype
9 years ago
Menaka Madushanka e3f8956d29 package refactoring
9 years ago
NuwanSameera ee250d25c5 Add permissions.xml to connected-cup device type.
9 years ago
Menaka Madushanka 0ac1c73efe License headers added.
9 years ago
Menaka Madushanka eac16a5d14 Code formatting
9 years ago
Menaka Madushanka 4cf1d77311 Added javadoc comments
9 years ago
Menaka Madushanka ef9c3dfe70 Added comments and code restructured.
9 years ago
charithag 706002b4d5 Fix for https://wso2.org/jira/browse/IOTS-77
9 years ago
Menaka Madushanka 0ce1d75c61 Class name changed
9 years ago
Menaka Madushanka 6858fb8a85 Code cleanup and refactoring : Check alert is displayed
9 years ago
Menaka Madushanka b930301819 Merge remote-tracking branch 'origin/master'
9 years ago
Menaka Madushanka a1b94d5415 Code cleanup and refactoring
9 years ago
Menaka Madushanka ead5b6e2bb Completed the sample test cases.
9 years ago
ayyoob 7a9b5547bd added feature extraction lifecycle listener
9 years ago
ayyoob 2a03111a5a merged with upstream
9 years ago
ayyoob dd3bfd4ffb merged with upstream
9 years ago
ayyoob 03be540d99 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
ayyoob 66971e4860 removed conflicting jars that exports same packages
9 years ago
Charitha Goonetilleke febdc36cba Removed commented code and reformat
9 years ago
Shabirmean d7de0f0607 Adding copy tasks for the portal app specific modifications in the bin.xml
9 years ago
Shabirmean 8206dc0f92 Added the doormanager-icon.png
9 years ago
Shabirmean 745d2369d3 Added portal app specific analytics changes and IoT-Gadget samples
9 years ago
Menaka Madushanka adfa5762c9 Sample Enrollment and verification
9 years ago
charithag 6c7041dcda Add ESP8266 based fire alarm sample
9 years ago
charithag f087baaa49 Bump event processing version to comply with analytics
9 years ago
charithag 4427f53044 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Menaka Madushanka b99001ae8d Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Menaka Madushanka 28879b416f Sample installation and verification
9 years ago
charithag 6dba086760 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Geesara Prathap 0a29e01356 Update README.md
9 years ago
GPrathap 4c2eeb4b2a Fix for JIRA IOTS-80
9 years ago
GPrathap d9f48423e3 Fix for JIRA IOTS-79
9 years ago
charithag 62d795232e Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Menaka Madushanka 890209e3de License header updated
9 years ago
Menaka Madushanka 98c222ed5e removed the unwanted build.xml file
9 years ago
Menaka Madushanka 34951b5395 Testng.xml changes
9 years ago
Menaka Madushanka 57f91949a3 Code formatting and fixes
9 years ago
Menaka Madushanka fcd5669361 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Menaka Madushanka 9a0f0f2187 restart
9 years ago
GPrathap a4695dfb2c added mqtt dependency to sample agent application
9 years ago
Ace 7b51e4f36b bumping dependencies to latest versions
9 years ago
GPrathap 953b15342f updated README.md
9 years ago
GPrathap d59f7bc089 added deployable sample application
9 years ago
Menaka Madushanka 67cb3df652 Code formatting
9 years ago
Menaka Madushanka 7cf8fcf4ac Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
charithag c556a9a7b0 Geesara's changes
9 years ago
Ace fca3016181 Bug fixes
9 years ago
Ace bb1216c6bf logic to send event to CEP
9 years ago
Ace 8f8209db08 Adding method to check if user exists
9 years ago
charithag ae08246052 fix issues
9 years ago
charithag 09fbbad7d7 Merge remote-tracking branch 'upstream/master'
9 years ago
GPrathap 1d698a73fd added new devicetype: doormanager
9 years ago
charithag 9e9627f37f upstream merge
9 years ago
charithag 81117d00c4 Change water dispensor category
9 years ago
NuwanSameera cc5cf0e09e Current sensor display name changed to Samrt Meeter
9 years ago
NuwanSameera aa6d02f25c Merge remote-tracking branch 'upstream/master'
9 years ago
NuwanSameera 335632769f Current Sensor controller changes
9 years ago
Menaka Madushanka cb1c30ec43 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Menaka Madushanka c7adb5530d Added comments and code cleanup
9 years ago
Menaka Madushanka c086968e24 Added comments and code cleanup
9 years ago
charithag fc702b96b9 Bump carbon device mgt plugins version
9 years ago
Shabirmean 8f4093b20f Removed already installed features from the "repository/components/features" folder
9 years ago
Menaka Madushanka d9799fa3c0 License headers
9 years ago
Menaka Madushanka 0ee834fc16 License headers added
9 years ago
Menaka Madushanka f91f4a3555 Integration tests for IOT server
9 years ago
NuwanSameera 8ca2614a08 Change Current Sensor display name to Water Dispensor
9 years ago
NuwanSameera e64bed8b50 Add flow sensor to currentsensor device type and modify device view page
9 years ago
charithag 463fb50b8f Updated current sensor component structure
9 years ago
NuwanSameera d9624efc80 Add current sensor device type sample
9 years ago
NuwanSameera aff032c66d Add current sensor device type sample
9 years ago
charithag 90dcc43ed1 Updated connected cup component structure
9 years ago
charithag 74c04dc49b Merged with CDM master
9 years ago
Charitha Goonetilleke 0c2318c425 Merge pull request #83 from charithag/master
9 years ago
charithag d0c7cddfd0 Update coffee cup UI
9 years ago
Ace 279c4a1c7a Adding fix for startup error when MB features are not yet up
9 years ago
Ace 1aef1d10c3 Bug fixes
9 years ago
Ace f9be9a8c0e Improving connected cup UI
9 years ago
Ace a3fd8d5134 Fixing issues with connected cup sample
9 years ago
Ruwan 347b27acf9 Merge pull request #78 from NuwanSameera/master
9 years ago
Ace 94f1b87ce3 Removing patches and upgrading DAS and MB
9 years ago
Shabirmean fd0f149c61 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Shabirmean 9ef829536e Upgraded Paho-MQTT version to latest v1.0.2
9 years ago
GPrathap 7bd44f4499 removed auto generated device-deployer.xml
9 years ago
Shabirmean 390bda1b3a Fixing wrong parent-groupId in the tools module
9 years ago
GPrathap 17db3bc651 created auto generated device-deployer.xml file
9 years ago
GPrathap 84dc857811 facilitated to create a feature of given device type dynamically
9 years ago
GPrathap a9750a2680 added a new maven archetype to generate sample structure of cdmf device type
9 years ago
NuwanSameera ede2489b38 Connected cup feature pom changes
9 years ago
Charitha Goonetilleke 8aa804bb92 Merge pull request #76 from menaka121/master
9 years ago
Shabirmean 7b5496d4db added the sample connected-cup project as a module into the device-deployer.xml
9 years ago
Menaka Madushanka 41bfb96fe2 Connected cup issues with url generation fixed
9 years ago
Menaka Madushanka 5770ecab2f fixed to get the server ip when starting the agent
9 years ago
Menaka Madushanka f1a22397a3 connected cup agent added
9 years ago
Shabirmean 5f8c04243b Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
ayyoob 3f9e279188 Merge pull request #75 from ayyoob/configConnectedCup
9 years ago
ayyoob 31c745e8f2 few changes in connected cup to remove the dependent with the configuration file
9 years ago
charithag 0ce0c246da Fix minor bugs
9 years ago
charithag a689182eac Fix minor bugs
9 years ago
Shabirmean b769a4ac71 removed duplicate version entry
9 years ago
Ruwan 25fd183278 Merge pull request #72 from NuwanSameera/master
9 years ago
NuwanSameera 06aecec053 connected-cup-agent modified
9 years ago
Ruwan fe2ae62d56 Merge pull request #71 from menaka121/master
9 years ago
Menaka Madushanka 37f22da494 publishedToDAS method changed
9 years ago
charithag 4a971476fb Fix minor bugs
9 years ago
Menaka Madushanka 1ac2dc9307 Issues fixed
9 years ago
Ruwan 54792872ef Merge pull request #69 from menaka121/master
9 years ago
NuwanSameera 568199b507 connected cup agent added to samples
9 years ago
Shabirmean ece55e1016 Small changes to the sample CoffeeCup sample
9 years ago
Menaka Madushanka 6179298d9f Connected cup device added
9 years ago
Menaka Madushanka bc84be58ea Connected cup device added
9 years ago
Shabir Mohamed 10087d78c6 Revert "Updated the sample device-type "ConnectedCup""
9 years ago
Shabirmean 5381fe3e6a Updated the sample device-type ""ConnectedCup
9 years ago
charithag d29fce31b4 Use dependencies from P2
9 years ago
charithag 3201b2e112 Change zip archive name to wso2iots
9 years ago
charithag d67ff8cd98 Removed IOS Mobile Plugin Management schema
9 years ago
ayyoob 2a30023d81 Merge pull request #61 from wso2-incubator/IoTS-1.0.0-M1
9 years ago
ayyoob 754891e39a added start up script
9 years ago
Ace 03a05472c4 Adding andes patch
9 years ago
Ace fad444510c Adding log fixes to spark core
9 years ago
Ace a8ca6887f8 Adding fixes for DAS components to co-exist with MB components
9 years ago
Ace 82c0c226f9 Including mb features in pack
9 years ago
Ace 4752b12545 Integrating mb features to IotServer
9 years ago
Shabirmean f29fa5e89e Force add the temporary jars relevant to DAS fix patches
9 years ago
Ruwan 337bdb3929 Merge pull request #59 from charithag/master
9 years ago
charithag b899f5c3a2 Add device-types to configs
9 years ago
Shabirmean e01a7fe2d8 Moved DB Creation for Android and Windows to feature from product pom
9 years ago
Ace 94dcaa82d8 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Ace ddf04e867e Changing gateway ports to http/https ports
9 years ago
Shabirmean 8bdf2910f9 removed duplicated copy tasks
9 years ago
Shabirmean 078c14f746 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Shabirmean fea8e23da0 Removed device-DB creation from distribution pom and moved to bin.xml copy task
9 years ago
Ace 424dd7979f Adding white listed tag to apim config
9 years ago
Shabir Mohamed b0f70a9b1b Revert "Added mb feature"
9 years ago
Shabirmean f8e9356504 Revert "Merge pull request #55 from sdkottegoda/embed-messaging-feature"
9 years ago
ayyoob fd09122872 Merge pull request #55 from sdkottegoda/embed-messaging-feature
9 years ago
sdkottegoda 1ee42cc94e Added mb feature
9 years ago
Shabirmean 98b6cfc487 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Shabirmean d37d73fe36 Copying custom sequences directory from distribution
9 years ago
Sumedha Rubasinghe 15fe50a774 including copying pom.xml
9 years ago
Sumedha Rubasinghe d4e66e9a93 initial version of connectedcup device type
9 years ago
Shabirmean 7681a7f6be Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
charithag eb88f7c1c6 Fix path error
9 years ago
charithag 959d275dca Override server startup script to overcome out of memory error
9 years ago
Shabirmean 40ea51d3bf Changed the source of the device-type datasources to copy from.
9 years ago
Shabirmean 19d0d2a116 Added device-type deployer xml to the pack
9 years ago
Shabirmean e02a31f6ee Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Shabirmean dc475b3542 Adding updated keystone file with default "RA" and "CA" certs
9 years ago
Ace 35b3cf8d35 Adding additional listener to read features
9 years ago
Shabirmean b94f3b6bfa Added featureDefs and DBCreation for RPi and Arduino
9 years ago
GPrathap 7234544212 changed datasource name
9 years ago
GPrathap ca47bf9844 added datasource description
9 years ago
Ace 75cdffb651 Adding device cloud grant type
9 years ago
Charitha Goonetilleke e91b80cd16 Merge pull request #43 from NuwanSameera/master
9 years ago
NuwanSameera 727ea9d5c1 rename digitaldisplay to digital_display
9 years ago
charithag 2a37c07ffa Fix h2 script path
9 years ago
Ace 2fd99fa85d Adding fix for API Store/Publisher login
9 years ago
Shabirmean 86675ecf92 removing virtual_firealarm datasource info from master-datasources xml
9 years ago
NuwanSameera d9fc247bf4 Merge remote-tracking branch 'upstream/master'
9 years ago
NuwanSameera 72fef2a2cc Merge remote-tracking branch 'upstream/master'
9 years ago
charithag 71a19d05c4 Fix api-store loggin issue
9 years ago
Charitha Goonetilleke 1b003a65c1 Merge pull request #39 from charithag/master
9 years ago
charithag 3a16839855 Add db create script
9 years ago
Shabirmean 727e6358d1 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Shabirmean 631d907613 Adding separate jaggery module "apimstore" to evade conflicts with the module used by APPM
9 years ago
sajithar a9bc546253 changed bin.xml to exclude 'app-conf.json' from UUF and CDMF apps.
9 years ago
charithag 99b123bf74 Add jaggery conf from cdmf
9 years ago
NuwanSameera 8b0d0ad8b5 digital display database configurations
9 years ago
NuwanSameera 7416404307 pom file changes
9 years ago
charithag c32caa6067 Copy cdmf related uuf contents from devicemgt-cdmf
9 years ago
Ace 5e7bbd6cb6 Fixing api manager store/publisher login issue
9 years ago
Shabirmean e7c7ab0e50 Adding execution to rename api store and publisher context in site.son
9 years ago
Ace 7e0d384dc9 Copying api publisher/store feature to pack
9 years ago
charithag a9dcd8cd21 Moved analytics toCDMF coomponents
9 years ago
Menaka Madushanka 9857e2f2b4 spark script for pressure
9 years ago
Menaka Madushanka 454b24db1f spark scripts for the other sensors + build.xml edited
9 years ago
Menaka Madushanka 88a09c8cab spark scripts for the other sensors + build.xml edited
9 years ago
Menaka Madushanka 194843c91a spark scripts for the other sensors
9 years ago
charithag de857cfc6e Fix issue in script
9 years ago
menaka b7661d286b DB schema for android sense and script change
9 years ago
menaka 3b9fe436c3 Merge remote-tracking branch 'origin/master'
9 years ago
charithag 4dcd064f8b Use custom carbon xml and Add DAS portal jaggery app
9 years ago
menaka 75d4344f6c DB schema for android sense and script change
9 years ago
charithag 4b8662f58f Add required changes for android sense
9 years ago
menaka 47c4c17012 Android sense db added
9 years ago
charithag f876abf3e4 Add carbonapps to deployment
9 years ago
Charitha Goonetilleke 0021029913 Merge pull request #1 from menaka121/master
9 years ago
charithag c08aa706e6 Removed oltu patch since it is included in identity 5.0.3
9 years ago
charithag ccf1af3ea4 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Menaka Madushanka 0076709626 Android sense feature added.
9 years ago
menaka 594bd03b84 Merge remote-tracking branch 'origin/master'
9 years ago
Ace 8cc653a788 bumping identity to 5.0.3 and other fixes
9 years ago
charithag 5b7fee6043 Excluded jaggery.conf in uuf-base app
9 years ago
NuwanSameera e13ce2dc8a pom.xml modification for digital display
9 years ago
menaka a91f75a34d Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago