Commit Graph

488 Commits

Author SHA1 Message Date
Ace
7b51e4f36b bumping dependencies to latest versions 2016-02-24 16:33:56 +05:30
charithag
fc702b96b9 Bump carbon device mgt plugins version 2016-02-11 15:33:10 +05:30
Shabirmean
8f4093b20f Removed already installed features from the "repository/components/features" folder 2016-02-10 17:32:25 +05:30
charithag
74c04dc49b Merged with CDM master 2016-01-28 17:44:10 +05:30
Ace
94f1b87ce3 Removing patches and upgrading DAS and MB 2016-01-25 10:47:31 +05:30
charithag
3201b2e112 Change zip archive name to wso2iots 2016-01-12 12:40:53 +05:30
ayyoob
2a30023d81 Merge pull request #61 from wso2-incubator/IoTS-1.0.0-M1
added start up script
2016-01-08 23:10:35 +05:30
ayyoob
754891e39a added start up script 2016-01-08 20:56:21 +05:30
Ace
03a05472c4 Adding andes patch 2016-01-08 12:05:42 +05:30
Ace
fad444510c Adding log fixes to spark core 2016-01-07 22:28:33 +05:30
Ace
a8ca6887f8 Adding fixes for DAS components to co-exist with MB components 2016-01-07 19:07:04 +05:30
Ace
82c0c226f9 Including mb features in pack 2016-01-06 10:51:21 +05:30
Ace
4752b12545 Integrating mb features to IotServer 2016-01-05 19:13:23 +05:30
Shabirmean
f29fa5e89e Force add the temporary jars relevant to DAS fix patches 2016-01-05 11:00:53 +05:30
Ruwan
337bdb3929 Merge pull request #59 from charithag/master
Add device-types to configs
2016-01-04 20:53:22 +05:30
charithag
b899f5c3a2 Add device-types to configs 2016-01-04 20:18:50 +05:30
Shabirmean
e01a7fe2d8 Moved DB Creation for Android and Windows to feature from product pom 2016-01-04 18:48:17 +05:30
Ace
94dcaa82d8 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-23 11:57:43 +05:30
Ace
ddf04e867e Changing gateway ports to http/https ports 2015-12-23 11:57:13 +05:30
Shabirmean
8bdf2910f9 removed duplicated copy tasks 2015-12-23 11:51:07 +05:30
Shabirmean
078c14f746 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-23 11:00:56 +05:30
Shabirmean
fea8e23da0 Removed device-DB creation from distribution pom and moved to bin.xml copy task 2015-12-23 11:00:44 +05:30
Ace
424dd7979f Adding white listed tag to apim config 2015-12-23 03:41:58 +05:30
Shabir Mohamed
b0f70a9b1b Revert "Added mb feature" 2015-12-22 16:29:25 +05:30
Shabirmean
f8e9356504 Revert "Merge pull request #55 from sdkottegoda/embed-messaging-feature"
This reverts commit fd09122872, reversing
changes made to e340d88608.
2015-12-22 16:27:56 +05:30
ayyoob
fd09122872 Merge pull request #55 from sdkottegoda/embed-messaging-feature
Added mb feature
2015-12-22 14:34:16 +05:30
sdkottegoda
1ee42cc94e Added mb feature 2015-12-22 14:27:13 +05:30
Shabirmean
98b6cfc487 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-22 12:30:43 +05:30
Shabirmean
d37d73fe36 Copying custom sequences directory from distribution 2015-12-22 12:30:33 +05:30
Sumedha Rubasinghe
15fe50a774 including copying pom.xml 2015-12-22 11:53:16 +05:30
Shabirmean
7681a7f6be Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-21 16:44:22 +05:30
charithag
eb88f7c1c6 Fix path error 2015-12-21 13:18:59 +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
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
Ace
75cdffb651 Adding device cloud grant type 2015-12-15 20:13:23 +05:30
Ace
2fd99fa85d Adding fix for API Store/Publisher login 2015-12-15 11:22:22 +05:30
Shabirmean
86675ecf92 removing virtual_firealarm datasource info from master-datasources xml 2015-12-14 19:37:21 +05:30
charithag
71a19d05c4 Fix api-store loggin issue 2015-12-14 18:26:05 +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
charithag
99b123bf74 Add jaggery conf from cdmf 2015-12-14 13:54:30 +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
Ace
7e0d384dc9 Copying api publisher/store feature to pack 2015-12-12 12:19:52 +05:30
charithag
a9dcd8cd21 Moved analytics toCDMF coomponents 2015-12-11 22:54:17 +05:30
Menaka Madushanka
9857e2f2b4 spark script for pressure 2015-12-11 15:30:34 +05:30
Menaka Madushanka
454b24db1f spark scripts for the other sensors + build.xml edited 2015-12-11 14:47:50 +05:30
Menaka Madushanka
88a09c8cab spark scripts for the other sensors + build.xml edited 2015-12-11 14:41:04 +05:30
Menaka Madushanka
194843c91a spark scripts for the other sensors 2015-12-11 14:27:40 +05:30
charithag
de857cfc6e Fix issue in script 2015-12-11 12:12:42 +05:30
menaka
3b9fe436c3 Merge remote-tracking branch 'origin/master'
Conflicts:
	modules/distribution/pom.xml
2015-12-11 11:13:48 +05:30
charithag
4dcd064f8b Use custom carbon xml and Add DAS portal jaggery app 2015-12-11 11:06:37 +05:30
menaka
75d4344f6c DB schema for android sense and script change 2015-12-11 11:02:20 +05:30
charithag
4b8662f58f Add required changes for android sense 2015-12-11 08:52:51 +05:30
charithag
f876abf3e4 Add carbonapps to deployment 2015-12-10 20:24:03 +05:30
Charitha Goonetilleke
0021029913 Merge pull request #1 from menaka121/master
Changes for the android sense: Spark scripts and p2 profile changes
2015-12-10 19:03:16 +05:30
charithag
c08aa706e6 Removed oltu patch since it is included in identity 5.0.3 2015-12-10 18:56:20 +05:30
charithag
ccf1af3ea4 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-10 18:45:36 +05:30
menaka
594bd03b84 Merge remote-tracking branch 'origin/master' 2015-12-10 15:04:14 +05:30
Ace
8cc653a788 bumping identity to 5.0.3 and other fixes 2015-12-10 14:31:01 +05:30
charithag
5b7fee6043 Excluded jaggery.conf in uuf-base app 2015-12-10 13:43:47 +05:30
menaka
a91f75a34d Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-09 15:50:25 +05:30
Charitha Goonetilleke
6632cfc272 Merge pull request #27 from charithag/master
Update console logo and removed asm-all_4.1.0.wso2v1.jar
2015-12-08 23:21:39 +05:30
charithag
4f6dfac0fa Removed asm-all_4.1.0.wso2v1.jar from distribution and include mdm based app mgt feature from plugins 2015-12-08 23:19:39 +05:30
Shabirmean
865372f9e8 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-08 23:02:16 +05:30
Shabirmean
910b52db75 adding social dbscripts to product 2015-12-08 23:02:02 +05:30
charithag
c494db99e7 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-08 22:49:36 +05:30
Ace
1250743458 Adding changes to identity.xml to fix logging issue 2015-12-08 21:46:46 +05:30
Shabirmean
9ae9bcfb31 Removing duplicate analytics version, switched "data-bridge-config.xml' to be copied from feature 2015-12-08 15:02:43 +05:30
Shabirmean
63dcd1e04e Addidng SocialDB to distribution pom 2015-12-08 12:02:58 +05:30
Menaka Madushanka
309d38de72 Added the accelerometer script 2015-12-08 10:59:05 +05:30
menaka
1c0242fe7e Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-08 10:55:08 +05:30
Menaka Madushanka
efe53204c8 Added the accelerometer script 2015-12-08 10:54:05 +05:30
Shabirmean
d09128f482 excluding "appmoauth2.war" from the build 2015-12-07 18:53:32 +05:30
charithag
584ba63494 Update logo 2015-12-07 13:44:59 +05:30
Shabirmean
808771056c removing the common-api feature from the build 2015-12-07 13:41:45 +05:30
charithag
2c1efd1af0 Migrated to EMM based product 2015-12-05 14:05:35 +05:30
ayyoob
098547efaa removing unnecessary es store files 2015-11-30 00:28:47 +05:30
ayyoob
320f754356 resolved few started errors 2015-11-28 01:27:40 +05:30
charithag
247dfa9820 Migrated to CDMF with Generic UI 2015-11-27 11:10:37 +05:30
Rasika Perera
29a0bf2fe2 fixing invalid relative paths in pom.xml 2015-11-03 11:38:14 +05:30
Ace
1d2d57259b fixing some minor bugs 2015-10-30 19:43:13 +05:30
ayyoob
5625b83b64 added android sense service and required stream definitions 2015-10-23 07:42:29 +05:30
Rasika Perera
fb21dc8b72 Merge pull request #13 from rasika90/master
Generalizing in memory map into any sensor reading
2015-10-23 01:11:11 +05:30
Rasika Perera
e31fda92a6 generalizing inmemory map into any sensor 2015-10-23 01:04:55 +05:30
charithag
16f1fc7d5e Remove duplicate portal jaggery app 2015-10-22 19:11:08 +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
08d2d9d6a7 Removed un used cdm dbscripts 2015-10-22 06:48:00 +05:30
ayyoob
ec47429127 few changes after testing 2015-10-16 18:30:19 +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
charithag
76de89bd05 Add components necessory to work with internal APIM 2015-10-13 00:46:26 +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
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
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
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
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
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
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
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
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
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