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