Commit Graph

277 Commits

Author SHA1 Message Date
sinthuja
2992d9e098 adding samples to the root location. 2016-11-09 17:55:24 +05:30
sinthuja
227779c2ad adding broker distribution and some logging configuration changes. 2016-11-09 12:44:21 +05:30
sinthuja
37b2cb01ff Adding bin scripts. 2016-11-08 20:38:27 +05:30
sinthuja
0e959da763 First cut of iot-pack restructuring. 2016-11-08 12:27:59 +05:30
Ace
2e15f2767d merging with upstream 2016-11-04 20:09:28 +05:30
Ace
c9c717af1c removing common/base modules & refactoring 2016-11-04 18:57:19 +05:30
GPrathap
ffa6a9cf59 removing mb features and related configurations 2016-11-02 15:43:53 +05:30
charitha
7562734282 Merge remote-tracking branch 'upstream/IoTS-1.0.0' into IoTS-1.0.0 2016-11-02 13:45:56 +05:30
sinthuja
b86694cc93 Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0-fresh 2016-11-02 13:16:36 +05:30
charitha
be5d946794 Merge remote-tracking branch 'upstream/IoTS-1.0.0' into IoTS-1.0.0
# Conflicts:
#	modules/distribution/src/samples-deployer.xml
2016-11-02 13:08:04 +05:30
sinthuja
7424caa74f Merge branch 'removeMBReferences' of https://github.com/hastef88/product-iots into IoTS-1.0.0-fresh 2016-11-02 12:56:27 +05:30
Susinda Perera
8a59ae4f68 Merge pull request #195 from susinda/master
Adding certMgt to dbscripts folder
2016-11-02 12:46:30 +05:30
sinthuja
6454c5b0df Removing DAS 2016-11-02 11:09:14 +05:30
ayyoob
59207f9980 merged with origin IoTS-1.0.0 2016-11-02 09:44:30 +05:30
Hasitha Amal De Silva
1fe9a80102 removing MB references from IOTserver pack 2016-11-01 00:31:16 -04:00
sinthuja
3156fd01ea Adding the analytics-scripts and themes template. 2016-10-26 17:00:50 +05:30
ayyoob
b559f0cf3a removed tmp files 2016-10-23 20:45:30 +05:30
ayyoob
7844cba270 moved samples to src to support filter properties 2016-10-23 20:35:50 +05:30
ayyoob
a4b8e81a56 removed plugin and added the deployer file for connected cup 2016-10-23 20:28:15 +05:30
susinda
12c12067c7 Merge remote-tracking branch 'upstream/master' 2016-10-21 12:41:46 +05:30
ayyoob
2b31921bd5 added configurations 2016-10-09 19:11:00 +05:30
ayyoob
b2d20b93e1 few changes after apimgt version upgrade 2016-10-09 03:16:28 +05:30
susinda
425d420773 Adding certMgt to dbscripts folder 2016-10-04 17:41:57 +05:30
warunalakshitha
af5c886907 Add akka reference file and registry-event-broker.xml 2016-09-29 01:01:55 +05:30
warunalakshitha
f1777e67ea Move carbon kernal version to 4.4.9 2016-09-29 00:59:09 +05:30
Rasika Perera
d01f58186d Copying product specific cdm-config.xml for enabling custom PushNotificationProviders such as XMPP, MQTT 2016-09-21 00:59:55 +05:30
Rasika Perera
a922fb5a0c Adding changes to the devicemgt app copy 2016-09-13 17:55:40 +05:30
ayyoob
971fd80b83 few changes in real time analytics 2016-07-27 14:45:55 +05:30
ayyoob
2df0515585 few changes added after testing with the cluster 2016-06-27 00:13:34 +05:30
ayyoob
97bf77f16c removed xmpp and mqtt properties 2016-06-20 02:58:46 +05:30
ayyoob
521f3b478a add removed libthrift 0.8 2016-06-10 15:35:09 +05:30
GPrathap
93a9f90277 overriding default designer.json which is coming from portal app 2016-06-09 13:05:35 +05:30
ayyoob
5933702725 added http-gateway, mqtt-gateway, devicetype-publisher, devicetype-worker and device-key-manager profiles 2016-06-08 22:36:53 +05:30
ayyoob
af5d6250fc merge with upstream 2016-06-07 14:34:32 +05:30
ayyoob
47e6331c93 removed device type features and added mqtt profile 2016-06-07 14:28:07 +05:30
GPrathap
6490c010f8 added analytics cdmf feature 2016-06-02 10:34:43 +05:30
ayyoob
8568a704ea fixed https://wso2.org/jira/browse/IOTS-184 2016-05-26 12:51:15 +05:30
ayyoob
97ac29c7ba Merge branch 'release-1.0.0-alpha' of https://github.com/wso2/product-iots into das-ext 2016-05-23 13:02:47 +05:30
mharindu
f32792788b Updated README, release-notes 2016-05-20 18:53:52 +05:30
ayyoob
8c14d86eb0 removed identity dbscripts 2016-05-19 18:38:55 +05:30
mharindu
870009915f Removed api-publisher 2016-05-19 01:14:58 +05:30
mharindu
401a07540e Merge branch 'master' of https://github.com/wso2/product-iots into apim 2016-05-19 00:56:41 +05:30
prabathabey
cba9d8baaa Adding virtual-fire-alarm-config.xml 2016-05-19 00:22:45 +05:30
mharindu
d2e914e275 Added new configuration for the webapp publisher and scope validator 2016-05-16 12:07:57 +05:30
mharindu
b777fa9764 Merge branch 'master' of https://github.com/wso2/product-iots 2016-05-12 22:05:07 +05:30
mharindu
566c5e5fb5 fixed issues in API publishing 2016-05-12 22:02:47 +05:30
ayyoob
e5d5afa9a0 added remote app manager config 2016-05-12 19:18:20 +05:30
ayyoob
a5be8acd45 Merge branch 'master' of https://github.com/wso2/product-iots into das-ext 2016-05-12 13:45:39 +05:30
ayyoob
14ead035d7 few changed mqtt authoriser 2016-05-12 13:39:44 +05:30
ayyoob
787178ddff added mqtt and xmpp.properties 2016-05-12 02:43:10 +05:30
prabathabey
cacd5bf5ae Adding APILifeCycle.xml 2016-05-11 16:56:40 +05:30
prabathabey
125e398dab Removing all mobile related dependencies 2016-05-10 22:21:56 +05:30
prabathabey
9548b88dad Removing app-mgt dependencies 2016-05-10 22:12:25 +05:30
ayyoob
a43048679d added device-analytics-config 2016-05-04 03:01:27 +05:30
ayyoob
751b2f8dae removed unused sample device types 2016-05-03 18:40:31 +05:30
NuwanSameera
2f2c23105a Move digital display and drone analyzer to samples. 2016-04-22 15:58:12 +05:30
Prabath Abeysekara
2fadbc10a6 Merge pull request #116 from charithag/master
Add devicemgt_admin jax-rs and removed mdm-admin jax-rs
2016-04-19 13:36:58 +05:30
charithag
49466b2953 Add devicemgt_admin jax-rs and removed mdm-admin jax-rs 2016-04-18 16:42:53 +05:30
ayyoob
e9f2062362 added files related to activate synapse as a gateway 2016-04-18 02:58:55 +05:30
ayyoob
f2648c2c28 few changes after testing with the apim 2016-04-17 12:21:17 +05:30
ayyoob
a80a493506 few changes after testing 2016-04-15 23:11:11 +05:30
ayyoob
f91b566425 version update and added das extension feature 2016-04-14 19:57:13 +05:30
ayyoob
7e51653b36 removed snapshot version from dependencies 2016-04-01 21:03:48 +05:30
ayyoob
0b6cd88b78 Changed analytics to released version and temporally disabled mobile features until impl is released from base feature. 2016-03-31 05:58:09 +05:30
Ruwan
155867b334 Merge pull request #109 from ayyoob/master
Added JWT grant type and upgraded the APIM version
2016-03-24 08:45:03 +05:30
ayyoob
69740cc2f2 updated APIM version 2016-03-23 03:23:13 +05:30
GPrathap
824503c0d7 adding new theme to dashboard portal application 2016-03-20 23:58:47 +05:30
ayyoob
03be540d99 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-03-08 15:52:44 +05:30
ayyoob
66971e4860 removed conflicting jars that exports same packages 2016-03-08 15:52:09 +05:30
Charitha Goonetilleke
febdc36cba Removed commented code and reformat 2016-03-08 13:44:47 +05:30
Shabirmean
d7de0f0607 Adding copy tasks for the portal app specific modifications in the bin.xml 2016-03-07 09:31:12 +05:30
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
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
82c0c226f9 Including mb features in pack 2016-01-06 10:51:21 +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
Shabirmean
8bdf2910f9 removed duplicated copy tasks 2015-12-23 11:51:07 +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
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
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
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
charithag
4dcd064f8b Use custom carbon xml and Add DAS portal jaggery app 2015-12-11 11:06:37 +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
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
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
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
910b52db75 adding social dbscripts to product 2015-12-08 23:02:02 +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
d09128f482 excluding "appmoauth2.war" from the build 2015-12-07 18:53:32 +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
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
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
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
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
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
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