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
Update coffee cup UI
|
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
Connected cup feature pom changes requested by menaka
|
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
Connected cup start agent url generation fixed
|
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
few changes in connected cup to remove the dependent with the configu…
|
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
connected-cup-agent modified
|
9 years ago |
NuwanSameera
|
06aecec053
|
connected-cup-agent modified
|
9 years ago |
Ruwan
|
fe2ae62d56
|
Merge pull request #71 from menaka121/master
publishedToDAS method changed
|
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
Issues fixed
|
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
added start up script
|
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
Add device-types to configs
|
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"
This reverts commit fd09122872 , reversing
changes made to e340d88608 .
|
9 years ago |
ayyoob
|
fd09122872
|
Merge pull request #55 from sdkottegoda/embed-messaging-feature
Added mb 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
rename digitaldisplay to digital_display
|
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'
Conflicts:
modules/distribution/pom.xml
|
9 years ago |
NuwanSameera
|
72fef2a2cc
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
modules/distribution/pom.xml
|
9 years ago |
charithag
|
71a19d05c4
|
Fix api-store loggin issue
|
9 years ago |
Charitha Goonetilleke
|
1b003a65c1
|
Merge pull request #39 from charithag/master
Add db create script
|
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'
Conflicts:
modules/distribution/pom.xml
|
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
Changes for the android sense: Spark scripts and p2 profile changes
|
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 |
Charitha Goonetilleke
|
6632cfc272
|
Merge pull request #27 from charithag/master
Update console logo and removed asm-all_4.1.0.wso2v1.jar
|
9 years ago |
charithag
|
4f6dfac0fa
|
Removed asm-all_4.1.0.wso2v1.jar from distribution and include mdm based app mgt feature from plugins
|
9 years ago |
Shabirmean
|
865372f9e8
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
9 years ago |
Shabirmean
|
910b52db75
|
adding social dbscripts to product
|
9 years ago |
charithag
|
c494db99e7
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
9 years ago |
Ace
|
1250743458
|
Adding changes to identity.xml to fix logging issue
|
9 years ago |
Shabirmean
|
9ae9bcfb31
|
Removing duplicate analytics version, switched "data-bridge-config.xml' to be copied from feature
|
9 years ago |
Shabirmean
|
63dcd1e04e
|
Addidng SocialDB to distribution pom
|
9 years ago |
Menaka Madushanka
|
309d38de72
|
Added the accelerometer script
|
9 years ago |
menaka
|
1c0242fe7e
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
9 years ago |
Menaka Madushanka
|
efe53204c8
|
Added the accelerometer script
|
9 years ago |
Shabirmean
|
85bc5bd201
|
Adding SocialDB creation execution to distribution pom
|
9 years ago |
Shabirmean
|
d09128f482
|
excluding "appmoauth2.war" from the build
|
9 years ago |
charithag
|
584ba63494
|
Update logo
|
9 years ago |
Shabirmean
|
808771056c
|
removing the common-api feature from the build
|
9 years ago |
charithag
|
2c1efd1af0
|
Migrated to EMM based product
|
9 years ago |
ayyoob
|
098547efaa
|
removing unnecessary es store files
|
9 years ago |
ayyoob
|
320f754356
|
resolved few started errors
|
9 years ago |
charithag
|
247dfa9820
|
Migrated to CDMF with Generic UI
|
9 years ago |
Shabirmean
|
cbdb4eaece
|
removed unnecessary logs from the VirtualFIreAlarmService
|
9 years ago |
Shabirmean
|
ec98c99894
|
Added complete SCEP implementation plus end to end encryption for VirtualFireAlarm
|
9 years ago |
Shabirmean
|
af3e30fbc3
|
synced firealarm web.xml with virtual_firealarm web.xml
|
9 years ago |
Shabirmean
|
d28a2bf4b3
|
Changes for the FireAlarmService to work with real device and SCEP service inclusions
|
9 years ago |
Menaka Madushanka
|
c8e85ce0db
|
resources.xml file added
|
9 years ago |
Ace
|
f5f5356e35
|
Restructirng samples
|
9 years ago |
Rasika Perera
|
29a0bf2fe2
|
fixing invalid relative paths in pom.xml
|
9 years ago |
Rasika Perera
|
44f380c8e0
|
changes to the resources.xml
|
9 years ago |
Rasika Perera
|
4c07301c8c
|
upgrading carbon analytics versions
|
9 years ago |
Ace
|
5a090d93df
|
Adding property to pickup application name from web.xml
|
9 years ago |
Charitha Goonetilleke
|
a337fefd8d
|
Merge pull request #19 from charithag/master
Add simple and advanced fire alarm agents
|
9 years ago |
Ace
|
1d2d57259b
|
fixing some minor bugs
|
9 years ago |
charithag
|
fe59fa9410
|
Add simple and advanced fire alarm agents
|
9 years ago |
charithag
|
e8a0ccf6e3
|
Fire alarm changes done by Shabir
|
9 years ago |
ayyoob
|
bf9bfd40b5
|
few changes after testing
|
9 years ago |
ayyoob
|
a0ee671515
|
resolved errors on sample build and few changes on android service
|
9 years ago |
ayyoob
|
e39ee91518
|
update version and few changes on android sense service
|
9 years ago |
Rasika Perera
|
ec70dad7da
|
refactoring
|
9 years ago |
charithag
|
82740dec44
|
Revert pom changes to previous
|
9 years ago |
Rasika Perera
|
b6156af241
|
refactoring
|
9 years ago |
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 |