ayyoob
|
08286dd88b
|
Merge branch 'master' of https://github.com/wso2/product-iots into new-master2
|
8 years ago |
sinthuja
|
c84dd34eaa
|
Merge branch 'wso2-master' into test-merge
# Conflicts:
# modules/distribution/src/core/plugins/plugins-deployer.xml
# pom.xml
|
8 years ago |
sinthuja
|
b94b171057
|
Removing gateway profile, and merging it with device backend.
|
8 years ago |
megala21
|
72d1891932
|
Adding initial jmeter scripts for app-publisher
|
8 years ago |
ayyoob
|
475bd3ac84
|
added filter properties to pick the parent plugins version
|
8 years ago |
ayyoob
|
834ad4f772
|
added missing appm features and installed android sense feature to the default pack
|
8 years ago |
sinthuja
|
3c74373597
|
Adding virtual fire alarm device type into the plugins deployer.
|
8 years ago |
sinthuja
|
6af2d23ef5
|
Adding Raspberry device type into the plugins deployer.
|
8 years ago |
sinthuja
|
7f06333cf8
|
Adding the ardino features to the plugins.
|
8 years ago |
sinthuja
|
37c3cf2d09
|
Adding andriod sense related features for the profiles.
|
8 years ago |
Amal Gunatilake
|
7db4733b1d
|
Merge pull request #399 from sinthuja/test-merge
Merging profile related fixes.
|
8 years ago |
Amal Gunatilake
|
af2d760e5b
|
Merge branch 'master' into master
|
8 years ago |
Amal Gunatilake
|
448d2f9b69
|
Updating the latest carbon.device.mgt.plugin.version
|
8 years ago |
sinthuja
|
d0e449ced0
|
Fixing the issues in the server ports mapping.
|
8 years ago |
sinthuja
|
c3743ea163
|
Merge branch 'wso2-master' into test-merge
|
8 years ago |
Chatura Dilan
|
f0ecea5359
|
Merge pull request #392 from janakamarasena/master
Change comment in bin.xml
|
8 years ago |
inoshperera
|
c7bd347618
|
Merge pull request #391 from sinthuja/local-branch2
Adding the missing social.xml file.
|
8 years ago |
megala21
|
ed7e574939
|
Adding policy mangement test cases
|
8 years ago |
megala21
|
a1688140c5
|
Adding notification management jmeter script
|
8 years ago |
sinthuja
|
00947e30b2
|
Fixing an issue in the key manager URL.
|
8 years ago |
sinthuja
|
0753585391
|
Adding the missing social.xml file.
|
8 years ago |
sinthuja
|
30c4c40f08
|
Adding the profile related improvements.
|
8 years ago |
Janak Amarasena
|
fd1cf890a2
|
Change comment
|
8 years ago |
megala21
|
583b562d8e
|
Removing the un-wanted copying of files
|
8 years ago |
megala21
|
fbab71b0f7
|
Improving multi-tenancy test cases and fixing certificate management public publish issue
|
8 years ago |
sinthuja
|
badc75a222
|
Merge branch 'wso2-master' into test-merge
|
8 years ago |
sinthuja
|
5ec80d4c0a
|
Moving the client-registration apps to device manager.
|
8 years ago |
sinthuja
|
6ddc2da328
|
Adding fixes related to ease distributed setup.
|
8 years ago |
megala21
|
fb5d73ecbe
|
Improving scripts
|
8 years ago |
megala21
|
0fea4d6eb0
|
Adding android negatove test cases and group management initial test cases
|
8 years ago |
Amal Gunatilake
|
faa5eb34d6
|
Merge pull request #384 from sinthuja/test-merge
Adding device manager profile node also in the indexing profiles
|
8 years ago |
sinthuja
|
7a4171be63
|
Removing the device-manager profile from webapp-publisher-config.xml.
|
8 years ago |
sinthuja
|
93cd14bc43
|
Adding the device-manager backend profile as well for webapp publishing.
|
8 years ago |
sinthuja
|
3a5f77c287
|
Adding device manager profile node also in the indexing profiles for the store to work in the distributed mode.
|
8 years ago |
Amal Gunatilake
|
a7c21fd22b
|
Updating the latest carbon.device.mgt.plugin.version
|
8 years ago |
Ayyoob Hamza
|
66be42a9ba
|
Merge pull request #374 from Megala21/test_case_fixes
Adding initial test cases with j-meter scripts
|
8 years ago |
megala21
|
e5df961298
|
Adding initial integration with device management api jmeter scripts
|
8 years ago |
Ayyoob Hamza
|
0df8dd1646
|
Merge pull request #371 from Megala21/test_case_fixes
Fixing test case failure
|
8 years ago |
megala21
|
81a4e7c503
|
Fixing test case failure
|
8 years ago |
Amal Gunatilake
|
1e0c018d95
|
Merge pull request #367 from sinthuja/test-merge
Fixes for profile creator for windows.
|
8 years ago |
sinthuja
|
2ef609d09c
|
Bug files for the profile-creator.bat after testing in windows machine, and improvements for script file.
|
8 years ago |
megala21
|
b0ab301004
|
Reformatting code
|
8 years ago |
megala21
|
23c385a7be
|
Improving android test cases
|
8 years ago |
sinthuja
|
8d99eb3967
|
Adding first cut of profile-creator.bat file.
|
8 years ago |
megala21
|
bb841f9a57
|
Merge remote-tracking branch 'upstream/master' into test_case_fixes
|
8 years ago |
megala21
|
1a80b27cd5
|
Improving android test cases
|
8 years ago |
sinthuja
|
992a561c61
|
Removing some unnecessary line in the secription.
|
8 years ago |
sinthuja
|
8fd14700c5
|
Fixing https://github.com/wso2/product-iots/issues/363.
|
8 years ago |
sinthuja
|
7f1d42a09c
|
Merge branch 'wso2-master' into test-merge
# Conflicts:
# modules/distribution/src/core/plugins/plugins-deployer.xml
|
8 years ago |
sinthuja
|
5ed7b60ae2
|
Fixing SSO issue with keymanager profile.
|
8 years ago |
megala21
|
828c59d0dd
|
Fixing test cases role management and user management
|
8 years ago |
sinthuja
|
45d02838fe
|
Adding all profiles creation in profile-creator.sh.
|
8 years ago |
sinthuja
|
12165fa996
|
Moving the profiles distributions into the temp directory.
|
8 years ago |
sinthuja
|
791ee45164
|
Fixing issue - https://github.com/wso2/product-iots/issues/358.
|
8 years ago |
sinthuja
|
69fff37565
|
Resolving the issue in resolving the porduct version for profile-creator.sh.
|
8 years ago |
sinthuja
|
70c4b9a24a
|
Removing some unwanted scripts from profiles.
|
8 years ago |
megala21
|
4abbd36cb5
|
Merge remote-tracking branch 'upstream/master' into test_case_fixes
|
8 years ago |
Amal Gunatilake
|
d4f818e866
|
Updating carbon.device.mgt.plugin.version
|
8 years ago |
Amal Gunatilake
|
7c98128b6e
|
Merge pull request #348 from sinthuja/test-merge
Adding profile-creator.sh
|
8 years ago |
lakshani
|
b32b2ab184
|
Fixed issues of https://github.com/wso2/product-iots/issues/347
|
8 years ago |
sinthuja
|
18cb016b88
|
Configuring executables as 755 file modes.
|
8 years ago |
sinthuja
|
fb24264eb0
|
Removing unnecessary deployables from the each IoT profiles.
|
8 years ago |
megala21
|
fa359b0455
|
Adding test cases
|
8 years ago |
sinthuja
|
f8129149b1
|
First cut of adding the profile-creator.sh.
|
8 years ago |
sinthuja
|
d29e58579b
|
Fixing https://github.com/wso2/product-iots/issues/331
|
8 years ago |
sinthuja
|
c189704778
|
Fixing the test cases which was passing in IoT 3.0.0.
|
8 years ago |
sinthuja
|
caf6f89743
|
Fixing the integration test framework to work with new packaging structure.
|
8 years ago |
sinthuja
|
46d9f28ad4
|
updating the license header
|
8 years ago |
sinthuja
|
cb8b36dd1f
|
Fixing https://github.com/wso2/carbon-device-mgt/issues/650.
|
8 years ago |
sinthuja
|
1e23e37952
|
Updating the plugins deployer pom.xml
|
8 years ago |
sinthuja
|
f9b4ad6647
|
Copying the cdmf analytics car file to iot-core.
|
8 years ago |
sinthuja
|
7f2a5deb23
|
Changes due to the move of cdmf capp to device-mgt-plugins.
|
8 years ago |
sinthuja
|
ecade231f2
|
Fixing the pom relative path issue.
|
8 years ago |
sinthuja
|
089e9dc631
|
Updating the device-mgt and device-mgt-plgins versions.
|
8 years ago |
sinthuja
|
8a1bb5bb16
|
Updating the pom.xml names, and resolving the warnings during the build.
|
8 years ago |
sinthuja
|
0ba26a3a45
|
Sharing the user db with analytics and core profiles, and adding the tenant theme,
|
8 years ago |
sinthuja
|
2ce5b0dd74
|
Merging the changes from wso2/master.
|
8 years ago |
sinthuja
|
0e6ff6b266
|
Further reducing the pack size.
|
8 years ago |
sinthuja
|
cbd695f598
|
Reducing the profiles to use same version of components.
|
8 years ago |
sinthuja
|
573b7888ed
|
Adding the Notification FCM feature.
|
8 years ago |
sinthuja
|
b1e19ba038
|
Fixing the siddhi extension loading issue.
|
8 years ago |
sinthuja
|
35aebbe445
|
Adding startup scripts for analytics, broker and iot-server.
|
8 years ago |
sinthuja
|
1dcbcaec2a
|
Fixing plugin installation issues and verifying virtual fire alarm.
|
8 years ago |
sinthuja
|
50c4ee7039
|
Fixing the solr indexing error with temporary fix, and broker datasource.
|
8 years ago |
sinthuja
|
d8bb6d6e3c
|
Adding plugins and samples to the distribution.
|
8 years ago |
sinthuja
|
f5378f61e9
|
fixing the API creating issue in the core.
|
8 years ago |
sinthuja
|
b5af4176d2
|
Adding broker related files, and fixing the startup errors in all three profiles.
|
8 years ago |
sinthuja
|
2c35edd820
|
Fixing the startup issues in core after copying all jars into components with bin.xml.
|
8 years ago |
sinthuja
|
8ce4538d27
|
Fixing the CARBON_DB location issue in the analytics profile.
|
8 years ago |
sinthuja
|
3326165513
|
Fixing the JVM startup issue in the analytics profile.
|
8 years ago |
sinthuja
|
08bc742c4d
|
Fixing the startup issues in the core profile.
|
8 years ago |
sinthuja
|
6501ba46cf
|
adding analytics profile to distribution.
|
8 years ago |
sinthuja
|
13e8764f23
|
Removing unnecessary configuration elements.
|
8 years ago |
sinthuja
|
546fc02ac4
|
fixing the build failure.
|
8 years ago |
sinthuja
|
2f3eb595a2
|
Adding iot distribution with restructure components.
|
8 years ago |
sinthuja
|
2a9f940b48
|
Adding analytics, broker profiles.
|
8 years ago |
sinthuja
|
39e781c492
|
Making the core with default profile.
|
8 years ago |
Susinda
|
06c8e7ae36
|
mobile-qsg refactored and dependencies copied from maven
|
8 years ago |
Susinda
|
89357d0f0d
|
Using the carbon.api.mgt.version 6.1.69, hence removing api#am#store.war
|
8 years ago |
amalhub
|
1a79017ac1
|
Fixing issue: IOTS-492, Replace default api#am#store.war with the patched war
|
8 years ago |
Rasika Perera
|
088d1a802e
|
Fixing carbon apps copy path
|
8 years ago |
madhawap
|
00ab274d9e
|
resolving conflicts when merging cloud and master brnaches
|
8 years ago |
madhawap
|
74edd97322
|
minor fix
|
8 years ago |
Susinda Perera
|
905a7d8c50
|
Merge pull request #289 from ayyoob/210releasepatch
merging from Ayyoob - removed mutualssl feature and the updated apim version
|
8 years ago |
lakshani
|
d0926571dc
|
added test cases for chage device status
|
8 years ago |
Rasika Perera
|
b697618b42
|
Update pom.xml
|
8 years ago |
Menaka Jayawardena
|
f4c26edb74
|
Enabled backend integration tests in the build
|
8 years ago |
Menaka Jayawardena
|
9535f4f8c0
|
Removed unwanted dependency
|
8 years ago |
susinda
|
5de566ca0c
|
device operation permisions changed, removed 'any-device', added 'disenrole' and 'owning-device'
|
8 years ago |
Menaka Jayawardena
|
e70306ac17
|
Fixed Android Operations Integration Tests.
|
8 years ago |
susinda
|
84adbc45ae
|
binaries and images removed, added all (script + jars) in the script_and_resources.zip file
|
8 years ago |
susinda
|
cb1a3d462d
|
ios policy addition moved to bottom, passwords changed
|
8 years ago |
lakshani
|
14645232b8
|
merging lakshani's changes on app-manager
|
8 years ago |
GPrathap
|
f3f1fc40cb
|
fixing a csrf property issue
|
8 years ago |
Menaka Jayawardena
|
4d485c39c1
|
Merge PR #272 from menakaj
|
8 years ago |
Menaka Jayawardena
|
134200375a
|
merging menaka's commit
|
8 years ago |
susinda
|
16c8948dea
|
adding modified jars
|
8 years ago |
susinda
|
ba7a9c2f45
|
Some issues fixed for ios app upload and logs added, readme modified with new usernames
|
8 years ago |
Menaka Jayawardena
|
816657a117
|
Removed Thread.sleep usages.
|
8 years ago |
Menaka Jayawardena
|
962623f257
|
Fixed Mobile device management and Android Enrollment test flows.
|
8 years ago |
susinda
|
cffb96bc93
|
Adding required files (apk, ipa, images and other)
|
8 years ago |
susinda
|
c2891c76e0
|
emm renamed to IoTs, some permisiosn issues fixed, names changed to ryan and milan
|
8 years ago |
susinda
|
0779e358ed
|
merging susinda's commit 'mobile-qsg code added'
|
8 years ago |
ayyoob
|
cb9d17882c
|
removed mutualssl feature and the updated apim version
|
8 years ago |
ayyoob
|
59b86f9d50
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/product-iots into cloud-3.1.0
|
8 years ago |
ayyoob
|
7daedd6516
|
added jwt authenticator
|
8 years ago |
kamidu
|
0eb45e7c92
|
add the cloud menu to the iot pack
|
8 years ago |
ayyoob
|
ef99c0f306
|
added default credential as properties
|
8 years ago |
ayyoob
|
1e25f08945
|
fixed tokenValidationUrlIssue
|
8 years ago |
ayyoob
|
f890415bae
|
enabled mutual ssl support and added artifact deployment related features
|
8 years ago |
ayyoob
|
ecda000395
|
used jwt grant type instead of saml
|
8 years ago |
ayyoob
|
b03b958979
|
changes adapter configs after testing
|
8 years ago |
ayyoob
|
c61cd953b2
|
few fixes after testing sso
|
8 years ago |
ayyoob
|
3610ed762d
|
enabled UseAuthenticatedUserDomainCrypto
|
8 years ago |
ayyoob
|
ab70dbe38a
|
few changes after testing multi tenancy
|
8 years ago |
Ayyoob Hamza
|
26197ef770
|
Merge pull request #271 from ayyoob/3.0.0
removed apim dependencies and solved sso tenant login issues.
|
8 years ago |
ayyoob
|
ca53efdab0
|
fixed sso login issue in portal in multi tenant
|
8 years ago |
Menaka Jayawardena
|
a6519d1e04
|
Restored data sources change.
|
8 years ago |
Menaka Jayawardena
|
3f010951af
|
POM versions updated for next release.
|
8 years ago |
Menaka Jayawardena
|
e8508b1dd0
|
Modifying Integration tests.
|
8 years ago |
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
|
8 years ago |
ayyoob
|
2ca23cce29
|
changed configs to support custom grant type
|
8 years ago |
Menaka Jayawardena
|
cacc4d4772
|
Access token generation flow fixed.
|
8 years ago |
ayyoob
|
d6695a9082
|
renamed profile names
|
8 years ago |
ayyoob
|
7290f64711
|
Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0
|
8 years ago |
ayyoob
|
232e63aeea
|
merged with origin
|
8 years ago |
ayyoob
|
1ac1355eee
|
removed cdmc dependency from core
|
8 years ago |
Ayyoob Hamza
|
030938e83e
|
Revert "Re-Enabling backend integration tests."
|
8 years ago |
Menaka Jayawardena
|
3bc01b0bfb
|
Pom versions updated.
|
8 years ago |
Hasunie
|
c6fda7e3d1
|
Merge pull request #266 from menakaj/backend-integration
Re-Enabling backend integration tests.
|
8 years ago |