Commit Graph

1382 Commits

Author SHA1 Message Date
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