Commit Graph

1762 Commits

Author SHA1 Message Date
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
Rasika Perera
c76427edc8 Temporary disable throttling info not found warnings on APIM 2017-01-19 15:20:57 +05:30
Menaka Jayawardena
5114d19a07 Modified csrf property for devicemgt api 2017-01-19 13:13:56 +05:30
Rasika Perera
48bcecf433 Merge pull request #260 from hasuniea/master
fixing localhost, port binding in synapse file
2017-01-19 01:26:46 +05:30
Rasika Perera
618ee3d01a CSRF fixed for /devicemgt/api 2017-01-18 20:59:56 +05:30
Rasika Perera
d0e3ae5106 Adding DAS env variables into shell script 2017-01-18 20:59:56 +05:30
Hasunie
f51dae6782 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-18 19:18:06 +05:30
Hasunie
6d5bb848d7 fixing localhost,port binding in synapse file 2017-01-18 19:17:54 +05:30
Maninda
93a4a9d494 Added security configs to that were missing 2017-01-18 16:33:42 +05:30
Chatura Dilan
af68560826 Merge branch 'master' of github.com:wso2/product-iots 2017-01-18 15:25:18 +05:30
Chatura Dilan
0bf780643d Added rule for installation 2017-01-18 15:25:03 +05:30
Rasika Perera
562a13962e Merge pull request #258 from chaturadilan/master
security fixes
2017-01-18 13:51:41 +05:30
sinthuja
0fa879e87f Merge remote-tracking branch 'origin/master' 2017-01-18 13:27:35 +05:30
sinthuja
07869a218a Updating the analytics feature used in iot-core to 1.3.3-SNAPSHOT to resolve the dependancy conflict issue in JSServiceConnector. 2017-01-18 13:24:45 +05:30
Chatura Dilan
6c02e9f947 Added Owasp security configurations 2017-01-18 13:01:45 +05:30
Chatura Dilan
d7e67c44df Merge branch 'master' of github.com:wso2/product-iots 2017-01-18 13:00:08 +05:30
Chatura Dilan
df7d612176 Added Owasp security configurations 2017-01-18 12:59:45 +05:30
Rasika Perera
ae92479ac7 Fixing connected cup issue 2017-01-18 12:58:20 +05:30
Maninda
c90bf7f9ae Corrected cache filters in web.xml files 2017-01-18 12:43:55 +05:30
Rasika Perera
127575a961 Changed connected cup plugin version [org.coffeeking.version] 2017-01-18 11:57:45 +05:30
ayyoob
2c500c4e4f added apim separation 2017-01-18 01:50:46 +05:30
Maninda
819f3c9a23 Made web apps to be extracted and replace the web.xml files and pack again for fixing security issues 2017-01-17 17:41:24 +05:30
ayyoob
df6d28fe0f installed missing features for device backend 2017-01-17 15:52:03 +05:30
ayyoob
b1bbd5c891 Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0 2017-01-16 23:55:22 +05:30
Rasika Perera
b74ea7baca Adding escape urls to csrf gurad 2017-01-16 23:36:01 +05:30
ayyoob
3e152d9ace Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0 2017-01-16 22:40:24 +05:30
ayyoob
c7251e251a renaming worker to backend 2017-01-16 19:42:59 +05:30
Rasika Perera
b267d7eda0 Merge pull request #257 from hasuniea/master
fixing CSRF issue in IOT server login
2017-01-16 18:45:17 +05:30
Hasunie
da44554243 fixing CSRF issue in IOT server login 2017-01-16 18:36:21 +05:30
ayyoob
96e7ca0900 Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0 2017-01-16 18:30:41 +05:30
Maninda
5ff53e84b5 Commented war file copy functionality 2017-01-16 17:03:24 +05:30
Maninda
6eb1bdd719 Merge branch 'master' of github.com:wso2/product-iots 2017-01-16 16:47:23 +05:30
Maninda
366c05961d Removed jaggery.conf from copying at build time 2017-01-16 16:46:19 +05:30
ayyoob
1b8d52e5e2 fixed multi tenant login issue 2017-01-16 16:08:23 +05:30
sinthuja
1e7404fdfa Merge remote-tracking branch 'origin/master' 2017-01-16 15:14:37 +05:30
sinthuja
6b6936591a Removing the temporary files from core distribution. 2017-01-16 15:10:05 +05:30
Rasika Perera
301f795260 Update designer.json 2017-01-16 15:08:49 +05:30
Maninda
f709353fc5 Corrected the security fixed web-app replacing configuration 2017-01-16 11:27:06 +05:30
WSO2 Builder
7286c37533 [maven-release-plugin] prepare for next development iteration 2017-01-14 22:41:45 +00:00
WSO2 Builder
7018c87e66 [maven-release-plugin] prepare release v3.0.0-RC 2017-01-14 22:33:32 +00:00
Rasika Perera
ef53c43923 Corrected coffeecup versions issues 2017-01-15 03:41:48 +05:30
Rasika Perera
2f15288d68 Corrected coffeecup versions 2017-01-15 03:41:06 +05:30
Rasika Perera
2ea8aafee8 Adding [basedir] on dist.xml 2017-01-15 03:37:40 +05:30
Rasika Perera
c6b0dc86b4 Merge pull request #256 from ayyoob/3.0.0
disabled api update
2017-01-13 22:43:30 +05:30
ayyoob
9a3049d77d disabled api update 2017-01-13 22:17:33 +05:30
Maninda
d983b2f843 q
Merge branch 'master' of github.com:wso2/product-iots
2017-01-13 20:53:25 +05:30
Maninda
12b1672208 Added jaggery.conf and web apps with correct security filters / filter mappings 2017-01-13 20:53:03 +05:30
Rasika Perera
b9a4795043 Removed bundle.info replacement on plugins-deployer 2017-01-13 20:11:13 +05:30
Ayyoob Hamza
a6ef5babd5 Merge pull request #255 from ayyoob/3.0.0
change default stats permission
2017-01-13 20:06:25 +05:30
Dunith Dhanushka
8d266126f8 Updating endpoint URLs for DCR 2017-01-13 19:55:22 +05:30
ayyoob
75643a1041 change default stats permission 2017-01-13 19:38:50 +05:30
Hasunie
230ab657a3 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-13 15:49:13 +05:30
Rasika Perera
d49991a7f0 Fixing windows-web-agent and android-web-agent not copied issue 2017-01-13 14:23:41 +05:30
ayyoob
78d689b24b adding android and windows db creation by default 2017-01-13 12:02:33 +05:30
Hasunie
2a1db1ba69 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-13 09:12:32 +05:30
Hasunie
abdb962e79 adding windows synapse configs 2017-01-13 09:12:14 +05:30
ayyoob
b8706c0437 few changes in the config 2017-01-13 05:25:29 +05:30
ayyoob
854d4389d9 updated webapp-publisher config 2017-01-13 05:18:51 +05:30
ayyoob
8ac43f0f37 few changes after testing gateway 2017-01-13 04:48:55 +05:30
ayyoob
f7399060e5 moved the configs to gateway 2017-01-12 19:30:17 +05:30
ayyoob
4ca84a9f2d Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0 2017-01-12 11:25:37 +05:30
ayyoob
03150ad70f made android and windows to be available by default 2017-01-12 11:13:10 +05:30
ayyoob
648b276491 few changes after testing the cluster 2017-01-12 11:12:49 +05:30
Rasika Perera
38e3f90240 Merge pull request #250 from ayyoob/3.0.0
added missing features updated configs
2017-01-11 13:24:46 +05:30
Rasika Perera
205dd41b0a Merge pull request #231 from dimuthnc/master
location-data-visualizer sample added to product-iots/modules/samples
2017-01-11 13:24:31 +05:30
ayyoob
e6ce91885d added missing components for profile 2017-01-11 13:08:36 +05:30
charitha
5feb7f82f2 Fix issues in connectedcup device 2017-01-10 16:47:28 +05:30
ayyoob
9f366902b1 Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0 2017-01-10 03:32:41 +05:30
ayyoob
63200bec45 added missing features and configurations 2017-01-10 03:09:57 +05:30
Rasika Perera
85c5be77c3 Merge pull request #248 from menakaj/master
Fixing the existing UI integration tests.
2017-01-09 17:02:24 +05:30
Menaka Jayawardena
ae8aec6a4e Fixing the existing UI integration tests. 2017-01-09 16:59:05 +05:30
Rasika Perera
df3a2deeea Merge pull request #246 from madhawap/master
fixes to plugins-deployer.xml
2017-01-09 14:59:41 +05:30
madhawap
07e7cb4a0a fixes to plugins-deployer.xml 2017-01-09 14:56:59 +05:30
Rasika Perera
bfc3882592 Merge pull request #245 from menakaj/master
Enabling Integration tests in parent pom
2017-01-09 14:45:48 +05:30
Menaka Jayawardena
370ed5fd98 Changing pom versions to match with parent. 2017-01-09 14:06:05 +05:30
Menaka Jayawardena
52290cf485 Disabling UI tests in build time by default. 2017-01-09 13:29:05 +05:30
ayyoob
751eef086e revived connected cup sample 2017-01-08 22:53:23 +05:30
ayyoob
9c12a2c4a0 changed default h2 port to 9095 2017-01-08 21:29:28 +05:30
ayyoob
afde45b2f0 Added default values for input and output adapters 2017-01-08 21:29:08 +05:30
Rasika Perera
18d97073d1 Updated cdmf-plugins version into [3.0.5] 2017-01-07 22:06:26 +05:30
Rasika Perera
a6e5ab4531 Renamed pom.xml var [carbon.kernel.version.iotcore] into [carbon.kernel.version] 2017-01-07 08:23:29 +05:30
Rasika Perera
e04be13e52 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-06 20:30:53 +05:30
Rasika Perera
414044177d Merge pull request #242 from menakaj/master
Fixed https://wso2.org/jira/browse/IOTS-360 : Modifying current UI integration tests.
2017-01-06 19:37:15 +05:30
Rasika Perera
452950c7e5 Merge pull request #240 from geethkokila/master
Adding the ios gateway support for the iot server
2017-01-06 19:35:04 +05:30
Menaka Jayawardena
c9ab7103d8 Fixed IOTS-360 : Modifying current ui integration tests. 2017-01-06 19:31:40 +05:30
Rasika Perera
cb4b5d9732 Merge pull request #241 from menakaj/master
Fixed https://wso2.org/jira/browse/IOTS-359
2017-01-06 19:27:37 +05:30
Rasika Perera
ba46ff6dd0 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-06 19:03:32 +05:30
geethkokila
838d1cf610 Adding the ios gateway support for the iot server 2017-01-06 17:14:00 +05:30
Milan Perera
df79fcd6fd Merge branch 'master' of https://github.com/wso2/product-iots into latest-master 2017-01-06 16:51:39 +05:30
Rasika Perera
2e220d21ec Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-06 14:20:57 +05:30
Menaka Jayawardena
f40159eca3 Merge remote-tracking branch 'origin/master' 2017-01-06 14:19:16 +05:30
Menaka Jayawardena
88e696b4e9 Adding custom Test Automation Extensions to start up the servers. 2017-01-06 14:18:58 +05:30
Menaka Jayawardena
284c221056 Changed the integration pom version to 3.0.1-SNAPSHOT. 2017-01-06 14:16:36 +05:30
Ace
7cfa3970ed Adding auto_server_port 2017-01-06 13:34:36 +05:30
Milan Perera
11b0db7bed Fixed version conflics 2017-01-06 13:17:25 +05:30
ayyoob
754fbe7dd3 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-05 22:27:32 +05:30
ayyoob
8888383e81 added deployer features 2017-01-05 22:27:27 +05:30
GPrathap
d8fdd18dde Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-05 14:39:46 +05:30
GPrathap
acb4593b9a fixed: https://wso2.org/jira/browse/IOTS-344 2017-01-05 14:19:46 +05:30
Rasika Perera
c51d630bfd Merge pull request #234 from ruwany/jira-fix
Making h2 db shareable between das and iot core
2017-01-05 12:42:21 +05:30
GPrathap
2e13e834c5 fixed: IOTS-204 2017-01-05 12:36:31 +05:30
Milan Perera
1f172a65ee Merge branch 'master' of https://github.com/ruwany/product-iots into latest-master 2017-01-05 10:05:33 +05:30
Milan Perera
45207898c0 Configured APIMs PasswordGrantHandler in identity.xml 2017-01-05 10:05:27 +05:30
Rasika Perera
56a976a84a Merge pull request #235 from rasika/master
Fixing https://wso2.org/jira/browse/IOTS-356
2017-01-04 19:53:06 +05:30
Rasika Perera
d93d9dd0a6 Fixing https://wso2.org/jira/browse/IOTS-356 2017-01-04 19:20:16 +05:30
Ace
70c656b5d4 reverting commit related to identity version bump 2017-01-04 18:18:29 +05:30
Ace
eaea7ff37f Merging with master 2017-01-04 18:03:08 +05:30
Ace
04128c7ee3 Making h2 db shareable between das and iot core 2017-01-04 17:51:37 +05:30
charitha
15d3a124b0 Increment plugin deployer version 2017-01-04 10:14:13 +05:30
sinthuja
1c203e0f61 Merge remote-tracking branch 'origin/master' 2017-01-03 13:35:25 +05:30
sinthuja
970bb35260 Adding sso by default for analytics portal application. 2017-01-03 13:35:08 +05:30
Ruwan
172f41d8da Merge pull request #233 from rasika/master
Fixing IoTS version issue
2017-01-03 12:31:41 +05:30
Rasika Perera
6866ee8f24 Fixing IoTS version issue 2017-01-03 12:25:08 +05:30
Ace
b22bfa88e6 Bumping IS versions to latest ones 2017-01-02 16:00:01 +05:30
GPrathap
24b6d4dc0e added org.wso2.carbon.apimgt.rest.api.dcr.feature 2017-01-02 14:41:59 +05:30
GPrathap
9192f8e65c updated designer.json 2017-01-02 14:34:38 +05:30
Menaka Jayawardena
329407d318 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-02 12:24:20 +05:30
Dimuth
37789891e7 location-data-visualizer sample added to product-iots/modules/samples 2017-01-01 21:48:49 +05:30
Rasika Perera
598a41e964 Merge pull request #230 from rasika/master
Upgrading CDMF and CDMF-plugins
2016-12-25 07:55:20 +05:30
Rasika Perera
36480c3c80 Upgrading CDMF and CDMF-plugins 2016-12-25 07:54:31 +05:30
WSO2 Builder
4cd01294ff [maven-release-plugin] prepare for next development iteration 2016-12-24 20:40:57 +00:00
WSO2 Builder
990d941c75 [maven-release-plugin] prepare release v3.0.0-BETA 2016-12-24 20:34:55 +00:00
Rasika Perera
879a3b1c5b Upgrading CDMF and CDMF-plugins 2016-12-25 01:58:25 +05:30
Menaka Jayawardena
53843181f7 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-23 12:27:38 +05:30
Ace
36ec90b681 Bumping oauth dependencies 2016-12-22 15:42:17 +05:30
Ace
6fa320f8bb Updating identity/auth-saml dependencies to latest 2016-12-22 11:02:36 +05:30
Supun94
91cf3015a4 Minor refactoring on cdm-config file 2016-12-22 10:51:56 +05:30
Supun94
4e845dcc37 Changing cdm-config file 2016-12-22 10:51:56 +05:30
Rasika Perera
a3b3d92be0 Disable hostname verification for opensaml http-client 2016-12-22 08:31:14 +05:30
charitha
ea333d897e Remove carbon console UI from MB 2016-12-20 12:31:13 +05:30
charitha
05ab111437 Merge branch 'master' of https://github.com/madawas/product-iots 2016-12-19 15:39:53 +05:30
Ace
d48f4e03ea Adding iot-core specific is bundles to accomodate appm identity version upgrade 2016-12-19 15:26:43 +05:30
Ace
fefd0ab3e2 upgrading to latest version of identity 2016-12-19 11:38:18 +05:30
Rasika Perera
485015b479 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-16 12:43:15 +05:30
Rasika Perera
c2806678e6 Updating APIKeyValidator/ServerURL to pick current IP instead of "localhost" 2016-12-16 12:42:47 +05:30
Harshan Liyanage
5de373b6c2 Added OWASP configurations to IoT pack. 2016-12-16 10:56:50 +05:30
Madawa Soysa
ac5c4b0d3c Removing UI components from MB
This commit removes the ui components of the message broker module in order to bring the module in to a headless state.
2016-12-15 17:21:21 +05:30
Menaka Jayawardena
75c6eba589 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-14 16:39:31 +05:30
Harshan Liyanage
4ef3e703da Added Owasp config for store and publisher apps 2016-12-14 11:22:25 +05:30
Menaka Jayawardena
5431fced9c Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-14 10:20:32 +05:30
Rasika Perera
fc821e1cab Changing SSO login page into /devicemgt/login 2016-12-09 19:02:19 +05:30
charitha
ec2a28d097 Bump versions to next development iteration 2016-12-09 13:12:41 +05:30
WSO2 Builder
412f912ca3 [maven-release-plugin] prepare for next development iteration 2016-12-09 06:30:04 +00:00
WSO2 Builder
80bfd669d2 [maven-release-plugin] prepare release v1.0.0-ALPHA5 2016-12-09 06:27:54 +00:00
charitha
0e13ffc991 Bump versions to released component versions 2016-12-09 01:32:56 +05:30
Charitha Goonetilleke
40d7ebce0b Merge pull request #217 from madhawap/master
Adding separate tasks to carry out device monitoring for each device type
2016-12-08 18:03:39 +05:30
madhawap
62f46a2cf8 Adding separate tasks to carry out device monitoring for each device type 2016-12-08 17:52:46 +05:30
dunithd
042da62607 Upgrading analytics carbon.kernel.version to 4.4.10 2016-12-08 17:50:00 +05:30
madhawap
dfbecaa8c2 Adding separate tasks to carry out device monitoring for each device type 2016-12-08 17:43:53 +05:30
Menaka Jayawardena
1d7021d06a Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-08 16:43:50 +05:30
Rasika Perera
e7f6c0797f Revert back changes done to sso 2016-12-08 14:59:42 +05:30
Rasika Perera
b7bc800cec Replacing application-authentication.xml from IoT 2016-12-07 14:53:28 +05:30
Menaka Jayawardena
9045b50fa8 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-07 13:20:39 +05:30
Menaka Jayawardena
934b4706d4 Modified designer.json to share query parameters in portal. 2016-12-07 13:16:49 +05:30
sinthuja
c4bb4fc544 Merge branch 'android-sense-feature' 2016-12-07 11:08:46 +05:30
Megala
20da28f48b Making the local copies of designer.json to be compatible with carbon-dashboards designer.json 2016-12-07 09:57:30 +05:30
charitha
a52f02850f Merge branch 'master' of https://github.com/wso2/product-iot-server 2016-12-06 18:01:32 +05:30
sinthuja
75a1fb6ede Merge pull request #213 from Megala21/embed
Adding siddhi extension feature for geo dashboard
2016-12-06 17:46:24 +05:30
Megala
aeaee5222f Adding siddhi extension feature for geo dashboard 2016-12-06 17:19:25 +05:30
Chatura Dilan
79325ac52a Creating APPM datasources 2016-12-06 15:16:37 +05:30
charitha
f0bc7854cc Merge branch 'master' of https://github.com/wso2/product-iot-server 2016-12-06 15:09:25 +05:30
charitha
b255782834 Add certificate mgt apis 2016-12-06 15:09:11 +05:30
Chatura Dilan
cd26a8daec Merge branch 'master' of github.com:wso2/product-iots 2016-12-06 13:50:38 +05:30
Chatura Dilan
9874844082 Added config to remove webapps 2016-12-06 13:48:08 +05:30
Rasika Perera
3e3bf1ce38 Fixing application-authentication.xml not replaced 2016-12-06 12:18:30 +05:30
Rasika Perera
945c581d99 Copying application-authentication.xml into pack 2016-12-06 11:59:23 +05:30
Rasika Perera
ae96430e0d Adding /devicemgt/login as authentication url when sso enabled 2016-12-06 10:59:45 +05:30
Rasika Perera
17f01a137e Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-06 10:33:25 +05:30
Rasika Perera
96d0d048df Adding APNS and GCM commented on cdm-config 2016-12-06 10:25:40 +05:30
Chatura Dilan
5cd3b6a2a8 Adding appstore module 2016-12-05 13:50:18 +05:30
GPrathap
9ec723966d Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-02 18:59:33 +05:30
GPrathap
47a9d9a767 added mb related new configurations 2016-12-02 18:58:26 +05:30
Rasika Perera
fe8beb5eb2 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-02 08:56:28 +05:30
charitha
6fb07cfe40 Bump versions to next development 2016-12-01 20:43:00 +05:30
WSO2 Builder
58a2eafffb [maven-release-plugin] prepare for next development iteration 2016-12-01 14:58:06 +00:00
WSO2 Builder
72e39a9603 [maven-release-plugin] prepare release v1.0.0-ALPHA4 2016-12-01 14:55:56 +00:00
charitha
5398c691a7 Bump versions to released component versions 2016-12-01 20:16:40 +05:30
Rasika Perera
346a50fc64 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-01 17:05:41 +05:30
Rasika Perera
ebe22410c4 Adding missing certificate management web apps features 2016-12-01 16:45:42 +05:30
Megala
090da79419 Removing roles and commented lines 2016-12-01 15:45:58 +05:30
Megala
ccd6184c9a Adding fixes for sso and making sso by default for all the jaggery apps 2016-12-01 14:22:22 +05:30
Charitha Goonetilleke
913d974cdf Merge pull request #204 from hasuniea/IoTS-1.0.0
adding windows feature to plugins-deployer.xml
2016-11-30 11:45:07 +05:30
sinthuja
ccb7d837b8 adding the iot geo fencing dashboard. 2016-11-28 01:35:37 +05:30
charitha
50c456b04f Bump versions to next development 2016-11-25 16:31:25 +05:30
WSO2 Builder
5e2b243ee3 [maven-release-plugin] prepare for next development iteration 2016-11-25 10:41:48 +00:00
WSO2 Builder
9828edda94 [maven-release-plugin] prepare release 1.0.0-ALPHA3 2016-11-25 10:39:21 +00:00
charitha
7908154d40 Bump versions to released component versions 2016-11-25 15:47:29 +05:30
Hasunie
3f569d4691 adding windows feature to plugins-deployer.xml 2016-11-24 09:19:50 +05:30
ayyoob
119aff7fc4 Merge branch 'master' of https://github.com/wso2/product-iots into IoTS-1.0.0 2016-11-21 19:24:05 +05:30
ayyoob
f3f082568f removed feature listener 2016-11-21 19:23:55 +05:30
ayyoob
f132818459 renamed default idp name 2016-11-21 19:14:48 +05:30
sinthuja
0b86f76362 Adding some fixes for android analytics. 2016-11-21 17:15:38 +05:30
ayyoob
8083f0350b removed unused components 2016-11-20 02:38:05 +05:30
ayyoob
caf65dcfb7 removed matt-gateway-profile generation 2016-11-17 23:33:46 +05:30
ayyoob
c01ca30a79 Merge branch 'master' of https://github.com/wso2/product-iots into IoTS-1.0.0 2016-11-17 20:23:04 +05:30
ayyoob
857b4360dd Merge branch 'IoTS-1.0.0' of https://github.com/wso2/product-iots into IoTS-1.0.0 2016-11-17 20:19:46 +05:30
ayyoob
7373de0a7a removed features tmp directory 2016-11-17 20:18:47 +05:30
sinthuja
62280f4e1a Removing the integration tests from core module to main module. 2016-11-17 12:17:11 +05:30
charitha
2c2f7ccd25 Bump versions to next development 2016-11-16 21:27:53 +05:30
WSO2 Builder
686d3be678 [maven-release-plugin] prepare for next development iteration 2016-11-16 15:34:29 +00:00
WSO2 Builder
80aaefe75f [maven-release-plugin] prepare release v1.0.0-ALPHA2 2016-11-16 15:32:27 +00:00
charitha
3ff3207ac1 Set broker version to be same as the core version 2016-11-16 20:41:22 +05:30
charitha
93ecdd3428 Update cdmf plugins version 2016-11-16 20:23:48 +05:30
Ace
4d44095714 Renaming samples to plugins 2016-11-16 17:44:35 +05:30
sinthuja
44af7334cf Removing the samples directory from the core distribution. 2016-11-16 16:31:07 +05:30
sinthuja
6a5ac2be1f Removing mqtt profile from core distribution, and adding the version to pack. 2016-11-16 16:24:28 +05:30
sinthuja
658cc1a157 Updating the module names according to the convention. 2016-11-16 15:48:49 +05:30
sinthuja
41bc7b038c Removing some unnecessary sources from the broker module. 2016-11-16 15:45:22 +05:30
sinthuja
6d1c377ab2 Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0 2016-11-16 14:46:48 +05:30
sinthuja
e6d6c5f178 Removing some unnecessary sources from the analytics module. 2016-11-16 14:45:58 +05:30
charitha
669ab894f9 Update component versions for IoTS-1.0.0 release 2016-11-16 13:33:26 +05:30
sinthuja
4e29b177f0 Merge branch 'iot-product-restructure' into IoTS-1.0.0-fresh2
# Conflicts:
#	modules/core/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java
#	modules/core/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/internal/AuthorizationDataHolder.java
#	modules/core/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/internal/AuthorizationServiceComponent.java
#	modules/core/iot-extensions/components/mb-extensions/pom.xml
#	modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/src/main/resources/build.properties
#	modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/src/main/resources/p2.inf
#	modules/core/iot-extensions/features/mb-extensions-feature/pom.xml
#	modules/distribution/src/samples-deployer.xml
#	pom.xml
2016-11-10 22:00:42 +05:30
sinthuja
617699693e Changing the JVM startup order, and adding trap for stoping the servers. 2016-11-10 21:48:36 +05:30
sinthuja
3349db1757 Changing the JVM startup order 2016-11-10 21:37:34 +05:30
sinthuja
15a4f4dd4f Fixing some issues in the broker distribution, and the analytics distribution. 2016-11-10 21:21:48 +05:30
sinthuja
2992d9e098 adding samples to the root location. 2016-11-09 17:55:24 +05:30
sinthuja
5ca98782fd Fixing issues in the sample integration. 2016-11-09 16:40:14 +05:30
sinthuja
3bf2f21711 Adding back the device-analytics-config.xml, and modifying log4j configs. 2016-11-09 14:19:17 +05:30
sinthuja
227779c2ad adding broker distribution and some logging configuration changes. 2016-11-09 12:44:21 +05:30
GPrathap
0ce49684fc init commit: adding wso2 mb as wso2iot- broker 2016-11-09 09:45:35 +05:30
ayyoob
8de788097a Merge branch 'IoTS-1.0.0' of https://github.com/wso2/product-iots into IoTS-1.0.0 2016-11-08 23:43:26 +05:30
ayyoob
21bf103e6e added android feature 2016-11-08 23:41:27 +05:30
sinthuja
da7929c5a3 some more fixes to the startup script. 2016-11-08 20:57:12 +05:30
sinthuja
37b2cb01ff Adding bin scripts. 2016-11-08 20:38:27 +05:30
GPrathap
401ad2846c removing mb mqtt authorization extension. This has been moved to https://github.com/wso2/carbon-device-mgt-plugins/pull/403 2016-11-08 16:19:45 +05:30
sinthuja
e0b29d4f08 Moving geo dashboard related files to src/repo/resources. 2016-11-08 13:04:40 +05:30
sinthuja
5fb6db5c7a Renaming the analytics modules to follow the naming structure. 2016-11-08 12:55:40 +05:30
sinthuja
9704c0b51f Adding empty distribution module. 2016-11-08 12:50:07 +05:30
sinthuja
21ab784b44 removing the distro 2016-11-08 12:48:23 +05:30
sinthuja
f551b4447a Removing the distribution dir. 2016-11-08 12:39:12 +05:30
sinthuja
81030f5d22 Removing old modules, and creating empty skeleton for broker and distro. 2016-11-08 12:33:24 +05:30
sinthuja
0e959da763 First cut of iot-pack restructuring. 2016-11-08 12:27:59 +05:30
ayyoob
4a4412b927 disabled mobile feature installation 2016-11-07 00:52:06 +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
GPrathap
56ec6b1e96 removing cdmf devicetype archetype. This has been moved to https://github.com/wso2/carbon-device-mgt-maven-plugin 2016-11-02 15:42:37 +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
kamidu
89b8a45e2e adding new released version of carbon-kernal, device-mgt and device-mgt-plugins 2016-11-01 14:43:18 +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
sinthuja
87109d5b87 Adding analytics files. 2016-10-26 15:10:49 +05:30
ayyoob
647262b652 added filter properties and escape string for resource plugin 2016-10-24 02:18:19 +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
ayyoob
81efa0e2c7 updated plugins version 2016-10-23 14:18:03 +05:30
ayyoob
45348c2a0a added deployer features to p2 profile 2016-10-23 01:24:07 +05:30
susinda
12c12067c7 Merge remote-tracking branch 'upstream/master' 2016-10-21 12:41:46 +05:30
ayyoob
a6dac9a19e resolved default api invocation issue 2016-10-10 20:47:56 +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
Rasika Perera
d246557763 Upgrading CDMF and CDMF plugins versions 2016-10-03 08:40:11 +05:30
Rasika Perera
2825269e4b Merge branch 'master' of https://github.com/rasika/product-iots 2016-09-29 16:17:58 +05:30
Rasika Perera
b8aacdcf40 Merge pull request #1 from warunalakshitha/master
Upgrade to carbon 4.4.9
2016-09-29 11:24:40 +05:30
warunalakshitha
6ef4bb4a9b Remove org.wso2.carbon.event.server featre from p2 since feature has been removed from carbon commons 2016-09-29 01:18:10 +05:30
warunalakshitha
eaf8da4548 Upgrade iot product features to latest identity and carbon version 2016-09-29 01:13:40 +05:30
warunalakshitha
b24ec4e36a Upgrade to carbon 4.4.9 2016-09-29 01:02:43 +05:30
warunalakshitha
af5c886907 Add akka reference file and registry-event-broker.xml 2016-09-29 01:01:55 +05:30
warunalakshitha
587c792b91 Fix hostname verfication issue 2016-09-29 01:00:49 +05:30
warunalakshitha
f1777e67ea Move carbon kernal version to 4.4.9 2016-09-29 00:59:09 +05:30
warunalakshitha
9a3fcccf63 Update api-manager.xml to 6.0.5 version 2016-09-29 00:58:05 +05:30
warunalakshitha
82a352242c Update api manager db scripts to 6.0.5 version 2016-09-29 00:57:29 +05:30
Rasika Perera
d47864db8a Fixing invalid invoker util URLs 2016-09-27 21:46:59 +05:30
Rasika Perera
9329e14bc1 Fixing invalid invoker util URLs 2016-09-27 21:42:26 +05:30
Rasika Perera
3b3bf6b854 Updating CDMF-plugins version for samples 2016-09-27 21:05:52 +05:30
Rasika Perera
70b1f9374c Fixing incorrect device object returned from JS to Hbs templates 2016-09-27 20:45:13 +05:30
Rasika Perera
eb3c68d895 Adding certificate management schema generation 2016-09-22 16:50:29 +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
bb29f61dbe Removed GCM notification adapter feature 2016-09-21 00:59:55 +05:30
Rasika Perera
75a34b3b20 Updating samples cdmf and cdmf plugins versions into snapshots 2016-09-21 00:59:55 +05:30
Rasika Perera
3ccb57747d Updating samples version 2016-09-21 00:59:55 +05:30
Rasika Perera
cf56008672 Updating cdmf and cdmf-plugins versions in samples 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
70483aacde merged with upstream 2016-07-28 17:03:08 +05:30
ayyoob
dca55c7385 fixed formatting issues and removed storing error message 2016-07-28 15:40:55 +05:30
ayyoob
c9736707ca fixed the formatting issues. 2016-07-28 15:37:16 +05:30
ayyoob
1033dfd40e added missng log trace 2016-07-28 15:22:07 +05:30
ayyoob
f072fb260a Changed to commons logging 2016-07-28 14:43:24 +05:30
ayyoob
5991eeec58 added missing log 2016-07-28 14:32:30 +05:30
ayyoob
9c82589af2 fixed formatting issues 2016-07-28 14:28:28 +05:30
Milan Perera
aeef79b47e Merge pull request #180 from ayyoob/das-ext
few changes in real time analytics
2016-07-28 14:13:50 +05:30
ayyoob
971fd80b83 few changes in real time analytics 2016-07-27 14:45:55 +05:30
Ace
1bbaf13b5c Updating sample webapp name 2016-07-26 11:24:22 +05:30
charitha
0a61e29641 Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/70 2016-07-23 11:33:23 +05:30
charitha
66470f145b Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/118 2016-07-23 11:14:59 +05:30
charitha
f071ce0d84 Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/83 2016-07-23 10:51:14 +05:30
charitha
1b42f08a01 Fix issues in PR https://github.com/wso2/product-iots/pull/151 2016-07-21 17:50:11 +05:30
charitha
35a47f81b0 Fix issues in PR https://github.com/wso2/product-iots/pull/151 2016-07-21 17:43:49 +05:30
charitha
258d059ddb Merge branch 'master' of https://github.com/wso2/product-iots 2016-07-21 10:47:47 +05:30
charitha
3ed272f22e Remove wso2 license text from 3rd party libraries 2016-07-21 10:47:15 +05:30
charitha
c9d51df3cb Fix issues in PR https://github.com/wso2/product-iots/pull/172 2016-07-21 10:44:57 +05:30
Ace
288a523c23 Updating IoTS device.mgt versions 2016-07-13 14:42:59 +05:30
charitha
c1bb8a0c6d Merge branch 'master' of https://github.com/wso2/product-iots 2016-06-30 10:36:39 +05:30