Commit Graph

2675 Commits

Author SHA1 Message Date
sumedharubasinghe
86b7c30287 Merge pull request #53 from sumedharubasinghe/master
including copying pom.xml
2015-12-22 11:56:06 +05:30
Sumedha Rubasinghe
15fe50a774 including copying pom.xml 2015-12-22 11:53:16 +05:30
sumedharubasinghe
6121890ebc Merge pull request #52 from sumedharubasinghe/master
initial version of connectedcup device type
2015-12-22 08:28:32 +05:30
Sumedha Rubasinghe
d4e66e9a93 initial version of connectedcup device type 2015-12-22 08:27:05 +05:30
Shabir Mohamed
94e2bfffb7 Merge pull request #51 from Shabirmean/master
Changed the source directory of the device-type datasources
2015-12-21 18:19:17 +05:30
Shabirmean
7681a7f6be Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-21 16:44:22 +05:30
Charitha Goonetilleke
a29e1ea465 Merge pull request #50 from charithag/master
Fix path error
2015-12-21 13:20:57 +05:30
charithag
eb88f7c1c6 Fix path error 2015-12-21 13:18:59 +05:30
Charitha Goonetilleke
eb5db3a986 Merge pull request #49 from charithag/master
Override server startup script to overcome out of memory error
2015-12-21 13:18:06 +05:30
charithag
959d275dca Override server startup script to overcome out of memory error 2015-12-21 13:17:36 +05:30
Shabirmean
40ea51d3bf Changed the source of the device-type datasources to copy from. 2015-12-21 11:54:31 +05:30
Shabir Mohamed
45ce876d9c Merge pull request #48 from Shabirmean/master
Adding device-type deployer to the pack
2015-12-18 14:31:52 +05:30
Shabirmean
19d0d2a116 Added device-type deployer xml to the pack 2015-12-18 14:29:28 +05:30
Shabirmean
e02a31f6ee Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-18 11:13:31 +05:30
Shabirmean
dc475b3542 Adding updated keystone file with default "RA" and "CA" certs 2015-12-18 11:13:18 +05:30
Ace
35b3cf8d35 Adding additional listener to read features 2015-12-17 19:52:45 +05:30
Shabir Mohamed
e7f21ba370 Merge pull request #47 from Shabirmean/master
Added featureDefs and DBCreation for RPi and Arduino
2015-12-17 12:47:34 +05:30
Shabirmean
b94f3b6bfa Added featureDefs and DBCreation for RPi and Arduino 2015-12-17 12:46:04 +05:30
Charitha Goonetilleke
f1312caa79 Merge pull request #46 from GPrathap/master
Add drone analyzer feature compoenets
2015-12-16 13:19:34 +05:30
GPrathap
7234544212 changed datasource name 2015-12-16 12:47:50 +05:30
GPrathap
ca47bf9844 added datasource description 2015-12-16 12:35:20 +05:30
Charitha Goonetilleke
ed556f269c Merge pull request #44 from charithag/master
Add apimgt staging repo
2015-12-15 20:38:32 +05:30
charithag
e7fff83780 Add apimgt staging repo 2015-12-15 20:37:14 +05:30
Ace
75cdffb651 Adding device cloud grant type 2015-12-15 20:13:23 +05:30
Ace
7be2e2a948 upgrading apim version to 4.3.1 2015-12-15 19:04:11 +05:30
Charitha Goonetilleke
e91b80cd16 Merge pull request #43 from NuwanSameera/master
rename digitaldisplay to digital_display
2015-12-15 17:00:48 +05:30
NuwanSameera
727ea9d5c1 rename digitaldisplay to digital_display 2015-12-15 12:22:57 +05:30
Charitha Goonetilleke
c90890b2a8 Merge pull request #42 from charithag/master
Fix h2 script path
2015-12-15 11:37:16 +05:30
charithag
2a37c07ffa Fix h2 script path 2015-12-15 11:23:49 +05:30
Ace
2fd99fa85d Adding fix for API Store/Publisher login 2015-12-15 11:22:22 +05:30
Shabir Mohamed
594b3381e7 Merge pull request #41 from Shabirmean/master
removing virtual_firealarm datasource info from master-datasources xml
2015-12-14 19:38:43 +05:30
Shabirmean
86675ecf92 removing virtual_firealarm datasource info from master-datasources xml 2015-12-14 19:37:21 +05:30
NuwanSameera
d9fc247bf4 Merge remote-tracking branch 'upstream/master'
Conflicts:
	modules/distribution/pom.xml
2015-12-14 18:39:32 +05:30
NuwanSameera
72fef2a2cc Merge remote-tracking branch 'upstream/master'
Conflicts:
	modules/distribution/pom.xml
2015-12-14 18:35:09 +05:30
Charitha Goonetilleke
f8622c2bea Merge pull request #40 from charithag/master
Fix api-store loggin issue
2015-12-14 18:26:55 +05:30
charithag
71a19d05c4 Fix api-store loggin issue 2015-12-14 18:26:05 +05:30
Charitha Goonetilleke
1b003a65c1 Merge pull request #39 from charithag/master
Add db create script
2015-12-14 17:50:58 +05:30
charithag
3a16839855 Add db create script 2015-12-14 17:09:51 +05:30
Shabir Mohamed
d08b13d514 Merge pull request #38 from Shabirmean/master
Adding separate jaggery module "apimstore"
2015-12-14 17:04:29 +05:30
Shabirmean
727e6358d1 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-14 17:03:11 +05:30
Shabirmean
631d907613 Adding separate jaggery module "apimstore" to evade conflicts with the module used by APPM 2015-12-14 17:02:14 +05:30
sajithar
a9bc546253 changed bin.xml to exclude 'app-conf.json' from UUF and CDMF apps. 2015-12-14 15:33:26 +05:30
Charitha Goonetilleke
802a70ec79 Merge pull request #37 from charithag/master
Add jaggery conf from cdmf
2015-12-14 14:02:13 +05:30
charithag
99b123bf74 Add jaggery conf from cdmf 2015-12-14 13:54:30 +05:30
NuwanSameera
8b0d0ad8b5 digital display database configurations 2015-12-14 13:00:25 +05:30
NuwanSameera
7416404307 pom file changes 2015-12-14 12:51:59 +05:30
Charitha Goonetilleke
8922e34694 Merge pull request #36 from charithag/master
Copy cdmf related uuf contents from devicemgt-cdmf
2015-12-14 12:47:43 +05:30
charithag
c32caa6067 Copy cdmf related uuf contents from devicemgt-cdmf 2015-12-14 12:25:57 +05:30
Ace
5e7bbd6cb6 Fixing api manager store/publisher login issue 2015-12-14 10:25:08 +05:30
Shabir Mohamed
1799bc65f4 Merge pull request #35 from Shabirmean/master
Adding execution to rename api store and publisher context in site.son
2015-12-12 15:02:37 +05:30