Commit Graph

1762 Commits

Author SHA1 Message Date
lasantha
74aec0eb54 improving change-ip.sh script 2017-08-07 09:55:23 +05:30
Milan Perera
907ab4b87d Added jwt public cert to client truststore from the change-ip scipt 2017-08-06 23:03:54 +05:30
Milan Perera
089cf7fa5d Merge remote-tracking branch 'upstream/master' into iot-master 2017-08-03 18:51:30 +05:30
sameera910409
d5eb514271 fixes https://github.com/wso2/product-iots/issues/1268 : [H2 / Analytics] Identity/h2.sql script is missing in analytics profile 2017-08-03 16:54:40 +05:30
WSO2 Builder
2ce8881cbc [maven-release-plugin]prepare for next development iteration 2017-08-03 13:43:12 +05:30
WSO2 Builder
4003c98a45 [maven-release-plugin]prepare release v3.1.0-RC4 2017-08-03 13:42:58 +05:30
Milan Perera
196ad6620b Modifying change-ip script
Added few commands to the script
2017-08-03 11:56:19 +05:30
Milan Perera
b571216208 Added JWT keystore to the script
In order to start servers after doing IP changes, it is required to create new keystore for JWT signing and verification. So this fix adds that keystore generating logic to the bash script
2017-08-02 16:14:10 +05:30
lasantha
08245bd329 Adding ip configurating script 2017-08-02 09:18:18 +05:30
lasantha
6008097712 Merge branch 'master' of https://github.com/wso2/product-iots 2017-07-31 10:52:23 +05:30
Rasika Perera
e3182a9d03 Fixing https://github.com/wso2/product-iots/issues/1193 2017-07-28 18:05:57 +05:30
WSO2 Builder
7ab7424707 [maven-release-plugin]prepare for next development iteration 2017-07-27 03:40:17 +05:30
WSO2 Builder
8501c22568 [maven-release-plugin]prepare release v3.1.0-RC3 2017-07-27 03:40:03 +05:30
lasantha
b25430132b Merge branch 'master' of https://github.com/wso2/product-iots 2017-07-26 20:33:21 +05:30
Madhawa Perera
55c3c942bb Merge pull request #1228 from wso2/shavidissa-patch-2
Update README
2017-07-26 18:58:18 +05:30
madhawap
a1ca2f6a43 Modifications to QSG executor 2017-07-26 10:13:11 +05:30
madhawap
ebc039b520 Removed change-ip.sh from bin.xml 2017-07-26 08:45:00 +05:30
Madhawa Perera
cc9246ae4a Merge pull request #1227 from wso2/shavidissa-patch-1
Update release-notes.html
2017-07-26 06:51:43 +05:30
madhawap
dd13b37443 Added license.txt 2017-07-26 06:32:48 +05:30
Rasika Perera
9ddae03239 Temporary overriding default keystores and truststores from kernel v4.4.17 due to DATE expiration. Remove these once Kernel v4.4.17 is released. 2017-07-26 00:21:53 +05:30
lasantha
8c99d3c0e3 Merge branch 'master' of https://github.com/wso2/product-iots 2017-07-25 19:50:45 +05:30
shavidissa
9b0b5ee8c4 Update README 2017-07-25 17:54:07 +05:30
shavidissa
d0d88c35b3 Update release-notes.html 2017-07-25 17:50:11 +05:30
lasantha
df47e56a97 enhancing app publishing test cases with role restriction 2017-07-25 17:24:36 +05:30
WSO2 Builder
a52820e36d [maven-release-plugin]prepare for next development iteration 2017-07-23 22:58:55 +05:30
WSO2 Builder
e0712291fd [maven-release-plugin]prepare release v3.1.0-RC2 2017-07-23 22:58:41 +05:30
sameera910409
48a4e22cff fixes https://github.com/wso2/product-iots/issues/1176 : [Windows / IOS Device] Unable to configure IOS devices in windows 2017-07-21 18:59:20 +05:30
madhawap
fed2b73a0d Updating device-mgt, device-mgt-plugin and appmgt versions and release note 2017-07-21 18:38:32 +05:30
Dileesha Rajapakse
456b12e2c5 Merge branch 'master' of https://github.com/wso2/product-iots 2017-07-21 16:57:19 +05:30
Dileesha Rajapakse
4ae3bab260 Fixed IoTs README version issues 2017-07-21 16:56:50 +05:30
Dileesha Rajapakse
c471de6e8d Changed the IoTs product version 2017-07-21 13:52:03 +05:30
madhawap
84aa9b780f Adding release note for IoTS 3.1.0 2017-07-21 12:51:18 +05:30
Madhawa Perera
a4dd2b01d9 Merge pull request #1208 from rasika/master
Fixing https://github.com/wso2/product-iots/issues/1205
2017-07-21 11:25:17 +05:30
Rasika Perera
e2070bba4f Fixing https://github.com/wso2/product-iots/issues/1205 2017-07-21 10:13:10 +05:30
Madhawa Perera
d86f395804 Merge pull request #1185 from inoshperera/master
changing app to con app
2017-07-20 19:04:18 +05:30
Madhawa Perera
2046a3549a Merge pull request #1188 from Nirothipan/master
Correcting minor spelling mistake
2017-07-20 18:27:15 +05:30
geethkokila
f2e5ba4c64 Removing few test cases due to sending wrong input for operations. It will take much long to fix them 2017-07-20 18:03:42 +05:30
Rasika Perera
09e0c5e2f4 Fixing https://github.com/wso2/product-iots/issues/1177 2017-07-17 21:51:02 +05:30
Nirothipan
7335f67960 correcting minor spelling mistake 2017-07-17 18:35:17 +05:30
inoshperera
c0cc9da10b changing app to con app 2017-07-17 15:47:30 +05:30
WSO2 Builder
760f6bfa10 [maven-release-plugin]prepare for next development iteration 2017-07-17 03:37:25 +05:30
WSO2 Builder
02c33bb161 [maven-release-plugin]prepare release v3.1.0-RC 2017-07-17 03:37:11 +05:30
lasantha
d3c996fd75 Adding minor UI change to connected cup sample 2017-07-16 11:39:32 +05:30
Nirothipan
3e188b5176 typing mistake in CronEcpression 2017-07-15 11:08:33 +05:30
Madhawa Perera
0157c9c912 Merge pull request #1157 from Nirothipan/master
Fixes for - connected cup analytics data graphs not displayed and broken pipe issue.
2017-07-14 12:44:16 +05:30
Nirothipan
dec82f5b0f changing data count to 100 2017-07-13 18:43:10 +05:30
Nirothipan
3eb75d040d changing update summary to 3 mins 2017-07-13 17:50:40 +05:30
Nirothipan
2ab4e8fa13 changing update summary to 3 mins. 2017-07-13 17:49:58 +05:30
Nirothipan
0bae6b1519 symultaneous stream authentication failure fix 2017-07-12 16:29:43 +05:30
Nirothipan
55601641e3 fixes for connected cup, device_temperature_summary table missing 2017-07-12 14:55:01 +05:30
inoshperera
f11b386493 fixing the integration test issue due to qsg change 2017-07-12 12:50:48 +05:30
inoshperera
0eda232d89 Merge branch 'master' of https://github.com/wso2/product-iots 2017-07-11 14:44:40 +05:30
inoshperera
046752fbe5 changing application name 2017-07-11 14:42:09 +05:30
WSO2 Builder
67263f446f [maven-release-plugin]prepare for next development iteration 2017-07-10 20:42:05 +05:30
WSO2 Builder
c599a0ab88 [maven-release-plugin]prepare release v3.1.0-beta2 2017-07-10 20:41:51 +05:30
Madhawa Perera
510c79b186 Merge pull request #1125 from hasuniea/master
fixing issue wso2/product-iots#965
2017-07-08 04:06:51 +05:30
Nirothipan
ed7f15346a updating connected cup order coffee cup url 2017-07-07 18:16:42 +05:30
inoshperera
9c372fa25c Adding a new app for qsg. 2017-07-07 17:44:10 +05:30
inoshperera
cd00a841c5 fixing test failiures. 2017-07-07 11:18:02 +05:30
Hasunie
06ba6e98fc fixing issue wso2/product-iots#965 2017-07-06 15:02:13 +05:30
inoshperera
eb71d1874b fixing qsg issues due to the change of DCR application 2017-07-05 16:26:11 +05:30
Nirothipan
c1a15e11eb correcting typo error 2017-07-04 12:21:22 +05:30
WSO2 Builder
2afb01c675 [maven-release-plugin]prepare for next development iteration 2017-07-02 00:07:40 +05:30
WSO2 Builder
7ecc464d42 [maven-release-plugin]prepare release v3.1.0-beta 2017-07-02 00:07:26 +05:30
WSO2 Builder
d889befe76 [maven-release-plugin]prepare for next development iteration 2017-07-01 21:48:00 +05:30
WSO2 Builder
5efa9d30a5 [maven-release-plugin]prepare release v3.1.0-beta 2017-07-01 21:47:46 +05:30
madhawap
5061465b53 Temporarily removed test case for execution of QSG script 2017-07-01 19:38:31 +05:30
geethkokila
0147fa4784 Fixing the osgi issue 2017-06-30 17:24:10 +05:30
Rasika Perera
4c613e5682 Fixing https://github.com/wso2/product-iots/issues/1066: moving scripts dir into wso2/analytics 2017-06-29 07:49:48 +05:30
Geeth
d6df453472 Merge pull request #1070 from milanperera/iot-master
Removed DCR feature
2017-06-28 18:06:30 +05:30
Madhawa Perera
c6086de22c Merge pull request #1071 from thisaripatabendi/master
Adding coffee level graph to realtime-analytics view
2017-06-28 13:38:32 +05:30
thisaripatabendi
a5154cf269 Adding coffee level graph to realtime-analytics view 2017-06-28 12:39:52 +05:30
Milan Perera
82d1cf41e0 Removed DCR life cycle listener 2017-06-28 12:18:18 +05:30
thisaripatabendi
9b26660971 Adding coffee level graph to realtime-analytics view 2017-06-28 11:41:35 +05:30
Milan Perera
3a394ae869 Removed DCR feature 2017-06-28 11:20:34 +05:30
sinthuja
77cd418e2f Fixing the build failure in the connected cup. 2017-06-27 18:24:57 +05:30
WSO2 Builder
76d8fc62a2 [maven-release-plugin]prepare for next development iteration 2017-06-23 23:06:50 +05:30
WSO2 Builder
cbf7dd8dce [maven-release-plugin]prepare release v3.1.0-alpha 2017-06-23 23:06:36 +05:30
madhawap
2d0104ee10 version changes 2017-06-23 21:58:05 +05:30
madhawap
8b868688ec version changes 2017-06-23 21:38:31 +05:30
sinthuja
c69f74ad2b Updating the source/target JDK versions to 1.8. 2017-06-23 18:13:44 +05:30
sinthuja
ff6642b5ba Adding the executable permission for the mobile qsg script. 2017-06-23 17:23:49 +05:30
sinthuja
f9fb51b671 Updating the qsg script out dated readme. 2017-06-23 17:21:13 +05:30
sinthuja
2803ba29e7 Merge branch 'pr1049' into origin-master
# Conflicts:
#	modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
2017-06-23 17:10:14 +05:30
thisaripatabendi
dd5f4861eb Fixing connected-cup issues. 2017-06-23 16:49:20 +05:30
sinthuja
9bdd2d766f Merge pull request #1048 from dunithd/master
Applying new UX for connected cup device details page
2017-06-23 16:48:35 +05:30
thisaripatabendi
67a6eb0db4 Fixing connected-cup issues. 2017-06-23 16:34:56 +05:30
Ruwan
93f5ed77f0 Merge pull request #1045 from ayyoob/devicetype-3.1.0
temporary fix for api verfication issue in integration test
2017-06-23 15:56:24 +05:30
sinthuja
0b85c80701 Updating the license headers. 2017-06-23 15:51:30 +05:30
sinthuja
cbd4507648 Adding missing connected cup version in the root pom.xml. 2017-06-23 15:30:53 +05:30
dunithd
ee680cfec8 Applying new UX for connected cup device details page 2017-06-23 15:27:23 +05:30
sinthuja
8afe1d5245 Cleaning up the files pom files. 2017-06-23 15:25:45 +05:30
sinthuja
cfe3e59ce3 Removing the unused file device-type, and removing datasource configs from UI feature. 2017-06-23 15:14:04 +05:30
sinthuja
2aad4c7bd4 Updating the coffeeking version as the bundle version. 2017-06-23 15:01:54 +05:30
sinthuja
1773b64d20 Reverting the change done for device type. 2017-06-23 14:08:19 +05:30
ayyoob
8cd1f815e4 temporary fix for api verfication issue 2017-06-23 13:50:25 +05:30
sinthuja
9d866509bd Merge branch 'wso2-master' into test-merge 2017-06-23 13:19:32 +05:30
sinthuja
5aa641183b Fixing some path issue in device type deployables. 2017-06-23 13:09:37 +05:30
sinthuja
c6876695fc Seperating the connected cup feature into backend, api, ui features as recommended feature structure. 2017-06-23 12:54:23 +05:30
sinthuja
5483532882 Fixing some version problem in the connected cup sample. 2017-06-23 11:47:39 +05:30
sinthuja
a8b4699cb9 Fixing intermittent NPE in mobile QSG 2017-06-23 11:05:32 +05:30
ayyoob
8c4f13ee48 Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 2017-06-23 04:12:26 +05:30
ayyoob
32c54e0ab6 adding client truststore key store - temporariy fix until kernel 4.4.17 is released 2017-06-23 04:07:25 +05:30
sinthuja
c04b8e7872 Fixing the old references of the plugins-deployer, and owsap log in the integration tests. 2017-06-22 23:26:45 +05:30
sinthuja
099ce78ea3 Adding missing http push notification extension. 2017-06-22 22:56:09 +05:30
sinthuja
eb473cb7ea Fixing the integration tests with modified plugin-deployer.xml name 2017-06-22 22:03:12 +05:30
ayyoob
5969d413ac moved to released version 2017-06-22 21:57:32 +05:30
sinthuja
b363714446 fixing the issue in creating the connected cup instance. 2017-06-22 20:45:52 +05:30
sinthuja
602e012e2e committing the intermediate changes. 2017-06-22 18:11:52 +05:30
Geeth
911d001aa6 Merge pull request #1034 from sinthuja/test-merge
Fixing  https://github.com/wso2/product-iots/issues/776.
2017-06-22 14:45:00 +05:30
sinthuja
56cbef3f35 Fixing https://github.com/wso2/product-iots/issues/776. 2017-06-22 14:23:05 +05:30
ayyoob
cc94c0b29a few test case fixes 2017-06-22 06:50:39 +05:30
Harshan Liyanage
c240fb9a71 Merge branch 'master' of https://github.com/wso2/product-iots 2017-06-21 18:34:03 +05:30
Harshan Liyanage
0a7e33961a Fixed sample-deployer issues which resolves wso2/product-iots#458 2017-06-21 18:33:39 +05:30
Rasika Perera
d48b7d4939 Fixing org_wso2_carbon_iot_geo_dashboard-1.0.0.car not copied 2017-06-21 14:52:25 +05:30
ayyoob
6d941a6e72 few fixes on test case 2017-06-20 19:32:51 +05:30
ayyoob
76ddf4fe57 Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 2017-06-17 19:33:14 +05:30
ayyoob
5f80490332 added device type test case 2017-06-17 18:54:59 +05:30
Rasika Perera
c2b573b32c Adding geo fencing 2017-06-16 16:15:15 +05:30
Geeth
ef8ce3e1c6 Merge pull request #1016 from sinthuja/test-merge
Fixing the issues in cipher tool.
2017-06-15 14:19:13 +05:30
sinthuja
b59aec2e48 Fixing the license year in script files. 2017-06-15 13:51:59 +05:30
sinthuja
760f35f912 Merge branch 'wso2-master' into test-merge 2017-06-15 13:42:56 +05:30
sinthuja
38963cb807 Fixing #1003. 2017-06-15 13:42:18 +05:30
ayyoob
bf02c6ccb7 Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 2017-06-15 10:00:56 +05:30
ayyoob
f167b20192 updated migration db queries 2017-06-15 09:47:46 +05:30
Ace
e2def31fdf Increasing timeout 2017-06-14 19:19:56 +05:30
ayyoob
4e248659ed Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0 2017-06-14 13:23:59 +05:30
ayyoob
72b66504f4 Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
Conflicts:
	pom.xml
2017-06-14 13:23:48 +05:30
Ace
8890408f38 Optimizing server start up time when running integration tests 2017-06-14 12:37:46 +05:30
Ace
a75f6bc12e Fixing test failure 2017-06-13 17:12:06 +05:30
sinthuja
6ac04eba48 Fixing https://github.com/wso2/product-iots/issues/1000. 2017-06-13 12:56:24 +05:30
sinthuja
2fc5104043 Fixing https://github.com/wso2/product-iots/issues/522. 2017-06-13 12:19:13 +05:30
Ace
e6850a2b2b increasing timeout for test 2017-06-12 17:20:00 +05:30
ayyoob
8ddac1d037 merged with origin 2017-06-12 11:50:45 +05:30
megala21
6b5d4bf05f Increasing the timeout 2017-06-10 23:46:24 +05:30
ayyoob
fcfd39f54d Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
Conflicts:
	pom.xml
2017-06-08 14:45:36 +05:30
ayyoob
bcffd2d41e adding http push notification feature 2017-06-08 14:40:18 +05:30
Janak Amarasena
c3ad20b18a Add new supported grant type 2017-06-07 14:26:29 +05:30
ayyoob
d4ff9da16d updated migration script 2017-06-06 11:01:16 +05:30
GDLMadushanka
d376a91745 JavaDocs added 2017-06-06 10:44:24 +05:30
GDLMadushanka
43d8dc38b1 Clean up code 2017-06-06 07:49:42 +05:30
GDLMadushanka
5c782a6c15 CarbonServerManager moved to IOTS from platform integration test tools 2017-06-05 16:40:45 +05:30
ayyoob
5785ee1072 intial commit for db migration from 3.0.0 - 3.1.0 2017-06-05 00:13:52 +05:30
ayyoob
12837efd6d renamed content validator type name 2017-06-04 06:53:21 +05:30
ayyoob
80ecba8528 migrated new kernel and mb version 2017-06-01 10:47:59 +05:30
ayyoob
1a5c3ab51f Merge branch 'master' of https://github.com/wso2/product-iots 2017-05-29 05:46:34 +05:30
ayyoob
2ed4b2dfb6 added default purge configuration 2017-05-29 05:45:55 +05:30
megala21
976bdb2292 Fixing issues 2017-05-23 12:03:05 +05:30
megala21
ee94b8ce8f Adding initial cut virtual fire-alarm policy publish scenario 2017-05-23 01:42:11 +05:30
megala21
1aadd2b171 Adding initial test cases for virtual fire alarm 2017-05-21 01:07:10 +05:30
megala21
70763e42c2 Merge remote-tracking branch 'upstream/master' into test_case_fixes 2017-05-16 20:21:00 +05:30
megala21
1178869ef3 Updating versions 2017-05-16 20:20:55 +05:30
Ayyoob Hamza
5334745d0b Merge pull request #448 from sinthuja/test-merge
Removing some unnecessary features from the profiles.
2017-05-16 16:21:02 +05:30
sinthuja
b2495ad414 Fixing the formatting issue. 2017-05-16 15:23:44 +05:30
sinthuja
52fb2f732f Fixing the formatting issue. 2017-05-16 15:22:14 +05:30
sinthuja
df48dbd3c0 Fixing the formatting issue. 2017-05-16 15:18:42 +05:30
sinthuja
955294135a Moving the config files to the key manager profile. 2017-05-16 15:08:14 +05:30
sinthuja
28cc40db78 Removing unwanted features from profiles. 2017-05-16 15:01:16 +05:30
megala21
974a113ac3 Resolving conflicts 2017-05-16 14:39:17 +05:30
megala21
8ee4c2dbba Adding test cases for quick start guide 2017-05-16 14:36:11 +05:30
megala21
2338043eee Fixing test case failure 2017-05-16 10:08:13 +05:30
megala21
79a4f58929 Fixing issue in tenant-conf.json copying location 2017-05-16 09:06:27 +05:30
megala21
19b06bc8bc Adding android sense test cases 2017-05-15 00:31:24 +05:30
ayyoob
408f392af2 merged with origin 2017-05-09 19:46:59 +05:30
ayyoob
d8620a0088 merged with origin 2017-05-09 19:33:05 +05:30
ayyoob
1c2d1ef231 added filter properties to pick plugins version from parent pom 2017-05-09 16:30:54 +05:30
ayyoob
43552543d2 added android sense analytics feature to the analytics runtime 2017-05-09 16:30:09 +05:30
ayyoob
2c7a7cd9b9 merged with origin 2017-05-09 16:29:32 +05:30
ayyoob
cd79929f42 added default values for global properties 2017-05-09 01:07:24 +05:30
sinthuja
2ec2c2e5b5 removing the android sense feature from key manager profile. 2017-05-08 23:36:03 +05:30
sinthuja
2f3819107a Merge branch 'wso2-master' into test-merge
# Conflicts:
#	modules/distribution/src/assembly/bin.xml
#	modules/distribution/src/core/plugins/plugins-deployer.xml
#	modules/p2-profile/iot-core-profile/pom.xml
#	pom.xml
2017-05-08 22:48:51 +05:30
sinthuja
efe3d7aefb Updating the device mgt plugins version. 2017-05-08 22:38:25 +05:30
sinthuja
afae580959 Fixing the issue in the build. 2017-05-08 22:37:22 +05:30
ayyoob
55a46201bd removed android sense from the default features 2017-05-08 17:23:42 +05:30
Amal Gunatilake
9608d22ef6 Merge pull request #405 from ayyoob/new-master2
Added missing appm features/ installed android sense feature / fixed stats deploying issue
2017-05-08 13:41:35 +05:30
ayyoob
08286dd88b Merge branch 'master' of https://github.com/wso2/product-iots into new-master2 2017-05-08 12:00:01 +05:30
sinthuja
c84dd34eaa Merge branch 'wso2-master' into test-merge
# Conflicts:
#	modules/distribution/src/core/plugins/plugins-deployer.xml
#	pom.xml
2017-05-08 11:57:07 +05:30
sinthuja
b94b171057 Removing gateway profile, and merging it with device backend. 2017-05-08 11:47:31 +05:30
megala21
72d1891932 Adding initial jmeter scripts for app-publisher 2017-05-05 17:29:54 +05:30
ayyoob
475bd3ac84 added filter properties to pick the parent plugins version 2017-05-05 01:55:19 +05:30
ayyoob
834ad4f772 added missing appm features and installed android sense feature to the default pack 2017-05-05 01:36:36 +05:30
sinthuja
3c74373597 Adding virtual fire alarm device type into the plugins deployer. 2017-05-04 21:42:00 +05:30
sinthuja
6af2d23ef5 Adding Raspberry device type into the plugins deployer. 2017-05-04 16:29:27 +05:30
sinthuja
7f06333cf8 Adding the ardino features to the plugins. 2017-05-04 15:58:28 +05:30
sinthuja
37c3cf2d09 Adding andriod sense related features for the profiles. 2017-05-04 15:38:40 +05:30
Amal Gunatilake
7db4733b1d Merge pull request #399 from sinthuja/test-merge
Merging profile related fixes.
2017-05-03 14:38:20 +05:30
Amal Gunatilake
af2d760e5b Merge branch 'master' into master 2017-05-02 20:41:59 +05:30
Amal Gunatilake
448d2f9b69 Updating the latest carbon.device.mgt.plugin.version 2017-05-02 20:39:00 +05:30
sinthuja
d0e449ced0 Fixing the issues in the server ports mapping. 2017-05-02 19:18:58 +05:30
sinthuja
c3743ea163 Merge branch 'wso2-master' into test-merge 2017-05-02 18:54:05 +05:30
Chatura Dilan
f0ecea5359 Merge pull request #392 from janakamarasena/master
Change comment in bin.xml
2017-05-02 17:07:46 +05:30
inoshperera
c7bd347618 Merge pull request #391 from sinthuja/local-branch2
Adding the missing social.xml file.
2017-05-02 16:05:11 +05:30
megala21
ed7e574939 Adding policy mangement test cases 2017-05-02 13:16:55 +05:30
megala21
a1688140c5 Adding notification management jmeter script 2017-04-29 22:23:01 +05:30
sinthuja
00947e30b2 Fixing an issue in the key manager URL. 2017-04-28 18:50:15 +05:30
sinthuja
0753585391 Adding the missing social.xml file. 2017-04-28 18:05:06 +05:30
sinthuja
30c4c40f08 Adding the profile related improvements. 2017-04-28 18:03:15 +05:30
Janak Amarasena
fd1cf890a2 Change comment 2017-04-28 16:53:39 +05:30
megala21
583b562d8e Removing the un-wanted copying of files 2017-04-28 00:19:48 +05:30
megala21
fbab71b0f7 Improving multi-tenancy test cases and fixing certificate management public publish issue 2017-04-27 17:35:17 +05:30
sinthuja
badc75a222 Merge branch 'wso2-master' into test-merge 2017-04-27 12:58:44 +05:30
sinthuja
5ec80d4c0a Moving the client-registration apps to device manager. 2017-04-27 12:58:13 +05:30
sinthuja
6ddc2da328 Adding fixes related to ease distributed setup. 2017-04-27 12:47:32 +05:30
megala21
fb5d73ecbe Improving scripts 2017-04-27 10:33:45 +05:30
megala21
0fea4d6eb0 Adding android negatove test cases and group management initial test cases 2017-04-27 01:42:35 +05:30
Amal Gunatilake
faa5eb34d6 Merge pull request #384 from sinthuja/test-merge
Adding device manager profile node also in the indexing profiles
2017-04-26 15:40:57 +05:30
sinthuja
7a4171be63 Removing the device-manager profile from webapp-publisher-config.xml. 2017-04-26 15:23:51 +05:30
sinthuja
93cd14bc43 Adding the device-manager backend profile as well for webapp publishing. 2017-04-26 14:18:06 +05:30
sinthuja
3a5f77c287 Adding device manager profile node also in the indexing profiles for the store to work in the distributed mode. 2017-04-26 14:10:02 +05:30
Amal Gunatilake
a7c21fd22b Updating the latest carbon.device.mgt.plugin.version 2017-04-25 14:16:11 +05:30
Ayyoob Hamza
66be42a9ba Merge pull request #374 from Megala21/test_case_fixes
Adding initial test cases with j-meter scripts
2017-04-21 17:02:32 +05:30
megala21
e5df961298 Adding initial integration with device management api jmeter scripts 2017-04-21 15:50:53 +05:30
Ayyoob Hamza
0df8dd1646 Merge pull request #371 from Megala21/test_case_fixes
Fixing test case failure
2017-04-20 09:17:47 +05:30
megala21
81a4e7c503 Fixing test case failure 2017-04-20 09:15:02 +05:30
Amal Gunatilake
1e0c018d95 Merge pull request #367 from sinthuja/test-merge
Fixes for profile creator for windows.
2017-04-19 20:37:42 +05:30
sinthuja
2ef609d09c Bug files for the profile-creator.bat after testing in windows machine, and improvements for script file. 2017-04-19 19:07:35 +05:30
megala21
b0ab301004 Reformatting code 2017-04-19 14:47:13 +05:30
megala21
23c385a7be Improving android test cases 2017-04-19 14:31:17 +05:30
sinthuja
8d99eb3967 Adding first cut of profile-creator.bat file. 2017-04-19 10:06:15 +05:30
megala21
bb841f9a57 Merge remote-tracking branch 'upstream/master' into test_case_fixes 2017-04-18 17:29:23 +05:30
megala21
1a80b27cd5 Improving android test cases 2017-04-18 17:29:03 +05:30
sinthuja
992a561c61 Removing some unnecessary line in the secription. 2017-04-18 13:36:13 +05:30
sinthuja
8fd14700c5 Fixing https://github.com/wso2/product-iots/issues/363. 2017-04-18 12:11:29 +05:30
sinthuja
7f1d42a09c Merge branch 'wso2-master' into test-merge
# Conflicts:
#	modules/distribution/src/core/plugins/plugins-deployer.xml
2017-04-17 21:17:30 +05:30
sinthuja
5ed7b60ae2 Fixing SSO issue with keymanager profile. 2017-04-17 16:23:36 +05:30
megala21
828c59d0dd Fixing test cases role management and user management 2017-04-17 16:19:57 +05:30
sinthuja
45d02838fe Adding all profiles creation in profile-creator.sh. 2017-04-17 14:30:04 +05:30
sinthuja
12165fa996 Moving the profiles distributions into the temp directory. 2017-04-17 12:36:18 +05:30
sinthuja
791ee45164 Fixing issue - https://github.com/wso2/product-iots/issues/358. 2017-04-17 11:46:57 +05:30
sinthuja
69fff37565 Resolving the issue in resolving the porduct version for profile-creator.sh. 2017-04-17 11:19:13 +05:30
sinthuja
70c4b9a24a Removing some unwanted scripts from profiles. 2017-04-17 10:30:36 +05:30
megala21
4abbd36cb5 Merge remote-tracking branch 'upstream/master' into test_case_fixes 2017-04-17 09:22:03 +05:30
Amal Gunatilake
d4f818e866 Updating carbon.device.mgt.plugin.version 2017-04-07 15:51:23 +05:30
Amal Gunatilake
7c98128b6e Merge pull request #348 from sinthuja/test-merge
Adding profile-creator.sh
2017-04-07 15:03:06 +05:30
lakshani
b32b2ab184 Fixed issues of https://github.com/wso2/product-iots/issues/347 2017-04-06 13:58:49 +05:30
sinthuja
18cb016b88 Configuring executables as 755 file modes. 2017-04-05 19:30:59 +05:30
sinthuja
fb24264eb0 Removing unnecessary deployables from the each IoT profiles. 2017-04-05 18:20:52 +05:30
megala21
fa359b0455 Adding test cases 2017-04-05 17:12:39 +05:30
sinthuja
f8129149b1 First cut of adding the profile-creator.sh. 2017-04-05 10:45:06 +05:30
sinthuja
d29e58579b Fixing https://github.com/wso2/product-iots/issues/331 2017-03-30 17:23:17 +05:30
sinthuja
c189704778 Fixing the test cases which was passing in IoT 3.0.0. 2017-03-29 23:15:34 +05:30
sinthuja
caf6f89743 Fixing the integration test framework to work with new packaging structure. 2017-03-29 20:40:45 +05:30
sinthuja
46d9f28ad4 updating the license header 2017-03-27 13:35:46 +05:30
sinthuja
cb8b36dd1f Fixing https://github.com/wso2/carbon-device-mgt/issues/650. 2017-03-27 13:33:57 +05:30
sinthuja
1e23e37952 Updating the plugins deployer pom.xml 2017-03-24 11:13:57 +05:30
sinthuja
f9b4ad6647 Copying the cdmf analytics car file to iot-core. 2017-03-23 15:41:53 +05:30
sinthuja
7f2a5deb23 Changes due to the move of cdmf capp to device-mgt-plugins. 2017-03-22 19:18:10 +05:30
sinthuja
ecade231f2 Fixing the pom relative path issue. 2017-03-22 15:48:26 +05:30
sinthuja
089e9dc631 Updating the device-mgt and device-mgt-plgins versions. 2017-03-22 10:45:31 +05:30
sinthuja
8a1bb5bb16 Updating the pom.xml names, and resolving the warnings during the build. 2017-03-21 20:37:01 +05:30
sinthuja
0ba26a3a45 Sharing the user db with analytics and core profiles, and adding the tenant theme, 2017-03-21 18:17:23 +05:30
sinthuja
2ce5b0dd74 Merging the changes from wso2/master. 2017-03-20 17:47:04 +05:30
sinthuja
0e6ff6b266 Further reducing the pack size. 2017-03-20 17:13:55 +05:30
sinthuja
cbd695f598 Reducing the profiles to use same version of components. 2017-03-20 15:53:47 +05:30
sinthuja
573b7888ed Adding the Notification FCM feature. 2017-03-17 11:20:19 +05:30
sinthuja
b1e19ba038 Fixing the siddhi extension loading issue. 2017-03-16 23:49:30 +05:30
sinthuja
35aebbe445 Adding startup scripts for analytics, broker and iot-server. 2017-03-15 23:46:46 +05:30
sinthuja
1dcbcaec2a Fixing plugin installation issues and verifying virtual fire alarm. 2017-03-15 23:29:15 +05:30
sinthuja
50c4ee7039 Fixing the solr indexing error with temporary fix, and broker datasource. 2017-03-14 22:26:49 +05:30
sinthuja
d8bb6d6e3c Adding plugins and samples to the distribution. 2017-03-14 20:30:47 +05:30
sinthuja
f5378f61e9 fixing the API creating issue in the core. 2017-03-13 23:41:38 +05:30
sinthuja
b5af4176d2 Adding broker related files, and fixing the startup errors in all three profiles. 2017-03-13 21:37:45 +05:30
sinthuja
2c35edd820 Fixing the startup issues in core after copying all jars into components with bin.xml. 2017-03-13 12:22:44 +05:30
sinthuja
8ce4538d27 Fixing the CARBON_DB location issue in the analytics profile. 2017-03-10 11:23:08 +05:30
sinthuja
3326165513 Fixing the JVM startup issue in the analytics profile. 2017-03-10 11:06:04 +05:30
sinthuja
08bc742c4d Fixing the startup issues in the core profile. 2017-03-09 17:55:37 +05:30
sinthuja
6501ba46cf adding analytics profile to distribution. 2017-03-08 14:48:22 +05:30
sinthuja
13e8764f23 Removing unnecessary configuration elements. 2017-03-07 16:50:21 +05:30
sinthuja
546fc02ac4 fixing the build failure. 2017-03-07 16:46:35 +05:30
sinthuja
2f3eb595a2 Adding iot distribution with restructure components. 2017-03-07 16:42:46 +05:30
sinthuja
2a9f940b48 Adding analytics, broker profiles. 2017-03-06 16:32:40 +05:30
sinthuja
39e781c492 Making the core with default profile. 2017-03-06 16:09:20 +05:30
Susinda
06c8e7ae36 mobile-qsg refactored and dependencies copied from maven 2017-03-02 22:53:01 +05:30
Susinda
89357d0f0d Using the carbon.api.mgt.version 6.1.69, hence removing api#am#store.war 2017-02-28 20:02:59 +05:30
amalhub
1a79017ac1 Fixing issue: IOTS-492, Replace default api#am#store.war with the patched war 2017-02-27 17:35:44 +05:30
Rasika Perera
088d1a802e Fixing carbon apps copy path 2017-02-23 15:10:30 +05:30
madhawap
00ab274d9e resolving conflicts when merging cloud and master brnaches 2017-02-14 16:56:55 +05:30
madhawap
74edd97322 minor fix 2017-02-14 12:56:41 +05:30
Susinda Perera
905a7d8c50 Merge pull request #289 from ayyoob/210releasepatch
merging from Ayyoob - removed mutualssl feature and the updated apim version
2017-02-13 17:13:58 +05:30
lakshani
d0926571dc added test cases for chage device status 2017-02-13 15:04:02 +05:30
Rasika Perera
b697618b42 Update pom.xml 2017-02-13 14:51:55 +05:30
Menaka Jayawardena
f4c26edb74 Enabled backend integration tests in the build 2017-02-13 14:50:07 +05:30
Menaka Jayawardena
9535f4f8c0 Removed unwanted dependency 2017-02-13 14:45:48 +05:30
susinda
5de566ca0c device operation permisions changed, removed 'any-device', added 'disenrole' and 'owning-device' 2017-02-13 14:42:57 +05:30
Menaka Jayawardena
e70306ac17 Fixed Android Operations Integration Tests. 2017-02-13 14:42:27 +05:30
susinda
84adbc45ae binaries and images removed, added all (script + jars) in the script_and_resources.zip file 2017-02-13 14:41:32 +05:30
susinda
cb1a3d462d ios policy addition moved to bottom, passwords changed 2017-02-13 14:41:07 +05:30
lakshani
14645232b8 merging lakshani's changes on app-manager 2017-02-13 14:32:37 +05:30
GPrathap
f3f1fc40cb fixing a csrf property issue 2017-02-13 14:27:27 +05:30
Menaka Jayawardena
4d485c39c1 Merge PR #272 from menakaj 2017-02-13 14:26:23 +05:30
Menaka Jayawardena
134200375a merging menaka's commit 2017-02-13 14:22:27 +05:30
susinda
16c8948dea adding modified jars 2017-02-13 14:00:27 +05:30
susinda
ba7a9c2f45 Some issues fixed for ios app upload and logs added, readme modified with new usernames 2017-02-13 13:59:19 +05:30
Menaka Jayawardena
816657a117 Removed Thread.sleep usages. 2017-02-13 13:57:41 +05:30
Menaka Jayawardena
962623f257 Fixed Mobile device management and Android Enrollment test flows. 2017-02-13 13:57:16 +05:30
susinda
cffb96bc93 Adding required files (apk, ipa, images and other) 2017-02-13 13:55:51 +05:30
susinda
c2891c76e0 emm renamed to IoTs, some permisiosn issues fixed, names changed to ryan and milan 2017-02-13 13:54:59 +05:30
susinda
0779e358ed merging susinda's commit 'mobile-qsg code added' 2017-02-13 13:53:21 +05:30
ayyoob
cb9d17882c removed mutualssl feature and the updated apim version 2017-02-09 03:04:25 +05:30
ayyoob
59b86f9d50 Merge branch 'cloud-3.1.0' of https://github.com/wso2/product-iots into cloud-3.1.0 2017-02-08 13:14:23 +05:30
ayyoob
7daedd6516 added jwt authenticator 2017-02-08 13:11:03 +05:30
kamidu
0eb45e7c92 add the cloud menu to the iot pack 2017-02-07 20:24:23 +05:30
ayyoob
ef99c0f306 added default credential as properties 2017-02-06 03:48:20 +05:30
ayyoob
1e25f08945 fixed tokenValidationUrlIssue 2017-02-06 00:52:36 +05:30
ayyoob
f890415bae enabled mutual ssl support and added artifact deployment related features 2017-02-05 17:53:37 +05:30
ayyoob
ecda000395 used jwt grant type instead of saml 2017-02-04 20:52:24 +05:30
ayyoob
b03b958979 changes adapter configs after testing 2017-02-02 03:17:40 +05:30
ayyoob
c61cd953b2 few fixes after testing sso 2017-02-01 00:08:51 +05:30
ayyoob
3610ed762d enabled UseAuthenticatedUserDomainCrypto 2017-01-31 14:19:02 +05:30
ayyoob
ab70dbe38a few changes after testing multi tenancy 2017-01-30 22:33:18 +05:30
Ayyoob Hamza
26197ef770 Merge pull request #271 from ayyoob/3.0.0
removed apim dependencies and solved sso tenant login issues.
2017-01-26 12:18:33 +05:30
ayyoob
ca53efdab0 fixed sso login issue in portal in multi tenant 2017-01-26 00:30:03 +05:30
Menaka Jayawardena
a6519d1e04 Restored data sources change. 2017-01-25 17:14:03 +05:30
Menaka Jayawardena
3f010951af POM versions updated for next release. 2017-01-25 17:10:47 +05:30
Menaka Jayawardena
e8508b1dd0 Modifying Integration tests. 2017-01-25 16:26:40 +05:30
Menaka Jayawardena
5d41fe313b Merge branch 'backend-integration'
# Conflicts:
#	modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java
#	modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
#	modules/integration/tests-integration/src/test/resources/automation.xml
#	modules/integration/tests-integration/src/test/resources/testng.xml
2017-01-25 15:50:43 +05:30
ayyoob
2ca23cce29 changed configs to support custom grant type 2017-01-25 14:25:28 +05:30
Menaka Jayawardena
cacc4d4772 Access token generation flow fixed. 2017-01-25 14:18:36 +05:30
ayyoob
d6695a9082 renamed profile names 2017-01-25 09:24:38 +05:30
ayyoob
7290f64711 Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0 2017-01-24 22:23:44 +05:30
ayyoob
232e63aeea merged with origin 2017-01-24 20:47:24 +05:30
ayyoob
1ac1355eee removed cdmc dependency from core 2017-01-24 19:33:36 +05:30
Ayyoob Hamza
030938e83e Revert "Re-Enabling backend integration tests." 2017-01-24 11:48:53 +05:30
Menaka Jayawardena
3bc01b0bfb Pom versions updated. 2017-01-24 11:31:16 +05:30
Hasunie
c6fda7e3d1 Merge pull request #266 from menakaj/backend-integration
Re-Enabling backend integration tests.
2017-01-24 11:26:08 +05:30
WSO2 Builder
369fb23a25 [maven-release-plugin] prepare for next development iteration 2017-01-24 05:51:48 +00:00
Menaka Jayawardena
0f18eb9d5e Re-Enabling backend integration tests. 2017-01-24 11:21:05 +05:30
WSO2 Builder
f28b4f389b [maven-release-plugin] prepare release v3.0.0-RC2 2017-01-24 05:44:17 +00:00
Rasika Perera
9c2fc5985e [-Diot.gatway.host="localhost"] -> [-Diot.gateway.host="localhost" 2017-01-24 11:06:06 +05:30
Rasika Perera
e1e330e83e Fixed profiling issue on jss service 2017-01-23 16:21:14 +05:30
Rasika Perera
375f555a2c Updated LICENSE.txt 2017-01-23 15:17:06 +05:30
Rasika Perera
0ccd63936b Updated OWSAP property file 2017-01-23 12:43:37 +05:30
ayyoob
df304038da Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-20 21:22:50 +05:30
ayyoob
c91171e09c replaced jaggery.conf 2017-01-20 21:21:15 +05:30
Rasika Perera
56c6f6dee9 Updating LICENSE.txt 2017-01-20 19:44:28 +05:30
Rasika Perera
fc4eb83297 update INSTALL.txt and README.txt 2017-01-20 18:09:16 +05:30
ayyoob
61e28471de fixed connected cup sample issues 2017-01-20 16:27:32 +05:30
Rasika Perera
1015ca40dc Updating LICENSE.txt 2017-01-20 10:28:05 +05:30
Rasika Perera
9dbab2cf2b Updating LICENSE.txt 2017-01-20 10:13:09 +05:30
Rasika Perera
40880a434b Created LICENSE.txt for iot-analytics 2017-01-20 09:58:29 +05:30
Rasika Perera
6661a8671b Updated LICENSE.txt for message-broker 2017-01-20 09:58:13 +05:30
Rasika Perera
5a2a6e73ec Updated LICENSE.txt for iot-core 2017-01-20 09:57:53 +05:30
Rasika Perera
2db9f661ac Updated MB user-agent params and server name 2017-01-20 09:08:09 +05:30
Rasika Perera
bf61a210f8 Release note updated for 3.0.0 2017-01-20 08:41:05 +05:30
madhawap
68c46d10b3 fixes for synapse configs 2017-01-20 01:03:34 +05:30
madhawap
190f97cd20 fixes for synapse configs 2017-01-20 00:29:16 +05:30
Rasika Perera
91d9a43199 Fixing [iot.analytics.https.port] variable not picking up 2017-01-19 19:48:28 +05:30
Rasika Perera
6c32ad2bfc Merge pull request #262 from menakaj/master
Modified csrf property for devicemgt api
2017-01-19 19:34:12 +05:30
Rasika Perera
1add362b76 Updated distribution filter.properties 2017-01-19 15:20:57 +05:30
Rasika Perera
cba0499a80 Updated install.txt and readme.txt 2017-01-19 15:20:57 +05:30